@angular-devkit/build-angular 13.0.0-next.8 → 13.0.0-rc.2

package/package.json

@@ -1,79 +1,78 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.0.0-next.8",
+  "version": "13.0.0-rc.2",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.0.1",
-    "@angular-devkit/architect": "0.1300.0-next.8",
-    "@angular-devkit/build-webpack": "0.1300.0-next.8",
-    "@angular-devkit/core": "13.0.0-next.8",
-    "@babel/core": "7.15.5",
-    "@babel/generator": "7.15.4",
+    "@angular-devkit/architect": "0.1300.0-rc.2",
+    "@angular-devkit/build-webpack": "0.1300.0-rc.2",
+    "@angular-devkit/core": "13.0.0-rc.2",
+    "@babel/core": "7.15.8",
+    "@babel/generator": "7.15.8",
     "@babel/helper-annotate-as-pure": "7.15.4",
-    "@babel/plugin-proposal-async-generator-functions": "7.15.4",
+    "@babel/plugin-proposal-async-generator-functions": "7.15.8",
     "@babel/plugin-transform-async-to-generator": "7.14.5",
-    "@babel/plugin-transform-runtime": "7.15.0",
-    "@babel/preset-env": "7.15.6",
+    "@babel/plugin-transform-runtime": "7.15.8",
+    "@babel/preset-env": "7.15.8",
     "@babel/runtime": "7.15.4",
     "@babel/template": "7.15.4",
     "@discoveryjs/json-ext": "0.5.5",
-    "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@ngtools/webpack": "13.0.0-next.8",
+    "@ngtools/webpack": "13.0.0-rc.2",
     "ansi-colors": "4.1.1",
-    "babel-loader": "8.2.2",
+    "babel-loader": "8.2.3",
+    "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
     "cacache": "15.3.0",
     "caniuse-lite": "^1.0.30001032",
     "circular-dependency-plugin": "5.2.2",
     "copy-webpack-plugin": "9.0.1",
-    "core-js": "3.18.1",
-    "critters": "0.0.10",
-    "css-loader": "6.3.0",
-    "esbuild-wasm": "0.13.3",
-    "find-cache-dir": "3.3.2",
+    "core-js": "3.19.0",
+    "critters": "0.0.14",
+    "css-loader": "6.5.0",
+    "esbuild-wasm": "0.13.9",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
-    "inquirer": "8.1.5",
+    "inquirer": "8.2.0",
     "karma-source-map-support": "1.4.0",
-    "less": "4.1.1",
-    "less-loader": "10.0.1",
-    "license-webpack-plugin": "2.3.21",
-    "loader-utils": "2.0.0",
-    "mini-css-extract-plugin": "2.3.0",
+    "less": "4.1.2",
+    "less-loader": "10.2.0",
+    "license-webpack-plugin": "3.0.0",
+    "loader-utils": "3.0.0",
+    "mini-css-extract-plugin": "2.4.3",
     "minimatch": "3.0.4",
-    "open": "8.2.1",
+    "open": "8.4.0",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
     "piscina": "3.1.0",
-    "postcss": "8.3.8",
+    "postcss": "8.3.11",
     "postcss-import": "14.0.2",
-    "postcss-loader": "6.1.1",
+    "postcss-loader": "6.2.0",
     "postcss-preset-env": "6.7.0",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "4.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.42.1",
-    "sass-loader": "12.1.0",
+    "sass": "1.43.4",
+    "sass-loader": "12.2.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.0",
     "source-map-support": "0.5.20",
     "stylus": "0.55.0",
-    "stylus-loader": "6.1.0",
+    "stylus-loader": "6.2.0",
     "terser": "5.9.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.55.1",
+    "webpack": "5.60.0",
     "webpack-dev-middleware": "5.2.1",
-    "webpack-dev-server": "4.3.0",
+    "webpack-dev-server": "4.3.1",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.0.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.13.3"
+    "esbuild": "0.13.9"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^13.0.0 || ^13.0.0-next",
@@ -117,8 +116,8 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.20.0 || >=14.0.0",
-    "npm": "^6.11.0 || ^7.5.6",
+    "node": "^12.20.0 || ^14.15.0 || >=16.10.0",
+    "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

package/src/babel/babel-loader.d.ts

