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

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.0.0-rc.1",
+  "version": "17.0.0-rc.3",
   "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-rc.1",
-    "@angular-devkit/build-webpack": "0.1700.0-rc.1",
-    "@angular-devkit/core": "17.0.0-rc.1",
+    "@angular-devkit/architect": "0.1700.0-rc.3",
+    "@angular-devkit/build-webpack": "0.1700.0-rc.3",
+    "@angular-devkit/core": "17.0.0-rc.3",
     "@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-rc.1",
+    "@ngtools/webpack": "17.0.0-rc.3",
     "@vitejs/plugin-basic-ssl": "1.0.1",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",
@@ -36,7 +36,7 @@
     "fast-glob": "3.3.1",
     "https-proxy-agent": "7.0.2",
     "http-proxy-middleware": "2.0.6",
-    "inquirer": "8.2.6",
+    "inquirer": "9.2.11",
     "jsonc-parser": "3.2.0",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",
@@ -49,21 +49,22 @@
     "open": "8.4.2",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
-    "picomatch": "2.3.1",
+    "picomatch": "3.0.1",
     "piscina": "4.1.0",
     "postcss": "8.4.31",
     "postcss-loader": "7.3.3",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.69.4",
+    "sass": "1.69.5",
     "sass-loader": "13.3.2",
     "semver": "7.5.4",
     "source-map-loader": "4.0.1",
     "source-map-support": "0.5.21",
-    "terser": "5.22.0",
+    "terser": "5.24.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
+    "undici": "5.27.0",
     "vite": "4.5.0",
     "webpack": "5.89.0",
     "webpack-dev-middleware": "6.1.1",
@@ -128,7 +129,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": ">=18.13.0",
+    "node": "^18.13.0 || >=20.9.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/src/builders/app-shell/render-worker.d.ts

