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

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.0.0-rc.2",
+  "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.2",
-    "@angular-devkit/build-webpack": "0.1700.0-rc.2",
-    "@angular-devkit/core": "17.0.0-rc.2",
+    "@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.2",
+    "@ngtools/webpack": "17.0.0-rc.3",
     "@vitejs/plugin-basic-ssl": "1.0.1",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",
@@ -49,7 +49,7 @@
     "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",
@@ -60,10 +60,11 @@
     "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");
@@ -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/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");
@@ -157,7 +158,7 @@ async function* serveWithVite(serverOptions, builderName, context, plugins) {
             }
         }
         if (server) {
-            handleUpdate(generatedFiles, server, serverOptions, context.logger);
+            handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
         }
         else {
             const projectName = context.target?.project;
@@ -189,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));
         }
     }
@@ -207,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,
@@ -240,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
@@ -282,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',
@@ -316,7 +318,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
         },
         ssr: {
             // Exclude any provided dependencies (currently build defined externals)
-            external: externalMetadata.implicit,
+            external: externalMetadata.explicit,
         },
         plugins: [
             (0, i18n_locale_plugin_1.createAngularLocaleDataPlugin)(),
@@ -331,24 +333,31 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                         // `/@id/${source}` but is currently closer to a raw external than a resolved file path.
                         return source;
                     }
-                    if (importer && source.startsWith('.')) {
+                    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.
@@ -422,7 +431,7 @@ 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;
@@ -538,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

@@ -63,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',
@@ -78,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);
@@ -88,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;
 /**
@@ -232,7 +235,7 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
         }));
     }
     buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
-    return buildOptions;
+    return () => buildOptions;
 }
 exports.createServerPolyfillBundleOptions = createServerPolyfillBundleOptions;
 function getEsBuildCommonOptions(options) {

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>;
 }

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

@@ -60,6 +60,9 @@ class ExecutionResult {
         if (this.codeBundleCache?.referencedFiles) {
             files.push(...this.codeBundleCache.referencedFiles);
         }
+        if (this.codeBundleCache?.loadResultCache) {
+            files.push(...this.codeBundleCache.loadResultCache.watchFiles);
+        }
         return files;
     }
     createRebuildState(fileChanges) {
@@ -68,8 +71,19 @@ class ExecutionResult {
             rebuildContexts: this.rebuildContexts,
             codeBundleCache: this.codeBundleCache,
             fileChanges,
+            previousOutputHashes: new Map(this.outputFiles.map((file) => [file.path, file.hash])),
         };
     }
+    findChangedFiles(previousOutputHashes) {
+        const changed = new Set();
+        for (const file of this.outputFiles) {
+            const previousHash = previousOutputHashes.get(file.path);
+            if (previousHash === undefined || previousHash !== file.hash) {
+                changed.add(file.path);
+            }
+        }
+        return changed;
+    }
     async dispose() {
         await Promise.allSettled(this.rebuildContexts.map((context) => context.dispose()));
     }

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

@@ -84,11 +84,11 @@ function checkCommonJSModules(metafile, allowedCommonJsDependencies) {
                     }
                 }
                 if (notAllowed) {
-                    // Issue a diagnostic message and skip all descendants since they are also most
-                    // likely not ESM but solved by addressing this import.
+                    // Issue a diagnostic message for CommonJS module
                     messages.push(createCommonJSModuleError(request, currentFile));
-                    continue;
                 }
+                // Skip all descendants since they are also most likely not ESM but solved by addressing this import
+                continue;
             }
             // Add the path so that its imports can be checked
             files.push(imported.path);

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

@@ -23,6 +23,7 @@ export interface JavaScriptTransformerOptions {
  */
 export declare class JavaScriptTransformer {
     #private;
+    readonly maxThreads: number;
     constructor(options: JavaScriptTransformerOptions, maxThreads: number);
     /**
      * Performs JavaScript transformations on a file from the filesystem.

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

@@ -20,16 +20,11 @@ const piscina_1 = __importDefault(require("piscina"));
  * and advanced optimizations.
  */
 class JavaScriptTransformer {
+    maxThreads;
     #workerPool;
     #commonOptions;
     constructor(options, maxThreads) {
-        this.#workerPool = new piscina_1.default({
-            filename: require.resolve('./javascript-transformer-worker'),
-            minThreads: 1,
-            maxThreads,
-            // Shutdown idle threads after 1 second of inactivity
-            idleTimeout: 1000,
-        });
+        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;
         this.#commonOptions = {
@@ -39,6 +34,16 @@ class JavaScriptTransformer {
             jit,
         };
     }
