@angular-devkit/build-angular 13.0.0 → 13.0.4

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.0.0",
+  "version": "13.0.4",
   "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.1300.0",
-    "@angular-devkit/build-webpack": "0.1300.0",
-    "@angular-devkit/core": "13.0.0",
+    "@angular-devkit/architect": "0.1300.4",
+    "@angular-devkit/build-webpack": "0.1300.4",
+    "@angular-devkit/core": "13.0.4",
     "@babel/core": "7.15.8",
     "@babel/generator": "7.15.8",
     "@babel/helper-annotate-as-pure": "7.15.4",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.15.4",
     "@babel/template": "7.15.4",
     "@discoveryjs/json-ext": "0.5.5",
-    "@ngtools/webpack": "13.0.0",
+    "@ngtools/webpack": "13.0.4",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
@@ -39,7 +39,7 @@
     "karma-source-map-support": "1.4.0",
     "less": "4.1.2",
     "less-loader": "10.2.0",
-    "license-webpack-plugin": "3.0.0",
+    "license-webpack-plugin": "4.0.0",
     "loader-utils": "3.0.0",
     "mini-css-extract-plugin": "2.4.3",
     "minimatch": "3.0.4",
@@ -65,7 +65,7 @@
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.60.0",
+    "webpack": "5.64.1",
     "webpack-dev-middleware": "5.2.1",
     "webpack-dev-server": "4.4.0",
     "webpack-merge": "5.8.0",
@@ -75,11 +75,11 @@
     "esbuild": "0.13.12"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^13.0.0 || ^13.0.0-next",
-    "@angular/localize": "^13.0.0 || ^13.0.0-next",
-    "@angular/service-worker": "^13.0.0 || ^13.0.0-next",
+    "@angular/compiler-cli": "^13.0.0",
+    "@angular/localize": "^13.0.0",
+    "@angular/service-worker": "^13.0.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^13.0.0 || ^13.0.0-next",
+    "ng-packagr": "^13.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0",
     "typescript": "~4.4.3"

package/src/babel/presets/application.d.ts

@@ -34,6 +34,7 @@ export interface ApplicationPresetOptions {
     forceAsyncTransformation?: boolean;
     instrumentCode?: {
         includedBasePath: string;
+        inputSourceMap: unknown;
     };
     optimize?: {
         looseEnums: boolean;

package/src/babel/presets/application.js

@@ -101,7 +101,7 @@ function createNgtscLogger(reporter) {
     };
 }
 function default_1(api, options) {
-    var _a;
+    var _a, _b;
     const presets = [];
     const plugins = [];
     let needRuntimeTransform = false;
@@ -160,7 +160,10 @@ function default_1(api, options) {
     if (options.instrumentCode) {
         plugins.push([
             require('babel-plugin-istanbul').default,
-            { inputSourceMap: false, cwd: options.instrumentCode.includedBasePath },
+            {
+                inputSourceMap: (_b = options.instrumentCode.inputSourceMap) !== null && _b !== void 0 ? _b : false,
+                cwd: options.instrumentCode.includedBasePath,
+            },
         ]);
     }
     if (needRuntimeTransform) {

package/src/babel/webpack-loader.js

@@ -51,7 +51,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
         inputSourceMap: false,
     });
     return {
-        async customOptions(options, { source }) {
+        async customOptions(options, { source, map }) {
             var _a, _b;
             const { i18n, scriptTarget, aot, optimize, instrumentCode, ...rawOptions } = options;
             // Must process file if plugins are added
@@ -140,6 +140,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 // `babel-plugin-istanbul` has it's own includes but we do the below so that we avoid running the the loader.
                 customOptions.instrumentCode = {
                     includedBasePath: instrumentCode.includedBasePath,
+                    inputSourceMap: map,
                 };
                 shouldProcess = true;
             }
@@ -198,7 +199,13 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 // `@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 = (0, remapping_1.default)([result.map, inputSourceMap], () => null);
+                result.map = {
+                    // Convert the SourceMap back to simple plain object.
+                    // This is needed because otherwise code-coverage will fail with `don't know how to turn this value into a node`
+                    // Which is thrown by Babel if it is invoked again from `istanbul-lib-instrument`.
+                    // https://github.com/babel/babel/blob/780aa48d2a34dc55f556843074b6aed45e7eabeb/packages/babel-types/src/converters/valueToNode.ts#L115-L130
+                    ...(0, remapping_1.default)([result.map, inputSourceMap], () => null),
+                };
             }
             return result;
         },

package/src/builders/extract-i18n/ivy-extract-loader.js

@@ -29,6 +29,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const nodePath = __importStar(require("path"));
 const load_esm_1 = require("../../utils/load-esm");
 function localizeExtractLoader(content, map) {
+    // This loader is not cacheable due to how message extraction works.
+    // Extracted messages are not part of webpack pipeline and hence they cannot be retrieved from cache.
+    // TODO: We should investigate in the future on making this deterministic and more cacheable.
+    this.cacheable(false);
     const options = this.getOptions();
     const callback = this.async();
     extract(this, content, map, options).then(() => {

package/src/webpack/configs/common.js

@@ -300,6 +300,9 @@ async function getCommonConfig(wco) {
             /Failed to parse source map from/,
             // https://github.com/webpack-contrib/postcss-loader/blob/bd261875fdf9c596af4ffb3a1a73fe3c549befda/src/index.js#L153-L158
             /Add postcss as project dependency/,
+            // esbuild will issue a warning, while still hoists the @charset at the very top.
+            // This is caused by a bug in css-loader https://github.com/webpack-contrib/css-loader/issues/1212
+            /"@charset" must be the first rule in the file/,
         ],
         module: {
             // Show an error for missing exports instead of a warning.

package/src/webpack/plugins/hmr/hmr-accept.js

@@ -140,7 +140,6 @@ function restoreFormValues(oldInputs, oldOptions) {
                 case 'date':
                 case 'datetime-local':
                 case 'email':
-                case 'file':
                 case 'hidden':
                 case 'month':
                 case 'number':
@@ -155,6 +154,10 @@ function restoreFormValues(oldInputs, oldOptions) {
                 case 'week':
                     newElement.value = oldElement.value;
                     break;
+                case 'file':
+                    // Ignored due: Uncaught DOMException: Failed to set the 'value' property on 'HTMLInputElement':
+                    // This input element accepts a filename, which may only be programmatically set to the empty string.
+                    break;
                 default:
                     console.warn('[NG HMR] Unknown input type ' + oldElement.type + '.');
                     continue;

package/src/webpack/utils/helpers.js

@@ -102,7 +102,7 @@ exports.isPolyfillsEntry = isPolyfillsEntry;
 function getWatchOptions(poll) {
     return {
         poll,
-        ignored: poll === undefined ? '**/$_lazy_route_resources' : 'node_modules/**',
+        ignored: poll === undefined ? '**/$_lazy_route_resources' : '**/node_modules/**',
     };
 }
 exports.getWatchOptions = getWatchOptions;