@@ -20,7 +20,7 @@ interface RenderRequest {
     /**
      * An optional URL path that represents the Angular route that should be rendered.
      */
-    url: string | undefined;
+    url: string;
 }
 /**
  * Renders an application based on a provided server bundle path, initial document, and optional URL route.

package/src/builders/app-shell/render-worker.js

@@ -54,23 +54,30 @@ async function render({ serverBundlePath, document, url }) {
             useValue: 'app-shell',
         },
     ];
+    let renderAppPromise;
     // Render platform server module
     if (isBootstrapFn(bootstrapAppFn)) {
         (0, node_assert_1.default)(renderApplication, `renderApplication was not exported from: ${serverBundlePath}.`);
-        return renderApplication(bootstrapAppFn, {
+        renderAppPromise = renderApplication(bootstrapAppFn, {
             document,
             url,
             platformProviders,
         });
     }
-    (0, node_assert_1.default)(renderModule, `renderModule was not exported from: ${serverBundlePath}.`);
-    const moduleClass = bootstrapAppFn || AppServerModule;
-    (0, node_assert_1.default)(moduleClass, `Neither an AppServerModule nor a bootstrapping function was exported from: ${serverBundlePath}.`);
-    return renderModule(moduleClass, {
-        document,
-        url,
-        extraProviders: platformProviders,
-    });
+    else {
+        (0, node_assert_1.default)(renderModule, `renderModule was not exported from: ${serverBundlePath}.`);
+        const moduleClass = bootstrapAppFn || AppServerModule;
+        (0, node_assert_1.default)(moduleClass, `Neither an AppServerModule nor a bootstrapping function was exported from: ${serverBundlePath}.`);
+        renderAppPromise = renderModule(moduleClass, {
+            document,
+            url,
+            extraProviders: platformProviders,
+        });
+    }
+    // The below should really handled by the framework!!!.
+    let timer;
+    const renderingTimeout = new Promise((_, reject) => (timer = setTimeout(() => reject(new Error(`Page ${new URL(url, 'resolve://').pathname} did not render in 30 seconds.`)), 30000)));
+    return Promise.race([renderAppPromise, renderingTimeout]).finally(() => clearTimeout(timer));
 }
 function isBootstrapFn(value) {
     // We can differentiate between a module and a bootstrap function by reading compiler-generated `ɵmod` static property:

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

@@ -38,6 +38,7 @@ 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 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;
@@ -95,8 +96,10 @@ async function* runEsBuildBuildAction(action, options) {
         });
         // Setup abort support
         options.signal?.addEventListener('abort', () => void watcher?.close());
-        // Temporarily watch the entire project
-        watcher.add(projectRoot);
+        // Watch the entire project root if 'NG_BUILD_WATCH_ROOT' environment variable is set
+        if (environment_options_1.shouldWatchRoot) {
+            watcher.add(projectRoot);
+        }
         // Watch workspace for package manager changes
         const packageWatchFiles = [
             // manifest can affect module resolution

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

@@ -19,6 +19,7 @@ const global_styles_1 = require("../../tools/esbuild/global-styles");
 const license_extractor_1 = require("../../tools/esbuild/license-extractor");
 const utils_1 = require("../../tools/esbuild/utils");
 const bundle_calculator_1 = require("../../utils/bundle-calculator");
+const color_1 = require("../../utils/color");
 const copy_assets_1 = require("../../utils/copy-assets");
 const supported_browsers_1 = require("../../utils/supported-browsers");
 const execute_post_bundle_1 = require("./execute-post-bundle");
@@ -49,7 +50,7 @@ async function executeBuild(options, context, rebuildState) {
         // Global Stylesheets
         if (options.globalStyles.length > 0) {
             for (const initial of [true, false]) {
-                const bundleOptions = (0, global_styles_1.createGlobalStylesBundleOptions)(options, target, initial, codeBundleCache?.loadResultCache);
+                const bundleOptions = (0, global_styles_1.createGlobalStylesBundleOptions)(options, target, initial);
                 if (bundleOptions) {
                     bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
                 }
@@ -76,7 +77,7 @@ async function executeBuild(options, context, rebuildState) {
             }
         }
     }
-    const bundlingResult = await bundler_context_1.BundlerContext.bundleAll(bundlerContexts);
+    const bundlingResult = await bundler_context_1.BundlerContext.bundleAll(bundlerContexts, rebuildState?.fileChanges.all);
     // Log all warnings and errors generated during bundling
     await (0, utils_1.logMessages)(context, bundlingResult);
     const executionResult = new bundler_execution_result_1.ExecutionResult(bundlerContexts, codeBundleCache);
@@ -112,13 +113,15 @@ async function executeBuild(options, context, rebuildState) {
     if (options.budgets) {
         const compatStats = (0, budget_stats_1.generateBudgetStats)(metafile, initialFiles);
         budgetFailures = [...(0, bundle_calculator_1.checkBudgets)(options.budgets, compatStats, true)];
-        for (const { severity, message } of budgetFailures) {
-            if (severity === 'error') {
-                context.logger.error(message);
-            }
-            else {
-                context.logger.warn(message);
-            }
+        if (budgetFailures.length > 0) {
+            await (0, utils_1.logMessages)(context, {
+                errors: budgetFailures
+                    .filter((failure) => failure.severity === 'error')
+                    .map((failure) => ({ text: failure.message, location: null })),
+                warnings: budgetFailures
+                    .filter((failure) => failure.severity !== 'error')
+                    .map((failure) => ({ text: failure.message, location: null })),
+            });
         }
     }
     // Calculate estimated transfer size if scripts are optimized
@@ -146,11 +149,20 @@ async function executeBuild(options, context, rebuildState) {
         executionResult.outputFiles.push(...result.additionalOutputFiles);
         executionResult.assetFiles.push(...result.additionalAssets);
     }
+    await printWarningsAndErrorsToConsole(context, warnings, errors);
     if (prerenderOptions) {
         executionResult.addOutputFile('prerendered-routes.json', JSON.stringify({ routes: prerenderedRoutes.sort((a, b) => a.localeCompare(b)) }, null, 2), bundler_context_1.BuildOutputFileType.Root);
+        let prerenderMsg = `Prerendered ${prerenderedRoutes.length} static route`;
+        if (prerenderedRoutes.length > 1) {
+            prerenderMsg += 's.';
+        }
+        else {
+            prerenderMsg += '.';
+        }
+        context.logger.info(color_1.colors.magenta(prerenderMsg) + '\n');
     }
-    printWarningsAndErrorsToConsole(context, warnings, errors);
-    (0, utils_1.logBuildStats)(context, metafile, initialFiles, budgetFailures, estimatedTransferSizes);
+    const changedFiles = rebuildState && executionResult.findChangedFiles(rebuildState.previousOutputHashes);
+    (0, utils_1.logBuildStats)(context, metafile, initialFiles, budgetFailures, changedFiles, estimatedTransferSizes);
     // Write metafile if stats option is enabled
     if (options.stats) {
         executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2), bundler_context_1.BuildOutputFileType.Root);
@@ -158,11 +170,9 @@ async function executeBuild(options, context, rebuildState) {
     return executionResult;
 }
 exports.executeBuild = executeBuild;
-function printWarningsAndErrorsToConsole(context, warnings, errors) {
-    for (const error of errors) {
-        context.logger.error(error);
-    }
-    for (const warning of warnings) {
-        context.logger.warn(warning);
-    }
+async function printWarningsAndErrorsToConsole(context, warnings, errors) {
+    await (0, utils_1.logMessages)(context, {
+        errors: errors.map((text) => ({ text, location: null })),
+        warnings: warnings.map((text) => ({ text, location: null })),
+    });
 }

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

@@ -37,7 +37,15 @@ async function* buildEsbuildBrowser(userOptions, context, infrastructureSettings
             // Write output files
             await writeResultFiles(result.outputFiles, result.assetFiles, fullOutputPath);
         }
-        yield result;
+        // The builder system (architect) currently attempts to treat all results as JSON and
+        // attempts to validate the object with a JSON schema validator. This can lead to slow
+        // build completion (even after the actual build is fully complete) or crashes if the
+        // size and/or quantity of output files is large. Architect only requires a `success`
+        // property so that is all that will be passed here if the infrastructure settings have
+        // not been explicitly set to avoid writes. Writing is only disabled when used directly
+        // by the dev server which bypasses the architect behavior.
+        const builderResult = infrastructureSettings?.write === false ? result : { success: result.success };
+        yield builderResult;
     }
 }
 exports.buildEsbuildBrowser = buildEsbuildBrowser;

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

@@ -37,6 +37,7 @@ exports.setupServer = exports.serveWithVite = void 0;
 const remapping_1 = __importDefault(require("@ampproject/remapping"));
 const mrmime_1 = require("mrmime");
 const node_assert_1 = __importDefault(require("node:assert"));
+const node_crypto_1 = require("node:crypto");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
@@ -148,14 +149,16 @@ async function* serveWithVite(serverOptions, builderName, context, plugins) {
         }
         // To avoid disconnecting the array objects from the option, these arrays need to be mutated
         // instead of replaced.
-        if (result.externalMetadata.explicit) {
-            externalMetadata.explicit.push(...result.externalMetadata.explicit);
-        }
-        if (result.externalMetadata.implicit) {
-            externalMetadata.implicit.push(...result.externalMetadata.implicit);
+        if (result.externalMetadata) {
+            if (result.externalMetadata.explicit) {
+                externalMetadata.explicit.push(...result.externalMetadata.explicit);
+            }
+            if (result.externalMetadata.implicit) {
+                externalMetadata.implicit.push(...result.externalMetadata.implicit);
+            }
         }
         if (server) {
-            handleUpdate(generatedFiles, server, serverOptions, context.logger);
+            handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
         }
         else {
             const projectName = context.target?.project;
@@ -187,13 +190,13 @@ async function* serveWithVite(serverOptions, builderName, context, plugins) {
     await new Promise((resolve) => (deferred = resolve));
 }
 exports.serveWithVite = serveWithVite;
-function handleUpdate(generatedFiles, server, serverOptions, logger) {
+function handleUpdate(normalizePath, generatedFiles, server, serverOptions, logger) {
     const updatedFiles = [];
     // Invalidate any updated files
     for (const [file, record] of generatedFiles) {
         if (record.updated) {
             updatedFiles.push(file);
-            const updatedModules = server.moduleGraph.getModulesByFile(file);
+            const updatedModules = server.moduleGraph.getModulesByFile(normalizePath(node_path_1.default.join(server.config.root, file)));
             updatedModules?.forEach((m) => server?.moduleGraph.invalidateModule(m));
         }
     }
@@ -205,8 +208,7 @@ function handleUpdate(generatedFiles, server, serverOptions, logger) {
             const timestamp = Date.now();
             server.ws.send({
                 type: 'update',
-                updates: updatedFiles.map((f) => {
-                    const filePath = f.slice(1); // Remove leading slash.
+                updates: updatedFiles.map((filePath) => {
                     return {
                         type: 'css-update',
                         timestamp,
@@ -238,7 +240,7 @@ function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generated
             filePath = '/index.html';
         }
         else {
-            filePath = '/' + normalizePath(file.path);
+            filePath = normalizePath(file.path);
         }
         seen.add(filePath);
         // Skip analysis of sourcemaps
@@ -280,11 +282,13 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
     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')));
+    // Path will not exist on disk and only used to provide separate path for Vite requests
+    const virtualProjectRoot = normalizePath(node_path_1.default.join(serverOptions.workspaceRoot, `.angular/vite-root/${(0, node_crypto_1.randomUUID)()}/`));
     const configuration = {
         configFile: false,
         envFile: false,
         cacheDir: node_path_1.default.join(serverOptions.cacheOptions.path, 'vite'),
-        root: serverOptions.workspaceRoot,
+        root: virtualProjectRoot,
         publicDir: false,
         esbuild: false,
         mode: 'development',
@@ -308,10 +312,13 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             watch: {
                 ignored: ['**/*'],
             },