+    #ensureWorkerPool() {
+        this.#workerPool ??= new piscina_1.default({
+            filename: require.resolve('./javascript-transformer-worker'),
+            minThreads: 1,
+            maxThreads: this.maxThreads,
+            // Shutdown idle threads after 1 second of inactivity
+            idleTimeout: 1000,
+        });
+        return this.#workerPool;
+    }
     /**
      * Performs JavaScript transformations on a file from the filesystem.
      * If no transformations are required, the data for the original file will be returned.
@@ -49,7 +54,7 @@ class JavaScriptTransformer {
     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.#workerPool.run({
+        return this.#ensureWorkerPool().run({
             filename,
             skipLinker,
             ...this.#commonOptions,
@@ -71,7 +76,7 @@ class JavaScriptTransformer {
                 (!!this.#commonOptions.thirdPartySourcemaps || !/[\\/]node_modules[\\/]/.test(filename));
             return Buffer.from(keepSourcemap ? data : data.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, ''), 'utf-8');
         }
-        return this.#workerPool.run({
+        return this.#ensureWorkerPool().run({
             filename,
             data,
             skipLinker,
@@ -82,10 +87,17 @@ class JavaScriptTransformer {
      * Stops all active transformation tasks and shuts down all workers.
      * @returns A void promise that resolves when closing is complete.
      */
-    close() {
-        // Workaround piscina bug where a worker thread will be recreated after destroy to meet the minimum.
-        this.#workerPool.options.minThreads = 0;
-        return this.#workerPool.destroy();
+    async close() {
+        if (this.#workerPool) {
+            // Workaround piscina bug where a worker thread will be recreated after destroy to meet the minimum.
+            this.#workerPool.options.minThreads = 0;
+            try {
+                await this.#workerPool.destroy();
+            }
+            finally {
+                this.#workerPool = undefined;
+            }
+        }
     }
 }
 exports.JavaScriptTransformer = JavaScriptTransformer;

package/src/tools/esbuild/utils.d.ts

@@ -10,7 +10,7 @@ import { BuildOptions, Metafile, OutputFile, PartialMessage } from 'esbuild';
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
 import { BuildOutputFile, BuildOutputFileType, InitialFileRecord } from './bundler-context';
 import { BuildOutputAsset } from './bundler-execution-result';
-export declare function logBuildStats(context: BuilderContext, metafile: Metafile, initial: Map<string, InitialFileRecord>, budgetFailures: BudgetCalculatorResult[] | undefined, estimatedTransferSizes?: Map<string, number>): void;
+export declare function logBuildStats(context: BuilderContext, metafile: Metafile, initial: Map<string, InitialFileRecord>, budgetFailures: BudgetCalculatorResult[] | undefined, changedFiles?: Set<string>, estimatedTransferSizes?: Map<string, number>): void;
 export declare function calculateEstimatedTransferSizes(outputFiles: OutputFile[]): Promise<Map<string, number>>;
 export declare function withSpinner<T>(text: string, action: () => T | Promise<T>): Promise<T>;
 export declare function withNoProgress<T>(text: string, action: () => T | Promise<T>): Promise<T>;

package/src/tools/esbuild/utils.js

@@ -46,8 +46,9 @@ const spinner_1 = require("../../utils/spinner");
 const stats_1 = require("../webpack/utils/stats");
 const bundler_context_1 = require("./bundler-context");
 const compressAsync = (0, node_util_1.promisify)(node_zlib_1.brotliCompress);
