@angular-devkit/build-angular 13.0.4 → 13.1.0-next.3

package/src/utils/index-file/augment-index-html.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.augmentIndexHtml = void 0;
 const crypto_1 = require("crypto");
+const load_esm_1 = require("../load-esm");
 const html_rewriting_stream_1 = require("./html-rewriting-stream");
 /*
  * Helper function used by the IndexHtmlWebpackPlugin.
@@ -18,6 +19,8 @@ const html_rewriting_stream_1 = require("./html-rewriting-stream");
  */
 async function augmentIndexHtml(params) {
     const { loadOutputFile, files, entrypoints, sri, deployUrl = '', lang, baseHref, html } = params;
+    const warnings = [];
+    const errors = [];
     let { crossOrigin = 'none' } = params;
     if (sri && crossOrigin === 'none') {
         crossOrigin = 'anonymous';
@@ -72,6 +75,7 @@ async function augmentIndexHtml(params) {
         }
         linkTags.push(`<link ${attrs.join(' ')}>`);
     }
+    const dir = lang ? await getLanguageDirection(lang, warnings) : undefined;
     const { rewriter, transformedContent } = await (0, html_rewriting_stream_1.htmlRewritingStream)(html);
     const baseTagExists = html.includes('<base');
     rewriter
@@ -82,6 +86,9 @@ async function augmentIndexHtml(params) {
                 if (isString(lang)) {
                     updateAttribute(tag, 'lang', lang);
                 }
+                if (dir) {
+                    updateAttribute(tag, 'dir', dir);
+                }
                 break;
             case 'head':
                 // Base href should be added before any link, meta tags
@@ -119,11 +126,14 @@ async function augmentIndexHtml(params) {
         rewriter.emitEndTag(tag);
     });
     const content = await transformedContent;
-    if (linkTags.length || scriptTags.length) {
-        // In case no body/head tags are not present (dotnet partial templates)
-        return linkTags.join('') + scriptTags.join('') + content;
-    }
-    return content;
+    return {
+        content: linkTags.length || scriptTags.length
+            ? // In case no body/head tags are not present (dotnet partial templates)
+                linkTags.join('') + scriptTags.join('') + content
+            : content,
+        warnings,
+        errors,
+    };
 }
 exports.augmentIndexHtml = augmentIndexHtml;
 function generateSriAttributes(content) {
@@ -144,3 +154,13 @@ function updateAttribute(tag, name, value) {
 function isString(value) {
     return typeof value === 'string';
 }
+async function getLanguageDirection(lang, warnings) {
+    try {
+        const localeData = (await (0, load_esm_1.loadEsmModule)(`@angular/common/locales/${lang}`)).default;
+        const dir = localeData[localeData.length - 2];
+        return isString(dir) ? dir : undefined;
+    }
+    catch {
+        warnings.push(`Locale data for '${lang}' cannot be found. 'dir' attribute will not be set for this locale.`);
+    }
+}

package/src/utils/index.d.ts

@@ -5,7 +5,6 @@
  * 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 './build-browser-features';
 export * from './default-progress';
 export * from './delete-output-dir';
 export * from './run-module-as-observable-fork';

package/src/utils/index.js

@@ -17,7 +17,6 @@ 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("./build-browser-features"), exports);
 __exportStar(require("./default-progress"), exports);
 __exportStar(require("./delete-output-dir"), exports);
 __exportStar(require("./run-module-as-observable-fork"), exports);

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

@@ -14,6 +14,7 @@ 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");
+const supported_browsers_1 = require("./supported-browsers");
 function normalizeBrowserSchema(root, projectRoot, sourceRoot, options, metadata) {
     const normalizedSourceMapOptions = (0, normalize_source_maps_1.normalizeSourceMaps)(options.sourceMap || false);
     return {
@@ -37,6 +38,7 @@ function normalizeBrowserSchema(root, projectRoot, sourceRoot, options, metadata
         // A value of 0 is falsy and will disable polling rather then enable
         // 500 ms is a sensible default in this case
         poll: options.poll === 0 ? 500 : options.poll,
+        supportedBrowsers: (0, supported_browsers_1.getSupportedBrowsers)((0, core_1.getSystemPath)(projectRoot)),
     };
 }
 exports.normalizeBrowserSchema = normalizeBrowserSchema;

package/src/{webpack/configs/worker.d.ts → utils/supported-browsers.d.ts}

@@ -5,6 +5,4 @@
  * 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 { Configuration } from 'webpack';
-import { WebpackConfigOptions } from '../../utils/build-options';
-export declare function getWorkerConfig(wco: WebpackConfigOptions): Configuration;
+export declare function getSupportedBrowsers(projectRoot: string): string[];

package/src/utils/supported-browsers.js

@@ -0,0 +1,26 @@
+"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.getSupportedBrowsers = void 0;
+const browserslist_1 = __importDefault(require("browserslist"));
+function getSupportedBrowsers(projectRoot) {
+    browserslist_1.default.defaults = [
+        'last 1 Chrome version',
+        'last 1 Firefox version',
+        'last 2 Edge major versions',
+        'last 2 Safari major versions',
+        'last 2 iOS major versions',
+        'Firefox ESR',
+    ];
+    return (0, browserslist_1.default)(undefined, { path: projectRoot });
+}
+exports.getSupportedBrowsers = getSupportedBrowsers;

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, WebpackTestOptions } from '../../utils/build-options';
-export declare function getCommonConfig(wco: WebpackConfigOptions<WebpackTestOptions>): Promise<Configuration>;
+import { WebpackConfigOptions } from '../../utils/build-options';
+export declare function getCommonConfig(wco: WebpackConfigOptions): Promise<Configuration>;

package/src/webpack/configs/common.js

@@ -30,25 +30,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommonConfig = void 0;
+const webpack_1 = require("@ngtools/webpack");
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
-const crypto_1 = require("crypto");
-const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
-const webpack_1 = require("webpack");
-const utils_1 = require("../../utils");
+const webpack_2 = require("webpack");
+const webpack_subresource_integrity_1 = require("webpack-subresource-integrity");
 const environment_options_1 = require("../../utils/environment-options");
 const load_esm_1 = require("../../utils/load-esm");
-const spinner_1 = require("../../utils/spinner");
-const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 const plugins_1 = require("../plugins");
-const javascript_optimizer_plugin_1 = require("../plugins/javascript-optimizer-plugin");
+const named_chunks_plugin_1 = require("../plugins/named-chunks-plugin");
+const progress_plugin_1 = require("../plugins/progress-plugin");
+const transfer_size_plugin_1 = require("../plugins/transfer-size-plugin");
+const typescript_2 = require("../plugins/typescript");
 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, projectName, sourceRoot } = wco;