@@ -7,9 +7,7 @@
  */
 
 declare module 'babel-loader' {
-  type BabelLoaderCustomizer<T> = (
-    babel: typeof import('@babel/core'),
-  ) => {
+  type BabelLoaderCustomizer<T> = (babel: typeof import('@babel/core')) => {
     customOptions?(
       this: import('webpack').loader.LoaderContext,
       loaderOptions: Record<string, unknown>,
@@ -20,6 +18,17 @@ declare module 'babel-loader' {
       configuration: import('@babel/core').PartialConfig,
       loaderArguments: { source: string; map?: unknown; customOptions: T },
     ): import('@babel/core').TransformOptions;
+    result?(
+      this: import('webpack').loader.LoaderContext,
+      result: import('@babel/core').BabelFileResult,
+      context: {
+        source: string;
+        map?: unknown;
+        customOptions: T;
+        configuration: import('@babel/core').PartialConfig;
+        options: import('@babel/core').TransformOptions;
+      },
+    ): import('@babel/core').BabelFileResult;
   };
   function custom<T>(customizer: BabelLoaderCustomizer<T>): import('webpack').loader.Loader;
 }

package/src/babel/presets/application.d.ts

@@ -32,6 +32,14 @@ export interface ApplicationPresetOptions {
     };
     forceES5?: boolean;
     forceAsyncTransformation?: boolean;
+    instrumentCode?: {
+        includedBasePath: string;
+    };
+    optimize?: {
+        looseEnums: boolean;
+        pureTopLevel: boolean;
+        wrapDecorators: boolean;
+    };
     diagnosticReporter?: DiagnosticReporter;
 }
 export default function (api: unknown, options: ApplicationPresetOptions): {

package/src/babel/presets/application.js

@@ -145,6 +145,24 @@ function default_1(api, options) {
         plugins.push(require('@babel/plugin-transform-async-to-generator').default, require('@babel/plugin-proposal-async-generator-functions').default);
         needRuntimeTransform = true;
     }
+    if (options.optimize) {
+        if (options.optimize.pureTopLevel) {
+            plugins.push(require('../plugins/pure-toplevel-functions').default);
+        }
+        plugins.push(require('../plugins/elide-angular-metadata').default, [
+            require('../plugins/adjust-typescript-enums').default,
+            { loose: options.optimize.looseEnums },
+        ], [
+            require('../plugins/adjust-static-class-members').default,
+            { wrapDecorators: options.optimize.wrapDecorators },
+        ]);
+    }
+    if (options.instrumentCode) {
+        plugins.push([
+            require('babel-plugin-istanbul').default,
+            { inputSourceMap: false, cwd: options.instrumentCode.includedBasePath },
+        ]);
+    }
     if (needRuntimeTransform) {
         // Babel equivalent to TypeScript's `importHelpers` option
         plugins.push([

package/src/babel/webpack-loader.d.ts

@@ -5,5 +5,14 @@
  * 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 { ApplicationPresetOptions } from './presets/application';
+interface AngularCustomOptions extends Omit<ApplicationPresetOptions, 'instrumentCode'> {
+    instrumentCode?: {
+        /** node_modules and test files are always excluded. */
+        excludedPaths: Set<String>;
+        includedBasePath: string;
+    };
+}
+export declare type AngularBabelLoaderOptions = AngularCustomOptions & Record<string, unknown>;
 declare const _default: any;
 export default _default;

package/src/babel/webpack-loader.js

@@ -6,7 +6,11 @@
  * 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
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const remapping_1 = __importDefault(require("@ampproject/remapping"));
 const babel_loader_1 = require("babel-loader");
 const typescript_1 = require("typescript");
 const load_esm_1 = require("../utils/load-esm");
@@ -47,8 +51,9 @@ exports.default = (0, babel_loader_1.custom)(() => {
         inputSourceMap: false,
     });
     return {
-        async customOptions({ i18n, scriptTarget, aot, optimize, ...rawOptions }, { source }) {
+        async customOptions(options, { source }) {
             var _a, _b;
+            const { i18n, scriptTarget, aot, optimize, instrumentCode, ...rawOptions } = options;
             // Must process file if plugins are added
             let shouldProcess = Array.isArray(rawOptions.plugins) && rawOptions.plugins.length > 0;
             const customOptions = {
@@ -56,6 +61,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 forceES5: false,
                 angularLinker: undefined,
                 i18n: undefined,
+                instrumentCode: undefined,
             };
             // Analyze file for linking
             if (await requiresLinking(this.resourcePath, source)) {
@@ -87,7 +93,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                     customOptions.forceAsyncTransformation =
                         !/[\\/][_f]?esm2015[\\/]/.test(this.resourcePath) && source.includes('async');
                 }
-                shouldProcess || (shouldProcess = customOptions.forceAsyncTransformation || customOptions.forceES5);
+                shouldProcess || (shouldProcess = customOptions.forceAsyncTransformation || customOptions.forceES5 || false);
             }
             // Analyze for i18n inlining
             if (i18n &&
@@ -127,6 +133,16 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 };
                 shouldProcess = true;
             }
+            if (instrumentCode &&
+                !instrumentCode.excludedPaths.has(this.resourcePath) &&
+                !/\.(e2e|spec)\.tsx?$|[\\/]node_modules[\\/]/.test(this.resourcePath) &&
+                this.resourcePath.startsWith(instrumentCode.includedBasePath)) {
+                // `babel-plugin-istanbul` has it's own includes but we do the below so that we avoid running the the loader.
+                customOptions.instrumentCode = {
+                    includedBasePath: instrumentCode.includedBasePath,
+                };
+                shouldProcess = true;
+            }
             // Add provided loader options to default base options
             const loaderOptions = {
                 ...baseOptions,
@@ -146,27 +162,12 @@ exports.default = (0, babel_loader_1.custom)(() => {
             return { custom: customOptions, loader: loaderOptions };
         },
         config(configuration, { customOptions }) {
-            var _a;
-            const plugins = (_a = configuration.options.plugins) !== null && _a !== void 0 ? _a : [];
-            if (customOptions.optimize) {
-                if (customOptions.optimize.pureTopLevel) {
-                    plugins.push(require('./plugins/pure-toplevel-functions').default);
-                }
-                plugins.push(require('./plugins/elide-angular-metadata').default, [
-                    require('./plugins/adjust-typescript-enums').default,
-                    { loose: customOptions.optimize.looseEnums },
-                ], [
-                    require('./plugins/adjust-static-class-members').default,
-                    { wrapDecorators: customOptions.optimize.wrapDecorators },
-                ]);
-            }
             return {
                 ...configuration.options,
-                // Workaround for https://github.com/babel/babel-loader/pull/896 is available
-                // Delete once the above PR is released
+                // Using `false` disables babel from attempting to locate sourcemaps or process any inline maps.
+                // The babel types do not include the false option even though it is valid
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                inputSourceMap: configuration.options.inputSourceMap || false,
-                plugins,
+                inputSourceMap: false,
                 presets: [
                     ...(configuration.options.presets || []),
                     [
@@ -190,5 +191,16 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 ],
             };
         },
+        result(result, { map: inputSourceMap }) {
+            if (result.map && inputSourceMap) {
+                // Merge the intermediate sourcemap generated by babel with the input source map.
+                // The casting is required due to slight differences in the types for babel and
+                // `@ampproject/remapping` source map objects but both are compatible with Webpack.
+                // This method for merging is used because it provides more accurate output
+                // and is faster while using less memory.
+                result.map = (0, remapping_1.default)([result.map, inputSourceMap], () => null);
+            }
+            return result;
+        },
     };
 });

package/src/builders/app-shell/index.js

@@ -91,7 +91,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         }
         await fs.promises.writeFile(outputIndexPath, html);
         if (browserOptions.serviceWorker) {
-            await (0, service_worker_1.augmentAppWithServiceWorker)((0, core_1.normalize)(root), projectRoot, (0, core_1.normalize)(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, (0, core_1.normalize)(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
         }
     }
     return browserResult;

package/src/builders/browser/index.js

@@ -41,6 +41,7 @@ const color_1 = require("../../utils/color");
 const copy_assets_1 = require("../../utils/copy-assets");
 const i18n_inlining_1 = require("../../utils/i18n-inlining");
 const index_html_generator_1 = require("../../utils/index-file/index-html-generator");
+const normalize_cache_1 = require("../../utils/normalize-cache");
 const output_paths_1 = require("../../utils/output-paths");
 const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
 const service_worker_1 = require("../../utils/service-worker");
@@ -102,10 +103,13 @@ function buildWebpackBrowser(options, context, transforms = {}) {
         const sysProjectRoot = (0, core_1.getSystemPath)((0, core_1.resolve)((0, core_1.normalize)(context.workspaceRoot), (0, core_1.normalize)((_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '')));
         const buildBrowserFeatures = new utils_1.BuildBrowserFeatures(sysProjectRoot);
         checkInternetExplorerSupport(buildBrowserFeatures.supportedBrowsers, context.logger);
-        return initialize(options, context, transforms.webpackConfiguration);
+        return {
+            ...(await initialize(options, context, transforms.webpackConfiguration)),
+            cacheOptions: (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, context.workspaceRoot),
+        };
     }), (0, operators_1.switchMap)(
     // eslint-disable-next-line max-lines-per-function
-    ({ config, projectRoot, projectSourceRoot, i18n, target }) => {
+    ({ config, projectRoot, projectSourceRoot, i18n, target, cacheOptions }) => {
         const normalizedOptimization = (0, utils_1.normalizeOptimization)(options.optimization);
         return (0, build_webpack_1.runWebpack)(config, context, {
             webpackFactory: require('webpack'),
@@ -191,6 +195,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                             styles: (_e = options.styles) !== null && _e !== void 0 ? _e : [],
                         });
                         const indexHtmlGenerator = new index_html_generator_1.IndexHtmlGenerator({
+                            cache: cacheOptions,
                             indexPath: path.join(context.workspaceRoot, (0, webpack_browser_config_1.getIndexInputFile)(options.index)),
                             entrypoints,
                             deployUrl: options.deployUrl,
@@ -239,7 +244,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)(root, (0, core_1.normalize)(projectRoot), (0, core_1.normalize)(outputPath), getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
+                                await (0, service_worker_1.augmentAppWithServiceWorker)((0, core_1.normalize)(projectRoot), (0, core_1.normalize)(outputPath), getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
                             }
                             catch (error) {
                                 spinner.fail('Service worker generation failed.');

package/src/builders/dev-server/index.js

@@ -35,9 +35,9 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const url = __importStar(require("url"));
 const utils_1 = require("../../utils");
-const cache_path_1 = require("../../utils/cache-path");
 const check_port_1 = require("../../utils/check-port");
 const color_1 = require("../../utils/color");
+const normalize_cache_1 = require("../../utils/normalize-cache");
 const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
 const version_1 = require("../../utils/version");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
@@ -61,8 +61,12 @@ function serveWebpackBrowser(options, context, transforms = {}) {
     (0, version_1.assertCompatibleAngularVersion)(workspaceRoot);
     const browserTarget = (0, architect_1.targetFromTargetString)(options.browserTarget);
     async function setup() {
-        var _a;
-        options.port = await (0, check_port_1.checkPort)((_a = options.port) !== null && _a !== void 0 ? _a : 4200, options.host || 'localhost');
+        var _a, _b, _c, _d;
+        const projectName = (_a = context.target) === null || _a === void 0 ? void 0 : _a.project;
+        if (!projectName) {
+            throw new Error('The builder requires a target.');
+        }
+        options.port = await (0, check_port_1.checkPort)((_b = options.port) !== null && _b !== void 0 ? _b : 4200, options.host || 'localhost');
         if (options.hmr) {
             logger.warn(core_1.tags.stripIndents `NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.
       See https://webpack.js.org/guides/hot-module-replacement for information on working with HMR for Webpack.`);
@@ -96,6 +100,8 @@ function serveWebpackBrowser(options, context, transforms = {}) {
             rawBrowserOptions.outputHashing = schema_1.OutputHashing.None;
             logger.warn(`Warning: 'outputHashing' option is disabled when using the dev-server.`);
         }
+        const metadata = await context.getProjectMetadata(projectName);
+        const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot);
         const browserName = await context.getBuilderNameForTarget(browserTarget);
         const browserOptions = (await context.validateOptions({
             ...rawBrowserOptions,
@@ -143,20 +149,11 @@ function serveWebpackBrowser(options, context, transforms = {}) {
             if (i18n.inlineLocales.size > 1) {
                 throw new Error('The development server only supports localizing a single locale per build.');
             }
-            await setupLocalize(locale, i18n, browserOptions, webpackConfig);
+            await setupLocalize(locale, i18n, browserOptions, webpackConfig, cacheOptions);
         }
         if (transforms.webpackConfiguration) {
             webpackConfig = await transforms.webpackConfiguration(webpackConfig);
         }
-        return {
-            browserOptions,
-            webpackConfig,
-            projectRoot,
-            locale,
-        };
-    }
-    return (0, rxjs_1.from)(setup()).pipe((0, operators_1.switchMap)(({ browserOptions, webpackConfig, locale }) => {
-        var _a, _b;
         if (browserOptions.index) {
             const { scripts = [], styles = [], baseHref } = browserOptions;
             const entrypoints = (0, package_chunk_sort_1.generateEntryPoints)({
@@ -165,9 +162,9 @@ function serveWebpackBrowser(options, context, transforms = {}) {
                 // The below is needed as otherwise HMR for CSS will break.
                 // styles.js and runtime.js needs to be loaded as a non-module scripts as otherwise `document.currentScript` will be null.
                 // https://github.com/webpack-contrib/mini-css-extract-plugin/blob/90445dd1d81da0c10b9b0e8a17b417d0651816b8/src/hmr/hotModuleReplacement.js#L39
-                isHMREnabled: !!((_a = webpackConfig.devServer) === null || _a === void 0 ? void 0 : _a.hot),
+                isHMREnabled: !!((_c = webpackConfig.devServer) === null || _c === void 0 ? void 0 : _c.hot),
             });
-            (_b = webpackConfig.plugins) !== null && _b !== void 0 ? _b : (webpackConfig.plugins = []);
+            (_d = webpackConfig.plugins) !== null && _d !== void 0 ? _d : (webpackConfig.plugins = []);
             webpackConfig.plugins.push(new index_html_webpack_plugin_1.IndexHtmlWebpackPlugin({
                 indexPath: path.resolve(workspaceRoot, (0, webpack_browser_config_1.getIndexInputFile)(browserOptions.index)),
                 outputPath: (0, webpack_browser_config_1.getIndexOutputFile)(browserOptions.index),
@@ -175,12 +172,20 @@ function serveWebpackBrowser(options, context, transforms = {}) {
                 entrypoints,
                 deployUrl: browserOptions.deployUrl,
                 sri: browserOptions.subresourceIntegrity,
+                cache: cacheOptions,
                 postTransform: transforms.indexHtml,
                 optimization: (0, utils_1.normalizeOptimization)(browserOptions.optimization),
                 crossOrigin: browserOptions.crossOrigin,
                 lang: locale,
             }));
         }
+        return {
+            browserOptions,
+            webpackConfig,
+            projectRoot,
+        };
+    }
+    return (0, rxjs_1.from)(setup()).pipe((0, operators_1.switchMap)(({ browserOptions, webpackConfig }) => {
         return (0, build_webpack_1.runWebpackDevServer)(webpackConfig, context, {
             logging: transforms.logging || (0, stats_1.createWebpackLoggingCallback)(browserOptions, logger),
             webpackFactory: require('webpack'),
@@ -211,12 +216,15 @@ function serveWebpackBrowser(options, context, transforms = {}) {
             if (buildEvent.success) {
                 logger.info(`\n${color_1.colors.greenBright(color_1.colors.symbols.check)} Compiled successfully.`);
             }
+            else {
+                logger.info(`\n${color_1.colors.redBright(color_1.colors.symbols.cross)} Failed to compile.`);
+            }
             return { ...buildEvent, baseUrl: serverAddress };
         }));
     }));
 }
 exports.serveWebpackBrowser = serveWebpackBrowser;
-async function setupLocalize(locale, i18n, browserOptions, webpackConfig) {
+async function setupLocalize(locale, i18n, browserOptions, webpackConfig, cacheOptions) {
     var _a;
     const localeDescription = i18n.locales[locale];
     // Modify main entrypoint to include locale data
@@ -252,7 +260,8 @@ async function setupLocalize(locale, i18n, browserOptions, webpackConfig) {
             {
                 loader: require.resolve('../../babel/webpack-loader'),
                 options: {
-                    cacheDirectory: (0, cache_path_1.findCachePath)('babel-dev-server-i18n'),
+                    cacheDirectory: (cacheOptions.enabled && path.join(cacheOptions.path, 'babel-dev-server-i18n')) ||
+                        false,
                     cacheIdentifier: JSON.stringify({
                         locale,
                         translationIntegrity: localeDescription === null || localeDescription === void 0 ? void 0 : localeDescription.files.map((file) => file.integrity),

package/src/builders/ng-packagr/index.js

@@ -31,19 +31,31 @@ const architect_1 = require("@angular-devkit/architect");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-async function initialize(options, root) {
-    const packager = (await Promise.resolve().then(() => __importStar(require('ng-packagr')))).ngPackagr();
-    packager.forProject((0, path_1.resolve)(root, options.project));
-    if (options.tsConfig) {
-        packager.withTsConfig((0, path_1.resolve)(root, options.tsConfig));
-    }
-    return packager;
-}
+const normalize_cache_1 = require("../../utils/normalize-cache");
 /**
  * @experimental Direct usage of this function is considered experimental.
  */
 function execute(options, context) {
-    return (0, rxjs_1.from)(initialize(options, context.workspaceRoot)).pipe((0, operators_1.switchMap)((packager) => (options.watch ? packager.watch() : packager.build())), (0, operators_1.mapTo)({ success: true }), (0, operators_1.catchError)((err) => (0, rxjs_1.of)({ success: false, error: err.message })));
+    return (0, rxjs_1.from)((async () => {
+        var _a;
+        const root = context.workspaceRoot;
+        const packager = (await Promise.resolve().then(() => __importStar(require('ng-packagr')))).ngPackagr();
+        packager.forProject((0, path_1.resolve)(root, options.project));
+        if (options.tsConfig) {
+            packager.withTsConfig((0, path_1.resolve)(root, options.tsConfig));
+        }
+        const projectName = (_a = context.target) === null || _a === void 0 ? void 0 : _a.project;
+        if (!projectName) {
+            throw new Error('The builder requires a target.');
+        }
+        const metadata = await context.getProjectMetadata(projectName);
+        const { enabled: cacheEnabled, path: cacheDirectory } = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot);
+        const ngPackagrOptions = {
+            cacheEnabled,
+            cacheDirectory: (0, path_1.join)(cacheDirectory, 'ng-packagr'),
+        };
+        return { packager, ngPackagrOptions };
+    })()).pipe((0, operators_1.switchMap)(({ packager, ngPackagrOptions }) => options.watch ? packager.watch(ngPackagrOptions) : packager.build(ngPackagrOptions)), (0, operators_1.mapTo)({ success: true }), (0, operators_1.catchError)((err) => (0, rxjs_1.of)({ success: false, error: err.message })));
 }
 exports.execute = execute;
 exports.default = (0, architect_1.createBuilder)(execute);

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

@@ -9,6 +9,7 @@ import { logging } from '@angular-devkit/core';
 import type { ParsedConfiguration } from '@angular/compiler-cli';
 import { AssetPatternClass, Budget, CrossOrigin, ExtraEntryPoint, I18NMissingTranslation, IndexUnion, InlineStyleLanguage, Localize, 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';
 import { NormalizedOptimizationOptions } from './normalize-optimization';
 export interface BuildOptions {
@@ -57,6 +58,7 @@ export interface BuildOptions {
     fileReplacements: NormalizedFileReplacement[];
     inlineStyleLanguage?: InlineStyleLanguage;
     allowedCommonJsDependencies?: string[];
+    cache: NormalizedCachedOptions;
 }
 export interface WebpackTestOptions extends BuildOptions {
     codeCoverage?: boolean;
@@ -73,4 +75,5 @@ export interface WebpackConfigOptions<T = BuildOptions> {
     tsConfig: ParsedConfiguration;
     tsConfigPath: string;
     scriptTarget: import('typescript').ScriptTarget;
+    projectName: string;
 }

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

@@ -8,8 +8,6 @@
 export declare const allowMangle: boolean;
 export declare const shouldBeautify: boolean;
 export declare const allowMinify: boolean;
-export declare const cachingDisabled: boolean;
-export declare const cachingBasePath: string | null;
-export declare const persistentBuildCacheEnabled: boolean;
 export declare const profilingEnabled: boolean;
 export declare const maxWorkers: number;
+export declare const cachingDisabled: boolean | null;

package/src/utils/environment-options.js

@@ -6,28 +6,9 @@
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maxWorkers = exports.profilingEnabled = exports.persistentBuildCacheEnabled = exports.cachingBasePath = exports.cachingDisabled = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
-const path = __importStar(require("path"));
+exports.cachingDisabled = exports.maxWorkers = exports.profilingEnabled = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
+const color_1 = require("./color");
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
 }
@@ -76,23 +57,6 @@ exports.allowMangle = isPresent(mangleVariable)
     : debugOptimize.mangle;
 exports.shouldBeautify = debugOptimize.beautify;
 exports.allowMinify = debugOptimize.minify;
-// Build cache
-const cacheVariable = process.env['NG_BUILD_CACHE'];
-exports.cachingDisabled = isPresent(cacheVariable) && isDisabled(cacheVariable);
-exports.cachingBasePath = (() => {
-    if (exports.cachingDisabled || !isPresent(cacheVariable) || isEnabled(cacheVariable)) {
-        return null;
-    }
-    if (!path.isAbsolute(cacheVariable)) {
-        throw new Error('NG_BUILD_CACHE path value must be absolute.');
-    }
-    return cacheVariable;
-})();
-// Persistent build cache
-const persistentBuildCacheVariable = process.env['NG_PERSISTENT_BUILD_CACHE'];
-exports.persistentBuildCacheEnabled = !exports.cachingDisabled &&
-    isPresent(persistentBuildCacheVariable) &&
-    isEnabled(persistentBuildCacheVariable);
 // Build profiling
 const profilingVariable = process.env['NG_BUILD_PROFILING'];
 exports.profilingEnabled = isPresent(profilingVariable) && isEnabled(profilingVariable);
@@ -107,3 +71,14 @@ exports.profilingEnabled = isPresent(profilingVariable) && isEnabled(profilingVa
  */
 const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
 exports.maxWorkers = isPresent(maxWorkersVariable) ? +maxWorkersVariable : 4;
+// Build cache
+const cacheVariable = process.env['NG_BUILD_CACHE'];
+exports.cachingDisabled = (() => {
+    if (!isPresent(cacheVariable)) {
+        return null;
+    }
+    // eslint-disable-next-line no-console
+    console.warn(color_1.colors.yellow(`Warning: 'NG_BUILD_CACHE' environment variable support will be removed in version 14.\n` +
+        `Configure 'cli.cache' in the workspace configuration instead.`));
+    return isDisabled(cacheVariable);
+})();

package/src/utils/index-file/index-html-generator.d.ts

@@ -5,6 +5,7 @@
  * 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 { NormalizedCachedOptions } from '../normalize-cache';
 import { NormalizedOptimizationOptions } from '../normalize-optimization';
 import { CrossOriginValue, Entrypoint, FileInfo } from './augment-index-html';
 export interface IndexHtmlGeneratorProcessOptions {
@@ -21,6 +22,7 @@ export interface IndexHtmlGeneratorOptions {
     postTransform?: IndexHtmlTransform;
     crossOrigin?: CrossOriginValue;
     optimization?: NormalizedOptimizationOptions;
+    cache?: NormalizedCachedOptions;
 }
 export declare type IndexHtmlTransform = (content: string) => Promise<string>;
 export interface IndexHtmlTransformResult {

package/src/utils/index-file/inline-fonts.d.ts

@@ -5,11 +5,14 @@
  * 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 { NormalizedCachedOptions } from '../normalize-cache';
 export interface InlineFontsOptions {
     minify?: boolean;
+    cache?: NormalizedCachedOptions;
 }
 export declare class InlineFontsProcessor {
     private options;
+    private readonly cachePath;
     constructor(options: InlineFontsOptions);
     process(content: string): Promise<string>;
     private getResponse;

package/src/utils/index-file/inline-fonts.js

@@ -34,13 +34,9 @@ const cacache = __importStar(require("cacache"));
 const fs = __importStar(require("fs"));
 const https = __importStar(require("https"));
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
+const path_1 = require("path");
 const url_1 = require("url");
-const cache_path_1 = require("../cache-path");
-const environment_options_1 = require("../environment-options");
 const html_rewriting_stream_1 = require("./html-rewriting-stream");
-const cacheFontsPath = environment_options_1.cachingDisabled
-    ? undefined
-    : (0, cache_path_1.findCachePath)('angular-build-fonts');
 const packageVersion = require('../../../package.json').version;
 const SUPPORTED_PROVIDERS = {
     'fonts.googleapis.com': {
@@ -53,6 +49,10 @@ const SUPPORTED_PROVIDERS = {
 class InlineFontsProcessor {
     constructor(options) {
         this.options = options;
+        const { path: cacheDirectory, enabled } = this.options.cache || {};
+        if (cacheDirectory && enabled) {
+            this.cachePath = (0, path_1.join)(cacheDirectory, 'angular-build-fonts');
+        }
     }
     async process(content) {
         var _a;
@@ -147,8 +147,8 @@ class InlineFontsProcessor {
     async getResponse(url) {
         var _a;
         const key = `${packageVersion}|${url}`;
-        if (cacheFontsPath) {
-            const entry = await cacache.get.info(cacheFontsPath, key);
+        if (this.cachePath) {
+            const entry = await cacache.get.info(this.cachePath, key);
             if (entry) {
                 return fs.promises.readFile(entry.path, 'utf8');
             }
@@ -177,8 +177,8 @@ class InlineFontsProcessor {
                 .on('error', (e) => reject(new Error(`Inlining of fonts failed. An error has occurred while retrieving ${url} over the internet.\n` +
                 e.message)));
         });
-        if (cacheFontsPath) {
-            await cacache.put(cacheFontsPath, key, data);
+        if (this.cachePath) {
+            await cacache.put(this.cachePath, key, data);
         }
         return data;
     }

package/src/utils/normalize-builder-schema.d.ts

@@ -5,7 +5,7 @@
  * 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 { Path } from '@angular-devkit/core';
+import { Path, json } from '@angular-devkit/core';
 import { AssetPatternClass, Schema as BrowserBuilderSchema, SourceMapClass } from '../builders/browser/schema';
 import { BuildOptions } from './build-options';
 import { NormalizedFileReplacement } from './normalize-file-replacements';
@@ -19,4 +19,4 @@ export declare type NormalizedBrowserBuilderSchema = BrowserBuilderSchema & Buil
     fileReplacements: NormalizedFileReplacement[];
     optimization: NormalizedOptimizationOptions;
 };
-export declare function normalizeBrowserSchema(root: Path, projectRoot: Path, sourceRoot: Path | undefined, options: BrowserBuilderSchema): NormalizedBrowserBuilderSchema;
+export declare function normalizeBrowserSchema(root: Path, projectRoot: Path, sourceRoot: Path | undefined, options: BrowserBuilderSchema, metadata: json.JsonObject): NormalizedBrowserBuilderSchema;

package/src/utils/normalize-builder-schema.js

@@ -8,14 +8,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeBrowserSchema = void 0;
+const core_1 = require("@angular-devkit/core");
 const normalize_asset_patterns_1 = require("./normalize-asset-patterns");
+const normalize_cache_1 = require("./normalize-cache");
 const normalize_file_replacements_1 = require("./normalize-file-replacements");
 const normalize_optimization_1 = require("./normalize-optimization");
 const normalize_source_maps_1 = require("./normalize-source-maps");
-function normalizeBrowserSchema(root, projectRoot, sourceRoot, options) {
+function normalizeBrowserSchema(root, projectRoot, sourceRoot, options, metadata) {
     const normalizedSourceMapOptions = (0, normalize_source_maps_1.normalizeSourceMaps)(options.sourceMap || false);
     return {
         ...options,
+        cache: (0, normalize_cache_1.normalizeCacheOptions)(metadata, (0, core_1.getSystemPath)(root)),
         assets: (0, normalize_asset_patterns_1.normalizeAssetPatterns)(options.assets || [], root, projectRoot, sourceRoot),
         fileReplacements: (0, normalize_file_replacements_1.normalizeFileReplacements)(options.fileReplacements || [], root),
         optimization: (0, normalize_optimization_1.normalizeOptimization)(options.optimization),

package/src/utils/normalize-cache.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @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 { json } from '@angular-devkit/core';
+export interface NormalizedCachedOptions {
+    enabled: boolean;
+    path: string;
+}
+export declare function normalizeCacheOptions(metadata: json.JsonObject, worspaceRoot: string): NormalizedCachedOptions;

package/src/utils/normalize-cache.js

@@ -0,0 +1,40 @@
+"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.normalizeCacheOptions = void 0;
+const core_1 = require("@angular-devkit/core");
+const path_1 = require("path");
+const environment_options_1 = require("./environment-options");
+function normalizeCacheOptions(metadata, worspaceRoot) {
+    var _a;
+    const cacheMetadata = core_1.json.isJsonObject(metadata.cli) && core_1.json.isJsonObject(metadata.cli.cache)
+        ? metadata.cli.cache
+        : {};
+    const { enabled = true, environment = 'local', path = '.angular/cache' } = cacheMetadata;
+    const isCI = process.env['CI'] === '1' || ((_a = process.env['CI']) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
+    let cacheEnabled = enabled;
+    if (environment_options_1.cachingDisabled !== null) {
+        cacheEnabled = !environment_options_1.cachingDisabled;
+    }
+    if (cacheEnabled) {
+        switch (environment) {
+            case 'ci':
+                cacheEnabled = isCI;
+                break;
+            case 'local':
+                cacheEnabled = !isCI;
+                break;
+        }
+    }
+    return {
+        enabled: cacheEnabled,
+        path: (0, path_1.resolve)(worspaceRoot, path),
+    };
+}
+exports.normalizeCacheOptions = normalizeCacheOptions;

package/src/utils/service-worker.d.ts

@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Path } from '@angular-devkit/core';
-export declare function augmentAppWithServiceWorker(projectRoot: Path, appRoot: Path, outputPath: Path, baseHref: string, ngswConfigPath?: string): Promise<void>;
+export declare function augmentAppWithServiceWorker(appRoot: Path, outputPath: Path, baseHref: string, ngswConfigPath?: string): Promise<void>;

package/src/utils/service-worker.js

@@ -32,7 +32,6 @@ const crypto = __importStar(require("crypto"));
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const stream_1 = require("stream");
-const url_1 = require("url");
 const load_esm_1 = require("./load-esm");
 class CliFilesystem {
     constructor(base) {
@@ -73,26 +72,12 @@ class CliFilesystem {
         return items;
     }
 }
-async function augmentAppWithServiceWorker(projectRoot, appRoot, outputPath, baseHref, ngswConfigPath) {
+async function augmentAppWithServiceWorker(appRoot, outputPath, baseHref, ngswConfigPath) {
     const distPath = (0, core_1.getSystemPath)((0, core_1.normalize)(outputPath));
-    const systemProjectRoot = (0, core_1.getSystemPath)(projectRoot);
-    // Find the service worker package
-    const workerPath = require.resolve('@angular/service-worker/ngsw-worker.js', {
-        paths: [systemProjectRoot],
-    });
-    // Absolute paths on Windows must be `file://` URLs when using ESM. Otherwise,
-    // `c:` would be interpreted as a protocol instead of a drive letter.
-    const swConfigPath = (0, url_1.pathToFileURL)(require.resolve('@angular/service-worker/config', {
-        paths: [systemProjectRoot],
-    }));
     // Determine the configuration file path
-    let configPath;
-    if (ngswConfigPath) {
-        configPath = (0, core_1.getSystemPath)((0, core_1.normalize)(ngswConfigPath));
-    }
-    else {
-        configPath = path.join((0, core_1.getSystemPath)(appRoot), 'ngsw-config.json');
-    }
+    const configPath = ngswConfigPath
+        ? (0, core_1.getSystemPath)((0, core_1.normalize)(ngswConfigPath))
+        : path.join((0, core_1.getSystemPath)(appRoot), 'ngsw-config.json');
     // Read the configuration file
     let config;
     try {
@@ -112,13 +97,15 @@ async function augmentAppWithServiceWorker(projectRoot, appRoot, outputPath, bas
     // Load ESM `@angular/service-worker/config` using the TypeScript dynamic import workaround.
     // Once TypeScript provides support for keeping the dynamic import this workaround can be
     // changed to a direct dynamic import.
-    const GeneratorConstructor = (await (0, load_esm_1.loadEsmModule)(swConfigPath)).Generator;
+    const GeneratorConstructor = (await (0, load_esm_1.loadEsmModule)('@angular/service-worker/config')).Generator;
     // Generate the manifest
     const generator = new GeneratorConstructor(new CliFilesystem(distPath), baseHref);
     const output = await generator.process(config);
     // Write the manifest
     const manifest = JSON.stringify(output, null, 2);
     await fs_1.promises.writeFile(path.join(distPath, 'ngsw.json'), manifest);
+    // Find the service worker package
+    const workerPath = require.resolve('@angular/service-worker/ngsw-worker.js');
     // Write the worker code
     await fs_1.promises.copyFile(workerPath, path.join(distPath, 'ngsw-worker.js'), fs_1.constants.COPYFILE_FICLONE);
     // If present, write the safety worker code

package/src/utils/webpack-browser-config.d.ts

@@ -15,7 +15,7 @@ import { WebpackConfigOptions } from '../utils/build-options';
 import { I18nOptions } from './i18n-options';
 export declare type BrowserWebpackConfigOptions = WebpackConfigOptions<NormalizedBrowserBuilderSchema>;
 export declare type WebpackPartialGenerator = (configurationOptions: BrowserWebpackConfigOptions) => (Promise<Configuration> | Configuration)[];
-export declare function generateWebpackConfig(workspaceRoot: string, projectRoot: string, sourceRoot: string | undefined, options: NormalizedBrowserBuilderSchema, webpackPartialGenerator: WebpackPartialGenerator, logger: logging.LoggerApi, extraBuildOptions: Partial<NormalizedBrowserBuilderSchema>): Promise<Configuration>;
+export declare function generateWebpackConfig(workspaceRoot: string, projectRoot: string, sourceRoot: string | undefined, projectName: string, options: NormalizedBrowserBuilderSchema, webpackPartialGenerator: WebpackPartialGenerator, logger: logging.LoggerApi, extraBuildOptions: Partial<NormalizedBrowserBuilderSchema>): Promise<Configuration>;
 export declare function generateI18nBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, webpackPartialGenerator: WebpackPartialGenerator, extraBuildOptions?: Partial<NormalizedBrowserBuilderSchema>): Promise<{
     config: Configuration;
     projectRoot: string;

package/src/utils/webpack-browser-config.js

@@ -36,7 +36,7 @@ const utils_1 = require("../utils");
 const read_tsconfig_1 = require("../utils/read-tsconfig");
 const builder_watch_plugin_1 = require("../webpack/plugins/builder-watch-plugin");
 const i18n_options_1 = require("./i18n-options");
-async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, options, webpackPartialGenerator, logger, extraBuildOptions) {
+async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, projectName, options, webpackPartialGenerator, logger, extraBuildOptions) {
     // Ensure Build Optimizer is only used with AOT.
     if (options.buildOptimizer && !options.aot) {
         throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
@@ -54,6 +54,7 @@ async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, opt
         buildOptions,
         tsConfig,
         tsConfigPath,
+        projectName,
         scriptTarget,
     };
     wco.buildOptions.progress = (0, utils_1.defaultProgress)(wco.buildOptions.progress);
@@ -118,8 +119,8 @@ async function generateBrowserWebpackConfigFromContext(options, context, webpack
     const sourceRoot = projectSourceRoot
         ? (0, core_1.resolve)(workspaceRoot, (0, core_1.normalize)(projectSourceRoot))
         : undefined;
-    const normalizedOptions = (0, utils_1.normalizeBrowserSchema)(workspaceRoot, projectRoot, sourceRoot, options);
-    const config = await generateWebpackConfig((0, core_1.getSystemPath)(workspaceRoot), (0, core_1.getSystemPath)(projectRoot), sourceRoot && (0, core_1.getSystemPath)(sourceRoot), normalizedOptions, webpackPartialGenerator, context.logger, extraBuildOptions);
+    const normalizedOptions = (0, utils_1.normalizeBrowserSchema)(workspaceRoot, projectRoot, sourceRoot, options, projectMetadata);
+    const config = await generateWebpackConfig((0, core_1.getSystemPath)(workspaceRoot), (0, core_1.getSystemPath)(projectRoot), sourceRoot && (0, core_1.getSystemPath)(sourceRoot), projectName, normalizedOptions, webpackPartialGenerator, context.logger, extraBuildOptions);
     // If builder watch support is present in the context, add watch plugin
     // This is internal only and currently only used for testing
     const watcherFactory = context.watcherFactory;

package/src/webpack/configs/analytics.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAnalyticsConfig = void 0;
 const analytics_1 = require("../plugins/analytics");
 function getAnalyticsConfig(wco, context) {
+    var _a;
     if (!context.analytics) {
         return {};
     }
@@ -21,7 +22,9 @@ function getAnalyticsConfig(wco, context) {
     }
     // The category is the builder name if it's an angular builder.
     return {
-        plugins: [new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category, true)],
+        plugins: [
+            new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category, (_a = wco.buildOptions.aot) !== null && _a !== void 0 ? _a : false),
+        ],
     };
 }
 exports.getAnalyticsConfig = getAnalyticsConfig;

package/src/webpack/configs/browser.js

@@ -35,6 +35,7 @@ function getBrowserConfig(wco) {
         devtool: false,
         resolve: {
             mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
+            conditionNames: ['es2020', 'es2015', '...'],
         },
         output: {
             crossOriginLoading,

package/src/webpack/configs/common.d.ts

@@ -6,5 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Configuration } from 'webpack';
-import { WebpackConfigOptions } from '../../utils/build-options';
-export declare function getCommonConfig(wco: WebpackConfigOptions): Promise<Configuration>;
+import { WebpackConfigOptions, WebpackTestOptions } from '../../utils/build-options';
+export declare function getCommonConfig(wco: WebpackConfigOptions<WebpackTestOptions>): Promise<Configuration>;

package/src/webpack/configs/common.js

@@ -37,7 +37,6 @@ const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
 const webpack_1 = require("webpack");
 const utils_1 = require("../../utils");
-const cache_path_1 = require("../../utils/cache-path");
 const environment_options_1 = require("../../utils/environment-options");
 const load_esm_1 = require("../../utils/load-esm");
 const spinner_1 = require("../../utils/spinner");
@@ -48,8 +47,8 @@ const helpers_1 = require("../utils/helpers");
 // eslint-disable-next-line max-lines-per-function
 async function getCommonConfig(wco) {
     var _a, _b;
-    const { root, projectRoot, buildOptions, tsConfig } = wco;
-    const { platform = 'browser', sourceMap: { styles: stylesSourceMap, scripts: scriptsSourceMap, vendor: vendorSourceMap }, optimization: { styles: stylesOptimization, scripts: scriptsOptimization }, } = buildOptions;
+    const { root, projectRoot, buildOptions, tsConfig, projectName, sourceRoot } = wco;
+    const { cache, codeCoverage, codeCoverageExclude = [], platform = 'browser', sourceMap: { styles: stylesSourceMap, scripts: scriptsSourceMap, vendor: vendorSourceMap }, optimization: { styles: stylesOptimization, scripts: scriptsOptimization }, } = buildOptions;
     const extraPlugins = [];
     const extraRules = [];
     const entryPoints = {};
@@ -283,6 +282,7 @@ async function getCommonConfig(wco) {
         context: root,
         entry: entryPoints,
         output: {
+            uniqueName: projectName,
             hashFunction: 'xxhash64',
             clean: (_a = buildOptions.deleteOutputPath) !== null && _a !== void 0 ? _a : true,
             path: path.resolve(root, buildOptions.outputPath),
@@ -296,9 +296,6 @@ async function getCommonConfig(wco) {
             hints: false,
         },
         ignoreWarnings: [
-            // Webpack 5+ has no facility to disable this warning.
-            // System.import is used in @angular/core for deprecated string-form lazy routes
-            /System.import\(\) is deprecated and will be removed soon/i,
             // https://github.com/webpack-contrib/source-map-loader/blob/b2de4249c7431dd8432da607e08f0f65e9d64219/src/index.js#L83
             /Failed to parse source map from/,
             // https://github.com/webpack-contrib/postcss-loader/blob/bd261875fdf9c596af4ffb3a1a73fe3c549befda/src/index.js#L153-L158
@@ -308,12 +305,6 @@ async function getCommonConfig(wco) {
             // Show an error for missing exports instead of a warning.
             strictExportPresence: true,
             rules: [
-                {
-                    // Mark files inside `@angular/core` as using SystemJS style dynamic imports.
-                    // Removing this will cause deprecation warnings to appear.
-                    test: /[/\\]@angular[/\\]core[/\\].+\.js$/,
-                    parser: { system: true },
-                },
                 {
                     // Mark files inside `rxjs/add` as containing side effects.
                     // If this is fixed upstream and the fixed version becomes the minimum
@@ -330,10 +321,16 @@ async function getCommonConfig(wco) {
                         {
                             loader: require.resolve('../../babel/webpack-loader'),
                             options: {
-                                cacheDirectory: (0, cache_path_1.findCachePath)('babel-webpack'),
+                                cacheDirectory: (cache.enabled && path.join(cache.path, 'babel-webpack')) || false,
                                 scriptTarget: wco.scriptTarget,
                                 aot: buildOptions.aot,
                                 optimize: buildOptions.buildOptimizer,
+                                instrumentCode: codeCoverage
+                                    ? {
+                                        includedBasePath: sourceRoot,
+                                        excludedPaths: (0, helpers_1.getInstrumentationExcludedPaths)(root, codeCoverageExclude),
+                                    }
+                                    : undefined,
                             },
                         },
                     ],
@@ -355,22 +352,17 @@ async function getCommonConfig(wco) {
             chunkIds: buildOptions.namedChunks ? 'named' : 'deterministic',
             emitOnErrors: false,
         },
-        plugins: [
-            // Always replace the context for the System.import in angular/core to prevent warnings.
-            // https://github.com/angular/angular/issues/11580
-            new webpack_1.ContextReplacementPlugin(/@angular[\\/]core[\\/]/, path.join(projectRoot, '$_lazy_route_resources'), {}),
-            new plugins_1.DedupeModuleResolvePlugin({ verbose: buildOptions.verbose }),
-            ...extraPlugins,
-        ],
+        plugins: [new plugins_1.DedupeModuleResolvePlugin({ verbose: buildOptions.verbose }), ...extraPlugins],
     };
 }
 exports.getCommonConfig = getCommonConfig;
 function getCacheSettings(wco, supportedBrowsers, angularVersion) {
-    if (environment_options_1.persistentBuildCacheEnabled) {
+    const { enabled, path: cacheDirectory } = wco.buildOptions.cache;
+    if (enabled) {
         const packageVersion = require('../../../package.json').version;
         return {
             type: 'filesystem',
-            cacheDirectory: (0, cache_path_1.findCachePath)('angular-webpack'),
+            cacheDirectory: path.join(cacheDirectory, 'angular-webpack'),
             maxMemoryGenerations: 1,
             // We use the versions and build options as the cache name. The Webpack configurations are too
             // dynamic and shared among different build types: test, build and serve.
@@ -390,7 +382,7 @@ function getCacheSettings(wco, supportedBrowsers, angularVersion) {
                 .digest('hex'),
         };
     }
-    if (wco.buildOptions.watch && !environment_options_1.cachingDisabled) {
+    if (wco.buildOptions.watch) {
         return {
             type: 'memory',
             maxGenerations: 1,

package/src/webpack/configs/test.js

@@ -27,32 +27,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTestConfig = void 0;
-const glob = __importStar(require("glob"));
 const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
 const helpers_1 = require("../utils/helpers");
 function getTestConfig(wco) {
-    const { buildOptions: { codeCoverage, codeCoverageExclude, main, sourceMap, webWorkerTsConfig }, root, sourceRoot, } = wco;
-    const extraRules = [];
+    const { buildOptions: { main, sourceMap, webWorkerTsConfig }, root, } = wco;
     const extraPlugins = [];
-    if (codeCoverage) {
-        const exclude = [/\.(e2e|spec)\.tsx?$/, /node_modules/];
-        if (codeCoverageExclude) {
-            for (const excludeGlob of codeCoverageExclude) {
-                glob
-                    .sync(path.join(root, excludeGlob), { nodir: true })
-                    .forEach((file) => exclude.push(path.normalize(file)));
-            }
-        }
-        extraRules.push({
-            test: /\.[cm]?[tj]sx?$/,
-            loader: require.resolve('@jsdevtools/coverage-istanbul-loader'),
-            options: { esModules: true },
-            enforce: 'post',
-            exclude,
-            include: sourceRoot,
-        });
-    }
     if (sourceMap.scripts || sourceMap.styles) {
         extraPlugins.push((0, helpers_1.getSourceMapDevTool)(sourceMap.scripts, sourceMap.styles, false, true));
     }
@@ -61,13 +41,13 @@ function getTestConfig(wco) {
         target: wco.tsConfig.options.target === typescript_1.ScriptTarget.ES5 ? ['web', 'es5'] : 'web',
         resolve: {
             mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
+            conditionNames: ['es2020', 'es2015', '...'],
         },
         devtool: false,
         entry: {
             main: path.resolve(root, main),
         },
         module: {
-            rules: extraRules,
             parser: webWorkerTsConfig === undefined
                 ? {
                     javascript: {

package/src/webpack/plugins/analytics.d.ts

@@ -40,10 +40,10 @@ export declare class NgBuildAnalyticsPlugin {
     protected _projectRoot: string;
     protected _analytics: analytics.Analytics;
     protected _category: string;
-    private _isIvy;
+    private aotEnabled;
     protected _built: boolean;
     protected _stats: AnalyticsBuildStats;
-    constructor(_projectRoot: string, _analytics: analytics.Analytics, _category: string, _isIvy: boolean);
+    constructor(_projectRoot: string, _analytics: analytics.Analytics, _category: string, aotEnabled: boolean);
     protected _reset(): void;
     protected _getMetrics(stats: Stats): (string | number)[];
     protected _getDimensions(): (string | number | boolean)[];

package/src/webpack/plugins/analytics.js

@@ -73,11 +73,11 @@ class AnalyticsBuildStats {
  * Analytics plugin that reports the analytics we want from the CLI.
  */
 class NgBuildAnalyticsPlugin {
-    constructor(_projectRoot, _analytics, _category, _isIvy) {
+    constructor(_projectRoot, _analytics, _category, aotEnabled) {
         this._projectRoot = _projectRoot;
         this._analytics = _analytics;
         this._category = _category;
-        this._isIvy = _isIvy;
+        this.aotEnabled = aotEnabled;
         this._built = false;
         this._stats = new AnalyticsBuildStats();
     }
@@ -108,7 +108,7 @@ class NgBuildAnalyticsPlugin {
             // Adding commas before and after so the regex are easier to define filters.
             dimensions[core_1.analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
         }
-        dimensions[core_1.analytics.NgCliAnalyticsDimensions.NgIvyEnabled] = this._isIvy;
+        dimensions[core_1.analytics.NgCliAnalyticsDimensions.AotEnabled] = this.aotEnabled;
         return dimensions;
     }
     _reportBuildMetrics(stats) {

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

@@ -20,3 +20,4 @@ export declare function getSourceMapDevTool(scriptsSourceMap: boolean | undefine
 export declare function isPolyfillsEntry(name: string): boolean;
 export declare function getWatchOptions(poll: number | undefined): NonNullable<Configuration['watchOptions']>;
 export declare function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath: string) => string;
+export declare function getInstrumentationExcludedPaths(sourceRoot: string, excludedPaths: string[]): Set<string>;

package/src/webpack/utils/helpers.js

@@ -25,8 +25,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assetNameTemplateFactory = exports.getWatchOptions = exports.isPolyfillsEntry = exports.getSourceMapDevTool = exports.normalizeExtraEntryPoints = exports.getOutputHashFormat = void 0;
+exports.getInstrumentationExcludedPaths = exports.assetNameTemplateFactory = exports.getWatchOptions = exports.isPolyfillsEntry = exports.getSourceMapDevTool = exports.normalizeExtraEntryPoints = exports.getOutputHashFormat = void 0;
+const glob_1 = __importDefault(require("glob"));
 const path = __importStar(require("path"));
 const webpack_1 = require("webpack");
 function getOutputHashFormat(option, length = 20) {
@@ -126,3 +130,13 @@ function assetNameTemplateFactory(hashFormat) {
     };
 }
 exports.assetNameTemplateFactory = assetNameTemplateFactory;
+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)));
+    }
+    return excluded;
+}
+exports.getInstrumentationExcludedPaths = getInstrumentationExcludedPaths;

package/src/utils/cache-path.d.ts

@@ -1,8 +0,0 @@
-/**
- * @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
- */
-export declare function findCachePath(name: string): string;

package/src/utils/cache-path.js

@@ -1,24 +0,0 @@
-"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
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findCachePath = void 0;
-const find_cache_dir_1 = __importDefault(require("find-cache-dir"));
-const os_1 = require("os");
-const path_1 = require("path");
-const environment_options_1 = require("./environment-options");
-function findCachePath(name) {
-    if (environment_options_1.cachingBasePath) {
-        return (0, path_1.resolve)(environment_options_1.cachingBasePath, name);
-    }
-    return (0, find_cache_dir_1.default)({ name }) || (0, os_1.tmpdir)();
-}
-exports.findCachePath = findCachePath;