@angular-devkit/build-angular 17.0.0-rc.3 → 17.0.0-rc.5

package/src/builders/karma/find-tests-plugin.js

@@ -89,18 +89,26 @@ async function findTests(include, exclude, workspaceRoot, projectSourceRoot) {
     return [...new Set(files.flat())];
 }
 const normalizePath = (path) => path.replace(/\\/g, '/');
+const removeLeadingSlash = (pattern) => {
+    if (pattern.charAt(0) === '/') {
+        return pattern.substring(1);
+    }
+    return pattern;
+};
+const removeRelativeRoot = (path, root) => {
+    if (path.startsWith(root)) {
+        return path.substring(root.length);
+    }
+    return path;
+};
 async function findMatchingTests(pattern, ignore, workspaceRoot, projectSourceRoot) {
     // normalize pattern, glob lib only accepts forward slashes
     let normalizedPattern = normalizePath(pattern);
-    if (normalizedPattern.charAt(0) === '/') {
-        normalizedPattern = normalizedPattern.substring(1);
-    }
+    normalizedPattern = removeLeadingSlash(normalizedPattern);
     const relativeProjectRoot = normalizePath((0, path_1.relative)(workspaceRoot, projectSourceRoot) + '/');
     // remove relativeProjectRoot to support relative paths from root
     // such paths are easy to get when running scripts via IDEs
-    if (normalizedPattern.startsWith(relativeProjectRoot)) {
-        normalizedPattern = normalizedPattern.substring(relativeProjectRoot.length);
-    }
+    normalizedPattern = removeRelativeRoot(normalizedPattern, relativeProjectRoot);
     // special logic when pattern does not look like a glob
     if (!(0, fast_glob_1.isDynamicPattern)(normalizedPattern)) {
         if (await isDirectory((0, path_1.join)(projectSourceRoot, normalizedPattern))) {
@@ -116,10 +124,12 @@ async function findMatchingTests(pattern, ignore, workspaceRoot, projectSourceRo
             }
         }
     }
+    // normalize the patterns in the ignore list
+    const normalizedIgnorePatternList = ignore.map((pattern) => removeRelativeRoot(removeLeadingSlash(normalizePath(pattern)), relativeProjectRoot));
     return (0, fast_glob_1.default)(normalizedPattern, {
         cwd: projectSourceRoot,
         absolute: true,
-        ignore: ['**/node_modules/**', ...ignore],
+        ignore: ['**/node_modules/**', ...normalizedIgnorePatternList],
     });
 }
 async function isDirectory(path) {

package/src/builders/ssr-dev-server/index.d.ts

@@ -9,7 +9,7 @@ import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
 import { json, logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { Schema } from './schema';
-type SSRDevServerBuilderOptions = Schema & json.JsonObject;
+export type SSRDevServerBuilderOptions = Schema & json.JsonObject;
 export type SSRDevServerBuilderOutput = BuilderOutput & {
     baseUrl?: string;
     port?: string;

package/src/index.d.ts

@@ -14,4 +14,5 @@ export { execute as executeExtractI18nBuilder, ExtractI18nBuilderOptions, } from
 export { execute as executeKarmaBuilder, KarmaBuilderOptions, KarmaConfigOptions, } from './builders/karma';
 export { execute as executeProtractorBuilder, ProtractorBuilderOptions, } from './builders/protractor';
 export { execute as executeServerBuilder, ServerBuilderOptions, ServerBuilderOutput, } from './builders/server';
+export { execute as executeSSRDevServerBuilder, SSRDevServerBuilderOptions, SSRDevServerBuilderOutput, } from './builders/ssr-dev-server';
 export { execute as executeNgPackagrBuilder, NgPackagrBuilderOptions } from './builders/ng-packagr';

package/src/index.js

@@ -21,7 +21,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeNgPackagrBuilder = exports.executeServerBuilder = exports.executeProtractorBuilder = exports.executeKarmaBuilder = exports.executeExtractI18nBuilder = exports.executeDevServerBuilder = exports.buildApplication = exports.executeBrowserBuilder = exports.Type = exports.OutputHashing = exports.CrossOrigin = void 0;
+exports.executeNgPackagrBuilder = exports.executeSSRDevServerBuilder = exports.executeServerBuilder = exports.executeProtractorBuilder = exports.executeKarmaBuilder = exports.executeExtractI18nBuilder = exports.executeDevServerBuilder = exports.buildApplication = exports.executeBrowserBuilder = exports.Type = exports.OutputHashing = exports.CrossOrigin = void 0;
 __exportStar(require("./transforms"), exports);
 var schema_1 = require("./builders/browser/schema");
 Object.defineProperty(exports, "CrossOrigin", { enumerable: true, get: function () { return schema_1.CrossOrigin; } });
@@ -41,5 +41,7 @@ var protractor_1 = require("./builders/protractor");
 Object.defineProperty(exports, "executeProtractorBuilder", { enumerable: true, get: function () { return protractor_1.execute; } });
 var server_1 = require("./builders/server");
 Object.defineProperty(exports, "executeServerBuilder", { enumerable: true, get: function () { return server_1.execute; } });
+var ssr_dev_server_1 = require("./builders/ssr-dev-server");
+Object.defineProperty(exports, "executeSSRDevServerBuilder", { enumerable: true, get: function () { return ssr_dev_server_1.execute; } });
 var ng_packagr_1 = require("./builders/ng-packagr");
 Object.defineProperty(exports, "executeNgPackagrBuilder", { enumerable: true, get: function () { return ng_packagr_1.execute; } });

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -78,6 +78,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
             const compilation = pluginOptions.noopTypeScriptCompilation
                 ? new compilation_1.NoopCompilation()
                 : await (0, compilation_1.createAngularCompilation)(!!pluginOptions.jit);
+            // Compilation is initially assumed to have errors until emitted
+            let hasCompilationErrors = true;
             // Determines if TypeScript should process JavaScript files based on tsconfig `allowJs` option
             let shouldTsIgnoreJs = true;
             // Track incremental component stylesheet builds
@@ -178,72 +180,59 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 };
                 // Initialize the Angular compilation for the current build.
                 // In watch mode, previous build state will be reused.
-                const { compilerOptions: { allowJs }, referencedFiles, } = await compilation.initialize(tsconfigPath, hostOptions, (compilerOptions) => {
-                    // target of 9 is ES2022 (using the number avoids an expensive import of typescript just for an enum)
-                    if (compilerOptions.target === undefined || compilerOptions.target < 9) {
-                        // If 'useDefineForClassFields' is already defined in the users project leave the value as is.
-                        // Otherwise fallback to false due to https://github.com/microsoft/TypeScript/issues/45995
-                        // which breaks the deprecated `@Effects` NGRX decorator and potentially other existing code as well.
-                        compilerOptions.target = 9;
-                        compilerOptions.useDefineForClassFields ??= false;
-                        // Only add the warning on the initial build
-                        setupWarnings?.push({
-                            text: 'TypeScript compiler options "target" and "useDefineForClassFields" are set to "ES2022" and ' +
-                                '"false" respectively by the Angular CLI.',
-                            location: { file: pluginOptions.tsconfig },
-                            notes: [
-                                {
-                                    text: 'To control ECMA version and features use the Browerslist configuration. ' +
-                                        'For more information, see https://angular.io/guide/build#configuring-browser-compatibility',
-                                },
-                            ],
-                        });
-                    }
-                    if (compilerOptions.compilationMode === 'partial') {
-                        setupWarnings?.push({
-                            text: 'Angular partial compilation mode is not supported when building applications.',
-                            location: null,
-                            notes: [{ text: 'Full compilation mode will be used instead.' }],
-                        });
-                        compilerOptions.compilationMode = 'full';
-                    }
-                    // Enable incremental compilation by default if caching is enabled
-                    if (pluginOptions.sourceFileCache?.persistentCachePath) {
-                        compilerOptions.incremental ??= true;
-                        // Set the build info file location to the configured cache directory
-                        compilerOptions.tsBuildInfoFile = path.join(pluginOptions.sourceFileCache?.persistentCachePath, '.tsbuildinfo');
-                    }
-                    else {
-                        compilerOptions.incremental = false;
-                    }
-                    return {
-                        ...compilerOptions,
-                        noEmitOnError: false,
-                        inlineSources: pluginOptions.sourcemap,
-                        inlineSourceMap: pluginOptions.sourcemap,
-                        mapRoot: undefined,
-                        sourceRoot: undefined,
-                        preserveSymlinks,
-                    };
-                });
-                shouldTsIgnoreJs = !allowJs;
+                let referencedFiles;
+                try {
+                    const initializationResult = await compilation.initialize(tsconfigPath, hostOptions, createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks));
+                    shouldTsIgnoreJs = !initializationResult.compilerOptions.allowJs;
+                    referencedFiles = initializationResult.referencedFiles;
+                }
+                catch (error) {
+                    (result.errors ??= []).push({
+                        text: 'Angular compilation initialization failed.',
+                        location: null,
+                        notes: [
+                            {
+                                text: error instanceof Error ? error.stack ?? error.message : `${error}`,
+                                location: null,
+                            },
+                        ],
+                    });
+                    // Initialization failure prevents further compilation steps
+                    hasCompilationErrors = true;
+                    return result;
+                }
                 if (compilation instanceof compilation_1.NoopCompilation) {
                     await sharedTSCompilationState.waitUntilReady;
+                    hasCompilationErrors = false;
                     return result;
                 }
                 const diagnostics = await compilation.diagnoseFiles();
-                if (diagnostics.errors) {
+                if (diagnostics.errors?.length) {
                     (result.errors ??= []).push(...diagnostics.errors);
                 }
-                if (diagnostics.warnings) {
+                if (diagnostics.warnings?.length) {
                     (result.warnings ??= []).push(...diagnostics.warnings);
                 }
                 // Update TypeScript file output cache for all affected files
-                await (0, profiling_1.profileAsync)('NG_EMIT_TS', async () => {
-                    for (const { filename, contents } of await compilation.emitAffectedFiles()) {
-                        typeScriptFileCache.set((0, node_url_1.pathToFileURL)(filename).href, contents);
-                    }
-                });
+                try {
+                    await (0, profiling_1.profileAsync)('NG_EMIT_TS', async () => {
+                        for (const { filename, contents } of await compilation.emitAffectedFiles()) {
+                            typeScriptFileCache.set((0, node_url_1.pathToFileURL)(filename).href, contents);
+                        }
+                    });
+                }
+                catch (error) {
+                    (result.errors ??= []).push({
+                        text: 'Angular compilation emit failed.',
+                        location: null,
+                        notes: [
+                            {
+                                text: error instanceof Error ? error.stack ?? error.message : `${error}`,
+                                location: null,
+                            },
+                        ],
+                    });
+                }
                 // Add errors from failed additional results.
                 // This must be done after emit to capture latest web worker results.
                 for (const { errors } of additionalResults.values()) {
@@ -258,6 +247,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         ...referencedFileTracker.referencedFiles,
                     ];
                 }
+                hasCompilationErrors = !!result.errors?.length;
                 // Reset the setup warnings so that they are only shown during the first build.
                 setupWarnings = undefined;
                 sharedTSCompilationState.markAsReady();
@@ -275,6 +265,11 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 // would need to be added to the key as well as a check for any change of content.
                 let contents = typeScriptFileCache.get((0, node_url_1.pathToFileURL)(request).href);
                 if (contents === undefined) {
+                    // If the Angular compilation had errors the file may not have been emitted.
+                    // To avoid additional errors about missing files, return empty contents.
+                    if (hasCompilationErrors) {
+                        return { contents: '', loader: 'js' };
+                    }
                     // No TS result indicates the file is not part of the TypeScript program.
                     // If allowJs is enabled and the file is JS then defer to the next load hook.
                     if (!shouldTsIgnoreJs && /\.[cm]?js$/.test(request)) {
@@ -318,6 +313,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 (0, jit_plugin_callbacks_1.setupJitPluginCallbacks)(build, stylesheetBundler, additionalResults, styleOptions.inlineStyleLanguage);
             }
             build.onEnd((result) => {
+                // Ensure other compilations are unblocked if the main compilation throws during start
+                sharedTSCompilationState?.markAsReady();
                 for (const { outputFiles, metafile } of additionalResults.values()) {
                     // Add any additional output files to the main output files
                     if (outputFiles?.length) {
@@ -340,6 +337,56 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
     };
 }
 exports.createCompilerPlugin = createCompilerPlugin;
+function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks) {
+    return (compilerOptions) => {
+        // target of 9 is ES2022 (using the number avoids an expensive import of typescript just for an enum)
+        if (compilerOptions.target === undefined || compilerOptions.target < 9) {
+            // If 'useDefineForClassFields' is already defined in the users project leave the value as is.
+            // Otherwise fallback to false due to https://github.com/microsoft/TypeScript/issues/45995
+            // which breaks the deprecated `@Effects` NGRX decorator and potentially other existing code as well.
+            compilerOptions.target = 9;
+            compilerOptions.useDefineForClassFields ??= false;
+            // Only add the warning on the initial build
+            setupWarnings?.push({
+                text: 'TypeScript compiler options "target" and "useDefineForClassFields" are set to "ES2022" and ' +
+                    '"false" respectively by the Angular CLI.',
+                location: { file: pluginOptions.tsconfig },
+                notes: [
+                    {
+                        text: 'To control ECMA version and features use the Browerslist configuration. ' +
+                            'For more information, see https://angular.io/guide/build#configuring-browser-compatibility',
+                    },
+                ],
+            });
+        }
+        if (compilerOptions.compilationMode === 'partial') {
+            setupWarnings?.push({
+                text: 'Angular partial compilation mode is not supported when building applications.',
+                location: null,
+                notes: [{ text: 'Full compilation mode will be used instead.' }],
+            });
+            compilerOptions.compilationMode = 'full';
+        }
+        // Enable incremental compilation by default if caching is enabled
+        if (pluginOptions.sourceFileCache?.persistentCachePath) {
+            compilerOptions.incremental ??= true;
+            // Set the build info file location to the configured cache directory
+            compilerOptions.tsBuildInfoFile = path.join(pluginOptions.sourceFileCache?.persistentCachePath, '.tsbuildinfo');
+        }
+        else {
+            compilerOptions.incremental = false;
+        }
+        return {
+            ...compilerOptions,
+            noEmitOnError: false,
+            inlineSources: pluginOptions.sourcemap,
+            inlineSourceMap: pluginOptions.sourcemap,
+            mapRoot: undefined,
+            sourceRoot: undefined,
+            preserveSymlinks,
+        };
+    };
+}
 function bundleWebWorker(build, pluginOptions, workerFile) {
     try {
         return build.esbuild.buildSync({

package/src/tools/esbuild/application-code-bundle.js

@@ -177,12 +177,9 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
 exports.createServerCodeBundleOptions = createServerCodeBundleOptions;
 function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
     const polyfills = [];
-    const zoneFlagsNamespace = 'angular:zone-flags/placeholder';
     const polyfillsFromConfig = new Set(options.polyfills);
-    let hasZoneJs = false;
     if (polyfillsFromConfig.has('zone.js')) {
-        hasZoneJs = true;
-        polyfills.push(zoneFlagsNamespace, 'zone.js/node');
+        polyfills.push('zone.js/node');
     }
     if (polyfillsFromConfig.has('@angular/localize') ||
         polyfillsFromConfig.has('@angular/localize/init')) {
@@ -222,18 +219,6 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
         },
     };
     buildOptions.plugins ??= [];
-    // Disable Zone.js uncaught promise rejections to provide cleaner stacktraces.
-    if (hasZoneJs) {
-        buildOptions.plugins.unshift((0, virtual_module_plugin_1.createVirtualModulePlugin)({
-            namespace: zoneFlagsNamespace,
-            entryPointOnly: false,
-            loadContent: () => ({
-                contents: `globalThis.__zone_symbol__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION = true;`,
-                loader: 'js',
-                resolveDir: workspaceRoot,
-            }),
-        }));
-    }
     buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
     return () => buildOptions;
 }

package/src/tools/esbuild/bundler-context.d.ts

@@ -16,7 +16,10 @@ export type BundleContextResult = {
     metafile: Metafile;
     outputFiles: BuildOutputFile[];
     initialFiles: Map<string, InitialFileRecord>;
-    externalImports: Set<string>;
+    externalImports: {
+        server?: Set<string>;
+        browser?: Set<string>;
+    };
 };
 export interface InitialFileRecord {
     entrypoint: boolean;

package/src/tools/esbuild/bundler-context.js

@@ -68,7 +68,8 @@ class BundlerContext {
         const warnings = [];
         const metafile = { inputs: {}, outputs: {} };
         const initialFiles = new Map();
-        const externalImports = new Set();
+        const externalImportsBrowser = new Set();
+        const externalImportsServer = new Set();
         const outputFiles = [];
         for (const result of individualResults) {
             warnings.push(...result.warnings);
@@ -84,7 +85,8 @@ class BundlerContext {
             }
             result.initialFiles.forEach((value, key) => initialFiles.set(key, value));
             outputFiles.push(...result.outputFiles);
-            result.externalImports.forEach((value) => externalImports.add(value));
+            result.externalImports.browser?.forEach((value) => externalImportsBrowser.add(value));
+            result.externalImports.server?.forEach((value) => externalImportsServer.add(value));
         }
         if (errors !== undefined) {
             return { errors, warnings };
@@ -95,7 +97,10 @@ class BundlerContext {
             metafile,
             initialFiles,
             outputFiles,
-            externalImports,
+            externalImports: {
+                browser: externalImportsBrowser,
+                server: externalImportsServer,
+            },
         };
     }
     /**
@@ -241,16 +246,14 @@ class BundlerContext {
                 externalImports.add(importData.path);
             }
         }
+        const platformIsServer = this.#esbuildOptions?.platform === 'node';
         const outputFiles = result.outputFiles.map((file) => {
             let fileType;
             if ((0, node_path_1.dirname)(file.path) === 'media') {
                 fileType = BuildOutputFileType.Media;
             }
             else {
-                fileType =
-                    this.#esbuildOptions?.platform === 'node'
-                        ? BuildOutputFileType.Server
-                        : BuildOutputFileType.Browser;
+                fileType = platformIsServer ? BuildOutputFileType.Server : BuildOutputFileType.Browser;
             }
             return (0, utils_1.convertOutputFile)(file, fileType);
         });
@@ -259,7 +262,9 @@ class BundlerContext {
             ...result,
             outputFiles,
             initialFiles,
-            externalImports,
+            externalImports: {
+                [platformIsServer ? 'server' : 'browser']: externalImports,
+            },
             errors: undefined,
         };
     }

package/src/tools/esbuild/bundler-execution-result.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 type { Message } from 'esbuild';
+import type { Message, PartialMessage } from 'esbuild';
 import type { ChangedFiles } from '../../tools/esbuild/watcher';
 import type { SourceFileCache } from './angular/source-file-cache';
 import type { BuildOutputFile, BuildOutputFileType, BundlerContext } from './bundler-context';
@@ -19,6 +19,11 @@ export interface RebuildState {
     fileChanges: ChangedFiles;
     previousOutputHashes: Map<string, string>;
 }
+export interface ExternalResultMetadata {
+    implicitBrowser: string[];
+    implicitServer: string[];
+    explicit: string[];
+}
 /**
  * Represents the result of a single builder execute call.
  */
@@ -27,22 +32,20 @@ export declare class ExecutionResult {
     private codeBundleCache?;
     outputFiles: BuildOutputFile[];
     assetFiles: BuildOutputAsset[];
-    errors: Message[];
-    externalMetadata?: {
-        implicit: string[];
-        explicit?: string[];
-    };
+    errors: (Message | PartialMessage)[];
+    externalMetadata?: ExternalResultMetadata;
     constructor(rebuildContexts: BundlerContext[], codeBundleCache?: SourceFileCache | undefined);
     addOutputFile(path: string, content: string, type: BuildOutputFileType): void;
     addAssets(assets: BuildOutputAsset[]): void;
-    addErrors(errors: Message[]): void;
+    addErrors(errors: (Message | PartialMessage)[]): void;
     /**
      * Add external JavaScript import metadata to the result. This is currently used
      * by the development server to optimize the prebundling process.
-     * @param implicit External dependencies due to the external packages option.
+     * @param implicitBrowser External dependencies for the browser bundles due to the external packages option.
+     * @param implicitServer External dependencies for the server bundles due to the external packages option.
      * @param explicit External dependencies due to explicit project configuration.
      */
-    setExternalMetadata(implicit: string[], explicit: string[] | undefined): void;
+    setExternalMetadata(implicitBrowser: string[], implicitServer: string[], explicit: string[] | undefined): void;
     get output(): {
         success: boolean;
     };
@@ -50,11 +53,8 @@ export declare class ExecutionResult {
         success: boolean;
         outputFiles: BuildOutputFile[];
         assetFiles: BuildOutputAsset[];
-        errors: Message[];
-        externalMetadata: {
-            implicit: string[];
-            explicit?: string[] | undefined;
-        } | undefined;
+        errors: (PartialMessage | Message)[];
+        externalMetadata: ExternalResultMetadata | undefined;
     };
     get watchFiles(): string[];
     createRebuildState(fileChanges: ChangedFiles): RebuildState;

package/src/tools/esbuild/bundler-execution-result.js

@@ -35,11 +35,12 @@ class ExecutionResult {
     /**
      * Add external JavaScript import metadata to the result. This is currently used
      * by the development server to optimize the prebundling process.
-     * @param implicit External dependencies due to the external packages option.
+     * @param implicitBrowser External dependencies for the browser bundles due to the external packages option.
+     * @param implicitServer External dependencies for the server bundles due to the external packages option.
      * @param explicit External dependencies due to explicit project configuration.
      */
-    setExternalMetadata(implicit, explicit) {
-        this.externalMetadata = { implicit, explicit };
+    setExternalMetadata(implicitBrowser, implicitServer, explicit) {
+        this.externalMetadata = { implicitBrowser, implicitServer, explicit: explicit ?? [] };
     }
     get output() {
         return {

package/src/tools/esbuild/commonjs-checker.js

@@ -38,6 +38,10 @@ function checkCommonJSModules(metafile, allowedCommonJsDependencies) {
     // Used by '@angular/platform-server' and is in a seperate chunk that is unused when
     // using `provideHttpClient(withFetch())`.
     allowedRequests.add('xhr2');
+    // Packages used by @angular/ssr.
+    // While critters is ESM it has a number of direct and transtive CJS deps.
+    allowedRequests.add('express');
+    allowedRequests.add('critters');
     // Find all entry points that contain code (JS/TS)
     const files = [];
     for (const { entryPoint } of Object.values(metafile.outputs)) {
@@ -62,6 +66,10 @@ function checkCommonJSModules(metafile, allowedCommonJsDependencies) {
                 continue;
             }
             seenFiles.add(imported.path);
+            // If the dependency is allowed ignore all other checks
+            if (allowedRequests.has(imported.original)) {
+                continue;
+            }
             // Only check actual code files
             if (!isPathCode(imported.path)) {
                 continue;
@@ -117,10 +125,7 @@ function isPathCode(name) {
  * @returns True, if specifier is potentially relative; false, otherwise.
  */
 function isPotentialRelative(specifier) {
-    if (specifier[0] === '.') {
-        return true;
-    }
-    return false;
+    return specifier[0] === '.';
 }
 /**
  * Creates an esbuild diagnostic message for a given non-ESM module request.

package/src/tools/esbuild/global-scripts.d.ts

@@ -13,4 +13,4 @@ import { BundlerOptionsFactory } from './bundler-context';
  * @param options The builder's user-provider normalized options.
  * @returns An esbuild BuildOptions object.
  */
-export declare function createGlobalScriptsBundleOptions(options: NormalizedApplicationBuildOptions, initial: boolean): BundlerOptionsFactory | undefined;
+export declare function createGlobalScriptsBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], initial: boolean): BundlerOptionsFactory | undefined;

package/src/tools/esbuild/global-scripts.js

@@ -48,7 +48,7 @@ const virtual_module_plugin_1 = require("./virtual-module-plugin");
  * @param options The builder's user-provider normalized options.
  * @returns An esbuild BuildOptions object.
  */
-function createGlobalScriptsBundleOptions(options, initial) {
+function createGlobalScriptsBundleOptions(options, target, initial) {
     const { globalScripts, optimizationOptions, outputNames, preserveSymlinks, sourcemapOptions, workspaceRoot, } = options;
     const namespace = 'angular:script/global';
     const entryPoints = {};
@@ -81,6 +81,7 @@ function createGlobalScriptsBundleOptions(options, initial) {
             sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
             write: false,
             platform: 'neutral',
+            target,
             preserveSymlinks,
             plugins: [
                 (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),

package/src/tools/esbuild/javascript-transformer.d.ts

@@ -24,7 +24,7 @@ export interface JavaScriptTransformerOptions {
 export declare class JavaScriptTransformer {
     #private;
     readonly maxThreads: number;
-    constructor(options: JavaScriptTransformerOptions, maxThreads: number);
+    constructor(options: JavaScriptTransformerOptions, maxThreads: number, reuseResults?: boolean);
     /**
      * Performs JavaScript transformations on a file from the filesystem.
      * If no transformations are required, the data for the original file will be returned.

package/src/tools/esbuild/javascript-transformer.js

@@ -23,7 +23,8 @@ class JavaScriptTransformer {
     maxThreads;
     #workerPool;
     #commonOptions;
-    constructor(options, maxThreads) {
+    #pendingfileResults;
+    constructor(options, maxThreads, reuseResults) {
         this.maxThreads = maxThreads;
         // Extract options to ensure only the named options are serialized and sent to the worker
         const { sourcemap, thirdPartySourcemaps = false, advancedOptimizations = false, jit = false, } = options;
@@ -33,6 +34,10 @@ class JavaScriptTransformer {
             advancedOptimizations,
             jit,
         };
+        // Currently only tracks pending file transform results
+        if (reuseResults) {
+            this.#pendingfileResults = new Map();
+        }
     }
     #ensureWorkerPool() {
         this.#workerPool ??= new piscina_1.default({
@@ -52,13 +57,19 @@ class JavaScriptTransformer {
      * @returns A promise that resolves to a UTF-8 encoded Uint8Array containing the result.
      */
     transformFile(filename, skipLinker) {
-        // Always send the request to a worker. Files are almost always from node modules which means
-        // they may need linking. The data is also not yet available to perform most transformation checks.
-        return this.#ensureWorkerPool().run({
-            filename,
-            skipLinker,
-            ...this.#commonOptions,
-        });
+        const pendingKey = `${!!skipLinker}--${filename}`;
+        let pending = this.#pendingfileResults?.get(pendingKey);
+        if (pending === undefined) {
+            // Always send the request to a worker. Files are almost always from node modules which means
+            // they may need linking. The data is also not yet available to perform most transformation checks.
+            pending = this.#ensureWorkerPool().run({
+                filename,
+                skipLinker,
+                ...this.#commonOptions,
+            });
+            this.#pendingfileResults?.set(pendingKey, pending);
+        }
+        return pending;
     }
     /**
      * Performs JavaScript transformations on the provided data of a file. The file does not need
@@ -88,6 +99,7 @@ class JavaScriptTransformer {
      * @returns A void promise that resolves when closing is complete.
      */
     async close() {
+        this.#pendingfileResults?.clear();
         if (this.#workerPool) {
             // Workaround piscina bug where a worker thread will be recreated after destroy to meet the minimum.
             this.#workerPool.options.minThreads = 0;

package/src/utils/bundle-calculator.js

@@ -228,7 +228,7 @@ class AnyComponentStyleCalculator extends Calculator {
  * Calculate the bytes given a string value.
  */
 function calculateBytes(input, baseline, factor = 1) {
-    const matches = input.match(/^\s*(\d+(?:\.\d+)?)\s*(%|(?:[mM]|[kK]|[gG])?[bB])?\s*$/);
+    const matches = input.trim().match(/^(\d+(?:\.\d+)?)[ \t]*(%|[kmg]?b)?$/i);
     if (!matches) {
         return NaN;
     }

package/src/utils/environment-options.js

@@ -68,8 +68,11 @@ exports.allowMinify = debugOptimize.minify;
  */
 const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
 exports.maxWorkers = isPresent(maxWorkersVariable) ? +maxWorkersVariable : 4;
+// Default to enabled unless inside a Web Container which currently fails when transferring MessagePort objects
 const parallelTsVariable = process.env['NG_BUILD_PARALLEL_TS'];
-exports.useParallelTs = !isPresent(parallelTsVariable) || !isDisabled(parallelTsVariable);
+exports.useParallelTs = isPresent(parallelTsVariable)
+    ? !isDisabled(parallelTsVariable)
+    : !process.versions.webcontainer;
 const legacySassVariable = process.env['NG_BUILD_LEGACY_SASS'];
 exports.useLegacySass = (() => {
     if (!isPresent(legacySassVariable)) {