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

package/dist/esm/actions.js

@@ -1,4 +1,4 @@
-import { claimElement, getNextElement, getRequestEvent, runHydrationEvents, spread, template } from "@solidjs/web";
+import { getNextElement, getRequestEvent, runHydrationEvents, spread, template } from "@solidjs/web";
 import { createDataClient } from "@modern-js/renderer-core/data";
 import { assertRendererIdentity, identityCacheKey } from "@modern-js/renderer-core/identity";
 import { createSignal, getOwner, omit, onCleanup, untrack } from "solid-js";
@@ -67,9 +67,9 @@ function createRouteAction(options) {
     const identity = Object.freeze({
         ...options.rendererIdentity
     });
-    const client = createDataClient(routeId, identity, {
+    const client = createDataClient(routeId, identity, options.fetch ? {
         fetch: options.fetch
-    });
+    } : {});
     const requestURL = getRequestEvent()?.request.url;
     const url = ()=>{
         const base = "u" < typeof window ? requestURL : window.location.href;
@@ -263,7 +263,6 @@ function ActionForm(props) {
         props.action.submitForm(event.currentTarget, event.submitter);
     };
     var _el$ = getNextElement(_tmpl$);
-    claimElement(_el$);
     spread(_el$, [
         ()=>omit(props, "action"),
         {

package/dist/esm/application-router.js

@@ -1,4 +1,4 @@
-import { createComponent, mergeProps, useHead } from "@solidjs/web";
+import { createComponent, getRequestEvent, mergeProps, useHead } from "@solidjs/web";
 import { DataProtocolError } from "@modern-js/renderer-core/data";
 import { ownApplicationRouteData } from "./route-completion.js";
 import { toHeadTags, useTags } from "./router-binding/headContentUtils.js";
@@ -10,7 +10,12 @@ function ApplicationHead() {
     return null;
 }
 function ApplicationRouter(props) {
-    if (Object.hasOwn(props, "context")) throw new DataProtocolError("Set public Solid router context in createApplicationRouter; ApplicationRouter context overrides are unsupported");
+    if (Object.hasOwn(props, "context")) {
+        const error = new DataProtocolError("Set public Solid router context in createApplicationRouter; ApplicationRouter context overrides are unsupported");
+        const session = getRequestEvent()?.locals.session;
+        session?.fail(error);
+        throw error;
+    }
     const { router, ...rest } = props;
     ownApplicationRouteData(router);
     return createComponent(RouterContextProvider, mergeProps({

package/dist/esm/entry-client.js

@@ -6,6 +6,7 @@ function startNativeClient(options) {
     startNativeClientEntry(options, {
         readBootstrap: readSolidDocumentBootstrap,
         createRouter: (application, routerOptions)=>createNativeRouter(application, routerOptions, solidRouterFactory),
+        disposeRouter: (router)=>router.history.destroy(),
         async prepareRouter (router, hydrating) {
             if (!hydrating) await router.load();
         },

package/dist/esm/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/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/i18n/LocalizedLink.js

@@ -1,74 +1,52 @@
 import { createComponent, 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";
 function LocalizedLink(props) {
     const context = __rspack_external_solid_js_0ac0db99.useContext(I18nContext);
     const router = useRouter();
-    const rewrite = Boolean(router.options.rewrite);
+    const location = useLocation();
+    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 href = __rspack_external_solid_js_0ac0db99.createMemo(()=>localizePath(props.to, targetLanguage(), {
+    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
-        }));
-    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 createComponent(Link, mergeProps(dataAttributes, {
+        });
+    });
+    return createComponent(Link, mergeProps(options, {
         get to () {
-            return memo(()=>!!masked())() ? props.to : ".";
-        },
-        get href () {
-            return memo(()=>!!masked())() ? void 0 : href();
+            return memo(()=>!!router.options.rewrite)() ? props.to : pathname();
         },
         get mask () {
-            return memo(()=>!!masked())() ? {
-                to: href()
+            return memo(()=>!!(router.options.rewrite && !externalTarget()))() ? {
+                to: pathname(),
+                inheritSearch: true,
+                hash: props.hash,
+                state: props.state
             } : void 0;
         },
         get hreflang () {
-            return memo(()=>!!crossLanguage())() ? targetLanguage() : void 0;
-        },
-        get class () {
-            return props.class;
-        },
-        get activeProps () {
-            return props.activeProps;
-        },
-        get inactiveProps () {
-            return props.inactiveProps;
-        },
-        get activeOptions () {
-            return props.activeOptions;
-        },
-        get replace () {
-            return props.replace;
-        },
-        get preload () {
-            return props.preload;
+            return memo(()=>targetLanguage() === context.language())() ? void 0 : targetLanguage();
         },
         get children () {
             return props.children;
         }
     }));
 }
-function useIsLocalizedActive(canonicalTarget) {
-    const context = __rspack_external_solid_js_0ac0db99.useContext(I18nContext);
-    const location = useLocation();
-    return ()=>canonicalPath(location().pathname, {
-            languages: [
-                ...context.languages
-            ],
-            localisedUrls: context.localisedUrls
-        }) === canonicalTarget;
-}
-export { LocalizedLink, useIsLocalizedActive };
+export { LocalizedLink };

package/dist/esm/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/index.js

@@ -1,11 +1,11 @@
 const SOLID_RENDERER_PROFILE = {
     renderer: "solid",
-    solid: "2.0.0-rc.13",
-    web: "2.0.0-rc.13",
+    solid: "2.0.0-rc.15",
+    web: "2.0.0-rc.15",
     router: "@modern-js/renderer-solid/router@3.8.3",
     routerSource: "4fbd65c5c3b40be87a6248867c22021c1c19bba8",
-    routerCore: "1.171.34",
-    history: "1.162.4",
+    routerCore: "1.171.38",
+    history: "1.162.5",
     publicRouteData: {
         containers: [
             "plain-record",
@@ -28,7 +28,7 @@ const SOLID_RENDERER_PROFILE = {
         providerOverrides: "unsupported"
     },
     nativePromiseMetadata: {
-        runtime: "2.0.0-rc.13",
+        runtime: "2.0.0-rc.15",
         fields: [
             "s",
             "v"

package/dist/esm/manifest.js

@@ -1,5 +1,5 @@
 import { nativeModuleManifestFilename, readRendererIdentity } from "@modern-js/renderer-core/identity";
-const SOLID_COMPILER_VERSION = "2.0.0-rc.13";
+const SOLID_COMPILER_VERSION = "2.0.0-rc.15";
 function solidModuleManifestFilename(entryName) {
     return nativeModuleManifestFilename("solid", entryName);
 }

package/dist/esm/route-completion.js

@@ -2,7 +2,7 @@ import { Dynamic, createComponent } from "@solidjs/web";
 import { DataProtocolError } from "@modern-js/renderer-core/data";
 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";
 const routeScopes = new WeakMap();
 const routerScopes = new WeakMap();
 function assertManagedRouteData(route) {
@@ -14,6 +14,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/router-binding/Asset.js

@@ -75,9 +75,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 = (()=>{
                     var _el$ = getNextElement(_tmpl$);
                     spread(_el$, attrs, false);

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

@@ -1,4 +1,4 @@
-import { createComponent, memo } from "@solidjs/web";
+import { createComponent, memo, mergeProps } from "@solidjs/web";
 import { replaceEqualDeep } from "@tanstack/router-core";
 import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
 import { Match } from "./Match.js";
@@ -47,17 +47,16 @@ function MatchesInner() {
     return createComponent(NearestMatchContext, {
         value: nearestMatch,
         get children () {
-            return createComponent(CatchBoundary, {
+            return createComponent(CatchBoundary, mergeProps({
                 getResetKey: ()=>router.stores.matches.get(),
                 render: matchContent,
-                errorComponent: ErrorComponent,
-                get onCatch () {
-                    return "production" !== process.env.NODE_ENV ? (error)=>{
+                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()}`);
-                    } : void 0;
-                }
-            });
+                    }
+                } : {}));
         }
     });
 }
@@ -69,10 +68,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/router-binding/PROVENANCE.json

@@ -14,7 +14,7 @@
       "sourcePath": "packages/solid-router/src",
       "upstreamPackage": "@tanstack/solid-router",
       "upstreamVersion": "1.170.36",
-      "routerCoreVersion": "1.171.34",
+      "routerCoreVersion": "1.171.37",
       "files": ["Scripts.tsx", "link.tsx"],
       "adaptation": "Native body-script composition and positional search equality are ported from the matching router-core release. The owned binding retains Solid 2 RC.13 JSX, NoHydration, keyed public match transfer and its module-keyed client-assets resolver."
     }
@@ -67,7 +67,7 @@
     "utils.ts": "a398c76ac378efe6f8b9aa859a5335d4f07cc692a31754fa93c8bf3e5df0b6ff"
   },
   "localChanges": [
-    "The public router surface omits InjectedHtmlEntry, isPlainArray and isPlainObject, which router-core 1.171.34 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.",
@@ -83,7 +83,7 @@
   ],
   "nativeProtocolLimitations": [
     {
-      "runtime": "@solidjs/web@2.0.0-rc.13 with Seroval 1.6.8",
+      "runtime": "@solidjs/web@2.0.0-rc.15 with Seroval 1.6.8",
       "trigger": "Direct native writer injection of a rejected whole-match Promise before the client binding loads",
       "observed": "Native inline resolver scripts reject registry Promises without a rejection handler; browser page errors occur before router construction. Binding claims cannot retroactively handle those errors.",
       "supportedProducer": "The maintained match producer writes only settled synchronous records and excludes pending matches. Critical public-data failures are rejected before headers; unsupported deferred values fail the owning session and abort native serialization.",

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

@@ -2,12 +2,13 @@ import { createComponent, 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";
 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/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/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/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/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/router-binding/link.js

@@ -1,4 +1,4 @@
-import { Dynamic, claimElement, createComponent, getNextElement, insert, mergeProps, runHydrationEvents, scope, spread, template } from "@solidjs/web";
+import { Dynamic, createComponent, getNextElement, insert, mergeProps, runHydrationEvents, scope, spread, template } from "@solidjs/web";
 import { deepEqual, exactPathTest, functionalUpdate, getUrlScheme, hasKeys, isDangerousProtocol, preloadWarning, removeTrailingSlash } from "@tanstack/router-core";
 import { isServer } from "@tanstack/router-core/isServer";
 import { useHydrated } from "./ClientOnly.js";
@@ -237,8 +237,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
         });
@@ -333,7 +333,6 @@ const Link = (props)=>{
         ]);
         var _el$ = getNextElement(_tmpl$);
         var _el$2 = _el$.firstChild;
-        claimElement(_el$2);
         spread(_el$2, svgLinkProps, true);
         insert(_el$2, scope(()=>children()));
         runHydrationEvents();
@@ -341,7 +340,6 @@ const Link = (props)=>{
     }
     if (!local._asChild) {
         var _el$3 = getNextElement(_tmpl$2);
-        claimElement(_el$3);
         spread(_el$3, linkProps, true);
         insert(_el$3, scope(()=>children()));
         runHydrationEvents();

package/dist/esm/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/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/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/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/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;

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

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