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

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

@@ -1,12 +1,12 @@
 /** This entry contains identity only. Select client, router or server explicitly. */
 export 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', 'null-record', 'array'],
     values: 'canonical-scalars',
@@ -19,7 +19,7 @@ export const SOLID_RENDERER_PROFILE = {
     providerOverrides: 'unsupported',
   },
   nativePromiseMetadata: {
-    runtime: '2.0.0-rc.13',
+    runtime: '2.0.0-rc.15',
     fields: ['s', 'v'],
     status: [0, 1, 2],
     handle: 'sealed-with-checked-metadata',

package/src/manifest.ts

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

package/src/plugin/index.ts

@@ -32,8 +32,6 @@ export const rendererAdapter: NativeRendererAdapter<'solid'> =
         'solid-js',
         '@solidjs/web',
         '@solidjs/signals',
-        'seroval',
-        'seroval-plugins',
         '@modern-js/renderer-solid',
         '@modern-js/renderer-solid/client',
         '@modern-js/renderer-solid/router',
@@ -64,7 +62,6 @@ export const rendererAdapter: NativeRendererAdapter<'solid'> =
         },
         devDependencies: {
           [profile.compiler.name]: profile.compiler.version,
-          '@solidjs/babel-plugin': profile.compiler.version,
         },
       }),
       generateAppSources: generateSolidAppSources,

package/src/plugin/preserve-import-loader.cjs

@@ -36,7 +36,7 @@ module.exports = function preserveSolidImport(source, inputMap) {
     });
     if (matched !== 1 || !result) {
       throw new Error(
-        'Solid native browser URL import contract changed. Expected one import(entryUrl) in @solidjs/web 2.0.0-rc.13; update and revalidate the compiler integration.',
+        'Solid native browser URL import contract changed. Expected one import(entryUrl) in @solidjs/web 2.0.0-rc.15; update and revalidate the compiler integration.',
       );
     }
     callback(null, result.code, result.map);

package/src/plugin/profile.ts

