refactor(webpack-runner): 同步 2.x 的 sourceMapType 配置项 (#6544)

NervJS · Jun 16, 2020 · 04b0962 · 04b0962
1 parent 9a2c419
commit 04b0962
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
     "type": "node",
     "request": "launch",
     "name": "CLI debug",
-    "program": "${workspaceFolder}/packages/taro-cli/bin/taro-build",
+    "program": "${workspaceFolder}/packages/taro-cli/bin/taro",
     // "cwd": "${project absolute path}",
     // "args": [
     //   "build",

diff --git a/packages/taro-webpack-runner/src/config/dev.conf.ts b/packages/taro-webpack-runner/src/config/dev.conf.ts
@@ -37,6 +37,7 @@ export default function (appPath: string, config: Partial<BuildConfig>): any {
     designWidth = 750,
     deviceRatio,
     enableSourceMap = true,
+    sourceMapType,
     enableExtract = false,
 
     defineConstants = emptyObj,
@@ -113,7 +114,7 @@ export default function (appPath: string, config: Partial<BuildConfig>): any {
 
   chain.merge({
     mode,
-    devtool: getDevtool([enableSourceMap]),
+    devtool: getDevtool({ enableSourceMap, sourceMapType }),
     entry,
     output: getOutput(appPath, [{
       outputRoot,

diff --git a/packages/taro-webpack-runner/src/config/prod.conf.ts b/packages/taro-webpack-runner/src/config/prod.conf.ts
@@ -36,6 +36,7 @@ export default function (appPath: string, config: Partial<BuildConfig>): any {
     designWidth = 750,
     deviceRatio,
     enableSourceMap = false,
+    sourceMapType,
     enableExtract = true,
 
     defineConstants = emptyObj,
@@ -132,7 +133,7 @@ export default function (appPath: string, config: Partial<BuildConfig>): any {
 
   chain.merge({
     mode,
-    devtool: getDevtool(enableSourceMap),
+    devtool: getDevtool({ enableSourceMap, sourceMapType }),
     entry,
     output: getOutput(appPath, [{
       outputRoot,

diff --git a/packages/taro-webpack-runner/src/util/chain.ts b/packages/taro-webpack-runner/src/util/chain.ts
@@ -559,6 +559,6 @@ export const getOutput = (appPath: string, [{ outputRoot, publicPath, chunkDirec
   }
 }
 
-export const getDevtool = enableSourceMap => {
-  return enableSourceMap ? 'cheap-module-eval-source-map' : 'none'
+export const getDevtool = ({ enableSourceMap, sourceMapType = 'cheap-module-eval-source-map' }) => {
+  return enableSourceMap ? sourceMapType : 'none'
 }