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

package/dist/esm-node/federation-ssr.js

@@ -1,14 +1,22 @@
-import { remoteBrowserAssets } from "@modern-js/renderer-core/federation";
 const FEDERATED_ASSET_PREFIX = "ultramodern-federation:";
-function federatedServerAssets(scope, id) {
-    const instance = scope?.instance;
-    const assets = instance && remoteBrowserAssets(instance, id);
-    if (!assets || !scope?.hydrationModule || !instance.name) return;
+const capturedAssets = new WeakMap();
+function captureFederatedServerAssets(scope, id, assets) {
+    const instance = scope.instance;
+    if (!assets || !scope.hydrationModule || !instance?.name) return;
     const hydration = `${scope.hydrationModule}?id=${encodeURIComponent(id)}&host=${encodeURIComponent(instance.name)}`;
-    return {
+    let records = capturedAssets.get(scope);
+    if (!records) {
+        records = new Map();
+        capturedAssets.set(scope, records);
+    }
+    const baseKey = federatedAssetKey(id);
+    let key = baseKey;
+    for(let revision = 1; records.has(key); revision += 1)key = `${baseKey}:${revision}`;
+    records.set(key, {
         hydration,
         assets
-    };
+    });
+    return key;
 }
 function federatedAssetKey(id) {
     return `${FEDERATED_ASSET_PREFIX}${id}`;
@@ -64,7 +72,7 @@ function withFederatedAssets(manifest, scope) {
     const modules = manifest;
     const resolve = (key)=>{
         if (!key.startsWith(FEDERATED_ASSET_PREFIX)) return resolveStaticAssets(modules, key);
-        const remote = federatedServerAssets(scope, key.slice(FEDERATED_ASSET_PREFIX.length));
+        const remote = capturedAssets.get(scope)?.get(key);
         if (!remote) return null;
         return {
             js: [
@@ -81,4 +89,4 @@ function withFederatedAssets(manifest, scope) {
         resolveSync: resolve
     };
 }
-export { FEDERATED_ASSET_PREFIX, federatedAssetKey, federatedServerAssets, withFederatedAssets };
+export { FEDERATED_ASSET_PREFIX, captureFederatedServerAssets, federatedAssetKey, withFederatedAssets };

package/dist/esm-node/federation.js

@@ -1,7 +1,7 @@
 import { loadFederatedModule } from "@modern-js/renderer-core/federation";
 import { isServer } from "@solidjs/web";
 import { FederationContext } from "./federation-context.js";
-import { federatedAssetKey, federatedServerAssets } from "./federation-ssr.js";
+import { captureFederatedServerAssets } from "./federation-ssr.js";
 import * as __rspack_external_solid_js_0ac0db99 from "solid-js";
 const DEFAULT_SERVER_TIMEOUT = 3e3;
 function withTimeout(promise, timeout, label) {
@@ -31,16 +31,20 @@ function federatedComponent(remote, options = {}) {
     const timeout = options.timeout ?? (isServer ? DEFAULT_SERVER_TIMEOUT : void 0);
     const load = (scope)=>(0, __rspack_external_solid_js_0ac0db99.lazy)(async ()=>{
             if (isServer && !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(scope.instance, id) : remote()), timeout, id ?? "loader");
+            const { module, assets } = await withTimeout(Promise.resolve().then(()=>id ? loadFederatedModule(scope.instance, id) : remote().then((module)=>({
+                        module,
+                        assets: void 0
+                    }))), timeout, id ?? "loader");
             const component = module?.default;
             if ("function" != typeof component) throw new TypeError("A federated Solid module must default-export a component");
             if (!isServer || !id) return {
                 default: component
             };
-            if (!federatedServerAssets(scope, id)) throw new Error(`Cannot server-render ${id}: the host has no server federation state for its browser assets`);
+            const assetKey = captureFederatedServerAssets(scope, id, assets);
+            if (!assetKey) throw new Error(`Cannot server-render ${id}: the host has no server federation state for its browser assets`);
             return {
                 default: component,
-                $$moduleUrl: federatedAssetKey(id)
+                $$moduleUrl: assetKey
             };
         });
     const remotes = new WeakMap();

package/dist/esm-node/i18n/LocalizedLink.js

@@ -1,86 +1,42 @@
 import { memo, mergeProps } from "@solidjs/web";
-import { canonicalPath, configuredLanguage, localizePath } from "@modern-js/i18n-runtime-extensions/paths";
+import { configuredLanguage, localizePath } from "@modern-js/i18n-runtime-extensions/paths";
 import { Link, useLocation, useRouter } from "../router.js";
 import { I18nContext } from "./context.js";
 import * as __rspack_external_solid_js_0ac0db99 from "solid-js";
-var _m$ = Symbol(), _m$2 = Symbol(), _m$3 = Symbol(), _m$4 = Symbol(), _m$5 = Symbol();
+var _m$ = Symbol(), _m$2 = Symbol(), _m$3 = Symbol(), _m$4 = Symbol(), _m$5 = Symbol(), _m$6 = Symbol();
 var _d$ = {
     get () {
-        const masked = this[_m$];
+        const router = this[_m$];
         const props = this[_m$2];
-        return memo(()=>!!masked())() ? props.to : ".";
+        const pathname = this[_m$3];
+        return memo(()=>!!router.options.rewrite)() ? props.to : pathname();
     },
     enumerable: true,
     configurable: true
 }, _d$2 = {
     get () {
-        const masked = this[_m$];
-        const href = this[_m$3];
-        return memo(()=>!!masked())() ? void 0 : href();
-    },
-    enumerable: true,
-    configurable: true
-}, _d$3 = {
-    get () {
-        const masked = this[_m$];
-        const href = this[_m$3];
-        return memo(()=>!!masked())() ? {
-            to: href()
+        const router = this[_m$];
+        const externalTarget = this[_m$4];
+        const pathname = this[_m$3];
+        const props = this[_m$2];
+        return memo(()=>!!(router.options.rewrite && !externalTarget()))() ? {
+            to: pathname(),
+            inheritSearch: true,
+            hash: props.hash,
+            state: props.state
         } : void 0;
     },
     enumerable: true,
     configurable: true
-}, _d$4 = {
+}, _d$3 = {
     get () {
-        const crossLanguage = this[_m$4];
         const targetLanguage = this[_m$5];
-        return memo(()=>!!crossLanguage())() ? targetLanguage() : void 0;
-    },
-    enumerable: true,
-    configurable: true
-}, _d$5 = {
-    get () {
-        const props = this[_m$2];
-        return props.class;
-    },
-    enumerable: true,
-    configurable: true
-}, _d$6 = {
-    get () {
-        const props = this[_m$2];
-        return props.activeProps;
+        const context = this[_m$6];
+        return memo(()=>targetLanguage() === context.language())() ? void 0 : targetLanguage();
     },
     enumerable: true,
     configurable: true
-}, _d$7 = {
-    get () {
-        const props = this[_m$2];
-        return props.inactiveProps;
-    },
-    enumerable: true,
-    configurable: true
-}, _d$8 = {
-    get () {
-        const props = this[_m$2];
-        return props.activeOptions;
-    },
-    enumerable: true,
-    configurable: true
-}, _d$9 = {
-    get () {
-        const props = this[_m$2];
-        return props.replace;
-    },
-    enumerable: true,
-    configurable: true
-}, _d$10 = {
-    get () {
-        const props = this[_m$2];
-        return props.preload;
-    },
-    enumerable: true,
-    configurable: true
-}, _d$11 = {
+}, _d$4 = {
     get () {
         const props = this[_m$2];
         return props.children;
@@ -88,55 +44,45 @@ var _d$ = {
     enumerable: true,
     configurable: true
 };
-function _P$(_p, _p2, _p3, _p4, _p5) {
+function _P$(_p, _p2, _p3, _p4, _p5, _p6) {
     this[_m$] = _p;
     this[_m$2] = _p2;
     this[_m$3] = _p3;
     this[_m$4] = _p4;
     this[_m$5] = _p5;
+    this[_m$6] = _p6;
     Object.defineProperty(this, "to", _d$);
-    Object.defineProperty(this, "href", _d$2);
-    Object.defineProperty(this, "mask", _d$3);
-    Object.defineProperty(this, "hreflang", _d$4);
-    Object.defineProperty(this, "class", _d$5);
-    Object.defineProperty(this, "activeProps", _d$6);
-    Object.defineProperty(this, "inactiveProps", _d$7);
-    Object.defineProperty(this, "activeOptions", _d$8);
-    Object.defineProperty(this, "replace", _d$9);
-    Object.defineProperty(this, "preload", _d$10);
-    Object.defineProperty(this, "children", _d$11);
+    Object.defineProperty(this, "mask", _d$2);
+    Object.defineProperty(this, "hreflang", _d$3);
+    Object.defineProperty(this, "children", _d$4);
 }
 _P$.prototype = Object.prototype;
 function LocalizedLink(props) {
     const context = __rspack_external_solid_js_0ac0db99.useContext(I18nContext);
     const router = useRouter();
-    const rewrite = Boolean(router.options.rewrite);
-    const targetLanguage = ()=>void 0 === props.language ? context.language() : configuredLanguage(props.language, context.languages);
-    const href = __rspack_external_solid_js_0ac0db99.createMemo(()=>localizePath(props.to, targetLanguage(), {
-            languages: [
-                ...context.languages
-            ],
-            localisedUrls: context.localisedUrls
-        }));
-    const crossLanguage = ()=>targetLanguage() !== context.language();
-    const masked = ()=>rewrite && crossLanguage();
-    const dataAttributes = Object.defineProperties({}, Object.fromEntries(Object.keys(props).filter((key)=>key.startsWith("data-")).map((key)=>[
-            key,
-            {
-                enumerable: true,
-                get: ()=>props[key]
-            }
-        ])));
-    return Link(mergeProps(dataAttributes, new _P$(masked, props, href, crossLanguage, targetLanguage)));
-}
-function useIsLocalizedActive(canonicalTarget) {
-    const context = __rspack_external_solid_js_0ac0db99.useContext(I18nContext);
     const location = useLocation();
-    return ()=>canonicalPath(location().pathname, {
+    const options = __rspack_external_solid_js_0ac0db99.omit(props, "to", "language", "children");
+    const targetLanguage = ()=>void 0 === props.language ? context.language() : configuredLanguage(props.language, context.languages);
+    const externalTarget = ()=>props.to.startsWith("//") || URL.canParse(props.to);
+    const canonicalTarget = ()=>({
+            to: props.to,
+            from: props.from,
+            params: props.params,
+            unsafeRelative: props.unsafeRelative
+        });
+    const pathname = __rspack_external_solid_js_0ac0db99.createMemo(()=>{
+        if (externalTarget()) return props.to;
+        const target = router.buildLocation({
+            ...canonicalTarget(),
+            _fromLocation: location()
+        });
+        return localizePath(target.pathname, targetLanguage(), {
             languages: [
                 ...context.languages
             ],
             localisedUrls: context.localisedUrls
-        }) === canonicalTarget;
+        });
+    });
+    return Link(mergeProps(options, new _P$(router, props, pathname, externalTarget, targetLanguage, context)));
 }
-export { LocalizedLink, useIsLocalizedActive };
+export { LocalizedLink };

package/dist/esm-node/i18n/index.js

@@ -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.js";
 export { I18nProvider } from "./I18nProvider.js";
-export { LocalizedLink, useIsLocalizedActive } from "./LocalizedLink.js";
+export { LocalizedLink } from "./LocalizedLink.js";
 export { createLatestLanguageSync } from "./languageSync.js";
 export { useI18n } from "./useI18n.js";

package/dist/esm-node/index.js

@@ -4,7 +4,7 @@ const SOLID_RENDERER_PROFILE = {
     web: "2.0.0-rc.15",
     router: "@modern-js/renderer-solid/router@3.8.3",
     routerSource: "4fbd65c5c3b40be87a6248867c22021c1c19bba8",
-    routerCore: "1.171.37",
+    routerCore: "1.171.38",
     history: "1.162.5",
     publicRouteData: {
         containers: [

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

@@ -22,7 +22,7 @@ const solidProfile = {
         name: '@modern-js/renderer-solid',
         version: '3.8.3',
         coreName: '@tanstack/router-core',
-        coreVersion: '1.171.37'
+        coreVersion: '1.171.38'
     },
     sourceExtensions: [
         '.tsx',
@@ -32,6 +32,7 @@ const solidProfile = {
     ],
     jsxImportSource: '@solidjs/web',
     dependencies: {
+        '@tanstack/router-core': 'https://github.com/BleedingDev/router/releases/download/ultramodern-router-core-585d3233f7f5/tanstack-router-core-1.171.38.tgz',
         'solid-js': '2.0.0-rc.15',
         '@solidjs/web': '2.0.0-rc.15',
         '@solidjs/signals': '2.0.0-rc.15',

package/dist/esm-node/route-completion.js

@@ -2,7 +2,7 @@ import { DataProtocolError } from "@modern-js/renderer-core/data";
 import { Dynamic } from "@solidjs/web";
 import { createEffect, createMemo, createSignal, onCleanup } from "solid-js";
 import { createRouter, preparePublicContextData, useMatch } from "./router-binding/index.js";
-import { registerPublicRouteDataOwner } from "./router-binding/registryTransfer.js";
+import { assertNativeSerializationOptions, registerPublicRouteDataOwner } from "./router-binding/registryTransfer.js";
 var _m$ = Symbol();
 var _d$ = {
     get () {
@@ -28,6 +28,7 @@ function registerRouteCompletionScope(route, scope) {
     routeScopes.set(route, scope);
 }
 const createApplicationRouter = (options)=>{
+    assertNativeSerializationOptions(options);
     const scope = options.routeTree ? routeScopes.get(options.routeTree) : void 0;
     if (!scope) assertManagedRouteData(options.routeTree);
     if (scope && options.routeTree) registerPublicRouteDataOwner(options.routeTree, scope.hydrationOwner, scope.privateRoots);

package/dist/esm-node/router-binding/Asset.js

@@ -80,9 +80,10 @@ function HeadElement(props) {
         case "style":
             {
                 const attrs = {
-                    ...props.attrs,
-                    innerHTML: "string" == typeof props.children ? props.children : void 0
+                    ...props.attrs
                 };
+                delete attrs.innerHTML;
+                if ("string" == typeof props.children) attrs.innerHTML = props.children;
                 element = ssrElement("style", attrs, void 0, true);
                 break;
             }

package/dist/esm-node/router-binding/Matches.js

@@ -1,4 +1,4 @@
-import { memo } from "@solidjs/web";
+import { memo, mergeProps } from "@solidjs/web";
 import { replaceEqualDeep } from "@tanstack/router-core";
 import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
 import { Match } from "./Match.js";
@@ -53,38 +53,30 @@ function _P$3(_p4, _p5) {
 }
 _P$3.prototype = Object.prototype;
 var _d$4 = {
-    get () {
-        return "production" !== process.env.NODE_ENV ? (error)=>{
-            console.warn("Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!");
-            console.warn(`Warning: ${error.message || error.toString()}`);
-        } : void 0;
-    },
-    enumerable: true,
-    configurable: true
-};
-function _P$4(_p6, _p7, _p8) {
-    this.getResetKey = _p6;
-    this.render = _p7;
-    this.errorComponent = _p8;
-    Object.defineProperty(this, "onCatch", _d$4);
-}
-_P$4.prototype = Object.prototype;
-var _d$5 = {
     get () {
         const router = this[_m$];
         const matchContent = this[_m$2];
-        return CatchBoundary(new _P$4(()=>router.stores.matches.get(), matchContent, ErrorComponent));
+        return CatchBoundary(mergeProps({
+            getResetKey: ()=>router.stores.matches.get(),
+            render: matchContent,
+            errorComponent: ErrorComponent
+        }, ()=>"production" !== process.env.NODE_ENV ? {
+                onCatch: (error)=>{
+                    console.warn("Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!");
+                    console.warn(`Warning: ${error.message || error.toString()}`);
+                }
+            } : {}));
     },
     enumerable: true,
     configurable: true
 };
-function _P$5(_p9, _p0, _p1) {
-    this[_m$] = _p9;
-    this[_m$2] = _p0;
-    this.value = _p1;
-    Object.defineProperty(this, "children", _d$5);
+function _P$4(_p6, _p7, _p8) {
+    this[_m$] = _p6;
+    this[_m$2] = _p7;
+    this.value = _p8;
+    Object.defineProperty(this, "children", _d$4);
 }
-_P$5.prototype = Object.prototype;
+_P$4.prototype = Object.prototype;
 const NearestMatchContext = nearestMatchContext;
 function Matches() {
     const router = useRouter();
@@ -103,7 +95,7 @@ function MatchesInner() {
                 routeId: currentRouteId
             })));
     if (router.options.disableGlobalCatchBoundary) return NearestMatchContext(new _P$3(matchContent, nearestMatch));
-    return NearestMatchContext(new _P$5(router, matchContent, nearestMatch));
+    return NearestMatchContext(new _P$4(router, matchContent, nearestMatch));
 }
 function useMatchRoute() {
     const router = useRouter();
@@ -113,10 +105,18 @@ function useMatchRoute() {
             router.stores.resolvedLocation.get();
             router.stores.status.get();
             return router.matchRoute(rest, {
-                pending,
-                caseSensitive,
-                fuzzy,
-                includeSearch
+                ...void 0 !== pending ? {
+                    pending
+                } : {},
+                ...void 0 !== caseSensitive ? {
+                    caseSensitive
+                } : {},
+                ...void 0 !== fuzzy ? {
+                    fuzzy
+                } : {},
+                ...void 0 !== includeSearch ? {
+                    includeSearch
+                } : {}
             });
         });
 }

package/dist/esm-node/router-binding/PROVENANCE.json

@@ -67,7 +67,7 @@
     "utils.ts": "a398c76ac378efe6f8b9aa859a5335d4f07cc692a31754fa93c8bf3e5df0b6ff"
   },
   "localChanges": [
-    "The public router surface omits InjectedHtmlEntry, isPlainArray and isPlainObject, which router-core 1.171.37 no longer exports. SSR options use the current top-level serializationAdapters contract and the public Solid 2 option types without legacy fallbacks or type assertions.",
+    "The public router surface omits InjectedHtmlEntry, isPlainArray and isPlainObject, which router-core 1.171.37 no longer exports. Managed SSR uses immutable public route data and native Solid 2 promise serialization. Custom serializationAdapters are unsupported and rejected before router construction or document commitment; the local public option types do not admit them.",
     "Authored JSX types import @solidjs/web and have explicit return annotations for Solid 2 declaration generation.",
     "Hydration state and keyed match transfer use Solid 2 RC.13 public isHydrating, isHydratable, getHydrationWriter and takeHydrationValue APIs.",
     "Explicit public beforeLoad results transfer after canonical validation; private request context stays in owner closures. Initial hydration inherits checked server beforeLoad contributions, invokes the native client route-context callback and preserves client options context without rerunning initial beforeLoad callbacks or loaders.",

package/dist/esm-node/router-binding/RouterProvider.js

@@ -2,7 +2,7 @@ import { mergeProps } from "@solidjs/web";
 import { isServer } from "@tanstack/router-core/isServer";
 import { setupFlightDataConsumer } from "./flightData.js";
 import { Matches } from "./Matches.js";
-import { requireManagedPublicRouter, serializeMatchTransfer } from "./registryTransfer.js";
+import { assertNativeSerializationOptions, requireManagedPublicRouter, serializeMatchTransfer } from "./registryTransfer.js";
 import { routerContext } from "./routerContext.js";
 import { SafeFragment } from "./SafeFragment.js";
 import * as __rspack_external_solid_js_0ac0db99 from "solid-js";
@@ -61,6 +61,7 @@ function _P$3(_p7, _p8, _p9) {
 _P$3.prototype = Object.prototype;
 const RouterContext = routerContext;
 function RouterContextProvider({ router, children, ...rest }) {
+    assertNativeSerializationOptions(rest);
     requireManagedPublicRouter(router);
     if (Object.keys(rest).length > 0) __rspack_external_solid_js_0ac0db99.runWithOwner(null, ()=>{
         router.update({

package/dist/esm-node/router-binding/Transitioner.js

@@ -93,10 +93,16 @@ function Rendered() {
     const router = useRouter();
     __rspack_external_solid_js_0ac0db99.onSettled(()=>{
         const resolvedLocation = getResolvedLocation(router);
-        if (resolvedLocation) router.emit({
-            type: "onRendered",
-            ...getLocationChangeInfo(resolvedLocation, resolvedLocation)
-        });
+        if (resolvedLocation) {
+            const { fromLocation, ...changeInfo } = getLocationChangeInfo(resolvedLocation, resolvedLocation);
+            router.emit({
+                type: "onRendered",
+                ...changeInfo,
+                ...void 0 !== fromLocation ? {
+                    fromLocation
+                } : {}
+            });
+        }
     });
     return null;
 }

package/dist/esm-node/router-binding/fileRoute.js

@@ -25,7 +25,7 @@ class FileRoute {
             route.isRoot = false;
             return route;
         };
-        this.silent = _opts?.silent;
+        if (_opts) this.silent = _opts.silent;
     }
 }
 function FileRouteLoader(_path) {

package/dist/esm-node/router-binding/headContentUtils.js

@@ -91,7 +91,9 @@ const useTags = (assetCrossOrigin)=>{
                 ...manifest.inlineStyle.attrs,
                 nonce
             },
-            children: manifest.inlineStyle.children,
+            ...void 0 !== manifest.inlineStyle.children ? {
+                children: manifest.inlineStyle.children
+            } : {},
             inlineCss: true
         });
         return tags;
@@ -114,7 +116,9 @@ const useTags = (assetCrossOrigin)=>{
                     ...attrs,
                     nonce
                 },
-                children: children
+                ...null != children ? {
+                    children: String(children)
+                } : {}
             })));
     const headScripts = __rspack_external_solid_js_0ac0db99.createMemo(()=>activeMatches().flatMap((match)=>match.headScripts ?? []).filter((script)=>void 0 !== script).map(({ children, ...attrs })=>({
                 tag: "script",
@@ -122,7 +126,9 @@ const useTags = (assetCrossOrigin)=>{
                     ...attrs,
                     nonce
                 },
-                children: children
+                ...null != children ? {
+                    children: String(children)
+                } : {}
             })));
     return __rspack_external_solid_js_0ac0db99.createMemo(()=>{
         const next = [];

package/dist/esm-node/router-binding/index.js

@@ -1,6 +1,6 @@
 export * from "./history.js";
 export { createBrowserHistory, createHashHistory, createHistory, createMemoryHistory } from "@tanstack/history";
-export { DEFAULT_PROTOCOL_ALLOWLIST, SearchParamError, cleanPath, composeRewrites, createControlledPromise, createSerializationAdapter, deepEqual, defaultParseSearch, defaultStringifySearch, defer, functionalUpdate, interpolatePath, isMatch, isNotFound, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight } from "@tanstack/router-core";
+export { DEFAULT_PROTOCOL_ALLOWLIST, SearchParamError, cleanPath, composeRewrites, createControlledPromise, deepEqual, defaultParseSearch, defaultStringifySearch, defer, functionalUpdate, interpolatePath, isMatch, isNotFound, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight } from "@tanstack/router-core";
 export { Asset } from "./Asset.js";
 export { Await, useAwaited } from "./awaited.js";
 export { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";

package/dist/esm-node/router-binding/link.js

@@ -267,8 +267,8 @@ function useLinkProps(options) {
         configurable: true
     });
     const defineGetters = (getters)=>{
-        for (const key of Object.keys(getters))Object.defineProperty(linkProps, key, {
-            get: getters[key],
+        for (const [key, get] of Object.entries(getters))Object.defineProperty(linkProps, key, {
+            get,
             enumerable: true,
             configurable: true
         });

package/dist/esm-node/router-binding/registryTransfer.js

@@ -12,7 +12,16 @@ function registerPublicRouteDataOwner(routeTree, owner, privateContexts = []) {
         privateContexts: privateContexts.map((value)=>new WeakRef(value))
     });
 }
+function assertNativeSerializationOptions(options) {
+    if ("serializationAdapters" in options) {
+        const error = new DataProtocolError("Solid serializationAdapters are unsupported by the immutable public-data profile; return public records, arrays and scalars instead");
+        const owner = getRequestEvent()?.locals.session;
+        owner?.fail(error);
+        throw error;
+    }
+}
 function requireManagedPublicRouter(router) {
+    assertNativeSerializationOptions(router.options);
     const owner = getRequestEvent()?.locals.session;
     if (!owner || publicRouteDataOwners.get(router.options.routeTree)?.owner.deref()) return;
     const error = new DataProtocolError("Custom native Solid routers are unsupported by UltraModern SSR. Use the managed filesystem route tree and application router public-data boundary.");
@@ -129,10 +138,13 @@ function primeRouterFromRegistry(router) {
     try {
         for (const [index, match] of matches.entries()){
             const entry = entries[index];
+            const beforeLoadContext = preparePublicContextData(entry.beforeLoadContext, owner, privateContexts);
             const checked = {
                 ...entry,
                 loaderData: prepareHydratedLoaderData(entry.loaderData, owner, privateContexts),
-                beforeLoadContext: preparePublicContextData(entry.beforeLoadContext, owner, privateContexts),
+                ...void 0 !== beforeLoadContext ? {
+                    beforeLoadContext
+                } : {},
                 error: preparePublicContextData(entry.error, owner, privateContexts)
             };
             entries[index] = checked;
@@ -196,7 +208,8 @@ function applyTransferredMatch(match, entry) {
         __beforeLoadContext: entry.beforeLoadContext
     };
     if ("loaderData" in entry) next.loaderData = entry.loaderData;
-    if ("ssr" in entry) next.ssr = entry.ssr;
+    if ("ssr" in entry) if (void 0 === entry.ssr) delete next.ssr;
+    else next.ssr = entry.ssr;
     return next;
 }
 function isRouteDataErrorSnapshot(value) {
@@ -207,4 +220,4 @@ function nativeContextField(match, key) {
     if (descriptor?.get || descriptor?.set) throw new DataProtocolError("Native route context must not contain accessor fields");
     return descriptor?.value;
 }
-export { MATCH_KEY_PREFIX, installPublicContextPublication, prepareRouterMatchTransfer, primeRouterFromRegistry, registerPublicRouteDataOwner, requireManagedPublicRouter, serializeMatchTransfer };
+export { MATCH_KEY_PREFIX, assertNativeSerializationOptions, installPublicContextPublication, prepareRouterMatchTransfer, primeRouterFromRegistry, registerPublicRouteDataOwner, requireManagedPublicRouter, serializeMatchTransfer };

package/dist/esm-node/router-binding/router.js

@@ -1,10 +1,11 @@
 import { RouterCore } from "@tanstack/router-core";
 import { isServer } from "@tanstack/router-core/isServer";
-import { installPublicContextPublication, primeRouterFromRegistry } from "./registryTransfer.js";
+import { assertNativeSerializationOptions, installPublicContextPublication, primeRouterFromRegistry } from "./registryTransfer.js";
 import { getStoreFactory } from "./routerStores.js";
 const createRouter = (options)=>new Router(options);
 class Router extends RouterCore {
     constructor(options){
+        assertNativeSerializationOptions(options);
         super(options, getStoreFactory);
         installPublicContextPublication(this);
         if (!(isServer ?? this.isServer)) primeRouterFromRegistry(this);

package/dist/esm-node/router-binding/routerOptions.js

@@ -0,0 +1 @@
+export { };

package/dist/esm-node/router-binding/useLoaderData.js

@@ -1,8 +1,7 @@
 import { useMatch } from "./useMatch.js";
 function useLoaderData(opts) {
     return useMatch({
-        from: opts.from,
-        strict: opts.strict,
+        ...opts,
         select: (match)=>opts.select ? opts.select(match.loaderData) : match.loaderData
     });
 }

package/dist/esm-node/router-binding/useNavigate.js

@@ -2,10 +2,16 @@ import { useRouter } from "./useRouter.js";
 import * as __rspack_external_solid_js_0ac0db99 from "solid-js";
 function useNavigate(_defaultOpts) {
     const router = useRouter();
-    return (options)=>router.navigate({
+    const navigate = (options)=>{
+        const from = options.from ?? _defaultOpts?.from;
+        return router.navigate({
             ...options,
-            from: options.from ?? _defaultOpts?.from
+            ...void 0 === from ? {} : {
+                from
+            }
         });
+    };
+    return navigate;
 }
 function Navigate(props) {
     const { navigate } = useRouter();

package/dist/esm-node/router-binding/useParams.js

@@ -1,9 +1,7 @@
 import { useMatch } from "./useMatch.js";
 function useParams(opts) {
     return useMatch({
-        from: opts.from,
-        strict: opts.strict,
-        shouldThrow: opts.shouldThrow,
+        ...opts,
         select: (match)=>{
             const params = false === opts.strict ? match.params : match._strictParams;
             return opts.select ? opts.select(params) : params;