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

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

@@ -5,7 +5,7 @@ export declare const SOLID_RENDERER_PROFILE: {
     readonly web: '2.0.0-rc.15';
     readonly router: '@modern-js/renderer-solid/router@3.8.3';
     readonly routerSource: '4fbd65c5c3b40be87a6248867c22021c1c19bba8';
-    readonly routerCore: '1.171.37';
+    readonly routerCore: '1.171.38';
     readonly history: '1.162.5';
     readonly publicRouteData: {
         readonly containers: readonly ['plain-record', 'null-record', 'array'];

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.8",
+  "version": "3.9.3-ultramodern.9",
   "description": "UltraModern native Solid 2 application runtime.",
   "license": "MIT",
   "type": "module",
@@ -68,18 +68,18 @@
   "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.8",
+    "@modern-js/renderer-core": "npm:@bleedingdev/modern-js-renderer-core@3.9.3-ultramodern.9",
     "@solidjs/signals": "2.0.0-rc.15",
     "@solidjs/web": "2.0.0-rc.15",
     "@tanstack/history": "1.162.5",
-    "@tanstack/router-core": "1.171.37",
     "isbot": "5.2.2",
     "solid-js": "2.0.0-rc.15"
   },
   "peerDependencies": {
-    "@modern-js/i18n-runtime-extensions": "3.9.3-ultramodern.8",
+    "@modern-js/i18n-runtime-extensions": "3.9.3-ultramodern.9",
     "@rsbuild/core": "2.2.13",
     "@solidjs/compiler": "2.0.0-rc.15",
+    "@tanstack/router-core": "1.171.38",
     "i18next": ">=25.7.4"
   },
   "peerDependenciesMeta": {
@@ -97,27 +97,36 @@
     }
   },
   "devDependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.3-ultramodern.8",
-    "@modern-js/tsconfig": "npm:@bleedingdev/modern-js-tsconfig@3.9.3-ultramodern.8",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.3-ultramodern.9",
+    "@modern-js/tsconfig": "npm:@bleedingdev/modern-js-tsconfig@3.9.3-ultramodern.9",
     "@rsbuild/core": "2.2.13",
     "@rslib/core": "1.0.3",
     "@scripts/rstest-config": "2.66.0",
     "@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],

package/src/federation.tsx

@@ -16,7 +16,7 @@ import {
   FederationContext,
   type SolidFederationScope,
 } from './federation-context';
