@analogjs/platform 2.7.0-beta.1 → 2.7.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "2.7.0-beta.1",
+  "version": "2.7.0-beta.3",
   "description": "The fullstack meta-framework for Angular",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "nitropack": "^2.13.1",
-    "@analogjs/vite-plugin-angular": "^2.7.0-beta.1",
-    "@analogjs/vite-plugin-nitro": "^2.7.0-beta.1",
+    "@analogjs/vite-plugin-angular": "^2.7.0-beta.3",
+    "@analogjs/vite-plugin-nitro": "^2.7.0-beta.3",
     "oxc-parser": "^0.121.0",
     "vitefu": "^1.1.2"
   },

package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts

@@ -1,10 +1,10 @@
 export declare const V18_X_NX_DEVKIT = "^20.0.0";
 export declare const V18_X_NX_ANGULAR = "^20.0.0";
-export declare const V18_X_ANALOG_JS_CONTENT = "^2.7.0-beta.1";
-export declare const V18_X_ANALOG_JS_ROUTER = "^2.7.0-beta.1";
+export declare const V18_X_ANALOG_JS_CONTENT = "^2.7.0-beta.3";
+export declare const V18_X_ANALOG_JS_ROUTER = "^2.7.0-beta.3";
 export declare const V18_X_ANALOG_JS_TRPC = "~0.4.0";
-export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.0-beta.1";
-export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.0-beta.1";
+export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.0-beta.3";
+export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.0-beta.3";
 export declare const V18_X_TRPC_CLIENT = "^10.25.0";
 export declare const V18_X_TRPC_SERVER = "^10.25.0";
 export declare const V18_X_ISOMORPHIC_FETCH = "^3.0.0";
@@ -20,7 +20,7 @@ export declare const V18_X_TAILWINDCSS = "^4.1.4";
 export declare const V18_X_TAILWINDCSS_VITE = "^4.1.4";
 export declare const V18_X_POSTCSS = "^8.5.3";
 export declare const V18_X_AUTOPREFIXER = "^10.4.0";
-export declare const V18_X_ANALOG_JS_PLATFORM = "^2.7.0-beta.1";
+export declare const V18_X_ANALOG_JS_PLATFORM = "^2.7.0-beta.3";
 export declare const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = "^19.0.0";
 export declare const V18_X_NX_VITE = "^21.0.0";
 export declare const V18_X_NX_LINTER = "^21.0.0";

package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js

@@ -5,11 +5,11 @@ exports.V18_X_ZOD = exports.V18_X_VITEST = exports.V18_X_VITE_TSCONFIG_PATHS = e
 // dependencies
 exports.V18_X_NX_DEVKIT = '^20.0.0';
 exports.V18_X_NX_ANGULAR = '^20.0.0';
-exports.V18_X_ANALOG_JS_CONTENT = '^2.7.0-beta.1';
-exports.V18_X_ANALOG_JS_ROUTER = '^2.7.0-beta.1';
+exports.V18_X_ANALOG_JS_CONTENT = '^2.7.0-beta.3';
+exports.V18_X_ANALOG_JS_ROUTER = '^2.7.0-beta.3';
 exports.V18_X_ANALOG_JS_TRPC = '~0.4.0';
-exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.0-beta.1';
-exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.0-beta.1';
+exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.0-beta.3';
+exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.0-beta.3';
 exports.V18_X_TRPC_CLIENT = '^10.25.0';
 exports.V18_X_TRPC_SERVER = '^10.25.0';
 exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
@@ -26,7 +26,7 @@ exports.V18_X_TAILWINDCSS_VITE = '^4.1.4';
 exports.V18_X_POSTCSS = '^8.5.3';
 exports.V18_X_AUTOPREFIXER = '^10.4.0';
 // devDependencies
-exports.V18_X_ANALOG_JS_PLATFORM = '^2.7.0-beta.1';
+exports.V18_X_ANALOG_JS_PLATFORM = '^2.7.0-beta.3';
 exports.V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
 exports.V18_X_NX_VITE = '^21.0.0';
 exports.V18_X_NX_LINTER = '^21.0.0';

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts

