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

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.1.0-next.3",
+  "version": "13.1.2",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.0.2",
-    "@angular-devkit/architect": "0.1301.0-next.3",
-    "@angular-devkit/build-webpack": "0.1301.0-next.3",
-    "@angular-devkit/core": "13.1.0-next.3",
+    "@angular-devkit/architect": "0.1301.2",
+    "@angular-devkit/build-webpack": "0.1301.2",
+    "@angular-devkit/core": "13.1.2",
     "@babel/core": "7.16.0",
     "@babel/generator": "7.16.0",
     "@babel/helper-annotate-as-pure": "7.16.0",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.16.3",
     "@babel/template": "7.16.0",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "13.1.0-next.3",
+    "@ngtools/webpack": "13.1.2",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
@@ -28,10 +28,10 @@
     "cacache": "15.3.0",
     "circular-dependency-plugin": "5.2.2",
     "copy-webpack-plugin": "10.0.0",
-    "core-js": "3.19.2",
+    "core-js": "3.19.3",
     "critters": "0.0.15",
     "css-loader": "6.5.1",
-    "esbuild-wasm": "0.14.1",
+    "esbuild-wasm": "0.14.2",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
     "inquirer": "8.2.0",
@@ -55,7 +55,7 @@
     "resolve-url-loader": "4.0.0",
     "rxjs": "6.6.7",
     "sass": "1.44.0",
-    "sass-loader": "12.3.0",
+    "sass-loader": "12.4.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.0",
     "source-map-support": "0.5.21",
@@ -65,14 +65,14 @@
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.64.4",
+    "webpack": "5.65.0",
     "webpack-dev-middleware": "5.2.2",
     "webpack-dev-server": "4.6.0",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.0.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.14.1"
+    "esbuild": "0.14.2"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^13.0.0 || ^13.1.0-next",
@@ -81,8 +81,8 @@
     "karma": "^6.3.0",
     "ng-packagr": "^13.0.0 || ^13.1.0-next",
     "protractor": "^7.0.0",