+            // This is needed when `externalDependencies` is used to prevent Vite load errors.
+            // NOTE: If Vite adds direct support for externals, this can be removed.
+            preTransformRequests: externalMetadata.explicit.length === 0,
         },
         ssr: {
             // Exclude any provided dependencies (currently build defined externals)
-            external: externalMetadata.implicit,
+            external: externalMetadata.explicit,
         },
         plugins: [
             (0, i18n_locale_plugin_1.createAngularLocaleDataPlugin)(),
@@ -320,24 +327,37 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                 // Ensures plugin hooks run before built-in Vite hooks
                 enforce: 'pre',
                 async resolveId(source, importer) {
-                    if (importer && source.startsWith('.')) {
+                    // Prevent vite from resolving an explicit external dependency (`externalDependencies` option)
+                    if (externalMetadata.explicit.includes(source)) {
+                        // This is still not ideal since Vite will still transform the import specifier to
+                        // `/@id/${source}` but is currently closer to a raw external than a resolved file path.
+                        return source;
+                    }
+                    if (importer && source[0] === '.' && importer.startsWith(virtualProjectRoot)) {
                         // Remove query if present
                         const [importerFile] = importer.split('?', 1);
-                        source = normalizePath(node_path_1.default.join(node_path_1.default.dirname(importerFile), source));
+                        source = normalizePath(node_path_1.default.join(node_path_1.default.dirname(node_path_1.default.relative(virtualProjectRoot, importerFile)), source));
+                    }
+                    if (source[0] === '/') {
+                        source = source.slice(1);
                     }
                     const [file] = source.split('?', 1);
                     if (outputFiles.has(file)) {
-                        return source;
+                        return node_path_1.default.join(virtualProjectRoot, source);
                     }
                 },
                 load(id) {
                     const [file] = id.split('?', 1);
-                    const codeContents = outputFiles.get(file)?.contents;
+                    const relativeFile = normalizePath(node_path_1.default.relative(virtualProjectRoot, file));
+                    const codeContents = outputFiles.get(relativeFile)?.contents;
                     if (codeContents === undefined) {
+                        if (relativeFile.endsWith('/node_modules/vite/dist/client/client.mjs')) {
+                            return loadViteClientCode(file);
+                        }
                         return;
                     }
                     const code = Buffer.from(codeContents).toString('utf-8');
-                    const mapContents = outputFiles.get(file + '.map')?.contents;
+                    const mapContents = outputFiles.get(relativeFile + '.map')?.contents;
                     return {
                         // Remove source map URL comments from the code if a sourcemap is present.
                         // Vite will inline and add an additional sourcemap URL for the sourcemap.
@@ -411,15 +431,17 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                                 next();
                                 return;
                             }
-                            const rawHtml = outputFiles.get('/index.server.html')?.contents;
+                            const rawHtml = outputFiles.get('index.server.html')?.contents;
                             if (!rawHtml) {
                                 next();
                                 return;
                             }
                             transformIndexHtmlAndAddHeaders(url, rawHtml, res, next, async (html) => {
+                                const protocol = serverOptions.ssl ? 'https' : 'http';
+                                const route = `${protocol}://${req.headers.host}${req.originalUrl}`;
                                 const { content } = await (0, render_page_1.renderPage)({
                                     document: html,
-                                    route: pathnameWithoutServePath(url, serverOptions),
+                                    route,
                                     serverContext: 'ssr',
                                     loadBundle: (path) => 
                                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -525,6 +547,23 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
     return configuration;
 }
 exports.setupServer = setupServer;
+/**
+ * Reads the resolved Vite client code from disk and updates the content to remove
+ * an unactionable suggestion to update the Vite configuration file to disable the
+ * error overlay. The Vite configuration file is not present when used in the Angular
+ * CLI.
+ * @param file The absolute path to the Vite client code.
+ * @returns
+ */
+async function loadViteClientCode(file) {
+    const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
+    let contents = originalContents.replace('You can also disable this overlay by setting', '');
+    contents = contents.replace(
+    // eslint-disable-next-line max-len
+    '<code part="config-option-name">server.hmr.overlay</code> to <code part="config-option-value">false</code> in <code part="config-file-name">vite.config.js.</code>', '');
+    (0, node_assert_1.default)(originalContents !== contents, 'Failed to update Vite client error overlay text.');
+    return contents;
+}
 function pathnameWithoutServePath(url, serverOptions) {
     const parsedUrl = new URL(url, 'http://localhost');
     let pathname = decodeURIComponent(parsedUrl.pathname);

package/src/builders/extract-i18n/application-extraction.js

@@ -22,6 +22,7 @@ async function extractMessages(options, builderName, context, extractorConstruct
     buildOptions.optimization = false;
     buildOptions.sourceMap = { scripts: true, vendor: true };
     buildOptions.localize = false;
+    buildOptions.budgets = undefined;
     let build;
     if (builderName === '@angular-devkit/build-angular:application') {
         build = application_1.buildApplicationInternal;

package/src/builders/prerender/routes-extractor-worker.js

@@ -45,7 +45,7 @@ async function extract() {
     const bootstrapAppFnOrModule = bootstrapAppFn || AppServerModule;
     (0, node_assert_1.default)(bootstrapAppFnOrModule, `Neither an AppServerModule nor a bootstrapping function was exported from: ${serverBundlePath}.`);
     const routes = [];
-    for await (const { route, success } of extractRoutes(bootstrapAppFnOrModule, document, '')) {
+    for await (const { route, success } of extractRoutes(bootstrapAppFnOrModule, document)) {
         if (success) {
             routes.push(route);
         }

package/src/tools/babel/plugins/elide-angular-metadata.js

@@ -17,6 +17,10 @@ const SET_CLASS_METADATA_NAME = 'ɵsetClassMetadata';
  * Name of the asynchronous Angular class metadata function created by the Angular compiler.
  */
 const SET_CLASS_METADATA_ASYNC_NAME = 'ɵsetClassMetadataAsync';
+/**
+ * Name of the function that sets debug information on classes.
+ */
+const SET_CLASS_DEBUG_INFO_NAME = 'ɵsetClassDebugInfo';
 /**
  * Provides one or more keywords that if found within the content of a source file indicate
  * that this plugin should be used with a source file.
@@ -24,7 +28,7 @@ const SET_CLASS_METADATA_ASYNC_NAME = 'ɵsetClassMetadataAsync';
  * @returns An a string iterable containing one or more keywords.
  */
 function getKeywords() {
-    return [SET_CLASS_METADATA_NAME, SET_CLASS_METADATA_ASYNC_NAME];
+    return [SET_CLASS_METADATA_NAME, SET_CLASS_METADATA_ASYNC_NAME, SET_CLASS_DEBUG_INFO_NAME];
 }
 exports.getKeywords = getKeywords;
 /**
@@ -48,7 +52,8 @@ function default_1() {
                 }
                 if (calleeName !== undefined &&
                     (isRemoveClassMetadataCall(calleeName, callArguments) ||
-                        isRemoveClassmetadataAsyncCall(calleeName, callArguments))) {
+                        isRemoveClassmetadataAsyncCall(calleeName, callArguments) ||
+                        isSetClassDebugInfoCall(calleeName, callArguments))) {
                     // The metadata function is always emitted inside a function expression
                     const parent = path.getFunctionParent();
                     if (parent && (parent.isFunctionExpression() || parent.isArrowFunctionExpression())) {
@@ -84,6 +89,13 @@ function isRemoveClassmetadataAsyncCall(name, args) {
         isInlineFunction(args[1]) &&
         isInlineFunction(args[2]));
 }
+/** Determines if a function call is a call to `setClassDebugInfo`. */
+function isSetClassDebugInfoCall(name, args) {
+    return (name === SET_CLASS_DEBUG_INFO_NAME &&
+        args.length === 2 &&
+        core_1.types.isIdentifier(args[0]) &&
+        core_1.types.isObjectExpression(args[1]));
+}
 /** Determines if a node is an inline function expression. */
 function isInlineFunction(node) {
     return core_1.types.isFunctionExpression(node) || core_1.types.isArrowFunctionExpression(node);

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

@@ -172,7 +172,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         // Return bundled worker file entry name to be used in the built output
                         const workerCodeFile = workerResult.outputFiles.find((file) => file.path.endsWith('.js'));
                         (0, node_assert_1.default)(workerCodeFile, 'Web Worker bundled code file should always be present.');
-                        return path.relative(build.initialOptions.outdir ?? '', workerCodeFile.path);
+                        const workerCodePath = path.relative(build.initialOptions.outdir ?? '', workerCodeFile.path);
+                        return workerCodePath.replaceAll('\\', '/');
                     },
                 };
                 // Initialize the Angular compilation for the current build.

package/src/tools/esbuild/application-code-bundle.d.ts

@@ -8,12 +8,13 @@
 import type { BuildOptions } from 'esbuild';
 import type { NormalizedApplicationBuildOptions } from '../../builders/application/options';
 import { SourceFileCache } from './angular/source-file-cache';
+import { BundlerOptionsFactory } from './bundler-context';
 export declare function createBrowserCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache?: SourceFileCache): BuildOptions;
-export declare function createBrowserPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache?: SourceFileCache): BuildOptions | undefined;
+export declare function createBrowserPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache?: SourceFileCache): BuildOptions | BundlerOptionsFactory | undefined;
 /**
  * Create an esbuild 'build' options object for the server bundle.
  * @param options The builder's user-provider normalized options.
  * @returns An esbuild BuildOptions object.
  */
 export declare function createServerCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache): BuildOptions;
-export declare function createServerPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache?: SourceFileCache): BuildOptions | undefined;
+export declare function createServerPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache?: SourceFileCache): BundlerOptionsFactory | undefined;

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

@@ -19,7 +19,6 @@ const environment_options_1 = require("../../utils/environment-options");
 const compiler_plugin_1 = require("./angular/compiler-plugin");
 const compiler_plugin_options_1 = require("./compiler-plugin-options");
 const i18n_locale_plugin_1 = require("./i18n-locale-plugin");
-const javascript_transfomer_plugin_1 = require("./javascript-transfomer-plugin");
 const rxjs_esm_resolution_plugin_1 = require("./rxjs-esm-resolution-plugin");
 const sourcemap_ignorelist_plugin_1 = require("./sourcemap-ignorelist-plugin");
 const utils_1 = require("./utils");
@@ -64,6 +63,7 @@ function createBrowserPolyfillBundleOptions(options, target, sourceFileCache) {
         return;
     }
     const { outputNames, polyfills } = options;
+    const hasTypeScriptEntries = polyfills?.some((entry) => /\.[cm]?tsx?$/.test(entry));
     const buildOptions = {
         ...polyfillBundleOptions,
         platform: 'browser',
@@ -79,7 +79,6 @@ function createBrowserPolyfillBundleOptions(options, target, sourceFileCache) {
         },
     };
     // Only add the Angular TypeScript compiler if TypeScript files are provided in the polyfills
-    const hasTypeScriptEntries = polyfills?.some((entry) => /\.[cm]?tsx?$/.test(entry));
     if (hasTypeScriptEntries) {
         buildOptions.plugins ??= [];
         const { pluginOptions, styleOptions } = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, target, sourceFileCache);
@@ -89,7 +88,10 @@ function createBrowserPolyfillBundleOptions(options, target, sourceFileCache) {
         // Component stylesheet options are unused for polyfills but required by the plugin
         styleOptions));
     }
-    return buildOptions;
+    // Use an options factory to allow fully incremental bundling when no TypeScript files are present.
+    // The TypeScript compilation is not currently integrated into the bundler invalidation so
+    // cannot be used with fully incremental bundling yet.
+    return hasTypeScriptEntries ? buildOptions : () => buildOptions;
 }
 exports.createBrowserPolyfillBundleOptions = createBrowserPolyfillBundleOptions;
 /**
@@ -195,7 +197,7 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
     if (!polyfillBundleOptions) {
         return;
     }
-    const { workspaceRoot, jit, sourcemapOptions, advancedOptimizations } = options;
+    const { workspaceRoot } = options;
     const buildOptions = {
         ...polyfillBundleOptions,
         platform: 'node',
@@ -232,14 +234,8 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
             }),
         }));
     }
-    buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)(), (0, javascript_transfomer_plugin_1.createJavaScriptTransformerPlugin)({
-        jit,
-        sourcemap: !!sourcemapOptions.scripts,
-        babelFileCache: sourceFileCache?.babelFileCache,
-        advancedOptimizations,
-        maxWorkers: 1,
-    }));
-    return buildOptions;
+    buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
+    return () => buildOptions;
 }
 exports.createServerPolyfillBundleOptions = createServerPolyfillBundleOptions;
 function getEsBuildCommonOptions(options) {

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

@@ -43,7 +43,7 @@ export declare class BundlerContext {
     private initialFilter?;
     readonly watchFiles: Set<string>;
     constructor(workspaceRoot: string, incremental: boolean, options: BuildOptions | BundlerOptionsFactory, initialFilter?: ((initial: Readonly<InitialFileRecord>) => boolean) | undefined);
-    static bundleAll(contexts: Iterable<BundlerContext>): Promise<BundleContextResult>;
+    static bundleAll(contexts: Iterable<BundlerContext>, changedFiles?: Iterable<string>): Promise<BundleContextResult>;
     /**
      * Executes the esbuild build function and normalizes the build result in the event of a
      * build failure that results in no output being generated.

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

@@ -53,8 +53,13 @@ class BundlerContext {
             };
         };
     }
-    static async bundleAll(contexts) {
-        const individualResults = await Promise.all([...contexts].map((context) => context.bundle()));
+    static async bundleAll(contexts, changedFiles) {
+        const individualResults = await Promise.all([...contexts].map((context) => {
+            if (changedFiles) {
+                context.invalidate(changedFiles);
+            }
+            return context.bundle();
+        }));
         // Return directly if only one result
         if (individualResults.length === 1) {
             return individualResults[0];

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

@@ -17,6 +17,7 @@ export interface RebuildState {
     rebuildContexts: BundlerContext[];
     codeBundleCache?: SourceFileCache;
     fileChanges: ChangedFiles;
+    previousOutputHashes: Map<string, string>;
 }
 /**
  * Represents the result of a single builder execute call.
@@ -57,5 +58,6 @@ export declare class ExecutionResult {
     };
     get watchFiles(): string[];
     createRebuildState(fileChanges: ChangedFiles): RebuildState;
+    findChangedFiles(previousOutputHashes: Map<string, string>): Set<string>;
     dispose(): Promise<void>;
 }