diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index 205f562ad6..d239d75a8a 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -20,26 +20,24 @@ module.exports = ({config, mode}) => { }, ]; - // Exclude all node_modules from babel-loader - config.module.rules - .find(rule => /mjs\|jsx/.test(rule.test.toString())) - .exclude.push(/node_modules/); - - // Filter out extraneous rules added by CRA (react-scripts) - // react-scripts automatically adds js/ts matchers for a `src` folder which we don't use so these rules are moot - config.module.rules = config.module.rules.filter( - rule => !/js\|mjs\|jsx\|ts\|tsx/.test(rule.test.toString()) - ); - - // Override CRA postcss presets - config.module.rules.forEach(rule => { - if (rule.test.toString().includes('scss|sass')) { - delete rule.use[2].options.plugins; + config.module.rules.push({ + test: /\.scss$/, + use: [ + 'style-loader', + 'css-loader', + 'sass-loader', + { + loader: 'postcss-loader', + options: { + sourceMap: true, + config: { + path: postcssConfigPath, + }, + }, + }, + ], - rule.use[2].options.config = { - path: postcssConfigPath, - }; - } + include: modulesPath, }); // Add `.ts` and `.tsx` as a resolvable extension. diff --git a/package.json b/package.json index 115a7886de..d920896f43 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,6 @@ "react-docgen-typescript": "^1.15.0", "react-docgen-typescript-loader": "^3.3.0", "react-dom": "16.12.0", - "react-scripts": "^3.4.1", "replace-in-files": "^2.0.3", "request": "^2.88.2", "rimraf": "^2.6.3",