@angular/build 19.0.0-next.2 → 19.0.0-next.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.0.0-next.2",
+  "version": "19.0.0-next.4",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,12 +23,12 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1900.0-next.2",
+    "@angular-devkit/architect": "0.1900.0-next.4",
     "@babel/core": "7.25.2",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@babel/plugin-syntax-import-attributes": "7.24.7",
-    "@inquirer/confirm": "3.1.22",
+    "@babel/plugin-syntax-import-attributes": "7.25.6",
+    "@inquirer/confirm": "3.2.0",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "browserslist": "^4.23.0",
     "critters": "0.0.24",
@@ -36,16 +36,16 @@
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.5",
     "listr2": "8.2.4",
-    "lmdb": "3.0.14",
+    "lmdb": "3.1.0",
     "magic-string": "0.30.11",
     "mrmime": "2.0.0",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.6.1",
-    "rollup": "4.21.1",
-    "sass": "1.77.8",
+    "rollup": "4.21.2",
+    "sass": "1.78.0",
     "semver": "7.6.3",
-    "vite": "5.4.2",
+    "vite": "5.4.3",
     "watchpack": "2.4.2"
   },
   "peerDependencies": {
@@ -53,11 +53,11 @@
     "@angular/localize": "^19.0.0-next.0",
     "@angular/platform-server": "^19.0.0-next.0",
     "@angular/service-worker": "^19.0.0-next.0",
-    "@angular/ssr": "^19.0.0-next.2",
+    "@angular/ssr": "^19.0.0-next.4",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
-    "typescript": ">=5.4 <5.6"
+    "typescript": ">=5.5 <5.7"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {

package/src/builders/application/execute-post-bundle.js

@@ -16,8 +16,10 @@ const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const index_html_generator_1 = require("../../tools/esbuild/index-html-generator");
 const utils_1 = require("../../tools/esbuild/utils");
 const environment_options_1 = require("../../utils/environment-options");
+const manifest_1 = require("../../utils/server-rendering/manifest");
 const prerender_1 = require("../../utils/server-rendering/prerender");
 const service_worker_1 = require("../../utils/service-worker");
+const options_1 = require("./options");
 /**
  * Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
  * @param options The normalized application builder options used to create the build.
@@ -32,15 +34,11 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
     const allErrors = [];
     const allWarnings = [];
     const prerenderedRoutes = [];
-    const { serviceWorker, indexHtmlOptions, optimizationOptions, sourcemapOptions, prerenderOptions, appShellOptions, workspaceRoot, verbose, } = options;
-    /**
-     * Index HTML content without CSS inlining to be used for server rendering (AppShell, SSG and SSR).
-     *
-     * NOTE: we don't perform critical CSS inlining as this will be done during server rendering.
-     */
-    let ssrIndexContent;
-    // When using prerender/app-shell the index HTML file can be regenerated.
-    // Thus, we use a Map so that we do not generate 2 files with the same filename.
+    const { baseHref = '/', serviceWorker, indexHtmlOptions, optimizationOptions, sourcemapOptions, ssrOptions, prerenderOptions, appShellOptions, workspaceRoot, verbose, } = options;
+    // Index HTML content without CSS inlining to be used for server rendering (AppShell, SSG and SSR).
+    // NOTE: Critical CSS inlining is deliberately omitted here, as it will be handled during server rendering.
+    // Additionally, when using prerendering or AppShell, the index HTML file may be regenerated.
+    // To prevent generating duplicate files with the same filename, a `Map` is used to store and manage the files.
     const additionalHtmlOutputFiles = new Map();
     // Generate index HTML file
     // If localization is enabled, index generation is handled in the inlining process.
@@ -50,21 +48,34 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         allWarnings.push(...warnings);
         additionalHtmlOutputFiles.set(indexHtmlOptions.output, (0, utils_1.createOutputFile)(indexHtmlOptions.output, csrContent, bundler_context_1.BuildOutputFileType.Browser));
         if (ssrContent) {
-            const serverIndexHtmlFilename = 'index.server.html';
-            additionalHtmlOutputFiles.set(serverIndexHtmlFilename, (0, utils_1.createOutputFile)(serverIndexHtmlFilename, ssrContent, bundler_context_1.BuildOutputFileType.Server));
-            ssrIndexContent = ssrContent;
+            additionalHtmlOutputFiles.set(options_1.INDEX_HTML_SERVER, (0, utils_1.createOutputFile)(options_1.INDEX_HTML_SERVER, ssrContent, bundler_context_1.BuildOutputFileType.Server));
         }
     }
+    // Create server manifest
+    if (prerenderOptions || appShellOptions || ssrOptions) {
+        additionalOutputFiles.push((0, utils_1.createOutputFile)(manifest_1.SERVER_APP_MANIFEST_FILENAME, (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined), bundler_context_1.BuildOutputFileType.Server));
+    }
     // Pre-render (SSG) and App-shell
     // If localization is enabled, prerendering is handled in the inlining process.
-    if (prerenderOptions || appShellOptions) {
-        (0, node_assert_1.default)(ssrIndexContent, 'The "index" option is required when using the "ssg" or "appShell" options.');
-        const { output, warnings, errors, prerenderedRoutes: generatedRoutes, } = await (0, prerender_1.prerenderPages)(workspaceRoot, appShellOptions, prerenderOptions, outputFiles, assetFiles, ssrIndexContent, sourcemapOptions.scripts, optimizationOptions.styles.inlineCritical, environment_options_1.maxWorkers, verbose);
+    if ((prerenderOptions || appShellOptions) && !allErrors.length) {
+        (0, node_assert_1.default)(indexHtmlOptions, 'The "index" option is required when using the "ssg" or "appShell" options.');
+        const { output, warnings, errors, prerenderedRoutes: generatedRoutes, serializableRouteTreeNode, } = await (0, prerender_1.prerenderPages)(workspaceRoot, baseHref, appShellOptions, prerenderOptions, [...outputFiles, ...additionalOutputFiles], assetFiles, sourcemapOptions.scripts, environment_options_1.maxWorkers, verbose);
         allErrors.push(...errors);
         allWarnings.push(...warnings);
         prerenderedRoutes.push(...Array.from(generatedRoutes));
-        for (const [path, content] of Object.entries(output)) {
-            additionalHtmlOutputFiles.set(path, (0, utils_1.createOutputFile)(path, content, bundler_context_1.BuildOutputFileType.Browser));
+        const indexHasBeenPrerendered = generatedRoutes.has(indexHtmlOptions.output);
+        for (const [path, { content, appShellRoute }] of Object.entries(output)) {
+            // Update the index contents with the app shell under these conditions:
+            // - Replace 'index.html' with the app shell only if it hasn't been prerendered yet.
+            // - Always replace 'index.csr.html' with the app shell.
+            const filePath = appShellRoute && !indexHasBeenPrerendered ? indexHtmlOptions.output : path;
+            additionalHtmlOutputFiles.set(filePath, (0, utils_1.createOutputFile)(filePath, content, bundler_context_1.BuildOutputFileType.Browser));
+        }
+        if (ssrOptions) {
+            // Regenerate the manifest to append route tree. This is only needed if SSR is enabled.
+            const manifest = additionalOutputFiles.find((f) => f.path === manifest_1.SERVER_APP_MANIFEST_FILENAME);
+            (0, node_assert_1.default)(manifest, `${manifest_1.SERVER_APP_MANIFEST_FILENAME} was not found in output files.`);
+            manifest.contents = new TextEncoder().encode((0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNode));
         }
     }
     additionalOutputFiles.push(...additionalHtmlOutputFiles.values());
@@ -72,7 +83,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
     // If localization is enabled, service worker is handled in the inlining process.
     if (serviceWorker) {
         try {
-            const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, options.baseHref || '/', options.indexHtmlOptions?.output, 
+            const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, baseHref, options.indexHtmlOptions?.output, 
             // Ensure additional files recently added are used
             [...outputFiles, ...additionalOutputFiles], assetFiles);
             additionalOutputFiles.push((0, utils_1.createOutputFile)('ngsw.json', serviceWorkerResult.manifest, bundler_context_1.BuildOutputFileType.Browser));

package/src/builders/application/i18n.js

@@ -15,8 +15,8 @@ const i18n_inliner_1 = require("../../tools/esbuild/i18n-inliner");
 const environment_options_1 = require("../../utils/environment-options");
 const i18n_options_1 = require("../../utils/i18n-options");
 const load_translations_1 = require("../../utils/load-translations");
-const url_1 = require("../../utils/url");
 const execute_post_bundle_1 = require("./execute-post-bundle");
+const options_1 = require("./options");
 /**
  * Inlines all active locales as specified by the application build options into all
  * application JavaScript files created during the build.
@@ -46,7 +46,7 @@ async function inlineI18n(options, executionResult, initialFiles) {
             const localeOutputFiles = localeInlineResult.outputFiles;
             inlineResult.errors.push(...localeInlineResult.errors);
             inlineResult.warnings.push(...localeInlineResult.warnings);
-            const baseHref = getLocaleBaseHref(options.baseHref, options.i18nOptions, locale) ?? options.baseHref;
+            const baseHref = (0, options_1.getLocaleBaseHref)(options.baseHref, options.i18nOptions, locale) ?? options.baseHref;
             const { errors, warnings, additionalAssets, additionalOutputFiles, prerenderedRoutes: generatedRoutes, } = await (0, execute_post_bundle_1.executePostBundleSteps)({
                 ...options,
                 baseHref,
@@ -90,15 +90,6 @@ async function inlineI18n(options, executionResult, initialFiles) {
     }
     return inlineResult;
 }
-function getLocaleBaseHref(baseHref, i18n, locale) {
-    if (i18n.flatOutput) {
-        return undefined;
-    }
-    if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
-        return (0, url_1.urlJoin)(baseHref || '', i18n.locales[locale].baseHref ?? `/${locale}/`);
-    }
-    return undefined;
-}
 /**
  * Loads all active translations using the translation loaders from the `@angular/localize` package.
  * @param context The architect builder context for the current build.

package/src/builders/application/options.d.ts

@@ -10,6 +10,16 @@ import type { Plugin } from 'esbuild';
 import { I18nOptions } from '../../utils/i18n-options';
 import { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
 import { Schema as ApplicationBuilderOptions, I18NTranslation, OutputPathClass } from './schema';
+/**
+ * The filename for the client-side rendered HTML template.
+ * This template is used for client-side rendering (CSR) in a web application.
+ */
+export declare const INDEX_HTML_CSR = "index.csr.html";
+/**
+ * The filename for the server-side rendered HTML template.
+ * This template is used for server-side rendering (SSR) in a web application.
+ */
+export declare const INDEX_HTML_SERVER = "index.server.html";
 export type NormalizedOutputOptions = Required<OutputPathClass> & {
     clean: boolean;
     ignoreServer: boolean;
@@ -148,4 +158,5 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
         [key: string]: string;
     } | undefined;
 }>;
+export declare function getLocaleBaseHref(baseHref: string | undefined, i18n: NormalizedApplicationBuildOptions['i18nOptions'], locale: string): string | undefined;
 export {};

package/src/builders/application/options.js

@@ -10,7 +10,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.INDEX_HTML_SERVER = exports.INDEX_HTML_CSR = void 0;
 exports.normalizeOptions = normalizeOptions;
+exports.getLocaleBaseHref = getLocaleBaseHref;
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const node_module_1 = require("node:module");
@@ -21,7 +23,18 @@ const environment_options_1 = require("../../utils/environment-options");
 const i18n_options_1 = require("../../utils/i18n-options");
 const normalize_cache_1 = require("../../utils/normalize-cache");
 const postcss_configuration_1 = require("../../utils/postcss-configuration");
+const url_1 = require("../../utils/url");
 const schema_1 = require("./schema");
+/**
+ * The filename for the client-side rendered HTML template.
+ * This template is used for client-side rendering (CSR) in a web application.
+ */
+exports.INDEX_HTML_CSR = 'index.csr.html';
+/**
+ * The filename for the server-side rendered HTML template.
+ * This template is used for server-side rendering (SSR) in a web application.
+ */
+exports.INDEX_HTML_SERVER = 'index.server.html';
 /**
  * Normalize the user provided options by creating full paths for all path based options
  * and converting multi-form options into a single form that can be directly used
@@ -164,7 +177,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
              * For instance, accessing `foo.com/` would lead to `foo.com/index.html` being served instead of hitting the server.
              */
             const indexBaseName = node_path_1.default.basename(options.index);
-            indexOutput = ssrOptions && indexBaseName === 'index.html' ? 'index.csr.html' : indexBaseName;
+            indexOutput = ssrOptions && indexBaseName === 'index.html' ? exports.INDEX_HTML_CSR : indexBaseName;
         }
         else {
             indexOutput = options.index.output || 'index.html';
@@ -369,3 +382,12 @@ function normalizeGlobalEntries(rawEntries, defaultName) {
     }
     return [...bundles.values()];
 }
+function getLocaleBaseHref(baseHref, i18n, locale) {
+    if (i18n.flatOutput) {
+        return undefined;
+    }
+    if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
+        return (0, url_1.urlJoin)(baseHref || '', i18n.locales[locale].baseHref ?? `/${locale}/`);
+    }
+    return undefined;
+}

package/src/builders/application/setup-bundling.js

@@ -22,22 +22,22 @@ const utils_1 = require("../../tools/esbuild/utils");
  * @returns An array of BundlerContext objects.
  */
 function setupBundlerContexts(options, browsers, codeBundleCache) {
-    const { appShellOptions, prerenderOptions, serverEntryPoint, ssrOptions, workspaceRoot } = options;
+    const { appShellOptions, prerenderOptions, serverEntryPoint, ssrOptions, workspaceRoot, watch = false, } = options;
     const target = (0, utils_1.transformSupportedBrowsersToTargets)(browsers);
     const bundlerContexts = [];
     // Browser application code
-    bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createBrowserCodeBundleOptions)(options, target, codeBundleCache)));
+    bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, (0, application_code_bundle_1.createBrowserCodeBundleOptions)(options, target, codeBundleCache)));
     // Browser polyfills code
     const browserPolyfillBundleOptions = (0, application_code_bundle_1.createBrowserPolyfillBundleOptions)(options, target, codeBundleCache);
     if (browserPolyfillBundleOptions) {
-        bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, browserPolyfillBundleOptions));
+        bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, browserPolyfillBundleOptions));
     }
     // Global Stylesheets
     if (options.globalStyles.length > 0) {
         for (const initial of [true, false]) {
             const bundleOptions = (0, global_styles_1.createGlobalStylesBundleOptions)(options, target, initial);
             if (bundleOptions) {
-                bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
+                bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, bundleOptions, () => initial));
             }
         }
     }
