@angular-devkit/build-angular 14.0.0 → 14.0.3

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.0",
+  "version": "14.0.3",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1400.0",
-    "@angular-devkit/build-webpack": "0.1400.0",
-    "@angular-devkit/core": "14.0.0",
+    "@angular-devkit/architect": "0.1400.3",
+    "@angular-devkit/build-webpack": "0.1400.3",
+    "@angular-devkit/core": "14.0.3",
     "@babel/core": "7.17.10",
     "@babel/generator": "7.17.10",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.17.9",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.0.0",
+    "@ngtools/webpack": "14.0.3",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
@@ -73,11 +73,11 @@
     "esbuild": "0.14.38"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-rc",
-    "@angular/localize": "^14.0.0 || ^14.0.0-rc",
-    "@angular/service-worker": "^14.0.0 || ^14.0.0-rc",
+    "@angular/compiler-cli": "^14.0.0",
+    "@angular/localize": "^14.0.0",
+    "@angular/service-worker": "^14.0.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^14.0.0 || ^14.0.0-next",
+    "ng-packagr": "^14.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=4.6.2 <4.8"

package/src/babel/webpack-loader.js

@@ -52,7 +52,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
     });
     return {
         async customOptions(options, { source, map }) {
-            var _a, _b;
+            var _a, _b, _c;
             const { i18n, scriptTarget, aot, optimize, instrumentCode, supportedBrowsers, ...rawOptions } = options;
             // Must process file if plugins are added
             let shouldProcess = Array.isArray(rawOptions.plugins) && rawOptions.plugins.length > 0;
@@ -89,7 +89,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 // Comparable behavior to tsconfig target of ES5
                 customOptions.supportedBrowsers = ['IE 9'];
             }
-            else if (isJsFile) {
+            else if (isJsFile && ((_a = customOptions.supportedBrowsers) === null || _a === void 0 ? void 0 : _a.length)) {
                 // Applications code ES version can be controlled using TypeScript's `target` option.
                 // However, this doesn't effect libraries and hence we use preset-env to downlevel ES fetaures
                 // based on the supported browsers in browserlist.
@@ -142,7 +142,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                     pureTopLevel: angularPackage,
                     // JavaScript modules that are marked as side effect free are considered to have
                     // no decorators that contain non-local effects.
-                    wrapDecorators: !!((_b = (_a = this._module) === null || _a === void 0 ? void 0 : _a.factoryMeta) === null || _b === void 0 ? void 0 : _b.sideEffectFree),
+                    wrapDecorators: !!((_c = (_b = this._module) === null || _b === void 0 ? void 0 : _b.factoryMeta) === null || _c === void 0 ? void 0 : _c.sideEffectFree),
                 };
                 shouldProcess = true;
             }

package/src/builders/browser-esbuild/compiler-plugin.js

@@ -119,7 +119,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
             // Once TypeScript provides support for retaining dynamic imports this workaround can be dropped.
             const compilerCli = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
             // Temporary deep import for transformer support
-            const { createAotTransformers, mergeTransformers, } = require('@ngtools/webpack/src/ivy/transformation');
+            const { mergeTransformers, replaceBootstrap, } = require('@ngtools/webpack/src/ivy/transformation');
             // Setup defines based on the values provided by the Angular compiler-cli
             (_a = (_b = build.initialOptions).define) !== null && _a !== void 0 ? _a : (_b.define = {});
             for (const [key, value] of Object.entries(compilerCli.GLOBAL_DEFS_FOR_TERSER_WITH_AOT)) {
@@ -226,7 +226,9 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         ((_b = result.warnings) !== null && _b !== void 0 ? _b : (result.warnings = [])).push(message);
                     }
                 }
-                fileEmitter = createFileEmitter(builder, mergeTransformers(angularCompiler.prepareEmit().transformers, createAotTransformers(builder, {})), () => []);
+                fileEmitter = createFileEmitter(builder, mergeTransformers(angularCompiler.prepareEmit().transformers, {
+                    before: [replaceBootstrap(() => builder.getProgram().getTypeChecker())],
+                }), () => []);
                 return result;
             });
             build.onLoad({ filter: compilerOptions.allowJs ? /\.[cm]?[jt]sx?$/ : /\.[cm]?tsx?$/ }, async (args) => {

package/src/builders/extract-i18n/index.js

@@ -209,7 +209,9 @@ async function execute(options, context, transforms) {
             },
         });
         return partials;
-    });
+    }, 
+    // During extraction we don't need specific browser support.
+    { supportedBrowsers: undefined });
     // All the localize usages are setup to first try the ESM entry point then fallback to the deep imports.
     // This provides interim compatibility while the framework is transitioned to bundled ESM packages.
     const localizeToolsModule = await (0, load_esm_1.loadEsmModule)('@angular/localize/tools');

package/src/builders/karma/index.js

@@ -107,8 +107,8 @@ function execute(options, context, transforms = {}) {
                 throw new Error('The builder requires a target.');
             }
             const projectMetadata = await context.getProjectMetadata(projectName);
