diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index a2d8e4c..6aca1e3 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -25,12 +25,36 @@ module.exports = ({ config }) => { ] }) config.module.rules.push({ - test: /\.(svg|gif|jpe?g|png)$/, - use: [ + test: /\.(svg)$/i, + oneOf: [ { - loader: require.resolve('url-loader'), + loader: 'file-loader', + query: { name: 'static/[name].[ext]' }, }, - ] + { + loader: 'url-loader', + query: { + limit: 10000, + name: 'static/[name].[ext]', + }, + }, + ], + }) + config.module.rules.push({ + test: /\.(jpe?g|png|gif)$/i, + oneOf: [ + { + loader: 'file-loader', + query: { name: 'static/[name].[ext]' }, + }, + { + loader: 'url-loader', + query: { + limit: 10000, + name: 'static/[name].[ext]', + }, + }, + ], }) config.module.rules.push({ test: /\.(eot|woff|woff2|ttf)$/, diff --git a/config/webpack/base.ts b/config/webpack/base.ts index fd83831..b093b57 100644 --- a/config/webpack/base.ts +++ b/config/webpack/base.ts @@ -49,14 +49,18 @@ const baseConfig: webpack.Configuration = { } }, { - test: /\.svg$/, + test: /\.(svg)$/i, oneOf: [ { - resourceQuery: /external/, - loader: 'url-loader?limit=10000', + loader: 'file-loader', + query: { name: 'static/[name].[ext]' }, }, { - loader: '@svgr/webpack', + loader: 'url-loader', + query: { + limit: 10000, + name: 'static/[name].[ext]', + }, }, ], }, @@ -64,7 +68,6 @@ const baseConfig: webpack.Configuration = { test: /\.(jpe?g|png|gif)$/i, oneOf: [ { - resource: /external/, loader: 'file-loader', query: { name: 'static/[name].[ext]' }, }, diff --git a/package.json b/package.json index 8276206..eda2db0 100755 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dev": "yarn install && NODE_ENV=development ts-node -r tsconfig-paths/register ./devServer.ts", "tslint-fix": "npx tslint --fix './src/**/*.{ts,tsx}'", "tslint": "npx tslint './src/**/*.{ts,tsx}'", - "storybook": "start-storybook -p 6006", + "storybook": "npm run build && start-storybook -s dist -p 6006", "build": "NODE_ENV=production npm run clean && npm run build:js", "build:js": "webpack -p --hide-modules --config config/webpack/prod.ts", "clean": "rimraf dist/", diff --git a/public/test/confetti3.png b/public/test/confetti3.png new file mode 100755 index 0000000..840d9a3 Binary files /dev/null and b/public/test/confetti3.png differ diff --git a/src/components/App.tsx b/src/components/App.tsx index 268a7a4..ea495de 100755 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -4,15 +4,25 @@ import { withRouter } from 'react-router' import { GlobalStyle } from 'styles' import 'styles/entry.scss' - import { Test } from './modules' import GlobalNavigation from 'components/molecules/GlobalNavigation' +import IconSettings from '@salesforce/design-system-react/components/icon-settings' +import Button from '@salesforce/design-system-react/components/button' +import 'static/lds/assets/icons/utility-sprite/svg/symbols.svg' const App = () => (
+ +