From 62665f06144a56a74a4e57ffcf0b1d735a496d82 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 19 Feb 2025 16:16:59 -0700 Subject: [PATCH 1/7] feat: ssr: false supports beforeLoad/loaders --- .../react/start-basic/app/routes/index.tsx | 14 +++++++ packages/react-router/src/Match.tsx | 3 +- packages/react-router/src/Matches.tsx | 1 + packages/react-router/src/Transitioner.tsx | 19 ++++------ .../react-router/src/lazyRouteComponent.tsx | 23 ++++++----- packages/react-router/src/router.ts | 30 +++++++++++++-- packages/start-client/src/serializer.ts | 22 +++++++++++ packages/start-client/src/ssr-client.tsx | 9 ++--- packages/start-server/src/ssr-server.ts | 38 +++++++++++++++---- 9 files changed, 117 insertions(+), 42 deletions(-) diff --git a/examples/react/start-basic/app/routes/index.tsx b/examples/react/start-basic/app/routes/index.tsx index 09a907cb18..971a96cd3e 100644 --- a/examples/react/start-basic/app/routes/index.tsx +++ b/examples/react/start-basic/app/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/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 4fb7010b58..a7102c9c78 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -57,7 +57,7 @@ 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)) ? React.Suspense : SafeFragment @@ -268,6 +268,7 @@ export const MatchInner = React.memo(function MatchInnerImpl({ }, pendingMinMs) } } + throw router.getMatch(match.id)?.loadPromise } diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx index f827e33831..0210292ef0 100644 --- a/packages/react-router/src/Matches.tsx +++ b/packages/react-router/src/Matches.tsx @@ -94,6 +94,7 @@ export interface RouteMatch< staticData: StaticDataRouteOption minPendingPromise?: ControlledPromise pendingTimeout?: ReturnType + dehydrated?: boolean } export type MakeRouteMatch< diff --git a/packages/react-router/src/Transitioner.tsx b/packages/react-router/src/Transitioner.tsx index 1b8b0ab407..562c905a91 100644 --- a/packages/react-router/src/Transitioner.tsx +++ b/packages/react-router/src/Transitioner.tsx @@ -64,24 +64,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/lazyRouteComponent.tsx b/packages/react-router/src/lazyRouteComponent.tsx index e75e9016c3..7ea35597f0 100644 --- a/packages/react-router/src/lazyRouteComponent.tsx +++ b/packages/react-router/src/lazyRouteComponent.tsx @@ -1,5 +1,4 @@ import * as React from 'react' -import { Outlet } from './Match' import type { AsyncRouteComponent } from './route' // If the load fails due to module not found, it may mean a new version of @@ -54,10 +53,10 @@ export function lazyRouteComponent< let reload: boolean const load = () => { - if (typeof document === 'undefined' && ssr?.() === false) { - comp = (() => null) as any - return Promise.resolve() - } + // if (typeof document === 'undefined' && ssr?.() === false) { + // comp = (() => null) as any + // return Promise.resolve() + // } if (!loadPromise) { loadPromise = importer() .then((res) => { @@ -109,13 +108,13 @@ export function lazyRouteComponent< throw load() } - if (ssr?.() === false) { - return ( - }> - {React.createElement(comp, props)} - - ) - } + // if (ssr?.() === false) { + // return ( + // }> + // {React.createElement(comp, props)} + // + // ) + // } return React.createElement(comp, props) } diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts index 1786a28ecb..3eabc045dc 100644 --- a/packages/react-router/src/router.ts +++ b/packages/react-router/src/router.ts @@ -2287,6 +2287,10 @@ export class Router< const route = this.looseRoutesById[routeId]! + if (!route.ssr && this.isServer) { + continue + } + const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs @@ -2301,7 +2305,10 @@ export class Router< this.options.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) @@ -2446,12 +2453,22 @@ export class Router< validResolvedMatches.forEach(({ id: matchId, routeId }, index) => { matchPromises.push( (async () => { - const { loaderPromise: prevLoaderPromise } = + const route = this.looseRoutesById[routeId]! + + const { loaderPromise: prevLoaderPromise, dehydrated } = this.getMatch(matchId)! let loaderShouldRunAsync = false let loaderIsRunningAsync = false + // Do not run the loader if the route is not SSR'able + if ( + (this.isServer && !route.ssr) || + (!this.isServer && dehydrated) + ) { + return this.getMatch(matchId)! + } + if (prevLoaderPromise) { await prevLoaderPromise const match = this.getMatch(matchId)! @@ -2459,8 +2476,11 @@ export class Router< handleRedirectAndNotFound(match, match.error) } } else { + if (!route.ssr && this.isServer) { + return this.getMatch(matchId)! + } + const parentMatchPromise = matchPromises[index - 1] as any - const route = this.looseRoutesById[routeId]! const getLoaderContext = (): LoaderFnContext => { const { @@ -2633,9 +2653,11 @@ export class Router< // If the route is successful and still fresh, just resolve const { status, invalid } = this.getMatch(matchId)! + loaderShouldRunAsync = status === 'success' && (invalid || (shouldReload ?? age > staleAge)) + if (preload && route.options.preload === false) { // Do nothing } else if (loaderShouldRunAsync && !sync) { @@ -2664,6 +2686,7 @@ export class Router< await runLoader() } } + if (!loaderIsRunningAsync) { const { loaderPromise, loadPromise } = this.getMatch(matchId)! @@ -2678,6 +2701,7 @@ export class Router< ? prev.loaderPromise : undefined, invalid: false, + dehydrated: false, })) return this.getMatch(matchId)! })(), diff --git a/packages/start-client/src/serializer.ts b/packages/start-client/src/serializer.ts index fb8154d107..9843e3bcd1 100644 --- a/packages/start-client/src/serializer.ts +++ b/packages/start-client/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/src/ssr-client.tsx b/packages/start-client/src/ssr-client.tsx index 572082a39b..831042216d 100644 --- a/packages/start-client/src/ssr-client.tsx +++ b/packages/start-client/src/ssr-client.tsx @@ -127,7 +127,9 @@ export function hydrate(router: AnyRouter) { ) if (dehydratedMatch) { - Object.assign(match, dehydratedMatch) + Object.assign(match, dehydratedMatch, { + dehydrated: true, + }) const parentMatch = matches[match.index - 1] const parentContext = parentMatch?.context ?? router.options.context ?? {} @@ -161,11 +163,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(), - }) } const assetContext = { diff --git a/packages/start-server/src/ssr-server.ts b/packages/start-server/src/ssr-server.ts index b17e658f76..1ead645529 100644 --- a/packages/start-server/src/ssr-server.ts +++ b/packages/start-server/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, From 3deb3ffdf663e46f1935f99f1d14dd75f8024ea1 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 19 Feb 2025 16:44:28 -0700 Subject: [PATCH 2/7] fix suspense --- packages/react-router/src/Match.tsx | 5 +++++ packages/react-router/src/index.tsx | 2 ++ packages/react-router/src/lazyRouteComponent.tsx | 12 ------------ packages/react-router/src/ssr-error.ts | 9 +++++++++ .../src/core/code-splitter/compilers.ts | 13 +++---------- .../react/1-default/development/arrow-function.tsx | 2 +- .../react/1-default/development/chinese.tsx | 2 +- .../development/conditional-properties.tsx | 2 +- .../destructured-react-memo-imported-component.tsx | 2 +- .../1-default/development/function-declaration.tsx | 2 +- .../react/1-default/development/importAttribute.tsx | 2 +- ...ported-default-component-destructured-loader.tsx | 2 +- .../development/imported-default-component.tsx | 2 +- .../development/imported-errorComponent.tsx | 2 +- .../development/imported-notFoundComponent.tsx | 2 +- .../development/imported-pendingComponent.tsx | 2 +- .../react/1-default/development/imported.tsx | 2 +- .../react/1-default/development/inline.tsx | 2 +- .../react/1-default/development/random-number.tsx | 2 +- .../1-default/development/react-memo-component.tsx | 2 +- .../development/react-memo-imported-component.tsx | 2 +- .../1-default/development/retain-exports-loader.tsx | 2 +- .../1-default/development/useStateDestructure.tsx | 2 +- .../react/1-default/production/arrow-function.tsx | 2 +- .../react/1-default/production/chinese.tsx | 2 +- .../1-default/production/conditional-properties.tsx | 2 +- .../destructured-react-memo-imported-component.tsx | 2 +- .../1-default/production/function-declaration.tsx | 2 +- .../react/1-default/production/importAttribute.tsx | 2 +- ...ported-default-component-destructured-loader.tsx | 2 +- .../production/imported-default-component.tsx | 2 +- .../production/imported-errorComponent.tsx | 2 +- .../production/imported-notFoundComponent.tsx | 2 +- .../production/imported-pendingComponent.tsx | 2 +- .../react/1-default/production/imported.tsx | 2 +- .../snapshots/react/1-default/production/inline.tsx | 2 +- .../react/1-default/production/random-number.tsx | 2 +- .../1-default/production/react-memo-component.tsx | 2 +- .../production/react-memo-imported-component.tsx | 2 +- .../1-default/production/retain-exports-loader.tsx | 2 +- .../1-default/production/useStateDestructure.tsx | 2 +- .../development/arrow-function.tsx | 2 +- .../development/chinese.tsx | 2 +- .../development/conditional-properties.tsx | 2 +- .../destructured-react-memo-imported-component.tsx | 2 +- .../development/function-declaration.tsx | 2 +- .../development/importAttribute.tsx | 2 +- ...ported-default-component-destructured-loader.tsx | 2 +- .../development/imported-default-component.tsx | 2 +- .../development/imported-errorComponent.tsx | 2 +- .../development/imported-notFoundComponent.tsx | 2 +- .../development/imported-pendingComponent.tsx | 2 +- .../development/imported.tsx | 2 +- .../development/inline.tsx | 2 +- .../development/random-number.tsx | 2 +- .../development/react-memo-component.tsx | 2 +- .../development/react-memo-imported-component.tsx | 2 +- .../development/retain-exports-loader.tsx | 2 +- .../development/useStateDestructure.tsx | 2 +- .../production/arrow-function.tsx | 2 +- .../production/chinese.tsx | 2 +- .../production/conditional-properties.tsx | 2 +- .../destructured-react-memo-imported-component.tsx | 2 +- .../production/function-declaration.tsx | 2 +- .../production/importAttribute.tsx | 2 +- ...ported-default-component-destructured-loader.tsx | 2 +- .../production/imported-default-component.tsx | 2 +- .../production/imported-errorComponent.tsx | 2 +- .../production/imported-notFoundComponent.tsx | 2 +- .../production/imported-pendingComponent.tsx | 2 +- .../production/imported.tsx | 2 +- .../production/inline.tsx | 2 +- .../production/random-number.tsx | 2 +- .../production/react-memo-component.tsx | 2 +- .../production/react-memo-imported-component.tsx | 2 +- .../production/retain-exports-loader.tsx | 2 +- .../production/useStateDestructure.tsx | 2 +- .../development/arrow-function.tsx | 2 +- .../development/chinese.tsx | 2 +- .../development/conditional-properties.tsx | 2 +- .../destructured-react-memo-imported-component.tsx | 2 +- .../development/function-declaration.tsx | 2 +- .../development/importAttribute.tsx | 2 +- ...ported-default-component-destructured-loader.tsx | 2 +- .../development/imported-default-component.tsx | 2 +- .../development/imported-errorComponent.tsx | 2 +- .../development/imported-notFoundComponent.tsx | 2 +- .../development/imported-pendingComponent.tsx | 2 +- .../development/imported.tsx | 2 +- .../development/inline.tsx | 2 +- .../development/random-number.tsx | 2 +- .../development/react-memo-component.tsx | 2 +- .../development/react-memo-imported-component.tsx | 2 +- .../development/retain-exports-loader.tsx | 2 +- .../development/useStateDestructure.tsx | 2 +- .../production/arrow-function.tsx | 2 +- .../production/chinese.tsx | 2 +- .../production/conditional-properties.tsx | 2 +- .../destructured-react-memo-imported-component.tsx | 2 +- .../production/function-declaration.tsx | 2 +- .../production/importAttribute.tsx | 2 +- ...ported-default-component-destructured-loader.tsx | 2 +- .../production/imported-default-component.tsx | 2 +- .../production/imported-errorComponent.tsx | 2 +- .../production/imported-notFoundComponent.tsx | 2 +- .../production/imported-pendingComponent.tsx | 2 +- .../production/imported.tsx | 2 +- .../production/inline.tsx | 2 +- .../production/random-number.tsx | 2 +- .../production/react-memo-component.tsx | 2 +- .../production/react-memo-imported-component.tsx | 2 +- .../production/retain-exports-loader.tsx | 2 +- .../production/useStateDestructure.tsx | 2 +- .../solid/1-default/development/arrow-function.tsx | 2 +- .../solid/1-default/production/arrow-function.tsx | 2 +- .../development/arrow-function.tsx | 2 +- .../production/arrow-function.tsx | 2 +- .../development/arrow-function.tsx | 2 +- .../production/arrow-function.tsx | 2 +- packages/start-server/src/defaultStreamHandler.tsx | 9 +++++++-- 120 files changed, 140 insertions(+), 138 deletions(-) create mode 100644 packages/react-router/src/ssr-error.ts diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index a7102c9c78..bd8df42b39 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -12,6 +12,7 @@ import { useRouterState } from './useRouterState' import { useRouter } from './useRouter' import { CatchNotFound, isNotFound } from './not-found' import { isRedirect } from './redirects' +import { createSsrError } from './ssr-error' import { matchContext } from './matchContext' import { SafeFragment } from './SafeFragment' import { renderRouteNotFound } from './renderRouteNotFound' @@ -269,6 +270,10 @@ export const MatchInner = React.memo(function MatchInnerImpl({ } } + if (router.isServer && !route.ssr) { + throw createSsrError() + } + throw router.getMatch(match.id)?.loadPromise } diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 1b335cc03c..fc0acf50a3 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -360,3 +360,5 @@ export { ScriptOnce } from './ScriptOnce' export { Asset } from './Asset' export { HeadContent } from './HeadContent' export { Scripts } from './Scripts' + +export { createSsrError, isSsrError } from './ssr-error' diff --git a/packages/react-router/src/lazyRouteComponent.tsx b/packages/react-router/src/lazyRouteComponent.tsx index 7ea35597f0..72c0d70197 100644 --- a/packages/react-router/src/lazyRouteComponent.tsx +++ b/packages/react-router/src/lazyRouteComponent.tsx @@ -43,7 +43,6 @@ export function lazyRouteComponent< >( importer: () => Promise, exportName?: TKey, - ssr?: () => boolean, ): T[TKey] extends (props: infer TProps) => any ? AsyncRouteComponent : never { @@ -53,10 +52,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) => { @@ -108,13 +103,6 @@ export function lazyRouteComponent< throw load() } - // if (ssr?.() === false) { - // return ( - // }> - // {React.createElement(comp, props)} - // - // ) - // } return React.createElement(comp, props) } diff --git a/packages/react-router/src/ssr-error.ts b/packages/react-router/src/ssr-error.ts new file mode 100644 index 0000000000..1e8e7c9247 --- /dev/null +++ b/packages/react-router/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 === message +} diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 6a4102ebc5..34c8c8fabe 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/development/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/useStateDestructure.tsx index 20ba4e5b97..19231d168f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/development/useStateDestructure.tsx @@ -6,7 +6,7 @@ import { startProject } from '~/projects/start'; import { createFileRoute } from '@tanstack/react-router'; import { seo } from '~/utils/seo'; export const Route = createFileRoute('/_libraries/start/$version/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), meta: () => seo({ title: startProject.name, description: startProject.description 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/1-default/production/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/useStateDestructure.tsx index 14e049add8..596407fc82 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/production/useStateDestructure.tsx @@ -6,7 +6,7 @@ import { startProject } from '~/projects/start'; import { createFileRoute } from '@tanstack/react-router'; import { seo } from '~/utils/seo'; export const Route = createFileRoute('/_libraries/start/$version/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), meta: () => seo({ title: startProject.name, description: startProject.description 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/development/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/useStateDestructure.tsx index a4c57ca84d..418d3357b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/development/useStateDestructure.tsx @@ -6,7 +6,7 @@ import { startProject } from '~/projects/start'; import { createFileRoute } from '@tanstack/react-router'; import { seo } from '~/utils/seo'; export const Route = createFileRoute('/_libraries/start/$version/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), meta: () => seo({ title: startProject.name, description: startProject.description 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/2-components-combined-loader-separate/production/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/useStateDestructure.tsx index 69361fdde8..fff512da1f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/production/useStateDestructure.tsx @@ -6,7 +6,7 @@ import { startProject } from '~/projects/start'; import { createFileRoute } from '@tanstack/react-router'; import { seo } from '~/utils/seo'; export const Route = createFileRoute('/_libraries/start/$version/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), meta: () => seo({ title: startProject.name, description: startProject.description 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/development/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/useStateDestructure.tsx index 9008c83373..b47b562eb7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/development/useStateDestructure.tsx @@ -6,7 +6,7 @@ import { startProject } from '~/projects/start'; import { createFileRoute } from '@tanstack/react-router'; import { seo } from '~/utils/seo'; export const Route = createFileRoute('/_libraries/start/$version/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), meta: () => seo({ title: startProject.name, description: startProject.description 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/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx index e69e404da1..984bd4e68f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/production/useStateDestructure.tsx @@ -6,7 +6,7 @@ import { startProject } from '~/projects/start'; import { createFileRoute } from '@tanstack/react-router'; import { seo } from '~/utils/seo'; export const Route = createFileRoute('/_libraries/start/$version/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component', () => Route.ssr), + component: lazyRouteComponent($$splitComponentImporter, 'component'), meta: () => seo({ title: startProject.name, description: startProject.description 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/start-server/src/defaultStreamHandler.tsx b/packages/start-server/src/defaultStreamHandler.tsx index 1b2546089e..0b2bdc6b58 100644 --- a/packages/start-server/src/defaultStreamHandler.tsx +++ b/packages/start-server/src/defaultStreamHandler.tsx @@ -2,6 +2,7 @@ import { PassThrough } from 'node:stream' import { isbot } from 'isbot' import ReactDOMServer from 'react-dom/server' +import { isSsrError } from '@tanstack/react-router' import { StartServer } from './StartServer' import { @@ -55,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( From b2f37f87fd5b61f817daff71bc12b97fd97ceeba Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Wed, 19 Feb 2025 23:48:31 -0700 Subject: [PATCH 3/7] Don't show ssr: false hydration errors --- packages/react-router/src/ssr-error.ts | 2 +- packages/start-config/src/index.ts | 35 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/packages/react-router/src/ssr-error.ts b/packages/react-router/src/ssr-error.ts index 1e8e7c9247..bbdbd94876 100644 --- a/packages/react-router/src/ssr-error.ts +++ b/packages/react-router/src/ssr-error.ts @@ -5,5 +5,5 @@ export function createSsrError() { } export function isSsrError(error: any): error is Error { - return error instanceof Error && error.message === message + return error instanceof Error && error.message.includes(message) } diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts index 6bd05f6025..21d8479e1e 100644 --- a/packages/start-config/src/index.ts +++ b/packages/start-config/src/index.ts @@ -180,6 +180,41 @@ export async function defineConfig( ) return [ + { + name: 'extend-react', + enforce: 'pre', + resolveId: (source: string, importer: string) => { + if ( + source === 'react-dom/client' && + !importer.includes('\0extended-react-dom-client') + ) { + return '\0extended-react-dom-client' + } + return null + }, + load: (id: string) => { + if (id.includes('\0extended-react-dom-client')) { + 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 + }, + }, config('tss-vite-config-client', { ...viteConfig.userConfig, ...clientViteConfig.userConfig, From fd14af136e6b30e7acd1fc060b4ef67316818caf Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Thu, 20 Feb 2025 20:04:42 -0700 Subject: [PATCH 4/7] feat: ssr: data-only --- .../app/utils/loggingMiddleware.tsx | 19 +++-- packages/react-router/src/Match.tsx | 14 ++-- packages/react-router/src/route.ts | 4 +- packages/react-router/src/router.ts | 33 ++++++--- packages/start-config/src/index.ts | 73 ++++++++++--------- 5 files changed, 84 insertions(+), 59 deletions(-) diff --git a/examples/react/start-basic/app/utils/loggingMiddleware.tsx b/examples/react/start-basic/app/utils/loggingMiddleware.tsx index 52c90185d0..f2e6363c90 100644 --- a/examples/react/start-basic/app/utils/loggingMiddleware.tsx +++ b/examples/react/start-basic/app/utils/loggingMiddleware.tsx @@ -1,6 +1,8 @@ import { createMiddleware } from '@tanstack/start' -export const logMiddleware = createMiddleware() +// + +const serverLogMiddleware = createMiddleware() .client(async (ctx) => { const clientTime = new Date() @@ -24,14 +26,19 @@ export const logMiddleware = createMiddleware() }, }) }) - .clientAfter(async (ctx) => { + +export const logMiddleware = createMiddleware() + .middleware([serverLogMiddleware]) + .client(async (ctx) => { + const res = await ctx.next() + const now = new Date() console.log('Client Req/Res:', { - duration: ctx.context.clientTime.getTime() - now.getTime(), - durationToServer: ctx.context.durationToServer, - durationFromServer: now.getTime() - ctx.context.serverTime.getTime(), + duration: res.context.clientTime.getTime() - now.getTime(), + durationToServer: res.context.durationToServer, + durationFromServer: now.getTime() - res.context.serverTime.getTime(), }) - return ctx.next() + return res }) diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index bd8df42b39..523a5a6c82 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -12,11 +12,11 @@ import { useRouterState } from './useRouterState' import { useRouter } from './useRouter' import { CatchNotFound, isNotFound } from './not-found' import { isRedirect } from './redirects' -import { createSsrError } from './ssr-error' import { matchContext } from './matchContext' import { SafeFragment } from './SafeFragment' import { renderRouteNotFound } from './renderRouteNotFound' import { ScrollRestoration } from './scroll-restoration' +import { createSsrError } from './ssr-error' import type { ParsedLocation } from '@tanstack/router-core' import type { AnyRoute } from './route' @@ -58,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.ssr)) + ((route.options.errorComponent as any)?.preload || + !route.ssr || + route.ssr === 'data-only')) ? React.Suspense : SafeFragment @@ -220,6 +222,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 @@ -270,10 +276,6 @@ export const MatchInner = React.memo(function MatchInnerImpl({ } } - if (router.isServer && !route.ssr) { - throw createSsrError() - } - throw router.getMatch(match.id)?.loadPromise } diff --git a/packages/react-router/src/route.ts b/packages/react-router/src/route.ts index ffa9d57a41..49f62bb21d 100644 --- a/packages/react-router/src/route.ts +++ b/packages/react-router/src/route.ts @@ -504,7 +504,7 @@ export interface UpdatableRouteOptions< TLoaderDeps >, ) => AnyRouteMatch['scripts'] - ssr?: boolean + ssr?: boolean | 'data-only' codeSplitGroupings?: Array< Array< | 'loader' @@ -776,7 +776,7 @@ export class Route< private _path!: TPath private _fullPath!: TFullPath private _to!: TrimPathRight - private _ssr!: boolean + private _ssr!: boolean | 'data-only' public get to() { /* invariant( diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts index 3eabc045dc..d7fcf4a10d 100644 --- a/packages/react-router/src/router.ts +++ b/packages/react-router/src/router.ts @@ -2235,6 +2235,26 @@ export class Router< } } + 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 () => { @@ -2287,7 +2307,7 @@ export class Router< const route = this.looseRoutesById[routeId]! - if (!route.ssr && this.isServer) { + if (shouldSkipLoader(matchId)) { continue } @@ -2455,17 +2475,14 @@ export class Router< (async () => { const route = this.looseRoutesById[routeId]! - const { loaderPromise: prevLoaderPromise, dehydrated } = + 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 ( - (this.isServer && !route.ssr) || - (!this.isServer && dehydrated) - ) { + if (shouldSkipLoader(matchId)) { return this.getMatch(matchId)! } @@ -2476,10 +2493,6 @@ export class Router< handleRedirectAndNotFound(match, match.error) } } else { - if (!route.ssr && this.isServer) { - return this.getMatch(matchId)! - } - const parentMatchPromise = matchPromises[index - 1] as any const getLoaderContext = (): LoaderFnContext => { diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts index 21d8479e1e..b0c80c0f27 100644 --- a/packages/start-config/src/index.ts +++ b/packages/start-config/src/index.ts @@ -180,41 +180,7 @@ export async function defineConfig( ) return [ - { - name: 'extend-react', - enforce: 'pre', - resolveId: (source: string, importer: string) => { - if ( - source === 'react-dom/client' && - !importer.includes('\0extended-react-dom-client') - ) { - return '\0extended-react-dom-client' - } - return null - }, - load: (id: string) => { - if (id.includes('\0extended-react-dom-client')) { - 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 - }, - }, + silenceReactErrorBoundaryPlugin(), config('tss-vite-config-client', { ...viteConfig.userConfig, ...clientViteConfig.userConfig, @@ -693,3 +659,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 + }, + } +} From 1b0b61e1c9b2b107fa3ce37a152def04bfefb956 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Wed, 26 Feb 2025 22:55:06 +0100 Subject: [PATCH 5/7] add example again --- e2e/react-start/basic/app/routes/index.tsx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/e2e/react-start/basic/app/routes/index.tsx b/e2e/react-start/basic/app/routes/index.tsx index 37169a78b4..fe68e5a9ce 100644 --- a/e2e/react-start/basic/app/routes/index.tsx +++ b/e2e/react-start/basic/app/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}

) -} +} \ No newline at end of file From 634be1b12f0d60eb5b9d7e6bbb6719971ec44b09 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 21:56:27 +0000 Subject: [PATCH 6/7] ci: apply automated fixes --- e2e/react-start/basic/app/routes/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/react-start/basic/app/routes/index.tsx b/e2e/react-start/basic/app/routes/index.tsx index fe68e5a9ce..971a96cd3e 100644 --- a/e2e/react-start/basic/app/routes/index.tsx +++ b/e2e/react-start/basic/app/routes/index.tsx @@ -24,4 +24,4 @@ function Home() {

{message}

) -} \ No newline at end of file +} From ed1c83044f18347169f0f16ac49b047d42a999d0 Mon Sep 17 00:00:00 2001 From: Manuel Schiller Date: Fri, 25 Apr 2025 00:27:32 +0200 Subject: [PATCH 7/7] fix lint --- packages/react-router/src/Match.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index 8433f45616..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, @@ -17,7 +18,6 @@ import { matchContext } from './matchContext' import { SafeFragment } from './SafeFragment' import { renderRouteNotFound } from './renderRouteNotFound' import { ScrollRestoration } from './scroll-restoration' -import { createSsrError } from '@tanstack/router-core' import type { AnyRoute, ParsedLocation } from '@tanstack/router-core' export const Match = React.memo(function MatchImpl({