@angular-devkit/build-angular 14.0.1 → 14.0.4

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.1",
+  "version": "14.0.4",
   "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.1",
-    "@angular-devkit/build-webpack": "0.1400.1",
-    "@angular-devkit/core": "14.0.1",
+    "@angular-devkit/architect": "0.1400.4",
+    "@angular-devkit/build-webpack": "0.1400.4",
+    "@angular-devkit/core": "14.0.4",
     "@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.1",
+    "@ngtools/webpack": "14.0.4",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",

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/app-shell/index.js

@@ -61,7 +61,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
             deployUrl: browserOptions.deployUrl,
         })
         : undefined;
-    for (const outputPath of browserResult.outputPaths) {
+    for (const { path: outputPath, baseHref } of browserResult.outputs) {
         const localeDirectory = path.relative(browserResult.baseOutputPath, outputPath);
         const browserIndexOutputPath = path.join(outputPath, 'index.html');
         const indexHtml = await fs.promises.readFile(browserIndexOutputPath, 'utf8');
@@ -95,7 +95,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         }
         await fs.promises.writeFile(outputIndexPath, html);
         if (browserOptions.serviceWorker) {
-            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref, browserOptions.ngswConfigPath);
         }
     }
     return browserResult;

package/src/builders/browser/index.d.ts

@@ -17,11 +17,19 @@ import { Schema as BrowserBuilderSchema } from './schema';
  */
 export declare type BrowserBuilderOutput = BuilderOutput & {
     baseOutputPath: string;
+    /**
+     * @deprecated in version 14. Use 'outputs' instead.
+     */
     outputPaths: string[];
     /**
-     * @deprecated in version 9. Use 'outputPaths' instead.
+     * @deprecated in version 9. Use 'outputs' instead.
      */
     outputPath: string;
+    outputs: {
+        locale?: string;
+        path: string;
+        baseHref: string;
+    }[];
 };
 /**
  * Maximum time in milliseconds for single build/rebuild

package/src/builders/browser/index.js

@@ -117,7 +117,9 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     }), (0, operators_1.switchMap)(
     // eslint-disable-next-line max-lines-per-function
     ({ config, projectRoot, projectSourceRoot, i18n, target, cacheOptions }) => {
+        var _a;
         const normalizedOptimization = (0, utils_1.normalizeOptimization)(options.optimization);
+        const defaultBaseHref = (_a = options.baseHref) !== null && _a !== void 0 ? _a : '/';
         return (0, build_webpack_1.runWebpack)(config, context, {
             webpackFactory: require('webpack'),
             logging: transforms.logging ||
@@ -127,7 +129,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     }
                 }),
         }).pipe((0, operators_1.concatMap)(async (buildEvent) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             const spinner = new spinner_1.Spinner();
             spinner.enabled = options.progress !== false;
             const { success, emittedFiles = [], outputPath: webpackOutputPath } = buildEvent;
@@ -216,7 +218,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
                                 const { content, warnings, errors } = await indexHtmlGenerator.process({
-                                    baseHref: getLocaleBaseHref(i18n, locale) || options.baseHref,
+                                    baseHref: getLocaleBaseHref(i18n, locale) || defaultBaseHref,
                                     // i18nLocale is used when Ivy is disabled
                                     lang: locale || undefined,
                                     outputPath,
@@ -252,7 +254,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         spinner.start('Generating service worker...');
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
-                                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
+                                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, (_f = getLocaleBaseHref(i18n, locale)) !== null && _f !== void 0 ? _f : defaultBaseHref, options.ngswConfigPath);
                             }
                             catch (error) {
                                 spinner.fail('Service worker generation failed.');
@@ -270,6 +272,18 @@ function buildWebpackBrowser(options, context, transforms = {}) {
             baseOutputPath,
             outputPath: baseOutputPath,
             outputPaths: (outputPaths && Array.from(outputPaths.values())) || [baseOutputPath],
+            outputs: (outputPaths &&
+                [...outputPaths.entries()].map(([locale, path]) => {
+                    var _a;
+                    return ({
+                        locale,
+                        path,
+                        baseHref: (_a = getLocaleBaseHref(i18n, locale)) !== null && _a !== void 0 ? _a : defaultBaseHref,
+                    });
+                })) || {
+                path: baseOutputPath,
+                baseHref: defaultBaseHref,
+            },
         })));
     }));
     function getLocaleBaseHref(i18n, locale) {

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/builders/server/index.d.ts

@@ -15,11 +15,18 @@ import { Schema as ServerBuilderOptions } from './schema';
  */
 export declare type ServerBuilderOutput = BuilderOutput & {
     baseOutputPath: string;
+    /**
+     * @deprecated in version 14. Use 'outputs' instead.
+     */
     outputPaths: string[];
     /**
-     * @deprecated in version 9. Use 'outputPaths' instead.
+     * @deprecated in version 9. Use 'outputs' instead.
      */
     outputPath: string;
+    outputs: {
+        locale?: string;
+        path: string;
+    }[];
 };
 export { ServerBuilderOptions };
 /**

package/src/builders/server/index.js

@@ -102,6 +102,13 @@ function execute(options, context, transforms = {}) {
             baseOutputPath,
             outputPath: baseOutputPath,
             outputPaths: outputPaths || [baseOutputPath],
+            outputs: (outputPaths &&
+                [...outputPaths.entries()].map(([locale, path]) => ({
+                    locale,
+                    path,
+                }))) || {
+                path: baseOutputPath,
+            },
         };
     }));
 }

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;
@@ -175,13 +175,15 @@ async function configureI18nBuild(context, options) {
     }
     // If inlining store the output in a temporary location to facilitate post-processing
     if (i18n.shouldInline) {
+        // TODO: we should likely save these in the .angular directory in the next major version.
+        // We'd need to do a migration to add the temp directory to gitignore.
         const tempPath = fs_1.default.mkdtempSync(path_1.default.join(fs_1.default.realpathSync(os_1.default.tmpdir()), 'angular-cli-i18n-'));
         buildOptions.outputPath = tempPath;
-        process.on('exit', () => deleteTempDirectory(tempPath));
-        process.once('SIGINT', () => {
-            deleteTempDirectory(tempPath);
-            // Needed due to `ora` as otherwise process will not terminate.
-            process.kill(process.pid, 'SIGINT');
+        process.on('exit', () => {
+            try {
+                fs_1.default.rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
+            }
+            catch { }
         });
     }
     return { buildOptions, i18n };
@@ -194,19 +196,9 @@ 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;
-    }
-}
-/** Remove temporary directory used for i18n processing. */
-function deleteTempDirectory(tempPath) {
-    try {
-        fs_1.default.rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
+        // fallback to known existing en-US locale data as of 14.0
+        return scrubbedLocale === 'en-US' ? findLocaleDataPath('en', resolver) : null;
     }
-    catch { }
 }
 function loadTranslations(locale, desc, workspaceRoot, loader, logger, usedFormats, duplicateTranslation) {
     let translations = undefined;

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

@@ -85,6 +85,10 @@ async function getDevServerConfig(wco) {
                     },
                 ],
             },
