@angular-devkit/build-angular 13.2.0 → 13.2.4

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.2.0",
+  "version": "13.2.4",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.1.1",
-    "@angular-devkit/architect": "0.1302.0",
-    "@angular-devkit/build-webpack": "0.1302.0",
-    "@angular-devkit/core": "13.2.0",
+    "@angular-devkit/architect": "0.1302.4",
+    "@angular-devkit/build-webpack": "0.1302.4",
+    "@angular-devkit/core": "13.2.4",
     "@babel/core": "7.16.12",
     "@babel/generator": "7.16.8",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.16.7",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "13.2.0",
+    "@ngtools/webpack": "13.2.4",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
@@ -31,7 +31,7 @@
     "core-js": "3.20.3",
     "critters": "0.0.16",
     "css-loader": "6.5.1",
-    "esbuild-wasm": "0.14.14",
+    "esbuild-wasm": "0.14.22",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
     "inquirer": "8.2.0",
@@ -39,7 +39,7 @@
     "karma-source-map-support": "1.4.0",
     "less": "4.1.2",
     "less-loader": "10.2.0",
-    "license-webpack-plugin": "4.0.0",
+    "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.0",
     "mini-css-extract-plugin": "2.5.3",
     "minimatch": "3.0.4",
@@ -72,7 +72,7 @@
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.14.14"
+    "esbuild": "0.14.22"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^13.0.0",

package/src/builders/karma/schema.d.ts

