@angular-devkit/build-angular 14.1.0-next.1 → 14.1.0-next.4

package/src/utils/i18n-options.js

@@ -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 };
@@ -198,13 +200,6 @@ function findLocaleDataPath(locale, resolver) {
         return scrubbedLocale === 'en-US' ? findLocaleDataPath('en', resolver) : null;
     }
 }
-/** Remove temporary directory used for i18n processing. */
-function deleteTempDirectory(tempPath) {
-    try {
-        fs_1.default.rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
-    }
-    catch { }
-}
 function loadTranslations(locale, desc, workspaceRoot, loader, logger, usedFormats, duplicateTranslation) {
     let translations = undefined;
     for (const file of desc.files) {

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

@@ -86,6 +86,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/common-js-usage-warn-plugin.js

@@ -12,7 +12,9 @@ const path_1 = require("path");
 const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 // Webpack doesn't export these so the deep imports can potentially break.
 const AMDDefineDependency = require('webpack/lib/dependencies/AMDDefineDependency');
+const CommonJsExportsDependency = require('webpack/lib/dependencies/CommonJsExportsDependency');
 const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency');
+const CommonJsSelfReferenceDependency = require('webpack/lib/dependencies/CommonJsSelfReferenceDependency');
 class CommonJsUsageWarnPlugin {
     constructor(options = {}) {
         this.options = options;
@@ -81,7 +83,10 @@ class CommonJsUsageWarnPlugin {
     }
     hasCommonJsDependencies(compilation, dependencies, checkParentModules = false) {
         for (const dep of dependencies) {
-            if (dep instanceof CommonJsRequireDependency || dep instanceof AMDDefineDependency) {
+            if (dep instanceof CommonJsRequireDependency ||
+                dep instanceof CommonJsExportsDependency ||
+                dep instanceof CommonJsSelfReferenceDependency ||
+                dep instanceof AMDDefineDependency) {
                 return true;
             }
             if (checkParentModules) {

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,11 +16,12 @@ 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[];
 export declare function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath: string) => string;
-export declare function getInstrumentationExcludedPaths(sourceRoot: string, excludedPaths: string[]): Set<string>;
+export declare function getInstrumentationExcludedPaths(root: string, excludedPaths: string[]): Set<string>;
 export declare function getCacheSettings(wco: WebpackConfigOptions, angularVersion: string): WebpackOptionsNormalized['cache'];
 export declare function globalScriptsByBundleName(root: string, scripts: ScriptElement[]): {
     bundleName: string;
@@ -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

@@ -121,12 +121,12 @@ function assetNameTemplateFactory(hashFormat) {
     };
 }
 exports.assetNameTemplateFactory = assetNameTemplateFactory;
-function getInstrumentationExcludedPaths(sourceRoot, excludedPaths) {
+function getInstrumentationExcludedPaths(root, 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: root, root, nomount: true })
+            .forEach((p) => excluded.add(path.join(root, 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));
     }