@angular/build 19.1.0-next.0 → 19.1.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.1.0-next.0",
+  "version": "19.1.0-next.2",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,29 +23,29 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1901.0-next.0",
+    "@angular-devkit/architect": "0.1901.0-next.2",
     "@babel/core": "7.26.0",
     "@babel/helper-annotate-as-pure": "7.25.9",
     "@babel/helper-split-export-declaration": "7.24.7",
     "@babel/plugin-syntax-import-attributes": "7.26.0",
-    "@inquirer/confirm": "5.0.2",
+    "@inquirer/confirm": "5.1.0",
     "@vitejs/plugin-basic-ssl": "1.2.0",
-    "beasties": "0.1.0",
+    "beasties": "0.2.0",
     "browserslist": "^4.23.0",
     "esbuild": "0.24.0",
     "fast-glob": "3.3.2",
-    "https-proxy-agent": "7.0.5",
+    "https-proxy-agent": "7.0.6",
     "istanbul-lib-instrument": "6.0.3",
     "listr2": "8.2.5",
-    "magic-string": "0.30.14",
+    "magic-string": "0.30.15",
     "mrmime": "2.0.0",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.8.0",
-    "rollup": "4.28.0",
-    "sass": "1.82.0",
+    "rollup": "4.28.1",
+    "sass": "1.83.0",
     "semver": "7.6.3",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "watchpack": "2.4.2"
   },
   "optionalDependencies": {
@@ -57,7 +57,7 @@
     "@angular/localize": "^19.0.0 || ^19.1.0-next.0",
     "@angular/platform-server": "^19.0.0 || ^19.1.0-next.0",
     "@angular/service-worker": "^19.0.0 || ^19.1.0-next.0",
-    "@angular/ssr": "^19.1.0-next.0",
+    "@angular/ssr": "^19.1.0-next.2",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
@@ -86,7 +86,6 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@4.5.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
@@ -109,5 +108,8 @@
     "puppeteer": {
       "built": true
     }
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": []
   }
 }

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

@@ -6,6 +6,39 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeBuild = executeBuild;
 const source_file_cache_1 = require("../../tools/esbuild/angular/source-file-cache");
@@ -21,7 +54,6 @@ const environment_options_1 = require("../../utils/environment-options");
 const resolve_assets_1 = require("../../utils/resolve-assets");
 const manifest_1 = require("../../utils/server-rendering/manifest");
 const supported_browsers_1 = require("../../utils/supported-browsers");
-const chunk_optimizer_1 = require("./chunk-optimizer");
 const execute_post_bundle_1 = require("./execute-post-bundle");
 const i18n_1 = require("./i18n");
 const setup_bundling_1 = require("./setup-bundling");
@@ -85,7 +117,8 @@ async function executeBuild(options, context, rebuildState) {
         bundlingResult = bundler_context_1.BundlerContext.mergeResults([bundlingResult, ...componentResults]);
     }
     if (options.optimizationOptions.scripts && environment_options_1.shouldOptimizeChunks) {
-        bundlingResult = await (0, profiling_1.profileAsync)('OPTIMIZE_CHUNKS', () => (0, chunk_optimizer_1.optimizeChunks)(bundlingResult, options.sourcemapOptions.scripts ? !options.sourcemapOptions.hidden || 'hidden' : false));
+        const { optimizeChunks } = await Promise.resolve().then(() => __importStar(require('./chunk-optimizer')));
+        bundlingResult = await (0, profiling_1.profileAsync)('OPTIMIZE_CHUNKS', () => optimizeChunks(bundlingResult, options.sourcemapOptions.scripts ? !options.sourcemapOptions.hidden || 'hidden' : false));
     }
     const executionResult = new bundler_execution_result_1.ExecutionResult(bundlerContexts, componentStyleBundler, codeBundleCache, templateUpdates);
     executionResult.addWarnings(bundlingResult.warnings);
