@angular/build 19.0.1 → 19.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.0.1",
+  "version": "19.0.3",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,7 +23,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1900.1",
+    "@angular-devkit/architect": "0.1900.3",
     "@babel/core": "7.26.0",
     "@babel/helper-annotate-as-pure": "7.25.9",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -57,7 +57,7 @@
     "@angular/localize": "^19.0.0",
     "@angular/platform-server": "^19.0.0",
     "@angular/service-worker": "^19.0.0",
-    "@angular/ssr": "^19.0.1",
+    "@angular/ssr": "^19.0.3",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",

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

@@ -37,7 +37,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
     const allErrors = [];
     const allWarnings = [];
     const prerenderedRoutes = {};
-    const { baseHref = '/', serviceWorker, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, workspaceRoot, partialSSRBuild, } = options;
+    const { baseHref = '/', serviceWorker, i18nOptions, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, 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.
@@ -56,7 +56,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
     }
     // Create server manifest
     if (serverEntryPoint) {
-        const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale);
+        const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale, baseHref);
         additionalOutputFiles.push(...serverAssetsChunks, (0, utils_1.createOutputFile)(manifest_1.SERVER_APP_MANIFEST_FILENAME, manifestContent, bundler_context_1.BuildOutputFileType.ServerApplication));
     }
     // Pre-render (SSG) and App-shell
@@ -95,7 +95,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
             // Regenerate the manifest to append route tree. This is only needed if SSR is enabled.
             const manifest = additionalOutputFiles.find((f) => f.path === manifest_1.SERVER_APP_MANIFEST_FILENAME);
             (0, node_assert_1.default)(manifest, `${manifest_1.SERVER_APP_MANIFEST_FILENAME} was not found in output files.`);