-    const { cache, codeCoverage, codeCoverageExclude = [], platform = 'browser', sourceMap: { styles: stylesSourceMap, scripts: scriptsSourceMap, vendor: vendorSourceMap }, optimization: { styles: stylesOptimization, scripts: scriptsOptimization }, } = buildOptions;
+    const { root, projectRoot, buildOptions, tsConfig, projectName, sourceRoot, tsConfigPath } = wco;
+    const { cache, codeCoverage, crossOrigin = 'none', platform = 'browser', aot = true, codeCoverageExclude = [], main, polyfills, sourceMap: { styles: stylesSourceMap, scripts: scriptsSourceMap, vendor: vendorSourceMap, hidden: hiddenSourceMap, }, optimization: { styles: stylesOptimization, scripts: scriptsOptimization }, commonChunk, vendorChunk, subresourceIntegrity, verbose, poll, webWorkerTsConfig, externalDependencies = [], allowedCommonJsDependencies, bundleDependencies, } = buildOptions;
+    const isPlatformServer = buildOptions.platform === 'server';
     const extraPlugins = [];
     const extraRules = [];
     const entryPoints = {};
@@ -61,34 +62,18 @@ async function getCommonConfig(wco) {
     const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT, VERSION: NG_VERSION, } = (compilerCliModule.GLOBAL_DEFS_FOR_TERSER ? compilerCliModule : compilerCliModule.default);
     // determine hashing format
     const hashFormat = (0, helpers_1.getOutputHashFormat)(buildOptions.outputHashing || 'none');
