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

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();

package/dist/esm/entry-server.mjs

@@ -34,13 +34,15 @@ function entry_server_createNativeServerEntry(options) {
                 session,
                 document
             }),
-        renderComponent: ({ session }, component, document, i18n)=>renderOctaneApplication({
+        renderComponent: ({ session, workerFederation }, component, document, i18n)=>renderOctaneApplication({
                 session,
                 App: componentView(component, i18n),
                 document,
-                federation: options.federation
+                federation: options.federation,
+                workerFederation,
+                workerFederationLocale: options.workerFederationLocale
             }),
-        async renderRoutes ({ request, context: { session }, router, outcomes, document, forbiddenValues, i18n }) {
+        async renderRoutes ({ request, context: { session, workerFederation }, router, outcomes, document, forbiddenValues, i18n }) {
             const response = await createOctaneRequestHandler({
                 request,
                 session,
@@ -73,6 +75,8 @@ function entry_server_createNativeServerEntry(options) {
                     },
                     document,
                     federation: options.federation,
+                    workerFederation,
+                    workerFederationLocale: options.workerFederationLocale,
                     router
                 });
                 return createSsrStreamResponse(router, rendered);
@@ -83,4 +87,5 @@ function entry_server_createNativeServerEntry(options) {
         }
     });
 }
+export { createNativeWorkerFederationRuntime } from "./worker-federation.mjs";
 export { entry_server_createNativeServerEntry as createNativeServerEntry, withOctaneDocumentFields };

package/dist/esm/federation.mjs

@@ -1,6 +1,9 @@
-import { loadFederatedModule, remoteBrowserAssets } from "@modern-js/renderer-core/federation";
-import { Suspense, createElement, lazy, preinit, useContext } from "octane";
+import { loadFederatedModule } from "@modern-js/renderer-core/federation";
+import { Suspense, createElement, decodeExternalSnapshot, externalSnapshotBoundary, hookSlots, lazy, preinit, publisherBoundary, serializeExternalSnapshotRequest, useContext, useEffect } from "octane";
 import { FederationContext } from "./federation-context.mjs";
+import { I18nContext } from "./i18n/context.mjs";
+import { WorkerFederationContext } from "./worker-federation-context.mjs";
+import { useOctaneWorkerContextKeys } from "./worker-federation-contexts.mjs";
 function withTimeout(promise, timeout, label) {
     if (void 0 === timeout) return promise;
     return new Promise((resolve, reject)=>{
@@ -15,6 +18,7 @@ function withTimeout(promise, timeout, label) {
         });
     });
 }
