@angular-devkit/build-angular 15.0.0-next.1 → 15.0.0-next.3

package/src/utils/esbuild-targets.js

@@ -0,0 +1,39 @@
+"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.transformSupportedBrowsersToTargets = void 0;
+/**
+ * Transform browserlists result to esbuild target.
+ * @see https://esbuild.github.io/api/#target
+ */
+function transformSupportedBrowsersToTargets(supportedBrowsers) {
+    const transformed = [];
+    // https://esbuild.github.io/api/#target
+    const esBuildSupportedBrowsers = new Set(['safari', 'firefox', 'edge', 'chrome', 'ios', 'node']);
+    for (const browser of supportedBrowsers) {
+        let [browserName, version] = browser.split(' ');
+        // browserslist uses the name `ios_saf` for iOS Safari whereas esbuild uses `ios`
+        if (browserName === 'ios_saf') {
+            browserName = 'ios';
+        }
+        // browserslist uses ranges `15.2-15.3` versions but only the lowest is required
+        // to perform minimum supported feature checks. esbuild also expects a single version.
+        [version] = version.split('-');
+        if (esBuildSupportedBrowsers.has(browserName)) {
+            if (browserName === 'safari' && version === 'TP') {
+                // esbuild only supports numeric versions so `TP` is converted to a high number (999) since
+                // a Technology Preview (TP) of Safari is assumed to support all currently known features.
+                version = '999';
+            }
+            transformed.push(browserName + version);
+        }
+    }
+    return transformed;
+}
+exports.transformSupportedBrowsersToTargets = transformSupportedBrowsersToTargets;

package/src/utils/i18n-inlining.d.ts

@@ -8,4 +8,4 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { EmittedFiles } from '@angular-devkit/build-webpack';
 import { I18nOptions } from './i18n-options';
-export declare function i18nInlineEmittedFiles(context: BuilderContext, emittedFiles: EmittedFiles[], i18n: I18nOptions, baseOutputPath: string, outputPaths: string[], scriptsEntryPointName: string[], emittedPath: string, es5: boolean, missingTranslation: 'error' | 'warning' | 'ignore' | undefined): Promise<boolean>;
+export declare function i18nInlineEmittedFiles(context: BuilderContext, emittedFiles: EmittedFiles[], i18n: I18nOptions, baseOutputPath: string, outputPaths: string[], scriptsEntryPointName: string[], emittedPath: string, missingTranslation: 'error' | 'warning' | 'ignore' | undefined): Promise<boolean>;

package/src/utils/i18n-inlining.js

@@ -37,7 +37,7 @@ const action_executor_1 = require("./action-executor");
 const copy_assets_1 = require("./copy-assets");
 const error_1 = require("./error");
 const spinner_1 = require("./spinner");