@@ -46,7 +46,7 @@ function setupBundlerContexts(options, browsers, codeBundleCache) {
         for (const initial of [true, false]) {
             const bundleOptions = (0, global_scripts_1.createGlobalScriptsBundleOptions)(options, target, initial);
             if (bundleOptions) {
-                bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
+                bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, bundleOptions, () => initial));
             }
         }
     }
@@ -54,11 +54,11 @@ function setupBundlerContexts(options, browsers, codeBundleCache) {
     if (serverEntryPoint && (prerenderOptions || appShellOptions || ssrOptions)) {
         const nodeTargets = [...target, ...(0, utils_1.getSupportedNodeTargets)()];
         // Server application code
-        bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createServerCodeBundleOptions)(options, nodeTargets, codeBundleCache)));
+        bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, (0, application_code_bundle_1.createServerMainCodeBundleOptions)(options, nodeTargets, codeBundleCache)));
         // Server polyfills code
         const serverPolyfillBundleOptions = (0, application_code_bundle_1.createServerPolyfillBundleOptions)(options, nodeTargets, codeBundleCache);
         if (serverPolyfillBundleOptions) {
-            bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, serverPolyfillBundleOptions));
+            bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, serverPolyfillBundleOptions));
         }
     }
     return bundlerContexts;

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

