@angular-devkit/build-angular 12.1.0-next.4 → 12.1.1

package/src/utils/process-bundle.js

@@ -6,17 +6,39 @@
  * 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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inlineLocales = exports.createI18nPlugins = exports.process = exports.setup = void 0;
 const core_1 = require("@babel/core");
-const template_1 = require("@babel/template");
-const cacache = require("cacache");
+const template_1 = __importDefault(require("@babel/template"));
+const cacache = __importStar(require("cacache"));
 const crypto_1 = require("crypto");
-const fs = require("fs");
-const path = require("path");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const source_map_1 = require("source-map");
 const terser_1 = require("terser");
-const v8 = require("v8");
+const v8 = __importStar(require("v8"));
 const webpack_1 = require("webpack");
 const environment_options_1 = require("./environment-options");
 const { ConcatSource, OriginalSource, ReplaceSource, SourceMapSource } = webpack_1.sources;
@@ -359,23 +381,23 @@ function createIifeWrapperPlugin() {
 const USE_LOCALIZE_PLUGINS = false;
 async function createI18nPlugins(locale, translation, missingTranslation, shouldInline, localeDataContent) {
     const plugins = [];
-    const localizeDiag = await Promise.resolve().then(() => require('@angular/localize/src/tools/src/diagnostics'));
+    const localizeDiag = await Promise.resolve().then(() => __importStar(require('@angular/localize/src/tools/src/diagnostics')));
     const diagnostics = new localizeDiag.Diagnostics();
     if (shouldInline) {
-        const es2015 = await Promise.resolve().then(() => require('@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin'));
+        const es2015 = await Promise.resolve().then(() => __importStar(require('@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin')));
         plugins.push(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         es2015.makeEs2015TranslatePlugin(diagnostics, (translation || {}), {
             missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
         }));
-        const es5 = await Promise.resolve().then(() => require('@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin'));
+        const es5 = await Promise.resolve().then(() => __importStar(require('@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin')));
         plugins.push(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         es5.makeEs5TranslatePlugin(diagnostics, (translation || {}), {
             missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
         }));
     }
-    const inlineLocale = await Promise.resolve().then(() => require('@angular/localize/src/tools/src/translate/source_files/locale_plugin'));
+    const inlineLocale = await Promise.resolve().then(() => __importStar(require('@angular/localize/src/tools/src/translate/source_files/locale_plugin')));
     plugins.push(inlineLocale.makeLocalePlugin(locale));
     if (localeDataContent) {
         plugins.push({
@@ -472,9 +494,9 @@ async function inlineLocalesDirect(ast, options) {
     if (!i18n || i18n.inlineLocales.size === 0) {
         return { file: options.filename, diagnostics: [], count: 0 };
     }
-    const { default: generate } = await Promise.resolve().then(() => require('@babel/generator'));
-    const utils = await Promise.resolve().then(() => require('@angular/localize/src/tools/src/source_file_utils'));
-    const localizeDiag = await Promise.resolve().then(() => require('@angular/localize/src/tools/src/diagnostics'));
+    const { default: generate } = await Promise.resolve().then(() => __importStar(require('@babel/generator')));
+    const utils = await Promise.resolve().then(() => __importStar(require('@angular/localize/src/tools/src/source_file_utils')));
+    const localizeDiag = await Promise.resolve().then(() => __importStar(require('@angular/localize/src/tools/src/diagnostics')));
     const diagnostics = new localizeDiag.Diagnostics();
     const positions = findLocalizePositions(ast, options, utils);
     if (positions.length === 0 && !options.setLocale) {

package/src/utils/read-tsconfig.js

@@ -6,9 +6,28 @@
  * 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.readTsconfig = void 0;
-const path = require("path");
+const path = __importStar(require("path"));
 /**
  * Reads and parses a given TsConfig file.
  *

package/src/utils/service-worker.js

@@ -6,12 +6,31 @@
  * 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.augmentAppWithServiceWorker = void 0;
 const core_1 = require("@angular-devkit/core");
-const crypto = require("crypto");
+const crypto = __importStar(require("crypto"));
 const fs_1 = require("fs");
-const path = require("path");
+const path = __importStar(require("path"));
 const stream_1 = require("stream");
 class CliFilesystem {
     constructor(base) {

package/src/utils/spinner.d.ts

@@ -6,11 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export declare class Spinner {
+    #private;
     private readonly spinner;
     /** When false, only fail messages will be displayed. */
     enabled: boolean;
     constructor(text?: string);
     set text(text: string);
+    get isSpinning(): boolean;
     succeed(text?: string): void;
     fail(text?: string): void;
     stop(): void;

package/src/utils/spinner.js

@@ -6,25 +6,40 @@
  * 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 __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _Spinner_isTTY;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Spinner = void 0;
-const ora = require("ora");
+const ora_1 = __importDefault(require("ora"));
 const color_1 = require("./color");
+const tty_1 = require("./tty");
 class Spinner {
     constructor(text) {
         /** When false, only fail messages will be displayed. */
         this.enabled = true;
-        this.spinner = ora({
+        _Spinner_isTTY.set(this, tty_1.isTTY());
+        this.spinner = ora_1.default({
             text,
             // The below 2 options are needed because otherwise CTRL+C will be delayed
             // when the underlying process is sync.
             hideCursor: false,
             discardStdin: false,
+            isEnabled: __classPrivateFieldGet(this, _Spinner_isTTY, "f"),
         });
     }
     set text(text) {
         this.spinner.text = text;
     }
+    get isSpinning() {
+        return this.spinner.isSpinning || !__classPrivateFieldGet(this, _Spinner_isTTY, "f");
+    }
     succeed(text) {
         if (this.enabled) {
             this.spinner.succeed(text);
@@ -43,3 +58,4 @@ class Spinner {
     }
 }
 exports.Spinner = Spinner;
+_Spinner_isTTY = new WeakMap();

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

@@ -6,10 +6,29 @@
  * 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.getIndexInputFile = exports.getIndexOutputFile = exports.generateBrowserWebpackConfigFromContext = exports.generateI18nBrowserWebpackConfigFromContext = exports.generateWebpackConfig = void 0;
 const core_1 = require("@angular-devkit/core");
-const path = require("path");
+const path = __importStar(require("path"));
 const webpack_1 = require("webpack");
 const webpack_merge_1 = require("webpack-merge");
 const utils_1 = require("../utils");
@@ -23,7 +42,7 @@ async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, opt
     }
     const tsConfigPath = path.resolve(workspaceRoot, options.tsConfig);
     const tsConfig = read_tsconfig_1.readTsconfig(tsConfigPath);
-    const ts = await Promise.resolve().then(() => require('typescript'));
+    const ts = await Promise.resolve().then(() => __importStar(require('typescript')));
     const scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
     const buildOptions = { ...options, ...extraBuildOptions };
     const wco = {

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

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext } from '@angular-devkit/architect';
+import { Configuration } from 'webpack';
+import { WebpackConfigOptions } from '../../utils/build-options';
+export declare function getAnalyticsConfig(wco: WebpackConfigOptions, context: BuilderContext): Configuration;

package/src/webpack/configs/analytics.js

@@ -0,0 +1,29 @@
+"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.getAnalyticsConfig = void 0;
+const analytics_1 = require("../plugins/analytics");
+function getAnalyticsConfig(wco, context) {
+    if (!context.analytics) {
+        return {};
+    }
+    // If there's analytics, add our plugin. Otherwise no need to slow down the build.
+    let category = 'build';
+    if (context.builder) {
+        // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
+        category = context.builder.builderName.split(':')[1] || context.builder.builderName || 'build';
+    }
+    // The category is the builder name if it's an angular builder.
+    return {
+        plugins: [
+            new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category, !!wco.tsConfig.options.enableIvy),
+        ],
+    };
+}
+exports.getAnalyticsConfig = getAnalyticsConfig;

package/src/webpack/configs/browser.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBrowserConfig = void 0;
-const typescript_1 = require("typescript");
 const utils_1 = require("../../utils");
 const plugins_1 = require("../plugins");
 const helpers_1 = require("../utils/helpers");
@@ -51,9 +50,6 @@ function getBrowserConfig(wco) {
         resolve: {
             mainFields: ['es2015', 'browser', 'module', 'main'],
         },
-        target: wco.tsConfig.options.target === typescript_1.ScriptTarget.ES5 || buildBrowserFeatures.isEs5SupportNeeded()
-            ? ['web', 'es5']
-            : 'web',
         output: {
             crossOriginLoading,
             trustedTypes: 'angular#bundler',

package/src/webpack/configs/common.js

@@ -6,12 +6,36 @@
  * 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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommonConfig = void 0;
 const build_optimizer_1 = require("@angular-devkit/build-optimizer");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
+const compiler_cli_1 = require("@angular/compiler-cli");
+const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
+const crypto_1 = require("crypto");
 const fs_1 = require("fs");
-const path = require("path");
+const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
 const webpack_1 = require("webpack");
 const utils_1 = require("../../utils");
@@ -22,10 +46,9 @@ const spinner_1 = require("../../utils/spinner");
 const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 const plugins_1 = require("../plugins");
 const helpers_1 = require("../utils/helpers");
-const stats_1 = require("../utils/stats");
 // eslint-disable-next-line max-lines-per-function
 function getCommonConfig(wco) {
-    var _a;
+    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 extraPlugins = [];
@@ -38,25 +61,22 @@ function getCommonConfig(wco) {
     if (buildOptions.progress) {
         const spinner = new spinner_1.Spinner();
         spinner.start(`Generating ${platform} application bundles (phase: setup)...`);
-        let previousPercentage;
         extraPlugins.push(new webpack_1.ProgressPlugin({
             handler: (percentage, message) => {
-                if (previousPercentage === 1 && percentage !== 0) {
-                    // In some scenarios in Webpack 5 percentage goes from 1 back to 0.99.
-                    // Ex: 0.99 -> 1 -> 0.99 -> 1
-                    // This causes the "complete" message to be displayed multiple times.
-                    return;
-                }
+                const phase = message ? ` (phase: ${message})` : '';
+                spinner.text = `Generating ${platform} application bundles${phase}...`;
                 switch (percentage) {
                     case 1:
-                        spinner.succeed(`${platform.replace(/^\w/, (s) => s.toUpperCase())} application bundle generation complete.`);
+                        if (spinner.isSpinning) {
+                            spinner.succeed(`${platform.replace(/^\w/, (s) => s.toUpperCase())} application bundle generation complete.`);
+                        }
                         break;
                     case 0:
-                    default:
-                        spinner.text = `Generating ${platform} application bundles (phase: ${message})...`;
+                        if (!spinner.isSpinning) {
+                            spinner.start();
+                        }
                         break;
                 }
-                previousPercentage = percentage;
             },
         }));
     }
@@ -182,7 +202,7 @@ function getCommonConfig(wco) {
                 },
             };
         });
-        extraPlugins.push(new CopyWebpackPlugin({
+        extraPlugins.push(new copy_webpack_plugin_1.default({
             patterns: copyWebpackPluginPatterns,
         }));
     }
@@ -196,7 +216,7 @@ function getCommonConfig(wco) {
         extraPlugins.push(new (class {
             apply(compiler) {
                 compiler.hooks.done.tapPromise('angular-cli-stats', async (stats) => {
-                    const { stringifyStream } = await Promise.resolve().then(() => require('@discoveryjs/json-ext'));
+                    const { stringifyStream } = await Promise.resolve().then(() => __importStar(require('@discoveryjs/json-ext')));
                     const data = stats.toJson('verbose');
                     const statsOutputPath = path.resolve(root, buildOptions.outputPath, 'stats.json');
                     try {
@@ -222,7 +242,7 @@ function getCommonConfig(wco) {
         });
     }
     let buildOptimizerUseRule = [];
-    if (buildOptions.buildOptimizer) {
+    if (buildOptions.buildOptimizer && wco.scriptTarget < typescript_1.ScriptTarget.ES2015) {
         extraPlugins.push(new build_optimizer_1.BuildOptimizerWebpackPlugin());
         buildOptimizerUseRule = [
             {
@@ -234,10 +254,9 @@ function getCommonConfig(wco) {
     const extraMinimizers = [];
     if (scriptsOptimization) {
         const TerserPlugin = require('terser-webpack-plugin');
-        const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT, } = require('@angular/compiler-cli');
         const angularGlobalDefinitions = buildOptions.aot
-            ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT
-            : GLOBAL_DEFS_FOR_TERSER;
+            ? compiler_cli_1.GLOBAL_DEFS_FOR_TERSER_WITH_AOT
+            : compiler_cli_1.GLOBAL_DEFS_FOR_TERSER;
         // TODO: Investigate why this fails for some packages: wco.supportES2015 ? 6 : 5;
         const terserEcma = 5;
         const terserOptions = {
@@ -305,12 +324,19 @@ function getCommonConfig(wco) {
     return {
         mode: scriptsOptimization || stylesOptimization.minify ? 'production' : 'development',
         devtool: false,
+        target: [
+            platform === 'server' ? 'node' : 'web',
+            tsConfig.options.target === typescript_1.ScriptTarget.ES5 ||
+                (platform !== 'server' && buildBrowserFeatures.isEs5SupportNeeded())
+                ? 'es5'
+                : 'es2015',
+        ],
         profile: buildOptions.statsJson,
         resolve: {
             roots: [projectRoot],
             extensions: ['.ts', '.tsx', '.mjs', '.js'],
             symlinks: !buildOptions.preserveSymlinks,
-            modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
+            modules: [tsConfig.options.baseUrl || projectRoot, 'node_modules'],
         },
         resolveLoader: {
             symlinks: !buildOptions.preserveSymlinks,
@@ -325,9 +351,9 @@ function getCommonConfig(wco) {
         context: root,
         entry: entryPoints,
         output: {
-            clean: buildOptions.deleteOutputPath,
+            clean: (_a = buildOptions.deleteOutputPath) !== null && _a !== void 0 ? _a : true,
             path: path.resolve(root, buildOptions.outputPath),
-            publicPath: (_a = buildOptions.deployUrl) !== null && _a !== void 0 ? _a : '',
+            publicPath: (_b = buildOptions.deployUrl) !== null && _b !== void 0 ? _b : '',
             filename: ({ chunk }) => {
                 if ((chunk === null || chunk === void 0 ? void 0 : chunk.name) === 'polyfills-es5') {
                     return `polyfills-es5${hashFormat.chunk}.js`;
@@ -336,14 +362,22 @@ function getCommonConfig(wco) {
                     return `[name]${targetInFileName}${hashFormat.chunk}.js`;
                 }
             },
-            chunkFilename: `[id]${targetInFileName}${hashFormat.chunk}.js`,
+            chunkFilename: `[name]${targetInFileName}${hashFormat.chunk}.js`,
         },
         watch: buildOptions.watch,
         watchOptions: helpers_1.getWatchOptions(buildOptions.poll),
         performance: {
             hints: false,
         },
-        ignoreWarnings: stats_1.IGNORE_WARNINGS,
+        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
+            /Add postcss as project dependency/,
+        ],
         module: {
             // Show an error for missing exports instead of a warning.
             strictExportPresence: true,
@@ -373,6 +407,7 @@ function getCommonConfig(wco) {
                                 cacheDirectory: cache_path_1.findCachePath('babel-webpack'),
                                 scriptTarget: wco.scriptTarget,
                                 aot: buildOptions.aot,
+                                optimize: buildOptions.buildOptimizer && wco.scriptTarget >= typescript_1.ScriptTarget.ES2015,
                             },
                         },
                         ...buildOptimizerUseRule,
@@ -385,11 +420,7 @@ function getCommonConfig(wco) {
             syncWebAssembly: true,
             asyncWebAssembly: true,
         },
-        cache: !!buildOptions.watch &&
-            !environment_options_1.cachingDisabled && {
-            type: 'memory',
-            maxGenerations: 1,
-        },
+        cache: getCacheSettings(wco, buildBrowserFeatures.supportedBrowsers),
         optimization: {
             minimizer: extraMinimizers,
             moduleIds: 'deterministic',
@@ -406,3 +437,31 @@ function getCommonConfig(wco) {
     };
 }
 exports.getCommonConfig = getCommonConfig;
+function getCacheSettings(wco, supportedBrowsers) {
+    if (environment_options_1.persistentBuildCacheEnabled) {
+        const packageVersion = require('../../../package.json').version;
+        return {
+            type: 'filesystem',
+            cacheDirectory: cache_path_1.findCachePath('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.
+            // None of which are "named".
+            name: crypto_1.createHash('sha1')
+                .update(compiler_cli_1.VERSION.full)
+                .update(packageVersion)
+                .update(wco.projectRoot)
+                .update(JSON.stringify(wco.tsConfig))
+                .update(JSON.stringify(wco.buildOptions))
+                .update(supportedBrowsers.join(''))
+                .digest('base64'),
+        };
+    }
+    if (wco.buildOptions.watch && !environment_options_1.cachingDisabled) {
+        return {
+            type: 'memory',
+            maxGenerations: 1,
+        };
+    }
+    return false;
+}

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

@@ -6,12 +6,31 @@
  * 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.buildServePath = exports.getDevServerConfig = void 0;
 const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const url = require("url");
+const url = __importStar(require("url"));
 const utils_1 = require("../../utils");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const hmr_loader_1 = require("../plugins/hmr/hmr-loader");

package/src/webpack/configs/index.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
  */
+export * from './analytics';
 export * from './browser';
 export * from './common';
 export * from './dev-server';

package/src/webpack/configs/index.js

@@ -17,6 +17,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./analytics"), exports);
 __exportStar(require("./browser"), exports);
 __exportStar(require("./common"), exports);
 __exportStar(require("./dev-server"), exports);

package/src/webpack/configs/server.js

@@ -30,7 +30,6 @@ function getServerConfig(wco) {
         resolve: {
             mainFields: ['es2015', 'main', 'module'],
         },
-        target: 'node',
         output: {
             libraryTarget: 'commonjs',
         },

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

@@ -16,6 +16,7 @@ export declare function getWebpackStatsConfig(verbose?: boolean): {
     warnings: boolean;
     errors: boolean;
     assets: boolean;
+    cachedAssets: boolean;
     ids: boolean;
     entrypoints: boolean;
 };
@@ -30,6 +31,7 @@ export declare function getStatsConfig(wco: WebpackConfigOptions): {
         warnings: boolean;
         errors: boolean;
         assets: boolean;
+        cachedAssets: boolean;
         ids: boolean;
         entrypoints: boolean;
     };

package/src/webpack/configs/stats.js

@@ -18,6 +18,7 @@ const webpackOutputOptions = {
     warnings: true,
     errors: true,
     assets: true,
+    cachedAssets: true,
     // Needed for markAsyncChunksNonInitial.
     ids: true,
     entrypoints: true,