Skip to content

Fix asset loading for web #2323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wslulciuc merged 4 commits into from
Dec 15, 2022
Merged

Fix asset loading for web #2323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3345c39
Updates for assets.
Dec 13, 2022
929a8bc
Newline.
Dec 14, 2022
e5019a3
Merge branch 'main' into fix/webpack_assets
phixMe Dec 14, 2022
467e806
Merge branch 'main' into fix/webpack_assets
wslulciuc Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions web/src/components/header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import MqText from '../core/text/MqText'
import NamespaceSelect from '../namespace-select/NamespaceSelect'
import React, { ReactElement } from 'react'
import Search from '../search/Search'
import marquez_logo from './marquez_logo.svg'

const styles = (theme: Theme) => {
return createStyles({
Expand Down Expand Up @@ -47,13 +48,7 @@ const Header = (props: HeaderProps): ReactElement => {
<Toolbar>
<Box className={classes.innerToolbar}>
<Link to='/'>
<img
src={
'https://raw.githubusercontent.com/MarquezProject/marquez/main/web/src/img/marquez_logo.svg'
}
height={48}
alt='Marquez Logo'
/>
<img src={marquez_logo} height={48} alt='Marquez Logo' />
</Link>
<Box display={'flex'} alignItems={'center'}>
<Search />
Expand Down
0 web/src/img/marquez_logo.svg → web/src/components/header/marquez_logo.svg
View file
Open in desktop
File renamed without changes
2 changes: 2 additions & 0 deletions web/styles.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ declare module '*.css' {
const content: any;
export = content;
}

declare module '*.svg';

@phixMe phixMe Dec 14, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially add other asset types here in the future, .jpg .png for example.

5 changes: 4 additions & 1 deletion web/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"downlevelIteration": true,
"resolveJsonModule": false
},
"include": ["./src/**/*"],
"include": [
"./src/**/*",
"styles.d.ts"
],
"exclude": ["./src/__tests__/*"]
}
11 changes: 3 additions & 8 deletions web/webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,7 @@ module.exports = {
},
{
test: /\.(png|jpe?g|gif|svg)(\?v=\d+\.\d+\.\d+)?$/,
use: [{
loader: 'file-loader',
options: {
name: '[name].[ext]',
outputPath: 'img/'
}
}]
loader: 'file-loader'
},
{
test: /\.(woff(2)?|ttf|eot|otf)(\?v=\d+\.\d+\.\d+)?$/,
Expand All @@ -60,6 +54,7 @@ module.exports = {
},
output: {
filename: 'bundle.js',
path: path.resolve(__dirname, 'dist')
path: path.resolve(__dirname, 'dist'),
publicPath: '/'
}
};
⚡