@angular-devkit/build-angular 17.0.0 → 17.0.2

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.0.0",
+  "version": "17.0.2",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.1",
-    "@angular-devkit/architect": "0.1700.0",
-    "@angular-devkit/build-webpack": "0.1700.0",
-    "@angular-devkit/core": "17.0.0",
+    "@angular-devkit/architect": "0.1700.2",
+    "@angular-devkit/build-webpack": "0.1700.2",
+    "@angular-devkit/core": "17.0.2",
     "@babel/core": "7.23.2",
     "@babel/generator": "7.23.0",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.23.2",
     "@babel/runtime": "7.23.2",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.0.0",
+    "@ngtools/webpack": "17.0.2",
     "@vitejs/plugin-basic-ssl": "1.0.1",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",

package/src/builders/application/build-action.js

@@ -34,32 +34,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runEsBuildBuildAction = void 0;
-const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const sass_language_1 = require("../../tools/esbuild/stylesheets/sass-language");
 const utils_1 = require("../../tools/esbuild/utils");
+const delete_output_dir_1 = require("../../utils/delete-output-dir");
 const environment_options_1 = require("../../utils/environment-options");
-const error_1 = require("../../utils/error");
 async function* runEsBuildBuildAction(action, options) {
     const { writeToFileSystemFilter, writeToFileSystem = true, watch, poll, logger, deleteOutputPath, cacheOptions, outputPath, verbose, projectRoot, workspaceRoot, progress, } = options;
-    if (writeToFileSystem) {
-        // Clean output path if enabled
-        if (deleteOutputPath) {
-            if (outputPath === workspaceRoot) {
-                logger.error('Output path MUST not be workspace root directory!');
-                return;
-            }
-            await promises_1.default.rm(outputPath, { force: true, recursive: true, maxRetries: 3 });
-        }
-        // Create output directory if needed
-        try {
-            await promises_1.default.mkdir(outputPath, { recursive: true });
-        }
-        catch (e) {
-            (0, error_1.assertIsError)(e);
-            logger.error('Unable to create output directory: ' + e.message);
-            return;
-        }
+    if (deleteOutputPath && writeToFileSystem) {
+        await (0, delete_output_dir_1.deleteOutputDir)(workspaceRoot, outputPath);
     }
     const withProgress = progress ? utils_1.withSpinner : utils_1.withNoProgress;
     // Initial build
@@ -135,7 +118,7 @@ async function* runEsBuildBuildAction(action, options) {
         return;
     }
     // Wait for changes and rebuild as needed
-    let previousWatchFiles = new Set(result.watchFiles);
+    const currentWatchFiles = new Set(result.watchFiles);
     try {
         for await (const changes of watcher) {
             if (options.signal?.aborted) {
@@ -146,12 +129,22 @@ async function* runEsBuildBuildAction(action, options) {
             }
             result = await withProgress('Changes detected. Rebuilding...', () => action(result.createRebuildState(changes)));
             // Update watched locations provided by the new build result.
-            // Add any new locations
-            watcher.add(result.watchFiles.filter((watchFile) => !previousWatchFiles.has(watchFile)));
-            const newWatchFiles = new Set(result.watchFiles);
-            // Remove any old locations
-            watcher.remove([...previousWatchFiles].filter((watchFile) => !newWatchFiles.has(watchFile)));
-            previousWatchFiles = newWatchFiles;
+            // Keep watching all previous files if there are any errors; otherwise consider all
+            // files stale until confirmed present in the new result's watch files.
+            const staleWatchFiles = result.errors.length > 0 ? undefined : new Set(currentWatchFiles);
+            for (const watchFile of result.watchFiles) {
+                if (!currentWatchFiles.has(watchFile)) {
+                    // Add new watch location
+                    watcher.add(watchFile);
+                    currentWatchFiles.add(watchFile);
+                }
+                // Present so remove from stale locations
+                staleWatchFiles?.delete(watchFile);
+            }
+            // Remove any stale locations if the build was successful
+            if (staleWatchFiles?.size) {
+                watcher.remove([...staleWatchFiles]);
+            }
             if (writeToFileSystem) {
                 // Write output files
                 const filesToWrite = writeToFileSystemFilter

package/src/builders/application/i18n.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadActiveTranslations = exports.inlineI18n = void 0;
 const node_path_1 = require("node:path");
+const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const i18n_inliner_1 = require("../../tools/esbuild/i18n-inliner");
 const environment_options_1 = require("../../utils/environment-options");
 const i18n_options_1 = require("../../utils/i18n-options");
@@ -72,8 +73,13 @@ async function inlineI18n(options, executionResult, initialFiles) {
     finally {
         await inliner.close();
     }
-    // Update the result with all localized files
-    executionResult.outputFiles = updatedOutputFiles;
+    // Update the result with all localized files.
+    executionResult.outputFiles = [
+        // Root files are not modified.
+        ...executionResult.outputFiles.filter(({ type }) => type === bundler_context_1.BuildOutputFileType.Root),
+        // Updated files for each locale.
+        ...updatedOutputFiles,
+    ];
     // Assets are only changed if not using the flat output option
     if (options.i18nOptions.flatOutput !== true) {
         executionResult.assetFiles = updatedAssetFiles;

package/src/builders/application/options.js

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const promises_1 = require("node:fs/promises");
 const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const helpers_1 = require("../../tools/webpack/utils/helpers");
@@ -67,8 +68,15 @@ async function normalizeOptions(context, projectName, options, plugins) {
     let fileReplacements;
     if (options.fileReplacements) {
         for (const replacement of options.fileReplacements) {
+            const fileReplaceWith = node_path_1.default.join(workspaceRoot, replacement.with);
+            try {
+                await (0, promises_1.access)(fileReplaceWith, promises_1.constants.F_OK);
+            }
+            catch {
+                throw new Error(`The ${fileReplaceWith} path in file replacements does not exist.`);
+            }
             fileReplacements ??= {};
-            fileReplacements[node_path_1.default.join(workspaceRoot, replacement.replace)] = node_path_1.default.join(workspaceRoot, replacement.with);
+            fileReplacements[node_path_1.default.join(workspaceRoot, replacement.replace)] = fileReplaceWith;
         }
     }
     const globalStyles = [];

package/src/builders/browser/index.js

@@ -74,7 +74,7 @@ async function initialize(options, context, webpackConfigurationTransform) {
         transformedConfig = await webpackConfigurationTransform(config);
     }
     if (options.deleteOutputPath) {
-        (0, utils_1.deleteOutputDir)(context.workspaceRoot, originalOutputPath);
+        await (0, utils_1.deleteOutputDir)(context.workspaceRoot, originalOutputPath);
     }
     return { config: transformedConfig || config, projectRoot, projectSourceRoot, i18n };
 }

package/src/builders/browser-esbuild/builder-status-warnings.js

@@ -18,8 +18,6 @@ const UNSUPPORTED_OPTIONS = [
     'webWorkerTsConfig',
 ];
 function logBuilderStatusWarnings(options, { logger }) {
-    logger.warn(`The 'browser-esbuild' builder is a compatibility builder which will be removed in a future major ` +
-        `version in favor of the 'application' builder.`);
     // Validate supported options
     for (const unsupportedOption of UNSUPPORTED_OPTIONS) {
         const value = options[unsupportedOption];

package/src/builders/browser-esbuild/index.js

@@ -16,6 +16,7 @@ const node_fs_1 = require("node:fs");
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const utils_1 = require("../../tools/esbuild/utils");
+const utils_2 = require("../../utils");
 const application_1 = require("../application");
 const builder_status_warnings_1 = require("./builder-status-warnings");
 /**
@@ -29,7 +30,11 @@ async function* buildEsbuildBrowser(userOptions, context, infrastructureSettings
     // Inform user of status of builder and options
     (0, builder_status_warnings_1.logBuilderStatusWarnings)(userOptions, context);
     const normalizedOptions = normalizeOptions(userOptions);
-    const fullOutputPath = node_path_1.default.join(context.workspaceRoot, normalizedOptions.outputPath);
+    const { deleteOutputPath, outputPath } = normalizedOptions;
+    const fullOutputPath = node_path_1.default.join(context.workspaceRoot, outputPath);
+    if (deleteOutputPath && infrastructureSettings?.write !== false) {
+        await (0, utils_2.deleteOutputDir)(context.workspaceRoot, outputPath);
+    }
     for await (const result of (0, application_1.buildApplicationInternal)(normalizedOptions, context, {
         write: false,
     }, plugins)) {

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

@@ -11,4 +11,4 @@ import { DevServerBuilderOutput } from './webpack-server';
 export { DevServerBuilderOptions, DevServerBuilderOutput, execute as executeDevServerBuilder };
 declare const _default: import("../../../../architect/src/internal").Builder<DevServerBuilderOptions & import("../../../../core/src").JsonObject>;
 export default _default;
-export { execute as serveWebpackBrowser };
+export { execute as executeDevServer };

package/src/builders/dev-server/index.js

@@ -7,9 +7,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serveWebpackBrowser = exports.executeDevServerBuilder = void 0;
+exports.executeDevServer = exports.executeDevServerBuilder = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const builder_1 = require("./builder");
 Object.defineProperty(exports, "executeDevServerBuilder", { enumerable: true, get: function () { return builder_1.execute; } });
-Object.defineProperty(exports, "serveWebpackBrowser", { enumerable: true, get: function () { return builder_1.execute; } });
+Object.defineProperty(exports, "executeDevServer", { enumerable: true, get: function () { return builder_1.execute; } });
 exports.default = (0, architect_1.createBuilder)(builder_1.execute);

package/src/builders/dev-server/vite-server.d.ts

@@ -25,5 +25,5 @@ export declare function serveWithVite(serverOptions: NormalizedDevServerOptions,
     middleware?: Connect.NextHandleFunction[];
     buildPlugins?: Plugin[];
 }): AsyncIterableIterator<DevServerBuilderOutput>;
-export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, externalMetadata: ExternalResultMetadata, ssr: boolean, prebundleTransformer: JavaScriptTransformer, target: string[], extensionMiddleware?: Connect.NextHandleFunction[], indexHtmlTransformer?: (content: string) => Promise<string>): Promise<InlineConfig>;
+export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, externalMetadata: ExternalResultMetadata, ssr: boolean, prebundleTransformer: JavaScriptTransformer, target: string[], extensionMiddleware?: Connect.NextHandleFunction[], indexHtmlTransformer?: (content: string) => Promise<string>, thirdPartySourcemaps?: boolean): Promise<InlineConfig>;
 export {};

package/src/builders/dev-server/vite-server.js

@@ -44,6 +44,7 @@ const javascript_transformer_1 = require("../../tools/esbuild/javascript-transfo
 const rxjs_esm_resolution_plugin_1 = require("../../tools/esbuild/rxjs-esm-resolution-plugin");
 const utils_1 = require("../../tools/esbuild/utils");
 const i18n_locale_plugin_1 = require("../../tools/vite/i18n-locale-plugin");
+const utils_2 = require("../../utils");
 const render_page_1 = require("../../utils/server-rendering/render-page");
 const supported_browsers_1 = require("../../utils/supported-browsers");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
@@ -60,11 +61,12 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
         poll: serverOptions.poll,
         verbose: serverOptions.verbose,
     }, builderName));
-    if (browserOptions.prerender) {
+    if (browserOptions.prerender || browserOptions.ssr) {
         // Disable prerendering if enabled and force SSR.
         // This is so instead of prerendering all the routes for every change, the page is "prerendered" when it is requested.
-        browserOptions.ssr = true;
         browserOptions.prerender = false;
+        // Avoid bundling and processing the ssr entry-point as this is not used by the dev-server.
+        browserOptions.ssr = true;
         // https://nodejs.org/api/process.html#processsetsourcemapsenabledval
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         process.setSourceMapsEnabled(true);
@@ -85,12 +87,13 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
         // When localization is enabled with a single locale, force a flat path to maintain behavior with the existing Webpack-based dev server.
         browserOptions.forceI18nFlatOutput = true;
     }
+    const { vendor: thirdPartySourcemaps } = (0, utils_2.normalizeSourceMaps)(browserOptions.sourceMap ?? false);
     // Setup the prebundling transformer that will be shared across Vite prebundling requests
     const prebundleTransformer = new javascript_transformer_1.JavaScriptTransformer(
     // Always enable JIT linking to support applications built with and without AOT.
     // In a development environment the additional scope information does not
     // have a negative effect unlike production where final output size is relevant.
-    { sourcemap: true, jit: true }, 1, true);
+    { sourcemap: true, jit: true, thirdPartySourcemaps }, 1, true);
     // Extract output index from options
     // TODO: Provide this info from the build results
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -107,9 +110,16 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
         implicitServer: [],
         explicit: [],
     };
-    const build = builderName === '@angular-devkit/build-angular:application'
-        ? application_1.buildApplicationInternal
-        : browser_esbuild_1.buildEsbuildBrowser;
+    // Add cleanup logic via a builder teardown.
+    let deferred;
+    context.addTeardown(async () => {
+        await server?.close();
+        await prebundleTransformer.close();
+        deferred?.();
+    });
+    const build = builderName === '@angular-devkit/build-angular:browser-esbuild'
+        ? browser_esbuild_1.buildEsbuildBrowser
+        : application_1.buildApplicationInternal;
     // TODO: Switch this to an architect schedule call when infrastructure settings are supported
     for await (const result of build(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -178,7 +188,7 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
             const browsers = (0, supported_browsers_1.getSupportedBrowsers)(projectRoot, context.logger);
             const target = (0, utils_1.transformSupportedBrowsersToTargets)(browsers);
             // Setup server and start listening
-            const serverConfiguration = await setupServer(serverOptions, generatedFiles, assetFiles, browserOptions.preserveSymlinks, externalMetadata, !!browserOptions.ssr, prebundleTransformer, target, extensions?.middleware, transformers?.indexHtml);
+            const serverConfiguration = await setupServer(serverOptions, generatedFiles, assetFiles, browserOptions.preserveSymlinks, externalMetadata, !!browserOptions.ssr, prebundleTransformer, target, extensions?.middleware, transformers?.indexHtml, thirdPartySourcemaps);
             server = await createServer(serverConfiguration);
             await server.listen();
             if (serverConfiguration.ssr?.optimizeDeps?.disabled === false) {
@@ -206,13 +216,6 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
             baseUrl: serverUrl?.href,
         };
     }
-    // Add cleanup logic via a builder teardown
-    let deferred;
-    context.addTeardown(async () => {
-        await server?.close();
-        await prebundleTransformer.close();
-        deferred?.();
-    });
     await new Promise((resolve) => (deferred = resolve));
 }
 exports.serveWithVite = serveWithVite;
@@ -304,7 +307,7 @@ function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generated
     }
 }
 // eslint-disable-next-line max-lines-per-function
-async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, externalMetadata, ssr, prebundleTransformer, target, extensionMiddleware, indexHtmlTransformer) {
+async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, externalMetadata, ssr, prebundleTransformer, target, extensionMiddleware, indexHtmlTransformer, thirdPartySourcemaps = false) {
     const proxy = await (0, load_proxy_config_1.loadProxyConfiguration)(serverOptions.workspaceRoot, serverOptions.proxyConfig, true);
     // dynamically import Vite for ESM compatibility
     const { normalizePath } = await Promise.resolve().then(() => __importStar(require('vite')));
@@ -371,6 +374,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                 ssr: true,
                 prebundleTransformer,
                 target,
+                thirdPartySourcemaps,
             }),
         },
         plugins: [
@@ -421,19 +425,15 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                     const originalssrTransform = server.ssrTransform;
                     server.ssrTransform = async (code, map, url, originalCode) => {
                         const result = await originalssrTransform(code, null, url, originalCode);
-                        if (!result) {
-                            return null;
-                        }
-                        let transformedCode = result.code;
-                        if (result.map && map) {
-                            transformedCode +=
-                                `\n//# sourceMappingURL=` +
-                                    `data:application/json;base64,${Buffer.from(JSON.stringify((0, remapping_1.default)([result.map, map], () => null))).toString('base64')}`;
+                        if (!result || !result.map || !map) {
+                            return result;
                         }
+                        const remappedMap = (0, remapping_1.default)([result.map, map], () => null);
+                        // Set the sourcemap root to the workspace root. This is needed since we set a virtual path as root.
+                        remappedMap.sourceRoot = normalizePath(serverOptions.workspaceRoot) + '/';
                         return {
                             ...result,
-                            map: null,
-                            code: transformedCode,
+                            map: remappedMap,
                         };
                     };
                     // Assets and resources get handled first
@@ -572,6 +572,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             ssr: false,
             prebundleTransformer,
             target,
+            thirdPartySourcemaps,
         }),
     };
     if (serverOptions.ssl) {
@@ -620,10 +621,10 @@ function pathnameWithoutServePath(url, serverOptions) {
     }
     return pathname;
 }
-function getDepOptimizationConfig({ disabled, exclude, include, target, prebundleTransformer, ssr, }) {
+function getDepOptimizationConfig({ disabled, exclude, include, target, prebundleTransformer, ssr, thirdPartySourcemaps, }) {
     const plugins = [
         {
-            name: `angular-vite-optimize-deps${ssr ? '-ssr' : ''}`,
+            name: `angular-vite-optimize-deps${ssr ? '-ssr' : ''}${thirdPartySourcemaps ? '-vendor-sourcemap' : ''}`,
             setup(build) {
                 build.onLoad({ filter: /\.[cm]?js$/ }, async (args) => {
                     return {

package/src/builders/server/index.js

@@ -150,7 +150,7 @@ async function initialize(options, context, webpackConfigurationTransform) {
         return [getPlatformServerExportsConfig(wco), (0, configs_1.getCommonConfig)(wco), (0, configs_1.getStylesConfig)(wco)];
     });
     if (options.deleteOutputPath) {
-        (0, utils_1.deleteOutputDir)(context.workspaceRoot, originalOutputPath);
+        await (0, utils_1.deleteOutputDir)(context.workspaceRoot, originalOutputPath);
     }
     const transformedConfig = (await webpackConfigurationTransform?.(config)) ?? config;
     return { config: transformedConfig, i18n, projectRoot, projectSourceRoot };

package/src/tools/esbuild/angular/compilation/parallel-compilation.js

@@ -35,6 +35,9 @@ class ParallelCompilation extends angular_compilation_1.AngularCompilation {
             minThreads: 1,
             maxThreads: 1,
             idleTimeout: Infinity,
+            // Web containers do not support transferable objects with receiveOnMessagePort which
+            // is used when the Atomics based wait loop is enable.
+            useAtomics: !process.versions.webcontainer,
             filename: localRequire.resolve('./parallel-worker'),
         });
     }

package/src/tools/esbuild/angular/compilation-state.d.ts

@@ -7,8 +7,8 @@
  */
 export declare class SharedTSCompilationState {
     #private;
-    get waitUntilReady(): Promise<void>;
-    markAsReady(): void;
+    get waitUntilReady(): Promise<boolean>;
+    markAsReady(hasErrors: boolean): void;
     markAsInProgress(): void;
     dispose(): void;
 }

package/src/tools/esbuild/angular/compilation-state.js

@@ -12,17 +12,19 @@ class SharedTSCompilationState {
     #pendingCompilation = true;
     #resolveCompilationReady;
     #compilationReadyPromise;
+    #hasErrors = true;
     get waitUntilReady() {
         if (!this.#pendingCompilation) {
-            return Promise.resolve();
+            return Promise.resolve(this.#hasErrors);
         }
         this.#compilationReadyPromise ??= new Promise((resolve) => {
             this.#resolveCompilationReady = resolve;
         });
         return this.#compilationReadyPromise;
     }
-    markAsReady() {
-        this.#resolveCompilationReady?.();
+    markAsReady(hasErrors) {
+        this.#hasErrors = hasErrors;
+        this.#resolveCompilationReady?.(hasErrors);
         this.#compilationReadyPromise = undefined;
         this.#pendingCompilation = false;
     }
@@ -30,7 +32,7 @@ class SharedTSCompilationState {
         this.#pendingCompilation = true;
     }
     dispose() {
-        this.markAsReady();
+        this.markAsReady(true);
         globalSharedCompilationState = undefined;
     }
 }

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

@@ -37,9 +37,9 @@ exports.createCompilerPlugin = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
 const promises_1 = require("node:fs/promises");
 const path = __importStar(require("node:path"));
-const node_url_1 = require("node:url");
 const environment_options_1 = require("../../../utils/environment-options");
 const javascript_transformer_1 = require("../javascript-transformer");
+const load_result_cache_1 = require("../load-result-cache");
 const profiling_1 = require("../profiling");
 const compilation_1 = require("./compilation");
 const compilation_state_1 = require("./compilation-state");
@@ -202,8 +202,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     return result;
                 }
                 if (compilation instanceof compilation_1.NoopCompilation) {
-                    await sharedTSCompilationState.waitUntilReady;
-                    hasCompilationErrors = false;
+                    hasCompilationErrors = await sharedTSCompilationState.waitUntilReady;
                     return result;
                 }
                 const diagnostics = await compilation.diagnoseFiles();
@@ -217,7 +216,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 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);
+                            typeScriptFileCache.set(path.normalize(filename), contents);
                         }
                     });
                 }
@@ -250,11 +249,11 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 hasCompilationErrors = !!result.errors?.length;
                 // Reset the setup warnings so that they are only shown during the first build.
                 setupWarnings = undefined;
-                sharedTSCompilationState.markAsReady();
+                sharedTSCompilationState.markAsReady(hasCompilationErrors);
                 return result;
             });
             build.onLoad({ filter: /\.[cm]?[jt]sx?$/ }, async (args) => {
-                const request = pluginOptions.fileReplacements?.[args.path] ?? args.path;
+                const request = path.normalize(pluginOptions.fileReplacements?.[path.normalize(args.path)] ?? args.path);
                 // Skip TS load attempt if JS TypeScript compilation not enabled and file is JS
                 if (shouldTsIgnoreJs && /\.[cm]?js$/.test(request)) {
                     return undefined;
@@ -263,7 +262,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 // the options cannot change and do not need to be represented in the key. If the
                 // cache is later stored to disk, then the options that affect transform output
                 // 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);
+                let contents = typeScriptFileCache.get(request);
                 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.
@@ -286,35 +285,29 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     // A string indicates untransformed output from the TS/NG compiler
                     contents = await javascriptTransformer.transformData(request, contents, true /* skipLinker */);
                     // Store as the returned Uint8Array to allow caching the fully transformed code
-                    typeScriptFileCache.set((0, node_url_1.pathToFileURL)(request).href, contents);
+                    typeScriptFileCache.set(request, contents);
                 }
                 return {
                     contents,
                     loader: 'js',
                 };
             });
-            build.onLoad({ filter: /\.[cm]?js$/ }, (args) => (0, profiling_1.profileAsync)('NG_EMIT_JS*', async () => {
-                // The filename is currently used as a cache key. Since the cache is memory only,
-                // the options cannot change and do not need to be represented in the key. If the
-                // cache is later stored to disk, then the options that affect transform output
-                // would need to be added to the key as well as a check for any change of content.
-                let contents = pluginOptions.sourceFileCache?.babelFileCache.get(args.path);
-                if (contents === undefined) {
-                    contents = await javascriptTransformer.transformFile(args.path, pluginOptions.jit);
-                    pluginOptions.sourceFileCache?.babelFileCache.set(args.path, contents);
-                }
-                return {
-                    contents,
-                    loader: 'js',
-                };
-            }, true));
+            build.onLoad({ filter: /\.[cm]?js$/ }, (0, load_result_cache_1.createCachedLoad)(pluginOptions.loadResultCache, async (args) => {
+                return (0, profiling_1.profileAsync)('NG_EMIT_JS*', async () => {
+                    const contents = await javascriptTransformer.transformFile(args.path, pluginOptions.jit);
+                    return {
+                        contents,
+                        loader: 'js',
+                    };
+                }, true);
+            }));
             // Setup bundling of component templates and stylesheets when in JIT mode
             if (pluginOptions.jit) {
                 (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();
+                sharedTSCompilationState?.markAsReady(hasCompilationErrors);
                 for (const { outputFiles, metafile } of additionalResults.values()) {
                     // Add any additional output files to the main output files
                     if (outputFiles?.length) {
@@ -416,17 +409,19 @@ function bundleWebWorker(build, pluginOptions, workerFile) {
     }
 }
 function createMissingFileError(request, original, root) {
+    const relativeRequest = path.relative(root, request);
     const error = {
-        text: `File '${path.relative(root, request)}' is missing from the TypeScript compilation.`,
+        text: `File '${relativeRequest}' is missing from the TypeScript compilation.`,
         notes: [
             {
                 text: `Ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,
             },
         ],
     };
-    if (request !== original) {
+    const relativeOriginal = path.relative(root, original);
+    if (relativeRequest !== relativeOriginal) {
         error.notes.push({
-            text: `File is requested from a file replacement of '${path.relative(root, original)}'.`,
+            text: `File is requested from a file replacement of '${relativeOriginal}'.`,
         });
     }
     return error;

package/src/tools/esbuild/angular/file-reference-tracker.js

@@ -8,23 +8,26 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileReferenceTracker = void 0;
+const node_path_1 = require("node:path");
 class FileReferenceTracker {
     #referencingFiles = new Map();
     get referencedFiles() {
         return this.#referencingFiles.keys();
     }
     add(containingFile, referencedFiles) {
+        const normalizedContainingFile = (0, node_path_1.normalize)(containingFile);
         for (const file of referencedFiles) {
-            if (file === containingFile) {
+            const normalizedReferencedFile = (0, node_path_1.normalize)(file);
+            if (normalizedReferencedFile === normalizedContainingFile) {
                 // Containing file is already known to the AOT compiler
                 continue;
             }
-            const referencing = this.#referencingFiles.get(file);
+            const referencing = this.#referencingFiles.get(normalizedReferencedFile);
             if (referencing === undefined) {
-                this.#referencingFiles.set(file, new Set([containingFile]));
+                this.#referencingFiles.set(normalizedReferencedFile, new Set([normalizedContainingFile]));
             }
             else {
-                referencing.add(containingFile);
+                referencing.add(normalizedContainingFile);
             }
         }
     }
@@ -37,14 +40,15 @@ class FileReferenceTracker {
         let allChangedFiles;
         // Add referencing files to fully notify the AOT compiler of required component updates
         for (const modifiedFile of changed) {
-            const referencing = this.#referencingFiles.get(modifiedFile);
+            const normalizedModifiedFile = (0, node_path_1.normalize)(modifiedFile);
+            const referencing = this.#referencingFiles.get(normalizedModifiedFile);
             if (referencing) {
                 allChangedFiles ??= new Set(changed);
                 for (const referencingFile of referencing) {
                     allChangedFiles.add(referencingFile);
                 }
                 // Cleanup the stale record which will be updated by new resource transforms
-                this.#referencingFiles.delete(modifiedFile);
+                this.#referencingFiles.delete(normalizedModifiedFile);
             }
         }
         return allChangedFiles ?? changed;

package/src/tools/esbuild/angular/source-file-cache.d.ts

@@ -10,7 +10,6 @@ import { MemoryLoadResultCache } from '../load-result-cache';
 export declare class SourceFileCache extends Map<string, ts.SourceFile> {
     readonly persistentCachePath?: string | undefined;
     readonly modifiedFiles: Set<string>;
-    readonly babelFileCache: Map<string, Uint8Array>;
     readonly typeScriptFileCache: Map<string, string | Uint8Array>;
     readonly loadResultCache: MemoryLoadResultCache;
     referencedFiles?: readonly string[];

package/src/tools/esbuild/angular/source-file-cache.js

@@ -33,14 +33,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceFileCache = void 0;
 const node_os_1 = require("node:os");
 const path = __importStar(require("node:path"));
-const node_url_1 = require("node:url");
 const load_result_cache_1 = require("../load-result-cache");
 const USING_WINDOWS = (0, node_os_1.platform)() === 'win32';
 const WINDOWS_SEP_REGEXP = new RegExp(`\\${path.win32.sep}`, 'g');
 class SourceFileCache extends Map {
     persistentCachePath;
     modifiedFiles = new Set();
-    babelFileCache = new Map();
     typeScriptFileCache = new Map();
     loadResultCache = new load_result_cache_1.MemoryLoadResultCache();
     referencedFiles;
@@ -53,8 +51,8 @@ class SourceFileCache extends Map {
             this.modifiedFiles.clear();
         }
         for (let file of files) {
-            this.babelFileCache.delete(file);
-            this.typeScriptFileCache.delete((0, node_url_1.pathToFileURL)(file).href);
+            file = path.normalize(file);
+            this.typeScriptFileCache.delete(file);
             this.loadResultCache.invalidate(file);
             // Normalize separators to allow matching TypeScript Host paths
             if (USING_WINDOWS) {

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

@@ -194,7 +194,6 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
     if (!polyfillBundleOptions) {
         return;
     }
-    const { workspaceRoot } = options;
     const buildOptions = {
         ...polyfillBundleOptions,
         platform: 'node',
@@ -218,8 +217,6 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
             'polyfills.server': namespace,
         },
     };
-    buildOptions.plugins ??= [];
-    buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
     return () => buildOptions;
 }
 exports.createServerPolyfillBundleOptions = createServerPolyfillBundleOptions;

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

@@ -161,22 +161,26 @@ class BundlerContext {
                 throw failure;
             }
         }
+        finally {
+            if (this.incremental) {
+                // When incremental always add any files from the load result cache
+                if (this.#loadCache) {
+                    this.#loadCache.watchFiles
+                        .filter((file) => !isInternalAngularFile(file))
+                        // watch files are fully resolved paths
+                        .forEach((file) => this.watchFiles.add(file));
+                }
+            }
+        }
         // Update files that should be watched.
         // While this should technically not be linked to incremental mode, incremental is only
         // currently enabled with watch mode where watch files are needed.
         if (this.incremental) {
             // Add input files except virtual angular files which do not exist on disk
             Object.keys(result.metafile.inputs)
-                .filter((input) => !input.startsWith('angular:'))
+                .filter((input) => !isInternalAngularFile(input))
                 // input file paths are always relative to the workspace root
                 .forEach((input) => this.watchFiles.add((0, node_path_1.join)(this.workspaceRoot, input)));
-            // Also add any files from the load result cache
-            if (this.#loadCache) {
-                this.#loadCache.watchFiles
-                    .filter((file) => !file.startsWith('angular:'))
-                    // watch files are fully resolved paths
-                    .forEach((file) => this.watchFiles.add(file));
-            }
         }
         // Return if the build encountered any errors
         if (result.errors.length) {
@@ -271,12 +275,12 @@ class BundlerContext {
     #addErrorsToWatch(result) {
         for (const error of result.errors) {
             let file = error.location?.file;
-            if (file) {
+            if (file && !isInternalAngularFile(file)) {
                 this.watchFiles.add((0, node_path_1.join)(this.workspaceRoot, file));
             }
             for (const note of error.notes) {
                 file = note.location?.file;
-                if (file) {
+                if (file && !isInternalAngularFile(file)) {
                     this.watchFiles.add((0, node_path_1.join)(this.workspaceRoot, file));
                 }
             }
@@ -324,3 +328,6 @@ class BundlerContext {
     }
 }
 exports.BundlerContext = BundlerContext;
+function isInternalAngularFile(file) {
+    return file.startsWith('angular:');
+}

package/src/tools/esbuild/bundler-execution-result.d.ts

@@ -53,7 +53,7 @@ export declare class ExecutionResult {
         success: boolean;
         outputFiles: BuildOutputFile[];
         assetFiles: BuildOutputAsset[];
-        errors: (PartialMessage | Message)[];
+        errors: (Message | PartialMessage)[];
         externalMetadata: ExternalResultMetadata | undefined;
     };
     get watchFiles(): string[];

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

@@ -8,6 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionResult = void 0;
+const node_path_1 = require("node:path");
 const utils_1 = require("./utils");
 /**
  * Represents the result of a single builder execute call.
@@ -57,11 +58,15 @@ class ExecutionResult {
         };
     }
     get watchFiles() {
+        // Bundler contexts internally normalize file dependencies
         const files = this.rebuildContexts.flatMap((context) => [...context.watchFiles]);
         if (this.codeBundleCache?.referencedFiles) {
-            files.push(...this.codeBundleCache.referencedFiles);
+            // These files originate from TS/NG and can have POSIX path separators even on Windows.
+            // To ensure path comparisons are valid, all these paths must be normalized.
+            files.push(...this.codeBundleCache.referencedFiles.map(node_path_1.normalize));
         }
         if (this.codeBundleCache?.loadResultCache) {
+            // Load result caches internally normalize file dependencies
             files.push(...this.codeBundleCache.loadResultCache.watchFiles);
         }
         return files;

package/src/tools/esbuild/load-result-cache.js

@@ -18,8 +18,13 @@ function createCachedLoad(cache, callback) {
         let result = cache.get(loadCacheKey);
         if (result === undefined) {
             result = await callback(args);
-            // Do not cache null or undefined or results with errors
-            if (result && result.errors === undefined) {
+            // Do not cache null or undefined
+            if (result) {
+                // Ensure requested path is included if it was a resolved file
+                if (args.namespace === 'file') {
+                    result.watchFiles ??= [];
+                    result.watchFiles.push(args.path);
+                }
                 await cache.put(loadCacheKey, result);
             }
         }
@@ -59,7 +64,9 @@ class MemoryLoadResultCache {
         return found;
     }
     get watchFiles() {
-        return [...this.#loadResults.keys(), ...this.#fileDependencies.keys()];
+        // this.#loadResults.keys() is not included here because the keys
+        // are namespaced request paths and not disk-based file paths.
+        return [...this.#fileDependencies.keys()];
     }
 }
 exports.MemoryLoadResultCache = MemoryLoadResultCache;

package/src/tools/esbuild/stylesheets/less-language.js

@@ -107,6 +107,7 @@ async function compileString(data, filename, options, resolver, unsafeInlineJava
     }
     catch (error) {
         if (isLessException(error)) {
+            const location = convertExceptionLocation(error);
             // Retry with a warning for less files requiring the deprecated inline JavaScript option
             if (error.message.includes('Inline JavaScript is not enabled.')) {
                 const withJsResult = await compileString(data, filename, options, resolver, 
@@ -114,7 +115,7 @@ async function compileString(data, filename, options, resolver, unsafeInlineJava
                 withJsResult.warnings = [
                     {
                         text: 'Deprecated inline execution of JavaScript has been enabled ("javascriptEnabled")',
-                        location: convertExceptionLocation(error),
+                        location,
                         notes: [
                             {
                                 location: null,
@@ -133,10 +134,11 @@ async function compileString(data, filename, options, resolver, unsafeInlineJava
                 errors: [
                     {
                         text: error.message,
-                        location: convertExceptionLocation(error),
+                        location,
                     },
                 ],
                 loader: 'css',
+                watchFiles: location.file ? [filename, location.file] : [filename],
             };
         }
         throw error;

package/src/tools/esbuild/stylesheets/sass-language.js

@@ -170,7 +170,7 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
     }
     catch (error) {
         if (isSassException(error)) {
-            const file = error.span.url ? (0, node_url_1.fileURLToPath)(error.span.url) : undefined;
+            const fileWithError = error.span.url ? (0, node_url_1.fileURLToPath)(error.span.url) : undefined;
             return {
                 loader: 'css',
                 errors: [
@@ -179,7 +179,7 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
                     },
                 ],
                 warnings,
-                watchFiles: file ? [file] : undefined,
+                watchFiles: fileWithError ? [filePath, fileWithError] : [filePath],
             };
         }
         throw error;

package/src/utils/delete-output-dir.d.ts

@@ -8,4 +8,4 @@
 /**
  * Delete an output directory, but error out if it's the root of the project.
  */
-export declare function deleteOutputDir(root: string, outputPath: string): void;
+export declare function deleteOutputDir(root: string, outputPath: string): Promise<void>;

package/src/utils/delete-output-dir.js

@@ -6,41 +6,32 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOutputDir = void 0;
-const fs = __importStar(require("fs"));
-const path_1 = require("path");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
 /**
  * Delete an output directory, but error out if it's the root of the project.
  */
-function deleteOutputDir(root, outputPath) {
-    const resolvedOutputPath = (0, path_1.resolve)(root, outputPath);
+async function deleteOutputDir(root, outputPath) {
+    const resolvedOutputPath = (0, node_path_1.resolve)(root, outputPath);
     if (resolvedOutputPath === root) {
         throw new Error('Output path MUST not be project root directory!');
     }
-    fs.rmSync(resolvedOutputPath, { force: true, recursive: true, maxRetries: 3 });
+    // Avoid removing the actual directory to avoid errors in cases where the output
+    // directory is mounted or symlinked. Instead the contents are removed.
+    let entries;
+    try {
+        entries = await (0, promises_1.readdir)(resolvedOutputPath);
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return;
+        }
+        throw error;
+    }
+    for (const entry of entries) {
+        await (0, promises_1.rm)((0, node_path_1.join)(resolvedOutputPath, entry), { force: true, recursive: true, maxRetries: 3 });
+    }
 }
 exports.deleteOutputDir = deleteOutputDir;

package/src/utils/environment-options.js

@@ -68,11 +68,8 @@ 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)
-    : !process.versions.webcontainer;
+exports.useParallelTs = !isPresent(parallelTsVariable) || !isDisabled(parallelTsVariable);
 const legacySassVariable = process.env['NG_BUILD_LEGACY_SASS'];
 exports.useLegacySass = (() => {
     if (!isPresent(legacySassVariable)) {

package/src/utils/routes-extractor/extractor.js

@@ -74,9 +74,15 @@ export async function* extractRoutes(bootstrapAppFnOrModule, document) {
         await whenStable(applicationRef);
         const injector = applicationRef.injector;
         const router = injector.get(Router);
-        const compiler = injector.get(Compiler);
-        // Extract all the routes from the config.
-        yield* getRoutesFromRouterConfig(router.config, compiler, injector);
+        if (router.config.length === 0) {
+            // In case there are no routes available
+            yield { route: '', success: true, redirect: false };
+        }
+        else {
+            const compiler = injector.get(Compiler);
+            // Extract all the routes from the config.
+            yield* getRoutesFromRouterConfig(router.config, compiler, injector);
+        }
     }
     finally {
         platformRef.destroy();