@angular/build 19.1.6 → 19.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.1.6",
+  "version": "19.1.8",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,8 +23,8 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/core": "19.1.6",
-    "@angular-devkit/architect": "0.1901.6",
+    "@angular-devkit/core": "19.1.8",
+    "@angular-devkit/architect": "0.1901.8",
     "@babel/core": "7.26.0",
     "@babel/helper-annotate-as-pure": "7.25.9",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -58,7 +58,7 @@
     "@angular/localize": "^19.0.0",
     "@angular/platform-server": "^19.0.0",
     "@angular/service-worker": "^19.0.0",
-    "@angular/ssr": "^19.1.6",
+    "@angular/ssr": "^19.1.8",
     "less": "^4.2.0",
     "ng-packagr": "^19.0.0",
     "postcss": "^8.4.0",

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) {
@@ -191,10 +190,6 @@ async function executeBuild(options, context, rebuildState) {
     if (serverEntryPoint) {
         executionResult.addOutputFile(manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME, (0, manifest_1.generateAngularServerAppEngineManifest)(i18nOptions, baseHref), bundler_context_1.BuildOutputFileType.ServerRoot);
     }
-    // Override auto-CSP settings if we are serving through Vite middleware.
-    if (context.builder.builderName === 'dev-server' && options.security) {
-        options.security.autoCsp = false;
-    }
     // Perform i18n translation inlining if enabled
     if (i18nOptions.shouldInline) {
         const result = await (0, i18n_1.inlineI18n)(metafile, options, executionResult, initialFiles);
@@ -218,6 +213,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/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/application/options.d.ts

@@ -196,7 +196,11 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     partialSSRBuild: boolean;
     externalRuntimeStyles: boolean | undefined;
     instrumentForCoverage: ((filename: string) => boolean) | undefined;
-    security: import("./schema").Security | undefined;
+    security: {
+        autoCsp: {
+            unsafeEval: boolean;
+        } | undefined;
+    };
     templateUpdates: boolean;
     incrementalResults: boolean;
 }>;

package/src/builders/application/options.js

@@ -236,8 +236,16 @@ async function normalizeOptions(context, projectName, options, extensions) {
             throw new Error('The "index" option cannot be set to false when enabling "ssr", "prerender" or "app-shell".');
         }
     }
+    const autoCsp = options.security?.autoCsp;
+    const security = {
+        autoCsp: autoCsp
+            ? {
+                unsafeEval: autoCsp === true ? false : !!autoCsp.unsafeEval,
+            }
+            : undefined,
+    };
     // Initial options to keep
-    const { allowedCommonJsDependencies, aot = true, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, outputMode, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, namedChunks, budgets, deployUrl, clearScreen, define, partialSSRBuild = false, externalRuntimeStyles, instrumentForCoverage, security, } = options;
+    const { allowedCommonJsDependencies, aot = true, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, outputMode, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, namedChunks, budgets, deployUrl, clearScreen, define, partialSSRBuild = false, externalRuntimeStyles, instrumentForCoverage, } = options;
     // Return all the normalized options
     return {
         advancedOptimizations: !!aot && optimizationOptions.scripts,

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

@@ -82,6 +82,10 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
         browserOptions.prerender = undefined;
         browserOptions.ssr ||= true;
     }
+    // Disable auto CSP.
+    browserOptions.security = {
+        autoCsp: false,
+    };
     // Set all packages as external to support Vite's prebundle caching
     browserOptions.externalPackages = serverOptions.prebundle;
     // Disable generating a full manifest with routes.
@@ -530,6 +534,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
@@ -546,6 +551,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,
@@ -575,14 +588,10 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
             preserveSymlinks,
         },
         dev: {
-            // This is needed when `externalDependencies` is used to prevent Vite load errors.
-            // NOTE: If Vite adds direct support for externals, this can be removed.
-            // NOTE: Vite breaks the resolution of browser modules in SSR
-            //       when accessing a url with two or more segments (e.g., 'foo/bar'),
-            //       as they are not re-based from the base href.
-            preTransformRequests: externalMetadata.explicitBrowser.length === 0 && ssrMode === plugins_1.ServerSsrMode.NoSsr,
+            preTransformRequests,
         },
         server: {
+            preTransformRequests,
             warmup: {
                 ssrFiles,
             },
@@ -603,6 +612,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,
             },
