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

package/dist/cjs/entry-server.js

@@ -83,7 +83,7 @@ function createNativeServerEntry(options) {
                 }
             })(async ({ router, responseHeaders })=>{
                 const metadata = (0, data_namespaceObject.mergeDataResponseMetadata)(outcomes, {
-                    status: router.state.statusCode ?? 200
+                    status: (0, external_router_server_js_namespaceObject.getSsrStatus)(router)
                 });
                 const policy = (0, data_namespaceObject.dataMetadataToDocumentPolicy)({
                     ...metadata,
@@ -106,7 +106,7 @@ function createNativeServerEntry(options) {
                     },
                     document,
                     federation: options.federation,
-                    injection: (0, external_router_server_js_namespaceObject.createOctaneRouterInjection)(router, session)
+                    router
                 });
                 return (0, external_router_server_js_namespaceObject.createSsrStreamResponse)(router, rendered);
             });

package/dist/cjs/i18n/I18nProvider.js

@@ -32,21 +32,13 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_octane_namespaceObject = require("octane");
 const external_context_js_namespaceObject = require("./context.js");
-const languageStateSlot = Symbol((0, external_octane_namespaceObject.hookSlots)(1));
-const languageSubscriptionSlot = Symbol((0, external_octane_namespaceObject.hookSlots)(1));
+const languageStoreSlot = Symbol((0, external_octane_namespaceObject.hookSlots)(1));
 function I18nProvider(props) {
-    const [language, setLanguage] = (0, external_octane_namespaceObject.useState)(()=>props.instance.language, languageStateSlot);
-    (0, external_octane_namespaceObject.useEffect)(()=>{
-        const instance = props.instance;
-        setLanguage(instance.language);
-        const handleLanguageChanged = (lng)=>setLanguage(lng);
-        instance.on?.('languageChanged', handleLanguageChanged);
-        return ()=>{
-            instance.off?.('languageChanged', handleLanguageChanged);
-        };
-    }, [
-        props.instance
-    ], languageSubscriptionSlot);
+    const instance = props.instance;
+    const language = (0, external_octane_namespaceObject.useSyncExternalStore)((notify)=>{
+        instance.on?.('languageChanged', notify);
+        return ()=>instance.off?.('languageChanged', notify);
+    }, ()=>instance.language, ()=>instance.language, languageStoreSlot);
     const value = {
         instance: props.instance,
         languages: props.languages,

package/dist/cjs/index.js

@@ -29,10 +29,10 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 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'
 });
 __webpack_require__.d(__webpack_exports__, {}, {
     OCTANE_RUNTIME_PROFILE: OCTANE_RUNTIME_PROFILE

package/dist/cjs/manifest.js

@@ -36,8 +36,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const identity_namespaceObject = require("@modern-js/renderer-core/identity");
 const external_bootstrap_js_namespaceObject = require("./bootstrap.js");
-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 (0, identity_namespaceObject.nativeModuleManifestFilename)('octane', entryName);
 }

package/dist/cjs/plugin/compiler.js

@@ -67,7 +67,8 @@ function createOctaneCompilerPlugin(options) {
             const directory = pluginSourceDirectory();
             const require1 = (0, external_node_module_namespaceObject.createRequire)(external_node_path_default().join(directory, 'index.cjs'));
             const { OctaneCompilerManifestPlugin } = require1('./compiler-manifest.cjs');
-            const { inferRspackEnvironment, OctaneRspackPlugin } = require1('@octanejs/rspack-plugin');
+            const appRequire = (0, external_node_module_namespaceObject.createRequire)(external_node_path_default().join(api.context.rootPath, 'package.json'));
+            const { inferRspackEnvironment, OctaneRspackPlugin } = appRequire('@octanejs/rspack-plugin');
             api.modifyRsbuildConfig((config, { mergeRsbuildConfig })=>mergeRsbuildConfig(config, {
                     source: {
                         include: [
@@ -77,10 +78,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/cjs/plugin/index.js

@@ -128,7 +128,7 @@ const rendererAdapter = (0, adapter_namespaceObject.defineRendererAdapter)({
                 ],
                 dependencies: (0, adapter_namespaceObject.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/cjs/plugin/profile.js

@@ -31,7 +31,7 @@ const octaneProfile = {
     renderer: 'octane',
     status: 'preview',
     protocolVersion: 1,
-    minimumNode: '26.10.0',
+    minimumNode: '26.12.0',
     hmr: {
         editedBoundary: 'may-reset',
         unaffectedComponents: 'preserved',
@@ -41,17 +41,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',
@@ -61,12 +61,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/cjs/router-client.js

@@ -64,7 +64,7 @@ function isReactiveMatchIds(value) {
 }
 function waitForCommittedMatches(router, signal) {
     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('Octane router hydration requires its native reactive match store');
     return new Promise((resolve, reject)=>{

package/dist/cjs/router-handler.js

@@ -84,8 +84,8 @@ function requestHeaders(router) {
         if (field?.get || field?.set) throw new TypeError('Native Octane response headers must be owned values');
         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;
 }
 function createOctaneRequestHandler({ createRouter, request, session, getRouterManifest, serialization }) {
@@ -106,7 +106,6 @@ function createOctaneRequestHandler({ createRouter, request, session, getRouterM
                     ...serialization?.forbiddenValues ?? []
                 ]
             });
-            session.registerCleanup(()=>router.cancelMatches());
             const { url } = (0, server_namespaceObject.getNormalizedURL)(request.url, 'http://localhost');
             const href = url.href.replace(url.origin, '');
             router.update({
@@ -118,11 +117,13 @@ function createOctaneRequestHandler({ createRouter, request, session, getRouterM
                 }),
                 origin: router.options.origin ?? (0, server_namespaceObject.getOrigin)(request)
             });
-            await withAbort(router.load(), session.signal);
+            await withAbort(router.load({
+                _signal: session.signal
+            }), session.signal);
             guard.assertActive();
-            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,
@@ -133,7 +134,9 @@ function createOctaneRequestHandler({ createRouter, request, session, getRouterM
             guard.assertMatches();
             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);
             const rendered = Promise.resolve(callback({

package/dist/cjs/router-server.js

@@ -3,9 +3,6 @@ var __webpack_modules__ = {
     "./router-handler" (module) {
         module.exports = require("./router-handler.js");
     },
-    "./router-injection" (module) {
-        module.exports = require("./router-injection.js");
-    },
     "./router-server-snapshot" (module) {
         module.exports = require("./router-server-snapshot.js");
     },
@@ -74,13 +71,11 @@ var __webpack_exports__ = {};
         "createOctaneRequestHandler",
         "prepareOctaneRouterSerialization",
         "default",
-        "OctaneRouterServer",
-        "createOctaneRouterInjection"
+        "OctaneRouterServer"
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_octanejs_tanstack_router_ssr_server__rspack_import_2[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
     var _router_handler__rspack_import_3 = __webpack_require__("./router-handler");
-    var _router_injection__rspack_import_4 = __webpack_require__("./router-injection");
-    var _router_server_snapshot__rspack_import_5 = __webpack_require__("./router-server-snapshot");
+    var _router_server_snapshot__rspack_import_4 = __webpack_require__("./router-server-snapshot");
     function OctaneRouterServer({ router }) {
         return (0, octane_server__rspack_import_1.createElement)(_octanejs_tanstack_router__rspack_import_0.RouterProvider, {
             router
@@ -89,18 +84,15 @@ var __webpack_exports__ = {};
     __webpack_require__.d(__webpack_exports__, {
         OctaneRouterServer: ()=>OctaneRouterServer,
         createOctaneRequestHandler: ()=>_router_handler__rspack_import_3.createOctaneRequestHandler,
-        createOctaneRouterInjection: ()=>_router_injection__rspack_import_4.createOctaneRouterInjection,
-        prepareOctaneRouterSerialization: ()=>_router_server_snapshot__rspack_import_5.prepareOctaneRouterSerialization
+        prepareOctaneRouterSerialization: ()=>_router_server_snapshot__rspack_import_4.prepareOctaneRouterSerialization
     });
 })();
 exports.OctaneRouterServer = __webpack_exports__.OctaneRouterServer;
 exports.createOctaneRequestHandler = __webpack_exports__.createOctaneRequestHandler;
-exports.createOctaneRouterInjection = __webpack_exports__.createOctaneRouterInjection;
 exports.prepareOctaneRouterSerialization = __webpack_exports__.prepareOctaneRouterSerialization;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "OctaneRouterServer",
     "createOctaneRequestHandler",
-    "createOctaneRouterInjection",
     "prepareOctaneRouterSerialization"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/router.js

@@ -150,7 +150,7 @@ var __webpack_exports__ = {};
         const identity = useApplicationIdentity();
         const routeId = useApplicationRouteId();
         const owner = (0, octane__rspack_import_2.useRef)(null, actionSlot(slot, 'owner'));
-        (0, octane__rspack_import_2.useEffect)(()=>{
+        (0, octane__rspack_import_2.useLayoutEffect)(()=>{
             const controller = new AbortController();
             owner.current = controller;
             return ()=>controller.abort(new DOMException('The route action owner unmounted', 'AbortError'));

package/dist/cjs/routes.js

@@ -47,21 +47,12 @@ function resolveRouteData(routeId, outcome) {
 function isReactiveNativeMatch(value) {
     return 'object' == typeof value && null !== value && 'function' == typeof Reflect.get(value, 'get') && 'function' == typeof Reflect.get(value, 'subscribe');
 }
-function observeRouteCompletion(router, controller, signal, completion) {
+function observeRouteCompletion(router, routeId, controller, signal, completion) {
     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;
         let settled = false;
         const cleanup = ()=>{
@@ -72,9 +63,10 @@ function observeRouteCompletion(router, controller, signal, completion) {
             settled = true;
             cleanup();
         };
-        const publish = ()=>{
+        const publish = async ()=>{
             if (settled) return;
             const current = store.get();
+            if (!current) return;
             if (current.abortController !== controller || signal.aborted || 'pending' !== current.status && 'success' !== current.status) return void onAbort();
             if ('success' !== current.status || current.isFetching) return;
             settled = true;
@@ -82,17 +74,19 @@ function observeRouteCompletion(router, controller, signal, completion) {
             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;
             }
             if (signal.aborted) return;
-            router.updateMatch(match.id, (previous)=>previous.abortController !== controller || 'success' !== previous.status || previous.isFetching ? previous : {
+            router.stores.setMatches(router.stores.matches.get().map((previous)=>previous.routeId !== route.id || previous.abortController !== controller || 'success' !== previous.status || previous.isFetching ? previous : {
                     ...previous,
                     error: failure,
                     status: 'error',
                     isFetching: false
-                });
+                }));
         };
         signal.addEventListener('abort', onAbort, {
             once: true
@@ -136,7 +130,7 @@ function createFileSystemRouteTree(routes, modules, options = {}) {
                         await Promise.resolve();
                         signal.throwIfAborted();
                         if (failed) throw failure;
-                        observeRouteCompletion(router, match.abortController, signal, outcome.completion);
+                        observeRouteCompletion(router, route.id, match.abortController, signal, outcome.completion);
                     }
                     options.onOutcome?.(route.id, outcome);
                     return resolveRouteData(route.id, outcome);

package/dist/cjs/server.js

@@ -33,7 +33,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const document_namespaceObject = require("@modern-js/renderer-core/document");
 const session_namespaceObject = require("@modern-js/renderer-core/session");
-const server_namespaceObject = require("octane/server");
+const server_namespaceObject = require("@octanejs/tanstack-router/ssr/server");
+const external_octane_server_namespaceObject = require("octane/server");
 const external_bootstrap_js_namespaceObject = require("./bootstrap.js");
 const external_federation_context_js_namespaceObject = require("./federation-context.js");
 function prepareOctaneDocument(session, document, hydrating) {
@@ -99,7 +100,7 @@ async function renderOctaneApplication(input) {
     const { session, document } = input;
     try {
         const { rootId, lang, bootstrap, headAssets, entryScripts } = prepareOctaneDocument(session, document, true);
-        const earlyBootstrap = (0, server_namespaceObject.earlySignalBootstrapScript)(void 0 === document.nonce ? {} : {
+        const earlyBootstrap = (0, external_octane_server_namespaceObject.earlySignalBootstrapScript)(void 0 === document.nonce ? {} : {
             nonce: document.nonce
         });
         await resolveDocumentResponse(input);
@@ -107,11 +108,11 @@ async function renderOctaneApplication(input) {
         session.startRendering();
         let head = '';
         const federation = input.federation ? (0, external_federation_context_js_namespaceObject.createFederationScope)(input.federation, true, document.nonce) : void 0;
-        const App = federation ? ()=>(0, server_namespaceObject.createElement)(external_federation_context_js_namespaceObject.FederationRoot, {
+        const App = federation ? ()=>(0, external_octane_server_namespaceObject.createElement)(external_federation_context_js_namespaceObject.FederationRoot, {
                 scope: federation,
-                children: 'function' == typeof input.App ? (0, server_namespaceObject.createElement)(input.App, input.props) : input.App
+                children: 'function' == typeof input.App ? (0, external_octane_server_namespaceObject.createElement)(input.App, input.props) : input.App
             }) : input.App;
-        const nativeStream = await (0, server_namespaceObject.renderToReadableStream)(App, input.props, {
+        const nativeStream = await (0, external_octane_server_namespaceObject.renderToReadableStream)(App, input.props, {
             signal: session.signal,
             ...void 0 === document.nonce ? {} : {
                 nonce: document.nonce
@@ -207,7 +208,14 @@ async function renderOctaneApplication(input) {
         }, {
             highWaterMark: 0
         });
-        return session.respond(body);
+        return session.respond(input.router ? (0, server_namespaceObject.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/entry-server.mjs

@@ -3,7 +3,7 @@ import { createNativeServerEntry } from "@modern-js/renderer-core/entry-server";
 import { createNativeRouter } from "@modern-js/renderer-core/router";
 import { componentView, localizedRouterRoot, octaneRouterFactory } from "./entry-application.mjs";
 import { validateOctaneModuleManifest } from "./manifest.mjs";
-import { OctaneRouterServer, createOctaneRequestHandler, createOctaneRouterInjection, createSsrStreamResponse } from "./router-server.mjs";
+import { OctaneRouterServer, createOctaneRequestHandler, createSsrStreamResponse, getSsrStatus } from "./router-server.mjs";
 import { renderOctaneApplication, renderOctaneCSRDocument } from "./server.mjs";
 const OCTANE_DOCUMENT_FIELDS = new Set([
     'content-language',
@@ -50,7 +50,7 @@ function entry_server_createNativeServerEntry(options) {
                 }
             })(async ({ router, responseHeaders })=>{
                 const metadata = mergeDataResponseMetadata(outcomes, {
-                    status: router.state.statusCode ?? 200
+                    status: getSsrStatus(router)
                 });
                 const policy = dataMetadataToDocumentPolicy({
                     ...metadata,
@@ -73,7 +73,7 @@ function entry_server_createNativeServerEntry(options) {
                     },
                     document,
                     federation: options.federation,
-                    injection: createOctaneRouterInjection(router, session)
+                    router
                 });
                 return createSsrStreamResponse(router, rendered);
             });

package/dist/esm/i18n/I18nProvider.mjs

@@ -1,20 +1,12 @@
-import { createElement, hookSlots, useEffect, useState } from "octane";
+import { createElement, hookSlots, useSyncExternalStore } from "octane";
 import { I18nContext } from "./context.mjs";
-const languageStateSlot = Symbol(hookSlots(1));
-const languageSubscriptionSlot = Symbol(hookSlots(1));
+const languageStoreSlot = Symbol(hookSlots(1));
 function I18nProvider(props) {
-    const [language, setLanguage] = useState(()=>props.instance.language, languageStateSlot);
-    useEffect(()=>{
-        const instance = props.instance;
-        setLanguage(instance.language);
-        const handleLanguageChanged = (lng)=>setLanguage(lng);
-        instance.on?.('languageChanged', handleLanguageChanged);
-        return ()=>{
-            instance.off?.('languageChanged', handleLanguageChanged);
-        };
-    }, [
-        props.instance
-    ], languageSubscriptionSlot);
+    const instance = props.instance;
+    const language = useSyncExternalStore((notify)=>{
+        instance.on?.('languageChanged', notify);
+        return ()=>instance.off?.('languageChanged', notify);
+    }, ()=>instance.language, ()=>instance.language, languageStoreSlot);
     const value = {
         instance: props.instance,
         languages: props.languages,

package/dist/esm/index.mjs

@@ -1,8 +1,8 @@
 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'
 });
 export { OCTANE_RUNTIME_PROFILE };

package/dist/esm/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/router-client.mjs

@@ -31,7 +31,7 @@ function isReactiveMatchIds(value) {
 }
 function waitForCommittedMatches(router, signal) {
     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('Octane router hydration requires its native reactive match store');
     return new Promise((resolve, reject)=>{

package/dist/esm/router-handler.mjs

@@ -52,8 +52,8 @@ function requestHeaders(router) {
         if (field?.get || field?.set) throw new TypeError('Native Octane response headers must be owned values');
         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;
 }
 function createOctaneRequestHandler({ createRouter, request, session, getRouterManifest, serialization }) {
@@ -74,7 +74,6 @@ function createOctaneRequestHandler({ createRouter, request, session, getRouterM
                     ...serialization?.forbiddenValues ?? []
                 ]
             });
-            session.registerCleanup(()=>router.cancelMatches());
             const { url } = getNormalizedURL(request.url, 'http://localhost');
             const href = url.href.replace(url.origin, '');
             router.update({
@@ -86,11 +85,13 @@ function createOctaneRequestHandler({ createRouter, request, session, getRouterM
                 }),
                 origin: router.options.origin ?? getOrigin(request)
             });
-            await withAbort(router.load(), session.signal);
+            await withAbort(router.load({
+                _signal: session.signal
+            }), session.signal);
             guard.assertActive();
-            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,
@@ -101,7 +102,9 @@ function createOctaneRequestHandler({ createRouter, request, session, getRouterM
             guard.assertMatches();
             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);
             const rendered = Promise.resolve(callback({

package/dist/esm/router-server.mjs

@@ -7,6 +7,5 @@ function OctaneRouterServer({ router }) {
     });
 }
 export { createOctaneRequestHandler } from "./router-handler.mjs";
-export { createOctaneRouterInjection } from "./router-injection.mjs";
 export { prepareOctaneRouterSerialization } from "./router-server-snapshot.mjs";
 export { OctaneRouterServer };

package/dist/esm/router.mjs

@@ -1,6 +1,6 @@
 import { createDataClient } from "@modern-js/renderer-core/data";
 import { RouterProvider, createRouter, redirect, useMatch, useRouter } from "@octanejs/tanstack-router";
-import { createSubSlot, useCallback, useEffect, useRef } from "octane";
+import { createSubSlot, useCallback, useLayoutEffect, useRef } from "octane";
 import { assertOctaneIdentity } from "./bootstrap.mjs";
 import { RouteDataError, createFileSystemRouteTree, matchApplicationRouteIds, matchApplicationRoutes, resolveRouteData, selectApplicationDataRoute } from "./routes.mjs";
 export * from "@octanejs/tanstack-router";
@@ -69,7 +69,7 @@ function useOctaneRouteAction(...args) {
     const identity = useApplicationIdentity();
     const routeId = useApplicationRouteId();
     const owner = useRef(null, actionSlot(slot, 'owner'));
-    useEffect(()=>{
+    useLayoutEffect(()=>{
         const controller = new AbortController();
         owner.current = controller;
         return ()=>controller.abort(new DOMException('The route action owner unmounted', 'AbortError'));

package/dist/esm/routes.mjs

@@ -10,21 +10,12 @@ function routes_resolveRouteData(routeId, outcome) {
 function isReactiveNativeMatch(value) {
     return 'object' == typeof value && null !== value && 'function' == typeof Reflect.get(value, 'get') && 'function' == typeof Reflect.get(value, 'subscribe');
 }
-function observeRouteCompletion(router, controller, signal, completion) {
+function observeRouteCompletion(router, routeId, controller, signal, completion) {
     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;
         let settled = false;
         const cleanup = ()=>{
@@ -35,9 +26,10 @@ function observeRouteCompletion(router, controller, signal, completion) {
             settled = true;
             cleanup();
         };
-        const publish = ()=>{
+        const publish = async ()=>{
             if (settled) return;
             const current = store.get();
+            if (!current) return;
             if (current.abortController !== controller || signal.aborted || 'pending' !== current.status && 'success' !== current.status) return void onAbort();
             if ('success' !== current.status || current.isFetching) return;
             settled = true;
@@ -45,17 +37,19 @@ function observeRouteCompletion(router, controller, signal, completion) {
             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;
             }
             if (signal.aborted) return;
-            router.updateMatch(match.id, (previous)=>previous.abortController !== controller || 'success' !== previous.status || previous.isFetching ? previous : {
+            router.stores.setMatches(router.stores.matches.get().map((previous)=>previous.routeId !== route.id || previous.abortController !== controller || 'success' !== previous.status || previous.isFetching ? previous : {
                     ...previous,
                     error: failure,
                     status: 'error',
                     isFetching: false
-                });
+                }));
         };
         signal.addEventListener('abort', onAbort, {
             once: true
@@ -99,7 +93,7 @@ function createFileSystemRouteTree(routes, modules, options = {}) {
                         await Promise.resolve();
                         signal.throwIfAborted();
                         if (failed) throw failure;
-                        observeRouteCompletion(router, match.abortController, signal, outcome.completion);
+                        observeRouteCompletion(router, route.id, match.abortController, signal, outcome.completion);
                     }
                     options.onOutcome?.(route.id, outcome);
                     return routes_resolveRouteData(route.id, outcome);