@angular/build 19.0.0-next.1 → 19.0.0-next.11

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

@@ -12,18 +12,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBrowserCodeBundleOptions = createBrowserCodeBundleOptions;
 exports.createBrowserPolyfillBundleOptions = createBrowserPolyfillBundleOptions;
-exports.createServerCodeBundleOptions = createServerCodeBundleOptions;
 exports.createServerPolyfillBundleOptions = createServerPolyfillBundleOptions;
+exports.createServerMainCodeBundleOptions = createServerMainCodeBundleOptions;
+exports.createSsrEntryCodeBundleOptions = createSsrEntryCodeBundleOptions;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
 const node_path_1 = require("node:path");
+const schema_1 = require("../../builders/application/schema");
 const environment_options_1 = require("../../utils/environment-options");
+const manifest_1 = require("../../utils/server-rendering/manifest");
 const compiler_plugin_1 = require("./angular/compiler-plugin");
 const compiler_plugin_options_1 = require("./compiler-plugin-options");
 const external_packages_plugin_1 = require("./external-packages-plugin");
 const i18n_locale_plugin_1 = require("./i18n-locale-plugin");
 const loader_import_attribute_plugin_1 = require("./loader-import-attribute-plugin");
 const rxjs_esm_resolution_plugin_1 = require("./rxjs-esm-resolution-plugin");
+const server_bundle_metadata_plugin_1 = require("./server-bundle-metadata-plugin");
 const sourcemap_ignorelist_plugin_1 = require("./sourcemap-ignorelist-plugin");
 const utils_1 = require("./utils");
 const virtual_module_plugin_1 = require("./virtual-module-plugin");
@@ -110,29 +114,29 @@ function createBrowserPolyfillBundleOptions(options, target, sourceFileCache) {
     // cannot be used with fully incremental bundling yet.
     return hasTypeScriptEntries ? buildOptions : () => buildOptions;
 }
-/**
- * Create an esbuild 'build' options object for the server bundle.
- * @param options The builder's user-provider normalized options.
- * @returns An esbuild BuildOptions object.
- */
-function createServerCodeBundleOptions(options, target, sourceFileCache) {
-    const { serverEntryPoint, workspaceRoot, ssrOptions, watch, externalPackages, prerenderOptions, polyfills, } = options;
-    (0, node_assert_1.default)(serverEntryPoint, 'createServerCodeBundleOptions should not be called without a defined serverEntryPoint.');
-    const { pluginOptions, styleOptions } = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, target, sourceFileCache);
-    const mainServerNamespace = 'angular:server-render-utils';
-    const entryPoints = {
-        'render-utils.server': mainServerNamespace,
-        'main.server': serverEntryPoint,
-    };
-    const ssrEntryPoint = ssrOptions?.entry;
-    if (ssrEntryPoint) {
-        entryPoints['server'] = ssrEntryPoint;
+function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
+    const serverPolyfills = [];
+    const polyfillsFromConfig = new Set(options.polyfills);
+    const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
+    if (!(0, utils_1.isZonelessApp)(options.polyfills)) {
+        serverPolyfills.push(isNodePlatform ? 'zone.js/node' : 'zone.js');
+    }
+    if (polyfillsFromConfig.has('@angular/localize') ||
+        polyfillsFromConfig.has('@angular/localize/init')) {
+        serverPolyfills.push('@angular/localize/init');
+    }
+    serverPolyfills.push('@angular/platform-server/init');
+    const namespace = 'angular:polyfills-server';
+    const polyfillBundleOptions = getEsBuildCommonPolyfillsOptions({
+        ...options,
+        polyfills: serverPolyfills,
+    }, namespace, false, sourceFileCache);
+    if (!polyfillBundleOptions) {
+        return;
     }
-    const zoneless = (0, utils_1.isZonelessApp)(polyfills);
     const buildOptions = {
-        ...getEsBuildCommonOptions(options),
-        platform: 'node',
-        splitting: true,
+        ...polyfillBundleOptions,
+        platform: isNodePlatform ? 'node' : 'neutral',
         outExtension: { '.js': '.mjs' },
         // 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
@@ -140,14 +144,50 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
         // More details: https://github.com/angular/angular-cli/issues/25405.
         mainFields: ['es2020', 'es2015', 'module', 'main'],
         entryNames: '[name]',
+        banner: isNodePlatform
+            ? {
+                js: [
+                    // 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);`,
+                ].join('\n'),
+            }
+            : undefined,
         target,
-        banner: {
-            js: `import './polyfills.server.mjs';`,
+        entryPoints: {
+            'polyfills.server': namespace,
         },
+    };
+    buildOptions.plugins ??= [];
+    buildOptions.plugins.push((0, server_bundle_metadata_plugin_1.createServerBundleMetadata)());
+    return () => buildOptions;
+}
+function createServerMainCodeBundleOptions(options, target, sourceFileCache) {
+    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, styleOptions } = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, target, 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, 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)(
@@ -164,20 +204,55 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
     else {
         buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
     }
-    buildOptions.plugins.push((0, virtual_module_plugin_1.createVirtualModulePlugin)({
+    // 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'),
+                loader: 'js',
+                resolveDir: workspaceRoot,
+            };
+        },
+    }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
         namespace: mainServerNamespace,
         cache: sourceFileCache?.loadResultCache,
         loadContent: async () => {
+            const mainServerEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, mainServerEntryPoint);
             const contents = [
-                `export { ɵConsole } from '@angular/core';`,
-                `export { renderApplication, renderModule, ɵSERVER_CONTEXT } from '@angular/platform-server';`,
+                // 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';`,
             ];
-            if (watch) {
-                contents.push(`export { ɵresetCompiledComponents } from '@angular/core';`);
-            }
-            if (prerenderOptions?.discoverRoutes) {
-                contents.push(`export { ɵgetRoutesFromAngularRouterConfig } from '@angular/ssr';`);
-            }
             return {
                 contents: contents.join('\n'),
                 loader: 'js',
@@ -190,28 +265,117 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
     }
     return buildOptions;
 }