-    "tailwindcss": "^2.0.0",
-    "typescript": "~4.4.3"
+    "tailwindcss": "^2.0.0 || ^3.0.0",
+    "typescript": ">=4.4.3 <4.6"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {

package/src/babel/presets/application.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 type { ɵParsedTranslation } from '@angular/localize/private';
 import type { makeEs2015TranslatePlugin, makeEs5TranslatePlugin, makeLocalePlugin } from '@angular/localize/tools';
 export declare type DiagnosticReporter = (type: 'error' | 'warning' | 'info', message: string) => void;
 /**
@@ -22,9 +23,9 @@ export interface ApplicationPresetOptions {
     i18n?: {
         locale: string;
         missingTranslationBehavior?: 'error' | 'warning' | 'ignore';
-        translation?: unknown;
+        translation?: Record<string, ɵParsedTranslation>;
         translationFiles?: string[];
-        pluginCreators?: I18nPluginCreators;
+        pluginCreators: I18nPluginCreators;
     };
     angularLinker?: {
         shouldLink: boolean;

package/src/babel/presets/application.js

@@ -60,28 +60,18 @@ function createI18nDiagnostics(reporter) {
     })();
     return diagnostics;
 }
-function createI18nPlugins(locale, translation, missingTranslationBehavior, diagnosticReporter, 
-// TODO_ESM: Make `pluginCreators` required once `@angular/localize` is published with the `tools` entry point
-pluginCreators) {
+function createI18nPlugins(locale, translation, missingTranslationBehavior, diagnosticReporter, pluginCreators) {
     const diagnostics = createI18nDiagnostics(diagnosticReporter);
     const plugins = [];
+    const { makeEs5TranslatePlugin, makeEs2015TranslatePlugin, makeLocalePlugin } = pluginCreators;
     if (translation) {
-        const { makeEs2015TranslatePlugin,
-        // TODO_ESM: Remove all deep imports once `@angular/localize` is published with the `tools` entry point
-         } = pluginCreators !== null && pluginCreators !== void 0 ? pluginCreators : require('@angular/localize/src/tools/src/translate/source_files/es2015_translate_plugin');
         plugins.push(makeEs2015TranslatePlugin(diagnostics, translation, {
             missingTranslation: missingTranslationBehavior,
         }));
-        const { makeEs5TranslatePlugin,
-        // TODO_ESM: Remove all deep imports once `@angular/localize` is published with the `tools` entry point
-         } = pluginCreators !== null && pluginCreators !== void 0 ? pluginCreators : require('@angular/localize/src/tools/src/translate/source_files/es5_translate_plugin');
         plugins.push(makeEs5TranslatePlugin(diagnostics, translation, {
             missingTranslation: missingTranslationBehavior,
         }));
     }
-    const { makeLocalePlugin,
-    // TODO_ESM: Remove all deep imports once `@angular/localize` is published with the `tools` entry point
-     } = pluginCreators !== null && pluginCreators !== void 0 ? pluginCreators : require('@angular/localize/src/tools/src/translate/source_files/locale_plugin');
     plugins.push(makeLocalePlugin(locale));
     return plugins;
 }

package/src/babel/webpack-loader.js

@@ -66,13 +66,10 @@ exports.default = (0, babel_loader_1.custom)(() => {
             };
             // Analyze file for linking
             if (await requiresLinking(this.resourcePath, source)) {
-                if (!linkerPluginCreator) {
-                    // Load ESM `@angular/compiler-cli/linker/babel` 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 linkerBabelModule = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/linker/babel');
-                    linkerPluginCreator = linkerBabelModule.createEs2015LinkerPlugin;
-                }
+                // Load ESM `@angular/compiler-cli/linker/babel` 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.
+                linkerPluginCreator !== null && linkerPluginCreator !== void 0 ? linkerPluginCreator : (linkerPluginCreator = (await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/linker/babel')).createEs2015LinkerPlugin);
                 customOptions.angularLinker = {
                     shouldLink: true,
                     jitMode: aot !== true,
@@ -105,15 +102,11 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 // During the transition, this will always attempt to load the entry point for each file.
                 // This will only occur during prerelease and will be automatically corrected once the new
                 // entry point exists.
-                // TODO_ESM: Make import failure an error once the `tools` entry point exists.
                 if (i18nPluginCreators === undefined) {
                     // Load ESM `@angular/localize/tools` 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.
-                    try {
-                        i18nPluginCreators = await (0, load_esm_1.loadEsmModule)('@angular/localize/tools');
-                    }
-                    catch { }
+                    i18nPluginCreators = await (0, load_esm_1.loadEsmModule)('@angular/localize/tools');
                 }
                 customOptions.i18n = {
                     ...i18n,

package/src/builders/extract-i18n/ivy-extract-loader.js

@@ -47,7 +47,6 @@ async function extract(loaderContext, content, map, options) {
     // Try to load the `@angular/localize` message extractor.
     // All the localize usages are setup to first try the ESM entry point then fallback to the deep imports.
     // This provides interim compatibility while the framework is transitioned to bundled ESM packages.
-    // TODO_ESM: Remove all deep imports once `@angular/localize` is published with the `tools` entry point
     let MessageExtractor;
     try {
         // Load ESM `@angular/localize/tools` using the TypeScript dynamic import workaround.

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

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

package/src/utils/environment-options.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cachingDisabled = exports.maxWorkers = exports.profilingEnabled = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
+exports.cachingDisabled = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
 const color_1 = require("./color");
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
@@ -57,9 +57,6 @@ exports.allowMangle = isPresent(mangleVariable)
     : debugOptimize.mangle;
 exports.shouldBeautify = debugOptimize.beautify;
 exports.allowMinify = debugOptimize.minify;
-// Build profiling
-const profilingVariable = process.env['NG_BUILD_PROFILING'];
-exports.profilingEnabled = isPresent(profilingVariable) && isEnabled(profilingVariable);
 /**
  * Some environments, like CircleCI which use Docker report a number of CPUs by the host and not the count of available.
  * This cause `Error: Call retries were exceeded` errors when trying to use them.

package/src/utils/i18n-options.js

@@ -158,9 +158,7 @@ async function configureI18nBuild(context, options) {
         if (!desc.files.length) {
             continue;
         }
-        if (!loader) {
-            loader = await (0, load_translations_1.createTranslationLoader)();
-        }
+        loader !== null && loader !== void 0 ? loader : (loader = await (0, load_translations_1.createTranslationLoader)());
         loadTranslations(locale, desc, context.workspaceRoot, loader, {
             warn(message) {
                 context.logger.warn(message);

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

@@ -154,13 +154,26 @@ function updateAttribute(tag, name, value) {
 function isString(value) {
     return typeof value === 'string';
 }
-async function getLanguageDirection(lang, warnings) {
+async function getLanguageDirection(locale, warnings) {
+    const dir = await getLanguageDirectionFromLocales(locale);
+    if (!dir) {
+        warnings.push(`Locale data for '${locale}' cannot be found. 'dir' attribute will not be set for this locale.`);
+    }
+    return dir;
+}
+async function getLanguageDirectionFromLocales(locale) {
     try {
-        const localeData = (await (0, load_esm_1.loadEsmModule)(`@angular/common/locales/${lang}`)).default;
+        const localeData = (await (0, load_esm_1.loadEsmModule)(`@angular/common/locales/${locale}`)).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.`);
+        // In some cases certain locales might map to files which are named only with language id.
+        // Example: `en-US` -> `en`.
+        const [languageId] = locale.split('-', 1);
+        if (languageId !== locale) {
+            return getLanguageDirectionFromLocales(languageId);
+        }
     }
+    return undefined;
 }

package/src/utils/read-tsconfig.js

@@ -41,10 +41,7 @@ async function readTsconfig(tsconfigPath, workspaceRoot) {
     // Load ESM `@angular/compiler-cli` 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 compilerCliModule = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
-    // If it is not ESM then the functions needed will be stored in the `default` property.
-    // TODO_ESM: This can be removed once `@angular/compiler-cli` is ESM only.
-    const { formatDiagnostics, readConfiguration } = (compilerCliModule.readConfiguration ? compilerCliModule : compilerCliModule.default);
+    const { formatDiagnostics, readConfiguration } = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
     const configResult = readConfiguration(tsConfigFullPath);
     if (configResult.errors && configResult.errors.length) {
         throw new Error(formatDiagnostics(configResult.errors));

package/src/webpack/configs/common.js

@@ -47,7 +47,7 @@ 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, tsConfigPath } = wco;
+    const { root, projectRoot, buildOptions, tsConfig, projectName, sourceRoot, tsConfigPath, scriptTarget, } = 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 = [];
@@ -56,10 +56,7 @@ async function getCommonConfig(wco) {
     // Load ESM `@angular/compiler-cli` 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 compilerCliModule = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
-    // If it is not ESM then the values needed will be stored in the `default` property.
-    // TODO_ESM: This can be removed once `@angular/compiler-cli` is ESM only.
-    const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT, VERSION: NG_VERSION, } = (compilerCliModule.GLOBAL_DEFS_FOR_TERSER ? compilerCliModule : compilerCliModule.default);
+    const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT, VERSION: NG_VERSION, } = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
     // determine hashing format
     const hashFormat = (0, helpers_1.getOutputHashFormat)(buildOptions.outputHashing || 'none');
     if (buildOptions.progress) {
@@ -93,11 +90,6 @@ async function getCommonConfig(wco) {
             }
         }
     }
-    if (environment_options_1.profilingEnabled) {
-        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.
@@ -205,7 +197,7 @@ async function getCommonConfig(wco) {
         extraMinimizers.push(new plugins_1.JavaScriptOptimizerPlugin({
             define: buildOptions.aot ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT : GLOBAL_DEFS_FOR_TERSER,
             sourcemap: scriptsSourceMap,
-            target: wco.scriptTarget,
+            target: scriptTarget,
             keepNames: !environment_options_1.allowMangle || isPlatformServer,
             removeLicenses: buildOptions.extractLicenses,
             advanced: buildOptions.buildOptimizer,
@@ -230,7 +222,7 @@ async function getCommonConfig(wco) {
         devtool: false,
         target: [
             isPlatformServer ? 'node' : 'web',
-            tsConfig.options.target === typescript_1.ScriptTarget.ES5 ? 'es5' : 'es2015',
+            scriptTarget === typescript_1.ScriptTarget.ES5 ? 'es5' : 'es2015',
         ],
         profile: buildOptions.statsJson,
         resolve: {
@@ -238,10 +230,7 @@ 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', '...'],
+            ...(0, helpers_1.getMainFieldsAndConditionNames)(scriptTarget, isPlatformServer),
         },
         resolveLoader: {
             symlinks: !buildOptions.preserveSymlinks,
@@ -291,6 +280,12 @@ async function getCommonConfig(wco) {
                 }
                 : undefined,
             rules: [
+                {
+                    test: /\.?(svg|html)$/,
+                    // Only process HTML and SVG which are known Angular component resources.
+                    resourceQuery: /\?ngResource/,
+                    type: 'asset/source',
+                },
                 {
                     // Mark files inside `rxjs/add` as containing side effects.
                     // If this is fixed upstream and the fixed version becomes the minimum
@@ -308,7 +303,7 @@ async function getCommonConfig(wco) {
                             loader: require.resolve('../../babel/webpack-loader'),
                             options: {
                                 cacheDirectory: (cache.enabled && path.join(cache.path, 'babel-webpack')) || false,
-                                scriptTarget: wco.scriptTarget,
+                                scriptTarget,
                                 aot: buildOptions.aot,
                                 optimize: buildOptions.buildOptimizer,
                                 instrumentCode: codeCoverage

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

@@ -30,7 +30,7 @@ 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 = __importStar(require("url"));
+const url_1 = require("url");
 const load_esm_1 = require("../../utils/load-esm");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const hmr_loader_1 = require("../plugins/hmr/hmr-loader");
@@ -78,7 +78,7 @@ async function getDevServerConfig(wco) {
                 rewrites: [
                     {
                         from: new RegExp(`^(?!${servePath})/.*`),
-                        to: (context) => url.format(context.parsedUrl),
+                        to: (context) => context.parsedUrl.href,
                     },
                 ],
             },
@@ -186,7 +186,7 @@ async function addProxyConfig(root, proxyConfig) {
             // Load the ESM configuration file 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.
-            return (await (0, load_esm_1.loadEsmModule)(url.pathToFileURL(proxyPath))).default;
+            return (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
         case '.cjs':
             return require(proxyPath);
         default:
@@ -200,7 +200,7 @@ async function addProxyConfig(root, proxyConfig) {
                     // Load the ESM configuration file 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.
-                    return (await (0, load_esm_1.loadEsmModule)(url.pathToFileURL(proxyPath))).default;
+                    return (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
                 }
                 throw e;
             }
@@ -274,10 +274,8 @@ function getAllowedHostsConfig(options) {
 function getPublicHostOptions(options, webSocketPath) {
     let publicHost = options.publicHost;
     if (publicHost) {
-        if (!/^\w+:\/\//.test(publicHost)) {
-            publicHost = `https://${publicHost}`;
-        }
-        publicHost = url.parse(publicHost).host;
+        const hostWithProtocol = !/^\w+:\/\//.test(publicHost) ? `https://${publicHost}` : publicHost;
+        publicHost = new url_1.URL(hostWithProtocol).host;
     }
     return `auto://${publicHost || '0.0.0.0:0'}${webSocketPath}`;
 }

package/src/webpack/configs/styles.js

@@ -91,14 +91,16 @@ function getStylesConfig(wco) {
         wco.logger.warn('Stylus usage is deprecated and will be removed in a future major version. ' +
             'To opt-out of the deprecated behaviour, please migrate to another stylesheet language.');
     }
-    const sassImplementation = new sass_service_1.SassWorkerImplementation();
-    extraPlugins.push({
-        apply(compiler) {
-            compiler.hooks.shutdown.tap('sass-worker', () => {
-                sassImplementation === null || sassImplementation === void 0 ? void 0 : sassImplementation.close();
-            });
-        },
-    });
+    const sassImplementation = getSassImplementation();
+    if (sassImplementation instanceof sass_service_1.SassWorkerImplementation) {
+        extraPlugins.push({
+            apply(compiler) {
+                compiler.hooks.shutdown.tap('sass-worker', () => {
+                    sassImplementation === null || sassImplementation === void 0 ? void 0 : sassImplementation.close();
+                });
+            },
+        });
+    }
     const assetNameTemplate = (0, helpers_1.assetNameTemplateFactory)(hashFormat);
     const extraPostcssPlugins = [];
     // Attempt to setup Tailwind CSS
@@ -338,17 +340,17 @@ function getStylesConfig(wco) {
                     // Setup processing rules for global and component styles
                     {
                         oneOf: [
+                            // Global styles are only defined global styles
+                            {
+                                use: globalStyleLoaders,
+                                include: globalStylePaths,
+                                resourceQuery: { not: [/\?ngResource/] },
+                            },
                             // Component styles are all styles except defined global styles
                             {
-                                exclude: globalStylePaths,
                                 use: componentStyleLoaders,
                                 type: 'asset/source',
                             },
-                            // Global styles are only defined global styles
-                            {
-                                include: globalStylePaths,
-                                use: globalStyleLoaders,
-                            },
                         ],
                     },
                     { use },
@@ -368,3 +370,12 @@ function getStylesConfig(wco) {
     };
 }
 exports.getStylesConfig = getStylesConfig;
+function getSassImplementation() {
+    const { webcontainer } = process.versions;
+    // When `webcontainer` is a truthy it means that we are running in a StackBlitz webcontainer.
+    // `SassWorkerImplementation` uses `receiveMessageOnPort` Node.js `worker_thread` API to ensure sync behavior which is ~2x faster.
+    // However, it is non trivial to support this in a webcontainer and while slower we choose to use `dart-sass`
+    // which in Webpack uses the slower async path.
+    // We should periodically check with StackBlitz folks (Mark Whitfeld / Dominic Elm) to determine if this workaround is still needed.
+    return webcontainer ? require('sass') : new sass_service_1.SassWorkerImplementation();
+}

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

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import type { ObjectPattern } from 'copy-webpack-plugin';
+import { ScriptTarget } from 'typescript';
 import type { Configuration, WebpackOptionsNormalized } from 'webpack';
 import { AssetPatternClass, ExtraEntryPoint, ExtraEntryPointClass } from '../../builders/browser/schema';
 import { WebpackConfigOptions } from '../../utils/build-options';
@@ -30,4 +31,5 @@ export declare function assetPatterns(root: string, assets: AssetPatternClass[])
 export declare function externalizePackages(context: string, request: string | undefined, callback: (error?: Error, result?: string) => void): void;
 declare type WebpackStatsOptions = Exclude<Configuration['stats'], string | boolean>;
 export declare function getStatsOptions(verbose?: boolean): WebpackStatsOptions;
+export declare function getMainFieldsAndConditionNames(target: ScriptTarget, platformServer: boolean): Pick<WebpackOptionsNormalized['resolve'], 'mainFields' | 'conditionNames'>;
 export {};

package/src/webpack/utils/helpers.js

@@ -29,11 +29,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStatsOptions = exports.externalizePackages = exports.assetPatterns = exports.globalScriptsByBundleName = exports.getCacheSettings = exports.getInstrumentationExcludedPaths = exports.assetNameTemplateFactory = exports.normalizeExtraEntryPoints = exports.getOutputHashFormat = void 0;
+exports.getMainFieldsAndConditionNames = exports.getStatsOptions = exports.externalizePackages = exports.assetPatterns = exports.globalScriptsByBundleName = exports.getCacheSettings = exports.getInstrumentationExcludedPaths = exports.assetNameTemplateFactory = exports.normalizeExtraEntryPoints = exports.getOutputHashFormat = void 0;
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const glob_1 = __importDefault(require("glob"));
 const path = __importStar(require("path"));
+const typescript_1 = require("typescript");
 function getOutputHashFormat(option, length = 20) {
     const hashFormats = {
         none: { chunk: '', extract: '', file: '', script: '' },
@@ -115,6 +116,7 @@ function getCacheSettings(wco, angularVersion) {
         const packageVersion = require('../../../package.json').version;
         return {
             type: 'filesystem',
+            profile: wco.buildOptions.verbose,
             cacheDirectory: path.join(cacheDirectory, 'angular-webpack'),
             maxMemoryGenerations: 1,
             // We use the versions and build options as the cache name. The Webpack configurations are too
@@ -265,3 +267,18 @@ function getStatsOptions(verbose = false) {
         : webpackOutputOptions;
 }
 exports.getStatsOptions = getStatsOptions;
+function getMainFieldsAndConditionNames(target, platformServer) {
+    const mainFields = platformServer
+        ? ['es2015', 'module', 'main']
+        : ['es2015', 'browser', 'module', 'main'];
+    const conditionNames = ['es2015', '...'];
+    if (target >= typescript_1.ScriptTarget.ES2020) {
+        mainFields.unshift('es2020');
+        conditionNames.unshift('es2020');
+    }
+    return {
+        mainFields,
+        conditionNames,
+    };
+}
+exports.getMainFieldsAndConditionNames = getMainFieldsAndConditionNames;