-function logBuildStats(context, metafile, initial, budgetFailures, estimatedTransferSizes) {
+function logBuildStats(context, metafile, initial, budgetFailures, changedFiles, estimatedTransferSizes) {
     const stats = [];
+    let unchangedCount = 0;
     for (const [file, output] of Object.entries(metafile.outputs)) {
         // Only display JavaScript and CSS files
         if (!file.endsWith('.js') && !file.endsWith('.css')) {
@@ -58,6 +59,11 @@ function logBuildStats(context, metafile, initial, budgetFailures, estimatedTran
         if (output['ng-component']) {
             continue;
         }
+        // Show only changed files if a changed list is provided
+        if (changedFiles && !changedFiles.has(file)) {
+            ++unchangedCount;
+            continue;
+        }
         let name = initial.get(file)?.name;
         if (name === undefined && output.entryPoint) {
             name = node_path_1.default
@@ -70,8 +76,16 @@ function logBuildStats(context, metafile, initial, budgetFailures, estimatedTran
             stats: [file, name ?? '-', output.bytes, estimatedTransferSizes?.get(file) ?? '-'],
         });
     }
-    const tableText = (0, stats_1.generateBuildStatsTable)(stats, true, true, !!estimatedTransferSizes, budgetFailures);
-    context.logger.info('\n' + tableText + '\n');
+    if (stats.length > 0) {
+        const tableText = (0, stats_1.generateBuildStatsTable)(stats, true, unchangedCount === 0, !!estimatedTransferSizes, budgetFailures);
+        context.logger.info('\n' + tableText + '\n');
+    }
+    else if (changedFiles !== undefined) {
+        context.logger.info('\nNo output file changes.\n');
+    }
+    if (unchangedCount > 0) {
+        context.logger.info(`Unchanged output files: ${unchangedCount}`);
+    }
 }
 exports.logBuildStats = logBuildStats;
 async function calculateEstimatedTransferSizes(outputFiles) {
@@ -327,7 +341,7 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
     return transformed;
 }
 exports.transformSupportedBrowsersToTargets = transformSupportedBrowsersToTargets;
-const SUPPORTED_NODE_VERSIONS = '>=18.13.0';
+const SUPPORTED_NODE_VERSIONS = '^18.13.0 || >=20.9.0';
 /**
  * Transform supported Node.js versions to esbuild target.
  * @see https://esbuild.github.io/api/#target

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

@@ -12,3 +12,4 @@ export declare const maxWorkers: number;
 export declare const useParallelTs: boolean;
 export declare const useLegacySass: boolean;
 export declare const debugPerformance: boolean;
+export declare const shouldWatchRoot: boolean;

package/src/utils/environment-options.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debugPerformance = exports.useLegacySass = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
+exports.shouldWatchRoot = exports.debugPerformance = exports.useLegacySass = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
 const color_1 = require("./color");
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
@@ -81,3 +81,5 @@ exports.useLegacySass = (() => {
 })();
 const debugPerfVariable = process.env['NG_BUILD_DEBUG_PERF'];
 exports.debugPerformance = isPresent(debugPerfVariable) && isEnabled(debugPerfVariable);
+const watchRootVariable = process.env['NG_BUILD_WATCH_ROOT'];
+exports.shouldWatchRoot = isPresent(watchRootVariable) && isEnabled(watchRootVariable);

package/src/utils/routes-extractor/extractor.d.ts

@@ -11,5 +11,5 @@ interface RouterResult {
     success: boolean;
     redirect: boolean;
 }
-export declare function extractRoutes(bootstrapAppFnOrModule: (() => Promise<ApplicationRef>) | Type<unknown>, document: string, url: string): AsyncIterableIterator<RouterResult>;
+export declare function extractRoutes(bootstrapAppFnOrModule: (() => Promise<ApplicationRef>) | Type<unknown>, document: string): AsyncIterableIterator<RouterResult>;
 export {};

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

@@ -38,11 +38,11 @@ async function* getRoutesFromRouterConfig(routes, compiler, parentInjector, pare
         }
     }
 }
-export async function* extractRoutes(bootstrapAppFnOrModule, document, url) {
+export async function* extractRoutes(bootstrapAppFnOrModule, document) {
     const platformRef = createPlatformFactory(platformCore, 'server', [
         {
             provide: INITIAL_CONFIG,
-            useValue: { document, url },
+            useValue: { document, url: '' },
         },
         {
             provide: ɵConsole,

package/src/utils/server-rendering/esm-in-memory-loader/loader-hooks.js

@@ -47,7 +47,9 @@ function resolve(specifier, context, nextResolve) {
 }
 exports.resolve = resolve;
 async function load(url, context, nextLoad) {
-    if (isFileProtocol(url)) {
+    const { format } = context;
+    // CommonJs modules require no transformations and are not in memory.
+    if (format !== 'commonjs' && isFileProtocol(url)) {
         const filePath = (0, url_1.fileURLToPath)(url);
         // Remove '/' or drive letter for Windows that was added in the above 'resolve'.
         let source = outputFiles[(0, node_path_1.relative)('/', filePath)] ?? TRANSFORMED_FILES[filePath];
@@ -55,7 +57,6 @@ async function load(url, context, nextLoad) {
             source = TRANSFORMED_FILES[filePath] = Buffer.from(await javascriptTransformer.transformFile(filePath)).toString('utf-8');
         }
         if (source !== undefined) {
-            const { format } = context;
             return {
                 format,
                 shortCircuit: true,

package/src/utils/server-rendering/fetch-patch.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export declare function patchFetchToLoadInMemoryAssets(): void;

package/src/utils/server-rendering/fetch-patch.js

@@ -0,0 +1,66 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchFetchToLoadInMemoryAssets = void 0;
+const mrmime_1 = require("mrmime");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const node_worker_threads_1 = require("node:worker_threads");
+const undici_1 = require("undici");
+/**
+ * This is passed as workerData when setting up the worker via the `piscina` package.
+ */
+const { assetFiles } = node_worker_threads_1.workerData;
+const assetsCache = new Map();
+const RESOLVE_PROTOCOL = 'resolve:';
+function patchFetchToLoadInMemoryAssets() {
+    const global = globalThis;
+    const originalFetch = global.fetch;
+    const patchedFetch = async (input, init) => {
+        let url;
+        if (input instanceof URL) {
+            url = input;
+        }
+        else if (typeof input === 'string') {
+            url = new URL(input, RESOLVE_PROTOCOL + '//');
+        }
+        else if (typeof input === 'object' && 'url' in input) {
+            url = new URL(input.url, RESOLVE_PROTOCOL + '//');
+        }
+        else {
+            return originalFetch(input, init);
+        }
+        const { pathname, protocol } = url;
+        if (protocol !== RESOLVE_PROTOCOL || !assetFiles[pathname]) {
+            // Only handle relative requests or files that are in assets.
+            return originalFetch(input, init);
+        }
+        const cachedAsset = assetsCache.get(pathname);
+        if (cachedAsset) {
+            const { content, headers } = cachedAsset;
+            return new undici_1.Response(content, {
+                headers,
+            });
+        }
+        const extension = (0, node_path_1.extname)(pathname);
+        const mimeType = (0, mrmime_1.lookup)(extension);
+        const content = await (0, promises_1.readFile)(assetFiles[pathname]);
+        const headers = mimeType
+            ? {
+                'Content-Type': mimeType,
+            }
+            : undefined;
+        assetsCache.set(pathname, { headers, content });
+        return new undici_1.Response(content, {
+            headers,
+        });
+    };
+    global.fetch = patchedFetch;
+}
+exports.patchFetchToLoadInMemoryAssets = patchFetchToLoadInMemoryAssets;

package/src/utils/server-rendering/prerender.js

@@ -16,7 +16,6 @@ const node_path_1 = require("node:path");
 const piscina_1 = __importDefault(require("piscina"));
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const node_18_utils_1 = require("./esm-in-memory-loader/node-18-utils");
-const prerender_server_1 = require("./prerender-server");
 async function prerenderPages(workspaceRoot, appShellOptions = {}, prerenderOptions = {}, outputFiles, assets, document, sourcemap = false, inlineCriticalCss = false, maxThreads = 1, verbose = false) {
     const outputFilesForWorker = {};
     const serverBundlesSourceMaps = new Map();
@@ -45,37 +44,33 @@ async function prerenderPages(workspaceRoot, appShellOptions = {}, prerenderOpti
         }
     }
     serverBundlesSourceMaps.clear();
-    // Start server to handle HTTP requests to assets.
-    // TODO: consider starting this is a seperate process to avoid any blocks to the main thread.
-    const { address: assetsServerAddress, close: closeAssetsServer } = await (0, prerender_server_1.startServer)(assets);
-    try {
-        // Get routes to prerender
-        const { routes: allRoutes, warnings: routesWarnings } = await getAllRoutes(workspaceRoot, outputFilesForWorker, document, appShellOptions, prerenderOptions, sourcemap, verbose, assetsServerAddress);
-        if (routesWarnings?.length) {
-            warnings.push(...routesWarnings);
-        }
-        if (allRoutes.size < 1) {
-            return {
-                errors,
-                warnings,
-                output: {},
-                prerenderedRoutes: allRoutes,
-            };
-        }
-        // Render routes
-        const { warnings: renderingWarnings, errors: renderingErrors, output, } = await renderPages(sourcemap, allRoutes, maxThreads, workspaceRoot, outputFilesForWorker, inlineCriticalCss, document, assetsServerAddress, appShellOptions);
-        errors.push(...renderingErrors);
-        warnings.push(...renderingWarnings);
+    const assetsReversed = {};
+    for (const { source, destination } of assets) {
+        assetsReversed[addLeadingSlash(destination.replace(/\\/g, node_path_1.posix.sep))] = source;
+    }
+    // Get routes to prerender
+    const { routes: allRoutes, warnings: routesWarnings } = await getAllRoutes(workspaceRoot, outputFilesForWorker, assetsReversed, document, appShellOptions, prerenderOptions, sourcemap, verbose);
+    if (routesWarnings?.length) {
+        warnings.push(...routesWarnings);
+    }
+    if (allRoutes.size < 1) {
         return {
             errors,
             warnings,
-            output,
+            output: {},
             prerenderedRoutes: allRoutes,
         };
     }
-    finally {
-        void closeAssetsServer?.();
-    }
+    // Render routes
+    const { warnings: renderingWarnings, errors: renderingErrors, output, } = await renderPages(sourcemap, allRoutes, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, inlineCriticalCss, document, appShellOptions);
+    errors.push(...renderingErrors);
+    warnings.push(...renderingWarnings);
+    return {
+        errors,
+        warnings,
+        output,
+        prerenderedRoutes: allRoutes,
+    };
 }
 exports.prerenderPages = prerenderPages;
 class RoutesSet extends Set {
@@ -83,7 +78,7 @@ class RoutesSet extends Set {
         return super.add(addLeadingSlash(value));
     }
 }
-async function renderPages(sourcemap, allRoutes, maxThreads, workspaceRoot, outputFilesForWorker, inlineCriticalCss, document, baseUrl, appShellOptions) {
+async function renderPages(sourcemap, allRoutes, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, inlineCriticalCss, document, appShellOptions) {
     const output = {};
     const warnings = [];
     const errors = [];
@@ -97,9 +92,9 @@ async function renderPages(sourcemap, allRoutes, maxThreads, workspaceRoot, outp
         workerData: {
             workspaceRoot,
             outputFiles: outputFilesForWorker,
+            assetFiles: assetFilesForWorker,
             inlineCriticalCss,
             document,
-            baseUrl,
         },
         execArgv: workerExecArgv,
     });
@@ -139,7 +134,7 @@ async function renderPages(sourcemap, allRoutes, maxThreads, workspaceRoot, outp
         output,
     };
 }
-async function getAllRoutes(workspaceRoot, outputFilesForWorker, document, appShellOptions, prerenderOptions, sourcemap, verbose, assetsServerAddress) {
+async function getAllRoutes(workspaceRoot, outputFilesForWorker, assetFilesForWorker, document, appShellOptions, prerenderOptions, sourcemap, verbose) {
     const { routesFile, discoverRoutes } = prerenderOptions;
     const routes = new RoutesSet();
     const { route: appShellRoute } = appShellOptions;
@@ -165,9 +160,9 @@ async function getAllRoutes(workspaceRoot, outputFilesForWorker, document, appSh
         workerData: {
             workspaceRoot,
             outputFiles: outputFilesForWorker,
+            assetFiles: assetFilesForWorker,
             document,
             verbose,
-            url: assetsServerAddress,
         },
         execArgv: workerExecArgv,
     });

package/src/utils/server-rendering/render-worker.d.ts

@@ -10,11 +10,13 @@ import { RenderResult, ServerContext } from './render-page';
 export interface RenderWorkerData extends ESMInMemoryFileLoaderWorkerData {
     document: string;
     inlineCriticalCss?: boolean;
-    baseUrl: string;
+    assetFiles: Record</** Destination */ string, /** Source */ string>;
 }
 export interface RenderOptions {
     route: string;
     serverContext: ServerContext;
 }
 /** Renders an application based on a provided options. */
-export default function (options: RenderOptions): Promise<RenderResult>;
+declare function render(options: RenderOptions): Promise<RenderResult>;
+declare const _default: typeof render;
+export default _default;

package/src/utils/server-rendering/render-worker.js

@@ -8,19 +8,23 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_worker_threads_1 = require("node:worker_threads");
+const fetch_patch_1 = require("./fetch-patch");
 const render_page_1 = require("./render-page");
 /**
  * This is passed as workerData when setting up the worker via the `piscina` package.
  */
-const { outputFiles, document, inlineCriticalCss, baseUrl } = node_worker_threads_1.workerData;
+const { outputFiles, document, inlineCriticalCss } = node_worker_threads_1.workerData;
 /** Renders an application based on a provided options. */
-function default_1(options) {
+async function render(options) {
     return (0, render_page_1.renderPage)({
         ...options,
-        route: baseUrl + options.route,
         outputFiles,
         document,
         inlineCriticalCss,
     });
 }
-exports.default = default_1;
+function initialize() {
+    (0, fetch_patch_1.patchFetchToLoadInMemoryAssets)();
+    return render;
+}
+exports.default = initialize();

package/src/utils/server-rendering/routes-extractor-worker.d.ts

@@ -9,11 +9,13 @@ import type { ESMInMemoryFileLoaderWorkerData } from './esm-in-memory-loader/loa
 export interface RoutesExtractorWorkerData extends ESMInMemoryFileLoaderWorkerData {
     document: string;
     verbose: boolean;
-    url: string;
-    assetsServerAddress: string;
+    assetFiles: Record</** Destination */ string, /** Source */ string>;
 }
 export interface RoutersExtractorWorkerResult {
     routes: string[];
     warnings?: string[];
 }
-export default function (): Promise<RoutersExtractorWorkerResult>;
+/** Renders an application based on a provided options. */
+declare function extractRoutes(): Promise<RoutersExtractorWorkerResult>;
+declare const _default: typeof extractRoutes;
+export default _default;

package/src/utils/server-rendering/routes-extractor-worker.js

@@ -9,17 +9,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_worker_threads_1 = require("node:worker_threads");
 const load_esm_1 = require("../load-esm");
+const fetch_patch_1 = require("./fetch-patch");
 /**
  * This is passed as workerData when setting up the worker via the `piscina` package.
  */
-const { document, verbose, url } = node_worker_threads_1.workerData;
-async function default_1() {
+const { document, verbose } = node_worker_threads_1.workerData;
+/** Renders an application based on a provided options. */
+async function extractRoutes() {
     const { extractRoutes } = await (0, load_esm_1.loadEsmModule)('./render-utils.server.mjs');
     const { default: bootstrapAppFnOrModule } = await (0, load_esm_1.loadEsmModule)('./main.server.mjs');
     const skippedRedirects = [];
     const skippedOthers = [];
     const routes = [];
-    for await (const { route, success, redirect } of extractRoutes(bootstrapAppFnOrModule, document, url)) {
+    for await (const { route, success, redirect } of extractRoutes(bootstrapAppFnOrModule, document)) {
         if (success) {
             routes.push(route);
             continue;
@@ -44,4 +46,8 @@ async function default_1() {
     }
     return { routes, warnings };
 }
-exports.default = default_1;
+function initialize() {
+    (0, fetch_patch_1.patchFetchToLoadInMemoryAssets)();
+    return extractRoutes;
+}
+exports.default = initialize();

package/src/utils/server-rendering/prerender-server.d.ts

@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { BuildOutputAsset } from '../../tools/esbuild/bundler-execution-result';
-/**
- * Start a server that can handle HTTP requests to assets.
- *
- * @example
- * ```ts
- * httpClient.get('/assets/content.json');
- * ```
- * @returns the server address.
- */
-export declare function startServer(assets: Readonly<BuildOutputAsset[]>): Promise<{
-    address: string;
-    close?: () => void;
-}>;

package/src/utils/server-rendering/prerender-server.js

@@ -1,102 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startServer = void 0;
-const mrmime_1 = require("mrmime");
-const promises_1 = require("node:fs/promises");
-const node_http_1 = require("node:http");
-const node_path_1 = require("node:path");
-/**
- * Start a server that can handle HTTP requests to assets.
- *
- * @example
- * ```ts
- * httpClient.get('/assets/content.json');
- * ```
- * @returns the server address.
- */
-async function startServer(assets) {
-    if (Object.keys(assets).length === 0) {
-        return {
-            address: '',
-        };
-    }
-    const assetsReversed = {};
-    for (const { source, destination } of assets) {
-        assetsReversed[addLeadingSlash(destination.replace(/\\/g, node_path_1.posix.sep))] = source;
-    }
-    const assetsCache = new Map();
-    const server = (0, node_http_1.createServer)(requestHandler(assetsReversed, assetsCache));
-    await new Promise((resolve) => {
-        server.listen(0, '127.0.0.1', resolve);
-    });
-    const serverAddress = server.address();
-    let address;
-    if (!serverAddress) {
-        address = '';
-    }
-    else if (typeof serverAddress === 'string') {
-        address = serverAddress;
-    }
-    else {
-        const { port, address: host } = serverAddress;
-        address = `http://${host}:${port}`;
-    }
-    return {
-        address,
-        close: () => {
-            assetsCache.clear();
-            server.unref();
-            server.close();
-        },
-    };
-}
-exports.startServer = startServer;
-function requestHandler(assetsReversed, assetsCache) {
-    return (req, res) => {
-        if (!req.url) {
-            res.destroy(new Error('Request url was empty.'));
-            return;
-        }
-        const { pathname } = new URL(req.url, 'resolve://');
-        const asset = assetsReversed[pathname];
-        if (!asset) {
-            res.statusCode = 404;
-            res.statusMessage = 'Asset not found.';
-            res.end();
-            return;
-        }
-        const cachedAsset = assetsCache.get(pathname);
-        if (cachedAsset) {
-            const { content, mimeType } = cachedAsset;
-            if (mimeType) {
-                res.setHeader('Content-Type', mimeType);
-            }
-            res.end(content);
-            return;
-        }
-        (0, promises_1.readFile)(asset)
-            .then((content) => {
-            const extension = (0, node_path_1.extname)(pathname);
-            const mimeType = (0, mrmime_1.lookup)(extension);
-            assetsCache.set(pathname, {
-                mimeType,
-                content,
-            });
-            if (mimeType) {
-                res.setHeader('Content-Type', mimeType);
-            }
-            res.end(content);
-        })
-            .catch((e) => res.destroy(e));
-    };
-}
-function addLeadingSlash(value) {
-    return value.charAt(0) === '/' ? value : '/' + value;
-}