fix(@angular-devkit/build-optimizer): fix sourcemap chaining

filipesilva · hansl · commit 5e25fd459ea8 · 2018-06-05T17:55:15.000-07:00
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
@@ -62,6 +62,7 @@ function isKnownSideEffectFree(filePath: string) {
 
 export interface BuildOptimizerOptions {
   content?: string;
+  originalFilePath?: string;
   inputFilePath?: string;
   outputFilePath?: string;
   emitSourceMap?: boolean;
@@ -72,7 +73,11 @@ export interface BuildOptimizerOptions {
 export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascriptOutput {
 
   const { inputFilePath } = options;
-  let { content } = options;
+  let { originalFilePath, content } = options;
+
+  if (!originalFilePath && inputFilePath) {
+    originalFilePath = inputFilePath;
+  }
 
   if (!inputFilePath && content === undefined) {
     throw new Error('Either filePath or content must be specified in options.');
@@ -97,7 +102,7 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
     getTransforms.push(getPrefixClassesTransformer);
   }
 
-  if (options.isSideEffectFree || inputFilePath && isKnownSideEffectFree(inputFilePath)) {
+  if (options.isSideEffectFree || originalFilePath && isKnownSideEffectFree(originalFilePath)) {
     getTransforms.push(
       // getPrefixFunctionsTransformer is rather dangerous, apply only to known pure es5 modules.
       // It will mark both `require()` calls and `console.log(stuff)` as pure.
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
@@ -21,12 +21,15 @@ export default function buildOptimizerLoader
   this.cacheable();
   const options: BuildOptimizerLoaderOptions = loaderUtils.getOptions(this) || {};
 
+  // Make up names of the intermediate files so we can chain the sourcemaps.
+  const inputFilePath = this.resourcePath + '.pre-build-optimizer.js';
+  const outputFilePath = this.resourcePath + '.post-build-optimizer.js';
+
   const boOutput = buildOptimizer({
     content,
-    inputFilePath: this.resourcePath,
-    // Add a name to the build optimizer output.
-    // Without a name the sourcemaps cannot be properly chained.
-    outputFilePath: this.resourcePath + '.build-optimizer.js',
+    originalFilePath: this.resourcePath,
+    inputFilePath,
+    outputFilePath,
     emitSourceMap: options.sourceMap,
   });
 
@@ -53,10 +56,10 @@ export default function buildOptimizerLoader
       // source map chaining example.
       // Use http://sokra.github.io/source-map-visualization/ to validate sourcemaps make sense.
 
-      // Fill in the intermediate sourcemap sources as the previous sourcemap sources.
-      if (previousSourceMap.sources) {
-        intermediateSourceMap.sources = previousSourceMap.sources;
-      }
+      // Force the previous sourcemap to use the filename we made up for it.
+      // In order for source maps to be chained, the consumed source map `file` needs to be in the
+      // consumers source map `sources` array.
+      previousSourceMap.file = inputFilePath;
 
       // Chain the sourcemaps.
       const consumer = new SourceMapConsumer(intermediateSourceMap);
