@bleedingdev/modern-js-renderer-octane 3.9.3-ultramodern.1 → 3.9.3-ultramodern.10

package/dist/cjs/routes.js

@@ -30,6 +30,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     RouteDataError: ()=>router_namespaceObject.RouteDataError,
     createFileSystemRouteTree: ()=>createFileSystemRouteTree,
+    hasUnchangedOctaneFileRouteHead: ()=>hasUnchangedOctaneFileRouteHead,
     matchApplicationRouteIds: ()=>router_namespaceObject.matchApplicationRouteIds,
     matchApplicationRoutes: ()=>router_namespaceObject.matchApplicationRoutes,
     resolveRouteData: ()=>resolveRouteData,
@@ -38,6 +39,10 @@ __webpack_require__.d(__webpack_exports__, {
 const router_namespaceObject = require("@modern-js/renderer-core/router");
 const tanstack_router_namespaceObject = require("@octanejs/tanstack-router");
 const external_octane_namespaceObject = require("octane");
+const fileRouteHeads = new WeakMap();
+function hasUnchangedOctaneFileRouteHead(route) {
+    return fileRouteHeads.get(route) === route.options.head;
+}
 function resolveRouteData(routeId, outcome) {
     return (0, router_namespaceObject.resolveRouteData)({
         redirect: tanstack_router_namespaceObject.redirect,
@@ -47,21 +52,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 +68,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 +79,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 +135,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);
@@ -157,6 +156,7 @@ function createFileSystemRouteTree(routes, modules, options = {}) {
         ...rootBindings,
         component: OctaneDocumentRoot
     });
+    fileRouteHeads.set(root, root.options.head);
     function bind(route, parent, inheritedErrorComponent) {
         const errorComponent = modules[route.id]?.errorComponent ?? inheritedErrorComponent;
         const native = (0, tanstack_router_namespaceObject.createRoute)({
@@ -164,12 +164,14 @@ function createFileSystemRouteTree(routes, modules, options = {}) {
             ...(0, router_namespaceObject.nativeRoutePath)(route),
             ...bindings(route, errorComponent)
         });
+        fileRouteHeads.set(native, native.options.head);
         return native.addChildren(route.children.map((child)=>bind(child, native, errorComponent)));
     }
     return root.addChildren(children.map((route)=>bind(route, root, rootErrorComponent)));
 }
 exports.RouteDataError = __webpack_exports__.RouteDataError;
 exports.createFileSystemRouteTree = __webpack_exports__.createFileSystemRouteTree;
+exports.hasUnchangedOctaneFileRouteHead = __webpack_exports__.hasUnchangedOctaneFileRouteHead;
 exports.matchApplicationRouteIds = __webpack_exports__.matchApplicationRouteIds;
 exports.matchApplicationRoutes = __webpack_exports__.matchApplicationRoutes;
 exports.resolveRouteData = __webpack_exports__.resolveRouteData;
@@ -177,6 +179,7 @@ exports.selectApplicationDataRoute = __webpack_exports__.selectApplicationDataRo
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "RouteDataError",
     "createFileSystemRouteTree",
+    "hasUnchangedOctaneFileRouteHead",
     "matchApplicationRouteIds",
     "matchApplicationRoutes",
     "resolveRouteData",

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;

package/dist/cjs/worker-federation-context.js

@@ -0,0 +1,63 @@
+"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__, {
+    WorkerFederationApplication: ()=>WorkerFederationApplication,
+    WorkerFederationContext: ()=>WorkerFederationContext,
+    WorkerFederationRoot: ()=>WorkerFederationRoot
+});
+const external_octane_namespaceObject = require("octane");
+const external_federation_context_js_namespaceObject = require("./federation-context.js");
+const WorkerFederationContext = (0, external_octane_namespaceObject.createContext)(null);
+function WorkerFederationRoot(props) {
+    return (0, external_octane_namespaceObject.createElement)(WorkerFederationContext, {
+        value: props.scope,
+        children: props.children
+    });
+}
+function WorkerFederationApplication(props) {
+    return (0, external_octane_namespaceObject.createElement)(WorkerFederationRoot, {
+        scope: props.scope,
+        children: props.federation ? (0, external_octane_namespaceObject.createElement)(external_federation_context_js_namespaceObject.FederationApplication, {
+            scope: props.federation,
+            application: props.application
+        }) : (0, external_octane_namespaceObject.createElement)(props.application.default, props.application.props)
+    });
+}
+exports.WorkerFederationApplication = __webpack_exports__.WorkerFederationApplication;
+exports.WorkerFederationContext = __webpack_exports__.WorkerFederationContext;
+exports.WorkerFederationRoot = __webpack_exports__.WorkerFederationRoot;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "WorkerFederationApplication",
+    "WorkerFederationContext",
+    "WorkerFederationRoot"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/worker-federation-contexts.js

@@ -0,0 +1,97 @@
+"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_WORKER_CONTEXT_KEYS: ()=>OCTANE_WORKER_CONTEXT_KEYS,
+    getOctaneWorkerRouterRewrite: ()=>getOctaneWorkerRouterRewrite,
+    registerOctaneWorkerContext: ()=>registerOctaneWorkerContext,
+    registerOctaneWorkerRouterRewrite: ()=>registerOctaneWorkerRouterRewrite,
+    useOctaneWorkerContextKeys: ()=>useOctaneWorkerContextKeys
+});
+const external_octane_namespaceObject = require("octane");
+const OCTANE_WORKER_CONTEXT_KEYS = Object.freeze({
+    router: 'ultramodern.octane.router-context.v1',
+    match: 'ultramodern.octane.match-context.v1',
+    i18n: 'ultramodern.octane.i18n-context.v1'
+});
+const builtinKeys = Object.values(OCTANE_WORKER_CONTEXT_KEYS);
+const contexts = new Map();
+function registerOctaneWorkerContext(context, codec) {
+    const { key, isProvided } = codec;
+    if (!builtinKeys.includes(key) || 'function' != typeof isProvided) throw new TypeError('Invalid Octane Worker builtin context codec');
+    const unregister = (0, external_octane_namespaceObject.registerExternalSnapshotContext)(context, codec);
+    const hasProvider = ()=>isProvided((0, external_octane_namespaceObject.useContext)(context));
+    contexts.set(key, hasProvider);
+    return ()=>{
+        if (contexts.get(key) !== hasProvider) return;
+        unregister();
+        contexts.delete(key);
+    };
+}
+function useOctaneWorkerContextKeys(explicit = []) {
+    const selected = [];
+    for (const key of builtinKeys){
+        const hasProvider = contexts.get(key);
+        if (hasProvider?.() && !explicit.includes(key)) selected.push(key);
+    }
+    return [
+        ...selected,
+        ...explicit
+    ];
+}
+let routerRewrite;
+function registerOctaneWorkerRouterRewrite(codec) {
+    if (routerRewrite || 'function' != typeof codec.capture || 'function' != typeof codec.restore) throw new TypeError('Invalid or duplicate Octane Worker router rewrite codec');
+    const captured = Object.freeze({
+        capture: codec.capture,
+        restore: codec.restore
+    });
+    routerRewrite = captured;
+    return ()=>{
+        if (routerRewrite === captured) routerRewrite = void 0;
+    };
+}
+function getOctaneWorkerRouterRewrite() {
+    return routerRewrite;
+}
+exports.OCTANE_WORKER_CONTEXT_KEYS = __webpack_exports__.OCTANE_WORKER_CONTEXT_KEYS;
+exports.getOctaneWorkerRouterRewrite = __webpack_exports__.getOctaneWorkerRouterRewrite;
+exports.registerOctaneWorkerContext = __webpack_exports__.registerOctaneWorkerContext;
+exports.registerOctaneWorkerRouterRewrite = __webpack_exports__.registerOctaneWorkerRouterRewrite;
+exports.useOctaneWorkerContextKeys = __webpack_exports__.useOctaneWorkerContextKeys;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "OCTANE_WORKER_CONTEXT_KEYS",
+    "getOctaneWorkerRouterRewrite",
+    "registerOctaneWorkerContext",
+    "registerOctaneWorkerRouterRewrite",
+    "useOctaneWorkerContextKeys"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/worker-federation.js