@@ -1,13 +1,13 @@
-export declare const V19_X_ANALOG_JS_ROUTER = "^2.7.0-beta.1";
-export declare const V19_X_ANALOG_JS_CONTENT = "^2.7.0-beta.1";
+export declare const V19_X_ANALOG_JS_ROUTER = "^2.7.0-beta.3";
+export declare const V19_X_ANALOG_JS_CONTENT = "^2.7.0-beta.3";
 export declare const V19_X_MARKED = "^15.0.7";
 export declare const V19_X_MARKED_GFM_HEADING_ID = "^4.1.1";
 export declare const V19_X_MARKED_HIGHLIGHT = "^2.2.1";
 export declare const V19_X_MARKED_MANGLE = "^1.1.10";
 export declare const V19_X_PRISMJS = "^1.29.0";
-export declare const V19_X_ANALOG_JS_PLATFORM = "^2.7.0-beta.1";
-export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.0-beta.1";
-export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.0-beta.1";
+export declare const V19_X_ANALOG_JS_PLATFORM = "^2.7.0-beta.3";
+export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.0-beta.3";
+export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.0-beta.3";
 export declare const V19_X_NX_ANGULAR = "^22.0.0";
 export declare const V19_X_NX_VITE = "^22.0.0";
 export declare const V19_X_JSDOM = "^22.0.0";

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_X_LATEST_NX = exports.NX_X_LATEST_VITEST = exports.NX_X_LATEST_VITE = exports.V19_X_VITE = exports.V19_X_VITEST = exports.V19_X_VITE_TSCONFIG_PATHS = exports.V19_X_JSDOM = exports.V19_X_NX_VITE = exports.V19_X_NX_ANGULAR = exports.V19_X_ANALOG_JS_VITEST_ANGULAR = exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V19_X_ANALOG_JS_PLATFORM = exports.V19_X_PRISMJS = exports.V19_X_MARKED_MANGLE = exports.V19_X_MARKED_HIGHLIGHT = exports.V19_X_MARKED_GFM_HEADING_ID = exports.V19_X_MARKED = exports.V19_X_ANALOG_JS_CONTENT = exports.V19_X_ANALOG_JS_ROUTER = void 0;
 // V19_X
-exports.V19_X_ANALOG_JS_ROUTER = '^2.7.0-beta.1';
-exports.V19_X_ANALOG_JS_CONTENT = '^2.7.0-beta.1';
+exports.V19_X_ANALOG_JS_ROUTER = '^2.7.0-beta.3';
+exports.V19_X_ANALOG_JS_CONTENT = '^2.7.0-beta.3';
 exports.V19_X_MARKED = '^15.0.7';
 exports.V19_X_MARKED_GFM_HEADING_ID = '^4.1.1';
 exports.V19_X_MARKED_HIGHLIGHT = '^2.2.1';
 exports.V19_X_MARKED_MANGLE = '^1.1.10';
 exports.V19_X_PRISMJS = '^1.29.0';
 // devDependencies
-exports.V19_X_ANALOG_JS_PLATFORM = '^2.7.0-beta.1';
-exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.0-beta.1';
-exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.0-beta.1';
+exports.V19_X_ANALOG_JS_PLATFORM = '^2.7.0-beta.3';
+exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.0-beta.3';
+exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.0-beta.3';
 exports.V19_X_NX_ANGULAR = '^22.0.0';
 exports.V19_X_NX_VITE = '^22.0.0';
 exports.V19_X_JSDOM = '^22.0.0';

package/src/lib/options.d.ts