@@ -9,7 +9,6 @@ export { type BuildOutputFile, BuildOutputFileType } from '@angular/build';
 export { createRxjsEsmResolutionPlugin } from '../../tools/esbuild/rxjs-esm-resolution-plugin';
 export { JavaScriptTransformer } from '../../tools/esbuild/javascript-transformer';
 export { getFeatureSupport, isZonelessApp } from '../../tools/esbuild/utils';
-export { renderPage } from '../../utils/server-rendering/render-page';
 export { type IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
 export { purgeStaleBuildCache } from '../../utils/purge-cache';
 export { getSupportedBrowsers } from '../../utils/supported-browsers';

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

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildApplicationInternal = exports.transformSupportedBrowsersToTargets = exports.getSupportedBrowsers = exports.purgeStaleBuildCache = exports.renderPage = exports.isZonelessApp = exports.getFeatureSupport = exports.JavaScriptTransformer = exports.createRxjsEsmResolutionPlugin = exports.BuildOutputFileType = void 0;
+exports.buildApplicationInternal = exports.transformSupportedBrowsersToTargets = exports.getSupportedBrowsers = exports.purgeStaleBuildCache = exports.isZonelessApp = exports.getFeatureSupport = exports.JavaScriptTransformer = exports.createRxjsEsmResolutionPlugin = exports.BuildOutputFileType = void 0;
 var build_1 = require("@angular/build");
 Object.defineProperty(exports, "BuildOutputFileType", { enumerable: true, get: function () { return build_1.BuildOutputFileType; } });
 var rxjs_esm_resolution_plugin_1 = require("../../tools/esbuild/rxjs-esm-resolution-plugin");
@@ -17,8 +17,6 @@ Object.defineProperty(exports, "JavaScriptTransformer", { enumerable: true, get:
 var utils_1 = require("../../tools/esbuild/utils");
 Object.defineProperty(exports, "getFeatureSupport", { enumerable: true, get: function () { return utils_1.getFeatureSupport; } });
 Object.defineProperty(exports, "isZonelessApp", { enumerable: true, get: function () { return utils_1.isZonelessApp; } });
-var render_page_1 = require("../../utils/server-rendering/render-page");
-Object.defineProperty(exports, "renderPage", { enumerable: true, get: function () { return render_page_1.renderPage; } });
 var purge_cache_1 = require("../../utils/purge-cache");
 Object.defineProperty(exports, "purgeStaleBuildCache", { enumerable: true, get: function () { return purge_cache_1.purgeStaleBuildCache; } });
 var supported_browsers_1 = require("../../utils/supported-browsers");

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

@@ -9,7 +9,7 @@ import type { BuilderContext } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import type { Connect, DepOptimizationConfig, InlineConfig } from 'vite';
 import { Result } from '../application/results';
-import { type ApplicationBuilderInternalOptions, type ExternalResultMetadata, JavaScriptTransformer } from './internal';
+import { type ApplicationBuilderInternalOptions, BuildOutputFileType, type ExternalResultMetadata, JavaScriptTransformer } from './internal';
 import type { NormalizedDevServerOptions } from './options';
 import type { DevServerBuilderOutput } from './output';
 interface OutputFileRecord {
@@ -18,6 +18,11 @@ interface OutputFileRecord {
     hash?: string;
     updated: boolean;
     servable: boolean;
+    type: BuildOutputFileType;
+}
+interface DevServerExternalResultMetadata extends Omit<ExternalResultMetadata, 'explicit'> {
+    explicitBrowser: string[];
+    explicitServer: string[];
 }
 export type BuilderAction = (options: ApplicationBuilderInternalOptions, context: BuilderContext, plugins?: Plugin[]) => AsyncIterable<Result>;
 export declare function serveWithVite(serverOptions: NormalizedDevServerOptions, builderName: string, builderAction: BuilderAction, context: BuilderContext, transformers?: {
@@ -26,6 +31,6 @@ export declare function serveWithVite(serverOptions: NormalizedDevServerOptions,
     middleware?: Connect.NextHandleFunction[];
     buildPlugins?: Plugin[];
 }): AsyncIterableIterator<DevServerBuilderOutput>;
-export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, externalMetadata: ExternalResultMetadata, ssr: boolean, prebundleTransformer: JavaScriptTransformer, target: string[], zoneless: boolean, prebundleLoaderExtensions: EsbuildLoaderOption | undefined, extensionMiddleware?: Connect.NextHandleFunction[], indexHtmlTransformer?: (content: string) => Promise<string>, thirdPartySourcemaps?: boolean): Promise<InlineConfig>;
+export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, externalMetadata: DevServerExternalResultMetadata, ssr: boolean, prebundleTransformer: JavaScriptTransformer, target: string[], zoneless: boolean, prebundleLoaderExtensions: EsbuildLoaderOption | undefined, extensionMiddleware?: Connect.NextHandleFunction[], indexHtmlTransformer?: (content: string) => Promise<string>, thirdPartySourcemaps?: boolean): Promise<InlineConfig>;
 type EsbuildLoaderOption = Exclude<DepOptimizationConfig['esbuildOptions'], undefined>['loader'];
 export {};

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

@@ -107,7 +107,8 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
     const externalMetadata = {
         implicitBrowser: [],
         implicitServer: [],
-        explicit: [],
+        explicitBrowser: [],
+        explicitServer: [],
     };
     // Add cleanup logic via a builder teardown.
     let deferred;
@@ -187,15 +188,18 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
                 requiresServerRestart = implicitServerFiltered.some((dep) => !previousImplicitServer.has(dep));
             }
             // Empty Arrays to avoid growing unlimited with every re-build.
-            externalMetadata.explicit.length = 0;
+            externalMetadata.explicitBrowser.length = 0;
+            externalMetadata.explicitServer.length = 0;
             externalMetadata.implicitServer.length = 0;
             externalMetadata.implicitBrowser.length = 0;
-            externalMetadata.explicit.push(...explicit);
+            externalMetadata.explicitBrowser.push(...explicit);
+            externalMetadata.explicitServer.push(...explicit, ...nodeJsBuiltinModules);
             externalMetadata.implicitServer.push(...implicitServerFiltered);
             externalMetadata.implicitBrowser.push(...implicitBrowserFiltered);
             // The below needs to be sorted as Vite uses these options are part of the hashing invalidation algorithm.
             // See: https://github.com/vitejs/vite/blob/0873bae0cfe0f0718ad2f5743dd34a17e4ab563d/packages/vite/src/node/optimizer/index.ts#L1203-L1239
-            externalMetadata.explicit.sort();
+            externalMetadata.explicitBrowser.sort();
+            externalMetadata.explicitServer.sort();
             externalMetadata.implicitServer.sort();
             externalMetadata.implicitBrowser.sort();
         }
@@ -204,12 +208,14 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
             server.config.server.fs.allow = [
                 ...new Set([...server.config.server.fs.allow, ...assetFiles.values()]),
             ];
-            handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
             if (requiresServerRestart) {
                 // Restart the server to force SSR dep re-optimization when a dependency has been added.
                 // This is a workaround for: https://github.com/vitejs/vite/issues/14896
                 await server.restart();
             }
+            else {
+                await handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
+            }
         }
         else {
             const projectName = context.target?.project;
@@ -271,12 +277,14 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
     }
     await new Promise((resolve) => (deferred = resolve));
 }