-            const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNodeForManifest, locale);
+            const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNodeForManifest, locale, baseHref);
             for (const chunk of serverAssetsChunks) {
                 const idx = additionalOutputFiles.findIndex(({ path }) => path === chunk.path);
                 if (idx === -1) {

package/src/builders/application/options.js

@@ -194,24 +194,25 @@ async function normalizeOptions(context, projectName, options, extensions) {
         let indexOutput;
         // The output file will be created within the configured output path
         if (typeof options.index === 'string') {
-            /**
-             * If SSR is activated, create a distinct entry file for the `index.html`.
-             * This is necessary because numerous server/cloud providers automatically serve the `index.html` as a static file
-             * if it exists (handling SSG).
-             *
-             * For instance, accessing `foo.com/` would lead to `foo.com/index.html` being served instead of hitting the server.
-             *
-             * This approach can also be applied to service workers, where the `index.csr.html` is served instead of the prerendered `index.html`.
-             */
-            const indexBaseName = node_path_1.default.basename(options.index);
-            indexOutput =
-                (ssrOptions || prerenderOptions) && indexBaseName === 'index.html'
-                    ? exports.INDEX_HTML_CSR
-                    : indexBaseName;
+            indexOutput = options.index;
         }
         else {
             indexOutput = options.index.output || 'index.html';
         }
+        /**
+         * If SSR is activated, create a distinct entry file for the `index.html`.
+         * This is necessary because numerous server/cloud providers automatically serve the `index.html` as a static file
+         * if it exists (handling SSG).
+         *
+         * For instance, accessing `foo.com/` would lead to `foo.com/index.html` being served instead of hitting the server.
+         *
+         * This approach can also be applied to service workers, where the `index.csr.html` is served instead of the prerendered `index.html`.
+         */
+        const indexBaseName = node_path_1.default.basename(indexOutput);
+        indexOutput =
+            (ssrOptions || prerenderOptions) && indexBaseName === 'index.html'
+                ? exports.INDEX_HTML_CSR
+                : indexBaseName;
         indexHtmlOptions = {
             input: node_path_1.default.join(workspaceRoot, typeof options.index === 'string' ? options.index : options.index.input),
             output: indexOutput,

package/src/private.d.ts

@@ -11,6 +11,8 @@
  * All exports are not supported for external use, do not provide SemVer guarantees, and
  * their existence may change in any future version.
  */
+import { CompilerPluginOptions } from './tools/esbuild/angular/compiler-plugin';
+import { BundleStylesheetOptions } from './tools/esbuild/stylesheets/bundle-options';
 export { buildApplicationInternal } from './builders/application';
 export type { ApplicationBuilderInternalOptions } from './builders/application/options';
 export { type Result, type ResultFile, ResultKind } from './builders/application/results';
@@ -23,7 +25,9 @@ export { SassWorkerImplementation } from './tools/sass/sass-service';
 export { SourceFileCache } from './tools/esbuild/angular/source-file-cache';
 export { createJitResourceTransformer } from './tools/angular/transformers/jit-resource-transformer';
 export { JavaScriptTransformer } from './tools/esbuild/javascript-transformer';
-export { createCompilerPlugin } from './tools/esbuild/angular/compiler-plugin';
+export declare function createCompilerPlugin(pluginOptions: CompilerPluginOptions, styleOptions: BundleStylesheetOptions & {
+    inlineStyleLanguage: string;
+}): import('esbuild').Plugin;
 export * from './utils/bundle-calculator';
 export { checkPort } from './utils/check-port';
 export { deleteOutputDir } from './utils/delete-output-dir';

package/src/private.js

@@ -21,13 +21,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.createCompilerPlugin = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.serveWithVite = exports.ResultKind = exports.buildApplicationInternal = void 0;
+exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.serveWithVite = exports.ResultKind = exports.buildApplicationInternal = void 0;
+exports.createCompilerPlugin = createCompilerPlugin;
 /**
  * @fileoverview
  * Private exports intended only for use with the @angular-devkit/build-angular package.
  * All exports are not supported for external use, do not provide SemVer guarantees, and
  * their existence may change in any future version.
  */
+const compiler_plugin_1 = require("./tools/esbuild/angular/compiler-plugin");
+const component_stylesheets_1 = require("./tools/esbuild/angular/component-stylesheets");
 // Builders
 var application_1 = require("./builders/application");
 Object.defineProperty(exports, "buildApplicationInternal", { enumerable: true, get: function () { return application_1.buildApplicationInternal; } });
@@ -49,8 +52,9 @@ var jit_resource_transformer_1 = require("./tools/angular/transformers/jit-resou
 Object.defineProperty(exports, "createJitResourceTransformer", { enumerable: true, get: function () { return jit_resource_transformer_1.createJitResourceTransformer; } });
 var javascript_transformer_1 = require("./tools/esbuild/javascript-transformer");
 Object.defineProperty(exports, "JavaScriptTransformer", { enumerable: true, get: function () { return javascript_transformer_1.JavaScriptTransformer; } });
-var compiler_plugin_1 = require("./tools/esbuild/angular/compiler-plugin");
-Object.defineProperty(exports, "createCompilerPlugin", { enumerable: true, get: function () { return compiler_plugin_1.createCompilerPlugin; } });
+function createCompilerPlugin(pluginOptions, styleOptions) {
+    return (0, compiler_plugin_1.createCompilerPlugin)(pluginOptions, new component_stylesheets_1.ComponentStylesheetBundler(styleOptions, styleOptions.inlineStyleLanguage, pluginOptions.incremental));
+}
 // Utilities
 __exportStar(require("./utils/bundle-calculator"), exports);
 var check_port_1 = require("./utils/check-port");

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

@@ -386,6 +386,22 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                     };
                 }, true);
             }));
