diff --git a/e2e/bundle-size/scenarios/react-router-full/src/routes/__root.tsx b/e2e/bundle-size/scenarios/react-router-full/src/routes/__root.tsx index 4c5e443555b..d8948fdb7e3 100644 --- a/e2e/bundle-size/scenarios/react-router-full/src/routes/__root.tsx +++ b/e2e/bundle-size/scenarios/react-router-full/src/routes/__root.tsx @@ -29,7 +29,6 @@ import { useLinkProps, useLoaderData, useLoaderDeps, - useLayoutEffect, useLocation, useMatch, useMatchRoute, @@ -42,7 +41,6 @@ import { useRouter, useRouterState, useSearch, - useStableCallback, useTags, } from '@tanstack/react-router' @@ -69,11 +67,9 @@ function RootComponent() { const location = useLocation() const canGoBack = useCanGoBack() const navigate = useNavigate() - const stableCallback = useStableCallback(() => {}) const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) const tags = useTags() - useLayoutEffect(() => {}, []) useBlocker({ shouldBlockFn: () => false, disabled: true, @@ -95,7 +91,6 @@ function RootComponent() { useMatch, useLoaderDeps, useLoaderData, - useLayoutEffect, useBlocker, useNavigate, useParams, @@ -105,7 +100,6 @@ function RootComponent() { useRouterState, useLocation, useCanGoBack, - useStableCallback, useElementScrollRestoration, useTags, Await, @@ -147,7 +141,6 @@ function RootComponent() { void routerState void location void canGoBack - stableCallback() void navigate void scrollEntry void tags diff --git a/e2e/bundle-size/scenarios/react-start-full/src/routes/__root.tsx b/e2e/bundle-size/scenarios/react-start-full/src/routes/__root.tsx index 292383253cb..07fd3a40be2 100644 --- a/e2e/bundle-size/scenarios/react-start-full/src/routes/__root.tsx +++ b/e2e/bundle-size/scenarios/react-start-full/src/routes/__root.tsx @@ -29,7 +29,6 @@ import { useLinkProps, useLoaderData, useLoaderDeps, - useLayoutEffect, useLocation, useMatch, useMatchRoute, @@ -42,7 +41,6 @@ import { useRouter, useRouterState, useSearch, - useStableCallback, useTags, } from '@tanstack/react-router' import { @@ -92,12 +90,10 @@ function RootComponent() { const location = useLocation() const canGoBack = useCanGoBack() const navigate = useNavigate() - const stableCallback = useStableCallback(() => {}) const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) const tags = useTags() const invokeServerFn = useServerFn(helloServerFn) - useLayoutEffect(() => {}, []) useBlocker({ shouldBlockFn: () => false, disabled: true, @@ -120,7 +116,6 @@ function RootComponent() { useMatch, useLoaderDeps, useLoaderData, - useLayoutEffect, useBlocker, useNavigate, useParams, @@ -130,7 +125,6 @@ function RootComponent() { useRouterState, useLocation, useCanGoBack, - useStableCallback, useElementScrollRestoration, useTags, Await, @@ -173,7 +167,6 @@ function RootComponent() { void routerState void location void canGoBack - stableCallback() void navigate void scrollEntry void tags diff --git a/e2e/bundle-size/scenarios/solid-router-full/src/routes/__root.tsx b/e2e/bundle-size/scenarios/solid-router-full/src/routes/__root.tsx index 3b0f7435cb2..f4c29060160 100644 --- a/e2e/bundle-size/scenarios/solid-router-full/src/routes/__root.tsx +++ b/e2e/bundle-size/scenarios/solid-router-full/src/routes/__root.tsx @@ -27,7 +27,6 @@ import { useChildMatches, useElementScrollRestoration, useHydrated, - useLayoutEffect, useLinkProps, useLoaderData, useLoaderDeps, @@ -71,7 +70,6 @@ function RootComponent() { const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) const tags = useTags() - useLayoutEffect(() => {}) useBlocker({ shouldBlockFn: () => false, disabled: true, @@ -93,7 +91,6 @@ function RootComponent() { useMatch, useLoaderDeps, useLoaderData, - useLayoutEffect, useBlocker, useNavigate, useParams, diff --git a/e2e/bundle-size/scenarios/solid-start-full/src/routes/__root.tsx b/e2e/bundle-size/scenarios/solid-start-full/src/routes/__root.tsx index 6a986000ed5..3daa0019c0b 100644 --- a/e2e/bundle-size/scenarios/solid-start-full/src/routes/__root.tsx +++ b/e2e/bundle-size/scenarios/solid-start-full/src/routes/__root.tsx @@ -27,7 +27,6 @@ import { useChildMatches, useElementScrollRestoration, useHydrated, - useLayoutEffect, useLinkProps, useLoaderData, useLoaderDeps, @@ -104,7 +103,6 @@ function RootComponent() { const tags = useTags() const invokeServerFn = useServerFn(helloServerFn) - useLayoutEffect(() => {}) useBlocker({ shouldBlockFn: () => false, disabled: true, @@ -127,7 +125,6 @@ function RootComponent() { useMatch, useLoaderDeps, useLoaderData, - useLayoutEffect, useBlocker, useNavigate, useParams, diff --git a/e2e/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx b/e2e/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx index 77e81f6bbb1..d696063083e 100644 --- a/e2e/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx +++ b/e2e/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx @@ -28,7 +28,6 @@ import { useCanGoBack, useChildMatches, useElementScrollRestoration, - useLayoutEffect, useLinkProps, useLoaderData, useLoaderDeps, @@ -70,7 +69,6 @@ function RootComponent() { const navigate = useNavigate() const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) const tags = useTags() - const layoutEffectRunner = useLayoutEffect(() => {}) useBlocker({ shouldBlockFn: () => false, @@ -92,7 +90,6 @@ function RootComponent() { useMatch, useLoaderDeps, useLoaderData, - useLayoutEffect, useBlocker, useNavigate, useParams, @@ -148,7 +145,6 @@ function RootComponent() { void navigate void scrollEntry void tags() - void layoutEffectRunner void routeMatchResult.value return ( diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 20a7a8cc324..09b93ad1938 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -1,6 +1,5 @@ export { defer, - TSR_DEFERRED_PROMISE, isMatch, joinPaths, cleanPath, @@ -10,7 +9,6 @@ export { resolvePath, interpolatePath, rootRouteId, - defaultSerializeError, defaultParseSearch, defaultStringifySearch, parseSearchWith, @@ -236,7 +234,6 @@ export { export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches' -export { matchContext } from './matchContext' export { Match, Outlet } from './Match' export { useMatch } from './useMatch' @@ -274,13 +271,7 @@ export type { export { createRouter, Router } from './router' -export { - componentTypes, - lazyFn, - SearchParamError, - PathParamError, - getInitialRouterState, -} from '@tanstack/router-core' +export { lazyFn, SearchParamError } from '@tanstack/router-core' export { RouterProvider, RouterContextProvider } from './RouterProvider' export type { RouterProps } from './RouterProvider' @@ -304,11 +295,6 @@ export { useRouterState } from './useRouterState' export { useLocation } from './useLocation' export { useCanGoBack } from './useCanGoBack' -export { - useLayoutEffect, // SSR - useStableCallback, -} from './utils' - export { CatchNotFound, DefaultGlobalNotFound } from './not-found' export { notFound, isNotFound } from '@tanstack/router-core' export type { NotFoundError } from '@tanstack/router-core' diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index bb82dc5a509..d5e93be35ad 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -39,8 +39,6 @@ export type { RequiredToOptions, } from './link' -export { componentTypes } from './load-matches' - export type { RouteToPath, TrailingSlashOptionByRouter, @@ -264,7 +262,6 @@ export type { SearchSerializer, SearchParser } from './searchParams' export type { OptionalStructuralSharing } from './structuralSharing' export { - last, functionalUpdate, replaceEqualDeep, isPlainObject, @@ -272,7 +269,6 @@ export { deepEqual, createControlledPromise, isModuleNotFoundError, - decodePath, DEFAULT_PROTOCOL_ALLOWLIST, escapeHtml, isDangerousProtocol, @@ -440,7 +436,6 @@ export { defaultSerovalPlugins } from './ssr/serializer/seroval-plugins' export { RawStream, - RawStreamSSRPlugin, createRawStreamRPCPlugin, createRawStreamDeserializePlugin, } from './ssr/serializer/RawStream' @@ -450,9 +445,5 @@ export type { RawStreamOptions, } from './ssr/serializer/RawStream' -export { - composeRewrites, - executeRewriteInput, - executeRewriteOutput, -} from './rewrite' +export { composeRewrites, executeRewriteInput } from './rewrite' export type { LocationRewrite, LocationRewriteFunction } from './router' diff --git a/packages/router-core/src/ssr/client.ts b/packages/router-core/src/ssr/client.ts index 91499e22c96..79ed2f1e8a2 100644 --- a/packages/router-core/src/ssr/client.ts +++ b/packages/router-core/src/ssr/client.ts @@ -1,4 +1,4 @@ -export { mergeHeaders, headersInitToObject } from './headers' +export { mergeHeaders } from './headers' export { json } from './json' export type { JsonResponse } from './json' export { hydrate } from './ssr-client' diff --git a/packages/router-core/src/ssr/headers.ts b/packages/router-core/src/ssr/headers.ts index f4094461cee..a31a41c1610 100644 --- a/packages/router-core/src/ssr/headers.ts +++ b/packages/router-core/src/ssr/headers.ts @@ -1,18 +1,6 @@ import { splitSetCookieString } from 'cookie-es' import type { OutgoingHttpHeaders } from 'node:http2' -// A utility function to turn HeadersInit into an object -export function headersInitToObject( - headers: HeadersInit, -): Record { - const obj: Record = {} - const headersInstance = new Headers(headers) - for (const [key, value] of headersInstance.entries()) { - obj[key] = value - } - return obj -} - export type AnyHeaders = | Headers | HeadersInit diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx index a192feceeca..31be74086fd 100644 --- a/packages/solid-router/src/index.tsx +++ b/packages/solid-router/src/index.tsx @@ -1,6 +1,5 @@ export { defer, - TSR_DEFERRED_PROMISE, isMatch, joinPaths, cleanPath, @@ -10,7 +9,6 @@ export { resolvePath, interpolatePath, rootRouteId, - defaultSerializeError, defaultParseSearch, defaultStringifySearch, parseSearchWith, @@ -244,7 +242,6 @@ export { export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches' -export { matchContext } from './matchContext' export { Match, Outlet } from './Match' export { useMatch } from './useMatch' @@ -280,13 +277,7 @@ export type { export { createRouter, Router } from './router' -export { - componentTypes, - lazyFn, - SearchParamError, - PathParamError, - getInitialRouterState, -} from '@tanstack/router-core' +export { lazyFn, SearchParamError } from '@tanstack/router-core' export { RouterProvider, RouterContextProvider } from './RouterProvider' export type { RouterProps } from './RouterProvider' @@ -310,8 +301,6 @@ export { useRouterState } from './useRouterState' export { useLocation } from './useLocation' export { useCanGoBack } from './useCanGoBack' -export { useLayoutEffect } from './utils' - export { CatchNotFound, DefaultGlobalNotFound } from './not-found' export { notFound, isNotFound } from '@tanstack/router-core' export type { NotFoundError } from '@tanstack/router-core' diff --git a/packages/solid-router/src/utils.ts b/packages/solid-router/src/utils.ts index 0049cf3fa41..2f35155cc78 100644 --- a/packages/solid-router/src/utils.ts +++ b/packages/solid-router/src/utils.ts @@ -1,8 +1,5 @@ import * as Solid from 'solid-js' -export const useLayoutEffect = - typeof window !== 'undefined' ? Solid.createRenderEffect : Solid.createEffect - export const usePrevious = (fn: () => boolean) => { return Solid.createMemo( ( diff --git a/packages/vue-router/src/index.tsx b/packages/vue-router/src/index.tsx index c569b8b9420..2e14e349f06 100644 --- a/packages/vue-router/src/index.tsx +++ b/packages/vue-router/src/index.tsx @@ -1,6 +1,5 @@ export { defer, - TSR_DEFERRED_PROMISE, isMatch, joinPaths, cleanPath, @@ -10,7 +9,6 @@ export { resolvePath, interpolatePath, rootRouteId, - defaultSerializeError, defaultParseSearch, defaultStringifySearch, parseSearchWith, @@ -236,7 +234,6 @@ export { export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches' -export { matchContext } from './matchContext' export { Match, Outlet } from './Match' export { useMatch } from './useMatch' @@ -274,13 +271,7 @@ export type { export { createRouter, Router } from './router' -export { - componentTypes, - lazyFn, - SearchParamError, - PathParamError, - getInitialRouterState, -} from '@tanstack/router-core' +export { lazyFn, SearchParamError } from '@tanstack/router-core' export { RouterProvider, RouterContextProvider } from './RouterProvider' export type { RouterProps } from './RouterProvider' @@ -304,8 +295,6 @@ export { useRouterState } from './useRouterState' export { useLocation } from './useLocation' export { useCanGoBack } from './useCanGoBack' -export { useLayoutEffect } from './utils' - export { CatchNotFound, DefaultGlobalNotFound } from './not-found' export { notFound, isNotFound } from '@tanstack/router-core' export type { NotFoundError } from '@tanstack/router-core'