@@ -5,9 +5,15 @@ import { ContentPluginOptions } from './content-plugin.js';
 declare module 'nitropack' {
     interface NitroRouteConfig {
         ssr?: boolean;
+        /**
+         * Disable progressive streaming SSR for matching routes (falls back to a
+         * buffered render). Only meaningful when `experimental.streaming` is on.
+         */
+        streaming?: boolean;
     }
     interface NitroRouteRules {
         ssr?: boolean;
+        streaming?: boolean;
     }
 }
 export interface PrerenderOptions {
@@ -124,5 +130,18 @@ export interface Options {
      * the LOCALE injection token.
      */
     i18n?: I18nOptions;
+    /**
+     * Opt-in experimental features that are not yet stable.
+     */
+    experimental?: {
+        /**
+         * Opt into progressive streaming SSR. When enabled, the SSR build patches
+         * `@angular/core` with a per-`@defer` block resolution hook so
+         * `@analogjs/router`'s `renderStream` can flush the document head first and
+         * each `@defer (hydrate …)` block as it resolves on the server. Has no
+         * effect unless the server entry uses `renderStream`.
+         */
+        streaming?: boolean;
+    };
 }
 export { PrerenderContentDir, PrerenderContentFile };

package/src/lib/platform-plugin.js

@@ -1,7 +1,10 @@
+import { createRequire } from 'node:module';
+import { join } from 'node:path';
 import viteNitroPlugin from '@analogjs/vite-plugin-nitro';
 import angular from '@analogjs/vite-plugin-angular';
 import { routerPlugin } from './router-plugin.js';
 import { ssrBuildPlugin, i18nDefRegistryPlugin, } from './ssr/ssr-build-plugin.js';
+import { deferStreamingPlugin, streamingSupportedOnAngular, MIN_STREAMING_ANGULAR_MAJOR, } from './ssr/defer-streaming-plugin.js';
 import { contentPlugin } from './content-plugin.js';
 import { clearClientPageEndpointsPlugin } from './clear-client-page-endpoint.js';
 import { ssrXhrBuildPlugin } from './ssr/ssr-xhr-plugin.js';
@@ -9,12 +12,46 @@ import { depsPlugin } from './deps-plugin.js';
 import { injectHTMLPlugin } from './ssr/inject-html-plugin.js';
 import { serverModePlugin } from '../server-mode-plugin.js';
 import { i18nExtractPlugin } from './i18n-extract-plugin.js';
+/**
+ * The installed `@angular/core` major version, resolved from the workspace root
+ * (where the app's Angular is installed). Returns `null` when it cannot be
+ * detected, in which case streaming is not blocked and the build-time
+ * anchor-drift detection is relied on instead.
+ */
+function getAngularCoreMajor(workspaceRoot) {
+    try {
+        const req = createRequire(join(workspaceRoot, 'noop.js'));
+        const { version } = req('@angular/core/package.json');
+        const major = Number.parseInt(version.split('.')[0], 10);
+        return Number.isNaN(major) ? null : major;
+    }
+    catch {
+        return null;
+    }
+}
 export function platformPlugin(opts = {}) {
     const isTest = process.env['NODE_ENV'] === 'test' || !!process.env['VITEST'];
     const { ...platformOptions } = {
         ssr: true,
         ...opts,
     };
+    // Gate experimental streaming SSR on an Angular version whose compiled
+    // @angular/core matches the patch anchors (see MIN_STREAMING_ANGULAR_MAJOR).
+    // Reflect the gated value back onto platformOptions so the nitro renderer
+    // selection and the deferStreamingPlugin registration below stay consistent —
+    // never select the streaming renderer without applying the patch.
+    if (platformOptions.ssr && platformOptions.experimental?.streaming) {
+        const major = getAngularCoreMajor(platformOptions.workspaceRoot ?? process.cwd());
+        if (!streamingSupportedOnAngular(major)) {
+            console.warn(`[@analogjs/platform] experimental.streaming requires Angular ` +
+                `${MIN_STREAMING_ANGULAR_MAJOR}+ (detected v${major}); streaming is ` +
+                `disabled and rendering falls back to buffered SSR.`);
+            platformOptions.experimental = {
+                ...platformOptions.experimental,
+                streaming: false,
+            };
+        }
+    }
     let nitroOptions = platformOptions?.nitro;
     if (nitroOptions?.routeRules) {
         nitroOptions = {
@@ -27,6 +64,7 @@ export function platformPlugin(opts = {}) {
                         headers: {
                             ...config[curr].headers,
                             'x-analog-no-ssr': config[curr]?.ssr === false ? 'true' : undefined,
+                            'x-analog-no-streaming': config[curr]?.streaming === false ? 'true' : undefined,
                         },
                     },
                 };
@@ -36,6 +74,9 @@ export function platformPlugin(opts = {}) {
     return [
         ...viteNitroPlugin(platformOptions, nitroOptions),
         ...(platformOptions.ssr ? [ssrBuildPlugin(), ...injectHTMLPlugin()] : []),
+        ...(platformOptions.ssr && platformOptions.experimental?.streaming
+            ? [deferStreamingPlugin()]
+            : []),
         ...(!isTest ? depsPlugin(platformOptions) : []),
         ...routerPlugin(platformOptions),
         ...contentPlugin(platformOptions?.content, platformOptions),
@@ -66,4 +107,4 @@ export function platformPlugin(opts = {}) {
             : []),
     ];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxlQUFlLE1BQU0sNkJBQTZCLENBQUM7QUFDMUQsT0FBTyxPQUFPLE1BQU0sK0JBQStCLENBQUM7QUFHcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sRUFDTCxjQUFjLEVBQ2QscUJBQXFCLEdBQ3RCLE1BQU0sMkJBQTJCLENBQUM7QUFDbkMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3BELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCxNQUFNLFVBQVUsY0FBYyxDQUFDLE9BQWdCLEVBQUU7SUFDL0MsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxNQUFNLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDN0UsTUFBTSxFQUFFLEdBQUcsZUFBZSxFQUFFLEdBQUc7UUFDN0IsR0FBRyxFQUFFLElBQUk7UUFDVCxHQUFHLElBQUk7S0FDUixDQUFDO0lBRUYsSUFBSSxZQUFZLEdBQUcsZUFBZSxFQUFFLEtBQUssQ0FBQztJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM1QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ2pDLE9BQU8sZUFBZSxNQUFNLDZCQUE2QixDQUFDO0FBQzFELE9BQU8sT0FBTyxNQUFNLCtCQUErQixDQUFDO0FBR3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEVBQ0wsY0FBYyxFQUNkLHFCQUFxQixHQUN0QixNQUFNLDJCQUEyQixDQUFDO0FBQ25DLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsMkJBQTJCLEVBQzNCLDJCQUEyQixHQUM1QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDL0QsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7Ozs7O0dBS0c7QUFDSCxTQUFTLG1CQUFtQixDQUFDLGFBQXFCO0lBQ2hELElBQUksQ0FBQztRQUNILE1BQU0sR0FBRyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLFNBQVMsQ0FB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

package/src/lib/ssr/defer-streaming-plugin.d.ts

@@ -0,0 +1,65 @@
+import type { Plugin } from 'vite';
+/**
+ * Minimum Angular major whose compiled `@angular/core` FESM matches the
+ * streaming patch anchors. Incremental hydration is a stable public API from
+ * v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
+ * the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
+ * ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
+ * form the anchor matches on. Keying on the literal ordinal would be fragile
+ * (enum values shift between versions), so v21 is the floor.
+ */
+export declare const MIN_STREAMING_ANGULAR_MAJOR = 21;
+/**
+ * Whether the streaming SSR patch can be applied to the installed Angular.
+ * A `null` major (version undetectable) returns `true`: don't block on a failed
+ * detection — the plugin's anchor-drift detection catches a real mismatch at
+ * build time and falls back to buffered rendering.
+ */
+export declare function streamingSupportedOnAngular(major: number | null): boolean;
+/**
+ * Pure transform that injects the streaming-SSR per-block resolution hook into
+ * `@angular/core`'s compiled output. It is the same class of transform as
+ * `i18nDefRegistryPlugin` in ./ssr-build-plugin — a string patch of Angular's
+ * bundle applied only to SSR builds. Exported separately so it can be unit
+ * tested against a bundle string.
+ *
+ * Two edits, both keyed on single-occurrence anchors in the module that holds
+ * the defer runtime:
+ *   1. Inside `applyDeferBlockState`, fire `globalThis.__analogSsrDeferCapture`
+ *      when a `@defer` block reaches `Complete` on the server, passing the
+ *      block's live `lContainer` — this is the per-block resolution signal a
+ *      streaming renderer consumes.
+ *   2. Expose `collectNativeNodesInLContainer` via `globalThis.__analogSsrInternals`
+ *      so the renderer can serialize a block's subtree.
+ *
+ * Returns `null` when the module is not the one carrying the defer runtime, so
+ * it is a no-op on every other Angular module.
+ */
+export declare function injectDeferStreamingHook(code: string): string | null;
+/**
+ * Classify an `@angular/core` module for the streaming patch. The patch anchors
+ * on internal symbol names, so when Angular changes those the transform would
+ * otherwise become a silent no-op and streaming would degrade to buffered with
+ * no signal. This distinguishes "not the target module" (skip quietly) from
+ * "this IS the `@defer` runtime module but the anchors drifted" (worth warning).
+ */
+export declare function inspectAngularCoreModule(code: string): {
+    kind: 'not-target';
+} | {
+    kind: 'patchable';
+} | {
+    kind: 'drifted';
+    reason: string;
+};
+/**
+ * Vite plugin that applies {@link injectDeferStreamingHook} to `@angular/core`
+ * during SSR builds, so `@analogjs/router`'s `renderStream` can flush `@defer`
+ * blocks as they resolve on the server — without hand-patching node_modules.
+ *
+ * Only active for SSR. Mirrors the enforce/filter/ssr-gate shape of
+ * `i18nDefRegistryPlugin`. If the `@defer` runtime module is found but its
+ * anchors have drifted (Angular changed internals), or if it is never
+ * encountered at all, the plugin warns rather than silently producing a build
+ * that falls back to buffered rendering.
+ */
+export declare function deferStreamingPlugin(): Plugin;

package/src/lib/ssr/defer-streaming-plugin.js

@@ -0,0 +1,135 @@
+/**
+ * Minimum Angular major whose compiled `@angular/core` FESM matches the
+ * streaming patch anchors. Incremental hydration is a stable public API from
+ * v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
+ * the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
+ * ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
+ * form the anchor matches on. Keying on the literal ordinal would be fragile
+ * (enum values shift between versions), so v21 is the floor.
+ */
+export const MIN_STREAMING_ANGULAR_MAJOR = 21;
+/**
+ * Whether the streaming SSR patch can be applied to the installed Angular.
+ * A `null` major (version undetectable) returns `true`: don't block on a failed
+ * detection — the plugin's anchor-drift detection catches a real mismatch at
+ * build time and falls back to buffered rendering.
+ */
+export function streamingSupportedOnAngular(major) {
+    return major === null || major >= MIN_STREAMING_ANGULAR_MAJOR;
+}
+/**
+ * Pure transform that injects the streaming-SSR per-block resolution hook into
+ * `@angular/core`'s compiled output. It is the same class of transform as
+ * `i18nDefRegistryPlugin` in ./ssr-build-plugin — a string patch of Angular's
+ * bundle applied only to SSR builds. Exported separately so it can be unit
+ * tested against a bundle string.
+ *
+ * Two edits, both keyed on single-occurrence anchors in the module that holds
+ * the defer runtime:
+ *   1. Inside `applyDeferBlockState`, fire `globalThis.__analogSsrDeferCapture`
+ *      when a `@defer` block reaches `Complete` on the server, passing the
+ *      block's live `lContainer` — this is the per-block resolution signal a
+ *      streaming renderer consumes.
+ *   2. Expose `collectNativeNodesInLContainer` via `globalThis.__analogSsrInternals`
+ *      so the renderer can serialize a block's subtree.
+ *
+ * Returns `null` when the module is not the one carrying the defer runtime, so
+ * it is a no-op on every other Angular module.
+ */
+export function injectDeferStreamingHook(code) {
+    const END_ANCHOR = 'profiler(ProfilerEvent.DeferBlockStateEnd);';
+    if (!code.includes('function applyDeferBlockState(') ||
+        !code.includes(END_ANCHOR)) {
+        return null;
+    }
+    // Wrap the entire guard — not just the call — so a drifted Angular runtime
+    // that still matches the anchors but renamed these locals fails as a silent
+    // no-op instead of throwing a ReferenceError inside applyDeferBlockState.
+    const capture = `try { if (newState === DeferBlockState.Complete && ` +
+        `typeof ngServerMode !== 'undefined' && ngServerMode && ` +
+        `typeof globalThis.__analogSsrDeferCapture === 'function') { ` +
+        `globalThis.__analogSsrDeferCapture({ ssrUniqueId: lDetails[SSR_UNIQUE_ID], lContainer, hostLView }); } } catch (e) {}\n  `;
+    let out = code.replace(END_ANCHOR, capture + END_ANCHOR);
+    if (code.includes('function collectNativeNodesInLContainer(')) {
+        out +=
+            '\nglobalThis.__analogSsrInternals = Object.assign(globalThis.__analogSsrInternals || {}, { collectNativeNodesInLContainer });\n';
+    }
+    return out;
+}
+/**
+ * Classify an `@angular/core` module for the streaming patch. The patch anchors
+ * on internal symbol names, so when Angular changes those the transform would
+ * otherwise become a silent no-op and streaming would degrade to buffered with
+ * no signal. This distinguishes "not the target module" (skip quietly) from
+ * "this IS the `@defer` runtime module but the anchors drifted" (worth warning).
+ */
+export function inspectAngularCoreModule(code) {
+    if (!code.includes('function applyDeferBlockState(')) {
+        return { kind: 'not-target' };
+    }
+    const missing = [];
+    if (!code.includes('profiler(ProfilerEvent.DeferBlockStateEnd);')) {
+        missing.push('DeferBlockStateEnd profiler anchor');
+    }
+    if (!code.includes('function collectNativeNodesInLContainer(')) {
+        missing.push('collectNativeNodesInLContainer');
+    }
+    return missing.length === 0
+        ? { kind: 'patchable' }
+        : { kind: 'drifted', reason: `missing ${missing.join(', ')}` };
+}
+/**
+ * Vite plugin that applies {@link injectDeferStreamingHook} to `@angular/core`
+ * during SSR builds, so `@analogjs/router`'s `renderStream` can flush `@defer`
+ * blocks as they resolve on the server — without hand-patching node_modules.
+ *
+ * Only active for SSR. Mirrors the enforce/filter/ssr-gate shape of
+ * `i18nDefRegistryPlugin`. If the `@defer` runtime module is found but its
+ * anchors have drifted (Angular changed internals), or if it is never
+ * encountered at all, the plugin warns rather than silently producing a build
+ * that falls back to buffered rendering.
+ */
+export function deferStreamingPlugin() {
+    let applied = false;
+    let warnedDrift = false;
+    return {
+        name: 'analogjs-defer-streaming',
+        enforce: 'post',
+        transform: {
+            filter: {
+                id: /\/@angular\/core\//,
+            },
+            handler(code, _id, options) {
+                if (!options?.ssr)
+                    return;
+                const info = inspectAngularCoreModule(code);
+                if (info.kind === 'not-target')
+                    return;
+                if (info.kind === 'drifted') {
+                    if (!warnedDrift) {
+                        warnedDrift = true;
+                        this.warn(`experimental streaming SSR: found @angular/core's @defer runtime ` +
+                            `but could not apply the resolution hook (${info.reason}). The ` +
+                            `installed Angular version likely changed internals the patch ` +
+                            `depends on; streaming will fall back to buffered rendering.`);
+                    }
+                    return;
+                }
+                const out = injectDeferStreamingHook(code);
+                if (!out)
+                    return;
+                applied = true;
+                return { code: out };
+            },
+        },
+        buildEnd() {
+            if (!applied && !warnedDrift) {
+                this.warn(`experimental streaming SSR is enabled but @angular/core's @defer ` +
+                    `runtime module was never encountered during the SSR build, so the ` +
+                    `resolution hook was not injected. Streaming will fall back to ` +
+                    `buffered rendering.`);
+            }
+        },
+    };
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmZXItc3RyZWFtaW5nLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvc3NyL2RlZmVyLXN0cmVhbWluZy1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUE7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLENBQUMsTUFBTSwyQkFBMkIsR0FBRyxFQUFFLENBQUM7QUFFOUM7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsMkJBQTJCLENBQUMsS0FBb0I7SUFDOUQsT0FBTyxLQUFLLEtBQUssSUFBSSxJQUFJLEtBQUssSUFBSSwyQkFBMkIsQ0FBQztBQUNoRSxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUNILE1BQU0sVUFBVSx3QkFBd0IsQ0FBQyxJQUFZO0lBQ25ELE1BQU0sVUFBVSxHQUFHLDZDQUE2QyxDQUFDO0lBQ2pFLElBQ0UsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGdDQUFnQyxDQUFDO1FBQ2hELENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsRUFDMUIsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELDJFQUEyRTtJQUMzRSw0RUFBNEU7SUFDNUUsMEVBQTBFO0lBQzFFLE1BQU0sT0FBTyxHQUNYLHFEQUFxRDtRQUNyRCx5REFBeUQ7UUFDekQsOERBQThEO1FBQzlELDJIQUEySCxDQUFDO0lBRTlILElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLE9BQU8sR0FBRyxVQUFVLENBQUMsQ0FBQztJQUV6RCxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsMENBQTBDLENBQUMsRUFBRSxDQUFDO1FBQzlELEdBQUc7WUFDRCxpSUFBaUksQ0FBQztJQUN0SSxDQUFDO0lBRUQsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFB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