@angular/build 19.2.0-next.1 → 19.2.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.2.0-next.1",
+  "version": "19.2.0-next.2",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,16 +23,16 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1902.0-next.1",
-    "@babel/core": "7.26.7",
+    "@angular-devkit/architect": "0.1902.0-next.2",
+    "@babel/core": "7.26.8",
     "@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.1.4",
+    "@inquirer/confirm": "5.1.5",
     "@vitejs/plugin-basic-ssl": "1.2.0",
     "beasties": "0.2.0",
     "browserslist": "^4.23.0",
-    "esbuild": "0.24.2",
+    "esbuild": "0.25.0",
     "fast-glob": "3.3.3",
     "https-proxy-agent": "7.0.6",
     "istanbul-lib-instrument": "6.0.3",
@@ -42,14 +42,14 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.8.0",
-    "rollup": "4.32.1",
-    "sass": "1.83.4",
-    "semver": "7.6.3",
-    "vite": "6.0.11",
+    "rollup": "4.34.6",
+    "sass": "1.84.0",
+    "semver": "7.7.1",
+    "vite": "6.1.0",
     "watchpack": "2.4.2"
   },
   "optionalDependencies": {
-    "lmdb": "3.2.2"
+    "lmdb": "3.2.6"
   },
   "peerDependencies": {
     "@angular/compiler": "^19.0.0 || ^19.2.0-next.0",
@@ -57,7 +57,7 @@
     "@angular/localize": "^19.0.0 || ^19.2.0-next.0",
     "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0",
     "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0",
-    "@angular/ssr": "^19.2.0-next.1",
+    "@angular/ssr": "^19.2.0-next.2",
     "less": "^4.2.0",
     "ng-packagr": "^19.0.0 || ^19.2.0-next.0",
     "postcss": "^8.4.0",

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

@@ -127,6 +127,9 @@ async function* runEsBuildBuildAction(action, options) {
     if (!watcher) {
         return;
     }
+    // Used to force a full result on next rebuild if there were initial errors.
+    // This ensures at least one full result is emitted.
+    let hasInitialErrors = result.errors.length > 0;
     // Wait for changes and rebuild as needed
     const currentWatchFiles = new Set(result.watchFiles);
     try {
@@ -164,9 +167,11 @@ async function* runEsBuildBuildAction(action, options) {
             if (staleWatchFiles?.size) {
                 watcher.remove([...staleWatchFiles]);
             }
-            for (const outputResult of emitOutputResults(result, outputOptions, changes, incrementalResults ? rebuildState : undefined)) {
+            for (const outputResult of emitOutputResults(result, outputOptions, changes, incrementalResults && !hasInitialErrors ? rebuildState : undefined)) {
                 yield outputResult;
             }
+            // Clear initial build errors flag if no errors are now present
+            hasInitialErrors &&= result.errors.length > 0;
         }
     }
     finally {

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

@@ -148,7 +148,6 @@ async function executeBuild(options, context, rebuildState) {
     }
     const { metafile, initialFiles, outputFiles } = bundlingResult;
     executionResult.outputFiles.push(...outputFiles);
-    const changedFiles = rebuildState && executionResult.findChangedFiles(rebuildState.previousOutputInfo);
     // Analyze files for bundle budget failures if present
     let budgetFailures;
     if (options.budgets) {
@@ -218,6 +217,7 @@ async function executeBuild(options, context, rebuildState) {
         executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2), bundler_context_1.BuildOutputFileType.Root);
     }
     if (!jsonLogs) {
+        const changedFiles = rebuildState && executionResult.findChangedFiles(rebuildState.previousOutputInfo);
         executionResult.addLog((0, utils_1.logBuildStats)(metafile, outputFiles, initialFiles, budgetFailures, colors, changedFiles, estimatedTransferSizes, !!ssrOptions, verbose));
     }
     return executionResult;

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

@@ -38,7 +38,7 @@ async function executePostBundleSteps(metafile, options, outputFiles, assetFiles
     const allErrors = [];
     const allWarnings = [];
     const prerenderedRoutes = {};
-    const { baseHref = '/', serviceWorker, i18nOptions, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, publicPath, workspaceRoot, partialSSRBuild, } = options;
+    const { baseHref = '/', serviceWorker, ssrOptions, 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.
@@ -57,7 +57,7 @@ async function executePostBundleSteps(metafile, options, outputFiles, assetFiles
     }
     // Create server manifest
     const initialFilesPaths = new Set(initialFiles.keys());
-    if (serverEntryPoint) {
+    if (serverEntryPoint && (outputMode || prerenderOptions || appShellOptions || ssrOptions)) {
         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));
     }

package/src/builders/application/i18n.js

@@ -26,12 +26,13 @@ const options_1 = require("./options");
  * @param initialFiles A map containing initial file information for the executed build.
  */
 async function inlineI18n(metafile, options, executionResult, initialFiles) {
-    const { i18nOptions, optimizationOptions, baseHref } = options;
+    const { i18nOptions, optimizationOptions, baseHref, cacheOptions } = options;
     // Create the multi-threaded inliner with common options and the files generated from the build.
     const inliner = new i18n_inliner_1.I18nInliner({
         missingTranslation: i18nOptions.missingTranslationBehavior ?? 'warning',
         outputFiles: executionResult.outputFiles,
         shouldOptimize: optimizationOptions.scripts,
+        persistentCachePath: cacheOptions.enabled ? cacheOptions.path : undefined,
     }, environment_options_1.maxWorkers);
     const inlineResult = {
         errors: [],
@@ -41,6 +42,8 @@ async function inlineI18n(metafile, options, executionResult, initialFiles) {
     // For each active locale, use the inliner to process the output files of the build.
     const updatedOutputFiles = [];
     const updatedAssetFiles = [];
+    // Root and SSR entry files are not modified.
+    const unModifiedOutputFiles = executionResult.outputFiles.filter(({ type }) => type === bundler_context_1.BuildOutputFileType.Root || type === bundler_context_1.BuildOutputFileType.ServerRoot);
     try {
         for (const locale of i18nOptions.inlineLocales) {
             // A locale specific set of files is returned from the inliner.
@@ -51,7 +54,7 @@ async function inlineI18n(metafile, options, executionResult, initialFiles) {
             const { errors, warnings, additionalAssets, additionalOutputFiles, prerenderedRoutes: generatedRoutes, } = await (0, execute_post_bundle_1.executePostBundleSteps)(metafile, {
                 ...options,
                 baseHref: (0, options_1.getLocaleBaseHref)(baseHref, i18nOptions, locale) ?? baseHref,
-            }, localeOutputFiles, executionResult.assetFiles, initialFiles, locale);
+            }, [...unModifiedOutputFiles, ...localeOutputFiles], executionResult.assetFiles, initialFiles, locale);
             localeOutputFiles.push(...additionalOutputFiles);
             inlineResult.errors.push(...errors);
             inlineResult.warnings.push(...warnings);
@@ -81,7 +84,7 @@ async function inlineI18n(metafile, options, executionResult, initialFiles) {
     // Update the result with all localized files.
     executionResult.outputFiles = [
         // Root and SSR entry files are not modified.
-        ...executionResult.outputFiles.filter(({ type }) => type === bundler_context_1.BuildOutputFileType.Root || type === bundler_context_1.BuildOutputFileType.ServerRoot),
+        ...unModifiedOutputFiles,
         // Updated files for each locale.
         ...updatedOutputFiles,
     ];

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

@@ -3,8 +3,8 @@
  */
 export type Schema = {
     /**
-     * The hosts that can access the development server. This option sets the Vite option of the
-     * same name. For further details:
+     * The hosts that the development server will respond to. This option sets the Vite option
+     * of the same name. For further details:
      * https://vite.dev/config/server-options.html#server-allowedhosts
      */
     allowedHosts?: AllowedHosts;
@@ -86,8 +86,8 @@ export type Schema = {
     watch?: boolean;
 };
 /**
- * The hosts that can access the development server. This option sets the Vite option of the
- * same name. For further details:
+ * The hosts that the development server will respond to. This option sets the Vite option
+ * of the same name. For further details:
  * https://vite.dev/config/server-options.html#server-allowedhosts
  */
 export type AllowedHosts = string[] | boolean;

package/src/builders/dev-server/schema.json

@@ -37,12 +37,12 @@
       "description": "SSL certificate to use for serving HTTPS."
     },
     "allowedHosts": {
-      "description": "The hosts that can access the development server. This option sets the Vite option of the same name. For further details: https://vite.dev/config/server-options.html#server-allowedhosts",
+      "description": "The hosts that the development server will respond to. This option sets the Vite option of the same name. For further details: https://vite.dev/config/server-options.html#server-allowedhosts",
       "default": [],
       "oneOf": [
         {
           "type": "array",
-          "description": "List of hosts that are allowed to access the development server.",
+          "description": "A list of hosts that the development server will respond to.",
           "items": {
             "type": "string"
           }

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

@@ -161,6 +161,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
                     },
                 });
             }
+            yield { baseUrl: '', success: false };
             continue;
         }
         // Clear existing error overlay on successful result
@@ -321,6 +322,29 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
                         break;
                 }
             });
+            // Setup component HMR invalidation
+            // Invalidation occurs when the runtime cannot update a component
+            server.hot.on('angular:invalidate', (data) => {
+                if (typeof data?.id !== 'string') {
+                    context.logger.warn('Development server client sent invalid internal invalidate event.');
+                }
+                // Clear invalid template update
+                templateUpdates.delete(data.id);
+                // Some cases are expected unsupported update scenarios but some may be errors.
+                // If an error occurred, log the error in addition to the invalidation.
+                if (data.error) {
+                    context.logger.error(`Component update failed${data.message ? `: ${data.message}` : '.'}` +
+                        '\nPlease consider reporting the error at https://github.com/angular/angular-cli/issues');
+                }
+                else {
+                    context.logger.warn(`Component update unsupported${data.message ? `: ${data.message}` : '.'}`);
+                }
+                server?.ws.send({
+                    type: 'full-reload',
+                    path: '*',
+                });
+                context.logger.info('Page reload sent to client(s).');
+            });
             const urls = server.resolvedUrls;
             if (urls && (urls.local.length || urls.network.length)) {
                 serverUrl = new URL(urls.local[0] ?? urls.network[0]);
@@ -506,6 +530,7 @@ function updateResultRecord(outputPath, file, normalizePath, htmlIndexPath, gene
         }
     }
 }
+// eslint-disable-next-line max-lines-per-function
 async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, externalMetadata, ssrMode, prebundleTransformer, target, zoneless, componentStyles, templateUpdates, prebundleLoaderExtensions, define, extensionMiddleware, indexHtmlTransformer, thirdPartySourcemaps = false) {
     const proxy = await (0, utils_2.loadProxyConfiguration)(serverOptions.workspaceRoot, serverOptions.proxyConfig);
     // dynamically import Vite for ESM compatibility
@@ -522,6 +547,14 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             ssrFiles = ['./main.server.mjs', './server.mjs'];
             break;
     }
+    /**
+     * Required when using `externalDependencies` to prevent Vite load errors.
+     *
+     * @note Can be removed if Vite introduces native support for externals.
+     * @note Vite misresolves browser modules in SSR when accessing URLs with multiple segments
+     *       (e.g., 'foo/bar'), as they are not correctly re-based from the base href.
+     */
+    const preTransformRequests = externalMetadata.explicitBrowser.length === 0 && ssrMode === plugins_1.ServerSsrMode.NoSsr;
     const cacheDir = (0, node_path_1.join)(serverOptions.cacheOptions.path, serverOptions.buildTarget.project, 'vite');
     const configuration = {
         configFile: false,
@@ -550,7 +583,11 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             mainFields: ['es2020', 'browser', 'module', 'main'],
             preserveSymlinks,
         },
+        dev: {
+            preTransformRequests,
+        },
         server: {
+            preTransformRequests,
             warmup: {
                 ssrFiles,
             },
@@ -571,6 +608,9 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                 ? (proxy ?? {})
                 : proxy,
             cors: {
+                // This will add the header `Access-Control-Allow-Origin: http://example.com`,
+                // where `http://example.com` is the requesting origin.
+                origin: true,
                 // Allow preflight requests to be proxied.
                 preflightContinue: true,
             },
@@ -587,9 +627,6 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                     ...[...assets.values()].map(({ source }) => source),
                 ],
             },
-            // 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.explicitBrowser.length === 0,
         },
         ssr: {
             // Note: `true` and `/.*/` have different sematics. When true, the `external` option is ignored.
@@ -631,7 +668,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                 outputFiles,
                 templateUpdates,
                 external: externalMetadata.explicitBrowser,
-                skipViteClient: serverOptions.liveReload === false && serverOptions.hmr === false,
+                disableViteTransport: !serverOptions.liveReload,
             }),
         ],
         // Browser only optimizeDeps. (This does not run for SSR dependencies).

