@angular/build 19.0.0-next.8 → 19.0.0-rc.0

package/src/utils/server-rendering/load-esm-from-memory.d.ts

@@ -15,5 +15,12 @@ interface MainServerBundleExports {
     ɵextractRoutesAndCreateRouteTree: typeof ɵextractRoutesAndCreateRouteTree;
     ɵgetOrCreateAngularServerApp: typeof ɵgetOrCreateAngularServerApp;
 }
+/**
+ * Represents the exports available from the server bundle.
+ */
+interface ServerBundleExports {
+    reqHandler?: unknown;
+}
 export declare function loadEsmModuleFromMemory(path: './main.server.mjs'): Promise<MainServerBundleExports>;
+export declare function loadEsmModuleFromMemory(path: './server.mjs'): Promise<ServerBundleExports>;
 export {};

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

@@ -7,7 +7,7 @@
  */
 import { NormalizedApplicationBuildOptions } from '../../builders/application/options';
 import type { BuildOutputFile } from '../../tools/esbuild/bundler-context';
-import { PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
+import type { PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
 export declare const SERVER_APP_MANIFEST_FILENAME = "angular-app-manifest.mjs";
 export declare const SERVER_APP_ENGINE_MANIFEST_FILENAME = "angular-app-engine-manifest.mjs";
 /**

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

@@ -18,18 +18,9 @@ const MAIN_SERVER_OUTPUT_FILENAME = 'main.server.mjs';
  * A mapping of unsafe characters to their escaped Unicode equivalents.
  */
 const UNSAFE_CHAR_MAP = {
-    '<': '\\u003C',
-    '>': '\\u003E',
-    '/': '\\u002F',
+    '`': '\\`',
+    '$': '\\$',
     '\\': '\\\\',
-    '\b': '\\b',
-    '\f': '\\f',
-    '\n': '\\n',
-    '\r': '\\r',
-    '\t': '\\t',
-    '\0': '\\0',
-    '\u2028': '\\u2028',
-    '\u2029': '\\u2029',
 };
 /**
  * Escapes unsafe characters in a given string by replacing them with
@@ -39,7 +30,7 @@ const UNSAFE_CHAR_MAP = {
  * @returns The escaped string where unsafe characters are replaced.
  */
 function escapeUnsafeChars(str) {
-    return str.replace(/[<>\b\f\n\r\t\0\u2028\u2029]/g, (c) => UNSAFE_CHAR_MAP[c]);
+    return str.replace(/[$`\\]/g, (c) => UNSAFE_CHAR_MAP[c]);
 }
 /**
  * Generates the server manifest for the App Engine environment.
@@ -119,7 +110,7 @@ function generateAngularServerAppManifest(additionalHtmlOutputFiles, outputFiles
         if (file.path === options_1.INDEX_HTML_SERVER ||
             file.path === options_1.INDEX_HTML_CSR ||
             (inlineCriticalCss && file.path.endsWith('.css'))) {
-            serverAssetsContent.push(`['${file.path}', async () => ${escapeUnsafeChars(JSON.stringify(file.text))}]`);
+            serverAssetsContent.push(`['${file.path}', async () => \`${escapeUnsafeChars(file.text)}\`]`);
         }
     }
     const manifestContent = `

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

@@ -92,7 +92,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         };
     }
     // Render routes
-    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions);
+    const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, appShellOptions, outputMode);
     errors.push(...renderingErrors);
     return {
         errors,
@@ -101,7 +101,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
         serializableRouteTreeNode,
     };
 }
-async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions) {
+async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxThreads, workspaceRoot, outputFilesForWorker, assetFilesForWorker, appShellOptions, outputMode) {
     const output = {};
     const errors = [];
     const workerExecArgv = [
@@ -119,6 +119,8 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
             workspaceRoot,
             outputFiles: outputFilesForWorker,
             assetFiles: assetFilesForWorker,
+            outputMode,
+            hasSsrEntry: !!outputFilesForWorker['server.mjs'],
         },
         execArgv: workerExecArgv,
     });
@@ -194,19 +196,21 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
             workspaceRoot,
             outputFiles: outputFilesForWorker,
             assetFiles: assetFilesForWorker,
+            outputMode,
+            hasSsrEntry: !!outputFilesForWorker['server.mjs'],
         },
         execArgv: workerExecArgv,
     });
     try {
-        const { serializedRouteTree, errors } = await renderWorker.run({
-            outputMode,
-        });
+        const { serializedRouteTree, errors } = await renderWorker.run({});
         return { errors, serializedRouteTree: [...routes, ...serializedRouteTree] };
     }
     catch (err) {
         (0, error_1.assertIsError)(err);
         return {
-            errors: [`An error occurred while extracting routes.\n\n${err.stack}`],
+            errors: [
+                `An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err.code ?? err}`,
+            ],
             serializedRouteTree: [],
         };
     }

package/src/utils/server-rendering/render-worker.d.ts

@@ -5,9 +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 { OutputMode } from '../../builders/application/schema';
 import type { ESMInMemoryFileLoaderWorkerData } from './esm-in-memory-loader/loader-hooks';
 export interface RenderWorkerData extends ESMInMemoryFileLoaderWorkerData {
     assetFiles: Record</** Destination */ string, /** Source */ string>;
+    outputMode: OutputMode | undefined;
+    hasSsrEntry: boolean;
 }
 export interface RenderOptions {
     url: string;
@@ -16,5 +19,5 @@ export interface RenderOptions {
  * Renders each route in routes and writes them to <outputPath>/<route>/index.html.
  */
 declare function renderPage({ url }: RenderOptions): Promise<string | null>;
-declare const _default: typeof renderPage;
+declare const _default: Promise<typeof renderPage>;
 export default _default;

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

@@ -7,19 +7,29 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const worker_threads_1 = require("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;
+let serverURL = launch_server_1.DEFAULT_URL;
 /**
  * Renders each route in routes and writes them to <outputPath>/<route>/index.html.
  */
 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, 'http://local-angular-prerender'), AbortSignal.timeout(30_000));
+    const response = await angularServerApp.renderStatic(new URL(url, serverURL), AbortSignal.timeout(30_000));
     return response ? response.text() : null;
 }
-function initialize() {
-    (0, fetch_patch_1.patchFetchToLoadInMemoryAssets)();
+async function initialize() {
+    if (outputMode !== undefined && hasSsrEntry) {
+        serverURL = await (0, launch_server_1.launchServer)();
+    }
+    (0, fetch_patch_1.patchFetchToLoadInMemoryAssets)(serverURL);
     return renderPage;
 }
 exports.default = initialize();

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

@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { OutputMode } from '../../builders/application/schema';
+import { ESMInMemoryFileLoaderWorkerData } from './esm-in-memory-loader/loader-hooks';
 import { RoutersExtractorWorkerResult } from './models';
-export interface ExtractRoutesOptions {
-    outputMode?: OutputMode;
+export interface ExtractRoutesWorkerData extends ESMInMemoryFileLoaderWorkerData {
+    outputMode: OutputMode | undefined;
 }
 /** Renders an application based on a provided options. */
-declare function extractRoutes({ outputMode, }: ExtractRoutesOptions): Promise<RoutersExtractorWorkerResult>;
-declare const _default: typeof extractRoutes;
+declare function extractRoutes(): Promise<RoutersExtractorWorkerResult>;
+declare const _default: Promise<typeof extractRoutes>;
 export default _default;

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

@@ -7,20 +7,30 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const worker_threads_1 = require("worker_threads");
 const schema_1 = require("../../builders/application/schema");
 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;
+let serverURL = launch_server_1.DEFAULT_URL;
 /** Renders an application based on a provided options. */
-async function extractRoutes({ outputMode, }) {
+async function extractRoutes() {
     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/'), undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
+    const { routeTree, errors } = await extractRoutesAndCreateRouteTree(serverURL, undefined /** manifest */, true /** invokeGetPrerenderParams */, outputMode === schema_1.OutputMode.Server /** includePrerenderFallbackRoutes */);
     return {
         errors,
         serializedRouteTree: routeTree.toObject(),
     };
 }
-function initialize() {
-    (0, fetch_patch_1.patchFetchToLoadInMemoryAssets)();
+async function initialize() {
+    if (outputMode !== undefined && hasSsrEntry) {
+        serverURL = await (0, launch_server_1.launchServer)();
+    }
+    (0, fetch_patch_1.patchFetchToLoadInMemoryAssets)(serverURL);
     return extractRoutes;
 }
 exports.default = initialize();

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

@@ -0,0 +1,11 @@
+/**
+ * @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 { createRequestHandler } from '@angular/ssr';
+import type { createNodeRequestHandler } from '@angular/ssr/node';
+export declare function isSsrNodeRequestHandler(value: unknown): value is ReturnType<typeof createNodeRequestHandler>;
+export declare function isSsrRequestHandler(value: unknown): value is ReturnType<typeof createRequestHandler>;

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

@@ -0,0 +1,17 @@
+"use strict";
+/**
+ * @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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSsrNodeRequestHandler = isSsrNodeRequestHandler;
+exports.isSsrRequestHandler = isSsrRequestHandler;
+function isSsrNodeRequestHandler(value) {
+    return typeof value === 'function' && '__ng_node_request_handler__' in value;
+}
+function isSsrRequestHandler(value) {
+    return typeof value === 'function' && '__ng_request_handler__' in value;
+}

package/src/utils/supported-browsers.js

@@ -19,6 +19,7 @@ function getSupportedBrowsers(projectRoot, logger) {
         'last 2 Edge major versions',
         'last 2 Safari major versions',
         'last 2 iOS major versions',
+        'last 2 Android major versions',
         'Firefox ESR',
     ];
     // Get browsers from config or default.