-function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, outputPath, es5, missingTranslation, context) {
+function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, outputPath, missingTranslation, context) {
     const options = [];
     const originalFiles = [];
     for (const emittedFile of emittedFiles) {
@@ -50,7 +50,6 @@ function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emitte
         const action = {
             filename: emittedFile.file,
             code: fs.readFileSync(originalPath, 'utf8'),
-            es5,
             outputPath,
             missingTranslation,
             setLocale: emittedFile.name === 'main' || emittedFile.name === 'vendor',
@@ -72,13 +71,13 @@ function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emitte
     }
     return { options, originalFiles };
 }
-async function i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, scriptsEntryPointName, emittedPath, es5, missingTranslation) {
+async function i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, outputPaths, scriptsEntryPointName, emittedPath, missingTranslation) {
     const executor = new action_executor_1.BundleActionExecutor({ i18n });
     let hasErrors = false;
     const spinner = new spinner_1.Spinner();
     spinner.start('Generating localized bundles...');
     try {
-        const { options, originalFiles: processedFiles } = emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, baseOutputPath, es5, missingTranslation, context);
+        const { options, originalFiles: processedFiles } = emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, baseOutputPath, missingTranslation, context);
         for await (const result of executor.inlineAll(options)) {
             context.logger.debug(`i18n file processed: ${result.file}`);
             for (const diagnostic of result.diagnostics) {

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 { json } from '@angular-devkit/core';
+import { json, logging } 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';
@@ -18,5 +18,6 @@ export declare type NormalizedBrowserBuilderSchema = BrowserBuilderSchema & Buil
     assets: AssetPatternClass[];
     fileReplacements: NormalizedFileReplacement[];
     optimization: NormalizedOptimizationOptions;
+    polyfills: string[];
 };
-export declare function normalizeBrowserSchema(workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined, options: BrowserBuilderSchema, metadata: json.JsonObject): NormalizedBrowserBuilderSchema;
+export declare function normalizeBrowserSchema(workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined, options: BrowserBuilderSchema, metadata: json.JsonObject, logger: logging.LoggerApi): NormalizedBrowserBuilderSchema;

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

@@ -12,17 +12,18 @@ 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_polyfills_1 = require("./normalize-polyfills");
 const normalize_source_maps_1 = require("./normalize-source-maps");
 const supported_browsers_1 = require("./supported-browsers");
-function normalizeBrowserSchema(workspaceRoot, projectRoot, projectSourceRoot, options, metadata) {
-    const normalizedSourceMapOptions = (0, normalize_source_maps_1.normalizeSourceMaps)(options.sourceMap || false);
+function normalizeBrowserSchema(workspaceRoot, projectRoot, projectSourceRoot, options, metadata, logger) {
     return {
         ...options,
         cache: (0, normalize_cache_1.normalizeCacheOptions)(metadata, workspaceRoot),
         assets: (0, normalize_asset_patterns_1.normalizeAssetPatterns)(options.assets || [], workspaceRoot, projectRoot, projectSourceRoot),
         fileReplacements: (0, normalize_file_replacements_1.normalizeFileReplacements)(options.fileReplacements || [], workspaceRoot),
         optimization: (0, normalize_optimization_1.normalizeOptimization)(options.optimization),
-        sourceMap: normalizedSourceMapOptions,
+        sourceMap: (0, normalize_source_maps_1.normalizeSourceMaps)(options.sourceMap || false),
+        polyfills: (0, normalize_polyfills_1.normalizePolyfills)(options.polyfills, workspaceRoot),
         preserveSymlinks: options.preserveSymlinks === undefined
             ? process.execArgv.includes('--preserve-symlinks')
             : options.preserveSymlinks,
@@ -37,7 +38,7 @@ function normalizeBrowserSchema(workspaceRoot, projectRoot, projectSourceRoot, o
         // 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)(projectRoot),
+        supportedBrowsers: (0, supported_browsers_1.getSupportedBrowsers)(projectRoot, logger),
     };
 }
 exports.normalizeBrowserSchema = normalizeBrowserSchema;

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

@@ -0,0 +1,8 @@
+/**
+ * @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 normalizePolyfills(polyfills: string[] | string | undefined, root: string): string[];

package/src/utils/normalize-polyfills.js

@@ -0,0 +1,24 @@
+"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.normalizePolyfills = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+function normalizePolyfills(polyfills, root) {
+    if (!polyfills) {
+        return [];
+    }
+    const polyfillsList = Array.isArray(polyfills) ? polyfills : [polyfills];
+    return polyfillsList.map((p) => {
+        const resolvedPath = (0, path_1.resolve)(root, p);
+        // If file doesn't exist, let the bundle resolve it using node module resolution.
+        return (0, fs_1.existsSync)(resolvedPath) ? resolvedPath : p;
+    });
+}
+exports.normalizePolyfills = normalizePolyfills;

package/src/utils/process-bundle.d.ts

@@ -13,7 +13,6 @@ export interface InlineOptions {
     filename: string;
     code: string;
     map?: string;
-    es5: boolean;
     outputPath: string;
     missingTranslation?: 'warning' | 'error' | 'ignore';
     setLocale?: boolean;

package/src/utils/process-bundle.js

@@ -37,7 +37,7 @@ exports.inlineLocales = exports.createI18nPlugins = void 0;
 const remapping_1 = __importDefault(require("@ampproject/remapping"));
 const core_1 = require("@babel/core");
 const template_1 = __importDefault(require("@babel/template"));
-const fs = __importStar(require("fs"));
+const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const worker_threads_1 = require("worker_threads");
 const environment_options_1 = require("./environment-options");
@@ -73,7 +73,7 @@ async function loadLocalizeTools() {
     return (0, load_esm_1.loadEsmModule)('@angular/localize/tools');
 }
 async function createI18nPlugins(locale, translation, missingTranslation, shouldInline, localeDataContent) {
-    const { Diagnostics, makeEs2015TranslatePlugin, makeEs5TranslatePlugin, makeLocalePlugin } = await loadLocalizeTools();
+    const { Diagnostics, makeEs2015TranslatePlugin, makeLocalePlugin } = await loadLocalizeTools();
     const plugins = [];
     const diagnostics = new Diagnostics();
     if (shouldInline) {
@@ -82,11 +82,6 @@ async function createI18nPlugins(locale, translation, missingTranslation, should
         makeEs2015TranslatePlugin(diagnostics, (translation || {}), {
             missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
         }));
-        plugins.push(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        makeEs5TranslatePlugin(diagnostics, (translation || {}), {
-            missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
-        }));
     }
     plugins.push(makeLocalePlugin(locale));
     if (localeDataContent) {
@@ -149,7 +144,7 @@ async function inlineLocales(options) {
             // If locale data is provided, load it and prepend to file
             const localeDataPath = (_a = i18n.locales[locale]) === null || _a === void 0 ? void 0 : _a.dataPath;
             if (localeDataPath) {
-                localeDataContent = await loadLocaleData(localeDataPath, true, options.es5);
+                localeDataContent = await loadLocaleData(localeDataPath, true);
             }
         }
         const { diagnostics: localeDiagnostics, plugins } = await createI18nPlugins(locale, translations, isSourceLocale ? 'ignore' : options.missingTranslation || 'warning', true, localeDataContent);
@@ -170,10 +165,10 @@ async function inlineLocales(options) {
             throw new Error(`Unknown error occurred processing bundle for "${options.filename}".`);
         }
         const outputPath = path.join(options.outputPath, i18n.flatOutput ? '' : locale, options.filename);
-        fs.writeFileSync(outputPath, transformResult.code);
+        await fs.writeFile(outputPath, transformResult.code);
         if (options.map && transformResult.map) {
             const outputMap = (0, remapping_1.default)([transformResult.map, options.map], () => null);
-            fs.writeFileSync(outputPath + '.map', JSON.stringify(outputMap));
+            await fs.writeFile(outputPath + '.map', JSON.stringify(outputMap));
         }
     }
     return { file: options.filename, diagnostics };
@@ -221,7 +216,7 @@ async function inlineLocalesDirect(ast, options) {
             let localeDataSource;
             const localeDataPath = i18n.locales[locale] && i18n.locales[locale].dataPath;
             if (localeDataPath) {
-                const localeDataContent = await loadLocaleData(localeDataPath, true, options.es5);
+                const localeDataContent = await loadLocaleData(localeDataPath, true);
                 localeDataSource = new OriginalSource(localeDataContent, path.basename(localeDataPath));
             }
             outputSource = localeDataSource
@@ -231,26 +226,26 @@ async function inlineLocalesDirect(ast, options) {
         }
         const { source: outputCode, map: outputMap } = outputSource.sourceAndMap();
         const outputPath = path.join(options.outputPath, i18n.flatOutput ? '' : locale, options.filename);
-        fs.writeFileSync(outputPath, outputCode);
+        await fs.writeFile(outputPath, outputCode);
         if (inputMap && outputMap) {
             outputMap.file = options.filename;
             if (mapSourceRoot) {
                 outputMap.sourceRoot = mapSourceRoot;
             }
-            fs.writeFileSync(outputPath + '.map', JSON.stringify(outputMap));
+            await fs.writeFile(outputPath + '.map', JSON.stringify(outputMap));
         }
     }
     return { file: options.filename, diagnostics: diagnostics.messages, count: positions.length };
 }
-function inlineCopyOnly(options) {
+async function inlineCopyOnly(options) {
     if (!i18n) {
         throw new Error('i18n options are missing');
     }
     for (const locale of i18n.inlineLocales) {
         const outputPath = path.join(options.outputPath, i18n.flatOutput ? '' : locale, options.filename);
-        fs.writeFileSync(outputPath, options.code);
+        await fs.writeFile(outputPath, options.code);
         if (options.map) {
-            fs.writeFileSync(outputPath + '.map', options.map);
+            await fs.writeFile(outputPath + '.map', options.map);
         }
     }
     return { file: options.filename, diagnostics: [], count: 0 };
@@ -260,43 +255,21 @@ function findLocalizePositions(ast, options, utils) {
     // Workaround to ensure a path hub is present for traversal
     const { File } = require('@babel/core');
     const file = new File({}, { code: options.code, ast });
-    if (options.es5) {
-        (0, core_1.traverse)(file.ast, {
-            CallExpression(path) {
-                const callee = path.get('callee');
-                if (callee.isIdentifier() &&
-                    callee.node.name === localizeName &&
-                    utils.isGlobalIdentifier(callee)) {
-                    const [messageParts, expressions] = unwrapLocalizeCall(path, utils);
-                    positions.push({
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        start: path.node.start,
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        end: path.node.end,
-                        messageParts,
-                        expressions,
-                    });
-                }
-            },
-        });
-    }
-    else {
-        (0, core_1.traverse)(file.ast, {
-            TaggedTemplateExpression(path) {
-                if (core_1.types.isIdentifier(path.node.tag) && path.node.tag.name === localizeName) {
-                    const [messageParts, expressions] = unwrapTemplateLiteral(path, utils);
-                    positions.push({
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        start: path.node.start,
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        end: path.node.end,
-                        messageParts,
-                        expressions,
-                    });
-                }
-            },
-        });
-    }
+    (0, core_1.traverse)(file.ast, {
+        TaggedTemplateExpression(path) {
+            if (core_1.types.isIdentifier(path.node.tag) && path.node.tag.name === localizeName) {
+                const [messageParts, expressions] = unwrapTemplateLiteral(path, utils);
+                positions.push({
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    start: path.node.start,
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    end: path.node.end,
+                    messageParts,
+                    expressions,
+                });
+            }
+        },
+    });
     return positions;
 }
 function unwrapTemplateLiteral(path, utils) {
@@ -309,9 +282,9 @@ function unwrapLocalizeCall(path, utils) {
     const [expressions] = utils.unwrapSubstitutionsFromLocalizeCall(path);
     return [messageParts, expressions];
 }
-async function loadLocaleData(path, optimize, es5) {
+async function loadLocaleData(path, optimize) {
     // The path is validated during option processing before the build starts
-    const content = fs.readFileSync(path, 'utf8');
+    const content = await fs.readFile(path, 'utf8');
     // Downlevel and optimize the data
     const transformResult = await (0, core_1.transformAsync)(content, {
         filename: path,
@@ -325,8 +298,7 @@ async function loadLocaleData(path, optimize, es5) {
                 require.resolve('@babel/preset-env'),
                 {
                     bugfixes: true,
-                    // IE 11 is the oldest supported browser
-                    targets: es5 ? { ie: '11' } : { esmodules: true },
+                    targets: { esmodules: true },
                 },
             ],
         ],

package/src/utils/supported-browsers.d.ts

@@ -5,4 +5,5 @@
  * 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 getSupportedBrowsers(projectRoot: string): string[];
+import { logging } from '@angular-devkit/core';
+export declare function getSupportedBrowsers(projectRoot: string, logger: logging.LoggerApi): string[];

package/src/utils/supported-browsers.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSupportedBrowsers = void 0;
 const browserslist_1 = __importDefault(require("browserslist"));
-function getSupportedBrowsers(projectRoot) {
+function getSupportedBrowsers(projectRoot, logger) {
     browserslist_1.default.defaults = [
         'last 1 Chrome version',
         'last 1 Firefox version',
@@ -21,6 +21,22 @@ function getSupportedBrowsers(projectRoot) {
         'last 2 iOS major versions',
         'Firefox ESR',
     ];
-    return (0, browserslist_1.default)(undefined, { path: projectRoot });
+    // Get browsers from config or default.
+    const browsersFromConfigOrDefault = new Set((0, browserslist_1.default)(undefined, { path: projectRoot }));
+    // Get browsers that support ES6 modules.
+    const browsersThatSupportEs6 = new Set((0, browserslist_1.default)('supports es6-module'));
+    const unsupportedBrowsers = [];
+    for (const browser of browsersFromConfigOrDefault) {
+        if (!browsersThatSupportEs6.has(browser)) {
+            browsersFromConfigOrDefault.delete(browser);
+            unsupportedBrowsers.push(browser);
+        }
+    }
+    if (unsupportedBrowsers.length) {
+        logger.warn(`One or more browsers which are configured in the project's Browserslist configuration ` +
+            'will be ignored as ES5 output is not supported by the Angular CLI.\n' +
+            `Ignored browsers: ${unsupportedBrowsers.join(', ')}`);
+    }
+    return Array.from(browsersFromConfigOrDefault);
 }
 exports.getSupportedBrowsers = getSupportedBrowsers;

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

@@ -7,7 +7,6 @@
  */
 import { BuilderContext } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { ScriptTarget } from 'typescript';
 import { Configuration } from 'webpack';
 import { Schema as BrowserBuilderSchema } from '../builders/browser/schema';
 import { NormalizedBrowserBuilderSchema } from '../utils';
@@ -21,7 +20,6 @@ export declare function generateI18nBrowserWebpackConfigFromContext(options: Bro
     projectRoot: string;
     projectSourceRoot?: string;
     i18n: I18nOptions;
-    target: ScriptTarget;
 }>;
 export declare function generateBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, webpackPartialGenerator: WebpackPartialGenerator, extraBuildOptions?: Partial<NormalizedBrowserBuilderSchema>): Promise<{
     config: Configuration;

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

@@ -32,7 +32,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIndexInputFile = exports.getIndexOutputFile = exports.generateBrowserWebpackConfigFromContext = exports.generateI18nBrowserWebpackConfigFromContext = exports.generateWebpackConfig = void 0;
 const path = __importStar(require("path"));
-const typescript_1 = require("typescript");
 const webpack_1 = require("webpack");
 const webpack_merge_1 = require("webpack-merge");
 const utils_1 = require("../utils");
@@ -46,8 +45,6 @@ async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, pro
     }
     const tsConfigPath = path.resolve(workspaceRoot, options.tsConfig);
     const tsConfig = await (0, read_tsconfig_1.readTsconfig)(tsConfigPath);
-    const ts = await Promise.resolve().then(() => __importStar(require('typescript')));
-    const scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
     const buildOptions = { ...options, ...extraBuildOptions };
     const wco = {
         root: workspaceRoot,
@@ -58,7 +55,6 @@ async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, pro
         tsConfig,
         tsConfigPath,
         projectName,
-        scriptTarget,
     };
     wco.buildOptions.progress = (0, utils_1.defaultProgress)(wco.buildOptions.progress);
     const partials = await Promise.all(webpackPartialGenerator(wco));
@@ -69,9 +65,7 @@ exports.generateWebpackConfig = generateWebpackConfig;
 async function generateI18nBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, extraBuildOptions = {}) {
     var _a;
     const { buildOptions, i18n } = await (0, i18n_options_1.configureI18nBuild)(context, options);
-    let target = typescript_1.ScriptTarget.ES5;
     const result = await generateBrowserWebpackConfigFromContext(buildOptions, context, (wco) => {
-        target = wco.scriptTarget;
         return webpackPartialGenerator(wco);
     }, extraBuildOptions);
     const config = result.config;
@@ -107,7 +101,7 @@ async function generateI18nBrowserWebpackConfigFromContext(options, context, web
             },
         });
     }
