@angular-devkit/build-angular 14.1.0-next.0 → 14.1.0-next.3

package/src/utils/i18n-inlining.js

@@ -35,6 +35,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const action_executor_1 = require("./action-executor");
 const copy_assets_1 = require("./copy-assets");
+const error_1 = require("./error");
 const spinner_1 = require("./spinner");
 function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, outputPath, es5, missingTranslation, context) {
     const options = [];
@@ -61,6 +62,7 @@ function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emitte
             originalFiles.push(originalMapPath);
         }
         catch (err) {
+            (0, error_1.assertIsError)(err);
             if (err.code !== 'ENOENT') {
                 throw err;
             }
@@ -102,6 +104,7 @@ async function i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPat
         ], outputPaths, '');
     }
     catch (err) {
+        (0, error_1.assertIsError)(err);
         spinner.fail('Localized bundle generation failed: ' + err.message);
         return false;
     }

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/utils/process-bundle.js

@@ -41,6 +41,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const worker_threads_1 = require("worker_threads");
 const environment_options_1 = require("./environment-options");
+const error_1 = require("./error");
 const load_esm_1 = require("./load-esm");
 // Lazy loaded webpack-sources object
 // Webpack is only imported if needed during the processing
@@ -124,14 +125,13 @@ async function inlineLocales(options) {
         });
     }
     catch (error) {
-        if (error.message) {
-            // Make the error more readable.
-            // Same errors will contain the full content of the file as the error message
-            // Which makes it hard to find the actual error message.
-            const index = error.message.indexOf(')\n');
-            const msg = index !== -1 ? error.message.slice(0, index + 1) : error.message;
-            throw new Error(`${msg}\nAn error occurred inlining file "${options.filename}"`);
-        }
+        (0, error_1.assertIsError)(error);
+        // Make the error more readable.
+        // Same errors will contain the full content of the file as the error message
+        // Which makes it hard to find the actual error message.
+        const index = error.message.indexOf(')\n');
+        const msg = index !== -1 ? error.message.slice(0, index + 1) : error.message;
+        throw new Error(`${msg}\nAn error occurred inlining file "${options.filename}"`);
     }
     if (!ast) {
         throw new Error(`Unknown error occurred inlining file "${options.filename}"`);

package/src/utils/service-worker.js

@@ -35,6 +35,7 @@ const crypto = __importStar(require("crypto"));
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const stream_1 = require("stream");
+const error_1 = require("./error");
 const load_esm_1 = require("./load-esm");
 class CliFilesystem {
     constructor(base) {
@@ -87,6 +88,7 @@ async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, b
         config = JSON.parse(configurationData);
     }
     catch (error) {
+        (0, error_1.assertIsError)(error);
         if (error.code === 'ENOENT') {
             throw new Error('Error: Expected to find an ngsw-config.json configuration file' +
                 ` in the ${appRoot} folder. Either provide one or` +
@@ -117,6 +119,7 @@ async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, b
         await fs_1.promises.copyFile(safetyPath, path.join(outputPath, 'safety-worker.js'), fs_1.constants.COPYFILE_FICLONE);
     }
     catch (error) {
+        (0, error_1.assertIsError)(error);
         if (error.code !== 'ENOENT') {
             throw error;
         }

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

@@ -35,6 +35,7 @@ const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const url_1 = require("url");
+const error_1 = require("../../utils/error");
 const load_esm_1 = require("../../utils/load-esm");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const hmr_loader_1 = require("../plugins/hmr/hmr-loader");
@@ -85,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),
@@ -187,6 +192,7 @@ async function addProxyConfig(root, proxyConfig) {
                 return require(proxyPath);
             }
             catch (e) {
+                (0, error_1.assertIsError)(e);
                 if (e.code === 'ERR_REQUIRE_ESM') {
                     // Load the ESM configuration file using the TypeScript dynamic import workaround.
                     // Once TypeScript provides support for keeping the dynamic import this workaround can be

package/src/webpack/plugins/index-html-webpack-plugin.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexHtmlWebpackPlugin = void 0;
 const path_1 = require("path");
 const webpack_1 = require("webpack");
+const error_1 = require("../../utils/error");
 const index_html_generator_1 = require("../../utils/index-file/index-html-generator");
 const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 const PLUGIN_NAME = 'index-html-webpack-plugin';
@@ -58,6 +59,7 @@ class IndexHtmlWebpackPlugin extends index_html_generator_1.IndexHtmlGenerator {
                 errors.forEach((msg) => (0, webpack_diagnostics_1.addError)(this.compilation, msg));
             }
             catch (error) {
+                (0, error_1.assertIsError)(error);
                 (0, webpack_diagnostics_1.addError)(this.compilation, error.message);
             }
         };

package/src/webpack/plugins/json-stats-plugin.js

@@ -33,6 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonStatsPlugin = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const error_1 = require("../../utils/error");
 const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 class JsonStatsPlugin {
     constructor(statsOutputPath) {
@@ -50,6 +51,7 @@ class JsonStatsPlugin {
                     .on('error', reject));
             }
             catch (error) {
+                (0, error_1.assertIsError)(error);
                 (0, webpack_diagnostics_1.addError)(stats.compilation, `Unable to write stats file: ${error.message || 'unknown error'}`);
             }
         });

package/src/webpack/plugins/postcss-cli-resources.js

@@ -34,6 +34,7 @@ exports.postcss = void 0;
 const loader_utils_1 = require("loader-utils");
 const path = __importStar(require("path"));
 const url = __importStar(require("url"));
+const error_1 = require("../../utils/error");
 function wrapUrl(url) {
     let wrappedUrl;
     const hasSingleQuotes = url.indexOf("'") >= 0;
@@ -146,6 +147,7 @@ function default_1(options) {
                     processedUrl = await process(originalUrl, context, resourceCache);
                 }
                 catch (err) {
+                    (0, error_1.assertIsError)(err);
                     loader.emitError(decl.error(err.message, { word: originalUrl }));
                     continue;
                 }

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));
     }