refactor(@angular-devkit/build-angular): don't add a SourceMapDevTool…

…Plugin when sourcemaps are disabled
angular · Dec 6, 2019 · 614820d · 614820d
1 parent 6f4fef5
commit 614820d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/...ages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/...ages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -53,8 +53,8 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
 
   if (!isEval && (scriptsSourceMap || stylesSourceMap)) {
     extraPlugins.push(getSourceMapDevTool(
-      !!scriptsSourceMap,
-      !!stylesSourceMap,
+      scriptsSourceMap,
+      stylesSourceMap,
       wco.differentialLoadingMode ? true : hiddenSourceMap,
     ));
   }

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -24,7 +24,9 @@ export function getServerConfig(wco: WebpackConfigOptions): Configuration {
   const extraPlugins = [];
   if (sourceMap) {
     const { scripts, styles, hidden } = sourceMap;
-    extraPlugins.push(getSourceMapDevTool(scripts || false, styles || false, hidden || false));
+    if (scripts || styles) {
+      extraPlugins.push(getSourceMapDevTool(scripts, styles, hidden));
+    }
   }
 
   const config: Configuration = {

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
@@ -50,12 +50,14 @@ export function getTestConfig(
   if (wco.buildOptions.sourceMap) {
     const { styles, scripts } = wco.buildOptions.sourceMap;
 
-    extraPlugins.push(getSourceMapDevTool(
-      scripts || false,
-      styles || false,
-      false,
-      true,
-    ));
+    if (styles || scripts) {
+      extraPlugins.push(getSourceMapDevTool(
+        scripts,
+        styles,
+        false,
+        true,
+      ));
+    }
   }
 
   return {

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -76,8 +76,8 @@ export function normalizeExtraEntryPoints(
 }
 
 export function getSourceMapDevTool(
-  scriptsSourceMap: boolean,
-  stylesSourceMap: boolean,
+  scriptsSourceMap: boolean | undefined,
+  stylesSourceMap: boolean | undefined,
   hiddenSourceMap = false,
   inlineSourceMap = false,
 ): SourceMapDevToolPlugin {