@@ -660,7 +672,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/esbuild/angular/compiler-plugin.js

@@ -402,7 +402,7 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun
                     const replacement = pluginOptions.fileReplacements?.[path.normalize(args.path)];
                     if (replacement) {
                         return {
-                            contents: await Promise.resolve().then(() => __importStar(require('fs/promises'))).then(({ readFile }) => readFile(path.normalize(replacement))),
+                            contents: await Promise.resolve().then(() => __importStar(require('node:fs/promises'))).then(({ readFile }) => readFile(path.normalize(replacement))),
                             loader: 'json',
                             watchFiles: [replacement],
                         };

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/index-html-generator.js

@@ -59,13 +59,6 @@ async function generateIndexHtml(initialFiles, outputFiles, buildOptions, lang)
         }
         throw new Error(`Output file does not exist: ${relativefilePath}`);
     };
-    // Read the Auto CSP options.
-    const autoCsp = buildOptions.security?.autoCsp;
-    const autoCspOptions = autoCsp === true
-        ? { unsafeEval: false }
-        : autoCsp
-            ? { unsafeEval: !!autoCsp.unsafeEval }
-            : undefined;
     // Create an index HTML generator that reads from the in-memory output files
     const indexHtmlGenerator = new index_html_generator_1.IndexHtmlGenerator({
         indexPath: indexHtmlOptions.input,
@@ -78,7 +71,7 @@ async function generateIndexHtml(initialFiles, outputFiles, buildOptions, lang)
         generateDedicatedSSRContent: !!(buildOptions.ssrOptions ||
             buildOptions.prerenderOptions ||
             buildOptions.appShellOptions),
-        autoCsp: autoCspOptions,
+        autoCsp: buildOptions.security.autoCsp,
     });
     indexHtmlGenerator.readAsset = readAsset;
     return indexHtmlGenerator.process({

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/middlewares/html-fallback-middleware.js

@@ -20,7 +20,8 @@ function angularHtmlFallbackMiddleware(req, _res, next) {
     }
     if (req.url) {
         const mimeType = (0, utils_1.lookupMimeTypeFromRequest)(req.url);
-        if (mimeType === 'text/html' || mimeType === 'application/xhtml+xml') {
+        if ((mimeType === 'text/html' || mimeType === 'application/xhtml+xml') &&
+            !/^\/index\.(?:csr\.)?html/.test(req.url)) {
             // eslint-disable-next-line no-console
             console.warn(`Request for HTML file "${req.url}" was received but no asset found. Asset may be missing from build.`);
         }

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

@@ -73,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;
             }
@@ -96,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"),
@@ -106,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/error.js

@@ -11,10 +11,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertIsError = assertIsError;
-const assert_1 = __importDefault(require("assert"));
+const node_assert_1 = __importDefault(require("node:assert"));
 function assertIsError(value) {
     const isError = value instanceof Error ||
         // The following is needing to identify errors coming from RxJs.
         (typeof value === 'object' && value && 'name' in value && 'message' in value);
-    (0, assert_1.default)(isError, 'catch clause variable is not an Error instance');
+    (0, node_assert_1.default)(isError, 'catch clause variable is not an Error instance');
 }

package/src/utils/index-file/auto-csp.js

@@ -112,7 +112,7 @@ async function autoCsp(html, unsafeEval = false) {
         rewriter.emitRaw(`<script>${loaderScript}</script>`);
         scriptContent = [];
     }
-    rewriter.on('startTag', (tag, html) => {
+    rewriter.on('startTag', (tag) => {
         if (tag.tagName === 'script') {
             openedScriptTag = tag;
             const src = getScriptAttributeValue(tag, 'src');

package/src/utils/index-file/index-html-generator.js

@@ -32,7 +32,7 @@ class IndexHtmlGenerator {
         this.plugins = [augmentIndexHtmlPlugin(this), ...extraCommonPlugins, postTransformPlugin(this)];
         // CSR plugins
         if (options?.optimization?.styles?.inlineCritical) {
-            this.csrPlugins.push(inlineCriticalCssPlugin(this));
+            this.csrPlugins.push(inlineCriticalCssPlugin(this, !!options.autoCsp));
         }
         this.csrPlugins.push(addNoncePlugin());
         // SSR plugins
@@ -127,11 +127,12 @@ function inlineFontsPlugin({ options }) {
     });
     return async (html) => inlineFontsProcessor.process(html);
 }
-function inlineCriticalCssPlugin(generator) {
+function inlineCriticalCssPlugin(generator, autoCsp) {
     const inlineCriticalCssProcessor = new inline_critical_css_1.InlineCriticalCssProcessor({
         minify: generator.options.optimization?.styles.minify,
         deployUrl: generator.options.deployUrl,
         readAsset: (filePath) => generator.readAsset(filePath),
+        autoCsp,
     });
     return async (html, options) => inlineCriticalCssProcessor.process(html, { outputPath: options.outputPath });
 }

package/src/utils/index-file/inline-critical-css.d.ts

@@ -12,6 +12,7 @@ export interface InlineCriticalCssProcessorOptions {
     minify?: boolean;
     deployUrl?: string;
     readAsset?: (path: string) => Promise<string>;
+    autoCsp?: boolean;
 }
 export declare class InlineCriticalCssProcessor {
     protected readonly options: InlineCriticalCssProcessorOptions;

package/src/utils/index-file/inline-critical-css.js

@@ -113,7 +113,7 @@ class BeastiesExtended extends BeastiesBase {
         }
         const returnValue = await super.embedLinkedStylesheet(link, document);
         const cspNonce = this.findCspNonce(document);
-        if (cspNonce) {
+        if (cspNonce || this.optionsExtended.autoCsp) {
             const beastiesMedia = link.getAttribute('onload')?.match(MEDIA_SET_HANDLER_PATTERN);
             if (beastiesMedia) {
                 // If there's a Beasties-generated `onload` handler and the file has an Angular CSP nonce,
@@ -128,11 +128,13 @@ class BeastiesExtended extends BeastiesBase {
             // a way of doing that at the moment so we fall back to doing it any time a `link` tag is
             // inserted. We mitigate it by only iterating the direct children of the `<head>` which
             // should be pretty shallow.
-            document.head.children.forEach((child) => {
-                if (child.tagName === 'style' && !child.hasAttribute('nonce')) {
-                    child.setAttribute('nonce', cspNonce);
-                }
-            });
+            if (cspNonce) {
+                document.head.children.forEach((child) => {
+                    if (child.tagName === 'style' && !child.hasAttribute('nonce')) {
+                        child.setAttribute('nonce', cspNonce);
+                    }
+                });
+            }
         }
         return returnValue;
     }
@@ -159,8 +161,10 @@ class BeastiesExtended extends BeastiesBase {
             return;
         }
         const script = document.createElement('script');
-        script.setAttribute('nonce', nonce);
         script.textContent = LINK_LOAD_SCRIPT_CONTENT;
+        if (nonce) {
+            script.setAttribute('nonce', nonce);
+        }
         // Prepend the script to the head since it needs to
         // run as early as possible, before the `link` tags.
         document.head.insertBefore(script, link);

package/src/utils/load-translations.js

@@ -41,8 +41,8 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTranslationLoader = createTranslationLoader;
-const crypto_1 = require("crypto");
-const fs = __importStar(require("fs"));
+const node_crypto_1 = require("node:crypto");
+const fs = __importStar(require("node:fs"));
 const load_esm_1 = require("./load-esm");
 async function createTranslationLoader() {
     const { parsers, diagnostics } = await importParsers();
@@ -55,7 +55,7 @@ async function createTranslationLoader() {
                 // Types don't overlap here so we need to use any.
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const { locale, translations } = parser.parse(path, content, analysis.hint);
-                const integrity = 'sha256-' + (0, crypto_1.createHash)('sha256').update(content).digest('base64');
+                const integrity = 'sha256-' + (0, node_crypto_1.createHash)('sha256').update(content).digest('base64');
                 return { format, locale, translations, diagnostics, integrity };
             }
             else {

package/src/utils/normalize-asset-patterns.js

@@ -45,9 +45,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MissingAssetSourceRootException = void 0;
 exports.normalizeAssetPatterns = normalizeAssetPatterns;
-const fs_1 = require("fs");
 const node_assert_1 = __importDefault(require("node:assert"));
-const path = __importStar(require("path"));
+const node_fs_1 = require("node:fs");
+const path = __importStar(require("node:path"));
 class MissingAssetSourceRootException extends Error {
     constructor(path) {
         super(`The ${path} asset path must start with the project source root.`);
@@ -73,7 +73,7 @@ function normalizeAssetPatterns(assetPatterns, workspaceRoot, projectRoot, proje
             let glob, input;
             let isDirectory = false;
             try {
-                isDirectory = (0, fs_1.statSync)(resolvedAssetPath).isDirectory();
+                isDirectory = (0, node_fs_1.statSync)(resolvedAssetPath).isDirectory();
             }
             catch {
                 isDirectory = true;

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.1.6';
+const VERSION = '19.1.8';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

package/src/utils/server-rendering/esm-in-memory-loader/loader-hooks.js

@@ -17,7 +17,6 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
-const url_1 = require("url");
 const javascript_transformer_1 = require("../../../tools/esbuild/javascript-transformer");
 /**
  * @note For some unknown reason, setting `globalThis.ngServerMode = true` does not work when using ESM loader hooks.
@@ -110,7 +109,7 @@ async function load(url, context, nextLoad) {
     // Only module files potentially require transformation. Angular libraries that would
     // need linking are ESM only.
     if (format === 'module' && isFileProtocol(url)) {
-        const filePath = (0, url_1.fileURLToPath)(url);
+        const filePath = (0, node_url_1.fileURLToPath)(url);
         let source = await javascriptTransformer.transformFile(filePath);
         if (filePath.includes('@angular/')) {
             // Prepend 'var ngServerMode=true;' to the source.

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/server-rendering/render-worker.js

@@ -7,14 +7,14 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const worker_threads_1 = require("worker_threads");
+const node_worker_threads_1 = require("node:worker_threads");
 const fetch_patch_1 = require("./fetch-patch");
 const launch_server_1 = require("./launch-server");
 const load_esm_from_memory_1 = require("./load-esm-from-memory");
 /**
  * This is passed as workerData when setting up the worker via the `piscina` package.
  */
-const { outputMode, hasSsrEntry } = worker_threads_1.workerData;
+const { outputMode, hasSsrEntry } = node_worker_threads_1.workerData;
 let serverURL = launch_server_1.DEFAULT_URL;
 /**
  * Renders each route in routes and writes them to <outputPath>/<route>/index.html.

package/src/utils/server-rendering/routes-extractor-worker.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const worker_threads_1 = require("worker_threads");
+const node_worker_threads_1 = require("node:worker_threads");
 const schema_1 = require("../../builders/application/schema");
 const fetch_patch_1 = require("./fetch-patch");
 const launch_server_1 = require("./launch-server");
@@ -15,7 +15,7 @@ const load_esm_from_memory_1 = require("./load-esm-from-memory");
 /**
  * This is passed as workerData when setting up the worker via the `piscina` package.
  */
-const { outputMode, hasSsrEntry } = worker_threads_1.workerData;
+const { outputMode, hasSsrEntry } = node_worker_threads_1.workerData;
 /** Renders an application based on a provided options. */
 async function extractRoutes() {
     const serverURL = outputMode !== undefined && hasSsrEntry ? await (0, launch_server_1.launchServer)() : launch_server_1.DEFAULT_URL;

package/src/utils/service-worker.js

@@ -43,9 +43,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.augmentAppWithServiceWorker = augmentAppWithServiceWorker;
 exports.augmentAppWithServiceWorkerEsbuild = augmentAppWithServiceWorkerEsbuild;
 exports.augmentAppWithServiceWorkerCore = augmentAppWithServiceWorkerCore;
-const crypto = __importStar(require("crypto"));
+const crypto = __importStar(require("node:crypto"));
 const node_fs_1 = require("node:fs");
-const path = __importStar(require("path"));
+const path = __importStar(require("node:path"));
 const bundler_context_1 = require("../tools/esbuild/bundler-context");
 const error_1 = require("./error");
 const load_esm_1 = require("./load-esm");