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

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

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

@@ -1,4 +1,4 @@
-import { mergeProps, useHead } from "@solidjs/web";
+import { 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 RouterContextProvider(mergeProps({

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

@@ -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-node/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-node/plugin/index.js

@@ -27,8 +27,6 @@ const rendererAdapter = defineRendererAdapter({
             'solid-js',
             '@solidjs/web',
             '@solidjs/signals',
-            'seroval',
-            'seroval-plugins',
             '@modern-js/renderer-solid',
             '@modern-js/renderer-solid/client',
             '@modern-js/renderer-solid/router',
@@ -63,8 +61,7 @@ const rendererAdapter = defineRendererAdapter({
                     '@solidjs/signals': profile.hydration.version
                 },
                 devDependencies: {
-                    [profile.compiler.name]: profile.compiler.version,
-                    '@solidjs/babel-plugin': profile.compiler.version
+                    [profile.compiler.name]: profile.compiler.version
                 }
             }),
         generateAppSources: generateSolidAppSources

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

@@ -2,7 +2,7 @@ const solidProfile = {
     renderer: 'solid',
     status: 'preview',
     protocolVersion: 1,
-    minimumNode: '26.10.0',
+    minimumNode: '26.12.0',
     hmr: {
         editedBoundary: 'may-reset',
         unaffectedComponents: 'preserved',
@@ -12,17 +12,17 @@ const solidProfile = {
     },
     compiler: {
         name: '@solidjs/compiler',
-        version: '2.0.0-rc.13'
+        version: '2.0.0-rc.15'
     },
     hydration: {
         name: '@solidjs/web',
-        version: '2.0.0-rc.13'
+        version: '2.0.0-rc.15'
     },
     router: {
         name: '@modern-js/renderer-solid',
         version: '3.8.3',
         coreName: '@tanstack/router-core',
-        coreVersion: '1.171.34'
+        coreVersion: '1.171.38'
     },
     sourceExtensions: [
         '.tsx',
@@ -32,13 +32,12 @@ const solidProfile = {
     ],
     jsxImportSource: '@solidjs/web',
     dependencies: {
-        'solid-js': '2.0.0-rc.13',
-        '@solidjs/web': '2.0.0-rc.13',
-        '@solidjs/signals': '2.0.0-rc.13',
-        '@solidjs/compiler': '2.0.0-rc.13',
-        '@modern-js/renderer-solid': '3.8.3',
-        seroval: '1.6.8',
-        'seroval-plugins': '1.6.8'
+        '@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',
+        '@solidjs/compiler': '2.0.0-rc.15',
+        '@modern-js/renderer-solid': '3.8.3'
     },
     capabilities: {
         worker: true,

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/CatchBoundary.js

@@ -1,4 +1,4 @@
-import { Dynamic, escape as web_escape, memo, scope, ssr, ssrHydrationKey, ssrStyleProperty } from "@solidjs/web";
+import { Dynamic, escape as web_escape, memo, scope, ssr, ssrHydrationKey, ssrStyleProperties, ssrStyleProperty } from "@solidjs/web";
 import { renderInNonRouteComponentContext } from "./nonRouteComponentContext.js";
 import * as __rspack_external_solid_js_0ac0db99 from "solid-js";
 var _tmpl$ = [
@@ -128,9 +128,9 @@ function ErrorComponent({ error }) {
                     var _v$6, _v$7;
                     return _c$2() ? (_v$6 = ssrHydrationKey(), _v$7 = scope(()=>web_escape(error.message)), ssr(_tmpl$3, _v$6, _v$7)) : web_escape(null);
                 };
-            })()), ssr(_tmpl$2, _v$4, ssrStyleProperty("font-size:", ".7em") + ssrStyleProperty(";border:", "1px solid red") + ssrStyleProperty(";border-radius:", ".25rem") + ssrStyleProperty(";padding:", ".3rem") + ssrStyleProperty(";color:", "red") + ssrStyleProperty(";overflow:", "auto"), _v$5)) : web_escape(null);
+            })()), ssr(_tmpl$2, _v$4, ssrStyleProperties("font-size:", ".7em", "border:", "1px solid red", "border-radius:", ".25rem", "padding:", ".3rem", "color:", "red", "overflow:", "auto"), _v$5)) : web_escape(null);
         };
     })());
-    return ssr(_tmpl$, _v$, ssrStyleProperty("padding:", ".5rem") + ssrStyleProperty(";max-width:", "100%"), ssrStyleProperty("display:", "flex") + ssrStyleProperty(";align-items:", "center") + ssrStyleProperty(";gap:", ".5rem"), ssrStyleProperty("font-size:", "1rem"), ssrStyleProperty("appearance:", "none") + ssrStyleProperty(";font-size:", ".6em") + ssrStyleProperty(";border:", "1px solid currentColor") + ssrStyleProperty(";padding:", ".1rem .2rem") + ssrStyleProperty(";font-weight:", "bold") + ssrStyleProperty(";border-radius:", ".25rem"), _v$2, ssrStyleProperty("height:", ".25rem"), _v$3);
+    return ssr(_tmpl$, _v$, ssrStyleProperties("padding:", ".5rem", "max-width:", "100%"), ssrStyleProperties("display:", "flex", "align-items:", "center", "gap:", ".5rem"), ssrStyleProperty("font-size:", "1rem"), ssrStyleProperties("appearance:", "none", "font-size:", ".6em", "border:", "1px solid currentColor", "padding:", ".1rem .2rem", "font-weight:", "bold", "border-radius:", ".25rem"), _v$2, ssrStyleProperty("height:", ".25rem"), _v$3);
 }
 export { CatchBoundary, ErrorComponent };

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

@@ -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-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) {