@@ -0,0 +1,97 @@
+"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__, {
+    createNativeWorkerFederationRuntime: ()=>createNativeWorkerFederationRuntime
+});
+const worker_federation_namespaceObject = require("@modern-js/renderer-core/worker-federation");
+const server_namespaceObject = require("octane/server");
+const external_federation_context_js_namespaceObject = require("./federation-context.js");
+const external_worker_federation_context_js_namespaceObject = require("./worker-federation-context.js");
+function isNativeWorkerComponent(value) {
+    return 'function' == typeof value;
+}
+function createNativeWorkerFederationRuntime(options, compiler) {
+    const { resources } = options;
+    const bindings = options.bindings;
+    const transport = resources.workerFederationServices?.length ? (0, worker_federation_namespaceObject.createWorkerFederationTransport)({
+        admitRendererContract: compiler.admitRendererContract,
+        services: resources.workerFederationServices.map((service)=>{
+            const binding = bindings && Reflect.get(bindings, service.binding);
+            if (!binding || 'object' != typeof binding && 'function' != typeof binding || !('fetch' in binding) || 'function' != typeof binding.fetch) throw new Error(`Native Worker federation requires service binding ${service.binding}.`);
+            return {
+                ...service,
+                fetch: binding.fetch.bind(binding)
+            };
+        })
+    }) : void 0;
+    let handle;
+    if (resources.workerFederation) {
+        if (!compiler.registry || !resources.workerFederationManifestUrl) throw new Error('Native Worker federation requires its compiled expose registry and pinned manifest URL.');
+        handle = compiler.registry.initialize({
+            publication: resources.workerFederation.worker,
+            manifestUrl: resources.workerFederationManifestUrl,
+            admitRendererContract: compiler.admitRendererContract,
+            admitNativeRequest (payload, { admitted, signal }) {
+                const initializeContexts = transport ? (provide, request)=>{
+                    provide(external_federation_context_js_namespaceObject.FederationContext, (0, external_federation_context_js_namespaceObject.createFederationScope)(void 0, true, request.nonce));
+                    provide(external_worker_federation_context_js_namespaceObject.WorkerFederationContext, {
+                        transport,
+                        locale: admitted.locale,
+                        signal
+                    });
+                } : void 0;
+                return (0, server_namespaceObject.prepareExternalSnapshotRequest)(payload, {
+                    authority: admitted.coordinate.native,
+                    signal,
+                    ...initializeContexts ? {
+                        initializeContexts
+                    } : {}
+                });
+            },
+            releaseNativeRequest: server_namespaceObject.releasePreparedExternalSnapshotRequest,
+            async renderNativeSnapshot (module, request, { admitted }) {
+                const component = module && 'object' == typeof module && 'default' in module ? module.default : void 0;
+                if (!isNativeWorkerComponent(component)) throw new TypeError(`Native Worker expose ${admitted.expose} requires a default Octane component.`);
+                return (0, server_namespaceObject.serializeExternalSnapshot)(await (0, server_namespaceObject.renderExternalSnapshot)(component, request));
+            }
+        });
+    }
+    return {
+        transport,
+        handleRequest: handle ?? (()=>Promise.resolve(void 0))
+    };
+}
+exports.createNativeWorkerFederationRuntime = __webpack_exports__.createNativeWorkerFederationRuntime;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createNativeWorkerFederationRuntime"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/client.mjs

