@angular/ssr 19.0.0-rc.1 → 19.0.0-rc.3

package/index.d.ts

@@ -174,6 +174,10 @@ declare interface AngularRouterConfigResult {
      * A list of errors encountered during the route extraction process.
      */
     errors: string[];
+    /**
+     * The specified route for the app-shell, if configured.
+     */
+    appShellRoute?: string;
 }
 
 /**
@@ -459,14 +463,23 @@ export declare enum PrerenderFallback {
 }
 
 /**
- * Configures the necessary providers for server routes configuration.
+ /**
+ * Sets up the necessary providers for configuring server routes.
+ * This function accepts an array of server routes and optional configuration
+ * options, returning an `EnvironmentProviders` object that encapsulates
+ * the server routes and configuration settings.
  *
  * @param routes - An array of server routes to be provided.
+ * @param options - (Optional) An object containing additional configuration options for server routes.
+ * @returns An `EnvironmentProviders` instance with the server routes configuration.
+ *
  * @returns An `EnvironmentProviders` object that contains the server routes configuration.
+ *
  * @see {@link ServerRoute}
+ * @see {@link ServerRoutesConfigOptions}
  * @developerPreview
  */
-export declare function provideServerRoutesConfig(routes: ServerRoute[]): EnvironmentProviders;
+export declare function provideServerRoutesConfig(routes: ServerRoute[], options?: ServerRoutesConfigOptions): EnvironmentProviders;
 
 /**
  * Different rendering modes for server routes.
@@ -475,14 +488,12 @@ export declare function provideServerRoutesConfig(routes: ServerRoute[]): Enviro
  * @developerPreview
  */
 export declare enum RenderMode {
-    /** AppShell rendering mode, typically used for pre-rendered shells of the application. */
-    AppShell = 0,
     /** Server-Side Rendering (SSR) mode, where content is rendered on the server for each request. */
-    Server = 1,
+    Server = 0,
     /** Client-Side Rendering (CSR) mode, where content is rendered on the client side in the browser. */
-    Client = 2,
+    Client = 1,
     /** Static Site Generation (SSG) mode, where content is pre-rendered at build time and served as static files. */
-    Prerender = 3
+    Prerender = 2
 }
 
 
