Merge branch 'next' into fix/convert

NervJS · Sep 2, 2020 · f652112 · f652112
2 parents 6a9f363 + 7cd0d5d
commit f652112
Show file tree

Hide file tree

Showing 4 changed files with 18 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/index.ts b/packages/taro-webpack-runner/src/index.ts
@@ -96,6 +96,10 @@ const buildDev = async (appPath: string, config: BuildConfig): Promise<any> => {
     customDevServerOption
   )
 
+  if (devServerOptions.host === 'localhost') {
+    devServerOptions.useLocalIp = false
+  }
+
   const originalPort = devServerOptions.port
   const availablePort = await detectPort(originalPort)
 

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
   ])