-    const buildBrowserFeatures = new utils_1.BuildBrowserFeatures(projectRoot);
     if (buildOptions.progress) {
-        const spinner = new spinner_1.Spinner();
-        spinner.start(`Generating ${platform} application bundles (phase: setup)...`);
-        extraPlugins.push(new webpack_1.ProgressPlugin({
-            handler: (percentage, message) => {
-                const phase = message ? ` (phase: ${message})` : '';
-                spinner.text = `Generating ${platform} application bundles${phase}...`;
-                switch (percentage) {
-                    case 1:
-                        if (spinner.isSpinning) {
-                            spinner.succeed(`${platform.replace(/^\w/, (s) => s.toUpperCase())} application bundle generation complete.`);
-                        }
-                        break;
-                    case 0:
-                        if (!spinner.isSpinning) {
-                            spinner.start();
-                        }
-                        break;
-                }
-            },
-        }));
+        extraPlugins.push(new progress_plugin_1.ProgressPlugin(platform));
     }
     if (buildOptions.main) {
         const mainPath = path.resolve(root, buildOptions.main);
         entryPoints['main'] = [mainPath];
     }
-    if (platform !== 'server') {
+    if (isPlatformServer) {
+        // Fixes Critical dependency: the request of a dependency is an expression
+        extraPlugins.push(new webpack_2.ContextReplacementPlugin(/@?hapi|express[\\/]/));
+    }
+    if (!isPlatformServer) {
         if (buildOptions.polyfills) {
             const projectPolyfills = path.resolve(root, buildOptions.polyfills);
             if (entryPoints['polyfills']) {
@@ -109,89 +94,34 @@ async function getCommonConfig(wco) {
         }
     }
     if (environment_options_1.profilingEnabled) {
-        extraPlugins.push(new webpack_1.debug.ProfilingPlugin({
+        extraPlugins.push(new webpack_2.debug.ProfilingPlugin({
             outputPath: path.resolve(root, 'chrome-profiler-events.json'),
         }));
     }
+    if (allowedCommonJsDependencies) {
+        // When this is not defined it means the builder doesn't support showing common js usages.
+        // When it does it will be an array.
+        extraPlugins.push(new plugins_1.CommonJsUsageWarnPlugin({
+            allowedDependencies: allowedCommonJsDependencies,
+        }));
+    }
     // process global scripts
-    const globalScriptsByBundleName = (0, helpers_1.normalizeExtraEntryPoints)(buildOptions.scripts, 'scripts').reduce((prev, curr) => {
-        const { bundleName, inject, input } = curr;
-        let resolvedPath = path.resolve(root, input);
-        if (!(0, fs_1.existsSync)(resolvedPath)) {
-            try {
-                resolvedPath = require.resolve(input, { paths: [root] });
-            }
-            catch {
-                throw new Error(`Script file ${input} does not exist.`);
-            }
-        }
-        const existingEntry = prev.find((el) => el.bundleName === bundleName);
-        if (existingEntry) {
-            if (existingEntry.inject && !inject) {
-                // All entries have to be lazy for the bundle to be lazy.
-                throw new Error(`The ${bundleName} bundle is mixing injected and non-injected scripts.`);
-            }
-            existingEntry.paths.push(resolvedPath);
-        }
-        else {
-            prev.push({
-                bundleName,
-                inject,
-                paths: [resolvedPath],
-            });
-        }
-        return prev;
-    }, []);
     // Add a new asset for each entry.
-    for (const script of globalScriptsByBundleName) {
+    for (const { bundleName, inject, paths } of (0, helpers_1.globalScriptsByBundleName)(root, buildOptions.scripts)) {
         // Lazy scripts don't get a hash, otherwise they can't be loaded by name.
-        const hash = script.inject ? hashFormat.script : '';
-        const bundleName = script.bundleName;
+        const hash = inject ? hashFormat.script : '';
         extraPlugins.push(new plugins_1.ScriptsWebpackPlugin({
             name: bundleName,
             sourceMap: scriptsSourceMap,
+            scripts: paths,
             filename: `${path.basename(bundleName)}${hash}.js`,
-            scripts: script.paths,
             basePath: projectRoot,
         }));
     }
     // process asset entries
     if (buildOptions.assets.length) {
-        const copyWebpackPluginPatterns = buildOptions.assets.map((asset, index) => {
-            // Resolve input paths relative to workspace root and add slash at the end.
-            // eslint-disable-next-line prefer-const
-            let { input, output, ignore = [], glob } = asset;
-            input = path.resolve(root, input).replace(/\\/g, '/');
-            input = input.endsWith('/') ? input : input + '/';
-            output = output.endsWith('/') ? output : output + '/';
-            if (output.startsWith('..')) {
-                throw new Error('An asset cannot be written to a location outside of the output path.');
-            }
-            return {
-                context: input,
-                // Now we remove starting slash to make Webpack place it from the output root.
-                to: output.replace(/^\//, ''),
-                from: glob,
-                noErrorOnMissing: true,
-                force: true,
-                globOptions: {
-                    dot: true,
-                    followSymbolicLinks: !!asset.followSymlinks,
-                    ignore: [
-                        '.gitkeep',
-                        '**/.DS_Store',
-                        '**/Thumbs.db',
-                        // Negate patterns needs to be absolute because copy-webpack-plugin uses absolute globs which
-                        // causes negate patterns not to match.
-                        // See: https://github.com/webpack-contrib/copy-webpack-plugin/issues/498#issuecomment-639327909
-                        ...ignore,
-                    ].map((i) => path.posix.join(input, i)),
-                },
-                priority: index,
-            };
-        });
         extraPlugins.push(new copy_webpack_plugin_1.default({
-            patterns: copyWebpackPluginPatterns,
+            patterns: (0, helpers_1.assetPatterns)(root, buildOptions.assets),
         }));
     }
     if (buildOptions.showCircularDependencies) {
@@ -212,26 +142,33 @@ async function getCommonConfig(wco) {
             skipChildCompilers: true,
         }));
     }
+    if (scriptsSourceMap || stylesSourceMap) {
+        const include = [];
+        if (scriptsSourceMap) {
+            include.push(/js$/);
+        }
+        if (stylesSourceMap) {
+            include.push(/css$/);
+        }
+        extraPlugins.push(new webpack_2.SourceMapDevToolPlugin({
+            filename: '[file].map',
+            include,
+            // We want to set sourceRoot to  `webpack:///` for non
+            // inline sourcemaps as otherwise paths to sourcemaps will be broken in browser
+            // `webpack:///` is needed for Visual Studio breakpoints to work properly as currently
+            // there is no way to set the 'webRoot'
+            sourceRoot: 'webpack:///',
+            moduleFilenameTemplate: '[resource-path]',
+            append: hiddenSourceMap ? false : undefined,
+        }));
+    }
     if (buildOptions.statsJson) {
-        extraPlugins.push(new (class {
-            apply(compiler) {
-                compiler.hooks.done.tapPromise('angular-cli-stats', async (stats) => {
-                    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 {
-                        await fs_1.promises.mkdir(path.dirname(statsOutputPath), { recursive: true });
-                        await new Promise((resolve, reject) => stringifyStream(data)
-                            .pipe((0, fs_1.createWriteStream)(statsOutputPath))
-                            .on('close', resolve)
-                            .on('error', reject));
-                    }
-                    catch (error) {
-                        (0, webpack_diagnostics_1.addError)(stats.compilation, `Unable to write stats file: ${error.message || 'unknown error'}`);
-                    }
-                });
-            }
-        })());
+        extraPlugins.push(new plugins_1.JsonStatsPlugin(path.resolve(root, buildOptions.outputPath, 'stats.json')));
+    }
+    if (subresourceIntegrity) {
+        extraPlugins.push(new webpack_subresource_integrity_1.SubresourceIntegrityPlugin({
+            hashFuncNames: ['sha384'],
+        }));
     }
     if (scriptsSourceMap || stylesSourceMap) {
         extraRules.push({
@@ -251,22 +188,48 @@ async function getCommonConfig(wco) {
             },
         });
     }
+    if (main || polyfills) {
+        extraRules.push({
+            test: tsConfig.options.allowJs ? /\.[cm]?[tj]sx?$/ : /\.[cm]?tsx?$/,
+            loader: webpack_1.AngularWebpackLoaderPath,
+            // The below are known paths that are not part of the TypeScript compilation even when allowJs is enabled.
+            exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/],
+        });
+        extraPlugins.push((0, typescript_2.createIvyPlugin)(wco, aot, tsConfigPath));
+    }
+    if (webWorkerTsConfig) {
+        extraPlugins.push((0, typescript_2.createIvyPlugin)(wco, false, path.resolve(wco.root, webWorkerTsConfig)));
+    }
     const extraMinimizers = [];
     if (scriptsOptimization) {
-        extraMinimizers.push(new javascript_optimizer_plugin_1.JavaScriptOptimizerPlugin({
+        extraMinimizers.push(new plugins_1.JavaScriptOptimizerPlugin({
             define: buildOptions.aot ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT : GLOBAL_DEFS_FOR_TERSER,
             sourcemap: scriptsSourceMap,
             target: wco.scriptTarget,
-            keepNames: !environment_options_1.allowMangle || platform === 'server',
+            keepNames: !environment_options_1.allowMangle || isPlatformServer,
             removeLicenses: buildOptions.extractLicenses,
             advanced: buildOptions.buildOptimizer,
         }));
     }
+    if (platform === 'browser' && (scriptsOptimization || stylesOptimization.minify)) {
+        extraMinimizers.push(new transfer_size_plugin_1.TransferSizePlugin());
+    }
+    const externals = [...externalDependencies];
+    if (isPlatformServer && !bundleDependencies) {
+        externals.push(({ context, request }, callback) => (0, helpers_1.externalizePackages)(context !== null && context !== void 0 ? context : wco.projectRoot, request, callback));
+    }
+    let crossOriginLoading = false;
+    if (subresourceIntegrity && crossOrigin === 'none') {
+        crossOriginLoading = 'anonymous';
+    }
+    else if (crossOrigin !== 'none') {
+        crossOriginLoading = crossOrigin;
+    }
     return {
         mode: scriptsOptimization || stylesOptimization.minify ? 'production' : 'development',
         devtool: false,
         target: [
-            platform === 'server' ? 'node' : 'web',
+            isPlatformServer ? 'node' : 'web',
             tsConfig.options.target === typescript_1.ScriptTarget.ES5 ? 'es5' : 'es2015',
         ],
         profile: buildOptions.statsJson,
@@ -275,12 +238,17 @@ async function getCommonConfig(wco) {
             extensions: ['.ts', '.tsx', '.mjs', '.js'],
             symlinks: !buildOptions.preserveSymlinks,
             modules: [tsConfig.options.baseUrl || projectRoot, 'node_modules'],
+            mainFields: isPlatformServer
+                ? ['es2015', 'module', 'main']
+                : ['es2020', 'es2015', 'browser', 'module', 'main'],
+            conditionNames: isPlatformServer ? ['es2015', '...'] : ['es2020', 'es2015', '...'],
         },
         resolveLoader: {
             symlinks: !buildOptions.preserveSymlinks,
         },
         context: root,
         entry: entryPoints,
+        externals,
         output: {
             uniqueName: projectName,
             hashFunction: 'xxhash64',
@@ -289,9 +257,16 @@ async function getCommonConfig(wco) {
             publicPath: (_b = buildOptions.deployUrl) !== null && _b !== void 0 ? _b : '',
             filename: `[name]${hashFormat.chunk}.js`,
             chunkFilename: `[name]${hashFormat.chunk}.js`,
+            libraryTarget: isPlatformServer ? 'commonjs' : undefined,
+            crossOriginLoading,
+            trustedTypes: 'angular#bundler',
+            scriptType: 'module',
         },
         watch: buildOptions.watch,
-        watchOptions: (0, helpers_1.getWatchOptions)(buildOptions.poll),
+        watchOptions: {
+            poll,
+            ignored: poll === undefined ? undefined : '**/node_modules/**',
+        },
         performance: {
             hints: false,
         },
@@ -307,6 +282,14 @@ async function getCommonConfig(wco) {
         module: {
             // Show an error for missing exports instead of a warning.
             strictExportPresence: true,
+            parser: webWorkerTsConfig === undefined
+                ? {
+                    javascript: {
+                        worker: false,
+                        url: false,
+                    },
+                }
+                : undefined,
             rules: [
                 {
                     // Mark files inside `rxjs/add` as containing side effects.
@@ -342,54 +325,48 @@ async function getCommonConfig(wco) {
             ],
         },
         experiments: {
+            backCompat: false,
             syncWebAssembly: true,
             asyncWebAssembly: true,
         },
         infrastructureLogging: {
-            level: buildOptions.verbose ? 'verbose' : 'error',
+            level: verbose ? 'verbose' : 'error',
         },
-        cache: getCacheSettings(wco, buildBrowserFeatures.supportedBrowsers, NG_VERSION.full),
+        stats: (0, helpers_1.getStatsOptions)(verbose),
+        cache: (0, helpers_1.getCacheSettings)(wco, NG_VERSION.full),
         optimization: {
             minimizer: extraMinimizers,
             moduleIds: 'deterministic',
             chunkIds: buildOptions.namedChunks ? 'named' : 'deterministic',
             emitOnErrors: false,
+            runtimeChunk: isPlatformServer ? false : 'single',
+            splitChunks: {
+                maxAsyncRequests: Infinity,
+                cacheGroups: {
+                    default: !!commonChunk && {
+                        chunks: 'async',
+                        minChunks: 2,
+                        priority: 10,
+                    },
+                    common: !!commonChunk && {
+                        name: 'common',
+                        chunks: 'async',
+                        minChunks: 2,
+                        enforce: true,
+                        priority: 5,
+                    },
+                    vendors: false,
+                    defaultVendors: !!vendorChunk && {
+                        name: 'vendor',
+                        chunks: (chunk) => chunk.name === 'main',
+                        enforce: true,
+                        test: /[\\/]node_modules[\\/]/,
+                    },
+                },
+            },
         },
-        plugins: [new plugins_1.DedupeModuleResolvePlugin({ verbose: buildOptions.verbose }), ...extraPlugins],
+        plugins: [new named_chunks_plugin_1.NamedChunksPlugin(), new plugins_1.DedupeModuleResolvePlugin({ verbose }), ...extraPlugins],
+        node: false,
     };
 }
 exports.getCommonConfig = getCommonConfig;
-function getCacheSettings(wco, supportedBrowsers, angularVersion) {
-    const { enabled, path: cacheDirectory } = wco.buildOptions.cache;
-    if (enabled) {
-        const packageVersion = require('../../../package.json').version;
-        return {
-            type: 'filesystem',
-            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.
-            // None of which are "named".
-            name: (0, crypto_1.createHash)('sha1')
-                .update(angularVersion)
-                .update(packageVersion)
-                .update(wco.projectRoot)
-                .update(JSON.stringify(wco.tsConfig))
-                .update(JSON.stringify({
-                ...wco.buildOptions,
-                // Needed because outputPath changes on every build when using i18n extraction
-                // https://github.com/angular/angular-cli/blob/736a5f89deaca85f487b78aec9ff66d4118ceb6a/packages/angular_devkit/build_angular/src/utils/i18n-options.ts#L264-L265
-                outputPath: undefined,
-            }))
-                .update(supportedBrowsers.join(''))
-                .digest('hex'),
-        };
-    }
-    if (wco.buildOptions.watch) {
-        return {
-            type: 'memory',
-            maxGenerations: 1,
-        };
-    }
-    return false;
-}

package/src/webpack/configs/dev-server.d.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import * as webpack from 'webpack';
+import { Configuration } from 'webpack';
 import { WebpackConfigOptions, WebpackDevServerOptions } from '../../utils/build-options';
-export declare function getDevServerConfig(wco: WebpackConfigOptions<WebpackDevServerOptions>): Promise<webpack.Configuration>;
+export declare function getDevServerConfig(wco: WebpackConfigOptions<WebpackDevServerOptions>): Promise<Configuration>;
 /**
  * Resolve and build a URL _path_ that will be the root of the server. This resolved base href and
  * deploy URL from the browser options and returns a path from the root.