@@ -4,7 +4,7 @@ export const solidProfile: RendererBuildProfile<'solid'> = {
   renderer: 'solid',
   status: 'preview',
   protocolVersion: 1,
-  minimumNode: '26.10.0',
+  minimumNode: '26.12.0',
   hmr: {
     editedBoundary: 'may-reset',
     unaffectedComponents: 'preserved',
@@ -12,24 +12,24 @@ export const solidProfile: RendererBuildProfile<'solid'> = {
     roots: 'single',
     cleanup: 'exactly-once',
   },
-  compiler: { name: '@solidjs/compiler', version: '2.0.0-rc.13' },
-  hydration: { name: '@solidjs/web', version: '2.0.0-rc.13' },
+  compiler: { name: '@solidjs/compiler', version: '2.0.0-rc.15' },
+  hydration: { name: '@solidjs/web', 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', '.ts', '.jsx', '.js'],
   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',
+    '@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',
-    seroval: '1.6.8',
-    'seroval-plugins': '1.6.8',
   },
   capabilities: {
     worker: true,

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;

package/src/router-binding/Asset.tsx

@@ -62,7 +62,7 @@ function InlineCssStyle({
   attrs,
   children,
 }: {
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: RouterManagedTag['children'];
 }) {
   const isInlineCssPlaceholder = children === undefined;
@@ -85,7 +85,7 @@ function InlineCssStyle({
 
 function HeadElement(props: {
   tag: 'meta' | 'link' | 'style';
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: unknown;
 }): JSX.Element | null {
   // Each branch must live in its own `case` block so the Solid compiler emits
@@ -101,11 +101,12 @@ function HeadElement(props: {
   let element: Element;
   switch (props.tag) {
     case 'style': {
-      const attrs = {
-        ...props.attrs,
-        innerHTML:
-          typeof props.children === 'string' ? props.children : undefined,
-      };
+      const attrs = { ...props.attrs };
+      // The managed child text owns this field, including when it is absent.
+      delete attrs.innerHTML;
+      if (typeof props.children === 'string') {
+        attrs.innerHTML = props.children;
+      }
       element = (<style {...attrs} />) as unknown as Element;
       break;
     }
@@ -125,7 +126,7 @@ function HeadElement(props: {
 }
 
 function Title(props: {
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: unknown;
 }): JSX.Element | null {
   let el: HTMLTitleElement | undefined;
@@ -158,7 +159,7 @@ function Title(props: {
 }
 
 function Script(props: {
-  attrs?: Record<string, any>;
+  attrs: Record<string, any> | undefined;
   children?: unknown;
 }): JSX.Element | null {
   const router = useRouter();

package/src/router-binding/Matches.tsx

@@ -79,16 +79,16 @@ function MatchesInner() {
         getResetKey={() => router.stores.matches.get()}
         render={matchContent}
         errorComponent={ErrorComponent}
-        onCatch={
-          process.env.NODE_ENV !== 'production'
-            ? error => {
+        {...(process.env.NODE_ENV !== 'production'
+          ? {
+              onCatch: (error: 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()}`);
-              }
-            : undefined
-        }
+              },
+            }
+          : {})}
       />
     </NearestMatchContext>
   );
@@ -126,10 +126,10 @@ export function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {
       router.stores.resolvedLocation.get();
       router.stores.status.get();
       return router.matchRoute(rest as any, {
-        pending,
-        caseSensitive,
-        fuzzy,
-        includeSearch,
+        ...(pending !== undefined ? { pending } : {}),
+        ...(caseSensitive !== undefined ? { caseSensitive } : {}),
+        ...(fuzzy !== undefined ? { fuzzy } : {}),
+        ...(includeSearch !== undefined ? { includeSearch } : {}),
       });
     });
   };

package/src/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/src/router-binding/RouterProvider.tsx

@@ -1,18 +1,16 @@
 import type { JSX } from '@solidjs/web';
-import type {
-  AnyRouter,
-  RegisteredRouter,
-  RouterOptions,
-} from '@tanstack/router-core';
+import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core';
 import { isServer } from '@tanstack/router-core/isServer';
 import * as Solid from 'solid-js';
 import { setupFlightDataConsumer } from './flightData';
 import { Matches } from './Matches';
 import {
+  assertNativeSerializationOptions,
   requireManagedPublicRouter,
   serializeMatchTransfer,
 } from './registryTransfer';
 import { routerContext } from './routerContext';
+import type { RouterOptions } from './routerOptions';
 import { SafeFragment } from './SafeFragment';
 
 const RouterContext = routerContext as unknown as Solid.Component<{
@@ -30,6 +28,7 @@ export function RouterContextProvider<
 }: RouterProps<TRouter, TDehydrated> & {
   children: () => JSX.Element;
 }) {
+  assertNativeSerializationOptions(rest);
   requireManagedPublicRouter(router);
   if (Object.keys(rest).length > 0) {
     Solid.runWithOwner(null, () => {

package/src/router-binding/Transitioner.tsx

@@ -162,9 +162,14 @@ export function Rendered() {
   Solid.onSettled(() => {
     const resolvedLocation = getResolvedLocation(router);
     if (resolvedLocation) {
+      const { fromLocation, ...changeInfo } = getLocationChangeInfo(
+        resolvedLocation,
+        resolvedLocation,
+      );
       router.emit({
         type: 'onRendered',
-        ...getLocationChangeInfo(resolvedLocation, resolvedLocation),
+        ...changeInfo,
+        ...(fromLocation !== undefined ? { fromLocation } : {}),
       });
     }
   });

package/src/router-binding/fileRoute.ts

@@ -69,7 +69,7 @@ export class FileRoute<
     public path?: TFilePath,
     _opts?: { silent: boolean },
   ) {
-    this.silent = _opts?.silent;
+    if (_opts) this.silent = _opts.silent;
   }
 
   createRoute = <

package/src/router-binding/headContentUtils.tsx

@@ -154,7 +154,9 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
           ...manifest.inlineStyle.attrs,
           nonce,
         },
-        children: manifest.inlineStyle.children,
+        ...(manifest.inlineStyle.children !== undefined
+          ? { children: manifest.inlineStyle.children }
+          : {}),
         inlineCss: true,
       });
     }
@@ -192,7 +194,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
           ...attrs,
           nonce,
         },
-        children: children as string | undefined,
+        ...(children != null ? { children: String(children) } : {}),
       })) satisfies Array<RouterManagedTag>;
   });
 
@@ -206,7 +208,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
           ...attrs,
           nonce,
         },
-        children: children as string | undefined,
+        ...(children != null ? { children: String(children) } : {}),
       })) satisfies Array<RouterManagedTag>;
   });
 

package/src/router-binding/index.tsx

@@ -26,7 +26,6 @@ export type {
   AnyRouterWithContext,
   AnyRouteWithContext,
   AnySchema,
-  AnySerializationAdapter,
   AnyValidator,
   AnyValidatorAdapter,
   AnyValidatorFn,
@@ -153,7 +152,6 @@ export type {
   RouterEvents,
   RouterListener,
   RouterManagedTag,
-  RouterOptions,
   RouterState,
   RoutesById,
   RoutesByPath,
@@ -163,7 +161,6 @@ export type {
   SearchSchemaInput,
   SearchSerializer,
   SerializableExtensions,
-  SerializationAdapter,
   StaticDataRouteOption,
   StringifyParamsFn,
   ToMaskOptions,
@@ -197,7 +194,6 @@ export {
   cleanPath,
   composeRewrites,
   createControlledPromise,
-  createSerializationAdapter,
   DEFAULT_PROTOCOL_ALLOWLIST,
   deepEqual,
   defaultParseSearch,
@@ -291,6 +287,7 @@ export {
   rootRouteWithContext,
 } from './route';
 export { createRouter, Router } from './router';
+export type { RouterOptions } from './routerOptions';
 export { ScriptOnce } from './ScriptOnce';
 export { Scripts } from './Scripts';
 export {

package/src/router-binding/link.tsx

@@ -505,9 +505,9 @@ export function useLinkProps<
   }
 
   const defineGetters = (getters: Record<string, () => any>) => {
-    for (const key of Object.keys(getters)) {
+    for (const [key, get] of Object.entries(getters)) {
       Object.defineProperty(linkProps, key, {
-        get: getters[key],
+        get,
         enumerable: true,
         configurable: true,
       });

package/src/router-binding/registryTransfer.ts

@@ -78,8 +78,21 @@ export function registerPublicRouteDataOwner(
   });
 }
 
+/** Managed match transfer uses the immutable public-data contract, not custom adapters. */
+export function assertNativeSerializationOptions(options: object): void {
+  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: RequestSession | undefined = getRequestEvent()?.locals.session;
+    owner?.fail(error);
+    throw error;
+  }
+}
+
 /** Framework SSR accepts only routers that passed its public-data factory boundary. */
 export function requireManagedPublicRouter(router: AnyRouter): void {
+  assertNativeSerializationOptions(router.options);
   const owner: RequestSession | undefined = getRequestEvent()?.locals.session;
   if (
     !owner ||
@@ -268,6 +281,11 @@ export function primeRouterFromRegistry(router: AnyRouter): boolean {
   try {
     for (const [index, match] of matches.entries()) {
       const entry = entries[index]!;
+      const beforeLoadContext = preparePublicContextData(
+        entry.beforeLoadContext,
+        owner,
+        privateContexts,
+      ) as Record<string, unknown> | undefined;
       const checked: TransferredMatch = {
         ...entry,
         loaderData: prepareHydratedLoaderData(
@@ -275,11 +293,7 @@ export function primeRouterFromRegistry(router: AnyRouter): boolean {
           owner,
           privateContexts,
         ),
-        beforeLoadContext: preparePublicContextData(
-          entry.beforeLoadContext,
-          owner,
-          privateContexts,
-        ) as Record<string, unknown> | undefined,
+        ...(beforeLoadContext !== undefined ? { beforeLoadContext } : {}),
         error: preparePublicContextData(entry.error, owner, privateContexts),
       };
       entries[index] = checked;
@@ -356,7 +370,10 @@ function applyTransferredMatch(
     __beforeLoadContext: entry.beforeLoadContext,
   } as AnyRouteMatch;
   if ('loaderData' in entry) next.loaderData = entry.loaderData;
-  if ('ssr' in entry) next.ssr = entry.ssr;
+  if ('ssr' in entry) {
+    if (entry.ssr === undefined) delete next.ssr;
+    else next.ssr = entry.ssr;
+  }
   return next;
 }
 

package/src/router-binding/route.tsx

@@ -133,7 +133,7 @@ export class RouteApi<
     return useNavigate({ from: router.routesById[this.id as string].fullPath });
   };
 
-  notFound = (opts?: NotFoundError) => {
+  override notFound = (opts?: NotFoundError) => {
     return notFound({ routeId: this.id as string, ...opts });
   };
 

package/src/router-binding/router.ts

@@ -9,6 +9,7 @@ import type {
 import { RouterCore } from '@tanstack/router-core';
 import { isServer } from '@tanstack/router-core/isServer';
 import {
+  assertNativeSerializationOptions,
   installPublicContextPublication,
   primeRouterFromRegistry,
 } from './registryTransfer';
@@ -104,6 +105,7 @@ export class Router<
       TDehydrated
     >,
   ) {
+    assertNativeSerializationOptions(options);
     super(options, getStoreFactory);
     installPublicContextPublication(this);
     // The hydration-claiming boot (see registryTransfer). Router creation is