@angular/build 19.0.0-rc.0 → 19.0.0-rc.2

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

@@ -10,12 +10,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prerenderPages = prerenderPages;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
-const node_url_1 = require("node:url");
 const schema_1 = require("../../builders/application/schema");
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const error_1 = require("../error");
 const url_1 = require("../url");
 const worker_pool_1 = require("../worker-pool");
+const utils_1 = require("./esm-in-memory-loader/utils");
 const models_1 = require("./models");
 async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerenderOptions, outputFiles, assets, outputMode, sourcemap = false, maxThreads = 1) {
     const outputFilesForWorker = {};
@@ -51,12 +51,11 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         assetsReversed[addLeadingSlash(destination.replace(/\\/g, node_path_1.posix.sep))] = source;
     }
     // Get routes to prerender
-    const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, outputMode).catch((err) => {
+    const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode, appShellRoute, } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, outputMode).catch((err) => {
         return {
-            errors: [
-                `An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err}`,
-            ],
+            errors: [`An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err}`],
             serializedRouteTree: [],
+            appShellRoute: undefined,
         };
     });
     errors.push(...extractionErrors);
@@ -73,7 +72,6 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         switch (metadata.renderMode) {
             case undefined: /* Legacy building mode */
             case models_1.RouteRenderMode.Prerender:
-            case models_1.RouteRenderMode.AppShell:
                 serializableRouteTreeNodeForPrerender.push(metadata);
                 break;
             case models_1.RouteRenderMode.Server:
@@ -92,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);
+    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions, outputMode, appShellRoute ?? appShellOptions?.route);
     errors.push(...renderingErrors);
     return {
         errors,
@@ -101,14 +99,10 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         serializableRouteTreeNode,
     };
 }
