@bleedingdev/modern-js-renderer-octane 3.9.3-ultramodern.7 → 3.9.3-ultramodern.8

package/dist/esm/server.mjs

@@ -1,5 +1,6 @@
 import { prepareDocument } from "@modern-js/renderer-core/document";
 import { untilAborted } from "@modern-js/renderer-core/session";
+import { transformReadableStreamWithRouter } from "@octanejs/tanstack-router/ssr/server";
 import { createElement, earlySignalBootstrapScript, renderToReadableStream } from "octane/server";
 import { assertNativeHydrationBuildId, assertOctaneIdentity } from "./bootstrap.mjs";
 import { FederationRoot, createFederationScope } from "./federation-context.mjs";
@@ -174,7 +175,14 @@ async function renderOctaneApplication(input) {
         }, {
             highWaterMark: 0
         });
-        return session.respond(body);
+        return session.respond(input.router ? transformReadableStreamWithRouter(input.router, body, {
+            signal: session.signal,
+            rendererSafePoint: "script-close",
+            timeoutMs: input.routerSerializationTimeoutMs,
+            onAbort: (reason)=>{
+                session.fail(reason);
+            }
+        }) : body);
     } catch (error) {
         await session.fail(error);
         throw error;

package/dist/esm-node/manifest.mjs

@@ -1,7 +1,7 @@
 import { nativeModuleManifestFilename, readRendererIdentity } from "@modern-js/renderer-core/identity";
 import { assertNativeHydrationBuildId, assertOctaneIdentity } from "./bootstrap.mjs";
-const OCTANE_RUNTIME_VERSION = '0.7.1+ultramodern.1331985ea3b0';
-const OCTANE_COMPILER_VERSION = '0.1.55';
+const OCTANE_RUNTIME_VERSION = '0.13.8';
+const OCTANE_COMPILER_VERSION = '0.2.4';
 function octaneModuleManifestFileName(entryName) {
     return nativeModuleManifestFilename('octane', entryName);
 }

package/dist/esm-node/plugin/compiler.mjs

@@ -20,7 +20,8 @@ function createOctaneCompilerPlugin(options) {
             const directory = pluginSourceDirectory();
             const require = createRequire(node_path.join(directory, 'index.cjs'));
             const { OctaneCompilerManifestPlugin } = require('./compiler-manifest.cjs');
-            const { inferRspackEnvironment, OctaneRspackPlugin } = require('@octanejs/rspack-plugin');
+            const appRequire = createRequire(node_path.join(api.context.rootPath, 'package.json'));
+            const { inferRspackEnvironment, OctaneRspackPlugin } = appRequire('@octanejs/rspack-plugin');
             api.modifyRsbuildConfig((config, { mergeRsbuildConfig })=>mergeRsbuildConfig(config, {
                     source: {
                         include: [
@@ -30,10 +31,6 @@ function createOctaneCompilerPlugin(options) {
                 }));
             api.modifyRspackConfig((config, { environment: rsbuildEnvironment })=>{
                 const environment = rsbuildEnvironment.name === options.workerEnvironmentName ? 'server' : inferRspackEnvironment(config.target);
-                config.resolve ??= {};
-                const extensions = (config.resolve.extensions ?? []).filter((extension)=>'.tsrx' !== extension);
-                extensions.splice(Math.max(extensions.indexOf('.ts'), extensions.indexOf('.tsx')) + 1, 0, '.tsrx');
-                config.resolve.extensions = extensions;
                 config.plugins ??= [];
                 config.plugins.push(new OctaneRspackPlugin({
                     root: api.context.rootPath,

package/dist/esm-node/plugin/index.mjs

@@ -86,7 +86,7 @@ const rendererAdapter = defineRendererAdapter({
                 ],
                 dependencies: nativeRendererDependencies(profile),
                 devDependencies: {
-                    [profile.compiler.name]: profile.compiler.version,
+                    [profile.compiler.name]: profile.dependencies[profile.compiler.name] ?? profile.compiler.version,
                     typescript: typescriptVersion
                 },
                 typecheckCommand: 'octane-tsc --noEmit --project tsconfig.json',

package/dist/esm-node/plugin/profile.mjs

@@ -2,7 +2,7 @@ const octaneProfile = {
     renderer: 'octane',
     status: 'preview',
     protocolVersion: 1,
-    minimumNode: '26.10.0',
+    minimumNode: '26.12.0',
     hmr: {
         editedBoundary: 'may-reset',
         unaffectedComponents: 'preserved',
@@ -12,17 +12,17 @@ const octaneProfile = {
     },
     compiler: {
         name: '@octanejs/rspack-plugin',
-        version: '0.1.55'
+        version: '0.2.4'
     },
     hydration: {
         name: 'octane',
-        version: '0.7.1+ultramodern.1331985ea3b0'
+        version: '0.13.8'
     },
     router: {
         name: '@octanejs/tanstack-router',
-        version: '0.1.60+ultramodern.0b9f76ee3003',
+        version: '0.2.10',
         coreName: '@tanstack/router-core',
-        coreVersion: '1.171.15'
+        coreVersion: '1.171.34'
     },
     sourceExtensions: [
         '.tsx',
@@ -32,12 +32,13 @@ const octaneProfile = {
     ],
     jsxImportSource: 'octane',
     dependencies: {
-        octane: 'https://github.com/bleedingdev/octane/releases/download/octane%400.7.1%2Bultramodern.1331985ea3b0/octane-0.7.1%2Bultramodern.1331985ea3b0.tgz',
-        '@octanejs/tanstack-router': 'https://github.com/bleedingdev/octane/releases/download/%40octanejs%2Ftanstack-router%400.1.60%2Bultramodern.0b9f76ee3003/octanejs-tanstack-router-0.1.60%2Bultramodern.0b9f76ee3003.tgz',
-        '@octanejs/rspack-plugin': '0.1.55',
+        '@tsrx/oxc': '0.20.0',
+        octane: 'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octane-0.13.8.tgz',
+        '@octanejs/tanstack-router': 'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octanejs-tanstack-router-0.2.10.tgz',
+        '@octanejs/rspack-plugin': 'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octanejs-rspack-plugin-0.2.4.tgz',
         '@modern-js/renderer-octane': '3.8.3',
-        seroval: '1.6.8',
-        'seroval-plugins': '1.6.8'
+        seroval: '1.6.9',
+        'seroval-plugins': '1.6.9'
     },
     capabilities: {
         worker: true,

package/dist/types/index.d.ts

@@ -2,8 +2,8 @@ export type { RendererIdentity } from '@modern-js/renderer-core/identity';
 export type { OctaneDocumentBootstrap } from './bootstrap';
 export declare const OCTANE_RUNTIME_PROFILE: Readonly<{
     renderer: "octane";
-    runtime: "0.7.1+ultramodern.1331985ea3b0";
-    router: "0.1.60+ultramodern.0b9f76ee3003";
-    routerCore: "1.171.15";
-    history: "1.162.0";
+    runtime: "0.13.8";
+    router: "0.2.10";
+    routerCore: "1.171.34";
+    history: "1.162.4";
 }>;

package/dist/types/manifest.d.ts

@@ -1,7 +1,7 @@
 import type { NativeCompilerArtifacts } from '@modern-js/renderer-core/adapter';
 import { type RendererIdentity } from '@modern-js/renderer-core/identity';
-export declare const OCTANE_RUNTIME_VERSION = "0.7.1+ultramodern.1331985ea3b0";
-export declare const OCTANE_COMPILER_VERSION = "0.1.55";
+export declare const OCTANE_RUNTIME_VERSION = "0.13.8";
+export declare const OCTANE_COMPILER_VERSION = "0.2.4";
 export interface OctaneCompiledSource {
     readonly resource: string;
     readonly canonicalId: string;

package/dist/types/router-server.d.ts

@@ -3,8 +3,6 @@ import { type ServerRenderNode } from 'octane/server';
 export * from '@octanejs/tanstack-router/ssr/server';
 export type { OctaneRequestHandlerOptions } from './router-handler';
 export { createOctaneRequestHandler } from './router-handler';
-export type { OctaneRouterInjectionOptions } from './router-injection';
-export { createOctaneRouterInjection } from './router-injection';
 export type { OctaneRouterSerializationGuard, OctaneRouterSerializationOptions, } from './router-server-snapshot';
 export { prepareOctaneRouterSerialization } from './router-server-snapshot';
 /** Render the native provider using the released Start server root contract. */

package/dist/types/server.d.ts

@@ -1,6 +1,7 @@
 import { type DocumentAsset, type DocumentInlineData } from '@modern-js/renderer-core/document';
 import type { NativeFederationBinding } from '@modern-js/renderer-core/federation';
 import { type RequestSession, type ResponsePolicy } from '@modern-js/renderer-core/session';
+import type { AnyRouter } from '@octanejs/tanstack-router';
 import { type ServerRenderNode, type StreamOptions } from 'octane/server';
 export interface OctaneDocumentOptions {
     /** One identity for this response, shared with the client's signal receiver. */
@@ -27,6 +28,8 @@ export interface RenderOctaneApplicationOptions<Bindings extends object = object
     readonly props?: unknown;
     /** Native router serialization, owned by this request's router SSR context. */
     readonly injection?: StreamOptions['injection'];
+    readonly router?: AnyRouter;
+    readonly routerSerializationTimeoutMs?: number;
     /** This server compilation's native Module Federation runtime. */
     readonly federation?: NativeFederationBinding;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bleedingdev/modern-js-renderer-octane",
-  "version": "3.9.3-ultramodern.7",
+  "version": "3.9.3-ultramodern.8",
   "description": "UltraModern native Octane application adapter.",
   "license": "MIT",
   "repository": {
@@ -149,23 +149,24 @@
     "octane-tsc": "bin/octane-tsc.mjs"
   },
   "engines": {
-    "node": ">=26.10.0"
+    "node": ">=26.12.0"
   },
   "dependencies": {
-    "@modern-js/renderer-core": "npm:@bleedingdev/modern-js-renderer-core@3.9.3-ultramodern.7",
+    "@modern-js/renderer-core": "npm:@bleedingdev/modern-js-renderer-core@3.9.3-ultramodern.8",
     "@volar/language-core": "2.4.28",
     "jsonc-parser": "3.3.1",
-    "seroval": "1.6.8",
-    "seroval-plugins": "1.6.8",
+    "seroval": "1.6.9",
+    "seroval-plugins": "1.6.9",
     "typescript": "7.0.2"
   },
   "peerDependencies": {
-    "@modern-js/i18n-runtime-extensions": "3.9.3-ultramodern.7",
-    "@octanejs/rspack-plugin": "0.1.55",
-    "@octanejs/tanstack-router": "0.1.60+ultramodern.0b9f76ee3003",
-    "@rsbuild/core": "2.2.11",
+    "@modern-js/i18n-runtime-extensions": "3.9.3-ultramodern.8",
+    "@octanejs/rspack-plugin": "0.2.4",
+    "@octanejs/tanstack-router": "0.2.10",
+    "@rsbuild/core": "2.2.13",
+    "@tsrx/oxc": "0.20.0",
     "i18next": ">=25.7.4",
-    "octane": "0.7.1+ultramodern.1331985ea3b0"
+    "octane": "0.13.8"
   },
   "peerDependenciesMeta": {
     "@modern-js/i18n-runtime-extensions": {
@@ -180,6 +181,9 @@
     "@rsbuild/core": {
       "optional": true
     },
+    "@tsrx/oxc": {
+      "optional": true
+    },
     "i18next": {
       "optional": true
     },
@@ -188,16 +192,17 @@
     }
   },
   "devDependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.3-ultramodern.7",
-    "@modern-js/tsconfig": "npm:@bleedingdev/modern-js-tsconfig@3.9.3-ultramodern.7",
-    "@octanejs/rspack-plugin": "0.1.55",
-    "@octanejs/tanstack-router": "https://github.com/bleedingdev/octane/releases/download/%40octanejs%2Ftanstack-router%400.1.60%2Bultramodern.0b9f76ee3003/octanejs-tanstack-router-0.1.60%2Bultramodern.0b9f76ee3003.tgz",
-    "@rsbuild/core": "2.2.11",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.3-ultramodern.8",
+    "@modern-js/tsconfig": "npm:@bleedingdev/modern-js-tsconfig@3.9.3-ultramodern.8",
+    "@octanejs/rspack-plugin": "https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octanejs-rspack-plugin-0.2.4.tgz",
+    "@octanejs/tanstack-router": "https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octanejs-tanstack-router-0.2.10.tgz",
+    "@rsbuild/core": "2.2.13",
     "@rslib/core": "1.0.3",
     "@scripts/rstest-config": "2.66.0",
-    "@types/node": "^26.6.3",
-    "happy-dom": "^20.14.5",
-    "octane": "https://github.com/bleedingdev/octane/releases/download/octane%400.7.1%2Bultramodern.1331985ea3b0/octane-0.7.1%2Bultramodern.1331985ea3b0.tgz",
+    "@tsrx/oxc": "0.20.0",
+    "@types/node": "^26.6.5",
+    "happy-dom": "^21.0.3",
+    "octane": "https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octane-0.13.8.tgz",
     "typescript": "7.0.2"
   },
   "sideEffects": false,

package/src/entry-server.ts

@@ -23,8 +23,8 @@ import {
 import { validateOctaneModuleManifest } from './manifest';
 import {
   createOctaneRequestHandler,
-  createOctaneRouterInjection,
   createSsrStreamResponse,
+  getSsrStatus,
   OctaneRouterServer,
 } from './router-server';
 import { renderOctaneApplication, renderOctaneCSRDocument } from './server';
@@ -100,7 +100,7 @@ export function createNativeServerEntry(
         serialization: { forbiddenValues },
       })(async ({ router, responseHeaders }) => {
         const metadata = mergeDataResponseMetadata(outcomes, {
-          status: router.state.statusCode ?? 200,
+          status: getSsrStatus(router),
         });
         // Route headers() take precedence over loader singleton fields; list
         // fields keep both.
@@ -127,7 +127,7 @@ export function createNativeServerEntry(
               }),
           document,
           federation: options.federation,
-          injection: createOctaneRouterInjection(router, session),
+          router,
         });
         return createSsrStreamResponse(router, rendered);
       });

package/src/i18n/I18nProvider.ts

@@ -1,6 +1,6 @@
-import { createElement, hookSlots, useEffect, useState } from 'octane';
+import { createElement, hookSlots, useSyncExternalStore } from 'octane';
 import { I18nContext } from './context';
-import type { I18nContextValue, I18nInstanceLike } from './types';
+import type { I18nContextValue } from './types';
 
 export interface I18nProviderProps extends Omit<I18nContextValue, 'language'> {
   children?: unknown;
@@ -22,27 +22,18 @@ export interface I18nProviderProps extends Omit<I18nContextValue, 'language'> {
  */
 // Plain TypeScript is not rewritten by the Octane compiler, so each hook call
 // site carries its own stable slot, like `OctaneRouterRoot`.
-const languageStateSlot = Symbol(hookSlots(1));
-const languageSubscriptionSlot = Symbol(hookSlots(1));
+const languageStoreSlot = Symbol(hookSlots(1));
 
 export function I18nProvider(props: I18nProviderProps) {
-  const [language, setLanguage] = useState(
-    () => props.instance.language,
-    languageStateSlot,
-  );
-
-  useEffect(
-    () => {
-      const instance: I18nInstanceLike = props.instance;
-      setLanguage(instance.language);
-      const handleLanguageChanged = (lng: string) => setLanguage(lng);
-      instance.on?.('languageChanged', handleLanguageChanged);
-      return () => {
-        instance.off?.('languageChanged', handleLanguageChanged);
-      };
+  const instance = props.instance;
+  const language = useSyncExternalStore(
+    notify => {
+      instance.on?.('languageChanged', notify);
+      return () => instance.off?.('languageChanged', notify);
     },
-    [props.instance],
-    languageSubscriptionSlot,
+    () => instance.language,
+    () => instance.language,
+    languageStoreSlot,
   );
 
   const value: I18nContextValue = {

package/src/index.ts

@@ -3,8 +3,8 @@ export type { OctaneDocumentBootstrap } from './bootstrap';
 
 export const OCTANE_RUNTIME_PROFILE = Object.freeze({
   renderer: 'octane',
-  runtime: '0.7.1+ultramodern.1331985ea3b0',
-  router: '0.1.60+ultramodern.0b9f76ee3003',
-  routerCore: '1.171.15',
-  history: '1.162.0',
+  runtime: '0.13.8',
+  router: '0.2.10',
+  routerCore: '1.171.34',
+  history: '1.162.4',
 });

package/src/manifest.ts

@@ -9,8 +9,8 @@ import {
   assertOctaneIdentity,
 } from './bootstrap';
 
-export const OCTANE_RUNTIME_VERSION = '0.7.1+ultramodern.1331985ea3b0';
-export const OCTANE_COMPILER_VERSION = '0.1.55';
+export const OCTANE_RUNTIME_VERSION = '0.13.8';
+export const OCTANE_COMPILER_VERSION = '0.2.4';
 
 export interface OctaneCompiledSource {
   readonly resource: string;

package/src/plugin/compiler.ts

@@ -41,10 +41,15 @@ export function createOctaneCompilerPlugin(
       } = require('./compiler-manifest.cjs');
       // The application installs the Octane compiler; resolve it lazily so
       // descriptor readers never load it.
+      const appRequire = createRequire(
+        path.join(api.context.rootPath, 'package.json'),
+      );
       const {
         inferRspackEnvironment,
         OctaneRspackPlugin,
-      }: typeof import('@octanejs/rspack-plugin') = require('@octanejs/rspack-plugin');
+      }: typeof import('@octanejs/rspack-plugin') = appRequire(
+        '@octanejs/rspack-plugin',
+      );
       api.modifyRsbuildConfig((config, { mergeRsbuildConfig }) =>
         mergeRsbuildConfig(config, {
           source: {
@@ -60,19 +65,6 @@ export function createOctaneCompilerPlugin(
           rsbuildEnvironment.name === options.workerEnvironmentName
             ? 'server'
             : inferRspackEnvironment(config.target);
-        // Octane prepends '.tsrx' only when it is absent. Keep TypeScript
-        // modules first so an extensionless './link' cannot select a
-        // case-colliding Link.tsrx on case-insensitive file systems.
-        config.resolve ??= {};
-        const extensions = (config.resolve.extensions ?? []).filter(
-          extension => extension !== '.tsrx',
-        );
-        extensions.splice(
-          Math.max(extensions.indexOf('.ts'), extensions.indexOf('.tsx')) + 1,
-          0,
-          '.tsrx',
-        );
-        config.resolve.extensions = extensions;
         config.plugins ??= [];
         config.plugins.push(
           new OctaneRspackPlugin({

package/src/plugin/index.ts

@@ -89,7 +89,9 @@ export const rendererAdapter: NativeRendererAdapter<'octane'> =
         ],
         dependencies: nativeRendererDependencies(profile),
         devDependencies: {
-          [profile.compiler.name]: profile.compiler.version,
+          [profile.compiler.name]:
+            profile.dependencies[profile.compiler.name] ??
+            profile.compiler.version,
           typescript: typescriptVersion,
         },
         typecheckCommand: 'octane-tsc --noEmit --project tsconfig.json',

package/src/plugin/profile.ts

@@ -4,7 +4,7 @@ export const octaneProfile: RendererBuildProfile<'octane'> = {
   renderer: 'octane',
   status: 'preview',
   protocolVersion: 1,
-  minimumNode: '26.10.0',
+  minimumNode: '26.12.0',
   hmr: {
     editedBoundary: 'may-reset',
     unaffectedComponents: 'preserved',
@@ -12,28 +12,30 @@ export const octaneProfile: RendererBuildProfile<'octane'> = {
     roots: 'single',
     cleanup: 'exactly-once',
   },
-  compiler: { name: '@octanejs/rspack-plugin', version: '0.1.55' },
+  compiler: { name: '@octanejs/rspack-plugin', version: '0.2.4' },
   hydration: {
     name: 'octane',
-    version: '0.7.1+ultramodern.1331985ea3b0',
+    version: '0.13.8',
   },
   router: {
     name: '@octanejs/tanstack-router',
-    version: '0.1.60+ultramodern.0b9f76ee3003',
+    version: '0.2.10',
     coreName: '@tanstack/router-core',
-    coreVersion: '1.171.15',
+    coreVersion: '1.171.34',
   },
   sourceExtensions: ['.tsx', '.tsrx', '.ts', '.js'],
   jsxImportSource: 'octane',
   dependencies: {
+    '@tsrx/oxc': '0.20.0',
     octane:
-      'https://github.com/bleedingdev/octane/releases/download/octane%400.7.1%2Bultramodern.1331985ea3b0/octane-0.7.1%2Bultramodern.1331985ea3b0.tgz',
+      'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octane-0.13.8.tgz',
     '@octanejs/tanstack-router':
-      'https://github.com/bleedingdev/octane/releases/download/%40octanejs%2Ftanstack-router%400.1.60%2Bultramodern.0b9f76ee3003/octanejs-tanstack-router-0.1.60%2Bultramodern.0b9f76ee3003.tgz',
-    '@octanejs/rspack-plugin': '0.1.55',
+      'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octanejs-tanstack-router-0.2.10.tgz',
+    '@octanejs/rspack-plugin':
+      'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-d5988dd93614/octanejs-rspack-plugin-0.2.4.tgz',
     '@modern-js/renderer-octane': '3.8.3',
-    seroval: '1.6.8',
-    'seroval-plugins': '1.6.8',
+    seroval: '1.6.9',
+    'seroval-plugins': '1.6.9',
   },
   capabilities: {
     worker: true,

package/src/router-client.ts

@@ -64,7 +64,7 @@ function waitForCommittedMatches(
   signal?: AbortSignal,
 ): Promise<void> {
   signal?.throwIfAborted();
-  const matchesId = router.stores.matchesId;
+  const matchesId = router.stores.ids;
   if (matchesId.get().length > 0) return Promise.resolve();
   if (!isReactiveMatchIds(matchesId)) {
     throw new Error(

package/src/router-handler.ts

@@ -91,8 +91,9 @@ function requestHeaders(router: AnyRouter): Headers {
       );
     appendHeaders(headers, field?.value);
   }
-  const redirect = router.stores.redirect.get();
-  if (redirect) appendHeaders(headers, redirect.headers);
+  const result = router._serverResult;
+  if (result?.type === 'redirect')
+    appendHeaders(headers, result.redirect.headers);
   return headers;
 }
 
@@ -117,7 +118,6 @@ export function createOctaneRequestHandler<TRouter extends AnyRouter>({
         ...serialization,
         forbiddenValues: [request, ...(serialization?.forbiddenValues ?? [])],
       });
-      session.registerCleanup(() => router.cancelMatches());
 
       const { url } = getNormalizedURL(request.url, 'http://localhost');
       const href = url.href.replace(url.origin, '');
@@ -126,14 +126,14 @@ export function createOctaneRequestHandler<TRouter extends AnyRouter>({
         history: createMemoryHistory({ initialEntries: [href] }),
         origin: router.options.origin ?? getOrigin(request),
       });
-      await withAbort(router.load(), session.signal);
+      await withAbort(router.load({ _signal: session.signal }), session.signal);
       guard.assertActive();
 
       // A native redirect is a terminal HTTP Response. It must never enter
       // the public serializer as a match error or document payload.
-      const redirect = router.stores.redirect.get();
-      if (redirect) {
-        const resolved = router.resolveRedirect(redirect);
+      const loadResult = router._serverResult;
+      if (loadResult?.type === 'redirect') {
+        const resolved = loadResult.redirect;
         const headers = requestHeaders(router);
         return new Response(null, {
           status: resolved.status,
@@ -146,7 +146,10 @@ export function createOctaneRequestHandler<TRouter extends AnyRouter>({
       const serverSsr = router.serverSsr;
       if (!serverSsr)
         throw new Error('Native Octane router SSR state is required');
-      await withAbort(serverSsr.dehydrate(), session.signal);
+      await withAbort(
+        serverSsr.dehydrate({ signal: session.signal }),
+        session.signal,
+      );
       guard.assertActive();
       const responseHeaders = requestHeaders(router);
       // A callback that ignores cancellation must not hold the router SSR

package/src/router-server.ts

@@ -5,8 +5,6 @@ import { createElement, type ServerRenderNode } from 'octane/server';
 export * from '@octanejs/tanstack-router/ssr/server';
 export type { OctaneRequestHandlerOptions } from './router-handler';
 export { createOctaneRequestHandler } from './router-handler';
-export type { OctaneRouterInjectionOptions } from './router-injection';
-export { createOctaneRouterInjection } from './router-injection';
 export type {
   OctaneRouterSerializationGuard,
   OctaneRouterSerializationOptions,

package/src/router.ts

@@ -9,7 +9,7 @@ import {
   useMatch,
   useRouter,
 } from '@octanejs/tanstack-router';
-import { createSubSlot, useCallback, useEffect, useRef } from 'octane';
+import { createSubSlot, useCallback, useLayoutEffect, useRef } from 'octane';
 import { assertOctaneIdentity } from './bootstrap';
 import { resolveRouteData } from './routes';
 
@@ -161,7 +161,7 @@ export function useOctaneRouteAction(...args: unknown[]) {
   const identity = useApplicationIdentity();
   const routeId = useApplicationRouteId();
   const owner = useRef<AbortController | null>(null, actionSlot(slot, 'owner'));
-  useEffect(
+  useLayoutEffect(
     () => {
       const controller = new AbortController();
       owner.current = controller;

package/src/routes.ts

@@ -59,7 +59,7 @@ export function resolveRouteData(
 }
 
 interface ReactiveNativeMatch {
-  get(): AnyRouteMatch;
+  get(): AnyRouteMatch | undefined;
   subscribe(callback: () => void): { unsubscribe(): void };
 }
 
@@ -75,24 +75,18 @@ function isReactiveNativeMatch(value: unknown): value is ReactiveNativeMatch {
 /** A transport failure belongs to the native generation that fetched it. */
 function observeRouteCompletion(
   router: AnyRouter,
+  routeId: string,
   controller: AbortController,
   signal: AbortSignal,
   completion: Promise<void>,
 ) {
   void completion.catch(error => {
     if (signal.aborted) return;
-    const match = [
-      ...router.stores.pendingMatches.get(),
-      ...router.stores.matches.get(),
-      ...router.stores.cachedMatches.get(),
-    ].find(candidate => candidate.abortController === controller);
-    if (!match) return;
-    const store = [
-      router.stores.pendingMatchStores.get(match.id),
-      router.stores.matchStores.get(match.id),
-      router.stores.cachedMatchStores.get(match.id),
-    ].find(candidate => candidate?.get().abortController === controller);
-    if (!store) return;
+    const route = Object.values(router.routesById).find(
+      candidate => candidate.options.staticData?.ultramodernRouteId === routeId,
+    );
+    if (!route) return;
+    const store = router.stores.getMatchStore(route.id);
     let subscription: { unsubscribe(): void } | undefined;
     let settled = false;
     const cleanup = () => {
@@ -103,9 +97,10 @@ function observeRouteCompletion(
       settled = true;
       cleanup();
     };
-    const publish = () => {
+    const publish = async () => {
       if (settled) return;
       const current = store.get();
+      if (!current) return;
       if (
         current.abortController !== controller ||
         signal.aborted ||
@@ -121,23 +116,29 @@ function observeRouteCompletion(
       const route = router.routesById[current.routeId];
       let failure = error;
       try {
+        await route?.options.errorComponent?.preload?.();
+        if (signal.aborted || store.get()?.abortController !== controller)
+          return;
         route?.options.onError?.(failure);
       } catch (onErrorFailure) {
         failure = onErrorFailure;
       }
-      // Native successful loads have already preloaded their route components.
+      // The error component is ready before publishing a late transport failure.
       if (signal.aborted) return;
-      router.updateMatch(match.id, previous =>
-        previous.abortController === controller &&
-        previous.status === 'success' &&
-        !previous.isFetching
-          ? {
-              ...previous,
-              error: failure,
-              status: 'error',
-              isFetching: false,
-            }
-          : previous,
+      router.stores.setMatches(
+        router.stores.matches.get().map(previous =>
+          previous.routeId === route.id &&
+          previous.abortController === controller &&
+          previous.status === 'success' &&
+          !previous.isFetching
+            ? {
+                ...previous,
+                error: failure,
+                status: 'error',
+                isFetching: false,
+              }
+            : previous,
+        ),
       );
     };
     signal.addEventListener('abort', onAbort, { once: true });
@@ -203,6 +204,7 @@ export function createFileSystemRouteTree<Context = unknown>(
                 if (failed) throw failure;
                 observeRouteCompletion(
                   router,
+                  route.id,
                   match.abortController,
                   signal,
                   outcome.completion,