@angular/ssr 20.0.0-next.6 → 20.0.0-next.7

package/node/index.d.ts

@@ -1,10 +1,54 @@
-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';
-import { Type } from '@angular/core';
+import { Type, ApplicationRef, StaticProvider } from '@angular/core';
+import { IncomingMessage, ServerResponse } from 'node:http';
+import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+
+interface CommonEngineOptions {
+    /** A method that when invoked returns a promise that returns an `ApplicationRef` instance once resolved or an NgModule. */
+    bootstrap?: Type<{}> | (() => Promise<ApplicationRef>);
+    /** A set of platform level providers for all requests. */
+    providers?: StaticProvider[];
+    /** Enable request performance profiling data collection and printing the results in the server console. */
+    enablePerformanceProfiler?: boolean;
+}
+interface CommonEngineRenderOptions {
+    /** A method that when invoked returns a promise that returns an `ApplicationRef` instance once resolved or an NgModule. */
+    bootstrap?: Type<{}> | (() => Promise<ApplicationRef>);
+    /** A set of platform level providers for the current request. */
+    providers?: StaticProvider[];
+    url?: string;
+    document?: string;
+    documentFilePath?: string;
+    /**
+     * Reduce render blocking requests by inlining critical CSS.
+     * Defaults to true.
+     */
+    inlineCriticalCss?: boolean;
+    /**
+     * Base path location of index file.
+     * Defaults to the 'documentFilePath' dirname when not provided.
+     */
+    publicPath?: string;
+}
+/**
+ * A common engine to use to server render an application.
+ */
+declare class CommonEngine {
+    private options?;
+    private readonly templateCache;
+    private readonly inlineCriticalCssProcessor;
+    private readonly pageIsSSG;
+    constructor(options?: CommonEngineOptions | undefined);
+    /**
+     * Render an HTML document for a specific URL with specified
+     * render options
+     */
+    render(opts: CommonEngineRenderOptions): Promise<string>;
+    private inlineCriticalCss;
+    private retrieveSSGPage;
+    private renderApplication;
+    /** Retrieve the document from the cache or the filesystem */
+    private getDocument;
+}
 
 /**
  * Angular server application engine.
@@ -14,7 +58,7 @@ import { Type } from '@angular/core';
  * @remarks This class should be instantiated once and used as a singleton across the server-side
  * application to ensure consistent handling of rendering requests and resource management.
  */
-export declare class AngularNodeAppEngine {
+declare class AngularNodeAppEngine {
     private readonly angularAppEngine;
     constructor();
     /**
@@ -35,55 +79,15 @@ export declare class AngularNodeAppEngine {
 }
 
 /**
- * A common engine to use to server render an application.
+ * Represents a middleware function for handling HTTP requests in a Node.js environment.
+ *
+ * @param req - The incoming HTTP request object.
+ * @param res - The outgoing HTTP response object.
+ * @param next - A callback function that signals the completion of the middleware or forwards the error if provided.
+ *
+ * @returns A Promise that resolves to void or simply void. The handler can be asynchronous.
  */
-export declare class CommonEngine {
-    private options?;
-    private readonly templateCache;
-    private readonly inlineCriticalCssProcessor;
-    private readonly pageIsSSG;
-    constructor(options?: CommonEngineOptions | undefined);
-    /**
-     * Render an HTML document for a specific URL with specified
-     * render options
-     */
-    render(opts: CommonEngineRenderOptions): Promise<string>;
-    private inlineCriticalCss;
-    private retrieveSSGPage;
-    private renderApplication;
-    /** Retrieve the document from the cache or the filesystem */
-    private getDocument;
-}
-
-export declare interface CommonEngineOptions {
-    /** A method that when invoked returns a promise that returns an `ApplicationRef` instance once resolved or an NgModule. */
-    bootstrap?: Type<{}> | (() => Promise<ApplicationRef>);
-    /** A set of platform level providers for all requests. */
-    providers?: StaticProvider[];
-    /** Enable request performance profiling data collection and printing the results in the server console. */
-    enablePerformanceProfiler?: boolean;
-}
-
-export declare interface CommonEngineRenderOptions {
-    /** A method that when invoked returns a promise that returns an `ApplicationRef` instance once resolved or an NgModule. */
-    bootstrap?: Type<{}> | (() => Promise<ApplicationRef>);
-    /** A set of platform level providers for the current request. */
-    providers?: StaticProvider[];
-    url?: string;
-    document?: string;
-    documentFilePath?: string;
-    /**
-     * Reduce render blocking requests by inlining critical CSS.
-     * Defaults to true.
-     */
-    inlineCriticalCss?: boolean;
-    /**
-     * Base path location of index file.
-     * Defaults to the 'documentFilePath' dirname when not provided.
-     */
-    publicPath?: string;
-}
-
+type NodeRequestHandlerFunction = (req: IncomingMessage, res: ServerResponse, next: (err?: unknown) => void) => Promise<void> | void;
 /**
  * Attaches metadata to the handler function to mark it as a special handler for Node.js environments.
  *
@@ -127,7 +131,20 @@ export declare interface CommonEngineRenderOptions {
  * }));
  * ```
  */
-export declare function createNodeRequestHandler<T extends NodeRequestHandlerFunction>(handler: T): T;
+declare function createNodeRequestHandler<T extends NodeRequestHandlerFunction>(handler: T): T;
+
+/**
+ * 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 response object (`ServerResponse` or `Http2ServerResponse`) to stream into.
+ * @returns A promise that resolves once the streaming operation is complete.
+ */
+declare function writeResponseToNodeResponse(source: Response, destination: ServerResponse | Http2ServerResponse): Promise<void>;
 
 /**
  * Converts a Node.js `IncomingMessage` or `Http2ServerRequest` into a
@@ -139,8 +156,7 @@ export declare function createNodeRequestHandler<T extends NodeRequestHandlerFun
  * @param nodeRequest - The Node.js request object (`IncomingMessage` or `Http2ServerRequest`) to convert.
  * @returns A Web Standard `Request` object.
  */
-export declare function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage | Http2ServerRequest): Request;
-
+declare function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage | Http2ServerRequest): Request;
 
 /**
  * Determines whether the provided URL represents the main entry point module.
@@ -157,30 +173,7 @@ export declare function createWebRequestFromNodeRequest(nodeRequest: IncomingMes
  * @param url The URL of the module to check. This should typically be `import.meta.url`.
  * @returns `true` if the provided URL represents the main entry point, otherwise `false`.
  */