+const publisherRegistrationEffectSlot = Symbol(hookSlots(1));
 function federatedComponent(remote, options = {}) {
     if ('string' == typeof remote ? !/^[^/]+\/.+/u.test(remote) : 'function' != typeof remote) throw new TypeError("federatedComponent requires a remote id such as 'remote/Widget' or a loader");
     if (void 0 !== options.timeout && (!Number.isFinite(options.timeout) || options.timeout <= 0)) throw new TypeError('federatedComponent timeout must be a positive number of milliseconds');
@@ -24,19 +28,117 @@ function federatedComponent(remote, options = {}) {
         server: "u" < typeof document
     };
     const components = new WeakMap();
+    const workerOwners = new WeakMap();
     return (props)=>{
         const context = useContext(FederationContext) ?? standalone;
-        let Remote = components.get(context);
+        const worker = useContext(WorkerFederationContext);
+        const language = worker ? useContext(I18nContext)?.language ?? worker.locale : void 0;
+        const contextKeys = worker ? useOctaneWorkerContextKeys(options.contextKeys) : void 0;
+        let owner = context;
+        if (worker) {
+            let scopes = workerOwners.get(context);
+            if (!scopes) workerOwners.set(context, scopes = new WeakMap());
+            let variants = scopes.get(worker);
+            if (!variants) scopes.set(worker, variants = new Map());
+            const key = JSON.stringify([
+                language,
+                contextKeys
+            ]);
+            let variant = variants.get(key);
+            if (!variant) variants.set(key, variant = {});
+            owner = variant;
+        }
+        let Remote = components.get(owner);
         if (!Remote) {
             Remote = lazy(async ()=>{
                 try {
                     if (context.server && !id) throw new Error('A federatedComponent loader renders in the browser only; use a remote id to server-render it');
-                    const module = await withTimeout(Promise.resolve().then(()=>id ? loadFederatedModule(context.instance, id) : remote()), options.timeout ?? (context.server ? 3000 : void 0), id ?? 'loader');
+                    if (worker) {
+                        if (!id || !language) throw new Error('Worker federation requires a remote id and the owning entry locale');
+                        const separator = id.indexOf('/');
+                        const remoteName = id.slice(0, separator);
+                        const expose = `./${id.slice(separator + 1)}`;
+                        const controller = new AbortController();
+                        const signal = worker.signal ? AbortSignal.any([
+                            worker.signal,
+                            controller.signal
+                        ]) : controller.signal;
+                        const timeout = options.timeout ?? (context.server ? 3000 : void 0);
+                        let admitted;
+                        try {
+                            admitted = await withTimeout(worker.transport.admit({
+                                remote: remoteName,
+                                expose,
+                                locale: language,
+                                signal
+                            }), timeout, id);
+                        } finally{
+                            controller.abort();
+                        }
+                        const BrowserRemote = lazy(async ()=>{
+                            const { module, assets } = await loadFederatedModule(context.instance, id);
+                            if ('function' != typeof module?.default) throw new TypeError('A federated Octane module must default-export a native component');
+                            const component = module.default;
+                            const Loaded = (props, scope, extra)=>{
+                                for (const href of assets?.css ?? [])preinit(href, {
+                                    as: 'style',
+                                    precedence: 'federated',
+                                    ...void 0 === context.nonce ? {} : {
+                                        nonce: context.nonce
+                                    }
+                                });
+                                return component(props, scope, extra);
+                            };
+                            return {
+                                default: Loaded
+                            };
+                        });
+                        const boundary = externalSnapshotBoundary({
+                            authority: admitted.coordinate.native,
+                            component: BrowserRemote,
+                            contextKeys,
+                            timeoutMs: timeout,
+                            async snapshot (request, signal) {
+                                const response = await worker.transport.request({
+                                    remote: remoteName,
+                                    expose,
+                                    locale: language,
+                                    payload: serializeExternalSnapshotRequest(request),
+                                    signal
+                                });
+                                return decodeExternalSnapshot(response.payload);
+                            }
+                        });
+                        const Loaded = (props)=>{
+                            for (const href of admitted.styles)preinit(href, {
+                                as: 'style',
+                                precedence: 'federated',
+                                ...void 0 === context.nonce ? {} : {
+                                    nonce: context.nonce
+                                }
+                            });
+                            return createElement(boundary, props);
+                        };
+                        return {
+                            default: Loaded
+                        };
+                    }
+                    const { module, assets } = await withTimeout(Promise.resolve().then(()=>id ? loadFederatedModule(context.instance, id) : remote().then((module)=>({
+                                module,
+                                assets: void 0
+                            }))), options.timeout ?? (context.server ? 3000 : void 0), id ?? 'loader');
                     if ('function' != typeof module?.default) throw new TypeError('A federated Octane module must default-export a native component');
-                    const assets = id && context.instance ? remoteBrowserAssets(context.instance, id) : void 0;
                     if (context.server && !assets) throw new Error(`Cannot server-render ${id}: the host has no browser assets for this remote`);
-                    const component = module.default;
+                    const component = publisherBoundary(module.default, {
+                        publisherKey: id ?? 'ultramodern:browser-loader'
+                    });
                     const Loaded = (props)=>{
+                        useEffect(()=>{
+                            if (context.server || !id || !context.instance) return;
+                            const register = Reflect.get(context.instance, Symbol.for('ultramodern.federation.browser-dev-boundary.v1'));
+                            if ('function' != typeof register) return;
+                            return register(id, module.default, component);
+                        }, [], publisherRegistrationEffectSlot);
                         for (const href of assets?.css ?? [])preinit(href, {
                             as: 'style',
                             precedence: 'federated',
@@ -50,11 +152,11 @@ function federatedComponent(remote, options = {}) {
                         default: Loaded
                     };
                 } catch (error) {
-                    if (!context.server) components.delete(context);
+                    if (!context.server) components.delete(owner);
                     throw error;
                 }
             });
-            components.set(context, Remote);
+            components.set(owner, Remote);
         }
         return createElement(Suspense, {
             fallback: options.fallback,

package/dist/esm/i18n/LocalizedLink.mjs

@@ -1,48 +1,42 @@
-import { canonicalPath, configuredLanguage, localizePath } from "@modern-js/i18n-runtime-extensions/paths";
+import { configuredLanguage, localizePath } from "@modern-js/i18n-runtime-extensions/paths";
 import { createElement, hookSlots, useContext } from "octane";
 import { Link, useLocation, useRouter } from "../router.mjs";
 import { I18nContext } from "./context.mjs";
-const locationSlot = Symbol(hookSlots(1));
+const targetLocationSlot = Symbol(hookSlots(1));
 function LocalizedLink(props) {
     const context = useContext(I18nContext);
     if (!context) throw new Error('[renderer-octane] LocalizedLink was used outside of an I18nProvider.');
     const router = useRouter();
-    const language = void 0 === props.language ? context.language : configuredLanguage(props.language, context.languages);
-    const href = localizePath(props.to, language, {
+    const location = useLocation(void 0, targetLocationSlot);
+    const { language: requestedLanguage, to, children, ...options } = props;
+    const language = void 0 === requestedLanguage ? context.language : configuredLanguage(requestedLanguage, context.languages);
+    const externalTarget = to.startsWith('//') || URL.canParse(to);
+    const pathname = externalTarget ? to : localizePath(router.buildLocation({
+        to,
+        from: options.from,
+        params: options.params,
+        unsafeRelative: options.unsafeRelative,
+        _fromLocation: location
+    }).pathname, language, {
         languages: [
             ...context.languages
         ],
         localisedUrls: context.localisedUrls
     });
-    const crossLanguage = language !== context.language;
-    const rewrite = Boolean(router.options.rewrite);
     return createElement(Link, {
-        to: rewrite ? props.to : href,
-        ...rewrite && crossLanguage ? {
+        ...options,
+        to: router.options.rewrite ? to : pathname,
+        ...router.options.rewrite && !externalTarget ? {
             mask: {
-                to: href
+                to: pathname,
+                inheritSearch: true,
+                hash: options.hash,
+                state: options.state
             }
         } : {},
-        ...crossLanguage ? {
+        ...language === context.language ? {} : {
             hreflang: language
-        } : {},
-        class: props.class,
-        activeProps: props.activeProps,
-        inactiveProps: props.inactiveProps,
-        activeOptions: props.activeOptions,
-        replace: props.replace,
-        preload: props.preload
-    }, props.children);
-}
-function useIsLocalizedActive(canonicalTarget) {
-    const context = useContext(I18nContext);
-    if (!context) throw new Error('[renderer-octane] useIsLocalizedActive was used outside of an I18nProvider.');
-    const location = useLocation(void 0, locationSlot);
-    return canonicalPath(location.pathname, {
-        languages: [
-            ...context.languages
-        ],
-        localisedUrls: context.localisedUrls
-    }) === canonicalTarget;
+        }
+    }, children);
 }
-export { LocalizedLink, useIsLocalizedActive };
+export { LocalizedLink };

package/dist/esm/i18n/index.mjs

@@ -3,6 +3,6 @@ export { I18N_SSR_HANDOFF_ELEMENT_ID, createI18nSsrHandoffInlineData, readI18nSs
 export { createI18nUrlRewrite } from "@modern-js/i18n-runtime-extensions/urlRewrite";
 export { I18nContext } from "./context.mjs";
 export { I18nProvider } from "./I18nProvider.mjs";
-export { LocalizedLink, useIsLocalizedActive } from "./LocalizedLink.mjs";
+export { LocalizedLink } from "./LocalizedLink.mjs";
 export { useLatestLanguageSync } from "./languageSync.mjs";
 export { useI18n } from "./useI18n.mjs";