-async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions, outputMode) {
+async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions, outputMode, appShellRoute) {
     const output = {};
     const errors = [];
-    const workerExecArgv = [
-        '--import',
-        // Loader cannot be an absolute path on Windows.
-        (0, node_url_1.pathToFileURL)((0, node_path_1.join)(__dirname, 'esm-in-memory-loader/register-hooks.js')).href,
-    ];
+    const workerExecArgv = [utils_1.IMPORT_EXEC_ARGV];
     if (sourcemap) {
         workerExecArgv.push('--enable-source-maps');
     }
@@ -126,24 +120,26 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
     });
     try {
         const renderingPromises = [];
-        const appShellRoute = appShellOptions && addLeadingSlash(appShellOptions.route);
+        const appShellRouteWithLeadingSlash = appShellRoute && addLeadingSlash(appShellRoute);
         const baseHrefWithLeadingSlash = addLeadingSlash(baseHref);
         for (const { route, redirectTo, renderMode } of serializableRouteTreeNode) {
-            // Remove base href from file output path.
-            const routeWithoutBaseHref = addLeadingSlash(route.slice(baseHrefWithLeadingSlash.length - 1));
+            // Remove the base href from the file output path.
+            const routeWithoutBaseHref = addTrailingSlash(route).startsWith(baseHrefWithLeadingSlash)
+                ? addLeadingSlash(route.slice(baseHrefWithLeadingSlash.length - 1))
+                : route;
             const outPath = node_path_1.posix.join(removeLeadingSlash(routeWithoutBaseHref), 'index.html');
             if (typeof redirectTo === 'string') {
                 output[outPath] = { content: generateRedirectStaticPage(redirectTo), appShellRoute: false };
                 continue;
             }
-            const isAppShellRoute = renderMode === models_1.RouteRenderMode.AppShell ||
-                // Legacy handling
-                (renderMode === undefined && appShellRoute === routeWithoutBaseHref);
-            const render = renderWorker.run({ url: route, isAppShellRoute });
+            const render = renderWorker.run({ url: route });
             const renderResult = render
                 .then((content) => {
                 if (content !== null) {
-                    output[outPath] = { content, appShellRoute: isAppShellRoute };
+                    output[outPath] = {
+                        content,
+                        appShellRoute: appShellRouteWithLeadingSlash === routeWithoutBaseHref,
+                    };
                 }
             })
                 .catch((err) => {
@@ -165,27 +161,27 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
 async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetFilesForWorker, appShellOptions, prerenderOptions, sourcemap, outputMode) {
     const { routesFile, discoverRoutes } = prerenderOptions ?? {};
     const routes = [];
+    let appShellRoute;
     if (appShellOptions) {
+        appShellRoute = (0, url_1.urlJoin)(baseHref, appShellOptions.route);
         routes.push({
-            route: (0, url_1.urlJoin)(baseHref, appShellOptions.route),
+            renderMode: models_1.RouteRenderMode.Prerender,
+            route: appShellRoute,
         });
     }
     if (routesFile) {
         const routesFromFile = (await (0, promises_1.readFile)(routesFile, 'utf8')).split(/\r?\n/);
         for (const route of routesFromFile) {
             routes.push({
+                renderMode: models_1.RouteRenderMode.Prerender,
                 route: (0, url_1.urlJoin)(baseHref, route.trim()),
             });
         }
     }
     if (!discoverRoutes) {
-        return { errors: [], serializedRouteTree: routes };
+        return { errors: [], appShellRoute, serializedRouteTree: routes };
     }
-    const workerExecArgv = [
-        '--import',
-        // Loader cannot be an absolute path on Windows.
-        (0, node_url_1.pathToFileURL)((0, node_path_1.join)(__dirname, 'esm-in-memory-loader/register-hooks.js')).href,
-    ];
+    const workerExecArgv = [utils_1.IMPORT_EXEC_ARGV];
     if (sourcemap) {
         workerExecArgv.push('--enable-source-maps');
     }
@@ -202,8 +198,18 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
         execArgv: workerExecArgv,
     });
     try {
-        const { serializedRouteTree, errors } = await renderWorker.run({});
-        return { errors, serializedRouteTree: [...routes, ...serializedRouteTree] };
+        const { serializedRouteTree, appShellRoute, errors } = await renderWorker.run({});
+        if (!routes.length) {
+            return { errors, appShellRoute, serializedRouteTree };
+        }
+        // Merge the routing trees
+        const uniqueRoutes = new Map();
+        for (const item of [...routes, ...serializedRouteTree]) {
+            if (!uniqueRoutes.has(item.route)) {
+                uniqueRoutes.set(item.route, item);
+            }
+        }
+        return { errors, serializedRouteTree: Array.from(uniqueRoutes.values()) };
     }
     catch (err) {
         (0, error_1.assertIsError)(err);
@@ -219,10 +225,13 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
     }
 }
 function addLeadingSlash(value) {
-    return value.charAt(0) === '/' ? value : '/' + value;
+    return value[0] === '/' ? value : '/' + value;
+}
+function addTrailingSlash(url) {
+    return url[url.length - 1] === '/' ? url : `${url}/`;
 }
 function removeLeadingSlash(value) {
-    return value.charAt(0) === '/' ? value.slice(1) : value;
+    return value[0] === '/' ? value.slice(1) : value;
 }
 /**
  * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL.

package/src/utils/server-rendering/render-worker.js

@@ -21,8 +21,10 @@ let serverURL = launch_server_1.DEFAULT_URL;
  */
 async function renderPage({ url }) {
     const { ɵgetOrCreateAngularServerApp: getOrCreateAngularServerApp } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./main.server.mjs');
-    const angularServerApp = getOrCreateAngularServerApp();
-    const response = await angularServerApp.renderStatic(new URL(url, serverURL), AbortSignal.timeout(30_000));
+    const angularServerApp = getOrCreateAngularServerApp({
+        allowStaticRouteRender: true,
+    });
+    const response = await angularServerApp.handle(new Request(new URL(url, serverURL), { signal: AbortSignal.timeout(30_000) }));
     return response ? response.text() : null;
 }
 async function initialize() {

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

@@ -20,9 +20,10 @@ let serverURL = launch_server_1.DEFAULT_URL;
 /** Renders an application based on a provided options. */
 async function extractRoutes() {
     const { ɵextractRoutesAndCreateRouteTree: extractRoutesAndCreateRouteTree } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./main.server.mjs');
-    const { routeTree, errors } = await extractRoutesAndCreateRouteTree(serverURL, undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
+    const { routeTree, appShellRoute, errors } = await extractRoutesAndCreateRouteTree(serverURL, undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
     return {
         errors,
+        appShellRoute,
         serializedRouteTree: routeTree.toObject(),
     };
 }