@angular/build 19.0.0-next.7 → 19.0.0-next.8

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

@@ -11,16 +11,19 @@ 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");
-async function prerenderPages(workspaceRoot, baseHref, appShellOptions = {}, prerenderOptions = {}, outputFiles, assets, sourcemap = false, maxThreads = 1, verbose = false) {
+const models_1 = require("./models");
+async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerenderOptions, outputFiles, assets, outputMode, sourcemap = false, maxThreads = 1) {
     const outputFilesForWorker = {};
     const serverBundlesSourceMaps = new Map();
     const warnings = [];
     const errors = [];
     for (const { text, path, type } of outputFiles) {
-        if (type !== bundler_context_1.BuildOutputFileType.Server) {
+        if (type !== bundler_context_1.BuildOutputFileType.ServerApplication && type !== bundler_context_1.BuildOutputFileType.ServerRoot) {
             continue;
         }
         // Contains the server runnable application code
@@ -48,39 +51,57 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions = {}, pre
         assetsReversed[addLeadingSlash(destination.replace(/\\/g, node_path_1.posix.sep))] = source;
     }
     // Get routes to prerender
-    const { routes: allRoutes, warnings: routesWarnings, errors: routesErrors, serializableRouteTreeNode, } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, verbose);
-    if (routesErrors?.length) {
-        errors.push(...routesErrors);
-    }
-    if (routesWarnings?.length) {
-        warnings.push(...routesWarnings);
+    const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode } = 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}`,
+            ],
+            serializedRouteTree: [],
+        };
+    });
+    errors.push(...extractionErrors);
+    const serializableRouteTreeNodeForPrerender = [];
+    for (const metadata of serializableRouteTreeNode) {
+        if (outputMode !== schema_1.OutputMode.Static && metadata.redirectTo) {
+            // Skip redirects if output mode is not static.
+            continue;
+        }
+        if (metadata.route.includes('*')) {
+            // Skip catch all routes from prerender.
+            continue;
+        }
+        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:
+                if (outputMode === schema_1.OutputMode.Static) {
+                    errors.push(`Route '${metadata.route}' is configured with server render mode, but the build 'outputMode' is set to 'static'.`);
+                }
+                break;
+        }
     }
-    if (allRoutes.size < 1 || errors.length > 0) {
+    if (!serializableRouteTreeNodeForPrerender.length || errors.length > 0) {
         return {
             errors,
             warnings,
             output: {},
             serializableRouteTreeNode,
-            prerenderedRoutes: allRoutes,
         };
     }
     // Render routes
-    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, allRoutes, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions);
+    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions);
     errors.push(...renderingErrors);
     return {
         errors,
         warnings,
         output,
         serializableRouteTreeNode,
-        prerenderedRoutes: allRoutes,
     };
 }
-class RoutesSet extends Set {
-    add(value) {
-        return super.add(addLeadingSlash(value));
-    }
-}
-async function renderPages(baseHref, sourcemap, allRoutes, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions) {
+async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions) {
     const output = {};
     const errors = [];
     const workerExecArgv = [
@@ -93,7 +114,7 @@ async function renderPages(baseHref, sourcemap, allRoutes, maxThreads, workspace
     }
     const renderWorker = new worker_pool_1.WorkerPool({
         filename: require.resolve('./render-worker'),
-        maxThreads: Math.min(allRoutes.size, maxThreads),
+        maxThreads: Math.min(serializableRouteTreeNode.length, maxThreads),
         workerData: {
             workspaceRoot,
             outputFiles: outputFilesForWorker,
@@ -103,17 +124,23 @@ async function renderPages(baseHref, sourcemap, allRoutes, maxThreads, workspace
     });
     try {
         const renderingPromises = [];
-        const appShellRoute = appShellOptions.route && addLeadingSlash(appShellOptions.route);
+        const appShellRoute = appShellOptions && addLeadingSlash(appShellOptions.route);
         const baseHrefWithLeadingSlash = addLeadingSlash(baseHref);
-        for (const route of allRoutes) {
+        for (const { route, redirectTo, renderMode } of serializableRouteTreeNode) {
             // Remove base href from file output path.
             const routeWithoutBaseHref = addLeadingSlash(route.slice(baseHrefWithLeadingSlash.length - 1));
-            const render = renderWorker.run({ url: 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 renderResult = render
                 .then((content) => {
                 if (content !== null) {
-                    const outPath = node_path_1.posix.join(removeLeadingSlash(routeWithoutBaseHref), 'index.html');
-                    const isAppShellRoute = appShellRoute === routeWithoutBaseHref;
                     output[outPath] = { content, appShellRoute: isAppShellRoute };
                 }
             })
@@ -133,21 +160,24 @@ async function renderPages(baseHref, sourcemap, allRoutes, maxThreads, workspace
         output,
     };
 }
-async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetFilesForWorker, appShellOptions, prerenderOptions, sourcemap, verbose) {
-    const { routesFile, discoverRoutes } = prerenderOptions;
-    const routes = new RoutesSet();
-    const { route: appShellRoute } = appShellOptions;
-    if (appShellRoute !== undefined) {
-        routes.add((0, url_1.urlJoin)(baseHref, appShellRoute));
+async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetFilesForWorker, appShellOptions, prerenderOptions, sourcemap, outputMode) {
+    const { routesFile, discoverRoutes } = prerenderOptions ?? {};
+    const routes = [];
+    if (appShellOptions) {
+        routes.push({
+            route: (0, url_1.urlJoin)(baseHref, appShellOptions.route),
+        });
     }
     if (routesFile) {
         const routesFromFile = (await (0, promises_1.readFile)(routesFile, 'utf8')).split(/\r?\n/);
         for (const route of routesFromFile) {
-            routes.add((0, url_1.urlJoin)(baseHref, route.trim()));
+            routes.push({
+                route: (0, url_1.urlJoin)(baseHref, route.trim()),
+            });
         }
     }
     if (!discoverRoutes) {
-        return { routes, serializableRouteTreeNode: [] };
+        return { errors: [], serializedRouteTree: routes };
     }
     const workerExecArgv = [
         '--import',
@@ -167,39 +197,22 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
         },
         execArgv: workerExecArgv,
     });
-    const errors = [];
-    const { serializedRouteTree: serializableRouteTreeNode } = await renderWorker
-        .run({})
-        .catch((err) => {
-        errors.push(`An error occurred while extracting routes.\n\n${err.stack}`);
-    })
-        .finally(() => {
-        void renderWorker.destroy();
-    });
-    const skippedRedirects = [];
-    const skippedOthers = [];
-    for (const { route, redirectTo } of serializableRouteTreeNode) {
-        if (redirectTo) {
-            skippedRedirects.push(route);
-        }
-        else if (route.includes('*')) {
-            skippedOthers.push(route);
-        }
-        else {
-            routes.add(route);
-        }
+    try {
+        const { serializedRouteTree, errors } = await renderWorker.run({
+            outputMode,
+        });
+        return { errors, serializedRouteTree: [...routes, ...serializedRouteTree] };
     }
-    let warnings;
-    if (verbose) {
-        if (skippedOthers.length) {
-            (warnings ??= []).push('The following routes were skipped from prerendering because they contain routes with dynamic parameters:\n' +
-                skippedOthers.join('\n'));
-        }
-        if (skippedRedirects.length) {
-            (warnings ??= []).push('The following routes were skipped from prerendering because they contain redirects:\n', skippedRedirects.join('\n'));
-        }
+    catch (err) {
+        (0, error_1.assertIsError)(err);
+        return {
+            errors: [`An error occurred while extracting routes.\n\n${err.stack}`],
+            serializedRouteTree: [],
+        };
+    }
+    finally {
+        void renderWorker.destroy();
     }
-    return { routes, serializableRouteTreeNode, warnings };
 }
 function addLeadingSlash(value) {
     return value.charAt(0) === '/' ? value : '/' + value;
@@ -207,3 +220,27 @@ function addLeadingSlash(value) {
 function removeLeadingSlash(value) {
     return value.charAt(0) === '/' ? value.slice(1) : value;
 }
+/**
+ * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL.
+ *
+ * This function creates a simple HTML page that performs a redirect using a meta tag.
+ * It includes a fallback link in case the meta-refresh doesn't work.
+ *
+ * @param url - The URL to which the page should redirect.
+ * @returns The HTML content of the static redirect page.
+ */
+function generateRedirectStaticPage(url) {
+    return `
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Redirecting</title>
+    <meta http-equiv="refresh" content="0; url=${url}">
+  </head>
+  <body>
+    <pre>Redirecting to <a href="${url}">${url}</a></pre>
+  </body>
+</html>
+`.trim();
+}

package/src/utils/server-rendering/routes-extractor-worker.d.ts

@@ -5,17 +5,12 @@
  * 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
  */
-import type { ɵextractRoutesAndCreateRouteTree } from '@angular/ssr';
-import type { ESMInMemoryFileLoaderWorkerData } from './esm-in-memory-loader/loader-hooks';
-export interface RoutesExtractorWorkerData extends ESMInMemoryFileLoaderWorkerData {
-    assetFiles: Record</** Destination */ string, /** Source */ string>;
-}
-export type SerializableRouteTreeNode = ReturnType<Awaited<ReturnType<typeof ɵextractRoutesAndCreateRouteTree>>['routeTree']['toObject']>;
-export interface RoutersExtractorWorkerResult {
-    serializedRouteTree: SerializableRouteTreeNode;
-    errors: string[];
+import { OutputMode } from '../../builders/application/schema';
+import { RoutersExtractorWorkerResult } from './models';
+export interface ExtractRoutesOptions {
+    outputMode?: OutputMode;
 }
 /** Renders an application based on a provided options. */
-declare function extractRoutes(): Promise<RoutersExtractorWorkerResult>;
+declare function extractRoutes({ outputMode, }: ExtractRoutesOptions): Promise<RoutersExtractorWorkerResult>;
 declare const _default: typeof extractRoutes;
 export default _default;

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

@@ -7,14 +7,13 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("../../builders/application/schema");
 const fetch_patch_1 = require("./fetch-patch");
 const load_esm_from_memory_1 = require("./load-esm-from-memory");
 /** Renders an application based on a provided options. */
-async function extractRoutes() {
+async function extractRoutes({ outputMode, }) {
     const { ɵextractRoutesAndCreateRouteTree: extractRoutesAndCreateRouteTree } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./main.server.mjs');
-    const { routeTree, errors } = await extractRoutesAndCreateRouteTree(new URL('http://local-angular-prerender/'), 
-    /** manifest */ undefined, 
-    /** invokeGetPrerenderParams */ true);
+    const { routeTree, errors } = await extractRoutesAndCreateRouteTree(new URL('http://local-angular-prerender/'), undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
     return {
         errors,
         serializedRouteTree: routeTree.toObject(),

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

@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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
- */
-import type { Connect, Plugin } from 'vite';
-import { AngularMemoryOutputFiles } from './utils';
-export interface AngularMemoryPluginOptions {
-    workspaceRoot: string;
-    virtualProjectRoot: string;
-    outputFiles: AngularMemoryOutputFiles;
-    assets: Map<string, string>;
-    ssr: boolean;
-    external?: string[];
-    extensionMiddleware?: Connect.NextHandleFunction[];
-    indexHtmlTransformer?: (content: string) => Promise<string>;
-    normalizePath: (path: string) => string;
-    usedComponentStyles: Map<string, string[]>;
-}
-export declare function createAngularMemoryPlugin(options: AngularMemoryPluginOptions): Plugin;