-function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
-    const serverPolyfills = [];
-    const polyfillsFromConfig = new Set(options.polyfills);
-    if (!(0, utils_1.isZonelessApp)(options.polyfills)) {
-        serverPolyfills.push('zone.js/node');
+function createSsrEntryCodeBundleOptions(options, target, sourceFileCache) {
+    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, styleOptions } = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, target, 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);
     }
-    if (polyfillsFromConfig.has('@angular/localize') ||
-        polyfillsFromConfig.has('@angular/localize/init')) {
-        serverPolyfills.push('@angular/localize/init');
+    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 options
+            styleOptions),
+        ],
+        inject,
+    };
+    buildOptions.plugins ??= [];
+    if (externalPackages) {
+        buildOptions.packages = 'external';
     }
-    serverPolyfills.push('@angular/platform-server/init');
-    const namespace = 'angular:polyfills-server';
-    const polyfillBundleOptions = getEsBuildCommonPolyfillsOptions({
-        ...options,
-        polyfills: serverPolyfills,
-    }, namespace, false, sourceFileCache);
-    if (!polyfillBundleOptions) {
-        return;
+    else {
+        buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
     }
-    const buildOptions = {
-        ...polyfillBundleOptions,
-        platform: 'node',
+    // 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;
+    return {
+        ...getEsBuildCommonOptions(options),
+        platform: isNodePlatform ? 'node' : 'neutral',
         outExtension: { '.js': '.mjs' },
         // 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
@@ -219,31 +383,18 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
         // More details: https://github.com/angular/angular-cli/issues/25405.
         mainFields: ['es2020', 'es2015', 'module', 'main'],
         entryNames: '[name]',
-        banner: {
-            js: [
-                // 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);`,
-            ].join('\n'),
-        },
-        target,
-        entryPoints: {
-            'polyfills.server': namespace,
-        },
     };
-    return () => buildOptions;
 }
 function getEsBuildCommonOptions(options) {
-    const { workspaceRoot, outExtension, optimizationOptions, sourcemapOptions, tsconfig, externalDependencies, outputNames, preserveSymlinks, jit, loaderExtensions, jsonLogs, } = options;
+    const { workspaceRoot, outExtension, optimizationOptions, sourcemapOptions, tsconfig, externalDependencies, outputNames, preserveSymlinks, jit, loaderExtensions, jsonLogs, i18nOptions, } = options;
     // Ensure unique hashes for i18n translation changes when using post-process inlining.
     // This hash value is added as a footer to each file and ensures that the output file names (with hashes)
     // change when translation files have changed. If this is not done the post processed files may have
     // different content but would retain identical production file names which would lead to browser caching problems.
     let footer;
-    if (options.i18nOptions.shouldInline) {
+    if (i18nOptions.shouldInline) {
         // Update file hashes to include translation file content
-        const i18nHash = Object.values(options.i18nOptions.locales).reduce((data, locale) => data + locale.files.map((file) => file.integrity || '').join('|'), '');
+        const i18nHash = Object.values(i18nOptions.locales).reduce((data, locale) => data + locale.files.map((file) => file.integrity || '').join('|'), '');
         footer = { js: `/**i18n:${(0, node_crypto_1.createHash)('sha256').update(i18nHash).digest('hex')}*/` };
     }
     return {
@@ -252,7 +403,12 @@ function getEsBuildCommonOptions(options) {
         bundle: true,
         packages: 'bundle',
         assetNames: outputNames.media,
-        conditions: ['es2020', 'es2015', 'module'],
+        conditions: [
+            'es2020',
+            'es2015',
+            'module',
+            optimizationOptions.scripts ? 'production' : 'development',
+        ],
         resolveExtensions: ['.ts', '.tsx', '.mjs', '.js', '.cjs'],
         metafile: true,
         legalComments: options.extractLicenses ? 'none' : 'eof',
@@ -267,7 +423,7 @@ function getEsBuildCommonOptions(options) {
         splitting: true,
         chunkNames: options.namedChunks ? '[name]-[hash]' : 'chunk-[hash]',
         tsconfig,
-        external: externalDependencies,
+        external: externalDependencies ? [...externalDependencies] : undefined,
         write: false,
         preserveSymlinks,
         define: {
@@ -360,3 +516,9 @@ function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfi
     }));
     return buildOptions;
 }
+function entryFileToWorkspaceRelative(workspaceRoot, entryFile) {
+    return ('./' +
+        (0, node_path_1.relative)(workspaceRoot, entryFile)
+            .replace(/.[mc]?ts$/, '')
+            .replace(/\\/g, '/'));
+}

package/src/tools/esbuild/budget-stats.js

@@ -28,7 +28,7 @@ function generateBudgetStats(metafile, outputFiles, initialFiles) {
             continue;
         }
         // Exclude server bundles
-        if (type === bundler_context_1.BuildOutputFileType.Server) {
+        if (type === bundler_context_1.BuildOutputFileType.ServerApplication || type === bundler_context_1.BuildOutputFileType.ServerRoot) {
             continue;
         }
         const initialRecord = initialFiles.get(file);

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

@@ -31,9 +31,10 @@ export interface InitialFileRecord {
     depth: number;
 }
 export declare enum BuildOutputFileType {
-    Browser = 1,
-    Media = 2,
-    Server = 3,
+    Browser = 0,
+    Media = 1,
+    ServerApplication = 2,
+    ServerRoot = 3,
     Root = 4
 }
 export interface BuildOutputFile extends OutputFile {

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

@@ -18,9 +18,10 @@ const load_result_cache_1 = require("./load-result-cache");
 const utils_1 = require("./utils");
 var BuildOutputFileType;
 (function (BuildOutputFileType) {
-    BuildOutputFileType[BuildOutputFileType["Browser"] = 1] = "Browser";
-    BuildOutputFileType[BuildOutputFileType["Media"] = 2] = "Media";
-    BuildOutputFileType[BuildOutputFileType["Server"] = 3] = "Server";
+    BuildOutputFileType[BuildOutputFileType["Browser"] = 0] = "Browser";
+    BuildOutputFileType[BuildOutputFileType["Media"] = 1] = "Media";
+    BuildOutputFileType[BuildOutputFileType["ServerApplication"] = 2] = "ServerApplication";
+    BuildOutputFileType[BuildOutputFileType["ServerRoot"] = 3] = "ServerRoot";
     BuildOutputFileType[BuildOutputFileType["Root"] = 4] = "Root";
 })(BuildOutputFileType || (exports.BuildOutputFileType = BuildOutputFileType = {}));
 /**
@@ -138,6 +139,7 @@ class BundlerContext {
         }
         return result;
     }
+    // eslint-disable-next-line max-lines-per-function
     async #performBundle() {
         // Create esbuild options if not present
         if (this.#esbuildOptions === undefined) {
@@ -165,12 +167,6 @@ class BundlerContext {
                 // For non-incremental builds, perform a single build
                 result = await (0, esbuild_1.build)(this.#esbuildOptions);
             }
-            if (this.#platformIsServer) {
-                for (const entry of Object.values(result.metafile.outputs)) {
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    entry['ng-platform-server'] = true;
-                }
-            }
         }
         catch (failure) {
             // Build failures will throw an exception which contains errors/warnings
@@ -215,6 +211,7 @@ class BundlerContext {
                 warnings: result.warnings,
             };
         }
+        const { 'ng-platform-server': isPlatformServer = false, 'ng-ssr-entry-bundle': isSsrEntryBundle = false, } = result.metafile;
         // Find all initial files
         const initialFiles = new Map();
         for (const outputFile of result.outputFiles) {
@@ -235,7 +232,7 @@ class BundlerContext {
                         name,
                         type,
                         entrypoint: true,
-                        serverFile: this.#platformIsServer,
+                        serverFile: isPlatformServer,
                         depth: 0,
                     };
                     if (!this.initialFilter || this.initialFilter(record)) {
@@ -263,7 +260,7 @@ class BundlerContext {
                         type: initialImport.kind === 'import-rule' ? 'style' : 'script',
                         entrypoint: false,
                         external: initialImport.external,
-                        serverFile: this.#platformIsServer,
+                        serverFile: isPlatformServer,
                         depth: entryRecord.depth + 1,
                     };
                     if (!this.initialFilter || this.initialFilter(record)) {
@@ -280,6 +277,7 @@ class BundlerContext {
         for (const { imports } of Object.values(result.metafile.outputs)) {
             for (const importData of imports) {
                 if (!importData.external ||
+                    utils_1.SERVER_GENERATED_EXTERNALS.has(importData.path) ||
                     (importData.kind !== 'import-statement' &&
                         importData.kind !== 'dynamic-import' &&
                         importData.kind !== 'require-call')) {
@@ -295,22 +293,32 @@ class BundlerContext {
             if (!/\.([cm]?js|css|wasm)(\.map)?$/i.test(file.path)) {
                 fileType = BuildOutputFileType.Media;
             }
+            else if (isPlatformServer) {
+                fileType = isSsrEntryBundle
+                    ? BuildOutputFileType.ServerRoot
+                    : BuildOutputFileType.ServerApplication;
+            }
             else {
-                fileType = this.#platformIsServer
-                    ? BuildOutputFileType.Server
-                    : BuildOutputFileType.Browser;
+                fileType = BuildOutputFileType.Browser;
             }
             return (0, utils_1.convertOutputFile)(file, fileType);
         });
+        let externalConfiguration = this.#esbuildOptions.external;
+        if (isPlatformServer && externalConfiguration) {
+            externalConfiguration = externalConfiguration.filter((dep) => !utils_1.SERVER_GENERATED_EXTERNALS.has(dep));
+            if (!externalConfiguration.length) {
+                externalConfiguration = undefined;
+            }
+        }
         // Return the successful build results
         return {
             ...result,
             outputFiles,
             initialFiles,
             externalImports: {
-                [this.#platformIsServer ? 'server' : 'browser']: externalImports,
+                [isPlatformServer ? 'server' : 'browser']: externalImports,
             },
-            externalConfiguration: this.#esbuildOptions.external,
+            externalConfiguration,
             errors: undefined,
         };
     }
@@ -328,9 +336,6 @@ class BundlerContext {
             }
         }
     }
-    get #platformIsServer() {
-        return this.#esbuildOptions?.platform === 'node';
-    }
     /**
      * Invalidate a stored bundler result based on the previous watch files
      * and a list of changed files.

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

@@ -24,6 +24,9 @@ export interface ExternalResultMetadata {
     implicitServer: string[];
     explicit: string[];
 }
+export type PrerenderedRoutesRecord = Record<string, {
+    headers?: Record<string, string>;
+}>;
 /**
  * Represents the result of a single builder execute call.
  */
@@ -33,7 +36,7 @@ export declare class ExecutionResult {
     outputFiles: BuildOutputFile[];
     assetFiles: BuildOutputAsset[];
     errors: (Message | PartialMessage)[];
-    prerenderedRoutes: string[];
+    prerenderedRoutes: PrerenderedRoutesRecord;
     warnings: (Message | PartialMessage)[];
     logs: string[];
     externalMetadata?: ExternalResultMetadata;
@@ -46,7 +49,7 @@ export declare class ExecutionResult {
     addLog(value: string): void;
     addError(error: PartialMessage | string): void;
     addErrors(errors: (PartialMessage | string)[]): void;
-    addPrerenderedRoutes(routes: string[]): void;
+    addPrerenderedRoutes(routes: PrerenderedRoutesRecord): void;
     addWarning(error: PartialMessage | string): void;
     addWarnings(errors: (PartialMessage | string)[]): void;
     /**

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

@@ -19,7 +19,7 @@ class ExecutionResult {
     outputFiles = [];
     assetFiles = [];
     errors = [];
-    prerenderedRoutes = [];
+    prerenderedRoutes = {};
     warnings = [];
     logs = [];
     externalMetadata;
@@ -53,9 +53,13 @@ class ExecutionResult {
         }
     }
     addPrerenderedRoutes(routes) {
-        this.prerenderedRoutes.push(...routes);
+        Object.assign(this.prerenderedRoutes, routes);
         // Sort the prerendered routes.
-        this.prerenderedRoutes.sort((a, b) => a.localeCompare(b));
+        const sortedObj = {};
+        for (const key of Object.keys(this.prerenderedRoutes).sort()) {
+            sortedObj[key] = this.prerenderedRoutes[key];
+        }
+        this.prerenderedRoutes = sortedObj;
     }
     addWarning(error) {
         if (typeof error === 'string') {

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

@@ -84,5 +84,10 @@ export declare class MemoryCache<V> extends Cache<V, Map<string, V>> {
      * Provides all the values currently present in the cache instance.
      * @returns An iterable of all values in the cache.
      */
-    values(): IterableIterator<V>;
+    values(): MapIterator<V>;
+    /**
+     * Provides all the keys/values currently present in the cache instance.
+     * @returns An iterable of all key/value pairs in the cache.
+     */
+    entries(): MapIterator<[string, V]>;
 }

package/src/tools/esbuild/cache.js

@@ -88,5 +88,12 @@ class MemoryCache extends Cache {
     values() {
         return this.store.values();
     }
+    /**
+     * Provides all the keys/values currently present in the cache instance.
+     * @returns An iterable of all key/value pairs in the cache.
+     */
+    entries() {
+        return this.store.entries();
+    }
 }
 exports.MemoryCache = MemoryCache;

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

@@ -9,7 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerPluginOptions = createCompilerPluginOptions;
 function createCompilerPluginOptions(options, target, sourceFileCache) {
-    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, cacheOptions, tailwindConfiguration, postcssConfiguration, publicPath, } = options;
+    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, cacheOptions, tailwindConfiguration, postcssConfiguration, publicPath, externalRuntimeStyles, instrumentForCoverage, } = options;
     return {
         // JS/TS options
         pluginOptions: {
@@ -22,6 +22,8 @@ function createCompilerPluginOptions(options, target, sourceFileCache) {
             sourceFileCache,
             loadResultCache: sourceFileCache?.loadResultCache,
             incremental: !!options.watch,
+            externalRuntimeStyles,
+            instrumentForCoverage,
         },
         // Component stylesheet options
         styleOptions: {
@@ -35,6 +37,9 @@ function createCompilerPluginOptions(options, target, sourceFileCache) {
             sourcemapOptions.styles && !sourcemapOptions.hidden ? 'linked' : false,
             outputNames,
             includePaths: stylePreprocessorOptions?.includePaths,
+            // string[] | undefined' is not assignable to type '(Version | DeprecationOrId)[] | undefined'.
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            sass: stylePreprocessorOptions?.sass,
             externalDependencies,
             target,
             inlineStyleLanguage,

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

@@ -72,7 +72,7 @@ function createGlobalScriptsBundleOptions(options, target, initial) {
             entryNames: initial ? outputNames.bundles : '[name]',
             assetNames: outputNames.media,
             mainFields: ['script', 'browser', 'main'],
-            conditions: ['script'],
+            conditions: ['script', optimizationOptions.scripts ? 'production' : 'development'],
             resolveExtensions: ['.mjs', '.js', '.cjs'],
             logLevel: options.verbose && !jsonLogs ? 'debug' : 'silent',
             metafile: true,