-            const projectRoot = path.join(context.workspaceRoot, (_c = projectMetadata.root) !== null && _c !== void 0 ? _c : '');
-            const projectSourceRoot = path.join(projectRoot, (_d = projectMetadata.sourceRoot) !== null && _d !== void 0 ? _d : '');
+            const sourceRoot = ((_d = (_c = projectMetadata.sourceRoot) !== null && _c !== void 0 ? _c : projectMetadata.root) !== null && _d !== void 0 ? _d : '');
+            const projectSourceRoot = path.join(context.workspaceRoot, sourceRoot);
             const files = await (0, find_tests_1.findTests)(options.include, context.workspaceRoot, projectSourceRoot);
             // early exit, no reason to start karma
             if (!files.length) {

package/src/utils/i18n-options.js

@@ -146,12 +146,12 @@ async function configureI18nBuild(context, options) {
             if (first) {
                 localeDataPath = findLocaleDataPath(first.toLowerCase(), localeResolver);
                 if (localeDataPath) {
-                    context.logger.warn(`Locale data for '${locale}' cannot be found.  Using locale data for '${first}'.`);
+                    context.logger.warn(`Locale data for '${locale}' cannot be found. Using locale data for '${first}'.`);
                 }
             }
         }
         if (!localeDataPath) {
-            context.logger.warn(`Locale data for '${locale}' cannot be found.  No locale data will be included for this locale.`);
+            context.logger.warn(`Locale data for '${locale}' cannot be found. No locale data will be included for this locale.`);
         }
         else {
             desc.dataPath = localeDataPath;
@@ -194,11 +194,8 @@ function findLocaleDataPath(locale, resolver) {
         return resolver(scrubbedLocale);
     }
     catch {
-        if (scrubbedLocale === 'en-US') {
-            // fallback to known existing en-US locale data as of 9.0
-            return findLocaleDataPath('en-US-POSIX', resolver);
-        }
-        return null;
+        // fallback to known existing en-US locale data as of 14.0
+        return scrubbedLocale === 'en-US' ? findLocaleDataPath('en', resolver) : null;
     }
 }
 /** Remove temporary directory used for i18n processing. */

package/src/webpack/configs/common.js

@@ -47,6 +47,7 @@ const named_chunks_plugin_1 = require("../plugins/named-chunks-plugin");
 const progress_plugin_1 = require("../plugins/progress-plugin");
 const transfer_size_plugin_1 = require("../plugins/transfer-size-plugin");
 const typescript_2 = require("../plugins/typescript");
+const watch_files_logs_plugin_1 = require("../plugins/watch-files-logs-plugin");
 const helpers_1 = require("../utils/helpers");
 // eslint-disable-next-line max-lines-per-function
 async function getCommonConfig(wco) {
@@ -143,6 +144,9 @@ async function getCommonConfig(wco) {
             append: hiddenSourceMap ? false : undefined,
         }));
     }
+    if (verbose) {
+        extraPlugins.push(new watch_files_logs_plugin_1.WatchFilesLogsPlugin());
+    }
     if (buildOptions.statsJson) {
         extraPlugins.push(new plugins_1.JsonStatsPlugin(path.resolve(root, buildOptions.outputPath, 'stats.json')));
     }

package/src/webpack/configs/dev-server.js

@@ -270,7 +270,7 @@ function getWebSocketSettings(options, servePath) {
             client: undefined,
         };
     }
-    const webSocketPath = path_1.posix.join(servePath, 'ws');
+    const webSocketPath = path_1.posix.join(servePath, 'ng-cli-ws');
     return {
         webSocketServer: {
             options: {

package/src/webpack/plugins/watch-files-logs-plugin.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+import type { Compiler } from 'webpack';
+export declare class WatchFilesLogsPlugin {
+    apply(compiler: Compiler): void;
+}

package/src/webpack/plugins/watch-files-logs-plugin.js

@@ -0,0 +1,27 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WatchFilesLogsPlugin = void 0;
+const PLUGIN_NAME = 'angular.watch-files-logs-plugin';
+class WatchFilesLogsPlugin {
+    apply(compiler) {
+        compiler.hooks.watchRun.tap(PLUGIN_NAME, ({ modifiedFiles, removedFiles }) => {
+            compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+                const logger = compilation.getLogger(PLUGIN_NAME);
+                if (modifiedFiles === null || modifiedFiles === void 0 ? void 0 : modifiedFiles.size) {
+                    logger.log(`Modified files:\n${[...modifiedFiles].join('\n')}\n`);
+                }
+                if (removedFiles === null || removedFiles === void 0 ? void 0 : removedFiles.size) {
+                    logger.log(`Removed files:\n${[...removedFiles].join('\n')}\n`);
+                }
+            });
+        });
+    }
+}
+exports.WatchFilesLogsPlugin = WatchFilesLogsPlugin;

package/src/webpack/utils/helpers.js

@@ -125,8 +125,8 @@ function getInstrumentationExcludedPaths(sourceRoot, excludedPaths) {
     const excluded = new Set();
     for (const excludeGlob of excludedPaths) {
         glob_1.default
-            .sync(path.join(sourceRoot, excludeGlob), { nodir: true })
-            .forEach((p) => excluded.add(path.normalize(p)));
+            .sync(excludeGlob, { nodir: true, cwd: sourceRoot })
+            .forEach((p) => excluded.add(path.join(sourceRoot, p)));
     }
     return excluded;
 }