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

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;

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

package/dist/types/federation-ssr.d.ts

@@ -1,3 +1,4 @@
+import type { FederatedAssets } from '@modern-js/renderer-core/federation';
 import type { SolidFederationScope } from './federation-context.js';
 /**
  * The server half of same-renderer Module Federation. federatedComponent()
@@ -6,11 +7,8 @@ import type { SolidFederationScope } from './federation-context.js';
  */
 /** Asset keys for server-rendered remotes, e.g. `ultramodern-federation:remote/Widget`. */
 export declare const FEDERATED_ASSET_PREFIX = "ultramodern-federation:";
-/** The host's server state for a remote: its browser assets and hydration module. */
-export declare function federatedServerAssets(scope: SolidFederationScope | undefined, id: string): {
-    hydration: string;
-    assets: import("@modern-js/renderer-core/federation").FederatedAssets;
-} | undefined;
+/** Retain the assets admitted with this module until its response resolves them. */
+export declare function captureFederatedServerAssets(scope: SolidFederationScope, id: string, assets: FederatedAssets | undefined): string | undefined;
 export declare function federatedAssetKey(id: string): string;
 /**
  * Extend a static Solid asset manifest with the remotes this response

package/dist/types/i18n/LocalizedLink.d.ts

@@ -1,43 +1,15 @@
 import type { JSX } from '@solidjs/web';
-import { type LinkComponentProps } from '../router.js';
-export interface LocalizedLinkProps {
+import { type AnyRouter, type LinkComponentProps } from '../router.js';
+export interface LocalizedLinkProps extends Omit<LinkComponentProps<'a', AnyRouter, string, string>, 'to' | 'mask' | 'href' | 'publicHref' | '_fromLocation'> {
     /** A canonical, language-agnostic target, e.g. `/products/red-shoe`. */
     to: string;
     /** Localize for a specific language instead of the current one. */
     language?: string;
-    children?: LinkComponentProps<'a'>['children'];
-    class?: string;
-    activeProps?: LinkComponentProps<'a'>['activeProps'];
-    inactiveProps?: LinkComponentProps<'a'>['inactiveProps'];
-    activeOptions?: LinkComponentProps<'a'>['activeOptions'];
-    replace?: boolean;
-    preload?: LinkComponentProps<'a'>['preload'];
     [key: `data-${string}`]: unknown;
 }
 /**
- * A thin wrapper over the native Solid router `Link` that localizes a
- * canonical `to` for the current (or an explicit) language before handing it
- * to the real link, the same contract as `@modern-js/plugin-i18n`'s React
- * `Link`. It resolves the href itself via the shared pathname helpers, so it
- * works with or without the router's i18n `rewrite`. Every link, including
- * one to another language, is the native `Link`: navigation, preloading and
- * active state stay with the router.
- *
- * Under the i18n `rewrite` the router matches canonical paths and localizes
- * outgoing locations to the current language, so a link to another language
- * routes to the canonical `to` and publishes the target language's URL as a
- * route mask (the rewrite keeps a mask's explicit language). The entry's
- * router language synchronization (`syncWithRouter`) switches the i18next
- * instance from the navigated URL, as it does for history navigation.
- *
- * Props are forwarded explicitly (not via object-rest or a missing
- * `splitProps`/`mergeProps` primitive — Solid 2 only exports `merge`) so
- * each one is read directly from `props` in JSX position and keeps its
- * per-key reactivity.
+ * The native router owns navigation, preloading and active state. A route mask
+ * publishes the selected language URL while keeping the canonical route;
+ * the entry's router subscription synchronizes the i18next instance.
  */
 export declare function LocalizedLink(props: LocalizedLinkProps): JSX.Element;
-/**
- * Language-invariant active check: `to="/products"` is active whether the
- * current location is `/en/products` or `/produkty` under a mapped locale.
- */
-export declare function useIsLocalizedActive(canonicalTarget: string): () => boolean;

package/dist/types/i18n/index.d.ts

