fix(runner): 修复样式条件编译问题，close #7410 (#7450)

NervJS · Sep 2, 2020 · bcf5a0c · bcf5a0c
1 parent 2408752
commit bcf5a0c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/packages/taro-mini-runner/src/webpack/chain.ts b/packages/taro-mini-runner/src/webpack/chain.ts
@@ -248,12 +248,16 @@ export const getModule = (appPath: string, {
     sourceMap: true,
     implementation: sass,
     sassOptions: {
-      indentedSyntax: true
+      indentedSyntax: true,
+      outputStyle: 'expanded'
     }
   }, sassLoaderOption])
   const scssLoader = getSassLoader([{
     sourceMap: true,
-    implementation: sass
+    implementation: sass,
+    sassOptions: {
+      outputStyle: 'expanded'
+    }
   }, sassLoaderOption])
 
   const postcssLoader = getPostcssLoader([

diff --git a/packages/taro-webpack-runner/__tests__/__snapshots__/vue.spec.ts.snap b/packages/taro-webpack-runner/__tests__/__snapshots__/vue.spec.ts.snap
@@ -39,7 +39,7 @@ exports[`vue should build vue app 2`] = `
 }, function(module, exports, __webpack_require__) {
     var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(2);
     exports = ___CSS_LOADER_API_IMPORT___(false);
-    exports.push([ module.i, \\".index{color:blue}\\", \\"\\" ]);
+    exports.push([ module.i, \\".index {\\\\n  color: blue;\\\\n}\\", \\"\\" ]);
     module.exports = exports;
 }, function(module, __webpack_exports__, __webpack_require__) {
     \\"use strict\\";
@@ -49,7 +49,7 @@ exports[`vue should build vue app 2`] = `
 }, function(module, exports, __webpack_require__) {
     var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(2);
     exports = ___CSS_LOADER_API_IMPORT___(false);
-    exports.push([ module.i, \\".detail{color:red}\\", \\"\\" ]);
+    exports.push([ module.i, \\".detail {\\\\n  color: red;\\\\n}\\", \\"\\" ]);
     module.exports = exports;
 }, function(module, __webpack_exports__, __webpack_require__) {
     \\"use strict\\";

diff --git a/packages/taro-webpack-runner/src/util/chain.ts b/packages/taro-webpack-runner/src/util/chain.ts
@@ -398,15 +398,19 @@ export const getModule = (appPath: string, {
       sourceMap: true,
       implementation: sass,
       sassOptions: {
-        indentedSyntax: true
+        indentedSyntax: true,
+        outputStyle: 'expanded'
       }
     },
     sassLoaderOption
   ])
   const scssLoader = getSassLoader([
     {
       sourceMap: true,
-      implementation: sass
+      implementation: sass,
+      sassOptions: {
+        outputStyle: 'expanded'
+      }
     },
     sassLoaderOption
   ])