GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-07 07:21:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert to drop scss rules

Browse Source
This commit is contained in:
y-kurami 2018-01-15 14:38:01 +09:00
parent 1ccbe21e78
commit 037c08b583
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/angular/src/server/angular-cli_config.js vendored
View File

@ -57,10 +57,11 @@ export function applyAngularCliWebpackConfig(baseConfig, cliWebpackConfigOptions
}
logger.info('=> Get angular-cli webpack config.');
// Don't use storybooks .css rules because we have to use .css rules created by @angualr/cli
// because @angular/cli created has include/exclude rules of global .css files.
// Don't use storybooks .css/.scss rules because we have to use rules created by @angualr/cli
// because @angular/cli created rules have include/exclude for global style files.
const styleRules = baseConfig.module.rules.filter(
rule => !rule.test || rule.test.toString() !== '/\\.css$/'
rule =>
!rule.test || (rule.test.toString() !== '/\\.css$/' && rule.test.toString() !== '/\\.scss$/')
);
// cliStyleConfig.entry adds global style files to the webpack context

4
app/angular/src/server/config/webpack.config.js
View File

@ -76,6 +76,10 @@ export default function(configDir) {
loader: 'raw-loader',
exclude: /\.async\.css$/,
},
{
test: /\.scss$/,
loaders: [require.resolve('raw-loader'), require.resolve('sass-loader')],
},
{
test: /\.md$/,
use: [

4
app/angular/src/server/config/webpack.config.prod.js
View File

@ -88,6 +88,10 @@ export default function(configDir) {
loader: 'raw-loader',
exclude: /\.async\.html$/,
},
{
test: /\.scss$/,
loaders: [require.resolve('raw-loader'), require.resolve('sass-loader')],
},
],
},
resolve: {