-export declare function isMainModule(url: string): boolean;
-
-/**
- * Represents a middleware function for handling HTTP requests in a Node.js environment.
- *
- * @param req - The incoming HTTP request object.
- * @param res - The outgoing HTTP response object.
- * @param next - A callback function that signals the completion of the middleware or forwards the error if provided.
- *
- * @returns A Promise that resolves to void or simply void. The handler can be asynchronous.
- */
-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`
- * 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 response object (`ServerResponse` or `Http2ServerResponse`) to stream into.
- * @returns A promise that resolves once the streaming operation is complete.
- */
-export declare function writeResponseToNodeResponse(source: Response, destination: ServerResponse | Http2ServerResponse): Promise<void>;
+declare function isMainModule(url: string): boolean;
 
-export { }
+export { AngularNodeAppEngine, CommonEngine, createNodeRequestHandler, createWebRequestFromNodeRequest, isMainModule, writeResponseToNodeResponse };
+export type { CommonEngineOptions, CommonEngineRenderOptions, NodeRequestHandlerFunction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/ssr",
-  "version": "20.0.0-next.6",
+  "version": "20.0.0-next.7",
   "description": "Angular server side rendering utilities",
   "type": "module",
   "license": "MIT",
@@ -29,12 +29,12 @@
   },
   "devDependencies": {
     "@angular-devkit/schematics": "workspace:*",
-    "@angular/common": "20.0.0-next.6",
-    "@angular/compiler": "20.0.0-next.6",
-    "@angular/core": "20.0.0-next.6",
-    "@angular/platform-browser": "20.0.0-next.6",
-    "@angular/platform-server": "20.0.0-next.6",
-    "@angular/router": "20.0.0-next.6",
+    "@angular/common": "20.0.0-next.7",
+    "@angular/compiler": "20.0.0-next.7",
+    "@angular/core": "20.0.0-next.7",
+    "@angular/platform-browser": "20.0.0-next.7",
+    "@angular/platform-server": "20.0.0-next.7",
+    "@angular/router": "20.0.0-next.7",
     "@schematics/angular": "workspace:*"
   },
   "sideEffects": false,

package/third_party/beasties/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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.io/license
+ */
+
+export { default } from 'beasties';

package/third_party/beasties/index.js

@@ -11348,7 +11348,8 @@ function isSubpath(basePath, currentPath) {
 }
 
 const removePseudoClassesAndElementsPattern = /(?<!\\)::?[a-z-]+(?:\(.+\))?/gi;
-const doubleNestingPattern = />\s*(?=>|$)/g;
+const implicitUniversalPattern = /([>+~])\s*(?!\1)([>+~])/g;
+const emptyCombinatorPattern = /([>+~])\s*(?=\1|$)/g;
 const removeTrailingCommasPattern = /\(\s*,|,\s*\)/g;
 class Beasties {
   #selectorCache = /* @__PURE__ */ new Map();
@@ -11739,9 +11740,7 @@ class Beasties {
     if (failedSelectors.length !== 0) {
       this.logger.warn?.(
         `${failedSelectors.length} rules skipped due to selector errors:
-  ${failedSelectors.join(
-          "\n  "
-        )}`
+  ${failedSelectors.join("\n  ")}`
       );
     }
     const preloadedFonts = /* @__PURE__ */ new Set();
@@ -11820,7 +11819,7 @@ class Beasties {
     if (normalizedSelector !== void 0) {
       return normalizedSelector;
     }
-    normalizedSelector = sel.replace(removePseudoClassesAndElementsPattern, "").replace(removeTrailingCommasPattern, (match) => match.includes("(") ? "(" : ")").replace(doubleNestingPattern, "> *").trim();
+    normalizedSelector = sel.replace(removePseudoClassesAndElementsPattern, "").replace(removeTrailingCommasPattern, (match) => match.includes("(") ? "(" : ")").replace(implicitUniversalPattern, "$1 * $2").replace(emptyCombinatorPattern, "$1 *").trim();
     this.#selectorCache.set(sel, normalizedSelector);
     return normalizedSelector;
   }