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

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

@@ -119,7 +119,7 @@ const rendererAdapter = (0, adapter_namespaceObject.defineRendererAdapter)({
     create: {
         templates: {
             federation: true,
-            workers: false
+            workers: true
         },
         dependencies: (profile, { typescriptVersion })=>({
                 frameworkDependencies: [
@@ -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.38'
     },
     sourceExtensions: [
         '.tsx',
@@ -61,12 +61,14 @@ 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-0bf2313bbdfb/octane-0.13.8.tgz',
+        '@octanejs/tanstack-router': 'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-0bf2313bbdfb/octanejs-tanstack-router-0.2.10.tgz',
+        '@octanejs/rspack-plugin': 'https://github.com/BleedingDev/octane/releases/download/ultramodern-octane-0bf2313bbdfb/octanejs-rspack-plugin-0.2.4.tgz',
+        '@tanstack/router-core': 'https://github.com/BleedingDev/router/releases/download/ultramodern-router-core-585d3233f7f5/tanstack-router-core-1.171.38.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-external-snapshot.js

@@ -0,0 +1,263 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE: ()=>OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE,
+    associateOctaneFileRouteSnapshot: ()=>associateOctaneFileRouteSnapshot,
+    captureOctaneRouterSnapshot: ()=>captureOctaneRouterSnapshot,
+    registerOctaneRouterWorkerContexts: ()=>registerOctaneRouterWorkerContexts
+});
+const tanstack_router_namespaceObject = require("@octanejs/tanstack-router");
+const external_worker_federation_contexts_js_namespaceObject = require("./worker-federation-contexts.js");
+const OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE = Object.freeze({
+    key: 'ultramodern.file-routes',
+    version: '1'
+});
+const origins = new WeakMap();
+let profileRegistered = false;
+function plainRecord(value) {
+    return null !== value && 'object' == typeof value && [
+        Object.prototype,
+        null
+    ].includes(Object.getPrototypeOf(value));
+}
+function record(value, fields) {
+    if (!plainRecord(value)) throw new TypeError('Worker router context requires a plain record');
+    for (const key of Reflect.ownKeys(value)){
+        const descriptor = Object.getOwnPropertyDescriptor(value, key);
+        if ('string' != typeof key || fields && !fields.includes(key) || !descriptor || !descriptor.enumerable || !('value' in descriptor)) throw new TypeError('Unknown Worker router context field or accessor');
+    }
+    return value;
+}
+function nonempty(value) {
+    if ('string' != typeof value || !value.trim() || value.length > 1024) throw new TypeError('Invalid Worker router identity');
+    return value;
+}
+function publicContext(value) {
+    const context = record(value, [
+        'ultramodern'
+    ]);
+    const metadata = record(context.ultramodern, [
+        'rendererIdentity'
+    ]);
+    const identity = record(metadata.rendererIdentity, [
+        'renderer',
+        'appId',
+        'entryName',
+        'protocolVersion',
+        'buildId'
+    ]);
+    if ('octane' !== identity.renderer || 1 !== identity.protocolVersion) throw new TypeError('Unsupported Worker router identity');
+    return Object.freeze({
+        ultramodern: Object.freeze({
+            rendererIdentity: Object.freeze({
+                renderer: 'octane',
+                appId: nonempty(identity.appId),
+                entryName: nonempty(identity.entryName),
+                protocolVersion: 1,
+                buildId: nonempty(identity.buildId)
+            })
+        })
+    });
+}
+function localizedUrls(value) {
+    if (void 0 === value || 'boolean' == typeof value) return value;
+    const input = record(value);
+    const result = {};
+    for (const [path, translations] of Object.entries(input)){
+        const names = {};
+        for (const [language, target] of Object.entries(record(translations)))names[nonempty(language)] = nonempty(target);
+        result[path] = names;
+    }
+    return result;
+}
+function rewriteDescriptor(value) {
+    if (void 0 === value) return;
+    const input = record(value, [
+        'language',
+        'languages',
+        'localisedUrls'
+    ]);
+    if (!Array.isArray(input.languages) || !input.languages.length || input.languages.length > 64) throw new TypeError('Invalid Worker router i18n languages');
+    const languages = input.languages.map(nonempty);
+    const language = nonempty(input.language);
+    if (new Set(languages).size !== languages.length || !languages.includes(language)) throw new TypeError('Invalid Worker router i18n language');
+    const urls = localizedUrls(input.localisedUrls);
+    return {
+        language,
+        languages,
+        ...void 0 === urls ? {} : {
+            localisedUrls: urls
+        }
+    };
+}
+function nativeRewriteDescriptor(router) {
+    if (!router.options.rewrite) return;
+    const known = (0, external_worker_federation_contexts_js_namespaceObject.getOctaneWorkerRouterRewrite)()?.capture(router.options.rewrite);
+    if (!known) throw new TypeError('Custom router rewrite requires an exact Worker profile');
+    const descriptor = rewriteDescriptor(known);
+    if (!descriptor) throw new TypeError('Missing native router rewrite provenance');
+    return {
+        language: descriptor.language,
+        languages: [
+            ...descriptor.languages
+        ],
+        ...void 0 === descriptor.localisedUrls ? {} : {
+            localisedUrls: descriptor.localisedUrls
+        }
+    };
+}
+function validateDefaultSnapshot(snapshot) {
+    publicContext(snapshot.publicContext);
+    rewriteDescriptor(snapshot.i18n);
+}
+function ensureDefaultProfile() {
+    if (profileRegistered) return;
+    (0, tanstack_router_namespaceObject.registerRouterRenderProfile)({
+        id: OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE,
+        assertHost: (router, snapshot)=>{
+            const origin = origins.get(router);
+            if (!origin || origin.rewrite !== router.options.rewrite || JSON.stringify(publicContext(router.options.context)) !== JSON.stringify(origin.publicContext)) throw new TypeError('Generated Worker router origin changed');
+            (0, tanstack_router_namespaceObject.assertDefaultRouterRenderHost)(router, void 0 !== snapshot.i18n);
+            validateDefaultSnapshot(snapshot);
+            if (JSON.stringify(nativeRewriteDescriptor(router)) !== JSON.stringify(snapshot.i18n)) throw new TypeError('Worker router rewrite differs from its native provenance');
+        },
+        createRoutingTree: (snapshot)=>{
+            validateDefaultSnapshot(snapshot);
+            return (0, tanstack_router_namespaceObject.createRouterRenderRouteTree)(snapshot.routes);
+        },
+        routingOptions: (snapshot)=>{
+            const defaults = {
+                parseSearch: tanstack_router_namespaceObject.defaultParseSearch,
+                stringifySearch: tanstack_router_namespaceObject.defaultStringifySearch
+            };
+            const i18n = rewriteDescriptor(snapshot.i18n);
+            if (!i18n) return defaults;
+            const codec = (0, external_worker_federation_contexts_js_namespaceObject.getOctaneWorkerRouterRewrite)();
+            if (!codec) throw new TypeError('Missing owning Worker router i18n codec');
+            return {
+                ...defaults,
+                rewrite: codec.restore(i18n)
+            };
+        }
+    });
+    profileRegistered = true;
+}
+function associateOctaneFileRouteSnapshot(router) {
+    ensureDefaultProfile();
+    const context = publicContext(router.options.context);
+    origins.set(router, {
+        publicContext: context,
+        rewrite: router.options.rewrite
+    });
+    (0, tanstack_router_namespaceObject.associateRouterRenderProfile)(router, {
+        id: OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE,
+        publicContext: context
+    });
+}
+function captureOctaneRouterSnapshot(router) {
+    const origin = origins.get(router);
+    const declared = (0, tanstack_router_namespaceObject.getRouterRenderProfile)(router);
+    if (origin && declared?.key === OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE.key && declared.version === OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE.version) {
+        const i18n = nativeRewriteDescriptor(router);
+        (0, tanstack_router_namespaceObject.associateRouterRenderProfile)(router, {
+            id: OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE,
+            publicContext: origin.publicContext,
+            ...void 0 === i18n ? {} : {
+                i18n
+            }
+        });
+    }
+    return (0, tanstack_router_namespaceObject.captureRouterRenderSnapshot)(router);
+}
+let registrations = 0;
+let releaseContexts;
+function registerOctaneRouterWorkerContexts() {
+    ensureDefaultProfile();
+    if (!releaseContexts) {
+        const releaseRouter = (0, external_worker_federation_contexts_js_namespaceObject.registerOctaneWorkerContext)(tanstack_router_namespaceObject.routerContext, {
+            key: external_worker_federation_contexts_js_namespaceObject.OCTANE_WORKER_CONTEXT_KEYS.router,
+            encode: (value)=>{
+                if (!value) throw new TypeError('Missing native router provider');
+                return captureOctaneRouterSnapshot(value);
+            },
+            decode: (value, signal)=>(0, tanstack_router_namespaceObject.restoreRouterRenderSnapshot)(value, {
+                    signal
+                }),
+            dispose: (value)=>{
+                if (value) (0, tanstack_router_namespaceObject.disposeRouterRenderSnapshot)(value);
+            },
+            isProvided: (value)=>void 0 !== value
+        });
+        try {
+            const releaseMatch = (0, external_worker_federation_contexts_js_namespaceObject.registerOctaneWorkerContext)(tanstack_router_namespaceObject.matchContext, {
+                key: external_worker_federation_contexts_js_namespaceObject.OCTANE_WORKER_CONTEXT_KEYS.match,
+                encode: nonempty,
+                decode: nonempty,
+                validate: (value, readContext)=>{
+                    const selected = readContext(tanstack_router_namespaceObject.routerContext);
+                    const router = selected.present ? selected.value : void 0;
+                    const current = router?.state.matches.find((match)=>match.routeId === value);
+                    if (!router || !current || 'string' != typeof value || router.stores.getMatchStore(value).get() !== current) throw new TypeError('Worker match context requires its selected native router and a current match');
+                },
+                isProvided: (value)=>void 0 !== value
+            });
+            releaseContexts = ()=>{
+                releaseMatch();
+                releaseRouter();
+            };
+        } catch (error) {
+            releaseRouter();
+            throw error;
+        }
+    }
+    registrations++;
+    let released = false;
+    return ()=>{
+        if (released) return;
+        released = true;
+        if (0 === --registrations) {
+            releaseContexts?.();
+            releaseContexts = void 0;
+        }
+    };
+}
+exports.OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE = __webpack_exports__.OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE;
+exports.associateOctaneFileRouteSnapshot = __webpack_exports__.associateOctaneFileRouteSnapshot;
+exports.captureOctaneRouterSnapshot = __webpack_exports__.captureOctaneRouterSnapshot;
+exports.registerOctaneRouterWorkerContexts = __webpack_exports__.registerOctaneRouterWorkerContexts;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "OCTANE_FILE_ROUTE_SNAPSHOT_PROFILE",
+    "associateOctaneFileRouteSnapshot",
+    "captureOctaneRouterSnapshot",
+    "registerOctaneRouterWorkerContexts"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

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,9 +33,11 @@ __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");
+const external_worker_federation_context_js_namespaceObject = require("./worker-federation-context.js");
 function prepareOctaneDocument(session, document, hydrating) {
     (0, external_bootstrap_js_namespaceObject.assertOctaneIdentity)(session.identity);
     if ('node' !== session.platform.kind && 'worker' !== session.platform.kind) throw new Error('An Octane document requires a Node or worker request platform.');
@@ -99,19 +101,28 @@ 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);
         if (session.responsePolicy?.kind === 'terminal') return session.respond(null);
         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 federation = input.federation || input.workerFederation ? (0, external_federation_context_js_namespaceObject.createFederationScope)(input.federation, true, document.nonce) : void 0;
+        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 workerFederation = input.workerFederation ? {
+            transport: input.workerFederation,
+            locale: input.workerFederationLocale ?? 'default',
+            signal: session.signal
+        } : void 0;
+        const NativeApp = workerFederation ? ()=>(0, external_octane_server_namespaceObject.createElement)(external_worker_federation_context_js_namespaceObject.WorkerFederationRoot, {
+                scope: workerFederation,
+                children: 'function' == typeof App ? (0, external_octane_server_namespaceObject.createElement)(App, input.props) : App
+            }) : App;
+        const nativeStream = await (0, external_octane_server_namespaceObject.renderToReadableStream)(NativeApp, input.props, {
             signal: session.signal,
             ...void 0 === document.nonce ? {} : {
                 nonce: document.nonce
@@ -124,6 +135,9 @@ async function renderOctaneApplication(input) {
                 buildId: document.nativeHydrationBuildId,
                 documentId: document.documentId
             },
+            externalSnapshots: {
+                documentId: document.documentId
+            },
             headChannel: 'separate',
             onHeadReady (value) {
                 head = value;
@@ -207,7 +221,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;