+            // Add a load handler if there are file replacement option entries for JSON files
+            if (pluginOptions.fileReplacements &&
+                Object.keys(pluginOptions.fileReplacements).some((value) => value.endsWith('.json'))) {
+                build.onLoad({ filter: /\.json$/ }, (0, load_result_cache_1.createCachedLoad)(pluginOptions.loadResultCache, async (args) => {
+                    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))),
+                            loader: 'json',
+                            watchFiles: [replacement],
+                        };
+                    }
+                    // If no replacement defined, let esbuild handle it directly
+                    return null;
+                }));
+            }
             // Setup bundling of component templates and stylesheets when in JIT mode
             if (pluginOptions.jit) {
                 (0, jit_plugin_callbacks_1.setupJitPluginCallbacks)(build, stylesheetBundler, additionalResults, pluginOptions.loadResultCache);

package/src/tools/esbuild/application-code-bundle.js

@@ -171,7 +171,6 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache, sty
     return (loadResultCache) => {
         const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache, loadResultCache);
         const mainServerNamespace = 'angular:main-server';
-        const mainServerInjectPolyfillsNamespace = 'angular:main-server-inject-polyfills';
         const mainServerInjectManifestNamespace = 'angular:main-server-inject-manifest';
         const zoneless = (0, utils_1.isZonelessApp)(polyfills);
         const entryPoints = {
@@ -187,7 +186,9 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache, sty
         const buildOptions = {
             ...getEsBuildServerCommonOptions(options),
             target,
-            inject: [mainServerInjectPolyfillsNamespace, mainServerInjectManifestNamespace],
+            banner: {
+                js: `import './polyfills.server.mjs';`,
+            },
             entryPoints,
             supported: (0, utils_1.getFeatureSupport)(target, zoneless),
             plugins: [
@@ -217,16 +218,9 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache, sty
             buildOptions.external.push('xhr2');
         }
         buildOptions.plugins.push((0, server_bundle_metadata_plugin_1.createServerBundleMetadata)(), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-            namespace: mainServerInjectPolyfillsNamespace,
-            cache: loadResultCache,
-            loadContent: () => ({
-                contents: `import './polyfills.server.mjs';`,
-                loader: 'js',
-                resolveDir: workspaceRoot,
-            }),
-        }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
             namespace: mainServerInjectManifestNamespace,
             cache: loadResultCache,
+            entryPointOnly: false,
             loadContent: async () => {
                 const contents = [
                     // Configure `@angular/ssr` manifest.
@@ -246,15 +240,17 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache, sty
             loadContent: async () => {
                 const mainServerEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, mainServerEntryPoint);
                 const contents = [
+                    // Inject manifest
+                    `import '${mainServerInjectManifestNamespace}';`,
+                    // Add @angular/ssr exports
+                    `export {
+              ɵdestroyAngularServerApp,
+              ɵextractRoutesAndCreateRouteTree,
+              ɵgetOrCreateAngularServerApp,
+            } from '@angular/ssr';`,
                     // Re-export all symbols including default export from 'main.server.ts'
                     `export { default } from '${mainServerEntryPointJsImport}';`,
                     `export * from '${mainServerEntryPointJsImport}';`,
-                    // Add @angular/ssr exports
-                    `export {
-            ɵdestroyAngularServerApp,
-            ɵextractRoutesAndCreateRouteTree,
-            ɵgetOrCreateAngularServerApp,
-          } from '@angular/ssr';`,
                 ];
                 return {
                     contents: contents.join('\n'),
@@ -277,17 +273,21 @@ function createSsrEntryCodeBundleOptions(options, target, sourceFileCache, style
         const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache, loadResultCache);
         const ssrEntryNamespace = 'angular:ssr-entry';
         const ssrInjectManifestNamespace = 'angular:ssr-entry-inject-manifest';
-        const ssrInjectRequireNamespace = 'angular:ssr-entry-inject-require';
         const isNodePlatform = options.ssrOptions?.platform !== schema_1.ExperimentalPlatform.Neutral;
-        const inject = [ssrInjectManifestNamespace];
-        if (isNodePlatform) {
-            inject.unshift(ssrInjectRequireNamespace);
-        }
         const buildOptions = {
             ...getEsBuildServerCommonOptions(options),
             target,
+            banner: isNodePlatform
+                ? {
+                    js: [
+                        // Note: Needed as esbuild does not provide require shims / proxy from ESModules.
+                        // See: https://github.com/evanw/esbuild/issues/1921.
+                        `import { createRequire } from 'node:module';`,
+                        `globalThis['require'] ??= createRequire(import.meta.url);`,
+                    ].join('\n'),
+                }
+                : undefined,
             entryPoints: {
-                // TODO: consider renaming to index
                 'server': ssrEntryNamespace,
             },
             supported: (0, utils_1.getFeatureSupport)(target, true),
@@ -299,7 +299,6 @@ function createSsrEntryCodeBundleOptions(options, target, sourceFileCache, style
                 // Component stylesheet bundler
                 stylesheetBundler),
             ],
-            inject,
         };
         buildOptions.plugins ??= [];
         if (externalPackages) {
@@ -317,24 +316,9 @@ function createSsrEntryCodeBundleOptions(options, target, sourceFileCache, style
             buildOptions.external.push('xhr2');
         }
         buildOptions.plugins.push((0, server_bundle_metadata_plugin_1.createServerBundleMetadata)({ ssrEntryBundle: true }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
-            namespace: ssrInjectRequireNamespace,
-            cache: loadResultCache,
-            loadContent: () => {
-                const contents = [
-                    // Note: Needed as esbuild does not provide require shims / proxy from ESModules.
-                    // See: https://github.com/evanw/esbuild/issues/1921.
-                    `import { createRequire } from 'node:module';`,
-                    `globalThis['require'] ??= createRequire(import.meta.url);`,
-                ];
-                return {
-                    contents: contents.join('\n'),
-                    loader: 'js',
-                    resolveDir: workspaceRoot,
-                };
-            },
-        }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
             namespace: ssrInjectManifestNamespace,
             cache: loadResultCache,
+            entryPointOnly: false,
             loadContent: () => {
                 const contents = [
                     // Configure `@angular/ssr` app engine manifest.
@@ -354,6 +338,8 @@ function createSsrEntryCodeBundleOptions(options, target, sourceFileCache, style
             loadContent: () => {
                 const serverEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, serverEntryPoint);
                 const contents = [
+                    // Configure `@angular/ssr` app engine manifest.
+                    `import '${ssrInjectManifestNamespace}';`,
                     // Re-export all symbols including default export
                     `import * as server from '${serverEntryPointJsImport}';`,
                     `export * from '${serverEntryPointJsImport}';`,

package/src/tools/esbuild/global-scripts.js

@@ -49,7 +49,7 @@ const virtual_module_plugin_1 = require("./virtual-module-plugin");
  * @returns An esbuild BuildOptions object.
  */
 function createGlobalScriptsBundleOptions(options, target, initial) {
-    const { globalScripts, optimizationOptions, outputNames, preserveSymlinks, sourcemapOptions, jsonLogs, workspaceRoot, } = options;
+    const { globalScripts, optimizationOptions, outputNames, preserveSymlinks, sourcemapOptions, jsonLogs, workspaceRoot, define, } = options;
     const namespace = 'angular:script/global';
     const entryPoints = {};
     let found = false;
@@ -83,6 +83,7 @@ function createGlobalScriptsBundleOptions(options, target, initial) {
             platform: 'neutral',
             target,
             preserveSymlinks,
+            define,
             plugins: [
                 (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
                 (0, virtual_module_plugin_1.createVirtualModulePlugin)({

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

@@ -21,7 +21,7 @@ const valid_self_closing_tags_1 = require("./valid-self-closing-tags");
  */
 // eslint-disable-next-line max-lines-per-function
 async function augmentIndexHtml(params) {
-    const { loadOutputFile, files, entrypoints, sri, deployUrl = '', lang, baseHref, html, imageDomains, } = params;
+    const { loadOutputFile, files, entrypoints, sri, deployUrl, lang, baseHref, html, imageDomains } = params;
     const warnings = [];
     const errors = [];
     let { crossOrigin = 'none' } = params;
@@ -57,7 +57,7 @@ async function augmentIndexHtml(params) {
     }
     let scriptTags = [];
     for (const [src, isModule] of scripts) {
-        const attrs = [`src="${deployUrl}${src}"`];
+        const attrs = [`src="${generateUrl(src, deployUrl)}"`];
         // This is also need for non entry-points as they may contain problematic code.
         if (isModule) {
             attrs.push('type="module"');
@@ -77,7 +77,7 @@ async function augmentIndexHtml(params) {
     let headerLinkTags = [];
     let bodyLinkTags = [];
     for (const src of stylesheets) {
-        const attrs = [`rel="stylesheet"`, `href="${deployUrl}${src}"`];
+        const attrs = [`rel="stylesheet"`, `href="${generateUrl(src, deployUrl)}"`];
         if (crossOrigin !== 'none') {
             attrs.push(`crossorigin="${crossOrigin}"`);
         }
@@ -89,7 +89,7 @@ async function augmentIndexHtml(params) {
     }
     if (params.hints?.length) {
         for (const hint of params.hints) {
-            const attrs = [`rel="${hint.mode}"`, `href="${deployUrl}${hint.url}"`];
+            const attrs = [`rel="${hint.mode}"`, `href="${generateUrl(hint.url, deployUrl)}"`];
             if (hint.mode !== 'modulepreload' && crossOrigin !== 'none') {
                 // Value is considered anonymous by the browser when not present or empty
                 attrs.push(crossOrigin === 'anonymous' ? 'crossorigin' : `crossorigin="${crossOrigin}"`);
@@ -215,6 +215,16 @@ function generateSriAttributes(content) {
     const hash = (0, node_crypto_1.createHash)(algo).update(content, 'utf8').digest('base64');
     return `integrity="${algo}-${hash}"`;
 }
+function generateUrl(value, deployUrl) {
+    if (!deployUrl) {
+        return value;
+    }
+    // Skip if root-relative, absolute or protocol relative url
+    if (/^((?:\w+:)?\/\/|data:|chrome:|\/)/.test(value)) {
+        return value;
+    }
+    return `${deployUrl}${value}`;
+}
 function updateAttribute(tag, name, value) {
     const index = tag.attrs.findIndex((a) => a.name === name);
     const newValue = { name, value };

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

package/src/utils/server-rendering/manifest.d.ts

@@ -40,12 +40,14 @@ export declare function generateAngularServerAppEngineManifest(i18nOptions: Norm
  * server-side rendering and routing.
  * @param locale - An optional string representing the locale or language code to be used for
  * the application, helping with localization and rendering content specific to the locale.
+ * @param baseHref - The base HREF for the application. This is used to set the base URL
+ * for all relative URLs in the application.
  *
  * @returns An object containing:
  * - `manifestContent`: A string of the SSR manifest content.
  * - `serverAssetsChunks`: An array of build output files containing the generated assets for the server.
  */
-export declare function generateAngularServerAppManifest(additionalHtmlOutputFiles: Map<string, BuildOutputFile>, outputFiles: BuildOutputFile[], inlineCriticalCss: boolean, routes: readonly unknown[] | undefined, locale: string | undefined): {
+export declare function generateAngularServerAppManifest(additionalHtmlOutputFiles: Map<string, BuildOutputFile>, outputFiles: BuildOutputFile[], inlineCriticalCss: boolean, routes: readonly unknown[] | undefined, locale: string | undefined, baseHref: string): {
     manifestContent: string;
     serverAssetsChunks: BuildOutputFile[];
 };

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

@@ -48,7 +48,7 @@ function escapeUnsafeChars(str) {
  * for all relative URLs in the application.
  */
 function generateAngularServerAppEngineManifest(i18nOptions, baseHref) {
-    const entryPointsContent = [];
+    const entryPoints = {};
     if (i18nOptions.shouldInline) {
         for (const locale of i18nOptions.inlineLocales) {
             const importPath = './' + (i18nOptions.flatOutput ? '' : locale + '/') + MAIN_SERVER_OUTPUT_FILENAME;
@@ -57,18 +57,22 @@ function generateAngularServerAppEngineManifest(i18nOptions, baseHref) {
             const start = localeWithBaseHref[0] === '/' ? 1 : 0;
             const end = localeWithBaseHref[localeWithBaseHref.length - 1] === '/' ? -1 : undefined;
             localeWithBaseHref = localeWithBaseHref.slice(start, end);
-            entryPointsContent.push(`['${localeWithBaseHref}', () => import('${importPath}')]`);
+            entryPoints[localeWithBaseHref] = `() => import('${importPath}')`;
         }
     }
     else {
-        entryPointsContent.push(`['', () => import('./${MAIN_SERVER_OUTPUT_FILENAME}')]`);
+        entryPoints[''] = `() => import('./${MAIN_SERVER_OUTPUT_FILENAME}')`;
     }
     const manifestContent = `
 export default {
   basePath: '${baseHref ?? '/'}',
-  entryPoints: new Map([${entryPointsContent.join(', \n')}]),
+  entryPoints: {
+    ${Object.entries(entryPoints)
+        .map(([key, value]) => `'${key}': ${value}`)
+        .join(',\n    ')}
+  },
 };
-  `;
+`;
     return manifestContent;
 }
 /**
@@ -89,29 +93,37 @@ export default {
  * server-side rendering and routing.
  * @param locale - An optional string representing the locale or language code to be used for
  * the application, helping with localization and rendering content specific to the locale.
+ * @param baseHref - The base HREF for the application. This is used to set the base URL
+ * for all relative URLs in the application.
  *
  * @returns An object containing:
  * - `manifestContent`: A string of the SSR manifest content.
  * - `serverAssetsChunks`: An array of build output files containing the generated assets for the server.
  */
-function generateAngularServerAppManifest(additionalHtmlOutputFiles, outputFiles, inlineCriticalCss, routes, locale) {
+function generateAngularServerAppManifest(additionalHtmlOutputFiles, outputFiles, inlineCriticalCss, routes, locale, baseHref) {
     const serverAssetsChunks = [];
-    const serverAssetsContent = [];
+    const serverAssets = {};
     for (const file of [...additionalHtmlOutputFiles.values(), ...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));
-            serverAssetsContent.push(`['${file.path}', {size: ${file.size}, hash: '${file.hash}', text: () => import('./${jsChunkFilePath}').then(m => m.default)}]`);
+            serverAssets[file.path] =
+                `{size: ${file.size}, hash: '${file.hash}', text: () => import('./${jsChunkFilePath}').then(m => m.default)}`;
         }
     }
     const manifestContent = `
 export default {
   bootstrap: () => import('./main.server.mjs').then(m => m.default),
   inlineCriticalCss: ${inlineCriticalCss},
+  baseHref: '${baseHref}',
+  locale: ${JSON.stringify(locale)},
   routes: ${JSON.stringify(routes, undefined, 2)},
-  assets: new Map([\n${serverAssetsContent.join(', \n')}\n]),
-  locale: ${locale !== undefined ? `'${locale}'` : undefined},
+  assets: {
+    ${Object.entries(serverAssets)
+        .map(([key, value]) => `'${key}': ${value}`)
+        .join(',\n    ')}
+  },
 };
 `;
     return { manifestContent, serverAssetsChunks };

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

@@ -90,7 +90,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         };
     }
     // Render routes
-    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions, outputMode, appShellRoute ?? appShellOptions?.route);
+    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, outputMode, appShellRoute ?? appShellOptions?.route);
     errors.push(...renderingErrors);
     return {
         errors,
@@ -99,7 +99,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         serializableRouteTreeNode,
     };
 }
-async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions, outputMode, appShellRoute) {
+async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, outputMode, appShellRoute) {
     const output = {};
     const errors = [];
     const workerExecArgv = [utils_1.IMPORT_EXEC_ARGV];
@@ -125,7 +125,7 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
         for (const { route, redirectTo, renderMode } of serializableRouteTreeNode) {
             // Remove the base href from the file output path.
             const routeWithoutBaseHref = addTrailingSlash(route).startsWith(baseHrefWithLeadingSlash)
-                ? addLeadingSlash(route.slice(baseHrefWithLeadingSlash.length - 1))
+                ? addLeadingSlash(route.slice(baseHrefWithLeadingSlash.length))
                 : route;
             const outPath = node_path_1.posix.join(removeLeadingSlash(routeWithoutBaseHref), 'index.html');
             if (typeof redirectTo === 'string') {

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

@@ -21,7 +21,12 @@ async function extractRoutes() {
     const serverURL = outputMode !== undefined && hasSsrEntry ? await (0, launch_server_1.launchServer)() : launch_server_1.DEFAULT_URL;
     (0, fetch_patch_1.patchFetchToLoadInMemoryAssets)(serverURL);
     const { ɵextractRoutesAndCreateRouteTree: extractRoutesAndCreateRouteTree } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./main.server.mjs');
-    const { routeTree, appShellRoute, errors } = await extractRoutesAndCreateRouteTree(serverURL, undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
+    const { routeTree, appShellRoute, errors } = await extractRoutesAndCreateRouteTree({
+        url: serverURL,
+        invokeGetPrerenderParams: outputMode !== undefined,
+        includePrerenderFallbackRoutes: outputMode === schema_1.OutputMode.Server,
+        signal: AbortSignal.timeout(30_000),
+    });
     return {
         errors,
         appShellRoute,