package/src/tools/angular/compilation/hmr-candidates.js

@@ -136,7 +136,8 @@ function analyzeFileUpdates(stale, updated, compiler) {
                     return null;
                 }
                 // Compare component meta decorator object literals
-                if (hasUnsupportedMetaUpdates(staleDecoratorExpression, stale, updatedDecoratorExpression, updated)) {
+                const analysis = analyzeMetaUpdates(staleDecoratorExpression, stale, updatedDecoratorExpression, updated);
+                if (analysis === MetaUpdateAnalysis.Unsupported) {
                     return null;
                 }
                 // Compare text of the member nodes to determine if any changes have occurred
@@ -145,7 +146,9 @@ function analyzeFileUpdates(stale, updated, compiler) {
                     return null;
                 }
                 // If all previous class checks passed, this class is supported for HMR updates
-                candidates.push(updatedNode);
+                if (analysis === MetaUpdateAnalysis.Supported) {
+                    candidates.push(updatedNode);
+                }
                 continue;
             }
         }
@@ -161,7 +164,19 @@ function analyzeFileUpdates(stale, updated, compiler) {
 /**
  * The set of Angular component metadata fields that are supported by HMR updates.
  */
-const SUPPORTED_FIELDS = new Set(['template', 'templateUrl', 'styles', 'styleUrl', 'stylesUrl']);
+const SUPPORTED_FIELD_NAMES = new Set([
+    'template',
+    'templateUrl',
+    'styles',
+    'styleUrl',
+    'stylesUrl',
+]);
+var MetaUpdateAnalysis;
+(function (MetaUpdateAnalysis) {
+    MetaUpdateAnalysis[MetaUpdateAnalysis["Supported"] = 0] = "Supported";
+    MetaUpdateAnalysis[MetaUpdateAnalysis["Unsupported"] = 1] = "Unsupported";
+    MetaUpdateAnalysis[MetaUpdateAnalysis["None"] = 2] = "None";
+})(MetaUpdateAnalysis || (MetaUpdateAnalysis = {}));
 /**
  * Analyzes the metadata fields of a decorator call expression for unsupported HMR updates.
  * Only updates to supported fields can be present for HMR to be viable.
@@ -169,22 +184,25 @@ const SUPPORTED_FIELDS = new Set(['template', 'templateUrl', 'styles', 'styleUrl
  * @param staleSource The source file instance containing the stale call instance.
  * @param updatedCall A call expression instance.
  * @param updatedSource The source file instance containing the updated call instance.
- * @returns true, if unsupported metadata updates are present; false, otherwise.
+ * @returns A MetaUpdateAnalysis enum value.
  */
-function hasUnsupportedMetaUpdates(staleCall, staleSource, updatedCall, updatedSource) {
+function analyzeMetaUpdates(staleCall, staleSource, updatedCall, updatedSource) {
     const staleObject = staleCall.arguments[0];
     const updatedObject = updatedCall.arguments[0];
+    let hasSupportedUpdate = false;
     if (!typescript_1.default.isObjectLiteralExpression(staleObject) || !typescript_1.default.isObjectLiteralExpression(updatedObject)) {
-        return true;
+        return MetaUpdateAnalysis.Unsupported;
     }
+    const supportedFields = new Map();
     const unsupportedFields = [];
     for (const property of staleObject.properties) {
         if (!typescript_1.default.isPropertyAssignment(property) || typescript_1.default.isComputedPropertyName(property.name)) {
             // Unsupported object literal property
-            return true;
+            return MetaUpdateAnalysis.Unsupported;
         }
         const name = property.name.text;
-        if (SUPPORTED_FIELDS.has(name)) {
+        if (SUPPORTED_FIELD_NAMES.has(name)) {
+            supportedFields.set(name, property.initializer);
             continue;
         }
         unsupportedFields.push(property.initializer);
@@ -193,18 +211,31 @@ function hasUnsupportedMetaUpdates(staleCall, staleSource, updatedCall, updatedS
     for (const property of updatedObject.properties) {
         if (!typescript_1.default.isPropertyAssignment(property) || typescript_1.default.isComputedPropertyName(property.name)) {
             // Unsupported object literal property
-            return true;
+            return MetaUpdateAnalysis.Unsupported;
         }
         const name = property.name.text;
-        if (SUPPORTED_FIELDS.has(name)) {
+        if (SUPPORTED_FIELD_NAMES.has(name)) {
+            const staleInitializer = supportedFields.get(name);
+            // If the supported field was added or has its content changed, there has been a supported update
+            if (!staleInitializer ||
+                !equalRangeText(property.initializer, updatedSource, staleInitializer, staleSource)) {
+                hasSupportedUpdate = true;
+            }
+            // Remove the field entry to allow tracking removed fields
+            supportedFields.delete(name);
             continue;
         }
         // Compare in order
         if (!equalRangeText(property.initializer, updatedSource, unsupportedFields[i++], staleSource)) {
-            return true;
+            return MetaUpdateAnalysis.Unsupported;
         }
     }
-    return i !== unsupportedFields.length;
+    if (i !== unsupportedFields.length) {
+        return MetaUpdateAnalysis.Unsupported;
+    }
+    // Any remaining supported field indicates a field removal. This is also considered a supported update.
+    hasSupportedUpdate ||= supportedFields.size > 0;
+    return hasSupportedUpdate ? MetaUpdateAnalysis.Supported : MetaUpdateAnalysis.None;
 }
 /**
  * Compares the text from a provided range in a source file to the text of a range in a second source file.

package/src/tools/babel/plugins/add-code-coverage.js

@@ -14,6 +14,7 @@ exports.default = default_1;
 const core_1 = require("@babel/core");
 const istanbul_lib_instrument_1 = require("istanbul-lib-instrument");
 const node_assert_1 = __importDefault(require("node:assert"));
+const node_url_1 = require("node:url");
 /**
  * A babel plugin factory function for adding istanbul instrumentation.
  *
@@ -25,9 +26,15 @@ function default_1() {
         visitor: {
             Program: {
                 enter(path, state) {
+                    const inputSourceMap = // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                     state.file.inputMap?.toObject();
+                    // istanbul does not support URL as sources.
+                    if (inputSourceMap?.sources) {
+                        inputSourceMap.sources = inputSourceMap.sources.map((s) => s.startsWith('file://') ? (0, node_url_1.fileURLToPath)(s) : s);
+                    }
                     const visitor = (0, istanbul_lib_instrument_1.programVisitor)(core_1.types, state.filename, {
                         // Babel returns a Converter object from the `convert-source-map` package
-                        inputSourceMap: state.file.inputMap?.toObject(),
+                        inputSourceMap,
                     });
                     visitors.set(path, visitor);
                     visitor.enter(path);

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

@@ -47,6 +47,7 @@ exports.createCompilerPlugin = createCompilerPlugin;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
 const path = __importStar(require("node:path"));
+const node_url_1 = require("node:url");
 const environment_options_1 = require("../../../utils/environment-options");
 const compilation_1 = require("../../angular/compilation");
 const javascript_transformer_1 = require("../javascript-transformer");
@@ -233,7 +234,7 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun
                 let referencedFiles;
                 let externalStylesheets;
                 try {
-                    const initializationResult = await compilation.initialize(pluginOptions.tsconfig, hostOptions, createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks, build.initialOptions.conditions));
+                    const initializationResult = await compilation.initialize(pluginOptions.tsconfig, hostOptions, createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks, build.initialOptions.conditions, build.initialOptions.absWorkingDir));
                     shouldTsIgnoreJs = !initializationResult.compilerOptions.allowJs;
                     // Isolated modules option ensures safe non-TypeScript transpilation.
                     // Typescript printing support for sourcemaps is not yet integrated.
@@ -474,7 +475,7 @@ async function bundleExternalStylesheet(stylesheetBundler, stylesheetFile, exter
         });
     }
 }
-function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks, customConditions) {
+function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks, customConditions, absWorkingDir) {
     return (compilerOptions) => {
         // target of 9 is ES2022 (using the number avoids an expensive import of typescript just for an enum)
         if (compilerOptions.target === undefined || compilerOptions.target < 9 /** ES2022 */) {
@@ -542,6 +543,10 @@ function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserve
         return {
             ...compilerOptions,
             noEmitOnError: false,
+            // Using the path as a URL is necessary here; otherwise, esbuild will not generate source maps correctly.
+            // https://github.com/evanw/esbuild/issues/4070
+            // https://github.com/evanw/esbuild/issues/4075
+            outDir: absWorkingDir ? (0, node_url_1.pathToFileURL)(absWorkingDir + '/').href : undefined,
             inlineSources: !!pluginOptions.sourcemap,
             inlineSourceMap: !!pluginOptions.sourcemap,
             sourceMap: undefined,

package/src/tools/esbuild/i18n-inliner.d.ts

@@ -13,6 +13,7 @@ export interface I18nInlinerOptions {
     missingTranslation: 'error' | 'warning' | 'ignore';
     outputFiles: BuildOutputFile[];
     shouldOptimize?: boolean;
+    persistentCachePath?: string;
 }
 /**
  * A class that performs i18n translation inlining of JavaScript code.
@@ -22,6 +23,7 @@ export interface I18nInlinerOptions {
  */
 export declare class I18nInliner {
     #private;
+    private readonly options;
     constructor(options: I18nInlinerOptions, maxThreads?: number);
     /**
      * Performs inlining of translations for the provided locale and translations. The files that
@@ -41,4 +43,11 @@ export declare class I18nInliner {
      * @returns A void promise that resolves when closing is complete.
      */
     close(): Promise<void>;
+    /**
+     * Initializes the cache for storing translated bundles.
+     * If the cache is already initialized, it does nothing.
+     *
+     * @returns A promise that resolves once the cache initialization process is complete.
+     */
+    private initCache;
 }

package/src/tools/esbuild/i18n-inliner.js

@@ -6,12 +6,47 @@
  * 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;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18nInliner = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
+const node_crypto_1 = require("node:crypto");
+const node_path_1 = require("node:path");
 const worker_pool_1 = require("../../utils/worker-pool");
 const bundler_context_1 = require("./bundler-context");
 const utils_1 = require("./utils");
@@ -27,37 +62,37 @@ const LOCALIZE_KEYWORD = '$localize';
  * localize function (`$localize`).
  */
 class I18nInliner {
+    options;
+    #cacheInitFailed = false;
     #workerPool;
+    #cache;
     #localizeFiles;
     #unmodifiedFiles;
-    #fileToType = new Map();
     constructor(options, maxThreads) {
+        this.options = options;
         this.#unmodifiedFiles = [];
+        const { outputFiles, shouldOptimize, missingTranslation } = options;
         const files = new Map();
         const pendingMaps = [];
-        for (const file of options.outputFiles) {
+        for (const file of outputFiles) {
             if (file.type === bundler_context_1.BuildOutputFileType.Root || file.type === bundler_context_1.BuildOutputFileType.ServerRoot) {
                 // Skip also the server entry-point.
                 // Skip stats and similar files.
                 continue;
             }
-            this.#fileToType.set(file.path, file.type);
-            if (file.path.endsWith('.js') || file.path.endsWith('.mjs')) {
+            const fileExtension = (0, node_path_1.extname)(file.path);
+            if (fileExtension === '.js' || fileExtension === '.mjs') {
                 // Check if localizations are present
                 const contentBuffer = Buffer.isBuffer(file.contents)
                     ? file.contents
                     : Buffer.from(file.contents.buffer, file.contents.byteOffset, file.contents.byteLength);
                 const hasLocalize = contentBuffer.includes(LOCALIZE_KEYWORD);
                 if (hasLocalize) {
-                    // A Blob is an immutable data structure that allows sharing the data between workers
-                    // without copying until the data is actually used within a Worker. This is useful here
-                    // since each file may not actually be processed in each Worker and the Blob avoids
-                    // unneeded repeat copying of potentially large JavaScript files.
-                    files.set(file.path, new Blob([file.contents]));
+                    files.set(file.path, file);
                     continue;
                 }
             }
-            else if (file.path.endsWith('.js.map')) {
+            else if (fileExtension === '.map') {
                 // The related JS file may not have been checked yet. To ensure that map files are not
                 // missed, store any pending map files and check them after all output files.
                 pendingMaps.push(file);
@@ -68,7 +103,7 @@ class I18nInliner {
         // Check if any pending map files should be processed by checking if the parent JS file is present
         for (const file of pendingMaps) {
             if (files.has(file.path.slice(0, -4))) {
-                files.set(file.path, new Blob([file.contents]));
+                files.set(file.path, file);
             }
             else {
                 this.#unmodifiedFiles.push(file);
@@ -80,9 +115,13 @@ class I18nInliner {
             maxThreads,
             // Extract options to ensure only the named options are serialized and sent to the worker
             workerData: {
-                missingTranslation: options.missingTranslation,
-                shouldOptimize: options.shouldOptimize,
-                files,
+                missingTranslation,
+                shouldOptimize,
+                // A Blob is an immutable data structure that allows sharing the data between workers
+                // without copying until the data is actually used within a Worker. This is useful here
+                // since each file may not actually be processed in each Worker and the Blob avoids
+                // unneeded repeat copying of potentially large JavaScript files.
+                files: new Map(Array.from(files, ([name, file]) => [name, new Blob([file.contents])])),
             },
         });
     }
@@ -95,18 +134,41 @@ class I18nInliner {
      * @returns A promise that resolves to an array of OutputFiles representing a translated result.
      */
     async inlineForLocale(locale, translation) {
+        await this.initCache();
+        const { shouldOptimize, missingTranslation } = this.options;
         // Request inlining for each file that contains localize calls
         const requests = [];
-        for (const filename of this.#localizeFiles.keys()) {
+        let fileCacheKeyBase;
+        for (const [filename, file] of this.#localizeFiles) {
+            let cacheKey;
             if (filename.endsWith('.map')) {
                 continue;
             }
-            const fileRequest = this.#workerPool.run({
-                filename,
-                locale,
-                translation,
+            let cacheResultPromise = Promise.resolve(null);
+            if (this.#cache) {
+                fileCacheKeyBase ??= Buffer.from(JSON.stringify({ locale, translation, missingTranslation, shouldOptimize }), 'utf-8');
+                // NOTE: If additional options are added, this may need to be updated.
+                // TODO: Consider xxhash or similar instead of SHA256
+                cacheKey = (0, node_crypto_1.createHash)('sha256')
+                    .update(file.hash)
+                    .update(filename)
+                    .update(fileCacheKeyBase)
+                    .digest('hex');
+                // Failure to get the value should not fail the transform
+                cacheResultPromise = this.#cache.get(cacheKey).catch(() => null);
+            }
+            const fileResult = cacheResultPromise.then(async (cachedResult) => {
+                if (cachedResult) {
+                    return cachedResult;
+                }
+                const result = await this.#workerPool.run({ filename, locale, translation });
+                if (this.#cache && cacheKey) {
+                    // Failure to set the value should not fail the transform
+                    await this.#cache.set(cacheKey, result).catch(() => { });
+                }
+                return result;
             });
-            requests.push(fileRequest);
+            requests.push(fileResult);
         }
         // Wait for all file requests to complete
         const rawResults = await Promise.all(requests);
@@ -115,7 +177,7 @@ class I18nInliner {
         const warnings = [];
         const outputFiles = [
             ...rawResults.flatMap(({ file, code, map, messages }) => {
-                const type = this.#fileToType.get(file);
+                const type = this.#localizeFiles.get(file)?.type;
                 (0, node_assert_1.default)(type !== undefined, 'localized file should always have a type' + file);
                 const resultFiles = [(0, utils_1.createOutputFile)(file, code, type)];
                 if (map) {
@@ -146,5 +208,32 @@ class I18nInliner {
     close() {
         return this.#workerPool.destroy();
     }
+    /**
+     * Initializes the cache for storing translated bundles.
+     * If the cache is already initialized, it does nothing.
+     *
+     * @returns A promise that resolves once the cache initialization process is complete.
+     */
+    async initCache() {
+        if (this.#cache || this.#cacheInitFailed) {
+            return;
+        }
+        const { persistentCachePath } = this.options;
+        // Webcontainers currently do not support this persistent cache store.
+        if (!persistentCachePath || process.versions.webcontainer) {
+            return;
+        }
+        // Initialize a persistent cache for i18n transformations.
+        try {
+            const { LmbdCacheStore } = await Promise.resolve().then(() => __importStar(require('./lmdb-cache-store')));
+            this.#cache = new LmbdCacheStore((0, node_path_1.join)(persistentCachePath, 'angular-i18n.db'));
+        }
+        catch {
+            this.#cacheInitFailed = true;
+            // eslint-disable-next-line no-console
+            console.warn('Unable to initialize JavaScript cache storage.\n' +
+                'This will not affect the build output content but may result in slower builds.');
+        }
+    }
 }
 exports.I18nInliner = I18nInliner;

package/src/tools/esbuild/stylesheets/less-language.js

@@ -42,6 +42,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LessStylesheetLanguage = void 0;
 const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const node_url_1 = require("node:url");
 /**
  * The lazy-loaded instance of the less stylesheet preprocessor.
  * It is only imported and initialized if a less stylesheet is used.
@@ -115,7 +117,7 @@ async function compileString(data, filename, options, resolver, unsafeInlineJava
         },
     };
     try {
-        const result = await less.render(data, {
+        const { imports, map, css } = await less.render(data, {
             filename,
             paths: options.includePaths,
             plugins: [resolverPlugin],
@@ -123,15 +125,15 @@ async function compileString(data, filename, options, resolver, unsafeInlineJava
             javascriptEnabled: unsafeInlineJavaScript,
             sourceMap: options.sourcemap
                 ? {
-                    sourceMapFileInline: true,
+                    sourceMapFileInline: false,
                     outputSourceFiles: true,
                 }
                 : undefined,
         });
         return {
-            contents: result.css,
+            contents: options.sourcemap ? `${css}\n${sourceMapToUrlComment(map)}` : css,
             loader: 'css',
-            watchFiles: [filename, ...result.imports],
+            watchFiles: [filename, ...imports],
         };
     }
     catch (error) {
@@ -182,3 +184,13 @@ function convertExceptionLocation(exception) {
         lineText: exception.extract && exception.extract[Math.trunc(exception.extract.length / 2)],
     };
 }
+function sourceMapToUrlComment(sourceMap) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const map = JSON.parse(sourceMap);
+    // Using file URLs instead of paths ensures that esbuild correctly resolves the source map.
+    // https://github.com/evanw/esbuild/issues/4070
+    // https://github.com/evanw/esbuild/issues/4075
+    map.sources = map.sources.map((source) => source && (0, node_path_1.isAbsolute)(source) ? (0, node_url_1.pathToFileURL)(source).href : source);
+    const urlSourceMap = Buffer.from(JSON.stringify(map), 'utf-8').toString('base64');
+    return `/*# sourceMappingURL=data:application/json;charset=utf-8;base64,${urlSourceMap} */`;
+}

package/src/tools/esbuild/stylesheets/sass-language.js

@@ -175,7 +175,7 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
         });
         return {
             loader: 'css',
-            contents: sourceMap ? `${css}\n${sourceMapToUrlComment(sourceMap, (0, node_path_1.dirname)(filePath))}` : css,
+            contents: sourceMap ? `${css}\n${sourceMapToUrlComment(sourceMap)}` : css,
             watchFiles: loadedUrls.map((url) => (0, node_url_1.fileURLToPath)(url)),
             warnings,
         };
@@ -201,10 +201,7 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
         throw error;
     }
 }
-function sourceMapToUrlComment(sourceMap, root) {
-    // Remove `file` protocol from all sourcemap sources and adjust to be relative to the input file.
-    // This allows esbuild to correctly process the paths.
-    sourceMap.sources = sourceMap.sources.map((source) => (0, node_path_1.relative)(root, (0, node_url_1.fileURLToPath)(source)));
+function sourceMapToUrlComment(sourceMap) {
     const urlSourceMap = Buffer.from(JSON.stringify(sourceMap), 'utf-8').toString('base64');
     return `/*# sourceMappingURL=data:application/json;charset=utf-8;base64,${urlSourceMap} */`;
 }

package/src/tools/esbuild/utils.js

@@ -35,6 +35,9 @@ const manifest_1 = require("../../utils/server-rendering/manifest");
 const stats_table_1 = require("../../utils/stats-table");
 const bundler_context_1 = require("./bundler-context");
 function logBuildStats(metafile, outputFiles, initial, budgetFailures, colors, changedFiles, estimatedTransferSizes, ssrOutputEnabled, verbose) {
+    // Remove the i18n subpath in case the build is using i18n.
+    // en-US/main.js -> main.js
+    const normalizedChangedFiles = new Set([...(changedFiles ?? [])].map((f) => (0, node_path_1.basename)(f)));
     const browserStats = [];
     const serverStats = [];
     let unchangedCount = 0;
@@ -45,7 +48,7 @@ function logBuildStats(metafile, outputFiles, initial, budgetFailures, colors, c
             continue;
         }
         // Show only changed files if a changed list is provided
-        if (changedFiles && !changedFiles.has(file)) {
+        if (normalizedChangedFiles.size && !normalizedChangedFiles.has(file)) {
             ++unchangedCount;
             continue;
         }

package/src/tools/vite/plugins/angular-memory-plugin.d.ts

@@ -12,7 +12,7 @@ interface AngularMemoryPluginOptions {
     outputFiles: AngularMemoryOutputFiles;
     templateUpdates?: ReadonlyMap<string, string>;
     external?: string[];
-    skipViteClient?: boolean;
+    disableViteTransport?: boolean;
 }
 export declare function createAngularMemoryPlugin(options: AngularMemoryPluginOptions): Promise<Plugin>;
 export {};

package/src/tools/vite/plugins/angular-memory-plugin.js

@@ -47,24 +47,13 @@ async function createAngularMemoryPlugin(options) {
                 // `/@id/${source}` but is currently closer to a raw external than a resolved file path.
                 return source;
             }
-            if (importer) {
+            if (importer && source[0] === '.') {
                 const normalizedImporter = normalizePath(importer);
-                if (source[0] === '.' && normalizedImporter.startsWith(virtualProjectRoot)) {
+                if (normalizedImporter.startsWith(virtualProjectRoot)) {
                     // Remove query if present
                     const [importerFile] = normalizedImporter.split('?', 1);
                     source = '/' + (0, node_path_1.join)((0, node_path_1.dirname)((0, node_path_1.relative)(virtualProjectRoot, importerFile)), source);
                 }
-                else if (!ssr &&
-                    source[0] === '/' &&
-                    importer.endsWith('index.html') &&
-                    normalizedImporter.startsWith(virtualProjectRoot)) {
-                    // This is only needed when using SSR and `angularSsrMiddleware` (old style) to correctly resolve
-                    // .js files when using lazy-loading.
-                    // Remove query if present
-                    const [importerFile] = normalizedImporter.split('?', 1);
-                    source =
-                        '/' + (0, node_path_1.join)((0, node_path_1.dirname)((0, node_path_1.relative)(virtualProjectRoot, importerFile)), (0, node_path_1.basename)(source));
-                }
             }
             const [file] = source.split('?', 1);
             if (outputFiles.has(normalizePath(file))) {
@@ -84,7 +73,7 @@ async function createAngularMemoryPlugin(options) {
             const codeContents = outputFiles.get(relativeFile)?.contents;
             if (codeContents === undefined) {
                 if (relativeFile.endsWith('/node_modules/vite/dist/client/client.mjs')) {
-                    return options.skipViteClient ? '' : loadViteClientCode(file);
+                    return loadViteClientCode(file, options.disableViteTransport);
                 }
                 return undefined;
             }
@@ -107,9 +96,9 @@ async function createAngularMemoryPlugin(options) {
  * @param file The absolute path to the Vite client code.
  * @returns
  */
-async function loadViteClientCode(file) {
+async function loadViteClientCode(file, disableViteTransport = false) {
     const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
-    const updatedContents = originalContents.replace(`"You can also disable this overlay by setting ",
+    let updatedContents = originalContents.replace(`"You can also disable this overlay by setting ",
       h("code", { part: "config-option-name" }, "server.hmr.overlay"),
       " to ",
       h("code", { part: "config-option-value" }, "false"),
@@ -117,5 +106,11 @@ async function loadViteClientCode(file) {
       h("code", { part: "config-file-name" }, hmrConfigName),
       "."`, '');
     (0, node_assert_1.default)(originalContents !== updatedContents, 'Failed to update Vite client error overlay text.');
+    if (disableViteTransport) {
+        const previousUpdatedContents = updatedContents;
+        updatedContents = updatedContents.replace('transport.connect(handleMessage)', '');
+        (0, node_assert_1.default)(previousUpdatedContents !== updatedContents, 'Failed to update Vite client WebSocket disable.');
+        updatedContents = updatedContents.replace('console.debug("[vite] connecting...")', '');
+    }
     return updatedContents;
 }

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '19.2.0-next.1';
+const VERSION = '19.2.0-next.2';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

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

@@ -11,6 +11,7 @@ exports.SERVER_APP_ENGINE_MANIFEST_FILENAME = exports.SERVER_APP_MANIFEST_FILENA
 exports.generateAngularServerAppEngineManifest = generateAngularServerAppEngineManifest;
 exports.generateAngularServerAppManifest = generateAngularServerAppManifest;
 const node_path_1 = require("node:path");
+const node_vm_1 = require("node:vm");
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const utils_1 = require("../../tools/esbuild/utils");
 const environment_options_1 = require("../environment-options");
@@ -115,9 +116,13 @@ function generateAngularServerAppManifest(additionalHtmlOutputFiles, outputFiles
         const extension = (0, node_path_1.extname)(file.path);
         if (extension === '.html' || (inlineCriticalCss && extension === '.css')) {
             const jsChunkFilePath = `assets-chunks/${file.path.replace(/[./]/g, '_')}.mjs`;
-            serverAssetsChunks.push((0, utils_1.createOutputFile)(jsChunkFilePath, `export default \`${escapeUnsafeChars(file.text)}\`;`, bundler_context_1.BuildOutputFileType.ServerApplication));
+            const escapedContent = escapeUnsafeChars(file.text);
+            serverAssetsChunks.push((0, utils_1.createOutputFile)(jsChunkFilePath, `export default \`${escapedContent}\`;`, bundler_context_1.BuildOutputFileType.ServerApplication));
+            // This is needed because JavaScript engines script parser convert `\r\n` to `\n` in template literals,
+            // which can result in an incorrect byte length.
+            const size = (0, node_vm_1.runInThisContext)(`new TextEncoder().encode(\`${escapedContent}\`).byteLength`);
             serverAssets[file.path] =
-                `{size: ${file.size}, hash: '${file.hash}', text: () => import('./${jsChunkFilePath}').then(m => m.default)}`;
+                `{size: ${size}, hash: '${file.hash}', text: () => import('./${jsChunkFilePath}').then(m => m.default)}`;
         }
     }
     // When routes have been extracted, mappings are no longer needed, as preloads will be included in the metadata.

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

@@ -128,11 +128,11 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
     try {
         const renderingPromises = [];
         const appShellRouteWithLeadingSlash = appShellRoute && addLeadingSlash(appShellRoute);
-        const baseHrefWithLeadingSlash = addLeadingSlash(baseHref);
+        const baseHrefPathnameWithLeadingSlash = new URL(baseHref, 'http://localhost').pathname;
         for (const { route, redirectTo } of serializableRouteTreeNode) {
             // Remove the base href from the file output path.
-            const routeWithoutBaseHref = addTrailingSlash(route).startsWith(baseHrefWithLeadingSlash)
-                ? addLeadingSlash(route.slice(baseHrefWithLeadingSlash.length))
+            const routeWithoutBaseHref = addTrailingSlash(route).startsWith(baseHrefPathnameWithLeadingSlash)
+                ? addLeadingSlash(route.slice(baseHrefPathnameWithLeadingSlash.length))
                 : route;
             const outPath = node_path_1.posix.join(removeLeadingSlash(routeWithoutBaseHref), 'index.html');
             if (typeof redirectTo === 'string') {

package/src/utils/version.js

@@ -29,8 +29,8 @@ function assertCompatibleAngularVersion(projectRoot) {
         process.exit(2);
     }
     const supportedAngularSemver = '^19.0.0 || ^19.2.0-next.0';
-    if (supportedAngularSemver.startsWith('0.0.0')) {
-        // Internal CLI testing version.
+    if (angularPkgJson['version'] === '0.0.0' || supportedAngularSemver.startsWith('0.0.0')) {
+        // Internal CLI and FW testing version.
         return;
     }
     const angularVersion = new semver_1.SemVer(angularPkgJson['version']);