diff --git a/e2e/react-start/basic-auth/src/routes/index.tsx b/e2e/react-start/basic-auth/src/routes/index.tsx index 09a907cb18..971a96cd3e 100644 --- a/e2e/react-start/basic-auth/src/routes/index.tsx +++ b/e2e/react-start/basic-auth/src/routes/index.tsx @@ -1,13 +1,27 @@ import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ + ssr: false, + beforeLoad: () => { + console.log('beforeLoad') + }, + loader: async () => { + console.log('loader') + await new Promise((resolve) => setTimeout(resolve, 500)) + return { + message: 'Hello from the server!', + } + }, + pendingComponent: () =>
Loading...
, component: Home, }) function Home() { + const { message } = Route.useLoaderData() return (

Welcome Home!!!

+

{message}

) } diff --git a/e2e/react-start/basic/src/routes/index.tsx b/e2e/react-start/basic/src/routes/index.tsx index 37169a78b4..971a96cd3e 100644 --- a/e2e/react-start/basic/src/routes/index.tsx +++ b/e2e/react-start/basic/src/routes/index.tsx @@ -1,15 +1,27 @@ import { createFileRoute } from '@tanstack/react-router' -import { CustomMessage } from '~/components/CustomMessage' export const Route = createFileRoute('/')({ + ssr: false, + beforeLoad: () => { + console.log('beforeLoad') + }, + loader: async () => { + console.log('loader') + await new Promise((resolve) => setTimeout(resolve, 500)) + return { + message: 'Hello from the server!', + } + }, + pendingComponent: () =>
Loading...
, component: Home, }) function Home() { + const { message } = Route.useLoaderData() return (

Welcome Home!!!

- +

{message}

) } diff --git a/examples/react/start-basic/src/utils/loggingMiddleware.tsx b/examples/react/start-basic/src/utils/loggingMiddleware.tsx index 3944490725..d7795b00fe 100644 --- a/examples/react/start-basic/src/utils/loggingMiddleware.tsx +++ b/examples/react/start-basic/src/utils/loggingMiddleware.tsx @@ -1,6 +1,8 @@ import { createMiddleware } from '@tanstack/react-start' -const preLogMiddleware = createMiddleware() +// + +const serverLogMiddleware = createMiddleware() .client(async (ctx) => { const clientTime = new Date() @@ -26,7 +28,7 @@ const preLogMiddleware = createMiddleware() }) export const logMiddleware = createMiddleware() - .middleware([preLogMiddleware]) + .middleware([serverLogMiddleware]) .client(async (ctx) => { const res = await ctx.next() diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 79dd4ed01a..59d88c5f01 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -3,6 +3,7 @@ import invariant from 'tiny-invariant' import warning from 'tiny-warning' import { createControlledPromise, + createSsrError, getLocationChangeInfo, isNotFound, isRedirect, @@ -57,7 +58,9 @@ export const Match = React.memo(function MatchImpl({ (!route.isRoot || route.options.wrapInSuspense) && (route.options.wrapInSuspense ?? PendingComponent ?? - (route.options.errorComponent as any)?.preload) + ((route.options.errorComponent as any)?.preload || + !route.ssr || + route.ssr === 'data-only')) ? React.Suspense : SafeFragment @@ -222,6 +225,10 @@ export const MatchInner = React.memo(function MatchInnerImpl({ throw router.getMatch(match.id)?.loadPromise } + if (router.isServer && (!route.ssr || route.ssr === 'data-only')) { + throw createSsrError() + } + if (match.status === 'error') { // If we're on the server, we need to use React's new and super // wonky api for throwing errors from a server side render inside @@ -271,6 +278,7 @@ export const MatchInner = React.memo(function MatchInnerImpl({ }, pendingMinMs) } } + throw router.getMatch(match.id)?.loadPromise } diff --git a/packages/react-router/src/Transitioner.tsx b/packages/react-router/src/Transitioner.tsx index f608e028d5..8f0e4c805c 100644 --- a/packages/react-router/src/Transitioner.tsx +++ b/packages/react-router/src/Transitioner.tsx @@ -68,24 +68,19 @@ export function Transitioner() { // Try to load the initial location useLayoutEffect(() => { + // Don't load if we're already mounted if ( - (typeof window !== 'undefined' && router.clientSsr) || - (mountLoadForRouter.current.router === router && - mountLoadForRouter.current.mounted) + mountLoadForRouter.current.router === router && + mountLoadForRouter.current.mounted ) { return } + mountLoadForRouter.current = { router, mounted: true } - const tryLoad = async () => { - try { - await router.load() - } catch (err) { - console.error(err) - } - } - - tryLoad() + router.load().catch((err) => { + console.error(err) + }) }, [router]) useLayoutEffect(() => { diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index b848fc7210..2318697c83 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -367,3 +367,5 @@ export { ScriptOnce } from './ScriptOnce' export { Asset } from './Asset' export { HeadContent } from './HeadContent' export { Scripts } from './Scripts' + +export { createSsrError, isSsrError } from '@tanstack/router-core' diff --git a/packages/react-router/src/lazyRouteComponent.tsx b/packages/react-router/src/lazyRouteComponent.tsx index 238894728a..8f68cf2463 100644 --- a/packages/react-router/src/lazyRouteComponent.tsx +++ b/packages/react-router/src/lazyRouteComponent.tsx @@ -1,6 +1,4 @@ import * as React from 'react' -import { Outlet } from './Match' -import { ClientOnly } from './ClientOnly' import type { AsyncRouteComponent } from './route' // If the load fails due to module not found, it may mean a new version of @@ -26,7 +24,6 @@ export function lazyRouteComponent< >( importer: () => Promise, exportName?: TKey, - ssr?: () => boolean, ): T[TKey] extends (props: infer TProps) => any ? AsyncRouteComponent : never { @@ -36,10 +33,6 @@ export function lazyRouteComponent< let reload: boolean const load = () => { - if (typeof document === 'undefined' && ssr?.() === false) { - comp = (() => null) as any - return Promise.resolve() - } if (!loadPromise) { loadPromise = importer() .then((res) => { @@ -91,13 +84,6 @@ export function lazyRouteComponent< throw load() } - if (ssr?.() === false) { - return ( - }> - {React.createElement(comp, props)} - - ) - } return React.createElement(comp, props) } diff --git a/packages/react-start-server/src/defaultStreamHandler.tsx b/packages/react-start-server/src/defaultStreamHandler.tsx index e95a9fcb87..2d58539541 100644 --- a/packages/react-start-server/src/defaultStreamHandler.tsx +++ b/packages/react-start-server/src/defaultStreamHandler.tsx @@ -2,6 +2,8 @@ import { PassThrough } from 'node:stream' import { isbot } from 'isbot' import ReactDOMServer from 'react-dom/server' +import { isSsrError } from '@tanstack/router-core' + import { defineHandlerCallback, transformPipeableStreamWithRouter, @@ -54,12 +56,16 @@ export const defaultStreamHandler = defineHandlerCallback( }, }), onError: (error, info) => { - console.error('Error in renderToPipeableStream:', error, info) + if (!isSsrError(error)) { + console.error('Error in renderToPipeableStream:', error, info) + } }, }, ) } catch (e) { - console.error('Error in renderToPipeableStream:', e) + if (!isSsrError(e)) { + console.error('Error in renderToPipeableStream:', e) + } } const responseStream = transformPipeableStreamWithRouter( diff --git a/packages/router-core/src/Matches.ts b/packages/router-core/src/Matches.ts index 5de34b3c1a..8127fa7fc6 100644 --- a/packages/router-core/src/Matches.ts +++ b/packages/router-core/src/Matches.ts @@ -155,6 +155,7 @@ export interface RouteMatch< staticData: StaticDataRouteOption minPendingPromise?: ControlledPromise pendingTimeout?: ReturnType + dehydrated?: boolean } export type MakeRouteMatchFromRoute = RouteMatch< diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 4988400855..e5e19b1e3d 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -410,3 +410,5 @@ export type { ValidateUseSearchResult, ValidateUseParamsResult, } from './typePrimitives' + +export { createSsrError, isSsrError } from './ssr-error' diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 4be19d5c24..30ab7362c8 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -567,6 +567,7 @@ export interface Route< fullPath: TFullPath path: TPath id: TId + ssr: boolean | 'data-only' parentRoute: TParentRoute children?: TChildren types: RouteTypes< @@ -1309,7 +1310,7 @@ export class BaseRoute< private _path!: TPath private _fullPath!: TFullPath private _to!: TrimPathRight - private _ssr!: boolean + private _ssr!: boolean | 'data-only' public get to() { return this._to diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index f41b47fe2f..47db9dd4e0 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -2320,6 +2320,26 @@ export class RouterCore< } } + const shouldSkipLoader = (matchId: string) => { + const match = this.getMatch(matchId)! + const route = this.looseRoutesById[match.routeId]! + + // Check if any parent route has ssr: false + const parentMatches = matches.slice( + 0, + matches.findIndex((m) => m.id === matchId), + ) + + const isNonSsr = + !route.ssr || + parentMatches.some((m) => { + const parentRoute = this.looseRoutesById[m.routeId]! + return !parentRoute.ssr + }) + + return (this.isServer && isNonSsr) || (!this.isServer && match.dehydrated) + } + try { await new Promise((resolveAll, rejectAll) => { ;(async () => { @@ -2372,6 +2392,10 @@ export class RouterCore< const route = this.looseRoutesById[routeId]! + if (shouldSkipLoader(matchId)) { + continue + } + const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs @@ -2388,7 +2412,9 @@ export class RouterCore< (this.options as any)?.defaultPendingComponent) ) - let executeBeforeLoad = true + // By default, execute the beforeLoad if the match is not dehydrated + // We'll unset this after the loader skips down below + let executeBeforeLoad = !existingMatch.dehydrated if ( // If we are in the middle of a load, either of these will be present // (not to be confused with `loadPromise`, which is always defined) @@ -2536,12 +2562,18 @@ export class RouterCore< validResolvedMatches.forEach(({ id: matchId, routeId }, index) => { matchPromises.push( (async () => { + const route = this.looseRoutesById[routeId]! const { loaderPromise: prevLoaderPromise } = this.getMatch(matchId)! let loaderShouldRunAsync = false let loaderIsRunningAsync = false + // Do not run the loader if the route is not SSR'able + if (shouldSkipLoader(matchId)) { + return this.getMatch(matchId)! + } + if (prevLoaderPromise) { await prevLoaderPromise const match = this.getMatch(matchId)! @@ -2768,6 +2800,7 @@ export class RouterCore< ? prev.loaderPromise : undefined, invalid: false, + dehydrated: false, })) return this.getMatch(matchId)! })(), diff --git a/packages/router-core/src/ssr-error.ts b/packages/router-core/src/ssr-error.ts new file mode 100644 index 0000000000..bbdbd94876 --- /dev/null +++ b/packages/router-core/src/ssr-error.ts @@ -0,0 +1,9 @@ +const message = 'SSR has been disabled for this route' + +export function createSsrError() { + return new Error(message) +} + +export function isSsrError(error: any): error is Error { + return error instanceof Error && error.message.includes(message) +} diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 91ca8ccf79..90ad953f8e 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -277,16 +277,9 @@ export function compileCodeSplitReferenceRoute( ]) } - // If it's a component, we need to pass the function to check the Route.ssr value - if (key === 'component') { - prop.value = template.expression( - `${LAZY_ROUTE_COMPONENT_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}', () => Route.ssr)`, - )() - } else { - prop.value = template.expression( - `${LAZY_ROUTE_COMPONENT_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}')`, - )() - } + prop.value = template.expression( + `${LAZY_ROUTE_COMPONENT_IDENT}(${splitNodeMeta.localImporterIdent}, '${splitNodeMeta.exporterIdent}')`, + )() // If the TSRDummyComponent is not defined, define it if ( diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx index 0e48584a4a..1bba7f376e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/arrow-function.tsx @@ -5,7 +5,7 @@ import { createFileRoute } from '@tanstack/react-router'; import { fetchPosts } from '../posts'; export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx index dffbd70c4d..94720d9ece 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/chinese.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); interface DemoProps { title: string; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx index 26de4ca825..0d32564cd5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/conditional-properties.tsx @@ -5,7 +5,7 @@ import { isEnabled } from '@features/feature-flags'; import TrueImport from '@modules/true-component'; import { falseLoader } from '@modules/false-component'; export const Route = createFileRoute('/posts')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: isEnabled ? TrueImport.loader : falseLoader }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx index 0fbc312626..28fc8b8d4a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/destructured-react-memo-imported-component.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx index c395bc44ee..9d1ce4cfb5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/function-declaration.tsx @@ -5,7 +5,7 @@ import { createFileRoute } from '@tanstack/react-router'; import { fetchPosts } from '../posts'; export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx index 8a221122d7..6eaa757391 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/importAttribute.tsx @@ -2,7 +2,7 @@ const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=com import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx index e23a496a74..f9083dfdec 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component-destructured-loader.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx index 968e6633d4..84b80abd8c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-default-component.tsx @@ -2,7 +2,7 @@ const $$splitComponentImporter = () => import('imported-default-component.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx index 0701029aa3..8cb47765ae 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-errorComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-s import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx index 63787a44d6..28f443b30f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-notFoundComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx index 143fe9c5e3..a75f856389 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported-pendingComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx index c4a5d9dbc4..3b49d3a3a6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/imported.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx index 931f6bce74..6d1c86c2d1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/inline.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); Route.addChildren([]); export const test = 'test'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx index b229826efb..0291adb554 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/random-number.tsx @@ -28,7 +28,7 @@ export const Route = createFileRoute('/')({ sponsorsPromise: defer(getSponsorsForSponsorPack()) }; }, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx index dc266fa611..4a2d2984fd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-component.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx index b1df7f4cf9..2dc70562f7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/react-memo-imported-component.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx index 2d40731c37..1e077409a4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/retain-exports-loader.tsx @@ -8,7 +8,7 @@ export function loaderFn() { }; } export const Route = createFileRoute('/_layout')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: loaderFn }); export const SIDEBAR_WIDTH = '150px'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/arrow-function.tsx index 82bb8e5078..48e3768224 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/arrow-function.tsx @@ -5,5 +5,5 @@ import { createFileRoute } from '@tanstack/react-router'; import { fetchPosts } from '../posts'; export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/chinese.tsx index 42ebf46e24..2ffcfaa9a2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/chinese.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); interface DemoProps { title: string; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/conditional-properties.tsx index efec873519..70385cd749 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/conditional-properties.tsx @@ -5,6 +5,6 @@ import { isEnabled } from '@features/feature-flags'; import TrueImport from '@modules/true-component'; import { falseLoader } from '@modules/false-component'; export const Route = createFileRoute('/posts')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: isEnabled ? TrueImport.loader : falseLoader }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/destructured-react-memo-imported-component.tsx index fd68ed1ef1..ee2af1cf9b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/destructured-react-memo-imported-component.tsx @@ -3,6 +3,6 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/function-declaration.tsx index 46e0618242..5d7e2181f5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/function-declaration.tsx @@ -5,5 +5,5 @@ import { createFileRoute } from '@tanstack/react-router'; import { fetchPosts } from '../posts'; export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/importAttribute.tsx index d4283ffced..df71217488 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/importAttribute.tsx @@ -2,5 +2,5 @@ const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=com import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component-destructured-loader.tsx index f89f29579f..2271ab4454 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component-destructured-loader.tsx @@ -3,6 +3,6 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component.tsx index 65202cff33..dcd6f3d5e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-default-component.tsx @@ -2,5 +2,5 @@ const $$splitComponentImporter = () => import('imported-default-component.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-errorComponent.tsx index a7b2f8702a..898e1b3618 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-errorComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-s import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-notFoundComponent.tsx index 0f9a8a66b6..4c5c19cfcf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-notFoundComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-pendingComponent.tsx index 4b0c7bd790..94770f5fb7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported-pendingComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported.tsx index 6e03300df9..e92f76cf98 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/imported.tsx @@ -3,6 +3,6 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/inline.tsx index a6e43381d6..c2b4dae416 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/inline.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); Route.addChildren([]); export const test = 'test'; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/random-number.tsx index 9b3a5559fd..0cb0a2e13b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/random-number.tsx @@ -28,5 +28,5 @@ export const Route = createFileRoute('/')({ sponsorsPromise: defer(getSponsorsForSponsorPack()) }; }, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-component.tsx index 260067ea5e..5fd96f8da1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-component.tsx @@ -3,6 +3,6 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-imported-component.tsx index 24fffc2776..69df0886db 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/react-memo-imported-component.tsx @@ -3,6 +3,6 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; import { importedLoader } from '../../shared/imported'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: importedLoader }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/retain-exports-loader.tsx index 73f2bd8818..88cd35f704 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/retain-exports-loader.tsx @@ -8,7 +8,7 @@ export function loaderFn() { }; } export const Route = createFileRoute('/_layout')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: loaderFn }); export const SIDEBAR_WIDTH = '150px'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx index 7104674b73..9fdfcf616d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/arrow-function.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx index 3efbe3595d..d98414f851 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/chinese.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); interface DemoProps { title: string; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx index a126bb6807..17f61d1d6f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/conditional-properties.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-sp import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx index 65f2bfb918..08d1ced301 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/destructured-react-memo-imported-component.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('destructured-react-memo-imported- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx index d6e6fa8152..60ea25d7bb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/function-declaration.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx index b89aede427..5cea07f338 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/importAttribute.tsx @@ -2,7 +2,7 @@ const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=com import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx index 9169f0b966..edd2152657 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component-destructured-loader.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('imported-default-component-destru import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx index 9b38429966..19eb5e9d0b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-default-component.tsx @@ -2,7 +2,7 @@ const $$splitComponentImporter = () => import('imported-default-component.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx index 108ad65fde..c56ebf6a62 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-errorComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-s import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx index 4df3a0edc2..ce3ddcdc4d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-notFoundComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx index 8a12860d09..3b5835bdf4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported-pendingComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx index b8c6e8c0ff..efe7499c05 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/imported.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx index a179d36c0b..66327a0973 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/inline.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); Route.addChildren([]); export const test = 'test'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx index 92f502edde..54e87e653b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/random-number.tsx @@ -24,7 +24,7 @@ const courses = [{ }]; export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx index bf8ae8af25..8234c9123e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-component.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-spli import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx index 5987f84c0a..9679a522df 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/react-memo-imported-component.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('react-memo-imported-component.tsx import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx index c8da9752f0..d4c731c637 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/retain-exports-loader.tsx @@ -8,7 +8,7 @@ export function loaderFn() { }; } export const Route = createFileRoute('/_layout')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: loaderFn }); export const SIDEBAR_WIDTH = '150px'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/arrow-function.tsx index 00aed12abc..ad71347222 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/arrow-function.tsx @@ -6,5 +6,5 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/chinese.tsx index 8240238572..327e227da4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/chinese.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); interface DemoProps { title: string; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/conditional-properties.tsx index 68f5556447..c20dcdc135 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/conditional-properties.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-sp import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/destructured-react-memo-imported-component.tsx index 265b803a90..c27220acce 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/destructured-react-memo-imported-component.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('destructured-react-memo-imported- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/function-declaration.tsx index e6cfcf3b74..c191f9fddd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/function-declaration.tsx @@ -6,5 +6,5 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/importAttribute.tsx index eb52fbee2e..e2aab465f5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/importAttribute.tsx @@ -2,5 +2,5 @@ const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=com import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component-destructured-loader.tsx index 37cd9799d7..70d5be8c3f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component-destructured-loader.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('imported-default-component-destru import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component.tsx index 00e081670b..601c1f656a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-default-component.tsx @@ -2,5 +2,5 @@ const $$splitComponentImporter = () => import('imported-default-component.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-errorComponent.tsx index ae97f66663..4df12c02de 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-errorComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-s import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-notFoundComponent.tsx index a0d6a07a7f..716ec0ca3a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-notFoundComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-pendingComponent.tsx index f8cd11e614..5a5aa789f7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported-pendingComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported.tsx index 96c6256f57..dd3299b1b1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/imported.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/inline.tsx index 9e05c80216..960f639c0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/inline.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); Route.addChildren([]); export const test = 'test'; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/random-number.tsx index 1d5b96ab42..a345d17ae7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/random-number.tsx @@ -24,5 +24,5 @@ const courses = [{ }]; export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-component.tsx index 19e2d97b6f..eea3e62996 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-component.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-spli import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-imported-component.tsx index a52cdbad09..e445bcbb72 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/react-memo-imported-component.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('react-memo-imported-component.tsx import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/retain-exports-loader.tsx index 09517a82c8..c31291f7fd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/retain-exports-loader.tsx @@ -8,7 +8,7 @@ export function loaderFn() { }; } export const Route = createFileRoute('/_layout')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: loaderFn }); export const SIDEBAR_WIDTH = '150px'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx index 25bae96925..f924172d3c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/arrow-function.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx index 9abb4a9d61..7cb48a6b73 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/chinese.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); interface DemoProps { title: string; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx index 279773de15..ca7b274435 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/conditional-properties.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-sp import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx index 0fe0b8418d..496ed8870d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/destructured-react-memo-imported-component.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('destructured-react-memo-imported- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx index 01360ef869..fc93ac22fc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/function-declaration.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx index d8355986bf..e01e9bf926 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/importAttribute.tsx @@ -2,7 +2,7 @@ const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=com import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx index 4e0beddab5..2134457394 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component-destructured-loader.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('imported-default-component-destru import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx index b749bed2ea..970af0c0db 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-default-component.tsx @@ -2,7 +2,7 @@ const $$splitComponentImporter = () => import('imported-default-component.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx index 26951c2d0a..aad1977bfc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-errorComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-s import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx index 54565ca6f1..c85459835f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-notFoundComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx index 02997dc053..6f2eceac67 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported-pendingComponent.tsx @@ -3,7 +3,7 @@ const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx index c397f9dccc..8e2b7ed396 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/imported.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx index ff044594ad..555a2910a9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/inline.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); Route.addChildren([]); export const test = 'test'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx index 05f26ecf0d..d9c3c8e153 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/random-number.tsx @@ -24,7 +24,7 @@ const courses = [{ }]; export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx index 66da0c232a..3a6bc8707a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-component.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-spli import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx index 8db833f30c..4d32acddf6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/react-memo-imported-component.tsx @@ -4,7 +4,7 @@ const $$splitComponentImporter = () => import('react-memo-imported-component.tsx import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); export function TSRDummyComponent() { diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx index eb4fd485bb..75a7761110 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/retain-exports-loader.tsx @@ -8,7 +8,7 @@ export function loaderFn() { }; } export const Route = createFileRoute('/_layout')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: loaderFn }); export const SIDEBAR_WIDTH = '150px'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/arrow-function.tsx index e1cb689fb1..380087d43c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/arrow-function.tsx @@ -6,5 +6,5 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/chinese.tsx index 0a05d2004c..d08045e238 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/chinese.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); interface DemoProps { title: string; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/conditional-properties.tsx index fe3a1fa350..dfb3b09c5e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/conditional-properties.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-sp import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/destructured-react-memo-imported-component.tsx index 1edba360e1..1776055cc2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/destructured-react-memo-imported-component.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('destructured-react-memo-imported- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/function-declaration.tsx index 9d5956f41f..6076420598 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/function-declaration.tsx @@ -6,5 +6,5 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/importAttribute.tsx index 847ad400fc..cec0324adf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/importAttribute.tsx @@ -2,5 +2,5 @@ const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=com import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component-destructured-loader.tsx index a110778506..d79c8e0f32 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component-destructured-loader.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('imported-default-component-destru import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component.tsx index bd196be036..c165f65262 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-default-component.tsx @@ -2,5 +2,5 @@ const $$splitComponentImporter = () => import('imported-default-component.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-errorComponent.tsx index f58664d12a..4152c9af17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-errorComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-s import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-notFoundComponent.tsx index 3880466641..584c829f37 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-notFoundComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?ts import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-pendingComponent.tsx index 939c087ebb..1be3f8071b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported-pendingComponent.tsx @@ -3,6 +3,6 @@ const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported.tsx index 0bbac9035a..14356133d6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/imported.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component- import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/inline.tsx index 3ce0186b9e..3e2ea1f1c2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/inline.tsx @@ -3,7 +3,7 @@ import { lazyRouteComponent } from '@tanstack/react-router'; import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); Route.addChildren([]); export const test = 'test'; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/random-number.tsx index 11fd8e69f7..5b4cfaaa9b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/random-number.tsx @@ -24,5 +24,5 @@ const courses = [{ }]; export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-component.tsx index 1043478308..568c8dc323 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-component.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-spli import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-imported-component.tsx index c3f6ce2057..233eca72a0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/react-memo-imported-component.tsx @@ -4,6 +4,6 @@ const $$splitComponentImporter = () => import('react-memo-imported-component.tsx import { lazyRouteComponent } from '@tanstack/react-router'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: lazyFn($$splitLoaderImporter, 'loader') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/retain-exports-loader.tsx index 046f910d6c..adee813a41 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/retain-exports-loader.tsx @@ -8,7 +8,7 @@ export function loaderFn() { }; } export const Route = createFileRoute('/_layout')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), loader: loaderFn }); export const SIDEBAR_WIDTH = '150px'; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx index f62b65b5eb..df55775555 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/development/arrow-function.tsx @@ -4,7 +4,7 @@ import { createFileRoute } from '@tanstack/solid-router'; import { fetchPosts } from '../posts'; export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/production/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/production/arrow-function.tsx index abfd462e25..b09548da57 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/production/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/production/arrow-function.tsx @@ -4,5 +4,5 @@ import { createFileRoute } from '@tanstack/solid-router'; import { fetchPosts } from '../posts'; export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx index 5f36162818..afa5ebe0c6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/development/arrow-function.tsx @@ -5,7 +5,7 @@ import { lazyFn } from '@tanstack/solid-router'; import { createFileRoute } from '@tanstack/solid-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/production/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/production/arrow-function.tsx index daa8e9e24d..61c77d73bd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/production/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/production/arrow-function.tsx @@ -5,5 +5,5 @@ import { lazyFn } from '@tanstack/solid-router'; import { createFileRoute } from '@tanstack/solid-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx index 56e28dce37..7dc7549935 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/development/arrow-function.tsx @@ -5,7 +5,7 @@ import { lazyFn } from '@tanstack/solid-router'; import { createFileRoute } from '@tanstack/solid-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); export function TSRDummyComponent() { return null; diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/production/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/production/arrow-function.tsx index d74bbba5db..a872f13d33 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/production/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/production/arrow-function.tsx @@ -5,5 +5,5 @@ import { lazyFn } from '@tanstack/solid-router'; import { createFileRoute } from '@tanstack/solid-router'; export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr) + component: lazyRouteComponent($$splitComponentImporter, 'component') }); \ No newline at end of file diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx index fc7c0bfd29..c2c172be34 100644 --- a/packages/solid-router/src/index.tsx +++ b/packages/solid-router/src/index.tsx @@ -370,3 +370,5 @@ export { ScriptOnce } from './ScriptOnce' export { Asset } from './Asset' export { HeadContent, useTags } from './HeadContent' export { Scripts } from './Scripts' + +export { createSsrError, isSsrError } from '@tanstack/router-core' diff --git a/packages/start-client-core/src/serializer.ts b/packages/start-client-core/src/serializer.ts index d9fd299b28..a2d336e3a6 100644 --- a/packages/start-client-core/src/serializer.ts +++ b/packages/start-client-core/src/serializer.ts @@ -174,4 +174,26 @@ const serializers = [ // From (v) => BigInt(v), ), + // Infinity + createSerializer( + // Key + 'infinity', + // Check + (v): v is number => v === Infinity || v === -Infinity, + // To + (v) => (v > 0 ? '+' : '-'), + // From + (v) => (v === '+' ? Infinity : -Infinity), + ), + // NaN + createSerializer( + // Key + 'nan', + // Check + (v): v is number => typeof v === 'number' && isNaN(v), + // To + () => 0, + // From + () => NaN, + ), ] as const diff --git a/packages/start-client-core/src/ssr-client.tsx b/packages/start-client-core/src/ssr-client.tsx index 9eddf971db..ab0d6fa809 100644 --- a/packages/start-client-core/src/ssr-client.tsx +++ b/packages/start-client-core/src/ssr-client.tsx @@ -131,7 +131,9 @@ export function hydrate(router: AnyRouter) { ) if (dehydratedMatch) { - Object.assign(match, dehydratedMatch) + Object.assign(match, dehydratedMatch, { + dehydrated: true, + }) // Handle beforeLoadContext if (dehydratedMatch.__beforeLoadContext) { @@ -156,11 +158,6 @@ export function hydrate(router: AnyRouter) { ;(match as unknown as SsrMatch).extracted?.forEach((ex) => { deepMutableSetByPath(match, ['loaderData', ...ex.path], ex.value) }) - } else { - Object.assign(match, { - status: 'success', - updatedAt: Date.now(), - }) } return match diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts index 60043bfa9c..ed971e7422 100644 --- a/packages/start-config/src/index.ts +++ b/packages/start-config/src/index.ts @@ -186,6 +186,7 @@ export async function defineConfig( ) return [ + silenceReactErrorBoundaryPlugin(), config('tss-vite-config-client', { ...viteConfig.userConfig, ...clientViteConfig.userConfig, @@ -663,3 +664,40 @@ function injectDefineEnv( [`import.meta.env.${key}`]: JSON.stringify(value), } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } } + +function silenceReactErrorBoundaryPlugin(): vite.Plugin { + return { + name: 'extend-react', + enforce: 'pre', + resolveId: (source, importer) => { + if ( + source === 'react-dom/client' && + !importer?.includes('\0react-dom/client-tss') + ) { + return '\0react-dom/client-tss' + } + return null + }, + load: (id) => { + if (id.includes('\0react-dom/client-tss')) { + return ` + import * as ReactDomClient from 'react-dom/client'; + const { hydrateRoot: originalHydrateRoot, ...rest } = ReactDomClient; + import { isSsrError } from '@tanstack/react-router' + + export const hydrateRoot = (a, b, c) => originalHydrateRoot(a, b, { + ...c, + onRecoverableError(error) { + if (isSsrError(error)) return + c?.onRecoverableError ? c.onRecoverableError(error) : console.error(error) + }, + }); + + export default { hydrateRoot, ...rest }; + export * from 'react-dom/client'` + } + + return null + }, + } +} diff --git a/packages/start-server-core/src/ssr-server.ts b/packages/start-server-core/src/ssr-server.ts index a7f8378310..c96cd6a39f 100644 --- a/packages/start-server-core/src/ssr-server.ts +++ b/packages/start-server-core/src/ssr-server.ts @@ -167,8 +167,16 @@ export function onMatchSettled(opts: { }) { const { router, match } = opts + const loaderDataProps: { loaderData?: any } = {} + const extractedProps: { + extracted?: Array<{ type: string; path: Array }> + } = {} + const errorProps: { error?: any } = {} + const beforeLoadContextProps: { __beforeLoadContext?: any } = {} + let extracted: Array | undefined = undefined let serializedLoaderData: any = undefined + if (match.loaderData !== undefined) { const result = extractAsyncLoaderData(match.loaderData, { router, @@ -182,20 +190,34 @@ export function onMatchSettled(opts: { }, { temp: result.replaced }, ).temp + + loaderDataProps.loaderData = + router.ssr!.serializer.stringify(serializedLoaderData) + + extractedProps.extracted = extracted.map((entry) => + pick(entry, ['type', 'path']), + ) + } + + if (match.error !== undefined) { + errorProps.error = router.ssr!.serializer.stringify(match.error) + } + + if (Object.keys(match.__beforeLoadContext).length > 0) { + beforeLoadContextProps.__beforeLoadContext = + router.ssr!.serializer.stringify(match.__beforeLoadContext) } const initCode = `__TSR_SSR__.initMatch(${jsesc( { id: match.id, - __beforeLoadContext: router.ssr!.serializer.stringify( - match.__beforeLoadContext, - ), - loaderData: router.ssr!.serializer.stringify(serializedLoaderData), - error: router.ssr!.serializer.stringify(match.error), - extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])), - updatedAt: match.updatedAt, status: match.status, - } satisfies SsrMatch, + updatedAt: match.updatedAt, + ...beforeLoadContextProps, + ...errorProps, + ...loaderDataProps, + ...extractedProps, + } satisfies unknown as SsrMatch, { isScriptContext: true, wrap: true,