@@ -707,17 +718,7 @@ declare interface ServerAsset {
  * @see {@link provideServerRoutesConfig}
  * @developerPreview
  */
-export declare type ServerRoute = ServerRouteAppShell | ServerRouteClient | ServerRoutePrerender | ServerRoutePrerenderWithParams | ServerRouteServer;
-
-/**
- * A server route that uses AppShell rendering mode.
- * @see {@link RenderMode}
- * @developerPreview
- */
-export declare interface ServerRouteAppShell extends Omit<ServerRouteCommon, 'headers' | 'status'> {
-    /** Specifies that the route uses AppShell rendering mode. */
-    renderMode: RenderMode.AppShell;
-}
+export declare type ServerRoute = ServerRouteClient | ServerRoutePrerender | ServerRoutePrerenderWithParams | ServerRouteServer;
 
 /**
  * A server route that uses Client-Side Rendering (CSR) mode.
@@ -800,6 +801,26 @@ export declare interface ServerRoutePrerenderWithParams extends Omit<ServerRoute
     getPrerenderParams: () => Promise<Record<string, string>[]>;
 }
 
+/**
+ * Configuration options for server routes.
+ *
+ * This interface defines the optional settings available for configuring server routes
+ * in the server-side environment, such as specifying a path to the app shell route.
+ *
+ * @see {@link provideServerRoutesConfig}
+ * @developerPreview
+ */
+export declare interface ServerRoutesConfigOptions {
+    /**
+     * Defines the route to be used as the app shell, which serves as the main entry
+     * point for the application. This route is often used to enable server-side rendering
+     * of the application shell for requests that do not match any specific server route.
+     *
+     * @see {@link https://angular.dev/ecosystem/service-workers/app-shell | App shell pattern on Angular.dev}
+     */
+    appShellRoute?: string;
+}
+
 /**
  * A server route that uses Server-Side Rendering (SSR) mode.
  * @see {@link RenderMode}
@@ -836,10 +857,12 @@ export declare function ɵdestroyAngularServerApp(): void;
  *
  * @returns A promise that resolves to an object containing:
  *  - `routeTree`: A populated `RouteTree` containing all extracted routes from the Angular application.
+ *  - `appShellRoute`: The specified route for the app-shell, if configured.
  *  - `errors`: An array of strings representing any errors encountered during the route extraction process.
  */
 export declare function ɵextractRoutesAndCreateRouteTree(url: URL, manifest?: AngularAppManifest, invokeGetPrerenderParams?: boolean, includePrerenderFallbackRoutes?: boolean): Promise<{
     routeTree: RouteTree;
+    appShellRoute?: string;
     errors: string[];
 }>;
 

package/node/index.d.ts

@@ -1,4 +1,6 @@
 import { ApplicationRef } from '@angular/core';
+import type { Http2ServerRequest } from 'node:http2';
+import type { Http2ServerResponse } from 'node:http2';
 import type { IncomingMessage } from 'node:http';
 import type { ServerResponse } from 'node:http';
 import { StaticProvider } from '@angular/core';
@@ -20,14 +22,17 @@ export declare class AngularNodeAppEngine {
      * Handles an incoming HTTP request by serving prerendered content, performing server-side rendering,
      * or delivering a static file for client-side rendered routes based on the `RenderMode` setting.
      *
-     * @param request - The HTTP request to handle.
+     * This method adapts Node.js's `IncomingMessage` or `Http2ServerRequest`
+     * to a format compatible with the `AngularAppEngine` and delegates the handling logic to it.
+     *
+     * @param request - The incoming HTTP request (`IncomingMessage` or `Http2ServerRequest`).
      * @param requestContext - Optional context for rendering, such as metadata associated with the request.
      * @returns A promise that resolves to the resulting HTTP response object, or `null` if no matching Angular route is found.
      *
      * @remarks A request to `https://www.example.com/page/index.html` will serve or render the Angular route
      * corresponding to `https://www.example.com/page`.
      */
-    handle(request: IncomingMessage, requestContext?: unknown): Promise<Response | null>;
+    handle(request: IncomingMessage | Http2ServerRequest, requestContext?: unknown): Promise<Response | null>;
 }
 
 /**
@@ -127,13 +132,17 @@ export declare interface CommonEngineRenderOptions {
 export declare function createNodeRequestHandler<T extends NodeRequestHandlerFunction>(handler: T): T;
 
 /**
- * Converts a Node.js `IncomingMessage` into a Web Standard `Request`.
+ * Converts a Node.js `IncomingMessage` or `Http2ServerRequest` into a
+ * Web Standard `Request` object.
+ *
+ * This function adapts the Node.js request objects to a format that can
+ * be used by web platform APIs.
  *
- * @param nodeRequest - The Node.js `IncomingMessage` object to convert.
+ * @param nodeRequest - The Node.js request object (`IncomingMessage` or `Http2ServerRequest`) to convert.
  * @returns A Web Standard `Request` object.
  * @developerPreview
  */
-export declare function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage): Request;
+export declare function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage | Http2ServerRequest): Request;
 
 
 /**
@@ -167,13 +176,17 @@ export declare function isMainModule(url: string): boolean;
 export declare type NodeRequestHandlerFunction = (req: IncomingMessage, res: ServerResponse, next: (err?: unknown) => void) => Promise<void> | void;
 
 /**
- * Streams a web-standard `Response` into a Node.js `ServerResponse`.
+ * Streams a web-standard `Response` into a Node.js `ServerResponse`
+ * or `Http2ServerResponse`.
+ *
+ * This function adapts the web `Response` object to write its content
+ * to a Node.js response object, handling both HTTP/1.1 and HTTP/2.
  *
  * @param source - The web-standard `Response` object to stream from.
- * @param destination - The Node.js `ServerResponse` object to stream into.
+ * @param destination - The Node.js response object (`ServerResponse` or `Http2ServerResponse`) to stream into.
  * @returns A promise that resolves once the streaming operation is complete.
  * @developerPreview
  */
