@angular-devkit/build-angular 12.2.9 → 12.2.10

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "12.2.9",
+  "version": "12.2.10",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.0.1",
-    "@angular-devkit/architect": "0.1202.9",
-    "@angular-devkit/build-optimizer": "0.1202.9",
-    "@angular-devkit/build-webpack": "0.1202.9",
-    "@angular-devkit/core": "12.2.9",
+    "@angular-devkit/architect": "0.1202.10",
+    "@angular-devkit/build-optimizer": "0.1202.10",
+    "@angular-devkit/build-webpack": "0.1202.10",
+    "@angular-devkit/core": "12.2.10",
     "@babel/core": "7.14.8",
     "@babel/generator": "7.14.8",
     "@babel/helper-annotate-as-pure": "7.14.5",
@@ -22,7 +22,7 @@
     "@babel/template": "7.14.5",
     "@discoveryjs/json-ext": "0.5.3",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@ngtools/webpack": "12.2.9",
+    "@ngtools/webpack": "12.2.10",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.2",
     "browserslist": "^4.9.1",

package/src/babel/babel-loader.d.ts

@@ -7,9 +7,7 @@
  */
 
 declare module 'babel-loader' {
-  type BabelLoaderCustomizer<T> = (
-    babel: typeof import('@babel/core'),
-  ) => {
+  type BabelLoaderCustomizer<T> = (babel: typeof import('@babel/core')) => {
     customOptions?(
       this: import('webpack').loader.LoaderContext,
       loaderOptions: Record<string, unknown>,
@@ -20,6 +18,17 @@ declare module 'babel-loader' {
       configuration: import('@babel/core').PartialConfig,
       loaderArguments: { source: string; map?: unknown; customOptions: T },
     ): import('@babel/core').TransformOptions;
+    result?(
+      this: import('webpack').loader.LoaderContext,
+      result: import('@babel/core').BabelFileResult,
+      context: {
+        source: string;
+        map?: unknown;
+        customOptions: T;
+        configuration: import('@babel/core').PartialConfig;
+        options: import('@babel/core').TransformOptions;
+      },
+    ): import('@babel/core').BabelFileResult;
   };
   function custom<T>(customizer: BabelLoaderCustomizer<T>): import('webpack').loader.Loader;
 }

package/src/babel/webpack-loader.js

@@ -6,7 +6,11 @@
  * 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
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const remapping_1 = __importDefault(require("@ampproject/remapping"));
 const linker_1 = require("@angular/compiler-cli/linker");
 const babel_loader_1 = require("babel-loader");
 const typescript_1 = require("typescript");
@@ -118,10 +122,10 @@ exports.default = babel_loader_1.custom(() => {
             }
             return {
                 ...configuration.options,
-                // Workaround for https://github.com/babel/babel-loader/pull/896 is available
-                // Delete once the above PR is released
+                // Using `false` disables babel from attempting to locate sourcemaps or process any inline maps.
+                // The babel types do not include the false option even though it is valid
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                inputSourceMap: configuration.options.inputSourceMap || false,
+                inputSourceMap: false,
                 plugins,
                 presets: [
                     ...(configuration.options.presets || []),
@@ -146,5 +150,16 @@ exports.default = babel_loader_1.custom(() => {
                 ],
             };
         },
+        result(result, { map: inputSourceMap }) {
+            if (result.map && inputSourceMap) {
+                // Merge the intermediate sourcemap generated by babel with the input source map.
+                // The casting is required due to slight differences in the types for babel and
+                // `@ampproject/remapping` source map objects but both are compatible with Webpack.
+                // This method for merging is used because it provides more accurate output
+                // and is faster while using less memory.
+                result.map = remapping_1.default([result.map, inputSourceMap], () => null);
+            }
+            return result;
+        },
     };
 });

package/src/webpack/configs/browser.js

@@ -37,6 +37,7 @@ function getBrowserConfig(wco) {
         devtool: false,
         resolve: {
             mainFields: ['es2015', 'browser', 'module', 'main'],
+            conditionNames: ['es2015', '...'],
         },
         output: {
             crossOriginLoading,

package/src/webpack/configs/test.js

@@ -61,6 +61,7 @@ function getTestConfig(wco) {
         target: wco.tsConfig.options.target === typescript_1.ScriptTarget.ES5 ? ['web', 'es5'] : 'web',
         resolve: {
             mainFields: ['es2015', 'browser', 'module', 'main'],
+            conditionNames: ['es2015', '...'],
         },
         devtool: false,
         entry: {