@angular/build 19.2.0-next.1 → 19.2.0-rc.0

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/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/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

@@ -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/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.2.0-next.1';
+const VERSION = '19.2.0-rc.0';
 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.