-function handleUpdate(normalizePath, generatedFiles, server, serverOptions, logger) {
+async function handleUpdate(normalizePath, generatedFiles, server, serverOptions, logger) {
     const updatedFiles = [];
+    let isServerFileUpdated = false;
     // Invalidate any updated files
     for (const [file, record] of generatedFiles) {
         if (record.updated) {
             updatedFiles.push(file);
+            isServerFileUpdated ||= record.type === internal_1.BuildOutputFileType.Server;
             const updatedModules = server.moduleGraph.getModulesByFile(normalizePath((0, node_path_1.join)(server.config.root, file)));
             updatedModules?.forEach((m) => server?.moduleGraph.invalidateModule(m));
         }
@@ -284,6 +292,11 @@ function handleUpdate(normalizePath, generatedFiles, server, serverOptions, logg
     if (!updatedFiles.length) {
         return;
     }
+    // clean server apps cache
+    if (isServerFileUpdated) {
+        const { ɵdestroyAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs'));
+        ɵdestroyAngularServerApp();
+    }
     if (serverOptions.liveReload || serverOptions.hmr) {
         if (updatedFiles.every((f) => f.endsWith('.css'))) {
             const timestamp = Date.now();
@@ -334,6 +347,7 @@ function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generated
                 contents: file.contents,
                 servable,
                 size: file.contents.byteLength,
+                type: file.type,
                 updated: false,
             });
             continue;
@@ -352,6 +366,7 @@ function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generated
             size: file.contents.byteLength,
             hash: file.hash,
             updated: true,
+            type: file.type,
             servable,
         });
     }
@@ -422,18 +437,18 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             },
             // This is needed when `externalDependencies` is used to prevent Vite load errors.
             // NOTE: If Vite adds direct support for externals, this can be removed.
-            preTransformRequests: externalMetadata.explicit.length === 0,
+            preTransformRequests: externalMetadata.explicitBrowser.length === 0,
         },
         ssr: {
             // Note: `true` and `/.*/` have different sematics. When true, the `external` option is ignored.
             noExternal: /.*/,
             // Exclude any Node.js built in module and provided dependencies (currently build defined externals)
-            external: externalMetadata.explicit,
+            external: externalMetadata.explicitServer,
             optimizeDeps: getDepOptimizationConfig({
                 // Only enable with caching since it causes prebundle dependencies to be cached
                 disabled: serverOptions.prebundle === false,
                 // Exclude any explicitly defined dependencies (currently build defined externals and node.js built-ins)
-                exclude: externalMetadata.explicit,
+                exclude: externalMetadata.explicitServer,
                 // Include all implict dependencies from the external packages internal option
                 include: externalMetadata.implicitServer,
                 ssr: true,
@@ -452,19 +467,19 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                 outputFiles,
                 assets,
                 ssr,
-                external: externalMetadata.explicit,
+                external: externalMetadata.explicitBrowser,
                 indexHtmlTransformer,
                 extensionMiddleware,
                 normalizePath,
             }),
-            (0, id_prefix_plugin_1.createRemoveIdPrefixPlugin)(externalMetadata.explicit),
+            (0, id_prefix_plugin_1.createRemoveIdPrefixPlugin)(externalMetadata.explicitBrowser),
         ],
         // Browser only optimizeDeps. (This does not run for SSR dependencies).
         optimizeDeps: getDepOptimizationConfig({
             // Only enable with caching since it causes prebundle dependencies to be cached
             disabled: serverOptions.prebundle === false,
             // Exclude any explicitly defined dependencies (currently build defined externals)
-            exclude: externalMetadata.explicit,
+            exclude: externalMetadata.explicitBrowser,
             // Include all implict dependencies from the external packages internal option
             include: externalMetadata.implicitBrowser,
             ssr: false,

package/src/tools/angular/compilation/parallel-compilation.d.ts

@@ -22,7 +22,7 @@ export declare class ParallelCompilation extends AngularCompilation {
     #private;
     readonly jit: boolean;
     constructor(jit: boolean);
-    initialize(tsconfig: string, hostOptions: AngularHostOptions, compilerOptionsTransformer?: ((compilerOptions: CompilerOptions) => CompilerOptions) | undefined): Promise<{
+    initialize(tsconfig: string, hostOptions: AngularHostOptions, compilerOptionsTransformer?: (compilerOptions: CompilerOptions) => CompilerOptions): Promise<{
         affectedFiles: ReadonlySet<SourceFile>;
         compilerOptions: CompilerOptions;
         referencedFiles: readonly string[];

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

@@ -40,6 +40,11 @@ class ParallelCompilation extends angular_compilation_1.AngularCompilation {
             useAtomics: !process.versions.webcontainer,
             filename: localRequire.resolve('./parallel-worker'),
             recordTiming: false,
+            env: {
+                ...process.env,
+                // Enable compile code caching if enabled for the main process (only exists on Node.js v22.8+)
+                'NODE_COMPILE_CACHE': (0, node_module_1.getCompileCacheDir)?.(),
+            },
         });
     }
     initialize(tsconfig, hostOptions, compilerOptionsTransformer) {

package/src/tools/esbuild/angular/file-reference-tracker.d.ts

@@ -7,7 +7,7 @@
  */
 export declare class FileReferenceTracker {
     #private;
-    get referencedFiles(): IterableIterator<string>;
+    get referencedFiles(): MapIterator<string>;
     add(containingFile: string, referencedFiles: Iterable<string>): void;
     /**
      *

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

@@ -11,10 +11,5 @@ 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 | 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): BundlerOptionsFactory | undefined;
+export declare function createServerMainCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache): BuildOptions;