-    return { ...result, i18n, target };
+    return { ...result, i18n };
 }
 exports.generateI18nBrowserWebpackConfigFromContext = generateI18nBrowserWebpackConfigFromContext;
 async function generateBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, extraBuildOptions = {}) {
@@ -121,7 +115,7 @@ async function generateBrowserWebpackConfigFromContext(options, context, webpack
     const projectRoot = path.join(workspaceRoot, (_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '');
     const sourceRoot = projectMetadata.sourceRoot;
     const projectSourceRoot = sourceRoot ? path.join(workspaceRoot, sourceRoot) : undefined;
-    const normalizedOptions = (0, utils_1.normalizeBrowserSchema)(workspaceRoot, projectRoot, projectSourceRoot, options, projectMetadata);
+    const normalizedOptions = (0, utils_1.normalizeBrowserSchema)(workspaceRoot, projectRoot, projectSourceRoot, options, projectMetadata, context.logger);
     const config = await generateWebpackConfig(workspaceRoot, projectRoot, projectSourceRoot, 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

package/src/utils/webpack-diagnostics.d.ts

@@ -5,6 +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
  */
-import { Compilation } from 'webpack';
+import type { Compilation } from 'webpack';
 export declare function addWarning(compilation: Compilation, message: string): void;
 export declare function addError(compilation: Compilation, message: string): void;

package/src/utils/webpack-diagnostics.js

@@ -8,12 +8,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addError = exports.addWarning = void 0;
-const webpack_1 = require("webpack");
 function addWarning(compilation, message) {
-    compilation.warnings.push(new webpack_1.WebpackError(message));
+    compilation.warnings.push(new compilation.compiler.webpack.WebpackError(message));
 }
 exports.addWarning = addWarning;
 function addError(compilation, message) {
-    compilation.errors.push(new webpack_1.WebpackError(message));
+    compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
 }
 exports.addError = addError;

package/src/webpack/configs/common.js

@@ -37,7 +37,6 @@ exports.getCommonConfig = void 0;
 const webpack_1 = require("@ngtools/webpack");
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 const path = __importStar(require("path"));
-const typescript_1 = require("typescript");
 const webpack_2 = require("webpack");
 const webpack_subresource_integrity_1 = require("webpack-subresource-integrity");
 const environment_options_1 = require("../../utils/environment-options");
@@ -47,15 +46,15 @@ const devtools_ignore_plugin_1 = require("../plugins/devtools-ignore-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 typescript_1 = require("../plugins/typescript");
 const watch_files_logs_plugin_1 = require("../plugins/watch-files-logs-plugin");
 const helpers_1 = require("../utils/helpers");
 const VENDORS_TEST = /[\\/]node_modules[\\/]/;
 // eslint-disable-next-line max-lines-per-function
 async function getCommonConfig(wco) {
     var _a, _b;
-    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 { 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, } = buildOptions;
     const isPlatformServer = buildOptions.platform === 'server';
     const extraPlugins = [];
     const extraRules = [];
@@ -77,14 +76,32 @@ async function getCommonConfig(wco) {
         // 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']) {
-                entryPoints['polyfills'].push(projectPolyfills);
+    if (polyfills === null || polyfills === void 0 ? void 0 : polyfills.length) {
+        // `zone.js/testing` is a **special** polyfill because when not imported in the main it fails with the below errors:
+        // `Error: Expected to be running in 'ProxyZone', but it was not found.`
+        // This was also the reason why previously it was imported in `test.ts` as the first module.
+        // From Jia li:
+        // This is because the jasmine functions such as beforeEach/it will not be patched by zone.js since
+        // jasmine will not be loaded yet, so the ProxyZone will not be there. We have to load zone-testing.js after
+        // jasmine is ready.
+        // We could force loading 'zone.js/testing' prior to jasmine by changing the order of scripts in 'karma-context.html'.
+        // But this has it's own problems as zone.js needs to be loaded prior to jasmine due to patching of timing functions
+        // See: https://github.com/jasmine/jasmine/issues/1944
+        // Thus the correct order is zone.js -> jasmine -> zone.js/testing.
+        const zoneTestingEntryPoint = 'zone.js/testing';
+        const polyfillsExludingZoneTesting = polyfills.filter((p) => p !== zoneTestingEntryPoint);
+        if (Array.isArray(entryPoints['polyfills'])) {
+            entryPoints['polyfills'].push(...polyfillsExludingZoneTesting);
+        }
+        else {
+            entryPoints['polyfills'] = polyfillsExludingZoneTesting;
+        }
+        if (polyfillsExludingZoneTesting.length !== polyfills.length) {
+            if (Array.isArray(entryPoints['main'])) {
+                entryPoints['main'].unshift(zoneTestingEntryPoint);
             }
             else {
-                entryPoints['polyfills'] = [projectPolyfills];
+                entryPoints['main'] = [zoneTestingEntryPoint];
             }
         }
     }
@@ -185,17 +202,17 @@ async function getCommonConfig(wco) {
                 /[\\/]node_modules[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/,
             ],
         });
-        extraPlugins.push((0, typescript_2.createIvyPlugin)(wco, aot, tsConfigPath));
+        extraPlugins.push((0, typescript_1.createIvyPlugin)(wco, aot, tsConfigPath));
     }
     if (webWorkerTsConfig) {
-        extraPlugins.push((0, typescript_2.createIvyPlugin)(wco, false, path.resolve(wco.root, webWorkerTsConfig)));
+        extraPlugins.push((0, typescript_1.createIvyPlugin)(wco, false, path.resolve(wco.root, webWorkerTsConfig)));
     }
     const extraMinimizers = [];
     if (scriptsOptimization) {
         extraMinimizers.push(new plugins_1.JavaScriptOptimizerPlugin({
             define: buildOptions.aot ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT : GLOBAL_DEFS_FOR_TERSER,
             sourcemap: scriptsSourceMap,
-            target: scriptTarget,
+            supportedBrowsers: buildOptions.supportedBrowsers,
             keepIdentifierNames: !environment_options_1.allowMangle || isPlatformServer,
             keepNames: isPlatformServer,
             removeLicenses: buildOptions.extractLicenses,
@@ -205,10 +222,6 @@ async function getCommonConfig(wco) {
     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';
@@ -219,24 +232,24 @@ async function getCommonConfig(wco) {
     return {
         mode: scriptsOptimization || stylesOptimization.minify ? 'production' : 'development',
         devtool: false,
-        target: [
-            isPlatformServer ? 'node' : 'web',
-            scriptTarget === typescript_1.ScriptTarget.ES5 ? 'es5' : 'es2015',
-        ],
+        target: [isPlatformServer ? 'node' : 'web', 'es2015'],
         profile: buildOptions.statsJson,
         resolve: {
             roots: [projectRoot],
             extensions: ['.ts', '.tsx', '.mjs', '.js'],
             symlinks: !buildOptions.preserveSymlinks,
             modules: [tsConfig.options.baseUrl || projectRoot, 'node_modules'],
-            ...(0, helpers_1.getMainFieldsAndConditionNames)(scriptTarget, isPlatformServer),
+            mainFields: isPlatformServer
+                ? ['es2020', 'es2015', 'module', 'main']
+                : ['es2020', 'es2015', 'browser', 'module', 'main'],
+            conditionNames: ['es2020', 'es2015', '...'],
         },
         resolveLoader: {
             symlinks: !buildOptions.preserveSymlinks,
         },
         context: root,
         entry: entryPoints,
-        externals,
+        externals: externalDependencies,
         output: {
             uniqueName: projectName,
             hashFunction: 'xxhash64',
@@ -281,6 +294,7 @@ async function getCommonConfig(wco) {
             strictExportPresence: true,
             parser: {
                 javascript: {
+                    requireContext: false,
                     // Disable auto URL asset module creation. This doesn't effect `new Worker(new URL(...))`
                     // https://webpack.js.org/guides/asset-modules/#url-assets
                     url: false,
@@ -313,7 +327,6 @@ async function getCommonConfig(wco) {
                             loader: require.resolve('../../babel/webpack-loader'),
                             options: {
                                 cacheDirectory: (cache.enabled && path.join(cache.path, 'babel-webpack')) || false,
-                                scriptTarget,
                                 aot: buildOptions.aot,
                                 optimize: buildOptions.buildOptimizer,
                                 supportedBrowsers: buildOptions.supportedBrowsers,

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

@@ -46,7 +46,7 @@ async function getDevServerConfig(wco) {
     if (hmr) {
         extraRules.push({
             loader: hmr_loader_1.HmrLoader,
-            include: [main].map((p) => (0, path_1.resolve)(wco.root, p)),
+            include: [(0, path_1.resolve)(wco.root, main)],
         });
     }
     const extraPlugins = [];