diff --git a/web/src/components/header/Header.tsx b/web/src/components/header/Header.tsx index 79037fe15e..d65ab42bd7 100644 --- a/web/src/components/header/Header.tsx +++ b/web/src/components/header/Header.tsx @@ -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({ @@ -47,13 +48,7 @@ const Header = (props: HeaderProps): ReactElement => { - Marquez Logo + Marquez Logo diff --git a/web/src/img/marquez_logo.svg b/web/src/components/header/marquez_logo.svg similarity index 100% rename from web/src/img/marquez_logo.svg rename to web/src/components/header/marquez_logo.svg diff --git a/web/styles.d.ts b/web/styles.d.ts index de8f2c7dd7..cefbbd72f3 100644 --- a/web/styles.d.ts +++ b/web/styles.d.ts @@ -2,3 +2,5 @@ declare module '*.css' { const content: any; export = content; } + +declare module '*.svg'; diff --git a/web/tsconfig.json b/web/tsconfig.json index f420bd0957..e6ee8872e5 100644 --- a/web/tsconfig.json +++ b/web/tsconfig.json @@ -14,6 +14,9 @@ "downlevelIteration": true, "resolveJsonModule": false }, - "include": ["./src/**/*"], + "include": [ + "./src/**/*", + "styles.d.ts" + ], "exclude": ["./src/__tests__/*"] } diff --git a/web/webpack.common.js b/web/webpack.common.js index c95616ef90..73757e3d2a 100644 --- a/web/webpack.common.js +++ b/web/webpack.common.js @@ -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+)?$/, @@ -60,6 +54,7 @@ module.exports = { }, output: { filename: 'bundle.js', - path: path.resolve(__dirname, 'dist') + path: path.resolve(__dirname, 'dist'), + publicPath: '/' } };