@@ -3,6 +3,7 @@ import { createRoot, hydrateRoot } from "octane";
 import { bootstrapStreamedSignalHydration } from "octane/hydration/streamed-signals";
 import { assertNativeHydrationBuildId, assertOctaneIdentity, readOctaneDocumentBootstrap } from "./bootstrap.mjs";
 import { FederationApplication, createFederationScope } from "./federation-context.mjs";
+import { WorkerFederationApplication } from "./worker-federation-context.mjs";
 const roots = new WeakMap();
 const documents = new WeakMap();
 const moduleResources = new WeakMap();
@@ -186,7 +187,11 @@ function createHandle(input) {
             const nextRelease = claimModuleResources(next);
             releaseModule = nextRelease;
             try {
-                input.federation ? input.root.render(FederationApplication, {
+                input.workerFederation ? input.root.render(WorkerFederationApplication, {
+                    scope: input.workerFederation,
+                    federation: input.federation,
+                    application: next
+                }) : input.federation ? input.root.render(FederationApplication, {
                     scope: input.federation,
                     application: next
                 }) : input.root.render(next.default, next.props);
@@ -204,6 +209,7 @@ function createHandle(input) {
             disposed = true;
             input.signal?.removeEventListener('abort', onAbort);
             cleanupResources([
+                ()=>input.retireWorkerFederation?.(),
                 ()=>input.root.unmount(),
                 ()=>releaseModule(),
                 ()=>input.bridge?.dispose(),
@@ -227,6 +233,12 @@ function createHandle(input) {
 }
 async function startApplication(input, release, hydration) {
     const errors = observeRootErrors(input.options);
+    const workerController = input.workerFederation ? new AbortController() : void 0;
+    let workerFederation;
+    const retireWorkerFederation = ()=>cleanupResources([
+            ()=>workerController?.abort(new DOMException('The Worker federation document was disposed', 'AbortError')),
+            ()=>workerFederation?.transport.dispose()
+        ]);
     let bridge;
     let root;
     let releaseModule;
@@ -237,6 +249,7 @@ async function startApplication(input, release, hydration) {
         if (cleaned) return;
         cleaned = true;
         cleanupResources([
+            retireWorkerFederation,
             ()=>root?.unmount(),
             ()=>releaseModule?.(),
             ()=>bridge?.dispose(),
@@ -244,7 +257,24 @@ async function startApplication(input, release, hydration) {
         ]);
     };
     try {
-        const federation = input.federation ? createFederationScope(input.federation, false) : void 0;
+        if (input.workerFederation && workerController) {
+            const signal = AbortSignal.any([
+                workerController.signal,
+                ...input.signal ? [
+                    input.signal
+                ] : []
+            ]);
+            const scope = 'function' == typeof input.workerFederation ? input.workerFederation(signal) : input.workerFederation;
+            workerFederation = {
+                ...scope,
+                signal: scope.signal ? AbortSignal.any([
+                    signal,
+                    scope.signal
+                ]) : signal
+            };
+        }
+        if (workerFederation && !hydration && !input.documentId) throw new Error('Worker federation requires the trusted document identity before application loading');
+        const federation = input.federation || workerFederation ? createFederationScope(input.federation, false) : void 0;
         if (hydration) {
             const { document, documentId } = hydration;
             bridge = bootstrapStreamedSignalHydration({
@@ -259,16 +289,34 @@ async function startApplication(input, release, hydration) {
         const application = loaded.application;
         releaseModule = loaded.releaseModule;
         input.signal?.throwIfAborted();
-        if (bridge) root = hydrateRoot(input.container, federation ? FederationApplication : application.default, federation ? {
+        if (bridge) root = hydrateRoot(input.container, workerFederation ? WorkerFederationApplication : federation ? FederationApplication : application.default, workerFederation ? {
+            scope: workerFederation,
+            federation,
+            application
+        } : federation ? {
             scope: federation,
             application
         } : application.props, {
             ...errors.options,
-            signalOwner: bridge.signalOwner
+            signalOwner: bridge.signalOwner,
+            externalSnapshots: {
+                documentId: hydration.documentId
+            }
         });
         else {
-            root = createRoot(input.container, errors.options);
-            federation ? root.render(FederationApplication, {
+            root = createRoot(input.container, {
+                ...errors.options,
+                ...input.documentId ? {
+                    externalSnapshots: {
+                        documentId: input.documentId
+                    }
+                } : {}
+            });
+            workerFederation ? root.render(WorkerFederationApplication, {
+                scope: workerFederation,
+                federation,
+                application
+            }) : federation ? root.render(FederationApplication, {
                 scope: federation,
                 application
             }) : root.render(application.default, application.props);
@@ -282,6 +330,8 @@ async function startApplication(input, release, hydration) {
             release,
             bridge,
             federation,
+            workerFederation,
+            retireWorkerFederation,
             ...void 0 === input.signal ? {} : {
                 signal: input.signal
             },

package/dist/esm/entry-application.mjs

@@ -1,6 +1,7 @@
 import { createMemoryHistory, createRouter } from "@octanejs/tanstack-router";
 import { createElement } from "octane";
 import { I18nProvider } from "./i18n/I18nProvider.mjs";
+import { associateOctaneFileRouteSnapshot } from "./router-external-snapshot.mjs";
 import { createFileSystemRouteTree } from "./routes.mjs";
 function componentView(component, i18n) {
     const App = component;
@@ -14,7 +15,8 @@ function componentView(component, i18n) {
 }
 const octaneRouterFactory = {
     routeTree: (routes, modules, options)=>createFileSystemRouteTree(routes, modules, options),
-    router: ({ location, ...options })=>createRouter({
+    router: ({ location, ...options })=>{
+        const router = createRouter({
             ...options,
             ...location ? {
                 origin: location.origin,
@@ -24,7 +26,10 @@ const octaneRouterFactory = {
                     ]
                 })
             } : {}
-        })
+        });
+        associateOctaneFileRouteSnapshot(router);
+        return router;
+    }
 };
 function localizedRouterRoot(Root) {
     return ({ router, i18n })=>createElement(I18nProvider, {

package/dist/esm/entry-client.mjs

@@ -9,6 +9,7 @@ function startNativeClient(options) {
     startNativeClientEntry(options, {
         readBootstrap: (document, identity)=>readOctaneDocumentBootstrap(document, identity, nativeHydrationBuildId),
         createRouter: (application, routerOptions)=>createNativeRouter(application, routerOptions, octaneRouterFactory),
+        disposeRouter: (router)=>router.history.destroy(),
         async prepareRouter (router, hydrating, signal) {
             if (hydrating) await prepareOctaneRouterHydration(router, {
                 signal
@@ -21,6 +22,8 @@ function startNativeClient(options) {
                 identity,
                 nativeHydrationBuildId,
                 federation: options.federation,
+                workerFederation: options.workerFederation,
+                documentId: bootstrap?.documentId,
                 signal,
                 load: async ()=>{
                     const view = await load();