+            // When setupExitSignals is enabled webpack-dev-server will shutdown gracefully which would
+            // require CTRL+C to be pressed multiple times to exit.
+            // See: https://github.com/webpack/webpack-dev-server/blob/c76b6d11a3821436c5e20207c8a38deb6ab7e33c/lib/Server.js#L1801-L1827
+            setupExitSignals: false,
             compress: false,
             static: false,
             server: getServerConfig(root, wco.buildOptions),

package/src/webpack/plugins/typescript.js

@@ -20,7 +20,6 @@ function ensureIvy(wco) {
         '\nFor additional information or if the build fails, please see https://angular.io/guide/ivy');
     wco.tsConfig.options.enableIvy = true;
 }
-let es5TargetWarningsShown = false;
 function createIvyPlugin(wco, aot, tsconfig) {
     if (aot) {
         ensureIvy(wco);
@@ -40,10 +39,7 @@ function createIvyPlugin(wco, aot, tsconfig) {
     // as for third-party libraries. This greatly reduces the complexity of static analysis.
     if (wco.scriptTarget < typescript_1.ScriptTarget.ES2015) {
         compilerOptions.target = typescript_1.ScriptTarget.ES2015;
-        if (!es5TargetWarningsShown) {
-            wco.logger.warn('DEPRECATED: ES5 output is deprecated. Please update TypeScript `target` compiler option to ES2015 or later.');
-            es5TargetWarningsShown = true;
-        }
+        wco.logger.warn('DEPRECATED: ES5 output is deprecated. Please update TypeScript `target` compiler option to ES2015 or later.');
     }
     const fileReplacements = {};
     if (buildOptions.fileReplacements) {

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

@@ -16,6 +16,7 @@ export interface HashFormat {
     file: string;
     script: string;
 }
+export declare type WebpackStatsOptions = Exclude<Configuration['stats'], string | boolean | undefined>;
 export declare function getOutputHashFormat(outputHashing?: OutputHashing, length?: number): HashFormat;
 export declare type NormalizedEntryPoint = Required<Exclude<ScriptElement | StyleElement, string>>;
 export declare function normalizeExtraEntryPoints(extraEntryPoints: (ScriptElement | StyleElement)[], defaultBundleName: string): NormalizedEntryPoint[];
@@ -29,7 +30,5 @@ export declare function globalScriptsByBundleName(root: string, scripts: ScriptE
 }[];
 export declare function assetPatterns(root: string, assets: AssetPatternClass[]): ObjectPattern[];
 export declare function externalizePackages(context: string, request: string | undefined, callback: (error?: Error, result?: string) => void): void;
-declare type WebpackStatsOptions = Exclude<Configuration['stats'], string | boolean>;
 export declare function getStatsOptions(verbose?: boolean): WebpackStatsOptions;
 export declare function getMainFieldsAndConditionNames(target: ScriptTarget, platformServer: boolean): Pick<WebpackOptionsNormalized['resolve'], 'mainFields' | 'conditionNames'>;
-export {};

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;
 }
@@ -278,6 +278,7 @@ function getStatsOptions(verbose = false) {
         version: true,
         chunkModules: true,
         errorDetails: true,
+        errorStack: true,
         moduleTrace: true,
         logging: 'verbose',
         modulesSpace: Infinity,

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

@@ -10,6 +10,7 @@ import { logging } from '@angular-devkit/core';
 import { Configuration, StatsCompilation } from 'webpack';
 import { Schema as BrowserBuilderOptions } from '../../builders/browser/schema';
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
+import { WebpackStatsOptions } from './helpers';
 export declare function formatSize(size: number): string;
 export declare type BundleStatsData = [
     files: string,
@@ -29,8 +30,8 @@ export declare function generateBundleStats(info: {
     initial?: boolean;
     rendered?: boolean;
 }): BundleStats;
-export declare function statsWarningsToString(json: StatsCompilation, statsConfig: any): string;
-export declare function statsErrorsToString(json: StatsCompilation, statsConfig: any): string;
+export declare function statsWarningsToString(json: StatsCompilation, statsConfig: WebpackStatsOptions): string;
+export declare function statsErrorsToString(json: StatsCompilation, statsConfig: WebpackStatsOptions): string;
 export declare function statsHasErrors(json: StatsCompilation): boolean;
 export declare function statsHasWarnings(json: StatsCompilation): boolean;
 export declare function createWebpackLoggingCallback(options: BrowserBuilderOptions, logger: logging.LoggerApi): WebpackLoggingCallback;

package/src/webpack/utils/stats.js

@@ -261,7 +261,6 @@ statsConfig, budgetFailures) {
       `));
     }
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function statsWarningsToString(json, statsConfig) {
     const colors = statsConfig.colors;
     const c = (x) => (colors ? color_1.colors.reset.cyan(x) : x);
@@ -294,8 +293,8 @@ function statsWarningsToString(json, statsConfig) {
     return output ? '\n' + output : output;
 }
 exports.statsWarningsToString = statsWarningsToString;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function statsErrorsToString(json, statsConfig) {
+    var _a, _b;
     const colors = statsConfig.colors;
     const c = (x) => (colors ? color_1.colors.reset.cyan(x) : x);
     const yb = (x) => (colors ? color_1.colors.reset.yellowBright(x) : x);
@@ -310,7 +309,16 @@ function statsErrorsToString(json, statsConfig) {
             output += r(`Error: ${error}\n\n`);
         }
         else {
-            const file = error.file || error.moduleName;
+            let file = error.file || error.moduleName;
+            // Clean up error paths
+            // Ex: ./src/app/styles.scss.webpack[javascript/auto]!=!./node_modules/css-loader/dist/cjs.js....
+            // to ./src/app/styles.scss.webpack
+            if (file && !statsConfig.errorDetails) {
+                const webpackPathIndex = file.indexOf('.webpack[');
+                if (webpackPathIndex !== -1) {
+                    file = file.substring(0, webpackPathIndex);
+                }
+            }
             if (file) {
                 output += c(file);
                 if (error.loc) {
@@ -318,10 +326,16 @@ function statsErrorsToString(json, statsConfig) {
                 }
                 output += ' - ';
             }
-            if (!/^error/i.test(error.message)) {
+            // In most cases webpack will add stack traces to error messages.
+            // This below cleans up the error from stacks.
+            // See: https://github.com/webpack/webpack/issues/15980
+            const message = statsConfig.errorStack
+                ? error.message
+                : (_b = (_a = /[\s\S]+?(?=[\n\s]+at)/.exec(error.message)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : error.message;
+            if (!/^error/i.test(message)) {
                 output += r('Error: ');
             }
-            output += `${error.message}\n\n`;
+            output += `${message}\n\n`;
         }
     }
     return output ? '\n' + output : output;
@@ -358,6 +372,9 @@ function createWebpackLoggingCallback(options, logger) {
 exports.createWebpackLoggingCallback = createWebpackLoggingCallback;
 function webpackStatsLogger(logger, json, config, budgetFailures) {
     logger.info(statsToString(json, config.stats, budgetFailures));
+    if (typeof config.stats !== 'object') {
+        throw new Error('Invalid Webpack stats configuration.');
+    }
     if (statsHasWarnings(json)) {
         logger.warn(statsWarningsToString(json, config.stats));
     }