@@ -3,7 +3,7 @@ export { createI18nSsrHandoffInlineData, I18N_SSR_HANDOFF_ELEMENT_ID, type I18nS
 export { type CreateI18nUrlRewriteOptions, createI18nUrlRewrite, type I18nLocationRewrite, } from '@modern-js/i18n-runtime-extensions/urlRewrite';
 export { I18nContext } from './context.js';
 export { I18nProvider, type I18nProviderProps } from './I18nProvider.js';
-export { LocalizedLink, type LocalizedLinkProps, useIsLocalizedActive, } from './LocalizedLink.js';
+export { LocalizedLink, type LocalizedLinkProps } from './LocalizedLink.js';
 export { createLatestLanguageSync, type SolidLatestLanguageSyncOptions, } from './languageSync.js';
 export type { I18nContextValue, I18nInstanceLike } from './types.js';
 export { type UseI18nReturn, useI18n } from './useI18n.js';

package/dist/types/index.d.ts

@@ -1,12 +1,12 @@
 /** This entry contains identity only. Select client, router or server explicitly. */
 export declare const SOLID_RENDERER_PROFILE: {
     readonly renderer: 'solid';
-    readonly solid: '2.0.0-rc.13';
-    readonly web: '2.0.0-rc.13';
+    readonly solid: '2.0.0-rc.15';
+    readonly web: '2.0.0-rc.15';
     readonly router: '@modern-js/renderer-solid/router@3.8.3';
     readonly routerSource: '4fbd65c5c3b40be87a6248867c22021c1c19bba8';
-    readonly routerCore: '1.171.34';
-    readonly history: '1.162.4';
+    readonly routerCore: '1.171.38';
+    readonly history: '1.162.5';
     readonly publicRouteData: {
         readonly containers: readonly ['plain-record', 'null-record', 'array'];
         readonly values: 'canonical-scalars';
@@ -19,7 +19,7 @@ export declare const SOLID_RENDERER_PROFILE: {
         readonly providerOverrides: 'unsupported';
     };
     readonly nativePromiseMetadata: {
-        readonly runtime: '2.0.0-rc.13';
+        readonly runtime: '2.0.0-rc.15';
         readonly fields: readonly ['s', 'v'];
         readonly status: readonly [0, 1, 2];
         readonly handle: 'sealed-with-checked-metadata';

package/dist/types/manifest.d.ts

@@ -1,6 +1,6 @@
 import type { NativeCompilerArtifacts } from '@modern-js/renderer-core/adapter';
 import { type RendererIdentity } from '@modern-js/renderer-core/identity';
-export declare const SOLID_COMPILER_VERSION = "2.0.0-rc.13";
+export declare const SOLID_COMPILER_VERSION = "2.0.0-rc.15";
 export declare function solidModuleManifestFilename(entryName: string): string;
 /** The compiler's structural JSON boundary matches native Solid AssetManifest. */
 interface SolidPreloadAttributes {

package/dist/types/router-binding/RouterProvider.d.ts

@@ -1,5 +1,6 @@
 import type { JSX } from '@solidjs/web';
-import type { AnyRouter, RegisteredRouter, RouterOptions } from '@tanstack/router-core';
+import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core';
+import type { RouterOptions } from './routerOptions.js';
 export declare function RouterContextProvider<TRouter extends AnyRouter = RegisteredRouter, TDehydrated extends Record<string, any> = Record<string, any>>({ router, children, ...rest }: RouterProps<TRouter, TDehydrated> & {
     children: () => JSX.Element;
 }): JSX.Element;

package/dist/types/router-binding/index.d.ts

@@ -1,7 +1,7 @@
 export type { BlockerFn, HistoryLocation, HistoryState, ParsedPath, RouterHistory, } from '@tanstack/history';
 export { createBrowserHistory, createHashHistory, createHistory, createMemoryHistory, } from '@tanstack/history';
-export type { AbsoluteToPath, ActiveOptions, AllContext, AllLoaderData, AllParams, AnyContext, AnyPathParams, AnyRedirect, AnyRoute, AnyRouteMatch, AnyRouter, AnyRouterWithContext, AnyRouteWithContext, AnySchema, AnySerializationAdapter, AnyValidator, AnyValidatorAdapter, AnyValidatorFn, AnyValidatorObj, Assign, BaseRouteOptions, BeforeLoadContextOptions, BeforeLoadContextParameter, BuildLocationFn, BuildNextOptions, CommitLocationOptions, Constrain, ContextAsyncReturnType, ContextOptions, ContextReturnType, ControllablePromise, ControlledPromise, CreateFileRoute, CreateLazyFileRoute, DefaultValidator, DeferredPromise, DeferredPromiseState, ErrorComponentProps, ErrorRouteProps, Expand, FileBaseRouteOptions, FileRoutesByPath, FileRouteTypes, FullSearchSchema, FullSearchSchemaInput, FullSearchSchemaOption, InferAllContext, InferAllParams, InferDescendantToPaths, InferFrom, InferFullSearchSchema, InferFullSearchSchemaInput, InferMaskFrom, InferMaskTo, InferSelected, InferShouldThrow, InferStrict, InferTo, IntersectAssign, LazyRouteOptions, LinkOptions, ListenerFn, LoaderFnContext, LocationRewrite, LocationRewriteFunction, LooseAsyncReturnType, LooseReturnType, MakeOptionalPathParams, MakeRemountDepsOptionsUnion, MakeRouteMatch, MakeRouteMatchUnion, Manifest, MatchLocation, MatchRouteOptions, MergeAll, MetaDescriptor, NavigateFn, NavigateOptions, NotFoundError, NotFoundRouteProps, ParamsOptions, ParsedLocation, ParseParamsFn, ParseRoute, PathParamOptions, PreloadableObj, Redirect, RedirectOptions, Register, RegisteredRouter, RelativeToCurrentPath, RelativeToParentPath, RelativeToPath, RelativeToPathAutoComplete, RemountDepsOptions, RemoveLeadingSlashes, RemoveTrailingSlashes, ResolveAllContext, ResolveAllParamsFromParent, ResolvedRedirect, ResolveFullPath, ResolveFullSearchSchema, ResolveFullSearchSchemaInput, ResolveId, ResolveLoaderData, ResolveOptionalParams, ResolveParams, ResolveRelativePath, ResolveRequiredParams, ResolveRoute, ResolveRouteContext, ResolveSearchValidatorInput, ResolveSearchValidatorInputFn, ResolveValidatorInput, ResolveValidatorInputFn, ResolveValidatorOutput, ResolveValidatorOutputFn, RootRouteId, RootRouteOptions, RouteById, RouteByPath, RouteConstraints, RouteContext, RouteContextFn, RouteContextOptions, RouteContextParameter, RouteIds, RouteLinkEntry, RouteLoaderFn, RouteMask, RouteMatch, RouteOptions, RoutePathOptions, RoutePathOptionsIntersection, RoutePaths, RouterConstructorOptions, RouterContextOptions, RouterEvent, RouterEvents, RouterListener, RouterManagedTag, RouterOptions, RouterState, RoutesById, RoutesByPath, SearchFilter, SearchParamOptions, SearchParser, SearchSchemaInput, SearchSerializer, SerializableExtensions, SerializationAdapter, StaticDataRouteOption, StringifyParamsFn, ToMaskOptions, ToOptions, ToPathOption, ToSubOptions, TrailingSlashOption, TrimPath, TrimPathLeft, TrimPathRight, UpdatableRouteOptions, UpdatableStaticRouteOption, UseNavigateResult, ValidateFromPath, ValidateId, ValidateNavigateOptions, ValidateNavigateOptionsArray, ValidateParams, ValidateRedirectOptions, ValidateRedirectOptionsArray, ValidateSearch, ValidateToPath, ValidateUseParamsResult, ValidateUseSearchResult, Validator, ValidatorAdapter, ValidatorFn, ValidatorObj, } from '@tanstack/router-core';
-export { cleanPath, composeRewrites, createControlledPromise, createSerializationAdapter, DEFAULT_PROTOCOL_ALLOWLIST, deepEqual, defaultParseSearch, defaultStringifySearch, defer, functionalUpdate, interpolatePath, isMatch, isNotFound, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, SearchParamError, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight, } from '@tanstack/router-core';
+export type { AbsoluteToPath, ActiveOptions, AllContext, AllLoaderData, AllParams, AnyContext, AnyPathParams, AnyRedirect, AnyRoute, AnyRouteMatch, AnyRouter, AnyRouterWithContext, AnyRouteWithContext, AnySchema, AnyValidator, AnyValidatorAdapter, AnyValidatorFn, AnyValidatorObj, Assign, BaseRouteOptions, BeforeLoadContextOptions, BeforeLoadContextParameter, BuildLocationFn, BuildNextOptions, CommitLocationOptions, Constrain, ContextAsyncReturnType, ContextOptions, ContextReturnType, ControllablePromise, ControlledPromise, CreateFileRoute, CreateLazyFileRoute, DefaultValidator, DeferredPromise, DeferredPromiseState, ErrorComponentProps, ErrorRouteProps, Expand, FileBaseRouteOptions, FileRoutesByPath, FileRouteTypes, FullSearchSchema, FullSearchSchemaInput, FullSearchSchemaOption, InferAllContext, InferAllParams, InferDescendantToPaths, InferFrom, InferFullSearchSchema, InferFullSearchSchemaInput, InferMaskFrom, InferMaskTo, InferSelected, InferShouldThrow, InferStrict, InferTo, IntersectAssign, LazyRouteOptions, LinkOptions, ListenerFn, LoaderFnContext, LocationRewrite, LocationRewriteFunction, LooseAsyncReturnType, LooseReturnType, MakeOptionalPathParams, MakeRemountDepsOptionsUnion, MakeRouteMatch, MakeRouteMatchUnion, Manifest, MatchLocation, MatchRouteOptions, MergeAll, MetaDescriptor, NavigateFn, NavigateOptions, NotFoundError, NotFoundRouteProps, ParamsOptions, ParsedLocation, ParseParamsFn, ParseRoute, PathParamOptions, PreloadableObj, Redirect, RedirectOptions, Register, RegisteredRouter, RelativeToCurrentPath, RelativeToParentPath, RelativeToPath, RelativeToPathAutoComplete, RemountDepsOptions, RemoveLeadingSlashes, RemoveTrailingSlashes, ResolveAllContext, ResolveAllParamsFromParent, ResolvedRedirect, ResolveFullPath, ResolveFullSearchSchema, ResolveFullSearchSchemaInput, ResolveId, ResolveLoaderData, ResolveOptionalParams, ResolveParams, ResolveRelativePath, ResolveRequiredParams, ResolveRoute, ResolveRouteContext, ResolveSearchValidatorInput, ResolveSearchValidatorInputFn, ResolveValidatorInput, ResolveValidatorInputFn, ResolveValidatorOutput, ResolveValidatorOutputFn, RootRouteId, RootRouteOptions, RouteById, RouteByPath, RouteConstraints, RouteContext, RouteContextFn, RouteContextOptions, RouteContextParameter, RouteIds, RouteLinkEntry, RouteLoaderFn, RouteMask, RouteMatch, RouteOptions, RoutePathOptions, RoutePathOptionsIntersection, RoutePaths, RouterConstructorOptions, RouterContextOptions, RouterEvent, RouterEvents, RouterListener, RouterManagedTag, RouterState, RoutesById, RoutesByPath, SearchFilter, SearchParamOptions, SearchParser, SearchSchemaInput, SearchSerializer, SerializableExtensions, StaticDataRouteOption, StringifyParamsFn, ToMaskOptions, ToOptions, ToPathOption, ToSubOptions, TrailingSlashOption, TrimPath, TrimPathLeft, TrimPathRight, UpdatableRouteOptions, UpdatableStaticRouteOption, UseNavigateResult, ValidateFromPath, ValidateId, ValidateNavigateOptions, ValidateNavigateOptionsArray, ValidateParams, ValidateRedirectOptions, ValidateRedirectOptionsArray, ValidateSearch, ValidateToPath, ValidateUseParamsResult, ValidateUseSearchResult, Validator, ValidatorAdapter, ValidatorFn, ValidatorObj, } from '@tanstack/router-core';
+export { cleanPath, composeRewrites, createControlledPromise, DEFAULT_PROTOCOL_ALLOWLIST, deepEqual, defaultParseSearch, defaultStringifySearch, defer, functionalUpdate, interpolatePath, isMatch, isNotFound, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, SearchParamError, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight, } from '@tanstack/router-core';
 export { Asset } from './Asset.js';
 export type { AwaitOptions } from './awaited.js';
 export { Await, useAwaited } from './awaited.js';
@@ -26,6 +26,7 @@ export { prepareRouterMatchTransfer } from './registryTransfer.js';
 export type { AnyRootRoute, AsyncRouteComponent, ErrorRouteComponent, NotFoundRouteComponent, RouteComponent, SolidNode, } from './route.js';
 export { createRootRoute, createRootRouteWithContext, createRoute, createRouteMask, getRouteApi, NotFoundRoute, RootRoute, Route, RouteApi, rootRouteWithContext, } from './route.js';
 export { createRouter, Router } from './router.js';
+export type { RouterOptions } from './routerOptions.js';
 export { ScriptOnce } from './ScriptOnce.js';
 export { Scripts } from './Scripts.js';
 export { ScrollRestoration, useElementScrollRestoration, } from './ScrollRestoration.js';

package/dist/types/router-binding/registryTransfer.d.ts

@@ -26,6 +26,8 @@ import { type PublicSnapshotOwner } from './publicMatchData.js';
 export declare const MATCH_KEY_PREFIX = "tsr:";
 /** Bind the managed public-data scope before native router construction claims hydration. */
 export declare function registerPublicRouteDataOwner(routeTree: object, owner: PublicSnapshotOwner, privateContexts?: readonly object[]): void;
+/** Managed match transfer uses the immutable public-data contract, not custom adapters. */
+export declare function assertNativeSerializationOptions(options: object): void;
 /** Framework SSR accepts only routers that passed its public-data factory boundary. */
 export declare function requireManagedPublicRouter(router: AnyRouter): void;
 /** Project composed public context before every native match-store publication. */

package/dist/types/router-binding/routerOptions.d.ts

@@ -0,0 +1,6 @@
+import type { RouterHistory } from '@tanstack/history';
+import type { AnyRoute, RouterOptions as CoreRouterOptions, TrailingSlashOption } from '@tanstack/router-core';
+/** Native managed hydration transfers immutable public data only. */
+export type RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean = false, TRouterHistory extends RouterHistory = RouterHistory, TDehydrated = undefined> = Omit<CoreRouterOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>, 'serializationAdapters'> & {
+    serializationAdapters?: never;
+};

package/dist/types/router.d.ts

@@ -14,11 +14,11 @@ export interface FileSystemRouteModule {
     pendingComponent?: RouteComponent;
     errorComponent?: ErrorRouteComponent;
     notFoundComponent?: NotFoundRouteComponent;
-    head?: AnyRoute['options']['head'];
+    head?: NonNullable<AnyRoute['options']['head']>;
     /** Explicit returned context becomes immutable public native route context. */
-    beforeLoad?: AnyRoute['options']['beforeLoad'];
+    beforeLoad?: NonNullable<AnyRoute['options']['beforeLoad']>;
     /** Native synchronous context contributions are checked before composition. */
-    context?: AnyRoute['options']['context'];
+    context?: NonNullable<AnyRoute['options']['context']>;
     validateSearch?: (search: Record<string, unknown>) => Record<string, unknown>;
 }
 /** Resolve location through the native router before committing HTTP headers. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bleedingdev/modern-js-renderer-solid",
-  "version": "3.9.3-ultramodern.1",
+  "version": "3.9.3-ultramodern.10",
   "description": "UltraModern native Solid 2 application runtime.",
   "license": "MIT",
   "type": "module",
@@ -63,25 +63,23 @@
     "./package.json": "./package.json"
   },
   "engines": {
-    "node": ">=26.10.0"
+    "node": ">=26.12.0"
   },
   "dependencies": {
     "@babel/core": "7.29.7",
     "@jridgewell/remapping": "2.3.5",
-    "@modern-js/renderer-core": "npm:@bleedingdev/modern-js-renderer-core@3.9.3-ultramodern.1",
-    "@solidjs/signals": "2.0.0-rc.13",
-    "@solidjs/web": "2.0.0-rc.13",
-    "@tanstack/history": "1.162.4",
-    "@tanstack/router-core": "1.171.34",
+    "@modern-js/renderer-core": "npm:@bleedingdev/modern-js-renderer-core@3.9.3-ultramodern.10",
+    "@solidjs/signals": "2.0.0-rc.15",
+    "@solidjs/web": "2.0.0-rc.15",
+    "@tanstack/history": "1.162.5",
     "isbot": "5.2.2",
-    "seroval": "1.6.8",
-    "seroval-plugins": "1.6.8",
-    "solid-js": "2.0.0-rc.13"
+    "solid-js": "2.0.0-rc.15"
   },
   "peerDependencies": {
-    "@modern-js/i18n-runtime-extensions": "3.9.3-ultramodern.1",
-    "@rsbuild/core": "2.2.11",
-    "@solidjs/compiler": "2.0.0-rc.13",
+    "@modern-js/i18n-runtime-extensions": "3.9.3-ultramodern.10",
+    "@rsbuild/core": "2.2.13",
+    "@solidjs/compiler": "2.0.0-rc.15",
+    "@tanstack/router-core": "1.171.38",
     "i18next": ">=25.7.4"
   },
   "peerDependenciesMeta": {
@@ -99,27 +97,36 @@
     }
   },
   "devDependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.3-ultramodern.1",
-    "@modern-js/tsconfig": "npm:@bleedingdev/modern-js-tsconfig@3.9.3-ultramodern.1",
-    "@rsbuild/core": "2.2.11",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.3-ultramodern.10",
+    "@modern-js/tsconfig": "npm:@bleedingdev/modern-js-tsconfig@3.9.3-ultramodern.10",
+    "@rsbuild/core": "2.2.13",
     "@rslib/core": "1.0.3",
     "@scripts/rstest-config": "2.66.0",
-    "@solidjs/compiler": "2.0.0-rc.13",
-    "@types/node": "^26.6.3"
+    "@solidjs/compiler": "2.0.0-rc.15",
+    "@tanstack/router-core": "https://github.com/BleedingDev/router/releases/download/ultramodern-router-core-585d3233f7f5/tanstack-router-core-1.171.38.tgz",
+    "@types/node": "^26.6.5"
   },
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
   },
+  "ultramodern": {
+    "nativeArtifacts": {
+      "@tanstack/router-core": {
+        "request": "https://github.com/BleedingDev/router/releases/download/ultramodern-router-core-585d3233f7f5/tanstack-router-core-1.171.38.tgz",
+        "version": "1.171.38",
+        "integrity": "sha512-d/aGvcyEVwDh2Cn9MuZM1n1dqTIqkFYi7AHY2Na/6x/a0jVSDVTNVVVY7QEsuKFXktaJF9zjVwetaRm/0MALZg=="
+      }
+    },
+    "sourceName": "@modern-js/renderer-solid"
+  },
   "scripts": {
     "build": "rslib build",
-    "test": "rstest"
+    "test": "rstest",
+    "test:types": "tsc -p tests/types/tsconfig.json"
   },
   "homepage": "https://github.com/ultramodernjs/ultramodern.js#readme",
   "bugs": {
     "url": "https://github.com/ultramodernjs/ultramodern.js/issues"
-  },
-  "ultramodern": {
-    "sourceName": "@modern-js/renderer-solid"
   }
 }

package/src/actions.tsx

@@ -165,7 +165,11 @@ export function createRouteAction(options: RouteActionOptions): RouteAction {
     assertRendererIdentity(options.rendererIdentity, configuredIdentity);
   }
   const identity = Object.freeze({ ...options.rendererIdentity });
-  const client = createDataClient(routeId, identity, { fetch: options.fetch });
+  const client = createDataClient(
+    routeId,
+    identity,
+    options.fetch ? { fetch: options.fetch } : {},
+  );
   // Capture the request while the native SSR request scope is active.
   const requestURL = getRequestEvent()?.request.url;
   const url = () => {

package/src/application-router.tsx

@@ -1,5 +1,6 @@
 import { DataProtocolError } from '@modern-js/renderer-core/data';
-import { type JSX, useHead } from '@solidjs/web';
+import type { RequestSession } from '@modern-js/renderer-core/session';
+import { getRequestEvent, type JSX, useHead } from '@solidjs/web';
 import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core';
 import { ownApplicationRouteData } from './route-completion';
 import { toHeadTags, useTags } from './router-binding/headContentUtils';
@@ -22,10 +23,15 @@ export function ApplicationRouter<
   TRouter extends AnyRouter = RegisteredRouter,
   TDehydrated extends Record<string, unknown> = Record<string, unknown>,
 >(props: Omit<RouterProps<TRouter, TDehydrated>, 'context'>): JSX.Element {
-  if (Object.hasOwn(props, 'context'))
-    throw new DataProtocolError(
+  if (Object.hasOwn(props, 'context')) {
+    const error = new DataProtocolError(
       'Set public Solid router context in createApplicationRouter; ApplicationRouter context overrides are unsupported',
     );
+    const session: RequestSession | undefined =
+      getRequestEvent()?.locals.session;
+    session?.fail(error);
+    throw error;
+  }
   const { router, ...rest } = props;
   ownApplicationRouteData(router);
   return (

package/src/entry-client.tsx

@@ -27,6 +27,7 @@ export function startNativeClient(options: SolidClientEntryOptions): void {
     readBootstrap: readSolidDocumentBootstrap,
     createRouter: (application, routerOptions) =>
       createNativeRouter(application, routerOptions, solidRouterFactory),
+    disposeRouter: router => router.history.destroy(),
     async prepareRouter(router, hydrating) {
       // Hydration adopts the server's matches; a fresh mount loads its own.
       if (!hydrating) await router.load();

package/src/federation-ssr.ts

@@ -1,4 +1,4 @@
-import { remoteBrowserAssets } from '@modern-js/renderer-core/federation';
+import type { FederatedAssets } from '@modern-js/renderer-core/federation';
 import type { SolidFederationScope } from './federation-context';
 
 /**
@@ -10,17 +10,39 @@ import type { SolidFederationScope } from './federation-context';
 /** Asset keys for server-rendered remotes, e.g. `ultramodern-federation:remote/Widget`. */
 export const FEDERATED_ASSET_PREFIX = 'ultramodern-federation:';
 
-/** The host's server state for a remote: its browser assets and hydration module. */
-export function federatedServerAssets(
-  scope: SolidFederationScope | undefined,
+interface CapturedServerAssets {
+  readonly hydration: string;
+  readonly assets: FederatedAssets;
+}
+
+const capturedAssets = new WeakMap<
+  SolidFederationScope,
+  Map<string, CapturedServerAssets>
+>();
+
+/** Retain the assets admitted with this module until its response resolves them. */
+export function captureFederatedServerAssets(
+  scope: SolidFederationScope,
   id: string,
-) {
-  const instance = scope?.instance;
-  const assets = instance && remoteBrowserAssets(instance, id);
-  if (!assets || !scope?.hydrationModule || !instance.name) return undefined;
+  assets: FederatedAssets | undefined,
+): string | undefined {
+  const instance = scope.instance;
+  if (!assets || !scope.hydrationModule || !instance?.name) return undefined;
   // The browser module finds this host by name among the realm's instances.
   const hydration = `${scope.hydrationModule}?id=${encodeURIComponent(id)}&host=${encodeURIComponent(instance.name)}`;
-  return { hydration, assets };
+  let records = capturedAssets.get(scope);
+  if (!records) {
+    records = new Map();
+    capturedAssets.set(scope, records);
+  }
+  const baseKey = federatedAssetKey(id);
+  let key = baseKey;
+  // Two loads of one remote may straddle a development revision in one response.
+  // Give each loaded module its own key rather than replacing earlier assets.
+  for (let revision = 1; records.has(key); revision += 1)
+    key = `${baseKey}:${revision}`;
+  records.set(key, { hydration, assets });
+  return key;
 }
 
 export function federatedAssetKey(id: string): string {
@@ -103,10 +125,7 @@ export function withFederatedAssets<Manifest>(
   const resolve = (key: string): ResolvedDocumentAssets | null => {
     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: [joinAssetPath(modules._base, remote.hydration), ...remote.assets.js],