@angular-devkit/build-optimizer 0.900.0-rc.7 → 0.900.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/build-optimizer",
-  "version": "0.900.0-rc.7",
+  "version": "0.900.1",
   "description": "Angular Build Optimizer",
   "experimental": true,
   "main": "src/index.js",
@@ -29,7 +29,6 @@
   "engines": {
     "node": ">= 10.13.0",
     "npm": ">= 6.11.0",
-    "pnpm": ">= 3.2.0",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

package/src/build-optimizer/webpack-loader.js

@@ -1,13 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-const source_map_1 = require("source-map");
+const webpack_sources_1 = require("webpack-sources");
 const loaderUtils = require('loader-utils');
 const build_optimizer_1 = require("./build-optimizer");
 exports.buildOptimizerLoaderPath = __filename;
@@ -34,14 +27,11 @@ function buildOptimizerLoader(content, previousSourceMap) {
         return;
     }
     const options = 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 = build_optimizer_1.buildOptimizer({
         content,
         originalFilePath: this.resourcePath,
-        inputFilePath,
-        outputFilePath,
+        inputFilePath: this.resourcePath,
+        outputFilePath: this.resourcePath,
         emitSourceMap: options.sourceMap,
         isSideEffectFree: this._module && this._module.factoryMeta && this._module.factoryMeta.sideEffectFree,
     });
@@ -57,24 +47,10 @@ function buildOptimizerLoader(content, previousSourceMap) {
         // Webpack doesn't need sourceMappingURL since we pass them on explicitely.
         newContent = newContent.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
         if (previousSourceMap) {
-            // If there's a previous sourcemap, we have to chain them.
-            // See https://github.com/mozilla/source-map/issues/216#issuecomment-150839869 for a simple
-            // source map chaining example.
             // Use http://sokra.github.io/source-map-visualization/ to validate sourcemaps make sense.
-            // 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.
-            source_map_1.SourceMapConsumer.with(intermediateSourceMap, null, intermediate => {
-                return source_map_1.SourceMapConsumer.with(previousSourceMap, null, previous => {
-                    const generator = source_map_1.SourceMapGenerator.fromSourceMap(intermediate);
-                    generator.applySourceMap(previous);
-                    return generator.toJSON();
-                });
-                // tslint:disable-next-line: no-any
-            }).then(map => callback(null, newContent, map), error => callback(error));
-            return;
+            // The last argument is not yet in the typings
+            // tslint:disable-next-line: no-any
+            newSourceMap = new webpack_sources_1.SourceMapSource(newContent, this.resourcePath, intermediateSourceMap, content, previousSourceMap, true).map();
         }
         else {
             // Otherwise just return our generated sourcemap.