-export declare function writeResponseToNodeResponse(source: Response, destination: ServerResponse): Promise<void>;
+export declare function writeResponseToNodeResponse(source: Response, destination: ServerResponse | Http2ServerResponse<Http2ServerRequest>): Promise<void>;
 
 export { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/ssr",
-  "version": "19.0.0-rc.1",
+  "version": "19.0.0-rc.3",
   "description": "Angular server side rendering utilities",
   "license": "MIT",
   "homepage": "https://github.com/angular/angular-cli",
@@ -22,12 +22,12 @@
     "@angular/router": "^19.0.0-next.0"
   },
   "devDependencies": {
-    "@angular/common": "19.0.0-rc.0",
-    "@angular/compiler": "19.0.0-rc.0",
-    "@angular/core": "19.0.0-rc.0",
-    "@angular/platform-browser": "19.0.0-rc.0",
-    "@angular/platform-server": "19.0.0-rc.0",
-    "@angular/router": "19.0.0-rc.0",
+    "@angular/common": "19.0.0-rc.3",
+    "@angular/compiler": "19.0.0-rc.3",
+    "@angular/core": "19.0.0-rc.3",
+    "@angular/platform-browser": "19.0.0-rc.3",
+    "@angular/platform-server": "19.0.0-rc.3",
+    "@angular/router": "19.0.0-rc.3",
     "@bazel/runfiles": "^5.8.1"
   },
   "sideEffects": false,
@@ -50,10 +50,6 @@
     "./node": {
       "types": "./node/index.d.ts",
       "default": "./fesm2022/node.mjs"
-    },
-    "./tokens": {
-      "types": "./tokens/index.d.ts",
-      "default": "./fesm2022/tokens.mjs"
     }
   }
 }

package/third_party/beasties/index.js

@@ -1021,6 +1021,36 @@ function requireNode$1 () {
 	  return cloned
 	}
 
+	function sourceOffset(inputCSS, position) {
+	  // Not all custom syntaxes support `offset` in `source.start` and `source.end`
+	  if (
+	    position &&
+	    typeof position.offset !== 'undefined'
+	  ) {
+	    return position.offset;
+	  }
+
+	  let column = 1;
+	  let line = 1;
+	  let offset = 0;
+
+	  for (let i = 0; i < inputCSS.length; i++) {
+	    if (line === position.line && column === position.column) {
+	      offset = i;
+	      break
+	    }
+
+	    if (inputCSS[i] === '\n') {
+	      column = 1;
+	      line += 1;
+	    } else {
+	      column += 1;
+	    }
+	  }
+
+	  return offset
+	}
+
 	class Node {
 	  constructor(defaults = {}) {
 	    this.raws = {};
@@ -1163,25 +1193,29 @@ function requireNode$1 () {
 	    return this.parent.nodes[index + 1]
 	  }
 
-	  positionBy(opts, stringRepresentation) {
+	  positionBy(opts) {
 	    let pos = this.source.start;
 	    if (opts.index) {
-	      pos = this.positionInside(opts.index, stringRepresentation);
+	      pos = this.positionInside(opts.index);
 	    } else if (opts.word) {
-	      stringRepresentation = this.toString();
+	      let stringRepresentation = this.source.input.css.slice(
+	        sourceOffset(this.source.input.css, this.source.start),
+	        sourceOffset(this.source.input.css, this.source.end)
+	      );
 	      let index = stringRepresentation.indexOf(opts.word);
-	      if (index !== -1) pos = this.positionInside(index, stringRepresentation);
+	      if (index !== -1) pos = this.positionInside(index);
 	    }
 	    return pos
 	  }
 
-	  positionInside(index, stringRepresentation) {
-	    let string = stringRepresentation || this.toString();
+	  positionInside(index) {
 	    let column = this.source.start.column;
 	    let line = this.source.start.line;
+	    let offset = sourceOffset(this.source.input.css, this.source.start);
+	    let end = offset + index;
 
-	    for (let i = 0; i < index; i++) {
-	      if (string[i] === '\n') {
+	    for (let i = offset; i < end; i++) {
+	      if (this.source.input.css[i] === '\n') {
 	        column = 1;
 	        line += 1;
 	      } else {
@@ -1214,13 +1248,15 @@ function requireNode$1 () {
 	        };
 
 	    if (opts.word) {
-	      let stringRepresentation = this.toString();
+	      let stringRepresentation = this.source.input.css.slice(
+	        sourceOffset(this.source.input.css, this.source.start),
+	        sourceOffset(this.source.input.css, this.source.end)
+	      );
 	      let index = stringRepresentation.indexOf(opts.word);
 	      if (index !== -1) {
-	        start = this.positionInside(index, stringRepresentation);
+	        start = this.positionInside(index);
 	        end = this.positionInside(
 	          index + opts.word.length,
-	          stringRepresentation
 	        );
 	      }
 	    } else {
@@ -4783,7 +4819,7 @@ function requireProcessor () {
 
 	class Processor {
 	  constructor(plugins = []) {
-	    this.version = '8.4.47';
+	    this.version = '8.4.49';
 	    this.plugins = this.normalize(plugins);
 	  }