-import { federatedAssetKey, federatedServerAssets } from './federation-ssr';
+import { captureFederatedServerAssets } from './federation-ssr';
 
 /** The module shape a same-renderer Module Federation remote exposes. */
 export interface FederatedModule<P extends object> {
@@ -120,11 +120,14 @@ export function federatedComponent<P extends object = Record<string, never>>(
         throw new Error(
           'A federatedComponent loader renders in the browser only; use a remote id to server-render it',
         );
-      const module = await withTimeout(
+      const { module, assets } = await withTimeout(
         Promise.resolve().then(() =>
           id
             ? loadFederatedModule<FederatedModule<P>>(scope.instance, id)
-            : (remote as () => Promise<never>)(),
+            : (remote as () => Promise<FederatedModule<P>>)().then(module => ({
+                module,
+                assets: undefined,
+              })),
         ),
         timeout,
         id ?? 'loader',
@@ -135,13 +138,14 @@ export function federatedComponent<P extends object = Record<string, never>>(
           'A federated Solid module must default-export a component',
         );
       if (!isServer || !id) return { default: component };
-      if (!federatedServerAssets(scope, id))
+      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`,
         );
       // Solid resolves a loaded module's $$moduleUrl through the response's
       // asset resolver: stylesheets, preloads and the hydration module.
-      return { default: component, $$moduleUrl: federatedAssetKey(id) };
+      return { default: component, $$moduleUrl: assetKey };
     }) as Component<P>;
   // Solid's lazy caches its module. Scope the cache to one application or
   // response, so two hosts rendering this component never share a remote.

package/src/i18n/LocalizedLink.tsx

@@ -1,11 +1,11 @@
 import {
-  canonicalPath,
   configuredLanguage,
   localizePath,
 } from '@modern-js/i18n-runtime-extensions/paths';
 import type { JSX } from '@solidjs/web';
 import * as Solid from 'solid-js';
 import {
+  type AnyRouter,
   Link,
   type LinkComponentProps,
   useLocation,
@@ -13,110 +13,71 @@ import {
 } from '../router';
 import { I18nContext } from './context';
 
-export interface LocalizedLinkProps {
+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 function LocalizedLink(props: LocalizedLinkProps): JSX.Element {
   const context = Solid.useContext(I18nContext);
   const router = useRouter();
-  const rewrite = Boolean(router.options.rewrite);
-
-  // An explicit language must be configured: it becomes the locale prefix.
+  const location = useLocation();
+  const options = Solid.omit(props, 'to', 'language', 'children');
   const targetLanguage = () =>
     props.language === undefined
       ? context.language()
       : configuredLanguage(props.language, context.languages);
-  const href = Solid.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 = Solid.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();
-  // Declared `data-*` attributes reach the anchor through getters, so each
-  // keeps its own reactivity like the explicitly forwarded props.
-  const dataAttributes = Object.defineProperties(
-    {},
-    Object.fromEntries(
-      Object.keys(props)
-        .filter(key => key.startsWith('data-'))
-        .map(key => [
-          key,
-          {
-            enumerable: true,
-            get: () => props[key as `data-${string}`],
-          },
-        ]),
-    ),
-  );
+    });
+  });
 
   return (
-    <Link
-      {...dataAttributes}
-      // A masked link routes to the canonical `to`. Otherwise `href` wins over
-      // `to` in router-core's `buildLocation` (it checks `dest.href` first);
-      // `to="."` only satisfies the type-level requirement that a `to` be
-      // present and is otherwise inert.
-      to={masked() ? props.to : '.'}
-      href={masked() ? undefined : href()}
-      mask={masked() ? { to: href() } : undefined}
-      hreflang={crossLanguage() ? targetLanguage() : undefined}
-      class={props.class}
-      activeProps={props.activeProps}
-      inactiveProps={props.inactiveProps}
-      activeOptions={props.activeOptions}
-      replace={props.replace}
-      preload={props.preload}
+    <Link<AnyRouter, string, string, string, string>
+      {...options}
+      to={router.options.rewrite ? props.to : pathname()}
+      mask={
+        router.options.rewrite && !externalTarget()
+          ? {
+              to: pathname(),
+              inheritSearch: true,
+              hash: props.hash,
+              state: props.state,
+            }
+          : undefined
+      }
+      hreflang={
+        targetLanguage() === context.language() ? undefined : targetLanguage()
+      }
     >
       {props.children}
     </Link>
   );
 }
-
-/**
- * Language-invariant active check: `to="/products"` is active whether the
- * current location is `/en/products` or `/produkty` under a mapped locale.
- */
-export function useIsLocalizedActive(canonicalTarget: string): () => boolean {
-  const context = Solid.useContext(I18nContext);
-  const location = useLocation();
-  return () =>
-    canonicalPath(location().pathname, {
-      languages: [...context.languages],
-      localisedUrls: context.localisedUrls,
-    }) === canonicalTarget;
-}

package/src/i18n/index.ts

@@ -22,11 +22,7 @@ export {
 } from '@modern-js/i18n-runtime-extensions/urlRewrite';
 export { I18nContext } from './context';
 export { I18nProvider, type I18nProviderProps } from './I18nProvider';
-export {
-  LocalizedLink,
-  type LocalizedLinkProps,
-  useIsLocalizedActive,
-} from './LocalizedLink';
+export { LocalizedLink, type LocalizedLinkProps } from './LocalizedLink';
 export {
   createLatestLanguageSync,
   type SolidLatestLanguageSyncOptions,

package/src/index.ts

@@ -5,7 +5,7 @@ export const SOLID_RENDERER_PROFILE = {
   web: '2.0.0-rc.15',
   router: '@modern-js/renderer-solid/router@3.8.3',
   routerSource: '4fbd65c5c3b40be87a6248867c22021c1c19bba8',
-  routerCore: '1.171.37',
+  routerCore: '1.171.38',
   history: '1.162.5',
   publicRouteData: {
     containers: ['plain-record', 'null-record', 'array'],

package/src/plugin/profile.ts

@@ -18,11 +18,13 @@ export const solidProfile: RendererBuildProfile<'solid'> = {
     name: '@modern-js/renderer-solid',
     version: '3.8.3',
     coreName: '@tanstack/router-core',
-    coreVersion: '1.171.37',
+    coreVersion: '1.171.38',
   },
   sourceExtensions: ['.tsx', '.ts', '.jsx', '.js'],
   jsxImportSource: '@solidjs/web',
   dependencies: {
+    '@tanstack/router-core':
+      'https://github.com/BleedingDev/router/releases/download/ultramodern-router-core-585d3233f7f5/tanstack-router-core-1.171.38.tgz',
     'solid-js': '2.0.0-rc.15',
     '@solidjs/web': '2.0.0-rc.15',
     '@solidjs/signals': '2.0.0-rc.15',

package/src/route-completion.tsx

@@ -10,7 +10,10 @@ import {
   preparePublicContextData,
   useMatch,
 } from './router-binding/index';
-import { registerPublicRouteDataOwner } from './router-binding/registryTransfer';
+import {
+  assertNativeSerializationOptions,
+  registerPublicRouteDataOwner,
+} from './router-binding/registryTransfer';
 
 interface CompletionRecord {
   readonly failure: Accessor<{ reason: unknown } | undefined>;
@@ -52,6 +55,7 @@ export function registerRouteCompletionScope(
 }
 
 export const createApplicationRouter: CreateRouterFn = options => {
+  assertNativeSerializationOptions(options);
   const scope = options.routeTree
     ? routeScopes.get(options.routeTree)
     : undefined;