@@ -161,13 +194,13 @@ async function executeBuild(options, context, rebuildState) {
     }
     // Perform i18n translation inlining if enabled
     if (i18nOptions.shouldInline) {
-        const result = await (0, i18n_1.inlineI18n)(options, executionResult, initialFiles);
+        const result = await (0, i18n_1.inlineI18n)(metafile, options, executionResult, initialFiles);
         executionResult.addErrors(result.errors);
         executionResult.addWarnings(result.warnings);
         executionResult.addPrerenderedRoutes(result.prerenderedRoutes);
     }
     else {
-        const result = await (0, execute_post_bundle_1.executePostBundleSteps)(options, executionResult.outputFiles, executionResult.assetFiles, initialFiles, 
+        const result = await (0, execute_post_bundle_1.executePostBundleSteps)(metafile, options, executionResult.outputFiles, executionResult.assetFiles, initialFiles, 
         // Set lang attribute to the defined source locale if present
         i18nOptions.hasDefinedSourceLocale ? i18nOptions.sourceLocale : undefined);
         executionResult.addErrors(result.errors);

package/src/builders/application/execute-post-bundle.d.ts

@@ -5,18 +5,20 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
+import type { Metafile } from 'esbuild';
 import { BuildOutputFile, InitialFileRecord } from '../../tools/esbuild/bundler-context';
 import { BuildOutputAsset, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedApplicationBuildOptions } from './options';
 /**
  * Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param outputFiles The output files of an executed build.
  * @param assetFiles The assets of an executed build.
  * @param initialFiles A map containing initial file information for the executed build.
  * @param locale A language locale to insert in the index.html.
  */
-export declare function executePostBundleSteps(options: NormalizedApplicationBuildOptions, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[], initialFiles: Map<string, InitialFileRecord>, locale: string | undefined): Promise<{
+export declare function executePostBundleSteps(metafile: Metafile, options: NormalizedApplicationBuildOptions, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[], initialFiles: Map<string, InitialFileRecord>, locale: string | undefined): Promise<{
     errors: string[];
     warnings: string[];
     additionalOutputFiles: BuildOutputFile[];

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

@@ -24,6 +24,7 @@ const options_1 = require("./options");
 const schema_1 = require("./schema");
 /**
  * Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param outputFiles The output files of an executed build.
  * @param assetFiles The assets of an executed build.
@@ -31,13 +32,13 @@ const schema_1 = require("./schema");
  * @param locale A language locale to insert in the index.html.
  */
 // eslint-disable-next-line max-lines-per-function
-async function executePostBundleSteps(options, outputFiles, assetFiles, initialFiles, locale) {
+async function executePostBundleSteps(metafile, options, outputFiles, assetFiles, initialFiles, locale) {
     const additionalAssets = [];
     const additionalOutputFiles = [];
     const allErrors = [];
     const allWarnings = [];
     const prerenderedRoutes = {};
-    const { baseHref = '/', serviceWorker, i18nOptions, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, workspaceRoot, partialSSRBuild, } = options;
+    const { baseHref = '/', serviceWorker, i18nOptions, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, publicPath, workspaceRoot, partialSSRBuild, } = 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.
@@ -55,8 +56,9 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         }
     }
     // Create server manifest
+    const initialFilesPaths = new Set(initialFiles.keys());
     if (serverEntryPoint) {
-        const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale, baseHref);
+        const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale, baseHref, initialFilesPaths, metafile, publicPath);
         additionalOutputFiles.push(...serverAssetsChunks, (0, utils_1.createOutputFile)(manifest_1.SERVER_APP_MANIFEST_FILENAME, manifestContent, bundler_context_1.BuildOutputFileType.ServerApplication));
     }
     // Pre-render (SSG) and App-shell
@@ -95,7 +97,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
             // 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.`);
-            const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNodeForManifest, locale, baseHref);
+            const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNodeForManifest, locale, baseHref, initialFilesPaths, metafile, publicPath);
             for (const chunk of serverAssetsChunks) {
                 const idx = additionalOutputFiles.findIndex(({ path }) => path === chunk.path);
                 if (idx === -1) {

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

@@ -6,17 +6,19 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { BuilderContext } from '@angular-devkit/architect';
+import type { Metafile } from 'esbuild';
 import { InitialFileRecord } from '../../tools/esbuild/bundler-context';
 import { ExecutionResult, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedApplicationBuildOptions } from './options';
 /**
  * Inlines all active locales as specified by the application build options into all
  * application JavaScript files created during the build.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param executionResult The result of an executed build.
  * @param initialFiles A map containing initial file information for the executed build.
  */
-export declare function inlineI18n(options: NormalizedApplicationBuildOptions, executionResult: ExecutionResult, initialFiles: Map<string, InitialFileRecord>): Promise<{
+export declare function inlineI18n(metafile: Metafile, options: NormalizedApplicationBuildOptions, executionResult: ExecutionResult, initialFiles: Map<string, InitialFileRecord>): Promise<{
     errors: string[];
     warnings: string[];
     prerenderedRoutes: PrerenderedRoutesRecord;

package/src/builders/application/i18n.js

@@ -20,16 +20,18 @@ 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.
+ * @param metafile An esbuild metafile object.
  * @param options The normalized application builder options used to create the build.
  * @param executionResult The result of an executed build.
  * @param initialFiles A map containing initial file information for the executed build.
  */
-async function inlineI18n(options, executionResult, initialFiles) {
+async function inlineI18n(metafile, options, executionResult, initialFiles) {
+    const { i18nOptions, optimizationOptions, baseHref } = options;
     // Create the multi-threaded inliner with common options and the files generated from the build.
     const inliner = new i18n_inliner_1.I18nInliner({
-        missingTranslation: options.i18nOptions.missingTranslationBehavior ?? 'warning',
+        missingTranslation: i18nOptions.missingTranslationBehavior ?? 'warning',
         outputFiles: executionResult.outputFiles,
-        shouldOptimize: options.optimizationOptions.scripts,
+        shouldOptimize: optimizationOptions.scripts,
     }, environment_options_1.maxWorkers);
     const inlineResult = {
         errors: [],
@@ -40,29 +42,29 @@ async function inlineI18n(options, executionResult, initialFiles) {
     const updatedOutputFiles = [];
     const updatedAssetFiles = [];
     try {
-        for (const locale of options.i18nOptions.inlineLocales) {
+        for (const locale of i18nOptions.inlineLocales) {
             // A locale specific set of files is returned from the inliner.
-            const localeInlineResult = await inliner.inlineForLocale(locale, options.i18nOptions.locales[locale].translation);
+            const localeInlineResult = await inliner.inlineForLocale(locale, i18nOptions.locales[locale].translation);
             const localeOutputFiles = localeInlineResult.outputFiles;
             inlineResult.errors.push(...localeInlineResult.errors);
             inlineResult.warnings.push(...localeInlineResult.warnings);
-            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)({
+            const { errors, warnings, additionalAssets, additionalOutputFiles, prerenderedRoutes: generatedRoutes, } = await (0, execute_post_bundle_1.executePostBundleSteps)(metafile, {
                 ...options,
-                baseHref,
+                baseHref: (0, options_1.getLocaleBaseHref)(baseHref, i18nOptions, locale) ?? baseHref,
             }, localeOutputFiles, executionResult.assetFiles, initialFiles, locale);
             localeOutputFiles.push(...additionalOutputFiles);
             inlineResult.errors.push(...errors);
             inlineResult.warnings.push(...warnings);
-            // Update directory with locale base
-            if (options.i18nOptions.flatOutput !== true) {
+            // Update directory with locale base or subPath
+            const subPath = i18nOptions.locales[locale].subPath;
+            if (i18nOptions.flatOutput !== true) {
                 localeOutputFiles.forEach((file) => {
-                    file.path = (0, node_path_1.join)(locale, file.path);
+                    file.path = (0, node_path_1.join)(subPath, file.path);
                 });
                 for (const assetFile of [...executionResult.assetFiles, ...additionalAssets]) {
                     updatedAssetFiles.push({
                         source: assetFile.source,
-                        destination: (0, node_path_1.join)(locale, assetFile.destination),
+                        destination: (0, node_path_1.join)(subPath, assetFile.destination),
                     });
                 }
             }
@@ -84,7 +86,7 @@ async function inlineI18n(options, executionResult, initialFiles) {
         ...updatedOutputFiles,
     ];
     // Assets are only changed if not using the flat output option
-    if (options.i18nOptions.flatOutput !== true) {
+    if (!i18nOptions.flatOutput) {
         executionResult.assetFiles = updatedAssetFiles;
     }
     return inlineResult;

package/src/builders/application/options.js

@@ -63,7 +63,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
     // Gather persistent caching option and provide a project specific cache location
     const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
     cacheOptions.path = node_path_1.default.join(cacheOptions.path, projectName);
-    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata, options.localize);
+    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata, options.localize, context.logger);
     i18nOptions.duplicateTranslationBehavior = options.i18nDuplicateTranslation;
     i18nOptions.missingTranslationBehavior = options.i18nMissingTranslation;
     if (options.forceI18nFlatOutput) {
@@ -427,12 +427,14 @@ function normalizeGlobalEntries(rawEntries, defaultName) {
     }
     return [...bundles.values()];
 }
-function getLocaleBaseHref(baseHref, i18n, locale) {
+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}/`);
+    const localeData = i18n.locales[locale];
+    if (!localeData) {
+        return undefined;
     }
-    return undefined;
+    const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/';
+    return baseHrefSuffix !== '' ? (0, url_1.urlJoin)(baseHref, baseHrefSuffix) : undefined;
 }

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

@@ -7,9 +7,10 @@
  */
 import type { BuilderContext } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
-import type { Connect, DepOptimizationConfig, InlineConfig } from 'vite';
+import type { Connect, InlineConfig } from 'vite';
 import type { ComponentStyleRecord } from '../../tools/vite/middlewares';
 import { ServerSsrMode } from '../../tools/vite/plugins';
+import { EsbuildLoaderOption } from '../../tools/vite/utils';
 import { Result } from '../application/results';
 import { type ApplicationBuilderInternalOptions, BuildOutputFileType, type ExternalResultMetadata, JavaScriptTransformer } from './internal';
 import type { NormalizedDevServerOptions } from './options';
@@ -34,5 +35,4 @@ export declare function serveWithVite(serverOptions: NormalizedDevServerOptions,
     buildPlugins?: Plugin[];
 }): AsyncIterableIterator<DevServerBuilderOutput>;
 export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, externalMetadata: DevServerExternalResultMetadata, ssrMode: ServerSsrMode, prebundleTransformer: JavaScriptTransformer, target: string[], zoneless: boolean, componentStyles: Map<string, ComponentStyleRecord>, templateUpdates: Map<string, string>, 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

@@ -50,7 +50,8 @@ const promises_1 = require("node:fs/promises");
 const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const plugins_1 = require("../../tools/vite/plugins");
-const utils_1 = require("../../utils");
+const utils_1 = require("../../tools/vite/utils");
+const utils_2 = require("../../utils");
 const environment_options_1 = require("../../utils/environment-options");
 const load_esm_1 = require("../../utils/load-esm");
 const results_1 = require("../application/results");
@@ -97,19 +98,18 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
         // When localization is enabled with a single locale, force a flat path to maintain behavior with the existing Webpack-based dev server.
         browserOptions.forceI18nFlatOutput = true;
     }
-    const { vendor: thirdPartySourcemaps, scripts: scriptsSourcemaps } = (0, utils_1.normalizeSourceMaps)(browserOptions.sourceMap ?? false);
+    const { vendor: thirdPartySourcemaps, scripts: scriptsSourcemaps } = (0, utils_2.normalizeSourceMaps)(browserOptions.sourceMap ?? false);
     if (scriptsSourcemaps && browserOptions.server) {
         // https://nodejs.org/api/process.html#processsetsourcemapsenabledval
         process.setSourceMapsEnabled(true);
     }
-    // Enable to support component style hot reloading (`NG_HMR_CSTYLES=0` can be used to disable selectively)
+    // Enable to support link-based component style hot reloading (`NG_HMR_CSTYLES=0` can be used to disable selectively)
     browserOptions.externalRuntimeStyles =
         serverOptions.liveReload && serverOptions.hmr && environment_options_1.useComponentStyleHmr;
-    // Enable to support component template hot replacement (`NG_HMR_TEMPLATE=1` can be used to enable)
-    browserOptions.templateUpdates = !!serverOptions.liveReload && environment_options_1.useComponentTemplateHmr;
-    if (browserOptions.templateUpdates) {
-        context.logger.warn('Experimental support for component template hot replacement has been enabled via the "NG_HMR_TEMPLATE" environment variable.');
-    }
+    // Enable to support component template hot replacement (`NG_HMR_TEMPLATE=0` can be used to disable selectively)
+    // This will also replace file-based/inline styles as code if external runtime styles are not enabled.
+    browserOptions.templateUpdates =
+        serverOptions.liveReload && serverOptions.hmr && environment_options_1.useComponentTemplateHmr;
     // Setup the prebundling transformer that will be shared across Vite prebundling requests
     const prebundleTransformer = new internal_1.JavaScriptTransformer(
     // Always enable JIT linking to support applications built with and without AOT.
@@ -184,6 +184,10 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
                         assetFiles.set('/' + normalizePath(outputPath), normalizePath(file.inputPath));
                     }
                 }
+                // Invalidate SSR module graph to ensure that only new rebuild is used and not stale component updates
+                if (server && browserOptions.ssr && templateUpdates.size > 0) {
+                    server.moduleGraph.invalidateAll();
+                }
                 // Clear stale template updates on code rebuilds
                 templateUpdates.clear();
                 // Analyze result files for changes
@@ -196,6 +200,13 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
             case results_1.ResultKind.ComponentUpdate:
                 (0, node_assert_1.default)(serverOptions.hmr, 'Component updates are only supported with HMR enabled.');
                 (0, node_assert_1.default)(server, 'Builder must provide an initial full build before component update results.');
+                // Invalidate SSR module graph to ensure that new component updates are used
+                // TODO: Use fine-grained invalidation of only the component update modules
+                if (browserOptions.ssr) {
+                    server.moduleGraph.invalidateAll();
+                    const { ɵresetCompiledComponents } = (await server.ssrLoadModule('/main.server.mjs'));
+                    ɵresetCompiledComponents();
+                }
                 for (const componentUpdate of result.updates) {
                     if (componentUpdate.type === 'template') {
                         templateUpdates.set(componentUpdate.id, componentUpdate.content);
@@ -459,7 +470,7 @@ function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generated
     }
 }
 async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, externalMetadata, ssrMode, prebundleTransformer, target, zoneless, componentStyles, templateUpdates, prebundleLoaderExtensions, extensionMiddleware, indexHtmlTransformer, thirdPartySourcemaps = false) {
-    const proxy = await (0, utils_1.loadProxyConfiguration)(serverOptions.workspaceRoot, serverOptions.proxyConfig);
+    const proxy = await (0, utils_2.loadProxyConfiguration)(serverOptions.workspaceRoot, serverOptions.proxyConfig);
     // dynamically import Vite for ESM compatibility
     const { normalizePath } = await (0, load_esm_1.loadEsmModule)('vite');
     // Path will not exist on disk and only used to provide separate path for Vite requests
@@ -503,7 +514,14 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             headers: serverOptions.headers,
             // Disable the websocket if live reload is disabled (false/undefined are the only valid values)
             ws: serverOptions.liveReload === false && serverOptions.hmr === false ? false : undefined,
-            proxy,
+            // When server-side rendering (SSR) is enabled togather with SSL and Express is being used,
+            // we must configure Vite to use HTTP/1.1.
+            // This is necessary because Express does not support HTTP/2.
+            // We achieve this by defining an empty proxy.
+            // See: https://github.com/vitejs/vite/blob/c4b532cc900bf988073583511f57bd581755d5e3/packages/vite/src/node/http.ts#L106
+            proxy: serverOptions.ssl && ssrMode === plugins_1.ServerSsrMode.ExternalSsrMiddleware
+                ? (proxy ?? {})
+                : proxy,
             cors: {
                 // Allow preflight requests to be proxied.
                 preflightContinue: true,
@@ -526,7 +544,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             noExternal: /.*/,
             // Exclude any Node.js built in module and provided dependencies (currently build defined externals)
             external: externalMetadata.explicitServer,
-            optimizeDeps: getDepOptimizationConfig({
+            optimizeDeps: (0, utils_1.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)
@@ -557,12 +575,13 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             await (0, plugins_1.createAngularMemoryPlugin)({
                 virtualProjectRoot,
                 outputFiles,
+                templateUpdates,
                 external: externalMetadata.explicitBrowser,
                 skipViteClient: serverOptions.liveReload === false && serverOptions.hmr === false,
             }),
         ],
         // Browser only optimizeDeps. (This does not run for SSR dependencies).
-        optimizeDeps: getDepOptimizationConfig({
+        optimizeDeps: (0, utils_1.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)
@@ -595,41 +614,6 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
     }
     return configuration;
 }
-function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless, prebundleTransformer, ssr, loader, thirdPartySourcemaps, }) {
-    const plugins = [
-        {
-            name: `angular-vite-optimize-deps${ssr ? '-ssr' : ''}${thirdPartySourcemaps ? '-vendor-sourcemap' : ''}`,
-            setup(build) {
-                build.onLoad({ filter: /\.[cm]?js$/ }, async (args) => {
-                    return {
-                        contents: await prebundleTransformer.transformFile(args.path),
-                        loader: 'js',
-                    };
-                });
-            },
-        },
-    ];
-    return {
-        // Exclude any explicitly defined dependencies (currently build defined externals)
-        exclude,
-        // NB: to disable the deps optimizer, set optimizeDeps.noDiscovery to true and optimizeDeps.include as undefined.
-        // Include all implict dependencies from the external packages internal option
-        include: disabled ? undefined : include,
-        noDiscovery: disabled,
-        // Add an esbuild plugin to run the Angular linker on dependencies
-        esbuildOptions: {
-            // Set esbuild supported targets.
-            target,
-            supported: (0, internal_1.getFeatureSupport)(target, zoneless),
-            plugins,
-            loader,
-            define: {
-                'ngServerMode': `${ssr}`,
-            },
-            resolveExtensions: ['.mjs', '.js', '.cjs'],
-        },
-    };
-}
 /**
  * Checks if the given value is an absolute URL.
  *

package/src/builders/extract-i18n/options.js

@@ -33,7 +33,7 @@ async function normalizeOptions(context, projectName, options) {
     // Target specifier defaults to the current project's build target with no specified configuration
     const buildTargetSpecifier = options.buildTarget ?? ':';
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
-    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata);
+    const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata, /** inline */ false, context.logger);
     // Normalize xliff format extensions
     let format = options.format;
     switch (format) {

package/src/tools/angular/angular-host.d.ts

@@ -24,4 +24,4 @@ export interface AngularHostOptions {
  * @param program The TypeScript Program instance to patch.
  */
 export declare function ensureSourceFileVersions(program: ts.Program): void;
-export declare function createAngularCompilerHost(typescript: typeof ts, compilerOptions: AngularCompilerOptions, hostOptions: AngularHostOptions): AngularCompilerHost;
+export declare function createAngularCompilerHost(typescript: typeof ts, compilerOptions: AngularCompilerOptions, hostOptions: AngularHostOptions, packageJsonCache: ts.PackageJsonInfoCache | undefined): AngularCompilerHost;

package/src/tools/angular/angular-host.js

@@ -91,7 +91,7 @@ function augmentHostWithReplacements(typescript, host, replacements, moduleResol
     };
     augmentResolveModuleNames(typescript, host, tryReplace, moduleResolutionCache);
 }
-function createAngularCompilerHost(typescript, compilerOptions, hostOptions) {
+function createAngularCompilerHost(typescript, compilerOptions, hostOptions, packageJsonCache) {
     // Create TypeScript compiler host
     const host = typescript.createIncrementalCompilerHost(compilerOptions);
     // Set the parsing mode to the same as TS 5.3+ default for tsc. This provides a parse
@@ -135,11 +135,11 @@ function createAngularCompilerHost(typescript, compilerOptions, hostOptions) {
     host.getModifiedResourceFiles = function () {
         return hostOptions.modifiedFiles;
     };
+    // Provide a resolution cache to ensure package.json lookups are cached
+    const resolutionCache = typescript.createModuleResolutionCache(host.getCurrentDirectory(), host.getCanonicalFileName.bind(host), compilerOptions, packageJsonCache);
+    host.getModuleResolutionCache = () => resolutionCache;
     // Augment TypeScript Host for file replacements option
     if (hostOptions.fileReplacements) {
-        // Provide a resolution cache since overriding resolution prevents automatic creation
-        const resolutionCache = typescript.createModuleResolutionCache(host.getCurrentDirectory(), host.getCanonicalFileName.bind(host), compilerOptions);
-        host.getModuleResolutionCache = () => resolutionCache;
         augmentHostWithReplacements(typescript, host, hostOptions.fileReplacements, resolutionCache);
     }
     // Augment TypeScript Host with source file caching if provided

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

@@ -11,6 +11,8 @@ import { AngularHostOptions } from '../angular-host';
 import { AngularCompilation, DiagnosticModes, EmitFileResult } from './angular-compilation';
 export declare class AotCompilation extends AngularCompilation {
     #private;
+    private readonly browserOnlyBuild;
+    constructor(browserOnlyBuild: boolean);
     initialize(tsconfig: string, hostOptions: AngularHostOptions, compilerOptionsTransformer?: (compilerOptions: ng.CompilerOptions) => ng.CompilerOptions): Promise<{
         affectedFiles: ReadonlySet<ts.SourceFile>;
         compilerOptions: ng.CompilerOptions;