Skip to content

Commit

Permalink
hotfix: update webpack Sass loader config to always output nested CSS…
Browse files Browse the repository at this point in the history
… to address a recent Sass Loader upstream change. port of #1361 for the v2.6.0-beta.2 release
  • Loading branch information
sghoweri committed Aug 27, 2019
1 parent c8e3a8c commit 43e7b04
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
7 changes: 6 additions & 1 deletion packages/build-tools/cli.js
Expand Up @@ -122,8 +122,13 @@ if (program.configFile) {
// automatically set enableSSR to true in prod mode and false in dev mode, unless manually set.
config.enableSSR = false;

// automatically enable i18n in production builds if undefined
config.i18n =
typeof options.i18n === 'undefined' ? !config.prod : options.i18n;
typeof options.i18n !== 'undefined'
? options.i18n
: config.prod
? true
: false;

// If i18n is disabled, ignore and remove lang config settings
if (config.lang && config.i18n === false) {
Expand Down
1 change: 1 addition & 0 deletions packages/build-tools/create-webpack-config.js
Expand Up @@ -233,6 +233,7 @@ async function createWebpackConfig(buildConfig) {
functions: sassExportData,
precision: 3,
data: globalSassData.join('\n'),
outputStyle: 'nested',
},
},
];
Expand Down

0 comments on commit 43e7b04

Please sign in to comment.