@@ -28,7 +28,7 @@ export interface Schema {
      * - when a path to directory is provided, all spec files ending ".spec.@(ts|tsx)" will be
      * included
      * - when a path to a file is provided, and a matching spec file exists it will be included
-     * instead
+     * instead.
      */
     include?: string[];
     /**

package/src/builders/karma/schema.json

@@ -70,7 +70,7 @@
       "items": {
         "type": "string"
       },
-      "description": "Globs of files to include, relative to workspace or project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead"
+      "description": "Globs of files to include, relative to workspace or project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead."
     },
     "sourceMap": {
       "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",

package/src/utils/build-options.d.ts

@@ -7,7 +7,7 @@
  */
 import { logging } from '@angular-devkit/core';
 import type { ParsedConfiguration } from '@angular/compiler-cli';
-import { AssetPatternClass, Budget, CrossOrigin, ExtraEntryPoint, I18NTranslation, IndexUnion, InlineStyleLanguage, Localize, SourceMapClass } from '../builders/browser/schema';
+import { AssetPatternClass, Budget, CrossOrigin, ExtraEntryPoint, I18NTranslation, IndexUnion, InlineStyleLanguage, Localize, OutputHashing, SourceMapClass } from '../builders/browser/schema';
 import { Schema as DevServerSchema } from '../builders/dev-server/schema';
 import { NormalizedCachedOptions } from './normalize-cache';
 import { NormalizedFileReplacement } from './normalize-file-replacements';
@@ -30,7 +30,7 @@ export interface BuildOptions {
     bundleDependencies?: boolean;
     externalDependencies?: string[];
     watch?: boolean;
-    outputHashing?: string;
+    outputHashing?: OutputHashing;
     poll?: number;
     index?: IndexUnion;
     deleteOutputPath?: boolean;

package/src/webpack/configs/common.js

@@ -58,7 +58,7 @@ async function getCommonConfig(wco) {
     // changed to a direct dynamic import.
     const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT, VERSION: NG_VERSION, } = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
     // determine hashing format
-    const hashFormat = (0, helpers_1.getOutputHashFormat)(buildOptions.outputHashing || 'none');
+    const hashFormat = (0, helpers_1.getOutputHashFormat)(buildOptions.outputHashing);
     if (buildOptions.progress) {
         extraPlugins.push(new progress_plugin_1.ProgressPlugin(platform));
     }
@@ -298,7 +298,9 @@ async function getCommonConfig(wco) {
                     test: /\.[cm]?[tj]sx?$/,
                     // The below is needed due to a bug in `@babel/runtime`. See: https://github.com/babel/babel/issues/12824
                     resolve: { fullySpecified: false },
-                    exclude: [/[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill)[/\\]/],
+                    exclude: [
+                        /[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill|whatwg-url)[/\\]/,
+                    ],
                     use: [
                         {
                             loader: require.resolve('../../babel/webpack-loader'),

package/src/webpack/plugins/css-optimizer-plugin.js

@@ -115,10 +115,10 @@ class CssOptimizerPlugin {
             // browserslist uses the name `ios_saf` for iOS Safari whereas esbuild uses `ios`
             if (browserName === 'ios_saf') {
                 browserName = 'ios';
-                // browserslist also uses ranges for iOS Safari versions but only the lowest is required
-                // to perform minimum supported feature checks. esbuild also expects a single version.
-                [version] = version.split('-');
             }
+            // browserslist uses ranges `15.2-15.3` versions but only the lowest is required
+            // to perform minimum supported feature checks. esbuild also expects a single version.
+            [version] = version.split('-');
             if (esBuildSupportedBrowsers.has(browserName)) {
                 if (browserName === 'safari' && version === 'TP') {
                     // esbuild only supports numeric versions so `TP` is converted to a high number (999) since

package/src/webpack/plugins/karma/karma.js

@@ -155,27 +155,38 @@ const init = (config, emitter) => {
     compiler.hooks.invalid.tap('karma', () => handler());
     compiler.hooks.watchRun.tapAsync('karma', (_, callback) => handler(callback));
     compiler.hooks.run.tapAsync('karma', (_, callback) => handler(callback));
+    webpackMiddleware = (0, webpack_dev_middleware_1.default)(compiler, webpackMiddlewareConfig);
+    emitter.on('exit', (done) => {
+        webpackMiddleware.close();
+        done();
+    });
     function unblock() {
         isBlocked = false;
         blocked.forEach((cb) => cb());
         blocked = [];
     }
     let lastCompilationHash;
-    compiler.hooks.done.tap('karma', (stats) => {
-        if (stats.hasErrors()) {
-            lastCompilationHash = undefined;
-        }
-        else if (stats.hash != lastCompilationHash) {
-            // Refresh karma only when there are no webpack errors, and if the compilation changed.
-            lastCompilationHash = stats.hash;
-            emitter.refreshFiles();
-        }
-        unblock();
-    });
-    webpackMiddleware = (0, webpack_dev_middleware_1.default)(compiler, webpackMiddlewareConfig);
-    emitter.on('exit', (done) => {
-        webpackMiddleware.close();
-        done();
+    let isFirstRun = true;
+    return new Promise((resolve) => {
+        compiler.hooks.done.tap('karma', (stats) => {
+            if (isFirstRun) {
+                // This is needed to block Karma from launching browsers before Webpack writes the assets in memory.
+                // See the below:
+                // https://github.com/karma-runner/karma-chrome-launcher/issues/154#issuecomment-986661937
+                // https://github.com/angular/angular-cli/issues/22495
+                isFirstRun = false;
+                resolve();
+            }
+            if (stats.hasErrors()) {
+                lastCompilationHash = undefined;
+            }
+            else if (stats.hash != lastCompilationHash) {
+                // Refresh karma only when there are no webpack errors, and if the compilation changed.
+                lastCompilationHash = stats.hash;
+                emitter.refreshFiles();
+            }
+            unblock();
+        });
     });
 };
 init.$inject = ['config', 'emitter'];

package/src/webpack/utils/helpers.d.ts

@@ -8,7 +8,7 @@
 import type { ObjectPattern } from 'copy-webpack-plugin';
 import { ScriptTarget } from 'typescript';
 import type { Configuration, WebpackOptionsNormalized } from 'webpack';
-import { AssetPatternClass, ExtraEntryPoint, ExtraEntryPointClass } from '../../builders/browser/schema';
+import { AssetPatternClass, ExtraEntryPoint, ExtraEntryPointClass, OutputHashing } from '../../builders/browser/schema';
 import { WebpackConfigOptions } from '../../utils/build-options';
 export interface HashFormat {
     chunk: string;
@@ -16,7 +16,7 @@ export interface HashFormat {
     file: string;
     script: string;
 }
-export declare function getOutputHashFormat(option: string, length?: number): HashFormat;
+export declare function getOutputHashFormat(outputHashing?: OutputHashing, length?: number): HashFormat;
 export declare type NormalizedEntryPoint = Required<ExtraEntryPointClass>;
 export declare function normalizeExtraEntryPoints(extraEntryPoints: ExtraEntryPoint[], defaultBundleName: string): NormalizedEntryPoint[];
 export declare function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath: string) => string;

package/src/webpack/utils/helpers.js

@@ -35,25 +35,41 @@ const fs_1 = require("fs");
 const glob_1 = __importDefault(require("glob"));
 const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
+const schema_1 = require("../../builders/browser/schema");
 const package_version_1 = require("../../utils/package-version");
-function getOutputHashFormat(option, length = 20) {
-    const hashFormats = {
-        none: { chunk: '', extract: '', file: '', script: '' },
-        media: { chunk: '', extract: '', file: `.[hash:${length}]`, script: '' },
-        bundles: {
-            chunk: `.[contenthash:${length}]`,
-            extract: `.[contenthash:${length}]`,
-            file: '',
-            script: `.[hash:${length}]`,
-        },
-        all: {
-            chunk: `.[contenthash:${length}]`,
-            extract: `.[contenthash:${length}]`,
-            file: `.[hash:${length}]`,
-            script: `.[hash:${length}]`,
-        },
-    };
-    return hashFormats[option] || hashFormats['none'];
+function getOutputHashFormat(outputHashing = schema_1.OutputHashing.None, length = 20) {
+    const hashTemplate = `.[contenthash:${length}]`;
+    switch (outputHashing) {
+        case 'media':
+            return {
+                chunk: '',
+                extract: '',
+                file: hashTemplate,
+                script: '',
+            };
+        case 'bundles':
+            return {
+                chunk: hashTemplate,
+                extract: hashTemplate,
+                file: '',
+                script: hashTemplate,
+            };
+        case 'all':
+            return {
+                chunk: hashTemplate,
+                extract: hashTemplate,
+                file: hashTemplate,
+                script: hashTemplate,
+            };
+        case 'none':
+        default:
+            return {
+                chunk: '',
+                extract: '',
+                file: '',
+                script: '',
+            };
+    }
 }
 exports.getOutputHashFormat = getOutputHashFormat;
 function normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName) {