@angular/build 19.0.0-rc.0 → 19.0.0-rc.2

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

@@ -32,54 +32,56 @@ const sourcemap_ignorelist_plugin_1 = require("./sourcemap-ignorelist-plugin");
 const utils_1 = require("./utils");
 const virtual_module_plugin_1 = require("./virtual-module-plugin");
 const wasm_plugin_1 = require("./wasm-plugin");
-function createBrowserCodeBundleOptions(options, target, sourceFileCache, stylesheetBundler) {
-    const { entryPoints, outputNames, polyfills } = options;
-    const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache);
-    const zoneless = (0, utils_1.isZonelessApp)(polyfills);
-    const buildOptions = {
-        ...getEsBuildCommonOptions(options),
-        platform: 'browser',
-        // Note: `es2015` is needed for RxJS v6. If not specified, `module` would
-        // match and the ES5 distribution would be bundled and ends up breaking at
-        // runtime with the RxJS testing library.
-        // More details: https://github.com/angular/angular-cli/issues/25405.
-        mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
-        entryNames: outputNames.bundles,
-        entryPoints,
-        target,
-        supported: (0, utils_1.getFeatureSupport)(target, zoneless),
-        plugins: [
-            (0, loader_import_attribute_plugin_1.createLoaderImportAttributePlugin)(),
-            (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: sourceFileCache?.loadResultCache }),
-            (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
-            (0, compiler_plugin_1.createCompilerPlugin)(
-            // JS/TS options
-            pluginOptions, 
-            // Component stylesheet bundler
-            stylesheetBundler),
-        ],
-    };
-    if (options.plugins) {
-        buildOptions.plugins?.push(...options.plugins);
-    }
-    if (options.externalPackages) {
-        // Package files affected by a customized loader should not be implicitly marked as external
-        if (options.loaderExtensions ||
-            options.plugins ||
-            typeof options.externalPackages === 'object') {
-            // Plugin must be added after custom plugins to ensure any added loader options are considered
-            buildOptions.plugins?.push((0, external_packages_plugin_1.createExternalPackagesPlugin)(options.externalPackages !== true ? options.externalPackages : undefined));
+function createBrowserCodeBundleOptions(options, target, sourceFileCache, stylesheetBundler, templateUpdates) {
+    return (loadCache) => {
+        const { entryPoints, outputNames, polyfills } = options;
+        const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache, loadCache, templateUpdates);
+        const zoneless = (0, utils_1.isZonelessApp)(polyfills);
+        const buildOptions = {
+            ...getEsBuildCommonOptions(options),
+            platform: 'browser',
+            // Note: `es2015` is needed for RxJS v6. If not specified, `module` would
+            // match and the ES5 distribution would be bundled and ends up breaking at
+            // runtime with the RxJS testing library.
+            // More details: https://github.com/angular/angular-cli/issues/25405.
+            mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
+            entryNames: outputNames.bundles,
+            entryPoints,
+            target,
+            supported: (0, utils_1.getFeatureSupport)(target, zoneless),
+            plugins: [
+                (0, loader_import_attribute_plugin_1.createLoaderImportAttributePlugin)(),
+                (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: loadCache }),
+                (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
+                (0, compiler_plugin_1.createCompilerPlugin)(
+                // JS/TS options
+                pluginOptions, 
+                // Component stylesheet bundler
+                stylesheetBundler),
+            ],
+        };
+        if (options.plugins) {
+            buildOptions.plugins?.push(...options.plugins);
         }
-        else {
-            // Safe to use the packages external option directly
-            buildOptions.packages = 'external';
+        if (options.externalPackages) {
+            // Package files affected by a customized loader should not be implicitly marked as external
+            if (options.loaderExtensions ||
+                options.plugins ||
+                typeof options.externalPackages === 'object') {
+                // Plugin must be added after custom plugins to ensure any added loader options are considered
+                buildOptions.plugins?.push((0, external_packages_plugin_1.createExternalPackagesPlugin)(options.externalPackages !== true ? options.externalPackages : undefined));
+            }
+            else {
+                // Safe to use the packages external option directly
+                buildOptions.packages = 'external';
+            }
         }
-    }
-    return buildOptions;
+        return buildOptions;
+    };
 }
 function createBrowserPolyfillBundleOptions(options, target, sourceFileCache, stylesheetBundler) {
     const namespace = 'angular:polyfills';
-    const polyfillBundleOptions = getEsBuildCommonPolyfillsOptions(options, namespace, true, sourceFileCache);
+    const polyfillBundleOptions = getEsBuildCommonPolyfillsOptions(options, namespace, true, sourceFileCache.loadResultCache);
     if (!polyfillBundleOptions) {
         return;
     }
@@ -114,7 +116,7 @@ function createBrowserPolyfillBundleOptions(options, target, sourceFileCache, st
     // cannot be used with fully incremental bundling yet.
     return hasTypeScriptEntries ? buildOptions : () => buildOptions;
 }
-function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
+function createServerPolyfillBundleOptions(options, target, loadResultCache) {
     const serverPolyfills = [];
     const polyfillsFromConfig = new Set(options.polyfills);
     const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
@@ -130,7 +132,7 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
     const polyfillBundleOptions = getEsBuildCommonPolyfillsOptions({
         ...options,
         polyfills: serverPolyfills,
-    }, namespace, false, sourceFileCache);
+    }, namespace, false, loadResultCache);
     if (!polyfillBundleOptions) {
         return;
     }
@@ -166,210 +168,214 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
 function createServerMainCodeBundleOptions(options, target, sourceFileCache, stylesheetBundler) {
     const { serverEntryPoint: mainServerEntryPoint, workspaceRoot, outputMode, externalPackages, ssrOptions, polyfills, } = options;
     (0, node_assert_1.default)(mainServerEntryPoint, 'createServerCodeBundleOptions should not be called without a defined serverEntryPoint.');
-    const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache);
-    const mainServerNamespace = 'angular:main-server';
-    const mainServerInjectPolyfillsNamespace = 'angular:main-server-inject-polyfills';
-    const mainServerInjectManifestNamespace = 'angular:main-server-inject-manifest';
-    const zoneless = (0, utils_1.isZonelessApp)(polyfills);
-    const entryPoints = {
-        'main.server': mainServerNamespace,
-    };
-    const ssrEntryPoint = ssrOptions?.entry;
-    const isOldBehaviour = !outputMode;
-    if (ssrEntryPoint && isOldBehaviour) {
-        // Old behavior: 'server.ts' was bundled together with the SSR (Server-Side Rendering) code.
-        // This approach combined server-side logic and rendering into a single bundle.
-        entryPoints['server'] = ssrEntryPoint;
-    }
-    const buildOptions = {
-        ...getEsBuildServerCommonOptions(options),
-        target,
-        inject: [mainServerInjectPolyfillsNamespace, mainServerInjectManifestNamespace],
-        entryPoints,
-        supported: (0, utils_1.getFeatureSupport)(target, zoneless),
-        plugins: [
-            (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: sourceFileCache?.loadResultCache }),
-            (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
-            (0, compiler_plugin_1.createCompilerPlugin)(
-            // JS/TS options
-            { ...pluginOptions, noopTypeScriptCompilation: true }, 
-            // Component stylesheet bundler
-            stylesheetBundler),
-        ],
-    };
-    buildOptions.plugins ??= [];
-    if (externalPackages) {
-        buildOptions.packages = 'external';
-    }
-    else {
-        buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
-    }
-    // Mark manifest and polyfills file as external as these are generated by a different bundle step.
-    (buildOptions.external ??= []).push(...utils_1.SERVER_GENERATED_EXTERNALS);
-    const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
-    if (!isNodePlatform) {
-        // `@angular/platform-server` lazily depends on `xhr2` for XHR usage with the HTTP client.
-        // Since `xhr2` has Node.js dependencies, it cannot be used when targeting non-Node.js platforms.
-        // Note: The framework already issues a warning when using XHR with SSR.
-        buildOptions.external.push('xhr2');
-    }
-    buildOptions.plugins.push((0, server_bundle_metadata_plugin_1.createServerBundleMetadata)(), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-        namespace: mainServerInjectPolyfillsNamespace,
-        cache: sourceFileCache?.loadResultCache,
-        loadContent: () => ({
-            contents: `import './polyfills.server.mjs';`,
-            loader: 'js',
-            resolveDir: workspaceRoot,
-        }),
-    }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-        namespace: mainServerInjectManifestNamespace,
-        cache: sourceFileCache?.loadResultCache,
-        loadContent: async () => {
-            const contents = [
-                // Configure `@angular/ssr` manifest.
-                `import manifest from './${manifest_1.SERVER_APP_MANIFEST_FILENAME}';`,
-                `import { ɵsetAngularAppManifest } from '@angular/ssr';`,
-                `ɵsetAngularAppManifest(manifest);`,
-            ];
-            return {
-                contents: contents.join('\n'),
+    return (loadResultCache) => {
+        const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache, loadResultCache);
+        const mainServerNamespace = 'angular:main-server';
+        const mainServerInjectPolyfillsNamespace = 'angular:main-server-inject-polyfills';
+        const mainServerInjectManifestNamespace = 'angular:main-server-inject-manifest';
+        const zoneless = (0, utils_1.isZonelessApp)(polyfills);
+        const entryPoints = {
+            'main.server': mainServerNamespace,
+        };
+        const ssrEntryPoint = ssrOptions?.entry;
+        const isOldBehaviour = !outputMode;
+        if (ssrEntryPoint && isOldBehaviour) {
+            // Old behavior: 'server.ts' was bundled together with the SSR (Server-Side Rendering) code.
+            // This approach combined server-side logic and rendering into a single bundle.
+            entryPoints['server'] = ssrEntryPoint;
+        }
+        const buildOptions = {
+            ...getEsBuildServerCommonOptions(options),
+            target,
+            inject: [mainServerInjectPolyfillsNamespace, mainServerInjectManifestNamespace],
+            entryPoints,
+            supported: (0, utils_1.getFeatureSupport)(target, zoneless),
+            plugins: [
+                (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: loadResultCache }),
+                (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
+                (0, compiler_plugin_1.createCompilerPlugin)(
+                // JS/TS options
+                { ...pluginOptions, noopTypeScriptCompilation: true }, 
+                // Component stylesheet bundler
+                stylesheetBundler),
+            ],
+        };
+        buildOptions.plugins ??= [];
+        if (externalPackages) {
+            buildOptions.packages = 'external';
+        }
+        else {
+            buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
+        }
+        // Mark manifest and polyfills file as external as these are generated by a different bundle step.
+        (buildOptions.external ??= []).push(...utils_1.SERVER_GENERATED_EXTERNALS);
+        const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
+        if (!isNodePlatform) {
+            // `@angular/platform-server` lazily depends on `xhr2` for XHR usage with the HTTP client.
+            // Since `xhr2` has Node.js dependencies, it cannot be used when targeting non-Node.js platforms.
+            // Note: The framework already issues a warning when using XHR with SSR.
+            buildOptions.external.push('xhr2');
+        }
+        buildOptions.plugins.push((0, server_bundle_metadata_plugin_1.createServerBundleMetadata)(), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+            namespace: mainServerInjectPolyfillsNamespace,
+            cache: loadResultCache,
+            loadContent: () => ({
+                contents: `import './polyfills.server.mjs';`,
                 loader: 'js',
                 resolveDir: workspaceRoot,
-            };
-        },
-    }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-        namespace: mainServerNamespace,
-        cache: sourceFileCache?.loadResultCache,
-        loadContent: async () => {
-            const mainServerEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, mainServerEntryPoint);
-            const contents = [
-                // Re-export all symbols including default export from 'main.server.ts'
-                `export { default } from '${mainServerEntryPointJsImport}';`,
-                `export * from '${mainServerEntryPointJsImport}';`,
-                // Add @angular/ssr exports
-                `export {
+            }),
+        }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+            namespace: mainServerInjectManifestNamespace,
+            cache: loadResultCache,
+            loadContent: async () => {
+                const contents = [
+                    // Configure `@angular/ssr` manifest.
+                    `import manifest from './${manifest_1.SERVER_APP_MANIFEST_FILENAME}';`,
+                    `import { ɵsetAngularAppManifest } from '@angular/ssr';`,
+                    `ɵsetAngularAppManifest(manifest);`,
+                ];
+                return {
+                    contents: contents.join('\n'),
+                    loader: 'js',
+                    resolveDir: workspaceRoot,
+                };
+            },
+        }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+            namespace: mainServerNamespace,
+            cache: loadResultCache,
+            loadContent: async () => {
+                const mainServerEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, mainServerEntryPoint);
+                const contents = [
+                    // Re-export all symbols including default export from 'main.server.ts'
+                    `export { default } from '${mainServerEntryPointJsImport}';`,
+                    `export * from '${mainServerEntryPointJsImport}';`,
+                    // Add @angular/ssr exports
+                    `export {
             ɵdestroyAngularServerApp,
             ɵextractRoutesAndCreateRouteTree,
             ɵgetOrCreateAngularServerApp,
           } from '@angular/ssr';`,
-            ];
-            return {
-                contents: contents.join('\n'),
-                loader: 'js',
-                resolveDir: workspaceRoot,
-            };
-        },
-    }));
-    if (options.plugins) {
-        buildOptions.plugins.push(...options.plugins);
-    }
-    return buildOptions;
+                ];
+                return {
+                    contents: contents.join('\n'),
+                    loader: 'js',
+                    resolveDir: workspaceRoot,
+                };
+            },
+        }));
+        if (options.plugins) {
+            buildOptions.plugins.push(...options.plugins);
+        }
+        return buildOptions;
+    };
 }
 function createSsrEntryCodeBundleOptions(options, target, sourceFileCache, stylesheetBundler) {
     const { workspaceRoot, ssrOptions, externalPackages } = options;
     const serverEntryPoint = ssrOptions?.entry;
     (0, node_assert_1.default)(serverEntryPoint, 'createSsrEntryCodeBundleOptions should not be called without a defined serverEntryPoint.');
-    const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache);
-    const ssrEntryNamespace = 'angular:ssr-entry';
-    const ssrInjectManifestNamespace = 'angular:ssr-entry-inject-manifest';
-    const ssrInjectRequireNamespace = 'angular:ssr-entry-inject-require';
-    const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
-    const inject = [ssrInjectManifestNamespace];
-    if (isNodePlatform) {
-        inject.unshift(ssrInjectRequireNamespace);
-    }
-    const buildOptions = {
-        ...getEsBuildServerCommonOptions(options),
-        target,
-        entryPoints: {
-            // TODO: consider renaming to index
-            'server': ssrEntryNamespace,
-        },
-        supported: (0, utils_1.getFeatureSupport)(target, true),
-        plugins: [
-            (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
-            (0, compiler_plugin_1.createCompilerPlugin)(
-            // JS/TS options
-            { ...pluginOptions, noopTypeScriptCompilation: true }, 
-            // Component stylesheet bundler
-            stylesheetBundler),
-        ],
-        inject,
+    return (loadResultCache) => {
+        const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache, loadResultCache);
+        const ssrEntryNamespace = 'angular:ssr-entry';
+        const ssrInjectManifestNamespace = 'angular:ssr-entry-inject-manifest';
+        const ssrInjectRequireNamespace = 'angular:ssr-entry-inject-require';
+        const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
+        const inject = [ssrInjectManifestNamespace];
+        if (isNodePlatform) {
+            inject.unshift(ssrInjectRequireNamespace);
+        }
+        const buildOptions = {
+            ...getEsBuildServerCommonOptions(options),
+            target,
+            entryPoints: {
+                // TODO: consider renaming to index
+                'server': ssrEntryNamespace,
+            },
+            supported: (0, utils_1.getFeatureSupport)(target, true),
+            plugins: [
+                (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
+                (0, compiler_plugin_1.createCompilerPlugin)(
+                // JS/TS options
+                { ...pluginOptions, noopTypeScriptCompilation: true }, 
+                // Component stylesheet bundler
+                stylesheetBundler),
+            ],
+            inject,
+        };
+        buildOptions.plugins ??= [];
+        if (externalPackages) {
+            buildOptions.packages = 'external';
+        }
+        else {
+            buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
+        }
+        // Mark manifest file as external. As this will be generated later on.
+        (buildOptions.external ??= []).push('*/main.server.mjs', ...utils_1.SERVER_GENERATED_EXTERNALS);
+        if (!isNodePlatform) {
+            // `@angular/platform-server` lazily depends on `xhr2` for XHR usage with the HTTP client.
+            // Since `xhr2` has Node.js dependencies, it cannot be used when targeting non-Node.js platforms.
+            // Note: The framework already issues a warning when using XHR with SSR.
+            buildOptions.external.push('xhr2');
+        }
+        buildOptions.plugins.push((0, server_bundle_metadata_plugin_1.createServerBundleMetadata)({ ssrEntryBundle: true }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+            namespace: ssrInjectRequireNamespace,
+            cache: loadResultCache,
+            loadContent: () => {
+                const contents = [
+                    // Note: Needed as esbuild does not provide require shims / proxy from ESModules.
+                    // See: https://github.com/evanw/esbuild/issues/1921.
+                    `import { createRequire } from 'node:module';`,
+                    `globalThis['require'] ??= createRequire(import.meta.url);`,
+                ];
+                return {
+                    contents: contents.join('\n'),
+                    loader: 'js',
+                    resolveDir: workspaceRoot,
+                };
+            },
+        }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+            namespace: ssrInjectManifestNamespace,
+            cache: loadResultCache,
+            loadContent: () => {
+                const contents = [
+                    // Configure `@angular/ssr` app engine manifest.
+                    `import manifest from './${manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME}';`,
+                    `import { ɵsetAngularAppEngineManifest } from '@angular/ssr';`,
+                    `ɵsetAngularAppEngineManifest(manifest);`,
+                ];
+                return {
+                    contents: contents.join('\n'),
+                    loader: 'js',
+                    resolveDir: workspaceRoot,
+                };
+            },
+        }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+            namespace: ssrEntryNamespace,
+            cache: loadResultCache,
+            loadContent: () => {
+                const serverEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, serverEntryPoint);
+                const contents = [
+                    // Re-export all symbols including default export
+                    `import * as server from '${serverEntryPointJsImport}';`,
+                    `export * from '${serverEntryPointJsImport}';`,
+                    // The below is needed to avoid
+                    // `Import "default" will always be undefined because there is no matching export` warning when no default is present.
+                    `const defaultExportName = 'default';`,
+                    `export default server[defaultExportName]`,
+                    // Add @angular/ssr exports
+                    `export { AngularAppEngine } from '@angular/ssr';`,
+                ];
+                return {
+                    contents: contents.join('\n'),
+                    loader: 'js',
+                    resolveDir: workspaceRoot,
+                };
+            },
+        }));
+        if (options.plugins) {
+            buildOptions.plugins.push(...options.plugins);
+        }
+        return buildOptions;
     };
-    buildOptions.plugins ??= [];
-    if (externalPackages) {
-        buildOptions.packages = 'external';
-    }
-    else {
-        buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
-    }
-    // Mark manifest file as external. As this will be generated later on.
-    (buildOptions.external ??= []).push('*/main.server.mjs', ...utils_1.SERVER_GENERATED_EXTERNALS);
-    if (!isNodePlatform) {
-        // `@angular/platform-server` lazily depends on `xhr2` for XHR usage with the HTTP client.
-        // Since `xhr2` has Node.js dependencies, it cannot be used when targeting non-Node.js platforms.
-        // Note: The framework already issues a warning when using XHR with SSR.
-        buildOptions.external.push('xhr2');
-    }
-    buildOptions.plugins.push((0, server_bundle_metadata_plugin_1.createServerBundleMetadata)({ ssrEntryBundle: true }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-        namespace: ssrInjectRequireNamespace,
-        cache: sourceFileCache?.loadResultCache,
-        loadContent: () => {
-            const contents = [
-                // Note: Needed as esbuild does not provide require shims / proxy from ESModules.
-                // See: https://github.com/evanw/esbuild/issues/1921.
-                `import { createRequire } from 'node:module';`,
-                `globalThis['require'] ??= createRequire(import.meta.url);`,
-            ];
-            return {
-                contents: contents.join('\n'),
-                loader: 'js',
-                resolveDir: workspaceRoot,
-            };
-        },
-    }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-        namespace: ssrInjectManifestNamespace,
-        cache: sourceFileCache?.loadResultCache,
-        loadContent: () => {
-            const contents = [
-                // Configure `@angular/ssr` app engine manifest.
-                `import manifest from './${manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME}';`,
-                `import { ɵsetAngularAppEngineManifest } from '@angular/ssr';`,
-                `ɵsetAngularAppEngineManifest(manifest);`,
-            ];
-            return {
-                contents: contents.join('\n'),
-                loader: 'js',
-                resolveDir: workspaceRoot,
-            };
-        },
-    }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-        namespace: ssrEntryNamespace,
-        cache: sourceFileCache?.loadResultCache,
-        loadContent: () => {
-            const serverEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, serverEntryPoint);
-            const contents = [
-                // Re-export all symbols including default export
-                `import * as server from '${serverEntryPointJsImport}';`,
-                `export * from '${serverEntryPointJsImport}';`,
-                // The below is needed to avoid
-                // `Import "default" will always be undefined because there is no matching export` warning when no default is present.
-                `const defaultExportName = 'default';`,
-                `export default server[defaultExportName]`,
-                // Add @angular/ssr exports
-                `export { AngularAppEngine } from '@angular/ssr';`,
-            ];
-            return {
-                contents: contents.join('\n'),
-                loader: 'js',
-                resolveDir: workspaceRoot,
-            };
-        },
-    }));
-    if (options.plugins) {
-        buildOptions.plugins.push(...options.plugins);
-    }
-    return buildOptions;
 }
 function getEsBuildServerCommonOptions(options) {
     const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
@@ -442,7 +448,7 @@ function getEsBuildCommonOptions(options) {
         footer,
     };
 }
-function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfillsAsRelative, sourceFileCache) {
+function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfillsAsRelative, loadResultCache) {
     const { jit, workspaceRoot, i18nOptions } = options;
     const buildOptions = {
         ...getEsBuildCommonOptions(options),
@@ -480,7 +486,7 @@ function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfi
     }
     buildOptions.plugins?.push((0, virtual_module_plugin_1.createVirtualModulePlugin)({
         namespace,
-        cache: sourceFileCache?.loadResultCache,
+        cache: loadResultCache,
         loadContent: async (_, build) => {
             let polyfillPaths = polyfills;
             let warnings;

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

@@ -15,11 +15,15 @@ export interface BuildOutputAsset {
     destination: string;
 }
 export interface RebuildState {
-    rebuildContexts: BundlerContext[];
+    rebuildContexts: {
+        typescriptContexts: BundlerContext[];
+        otherContexts: BundlerContext[];
+    };
     componentStyleBundler: ComponentStylesheetBundler;
     codeBundleCache?: SourceFileCache;
     fileChanges: ChangedFiles;
     previousOutputHashes: Map<string, string>;
+    templateUpdates?: Map<string, string>;
 }
 export interface ExternalResultMetadata {
     implicitBrowser: string[];
@@ -36,6 +40,7 @@ export declare class ExecutionResult {
     private rebuildContexts;
     private componentStyleBundler;
     private codeBundleCache?;
+    readonly templateUpdates?: Map<string, string> | undefined;
     outputFiles: BuildOutputFile[];
     assetFiles: BuildOutputAsset[];
     errors: (Message | PartialMessage)[];
@@ -46,7 +51,10 @@ export declare class ExecutionResult {
     extraWatchFiles: string[];
     htmlIndexPath?: string;
     htmlBaseHref?: string;
-    constructor(rebuildContexts: BundlerContext[], componentStyleBundler: ComponentStylesheetBundler, codeBundleCache?: SourceFileCache | undefined);
+    constructor(rebuildContexts: {
+        typescriptContexts: BundlerContext[];
+        otherContexts: BundlerContext[];
+    }, componentStyleBundler: ComponentStylesheetBundler, codeBundleCache?: SourceFileCache | undefined, templateUpdates?: Map<string, string> | undefined);
     addOutputFile(path: string, content: string | Uint8Array, type: BuildOutputFileType): void;
     addAssets(assets: BuildOutputAsset[]): void;
     addLog(value: string): void;

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

@@ -17,6 +17,7 @@ class ExecutionResult {
     rebuildContexts;
     componentStyleBundler;
     codeBundleCache;
+    templateUpdates;
     outputFiles = [];
     assetFiles = [];
     errors = [];
@@ -27,10 +28,11 @@ class ExecutionResult {
     extraWatchFiles = [];
     htmlIndexPath;
     htmlBaseHref;
-    constructor(rebuildContexts, componentStyleBundler, codeBundleCache) {
+    constructor(rebuildContexts, componentStyleBundler, codeBundleCache, templateUpdates) {
         this.rebuildContexts = rebuildContexts;
         this.componentStyleBundler = componentStyleBundler;
         this.codeBundleCache = codeBundleCache;
+        this.templateUpdates = templateUpdates;
     }
     addOutputFile(path, content, type) {
         this.outputFiles.push((0, utils_1.createOutputFile)(path, content, type));
@@ -102,26 +104,24 @@ class ExecutionResult {
     }
     get watchFiles() {
         // Bundler contexts internally normalize file dependencies
-        const files = this.rebuildContexts.flatMap((context) => [...context.watchFiles]);
+        const files = this.rebuildContexts.typescriptContexts
+            .flatMap((context) => [...context.watchFiles])
+            .concat(this.rebuildContexts.otherContexts.flatMap((context) => [...context.watchFiles]));
         if (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.concat(this.extraWatchFiles);
     }
     createRebuildState(fileChanges) {
-        this.codeBundleCache?.invalidate([...fileChanges.modified, ...fileChanges.removed]);
         return {
             rebuildContexts: this.rebuildContexts,
             codeBundleCache: this.codeBundleCache,
             componentStyleBundler: this.componentStyleBundler,
             fileChanges,
             previousOutputHashes: new Map(this.outputFiles.map((file) => [file.path, file.hash])),
+            templateUpdates: this.templateUpdates,
         };
     }
     findChangedFiles(previousOutputHashes) {
@@ -135,8 +135,11 @@ class ExecutionResult {
         return changed;
     }
     async dispose() {
-        await Promise.allSettled(this.rebuildContexts.map((context) => context.dispose()));
-        await this.componentStyleBundler.dispose();
+        await Promise.allSettled([
+            ...this.rebuildContexts.typescriptContexts.map((context) => context.dispose()),
+            ...this.rebuildContexts.otherContexts.map((context) => context.dispose()),
+            this.componentStyleBundler.dispose(),
+        ]);
     }
 }
 exports.ExecutionResult = ExecutionResult;