diff --git a/.github/labeler.yml b/.github/labeler.yml index cc81cd4e699..efc0513fa21 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -14,6 +14,28 @@ - 'packages/react-router/**/*' 'package: react-router-with-query': - 'packages/react-router-with-query/**/*' +'package: react-start': + - 'packages/react-start/**/*' +'package: react-start-api-routes': + - 'packages/react-start-api-routes/**/*' +'package: react-start-client': + - 'packages/react-start-client/**/*' +'package: react-start-config': + - 'packages/react-start-config/**/*' +'package: react-start-plugin': + - 'packages/react-start-plugin/**/*' +'package: react-start-router-manifest': + - 'packages/react-start-router-manifest/**/*' +'package: react-start-server': + - 'packages/react-start-server/**/*' +'package: react-start-server-functions-client': + - 'packages/react-start-server-functions-client/**/*' +'package: react-start-server-functions-fetcher': + - 'packages/react-start-server-functions-fetcher/**/*' +'package: react-start-server-functions-handler': + - 'packages/react-start-server-functions-handler/**/*' +'package: react-start-server-functions-ssr': + - 'packages/react-start-server-functions-ssr/**/*' 'package: router-cli': - 'packages/router-cli/**/*' 'package: router-core': @@ -34,28 +56,10 @@ - 'packages/solid-router/**/*' 'package: start': - 'packages/start/**/*' -'package: start-api-routes': - - 'packages/start-api-routes/**/*' -'package: start-client': - - 'packages/start-client/**/*' 'package: start-config': - 'packages/start-config/**/*' -'package: start-plugin': - - 'packages/start-plugin/**/*' -'package: start-router-manifest': - - 'packages/start-router-manifest/**/*' -'package: start-server': - - 'packages/start-server/**/*' -'package: start-server-functions-client': - - 'packages/start-server-functions-client/**/*' -'package: start-server-functions-fetcher': - - 'packages/start-server-functions-fetcher/**/*' -'package: start-server-functions-handler': - - 'packages/start-server-functions-handler/**/*' 'package: start-server-functions-server': - 'packages/start-server-functions-server/**/*' -'package: start-server-functions-ssr': - - 'packages/start-server-functions-ssr/**/*' 'package: valibot-adapter': - 'packages/valibot-adapter/**/*' 'package: virtual-file-routes': diff --git a/e2e/start/basic-auth/app.config.ts b/e2e/start/basic-auth/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/basic-auth/app.config.ts +++ b/e2e/start/basic-auth/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/basic-auth/app/client.tsx b/e2e/start/basic-auth/app/client.tsx index b14d8aac68a..1593d1b3c7b 100644 --- a/e2e/start/basic-auth/app/client.tsx +++ b/e2e/start/basic-auth/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/basic-auth/app/components/Login.tsx b/e2e/start/basic-auth/app/components/Login.tsx index a3cb2ecdba6..b6b6da0c37f 100644 --- a/e2e/start/basic-auth/app/components/Login.tsx +++ b/e2e/start/basic-auth/app/components/Login.tsx @@ -1,5 +1,5 @@ import { useRouter } from '@tanstack/react-router' -import { useServerFn } from '@tanstack/start' +import { useServerFn } from '@tanstack/react-start' import { useMutation } from '../hooks/useMutation' import { loginFn } from '../routes/_authed' import { Auth } from './Auth' diff --git a/e2e/start/basic-auth/app/routes/__root.tsx b/e2e/start/basic-auth/app/routes/__root.tsx index b89ed6de4fb..2aea651ca75 100644 --- a/e2e/start/basic-auth/app/routes/__root.tsx +++ b/e2e/start/basic-auth/app/routes/__root.tsx @@ -6,7 +6,7 @@ import { createRootRoute, } from '@tanstack/react-router' import { TanStackRouterDevtools } from '@tanstack/router-devtools' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import * as React from 'react' import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' diff --git a/e2e/start/basic-auth/app/routes/_authed.tsx b/e2e/start/basic-auth/app/routes/_authed.tsx index d8a208d3c1c..c457cf5e57e 100644 --- a/e2e/start/basic-auth/app/routes/_authed.tsx +++ b/e2e/start/basic-auth/app/routes/_authed.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' diff --git a/e2e/start/basic-auth/app/routes/logout.tsx b/e2e/start/basic-auth/app/routes/logout.tsx index a62168476c2..43a14fa39ac 100644 --- a/e2e/start/basic-auth/app/routes/logout.tsx +++ b/e2e/start/basic-auth/app/routes/logout.tsx @@ -1,5 +1,5 @@ import { createFileRoute, redirect } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import { useAppSession } from '~/utils/session' diff --git a/e2e/start/basic-auth/app/routes/signup.tsx b/e2e/start/basic-auth/app/routes/signup.tsx index fdb46bc3406..5edbb4993ff 100644 --- a/e2e/start/basic-auth/app/routes/signup.tsx +++ b/e2e/start/basic-auth/app/routes/signup.tsx @@ -1,5 +1,5 @@ import { createFileRoute, redirect } from '@tanstack/react-router' -import { createServerFn, useServerFn } from '@tanstack/start' +import { createServerFn, useServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' diff --git a/e2e/start/basic-auth/app/ssr.tsx b/e2e/start/basic-auth/app/ssr.tsx index 62572579acb..65a580f25ee 100644 --- a/e2e/start/basic-auth/app/ssr.tsx +++ b/e2e/start/basic-auth/app/ssr.tsx @@ -1,8 +1,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/basic-auth/app/utils/posts.ts b/e2e/start/basic-auth/app/utils/posts.ts index 4aef92081e4..532e883ac0c 100644 --- a/e2e/start/basic-auth/app/utils/posts.ts +++ b/e2e/start/basic-auth/app/utils/posts.ts @@ -1,5 +1,5 @@ import { notFound } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import axios from 'redaxios' export type PostType = { diff --git a/e2e/start/basic-auth/app/utils/session.ts b/e2e/start/basic-auth/app/utils/session.ts index b4e5fc5bf39..6630e847a3a 100644 --- a/e2e/start/basic-auth/app/utils/session.ts +++ b/e2e/start/basic-auth/app/utils/session.ts @@ -1,5 +1,5 @@ // app/services/session.server.ts -import { useSession } from '@tanstack/start/server' +import { useSession } from '@tanstack/react-start/server' import type { User } from '@prisma/client' type SessionUser = { diff --git a/e2e/start/basic-auth/package.json b/e2e/start/basic-auth/package.json index d7d03daf9f7..73325e216e6 100644 --- a/e2e/start/basic-auth/package.json +++ b/e2e/start/basic-auth/package.json @@ -15,7 +15,7 @@ "@prisma/client": "5.22.0", "@tanstack/react-router": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "prisma": "^5.22.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/e2e/start/basic-react-query/app.config.ts b/e2e/start/basic-react-query/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/basic-react-query/app.config.ts +++ b/e2e/start/basic-react-query/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/basic-react-query/app/api.ts b/e2e/start/basic-react-query/app/api.ts index 0caf78bb9d4..8b9fef16676 100644 --- a/e2e/start/basic-react-query/app/api.ts +++ b/e2e/start/basic-react-query/app/api.ts @@ -1,6 +1,6 @@ import { createStartAPIHandler, defaultAPIFileRouteHandler, -} from '@tanstack/start/api' +} from '@tanstack/react-start/api' export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/start/basic-react-query/app/client.tsx b/e2e/start/basic-react-query/app/client.tsx index 3bfe090a3e4..31385f57f19 100644 --- a/e2e/start/basic-react-query/app/client.tsx +++ b/e2e/start/basic-react-query/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/basic-react-query/app/routes/api.users.ts b/e2e/start/basic-react-query/app/routes/api.users.ts index eed5c438c0d..481085ef3fa 100644 --- a/e2e/start/basic-react-query/app/routes/api.users.ts +++ b/e2e/start/basic-react-query/app/routes/api.users.ts @@ -1,5 +1,5 @@ -import { json } from '@tanstack/start' -import { createAPIFileRoute } from '@tanstack/start/api' +import { json } from '@tanstack/react-start' +import { createAPIFileRoute } from '@tanstack/react-start/api' import axios from 'redaxios' import type { User } from '../utils/users' diff --git a/e2e/start/basic-react-query/app/routes/api/users.$id.ts b/e2e/start/basic-react-query/app/routes/api/users.$id.ts index 8e07779b919..b1797e7917e 100644 --- a/e2e/start/basic-react-query/app/routes/api/users.$id.ts +++ b/e2e/start/basic-react-query/app/routes/api/users.$id.ts @@ -1,5 +1,5 @@ -import { json } from '@tanstack/start' -import { createAPIFileRoute } from '@tanstack/start/api' +import { json } from '@tanstack/react-start' +import { createAPIFileRoute } from '@tanstack/react-start/api' import axios from 'redaxios' import type { User } from '../../utils/users' diff --git a/e2e/start/basic-react-query/app/ssr.tsx b/e2e/start/basic-react-query/app/ssr.tsx index 62572579acb..65a580f25ee 100644 --- a/e2e/start/basic-react-query/app/ssr.tsx +++ b/e2e/start/basic-react-query/app/ssr.tsx @@ -1,8 +1,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/basic-react-query/app/utils/posts.tsx b/e2e/start/basic-react-query/app/utils/posts.tsx index 7f6ae287fe6..4eba71f96da 100644 --- a/e2e/start/basic-react-query/app/utils/posts.tsx +++ b/e2e/start/basic-react-query/app/utils/posts.tsx @@ -1,6 +1,6 @@ import { queryOptions } from '@tanstack/react-query' import { notFound } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import axios from 'redaxios' export type PostType = { diff --git a/e2e/start/basic-react-query/package.json b/e2e/start/basic-react-query/package.json index 7488c9adc31..850b89c6f21 100644 --- a/e2e/start/basic-react-query/package.json +++ b/e2e/start/basic-react-query/package.json @@ -16,7 +16,7 @@ "@tanstack/react-router": "workspace:^", "@tanstack/react-router-with-query": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/e2e/start/basic-rsc/app.config.ts b/e2e/start/basic-rsc/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/basic-rsc/app.config.ts +++ b/e2e/start/basic-rsc/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/basic-rsc/app/client.tsx b/e2e/start/basic-rsc/app/client.tsx index 3bfe090a3e4..31385f57f19 100644 --- a/e2e/start/basic-rsc/app/client.tsx +++ b/e2e/start/basic-rsc/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/basic-rsc/app/routes/posts.$postId.tsx b/e2e/start/basic-rsc/app/routes/posts.$postId.tsx index c2d77db3a16..7dd63a2cd0a 100644 --- a/e2e/start/basic-rsc/app/routes/posts.$postId.tsx +++ b/e2e/start/basic-rsc/app/routes/posts.$postId.tsx @@ -1,5 +1,5 @@ import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import type { ErrorComponentProps } from '@tanstack/react-router' import { fetchPost } from '~/utils/posts' diff --git a/e2e/start/basic-rsc/app/routes/posts.tsx b/e2e/start/basic-rsc/app/routes/posts.tsx index 1e0be42f756..a3ef2a2e200 100644 --- a/e2e/start/basic-rsc/app/routes/posts.tsx +++ b/e2e/start/basic-rsc/app/routes/posts.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn, renderRsc } from '@tanstack/start' +import { createServerFn, renderRsc } from '@tanstack/react-start' import { renderPosts } from '~/utils/renderPosts' export const serverRenderPosts = createServerFn({ method: 'GET' }).handler( diff --git a/e2e/start/basic-rsc/app/ssr.tsx b/e2e/start/basic-rsc/app/ssr.tsx index 62572579acb..65a580f25ee 100644 --- a/e2e/start/basic-rsc/app/ssr.tsx +++ b/e2e/start/basic-rsc/app/ssr.tsx @@ -1,8 +1,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/basic-rsc/app/utils/posts.tsx b/e2e/start/basic-rsc/app/utils/posts.tsx index b2a8acc6343..16fc1744e6e 100644 --- a/e2e/start/basic-rsc/app/utils/posts.tsx +++ b/e2e/start/basic-rsc/app/utils/posts.tsx @@ -1,5 +1,5 @@ // import { notFound } from '@tanstack/react-router' -// import { createServerFn } from '@tanstack/start' +// import { createServerFn } from '@tanstack/react-start' import axios from 'redaxios' export type PostType = { diff --git a/e2e/start/basic-rsc/package.json b/e2e/start/basic-rsc/package.json index d0dc1b7f166..2db99d7660d 100644 --- a/e2e/start/basic-rsc/package.json +++ b/e2e/start/basic-rsc/package.json @@ -12,7 +12,7 @@ "@babel/plugin-syntax-typescript": "^7.25.9", "@tanstack/react-router": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/e2e/start/basic-tsr-config/app.config.ts b/e2e/start/basic-tsr-config/app.config.ts index 257f60c11bd..8989703df9a 100644 --- a/e2e/start/basic-tsr-config/app.config.ts +++ b/e2e/start/basic-tsr-config/app.config.ts @@ -1,5 +1,5 @@ // app.config.ts -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' export default defineConfig({ tsr: { diff --git a/e2e/start/basic-tsr-config/package.json b/e2e/start/basic-tsr-config/package.json index e6dce0c481a..9dcb3b6db56 100644 --- a/e2e/start/basic-tsr-config/package.json +++ b/e2e/start/basic-tsr-config/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@tanstack/react-router": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "vinxi": "0.5.3" diff --git a/e2e/start/basic-tsr-config/src/app/client.tsx b/e2e/start/basic-tsr-config/src/app/client.tsx index b14d8aac68a..1593d1b3c7b 100644 --- a/e2e/start/basic-tsr-config/src/app/client.tsx +++ b/e2e/start/basic-tsr-config/src/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/basic-tsr-config/src/app/routes/index.tsx b/e2e/start/basic-tsr-config/src/app/routes/index.tsx index 47b32632371..629a558953c 100644 --- a/e2e/start/basic-tsr-config/src/app/routes/index.tsx +++ b/e2e/start/basic-tsr-config/src/app/routes/index.tsx @@ -1,5 +1,5 @@ import { createFileRoute, useRouter } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' let count = 0 diff --git a/e2e/start/basic-tsr-config/src/app/ssr.tsx b/e2e/start/basic-tsr-config/src/app/ssr.tsx index f2d33f90308..8981a9a3383 100644 --- a/e2e/start/basic-tsr-config/src/app/ssr.tsx +++ b/e2e/start/basic-tsr-config/src/app/ssr.tsx @@ -2,8 +2,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/basic/app.config.ts b/e2e/start/basic/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/basic/app.config.ts +++ b/e2e/start/basic/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/basic/app/api.ts b/e2e/start/basic/app/api.ts index 0caf78bb9d4..8b9fef16676 100644 --- a/e2e/start/basic/app/api.ts +++ b/e2e/start/basic/app/api.ts @@ -1,6 +1,6 @@ import { createStartAPIHandler, defaultAPIFileRouteHandler, -} from '@tanstack/start/api' +} from '@tanstack/react-start/api' export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/start/basic/app/client.tsx b/e2e/start/basic/app/client.tsx index b14d8aac68a..1593d1b3c7b 100644 --- a/e2e/start/basic/app/client.tsx +++ b/e2e/start/basic/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/basic/app/components/RedirectOnClick.tsx b/e2e/start/basic/app/components/RedirectOnClick.tsx index ec7445df5a2..37b434c2e7d 100644 --- a/e2e/start/basic/app/components/RedirectOnClick.tsx +++ b/e2e/start/basic/app/components/RedirectOnClick.tsx @@ -1,4 +1,4 @@ -import { useServerFn } from '@tanstack/start' +import { useServerFn } from '@tanstack/react-start' import { throwRedirect } from './throwRedirect' interface RedirectOnClickProps { diff --git a/e2e/start/basic/app/components/throwRedirect.ts b/e2e/start/basic/app/components/throwRedirect.ts index 9cef423d233..514ab2543f1 100644 --- a/e2e/start/basic/app/components/throwRedirect.ts +++ b/e2e/start/basic/app/components/throwRedirect.ts @@ -1,5 +1,5 @@ import { redirect } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' export const throwRedirect = createServerFn() .validator( diff --git a/e2e/start/basic/app/routes/api.users.ts b/e2e/start/basic/app/routes/api.users.ts index 74b4ad35ba3..4f1902fd713 100644 --- a/e2e/start/basic/app/routes/api.users.ts +++ b/e2e/start/basic/app/routes/api.users.ts @@ -1,5 +1,5 @@ -import { json } from '@tanstack/start' -import { createAPIFileRoute } from '@tanstack/start/api' +import { json } from '@tanstack/react-start' +import { createAPIFileRoute } from '@tanstack/react-start/api' import axios from 'redaxios' import type { User } from '~/utils/users' diff --git a/e2e/start/basic/app/routes/api/users.$id.ts b/e2e/start/basic/app/routes/api/users.$id.ts index 2cfe2322ef5..5d62576c65a 100644 --- a/e2e/start/basic/app/routes/api/users.$id.ts +++ b/e2e/start/basic/app/routes/api/users.$id.ts @@ -1,5 +1,5 @@ -import { json } from '@tanstack/start' -import { createAPIFileRoute } from '@tanstack/start/api' +import { json } from '@tanstack/react-start' +import { createAPIFileRoute } from '@tanstack/react-start/api' import axios from 'redaxios' import type { User } from '~/utils/users' diff --git a/e2e/start/basic/app/routes/deferred.tsx b/e2e/start/basic/app/routes/deferred.tsx index ae649517167..a6bd45f8c25 100644 --- a/e2e/start/basic/app/routes/deferred.tsx +++ b/e2e/start/basic/app/routes/deferred.tsx @@ -1,5 +1,5 @@ import { Await, createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import { Suspense, useState } from 'react' const personServerFn = createServerFn({ method: 'GET' }) diff --git a/e2e/start/basic/app/ssr.tsx b/e2e/start/basic/app/ssr.tsx index 62572579acb..65a580f25ee 100644 --- a/e2e/start/basic/app/ssr.tsx +++ b/e2e/start/basic/app/ssr.tsx @@ -1,8 +1,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/basic/app/utils/posts.tsx b/e2e/start/basic/app/utils/posts.tsx index bf139e0ac88..9fdff27673c 100644 --- a/e2e/start/basic/app/utils/posts.tsx +++ b/e2e/start/basic/app/utils/posts.tsx @@ -1,5 +1,5 @@ import { notFound } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import axios from 'redaxios' export type PostType = { diff --git a/e2e/start/basic/package.json b/e2e/start/basic/package.json index cace9fdc3ea..cd17cc45305 100644 --- a/e2e/start/basic/package.json +++ b/e2e/start/basic/package.json @@ -13,7 +13,7 @@ "dependencies": { "@tanstack/react-router": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/e2e/start/clerk-basic/app.config.ts b/e2e/start/clerk-basic/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/clerk-basic/app.config.ts +++ b/e2e/start/clerk-basic/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/clerk-basic/app/client.tsx b/e2e/start/clerk-basic/app/client.tsx index 3bfe090a3e4..31385f57f19 100644 --- a/e2e/start/clerk-basic/app/client.tsx +++ b/e2e/start/clerk-basic/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/clerk-basic/app/routes/__root.tsx b/e2e/start/clerk-basic/app/routes/__root.tsx index 3da31d926ee..838b4445286 100644 --- a/e2e/start/clerk-basic/app/routes/__root.tsx +++ b/e2e/start/clerk-basic/app/routes/__root.tsx @@ -14,10 +14,10 @@ import { UserButton, } from '@clerk/tanstack-start' import { TanStackRouterDevtools } from '@tanstack/router-devtools' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import * as React from 'react' import { getAuth } from '@clerk/tanstack-start/server' -import { getWebRequest } from '@tanstack/start/server' +import { getWebRequest } from '@tanstack/react-start/server' import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' diff --git a/e2e/start/clerk-basic/app/ssr.tsx b/e2e/start/clerk-basic/app/ssr.tsx index 73d185feedc..ef5ba0bc956 100644 --- a/e2e/start/clerk-basic/app/ssr.tsx +++ b/e2e/start/clerk-basic/app/ssr.tsx @@ -1,8 +1,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createClerkHandler } from '@clerk/tanstack-start/server' import { createRouter } from './router' diff --git a/e2e/start/clerk-basic/app/utils/posts.ts b/e2e/start/clerk-basic/app/utils/posts.ts index 4aef92081e4..532e883ac0c 100644 --- a/e2e/start/clerk-basic/app/utils/posts.ts +++ b/e2e/start/clerk-basic/app/utils/posts.ts @@ -1,5 +1,5 @@ import { notFound } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import axios from 'redaxios' export type PostType = { diff --git a/e2e/start/clerk-basic/package.json b/e2e/start/clerk-basic/package.json index 9260602577c..77966775036 100644 --- a/e2e/start/clerk-basic/package.json +++ b/e2e/start/clerk-basic/package.json @@ -14,7 +14,7 @@ "@clerk/tanstack-start": "^0.9.4", "@tanstack/react-router": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/e2e/start/scroll-restoration/app.config.ts b/e2e/start/scroll-restoration/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/scroll-restoration/app.config.ts +++ b/e2e/start/scroll-restoration/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/scroll-restoration/app/api.ts b/e2e/start/scroll-restoration/app/api.ts index 0caf78bb9d4..8b9fef16676 100644 --- a/e2e/start/scroll-restoration/app/api.ts +++ b/e2e/start/scroll-restoration/app/api.ts @@ -1,6 +1,6 @@ import { createStartAPIHandler, defaultAPIFileRouteHandler, -} from '@tanstack/start/api' +} from '@tanstack/react-start/api' export default createStartAPIHandler(defaultAPIFileRouteHandler) diff --git a/e2e/start/scroll-restoration/app/client.tsx b/e2e/start/scroll-restoration/app/client.tsx index b14d8aac68a..1593d1b3c7b 100644 --- a/e2e/start/scroll-restoration/app/client.tsx +++ b/e2e/start/scroll-restoration/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/scroll-restoration/app/ssr.tsx b/e2e/start/scroll-restoration/app/ssr.tsx index 62572579acb..65a580f25ee 100644 --- a/e2e/start/scroll-restoration/app/ssr.tsx +++ b/e2e/start/scroll-restoration/app/ssr.tsx @@ -1,8 +1,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/scroll-restoration/package.json b/e2e/start/scroll-restoration/package.json index 746a017f91e..9744f91d863 100644 --- a/e2e/start/scroll-restoration/package.json +++ b/e2e/start/scroll-restoration/package.json @@ -13,7 +13,7 @@ "dependencies": { "@tanstack/react-router": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "@tanstack/zod-adapter": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/e2e/start/server-functions/app.config.ts b/e2e/start/server-functions/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/server-functions/app.config.ts +++ b/e2e/start/server-functions/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/server-functions/app/client.tsx b/e2e/start/server-functions/app/client.tsx index b14d8aac68a..1593d1b3c7b 100644 --- a/e2e/start/server-functions/app/client.tsx +++ b/e2e/start/server-functions/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/server-functions/app/routes/abort-signal.tsx b/e2e/start/server-functions/app/routes/abort-signal.tsx index d44baf1ba46..7de90f3143a 100644 --- a/e2e/start/server-functions/app/routes/abort-signal.tsx +++ b/e2e/start/server-functions/app/routes/abort-signal.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import React from 'react' export const Route = createFileRoute('/abort-signal')({ diff --git a/e2e/start/server-functions/app/routes/consistent.tsx b/e2e/start/server-functions/app/routes/consistent.tsx index 88a794a1783..64a919da7e8 100644 --- a/e2e/start/server-functions/app/routes/consistent.tsx +++ b/e2e/start/server-functions/app/routes/consistent.tsx @@ -1,6 +1,6 @@ import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' /** * This checks whether the returned payloads from a diff --git a/e2e/start/server-functions/app/routes/cookies/set.tsx b/e2e/start/server-functions/app/routes/cookies/set.tsx index 261a284deab..fd9e979ab96 100644 --- a/e2e/start/server-functions/app/routes/cookies/set.tsx +++ b/e2e/start/server-functions/app/routes/cookies/set.tsx @@ -1,6 +1,6 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' -import { setCookie } from '@tanstack/start/server' +import { createServerFn } from '@tanstack/react-start' +import { setCookie } from '@tanstack/react-start/server' import { z } from 'zod' import Cookies from 'js-cookie' import React, { useEffect } from 'react' diff --git a/e2e/start/server-functions/app/routes/dead-code-preserve.tsx b/e2e/start/server-functions/app/routes/dead-code-preserve.tsx index c2ee1dda082..46273c59e3c 100644 --- a/e2e/start/server-functions/app/routes/dead-code-preserve.tsx +++ b/e2e/start/server-functions/app/routes/dead-code-preserve.tsx @@ -1,6 +1,6 @@ import * as fs from 'node:fs' -import { createServerFn } from '@tanstack/start' -import { getRequestHeader } from '@tanstack/start/server' +import { createServerFn } from '@tanstack/react-start' +import { getRequestHeader } from '@tanstack/react-start/server' import { useState } from 'react' import { createFileRoute } from '@tanstack/react-router' diff --git a/e2e/start/server-functions/app/routes/env-only.tsx b/e2e/start/server-functions/app/routes/env-only.tsx index 50e4da87e51..fe5ae8c1e81 100644 --- a/e2e/start/server-functions/app/routes/env-only.tsx +++ b/e2e/start/server-functions/app/routes/env-only.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { clientOnly, createServerFn, serverOnly } from '@tanstack/start' +import { clientOnly, createServerFn, serverOnly } from '@tanstack/react-start' import { useState } from 'react' const serverEcho = serverOnly((input: string) => 'server got: ' + input) diff --git a/e2e/start/server-functions/app/routes/headers.tsx b/e2e/start/server-functions/app/routes/headers.tsx index 458a963bc95..0b0f1ff7bc4 100644 --- a/e2e/start/server-functions/app/routes/headers.tsx +++ b/e2e/start/server-functions/app/routes/headers.tsx @@ -1,8 +1,8 @@ import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -import { createServerFn } from '@tanstack/start' -import { getHeaders, setHeader } from '@tanstack/start/server' -import type { HTTPHeaderName } from '@tanstack/start/server' +import { createServerFn } from '@tanstack/react-start' +import { getHeaders, setHeader } from '@tanstack/react-start/server' +import type { HTTPHeaderName } from '@tanstack/react-start/server' export const Route = createFileRoute('/headers')({ loader: async () => { diff --git a/e2e/start/server-functions/app/routes/isomorphic-fns.tsx b/e2e/start/server-functions/app/routes/isomorphic-fns.tsx index df03eeb53e1..2c7bbc4a8fa 100644 --- a/e2e/start/server-functions/app/routes/isomorphic-fns.tsx +++ b/e2e/start/server-functions/app/routes/isomorphic-fns.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { createIsomorphicFn, createServerFn } from '@tanstack/start' +import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' import { useState } from 'react' const getEnv = createIsomorphicFn() diff --git a/e2e/start/server-functions/app/routes/multipart.tsx b/e2e/start/server-functions/app/routes/multipart.tsx index 92a5cd91222..a80ca0f1cd1 100644 --- a/e2e/start/server-functions/app/routes/multipart.tsx +++ b/e2e/start/server-functions/app/routes/multipart.tsx @@ -1,6 +1,6 @@ import { createFileRoute } from '@tanstack/react-router' import * as React from 'react' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' export const Route = createFileRoute('/multipart')({ component: MultipartServerFnCall, diff --git a/e2e/start/server-functions/app/routes/return-null.tsx b/e2e/start/server-functions/app/routes/return-null.tsx index 9526d02d57c..6d83d2762ff 100644 --- a/e2e/start/server-functions/app/routes/return-null.tsx +++ b/e2e/start/server-functions/app/routes/return-null.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import * as React from 'react' /** diff --git a/e2e/start/server-functions/app/routes/serialize-form-data.tsx b/e2e/start/server-functions/app/routes/serialize-form-data.tsx index c91099a232d..901a22fdc09 100644 --- a/e2e/start/server-functions/app/routes/serialize-form-data.tsx +++ b/e2e/start/server-functions/app/routes/serialize-form-data.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' export const Route = createFileRoute('/serialize-form-data')({ component: SerializeFormDataFnCall, diff --git a/e2e/start/server-functions/app/routes/status.tsx b/e2e/start/server-functions/app/routes/status.tsx index 59c961c74d1..b8dcdee2e65 100644 --- a/e2e/start/server-functions/app/routes/status.tsx +++ b/e2e/start/server-functions/app/routes/status.tsx @@ -1,6 +1,6 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn, useServerFn } from '@tanstack/start' -import { setResponseStatus } from '@tanstack/start/server' +import { createServerFn, useServerFn } from '@tanstack/react-start' +import { setResponseStatus } from '@tanstack/react-start/server' const helloFn = createServerFn().handler(() => { setResponseStatus(225, `hello`) diff --git a/e2e/start/server-functions/app/routes/submit-post-formdata.tsx b/e2e/start/server-functions/app/routes/submit-post-formdata.tsx index bf59c2bfbcb..4369239a055 100644 --- a/e2e/start/server-functions/app/routes/submit-post-formdata.tsx +++ b/e2e/start/server-functions/app/routes/submit-post-formdata.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' export const Route = createFileRoute('/submit-post-formdata')({ component: SubmitPostFormDataFn, diff --git a/e2e/start/server-functions/app/ssr.tsx b/e2e/start/server-functions/app/ssr.tsx index 62572579acb..65a580f25ee 100644 --- a/e2e/start/server-functions/app/ssr.tsx +++ b/e2e/start/server-functions/app/ssr.tsx @@ -1,8 +1,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/server-functions/package.json b/e2e/start/server-functions/package.json index d454ef31524..097d0d05d4b 100644 --- a/e2e/start/server-functions/package.json +++ b/e2e/start/server-functions/package.json @@ -13,7 +13,7 @@ "dependencies": { "@tanstack/react-router": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "js-cookie": "^3.0.5", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/e2e/start/website/app.config.ts b/e2e/start/website/app.config.ts index 732f04eabe7..346ac633901 100644 --- a/e2e/start/website/app.config.ts +++ b/e2e/start/website/app.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from '@tanstack/react-start/config' import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ diff --git a/e2e/start/website/app/client.tsx b/e2e/start/website/app/client.tsx index 3bfe090a3e4..31385f57f19 100644 --- a/e2e/start/website/app/client.tsx +++ b/e2e/start/website/app/client.tsx @@ -1,6 +1,6 @@ /// import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' +import { StartClient } from '@tanstack/react-start' import { createRouter } from './router' const router = createRouter() diff --git a/e2e/start/website/app/server/document.tsx b/e2e/start/website/app/server/document.tsx index bc73cbed1fd..0f8372b2516 100644 --- a/e2e/start/website/app/server/document.tsx +++ b/e2e/start/website/app/server/document.tsx @@ -1,5 +1,5 @@ import { notFound } from '@tanstack/react-router' -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' const documents: Array<{ id: string; title: string; content: string }> = [ { diff --git a/e2e/start/website/app/server/projects.tsx b/e2e/start/website/app/server/projects.tsx index a1fa182a454..11e75e2b22f 100644 --- a/e2e/start/website/app/server/projects.tsx +++ b/e2e/start/website/app/server/projects.tsx @@ -1,4 +1,4 @@ -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import { notFound } from '@tanstack/react-router' import { capitalize } from '~/utils/seo' diff --git a/e2e/start/website/app/ssr.tsx b/e2e/start/website/app/ssr.tsx index f2d33f90308..8981a9a3383 100644 --- a/e2e/start/website/app/ssr.tsx +++ b/e2e/start/website/app/ssr.tsx @@ -2,8 +2,8 @@ import { createStartHandler, defaultStreamHandler, -} from '@tanstack/start/server' -import { getRouterManifest } from '@tanstack/start/router-manifest' +} from '@tanstack/react-start/server' +import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' diff --git a/e2e/start/website/package.json b/e2e/start/website/package.json index 7b089f155f3..43d05050a27 100644 --- a/e2e/start/website/package.json +++ b/e2e/start/website/package.json @@ -13,7 +13,7 @@ "dependencies": { "@tanstack/react-router": "workspace:^", "@tanstack/router-devtools": "workspace:^", - "@tanstack/start": "workspace:^", + "@tanstack/react-start": "workspace:^", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/package.json b/package.json index 2ad958c63f1..6f81352c5a6 100644 --- a/package.json +++ b/package.json @@ -89,18 +89,18 @@ "@tanstack/zod-adapter": "workspace:*", "@tanstack/valibot-adapter": "workspace:*", "@tanstack/arktype-adapter": "workspace:*", - "@tanstack/start": "workspace:*", - "@tanstack/start-client": "workspace:*", - "@tanstack/start-server": "workspace:*", - "@tanstack/start-api-routes": "workspace:*", - "@tanstack/start-server-functions-fetcher": "workspace:*", - "@tanstack/start-server-functions-handler": "workspace:*", - "@tanstack/start-server-functions-client": "workspace:*", - "@tanstack/start-server-functions-ssr": "workspace:*", + "@tanstack/react-start": "workspace:*", + "@tanstack/react-start-client": "workspace:*", + "@tanstack/react-start-server": "workspace:*", + "@tanstack/react-start-api-routes": "workspace:*", + "@tanstack/react-start-server-functions-fetcher": "workspace:*", + "@tanstack/react-start-server-functions-handler": "workspace:*", + "@tanstack/react-start-server-functions-client": "workspace:*", + "@tanstack/react-start-server-functions-ssr": "workspace:*", "@tanstack/start-server-functions-server": "workspace:*", - "@tanstack/start-router-manifest": "workspace:*", - "@tanstack/start-config": "workspace:*", - "@tanstack/start-plugin": "workspace:*", + "@tanstack/react-start-router-manifest": "workspace:*", + "@tanstack/react-start-config": "workspace:*", + "@tanstack/react-start-plugin": "workspace:*", "@tanstack/eslint-plugin-router": "workspace:*", "@tanstack/server-functions-plugin": "workspace:*", "@tanstack/directive-functions-plugin": "workspace:*", diff --git a/packages/start-api-routes/README.md b/packages/react-start-api-routes/README.md similarity index 100% rename from packages/start-api-routes/README.md rename to packages/react-start-api-routes/README.md diff --git a/packages/start-api-routes/eslint.config.js b/packages/react-start-api-routes/eslint.config.js similarity index 100% rename from packages/start-api-routes/eslint.config.js rename to packages/react-start-api-routes/eslint.config.js diff --git a/packages/start-api-routes/package.json b/packages/react-start-api-routes/package.json similarity index 91% rename from packages/start-api-routes/package.json rename to packages/react-start-api-routes/package.json index 38862488205..a8b6c728202 100644 --- a/packages/start-api-routes/package.json +++ b/packages/react-start-api-routes/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-api-routes", - "version": "1.111.9", + "name": "@tanstack/react-start-api-routes", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-api-routes" }, "homepage": "https://tanstack.com/start", "funding": { @@ -63,7 +63,7 @@ }, "dependencies": { "@tanstack/router-core": "workspace:^", - "@tanstack/start-server": "workspace:^", + "@tanstack/react-start-server": "workspace:^", "vinxi": "0.5.3" }, "devDependencies": { diff --git a/packages/start-api-routes/src/index.ts b/packages/react-start-api-routes/src/index.ts similarity index 97% rename from packages/start-api-routes/src/index.ts rename to packages/react-start-api-routes/src/index.ts index 128f474d063..9ee1fc8ac1e 100644 --- a/packages/start-api-routes/src/index.ts +++ b/packages/react-start-api-routes/src/index.ts @@ -1,4 +1,4 @@ -import { eventHandler, toWebRequest } from '@tanstack/start-server' +import { eventHandler, toWebRequest } from '@tanstack/react-start-server' import vinxiFileRoutes from 'vinxi/routes' import type { ResolveParams } from '@tanstack/router-core' @@ -150,7 +150,7 @@ function findRoute( * @example * ```ts * // app/foo.ts - * import { createAPIRoute } from '@tanstack/start-api-routes' + * import { createAPIRoute } from '@tanstack/react-start-api-routes' * const fooBarRoute = createAPIRoute('/api/foo/$bar')({ * GET: ({ params }) => { * return new Response(JSON.stringify({ params })) @@ -161,7 +161,7 @@ function findRoute( * import { * createStartAPIHandler, * defaultAPIRoutesHandler - * } from '@tanstack/start-api-routes' + * } from '@tanstack/react-start-api-routes' * * export default createStartAPIHandler( * defaultAPIRoutesHandler({ @@ -305,7 +305,7 @@ function toTSRFileBasedRoutes( * import { * createStartAPIHandler, * defaultAPIFileRouteHandler - * } from '@tanstack/start-api-routes' + * } from '@tanstack/react-start-api-routes' * * export default createStartAPIHandler(defaultAPIFileRouteHandler) * ``` diff --git a/packages/start-api-routes/tsconfig.json b/packages/react-start-api-routes/tsconfig.json similarity index 100% rename from packages/start-api-routes/tsconfig.json rename to packages/react-start-api-routes/tsconfig.json diff --git a/packages/start-api-routes/vite.config.ts b/packages/react-start-api-routes/vite.config.ts similarity index 100% rename from packages/start-api-routes/vite.config.ts rename to packages/react-start-api-routes/vite.config.ts diff --git a/packages/start-client/README.md b/packages/react-start-client/README.md similarity index 100% rename from packages/start-client/README.md rename to packages/react-start-client/README.md diff --git a/packages/start-client/eslint.config.js b/packages/react-start-client/eslint.config.js similarity index 100% rename from packages/start-client/eslint.config.js rename to packages/react-start-client/eslint.config.js diff --git a/packages/start-client/package.json b/packages/react-start-client/package.json similarity index 95% rename from packages/start-client/package.json rename to packages/react-start-client/package.json index 1af6bbcd428..caa594b6dfc 100644 --- a/packages/start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-client", - "version": "1.111.9", + "name": "@tanstack/react-start-client", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-client" }, "homepage": "https://tanstack.com/start", "funding": { diff --git a/packages/start-client/src/Meta.tsx b/packages/react-start-client/src/Meta.tsx similarity index 100% rename from packages/start-client/src/Meta.tsx rename to packages/react-start-client/src/Meta.tsx diff --git a/packages/start-client/src/Scripts.tsx b/packages/react-start-client/src/Scripts.tsx similarity index 100% rename from packages/start-client/src/Scripts.tsx rename to packages/react-start-client/src/Scripts.tsx diff --git a/packages/start-client/src/StartClient.tsx b/packages/react-start-client/src/StartClient.tsx similarity index 100% rename from packages/start-client/src/StartClient.tsx rename to packages/react-start-client/src/StartClient.tsx diff --git a/packages/start-client/src/createIsomorphicFn.ts b/packages/react-start-client/src/createIsomorphicFn.ts similarity index 100% rename from packages/start-client/src/createIsomorphicFn.ts rename to packages/react-start-client/src/createIsomorphicFn.ts diff --git a/packages/start-client/src/createMiddleware.ts b/packages/react-start-client/src/createMiddleware.ts similarity index 100% rename from packages/start-client/src/createMiddleware.ts rename to packages/react-start-client/src/createMiddleware.ts diff --git a/packages/start-client/src/createServerFn.ts b/packages/react-start-client/src/createServerFn.ts similarity index 100% rename from packages/start-client/src/createServerFn.ts rename to packages/react-start-client/src/createServerFn.ts diff --git a/packages/start-client/src/envOnly.ts b/packages/react-start-client/src/envOnly.ts similarity index 100% rename from packages/start-client/src/envOnly.ts rename to packages/react-start-client/src/envOnly.ts diff --git a/packages/start-client/src/headers.ts b/packages/react-start-client/src/headers.ts similarity index 100% rename from packages/start-client/src/headers.ts rename to packages/react-start-client/src/headers.ts diff --git a/packages/start-client/src/index.tsx b/packages/react-start-client/src/index.tsx similarity index 100% rename from packages/start-client/src/index.tsx rename to packages/react-start-client/src/index.tsx diff --git a/packages/start-client/src/json.ts b/packages/react-start-client/src/json.ts similarity index 100% rename from packages/start-client/src/json.ts rename to packages/react-start-client/src/json.ts diff --git a/packages/start-client/src/registerGlobalMiddleware.ts b/packages/react-start-client/src/registerGlobalMiddleware.ts similarity index 100% rename from packages/start-client/src/registerGlobalMiddleware.ts rename to packages/react-start-client/src/registerGlobalMiddleware.ts diff --git a/packages/start-client/src/renderRSC.tsx b/packages/react-start-client/src/renderRSC.tsx similarity index 100% rename from packages/start-client/src/renderRSC.tsx rename to packages/react-start-client/src/renderRSC.tsx diff --git a/packages/start-client/src/routesManifest.ts b/packages/react-start-client/src/routesManifest.ts similarity index 100% rename from packages/start-client/src/routesManifest.ts rename to packages/react-start-client/src/routesManifest.ts diff --git a/packages/start-client/src/serializer.ts b/packages/react-start-client/src/serializer.ts similarity index 100% rename from packages/start-client/src/serializer.ts rename to packages/react-start-client/src/serializer.ts diff --git a/packages/start-client/src/ssr-client.tsx b/packages/react-start-client/src/ssr-client.tsx similarity index 100% rename from packages/start-client/src/ssr-client.tsx rename to packages/react-start-client/src/ssr-client.tsx diff --git a/packages/start-client/src/tests/createIsomorphicFn.test-d.ts b/packages/react-start-client/src/tests/createIsomorphicFn.test-d.ts similarity index 100% rename from packages/start-client/src/tests/createIsomorphicFn.test-d.ts rename to packages/react-start-client/src/tests/createIsomorphicFn.test-d.ts diff --git a/packages/start-client/src/tests/createServerFn.test-d.tsx b/packages/react-start-client/src/tests/createServerFn.test-d.tsx similarity index 100% rename from packages/start-client/src/tests/createServerFn.test-d.tsx rename to packages/react-start-client/src/tests/createServerFn.test-d.tsx diff --git a/packages/start-client/src/tests/createServerMiddleware.test-d.ts b/packages/react-start-client/src/tests/createServerMiddleware.test-d.ts similarity index 100% rename from packages/start-client/src/tests/createServerMiddleware.test-d.ts rename to packages/react-start-client/src/tests/createServerMiddleware.test-d.ts diff --git a/packages/start-client/src/tests/envOnly.test-d.ts b/packages/react-start-client/src/tests/envOnly.test-d.ts similarity index 100% rename from packages/start-client/src/tests/envOnly.test-d.ts rename to packages/react-start-client/src/tests/envOnly.test-d.ts diff --git a/packages/start-client/src/tests/json.test.ts b/packages/react-start-client/src/tests/json.test.ts similarity index 100% rename from packages/start-client/src/tests/json.test.ts rename to packages/react-start-client/src/tests/json.test.ts diff --git a/packages/start-client/src/tests/transformer.test.tsx b/packages/react-start-client/src/tests/transformer.test.tsx similarity index 100% rename from packages/start-client/src/tests/transformer.test.tsx rename to packages/react-start-client/src/tests/transformer.test.tsx diff --git a/packages/start-client/src/useServerFn.ts b/packages/react-start-client/src/useServerFn.ts similarity index 100% rename from packages/start-client/src/useServerFn.ts rename to packages/react-start-client/src/useServerFn.ts diff --git a/packages/start-client/tsconfig.json b/packages/react-start-client/tsconfig.json similarity index 100% rename from packages/start-client/tsconfig.json rename to packages/react-start-client/tsconfig.json diff --git a/packages/start-client/vite.config.ts b/packages/react-start-client/vite.config.ts similarity index 100% rename from packages/start-client/vite.config.ts rename to packages/react-start-client/vite.config.ts diff --git a/packages/start-router-manifest/README.md b/packages/react-start-config/README.md similarity index 100% rename from packages/start-router-manifest/README.md rename to packages/react-start-config/README.md diff --git a/packages/start-router-manifest/eslint.config.js b/packages/react-start-config/eslint.config.js similarity index 100% rename from packages/start-router-manifest/eslint.config.js rename to packages/react-start-config/eslint.config.js diff --git a/packages/react-start-config/package.json b/packages/react-start-config/package.json new file mode 100644 index 00000000000..9fe14aec0d4 --- /dev/null +++ b/packages/react-start-config/package.json @@ -0,0 +1,73 @@ +{ + "name": "@tanstack/react-start-config", + "version": "1.111.7", + "description": "Modern and scalable routing for React applications", + "author": "Tanner Linsley", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/TanStack/router.git", + "directory": "packages/react-start-config" + }, + "homepage": "https://tanstack.com/start", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "keywords": [ + "react", + "location", + "router", + "routing", + "async", + "async router", + "typescript" + ], + "scripts": { + "clean": "rimraf ./dist && rimraf ./coverage", + "build": "tsc", + "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", + "test:unit": "exit 0;vitest", + "test:eslint": "eslint ./src", + "test:types": "exit 0; vitest" + }, + "type": "module", + "types": "dist/esm/index.d.ts", + "exports": { + ".": { + "import": { + "types": "./dist/esm/index.d.ts", + "default": "./dist/esm/index.js" + } + }, + "./package.json": "./package.json" + }, + "sideEffects": false, + "files": [ + "dist", + "src" + ], + "engines": { + "node": ">=12" + }, + "dependencies": { + "@tanstack/react-router": "workspace:^", + "@tanstack/router-generator": "workspace:^", + "@tanstack/router-plugin": "workspace:^", + "@tanstack/server-functions-plugin": "workspace:^", + "@tanstack/react-start-plugin": "workspace:^", + "@tanstack/react-start-server-functions-handler": "workspace:^", + "@vitejs/plugin-react": "^4.3.4", + "import-meta-resolve": "^4.1.0", + "nitropack": "^2.10.4", + "ofetch": "^1.4.1", + "vite": "^6.1.0", + "vinxi": "0.5.3", + "zod": "^3.24.1" + }, + "peerDependencies": { + "react": ">=18.0.0 || >=19.0.0", + "react-dom": ">=18.0.0 || >=19.0.0", + "vite": "^6.0.0" + } +} diff --git a/packages/react-start-config/src/index.ts b/packages/react-start-config/src/index.ts new file mode 100644 index 00000000000..10ae0aa7873 --- /dev/null +++ b/packages/react-start-config/src/index.ts @@ -0,0 +1,661 @@ +import path from 'node:path' +import { existsSync, readFileSync } from 'node:fs' +import { readFile } from 'node:fs/promises' +import { fileURLToPath } from 'node:url' +import viteReact from '@vitejs/plugin-react' +import { resolve } from 'import-meta-resolve' +import { TanStackRouterVite } from '@tanstack/router-plugin/vite' +import { getConfig } from '@tanstack/router-generator' +import { createApp } from 'vinxi' +import { config } from 'vinxi/plugins/config' +// // @ts-expect-error +// import { serverComponents } from '@vinxi/server-components/plugin' +import { createTanStackServerFnPlugin } from '@tanstack/server-functions-plugin' +import { createTanStackStartPlugin } from '@tanstack/react-start-plugin' +import { createFetch } from 'ofetch' +import { createNitro } from 'nitropack' +import { tanstackStartVinxiFileRouter } from './vinxi-file-router.js' +import { + checkDeploymentPresetInput, + getUserViteConfig, + inlineConfigSchema, + serverSchema, +} from './schema.js' +import type { configSchema } from '@tanstack/router-generator' +import type { z } from 'zod' +import type { + TanStackStartInputConfig, + TanStackStartOutputConfig, +} from './schema.js' +import type { App as VinxiApp } from 'vinxi' +import type { Manifest } from '@tanstack/react-router' +import type * as vite from 'vite' + +export type { + TanStackStartInputConfig, + TanStackStartOutputConfig, +} from './schema.js' + +function setTsrDefaults(config: TanStackStartOutputConfig['tsr']) { + // Normally these are `./src/___`, but we're using `./app/___` for Start stuff + const appDirectory = config?.appDirectory ?? './app' + return { + ...config, + appDirectory: config?.appDirectory ?? appDirectory, + routesDirectory: + config?.routesDirectory ?? path.join(appDirectory, 'routes'), + generatedRouteTree: + config?.generatedRouteTree ?? path.join(appDirectory, 'routeTree.gen.ts'), + } +} + +function mergeSsrOptions(options: Array) { + let ssrOptions: vite.SSROptions = {} + let noExternal: vite.SSROptions['noExternal'] = [] + for (const option of options) { + if (!option) { + continue + } + + if (option.noExternal) { + if (option.noExternal === true) { + noExternal = true + } else if (noExternal !== true) { + if (Array.isArray(option.noExternal)) { + noExternal.push(...option.noExternal) + } else { + noExternal.push(option.noExternal) + } + } + } + + ssrOptions = { + ...ssrOptions, + ...option, + noExternal, + } + } + + return ssrOptions +} + +export async function defineConfig( + inlineConfig: TanStackStartInputConfig = {}, +): Promise { + const opts = inlineConfigSchema.parse(inlineConfig) + + const { preset: configDeploymentPreset, ...serverOptions } = + serverSchema.parse(opts.server || {}) + + const deploymentPreset = checkDeploymentPresetInput( + configDeploymentPreset || 'node-server', + ) + const tsr = setTsrDefaults(opts.tsr) + const tsrConfig = getConfig(tsr) + + const appDirectory = tsr.appDirectory + const publicDir = opts.routers?.public?.dir || './public' + + const publicBase = opts.routers?.public?.base || '/' + const clientBase = opts.routers?.client?.base || '/_build' + const apiBase = opts.tsr?.apiBase || '/api' + const serverBase = opts.routers?.server?.base || '/_server' + + const apiMiddleware = opts.routers?.api?.middleware || undefined + const serverMiddleware = opts.routers?.server?.middleware || undefined + const ssrMiddleware = opts.routers?.ssr?.middleware || undefined + + const clientEntry = + opts.routers?.client?.entry || path.join(appDirectory, 'client.tsx') + const ssrEntry = + opts.routers?.ssr?.entry || path.join(appDirectory, 'ssr.tsx') + const apiEntry = opts.routers?.api?.entry || path.join(appDirectory, 'api.ts') + const globalMiddlewareEntry = + opts.routers?.server?.globalMiddlewareEntry || + path.join(appDirectory, 'global-middleware.ts') + const apiEntryExists = existsSync(apiEntry) + + const viteConfig = getUserViteConfig(opts.vite) + + const TanStackServerFnsPlugin = createTanStackServerFnPlugin({ + // This is the ID that will be available to look up and import + // our server function manifest and resolve its module + manifestVirtualImportId: 'tsr:server-fn-manifest', + client: { + getRuntimeCode: () => + `import { createClientRpc } from '@tanstack/react-start/server-functions-client'`, + replacer: (opts) => + `createClientRpc('${opts.functionId}', '${serverBase}')`, + }, + ssr: { + getRuntimeCode: () => + `import { createSsrRpc } from '@tanstack/react-start/server-functions-ssr'`, + replacer: (opts) => `createSsrRpc('${opts.functionId}', '${serverBase}')`, + }, + server: { + getRuntimeCode: () => + `import { createServerRpc } from '@tanstack/react-start/server-functions-server'`, + replacer: (opts) => + `createServerRpc('${opts.functionId}', '${serverBase}', ${opts.fn})`, + }, + }) + + const TanStackStartPlugin = createTanStackStartPlugin({ + globalMiddlewareEntry, + }) + + // Create a dummy nitro app to get the resolved public output path + const dummyNitroApp = await createNitro({ + preset: deploymentPreset, + compatibilityDate: '2024-12-01', + }) + + const nitroOutputPublicDir = dummyNitroApp.options.output.publicDir + await dummyNitroApp.close() + + let vinxiApp = createApp({ + server: { + ...serverOptions, + preset: deploymentPreset, + experimental: { + ...serverOptions.experimental, + asyncContext: true, + }, + }, + routers: [ + { + name: 'public', + type: 'static', + dir: publicDir, + base: publicBase, + }, + { + name: 'client', + type: 'client', + target: 'browser', + handler: clientEntry, + base: clientBase, + // @ts-expect-error + build: { + sourcemap: true, + }, + plugins: () => { + const routerType = 'client' + const clientViteConfig = getUserViteConfig( + opts.routers?.[routerType]?.vite, + ) + + return [ + config('tss-vite-config-client', { + ...viteConfig.userConfig, + ...clientViteConfig.userConfig, + define: { + ...(viteConfig.userConfig.define || {}), + ...(clientViteConfig.userConfig.define || {}), + ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), + ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), + ...injectDefineEnv('TSS_API_BASE', apiBase), + ...injectDefineEnv( + 'TSS_OUTPUT_PUBLIC_DIR', + nitroOutputPublicDir, + ), + }, + ssr: mergeSsrOptions([ + viteConfig.userConfig.ssr, + clientViteConfig.userConfig.ssr, + { + noExternal, + }, + ]), + optimizeDeps: { + entries: [], + ...(viteConfig.userConfig.optimizeDeps || {}), + ...(clientViteConfig.userConfig.optimizeDeps || {}), + }, + }), + TanStackRouterVite({ + ...tsrConfig, + enableRouteGeneration: true, + autoCodeSplitting: true, + experimental: { + ...tsrConfig.experimental, + }, + }), + TanStackStartPlugin.client, + TanStackServerFnsPlugin.client, + ...(viteConfig.plugins || []), + ...(clientViteConfig.plugins || []), + viteReact(opts.react), + // TODO: RSCS - enable this + // serverComponents.client(), + ] + }, + }, + { + name: 'ssr', + type: 'http', + target: 'server', + handler: ssrEntry, + middleware: ssrMiddleware, + // @ts-expect-error + link: { + client: 'client', + }, + plugins: () => { + const routerType = 'ssr' + const ssrViteConfig = getUserViteConfig( + opts.routers?.[routerType]?.vite, + ) + + return [ + config('tss-vite-config-ssr', { + ...viteConfig.userConfig, + ...ssrViteConfig.userConfig, + define: { + ...(viteConfig.userConfig.define || {}), + ...(ssrViteConfig.userConfig.define || {}), + ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), + ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), + ...injectDefineEnv('TSS_API_BASE', apiBase), + ...injectDefineEnv( + 'TSS_OUTPUT_PUBLIC_DIR', + nitroOutputPublicDir, + ), + }, + ssr: mergeSsrOptions([ + viteConfig.userConfig.ssr, + ssrViteConfig.userConfig.ssr, + { + noExternal, + external: ['@vinxi/react-server-dom/client'], + }, + ]), + optimizeDeps: { + entries: [], + ...(viteConfig.userConfig.optimizeDeps || {}), + ...(ssrViteConfig.userConfig.optimizeDeps || {}), + }, + }), + TanStackRouterVite({ + ...tsrConfig, + enableRouteGeneration: false, + autoCodeSplitting: true, + experimental: { + ...tsrConfig.experimental, + }, + }), + TanStackStartPlugin.ssr, + TanStackServerFnsPlugin.ssr, + tsrRoutesManifest({ + tsrConfig, + clientBase, + }), + ...(getUserViteConfig(opts.vite).plugins || []), + ...(getUserViteConfig(opts.routers?.ssr?.vite).plugins || []), + viteReact(opts.react), + ] + }, + }, + { + name: 'server', + type: 'http', + target: 'server', + base: serverBase, + middleware: serverMiddleware, + // TODO: RSCS - enable this + // worker: true, + handler: importToProjectRelative( + '@tanstack/react-start-server-functions-handler', + ), + plugins: () => { + const routerType = 'server' + const serverViteConfig = getUserViteConfig( + opts.routers?.[routerType]?.vite, + ) + + return [ + config('tss-vite-config-server', { + ...viteConfig.userConfig, + ...serverViteConfig.userConfig, + define: { + ...(viteConfig.userConfig.define || {}), + ...(serverViteConfig.userConfig.define || {}), + ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), + ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), + ...injectDefineEnv('TSS_API_BASE', apiBase), + ...injectDefineEnv('TSS_SERVER_FN_BASE', serverBase), + ...injectDefineEnv( + 'TSS_OUTPUT_PUBLIC_DIR', + nitroOutputPublicDir, + ), + }, + ssr: mergeSsrOptions([ + viteConfig.userConfig.ssr, + serverViteConfig.userConfig.ssr, + { + noExternal, + }, + ]), + optimizeDeps: { + entries: [], + ...(viteConfig.userConfig.optimizeDeps || {}), + ...(serverViteConfig.userConfig.optimizeDeps || {}), + }, + }), + TanStackRouterVite({ + ...tsrConfig, + enableRouteGeneration: false, + autoCodeSplitting: true, + experimental: { + ...tsrConfig.experimental, + }, + }), + TanStackStartPlugin.server, + TanStackServerFnsPlugin.server, + // TODO: RSCS - remove this + // resolve: { + // conditions: [], + // }, + // TODO: RSCs - add this + // serverComponents.serverActions({ + // resolve: { + // conditions: [ + // 'react-server', + // // 'node', + // 'import', + // process.env.NODE_ENV, + // ], + // }, + // runtime: '@vinxi/react-server-dom/runtime', + // transpileDeps: ['react', 'react-dom', '@vinxi/react-server-dom'], + // }), + ...(viteConfig.plugins || []), + ...(serverViteConfig.plugins || []), + ] + }, + }, + ], + }) + + const noExternal = [ + '@tanstack/start', + '@tanstack/react-start', + '@tanstack/react-start/server', + '@tanstack/react-start-client', + '@tanstack/react-start-server', + '@tanstack/react-start-server-functions-fetcher', + '@tanstack/react-start-server-functions-handler', + '@tanstack/react-start-server-functions-client', + '@tanstack/react-start-server-functions-ssr', + '@tanstack/start-server-functions-server', + '@tanstack/react-start-router-manifest', + '@tanstack/react-start-config', + '@tanstack/react-start-api-routes', + '@tanstack/server-functions-plugin', + 'tsr:routes-manifest', + 'tsr:server-fn-manifest', + ] + + // If API routes handler exists, add a router for it + if (apiEntryExists) { + vinxiApp = vinxiApp.addRouter({ + name: 'api', + type: 'http', + target: 'server', + base: apiBase, + handler: apiEntry, + middleware: apiMiddleware, + routes: tanstackStartVinxiFileRouter({ tsrConfig, apiBase }), + plugins: () => { + const viteConfig = getUserViteConfig(opts.vite) + const apiViteConfig = getUserViteConfig(opts.routers?.api?.vite) + + return [ + config('tsr-vite-config-api', { + ...viteConfig.userConfig, + ...apiViteConfig.userConfig, + ssr: mergeSsrOptions([ + viteConfig.userConfig.ssr, + apiViteConfig.userConfig.ssr, + { + noExternal, + }, + ]), + optimizeDeps: { + entries: [], + ...(viteConfig.userConfig.optimizeDeps || {}), + ...(apiViteConfig.userConfig.optimizeDeps || {}), + }, + define: { + ...(viteConfig.userConfig.define || {}), + ...(apiViteConfig.userConfig.define || {}), + ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase), + ...injectDefineEnv('TSS_CLIENT_BASE', clientBase), + ...injectDefineEnv('TSS_API_BASE', apiBase), + ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir), + }, + }), + TanStackRouterVite({ + ...tsrConfig, + enableRouteGeneration: false, + autoCodeSplitting: true, + experimental: { + ...tsrConfig.experimental, + }, + }), + ...(viteConfig.plugins || []), + ...(apiViteConfig.plugins || []), + ] + }, + }) + } + + // Because Vinxi doesn't use the normal nitro dev server, it doesn't + // supply $fetch during dev. We need to hook into the dev server creation, + // nab the proper utils from the custom nitro instance that is used + // during dev and supply the $fetch to app. + // Hopefully and likely, this will just get removed when we move to + // Nitro directly. + vinxiApp.hooks.hook('app:dev:nitro:config', (devServer) => { + vinxiApp.hooks.hook( + 'app:dev:server:created', + ({ devApp: { localFetch } }) => { + const $fetch = createFetch({ + fetch: localFetch, + defaults: { + baseURL: devServer.nitro.options.runtimeConfig.app.baseURL, + }, + }) + + // @ts-expect-error + globalThis.$fetch = $fetch + }, + ) + }) + + return vinxiApp +} + +function importToProjectRelative(p: string) { + const resolved = fileURLToPath(resolve(p, import.meta.url)) + + const relative = path.relative(process.cwd(), resolved) + + return relative +} + +function tsrRoutesManifest(opts: { + tsrConfig: z.infer + clientBase: string +}): vite.Plugin { + let config: vite.ResolvedConfig + + return { + name: 'tsr-routes-manifest', + configResolved(resolvedConfig) { + config = resolvedConfig + }, + resolveId(id) { + if (id === 'tsr:routes-manifest') { + return id + } + return + }, + async load(id) { + if (id === 'tsr:routes-manifest') { + // If we're in development, return a dummy manifest + + if (config.command === 'serve') { + return `export default () => ({ + routes: {} + })` + } + + const clientViteManifestPath = path.resolve( + config.build.outDir, + `../client/${opts.clientBase}/.vite/manifest.json`, + ) + + type ViteManifest = Record< + string, + { + file: string + isEntry: boolean + imports: Array + } + > + + let manifest: ViteManifest + try { + manifest = JSON.parse(await readFile(clientViteManifestPath, 'utf-8')) + } catch (err) { + console.error(err) + throw new Error( + `Could not find the production client vite manifest at '${clientViteManifestPath}'!`, + ) + } + + const routeTreePath = path.resolve(opts.tsrConfig.generatedRouteTree) + + let routeTreeContent: string + try { + routeTreeContent = readFileSync(routeTreePath, 'utf-8') + } catch (err) { + console.error(err) + throw new Error( + `Could not find the generated route tree at '${routeTreePath}'!`, + ) + } + + // Extract the routesManifest JSON from the route tree file. + // It's located between the /* ROUTE_MANIFEST_START and ROUTE_MANIFEST_END */ comment block. + + const routerManifest = JSON.parse( + routeTreeContent.match( + /\/\* ROUTE_MANIFEST_START([\s\S]*?)ROUTE_MANIFEST_END \*\//, + )?.[1] || '{ routes: {} }', + ) as Manifest + + const routes = routerManifest.routes + + let entryFile: + | { + file: string + imports: Array + } + | undefined + + const filesByRouteFilePath: ViteManifest = Object.fromEntries( + Object.entries(manifest).map(([k, v]) => { + if (v.isEntry) { + entryFile = v + } + + const rPath = k.split('?')[0] + + return [rPath, v] + }, {}), + ) + + // Add preloads to the routes from the vite manifest + Object.entries(routes).forEach(([k, v]) => { + const file = + filesByRouteFilePath[ + path.join(opts.tsrConfig.routesDirectory, v.filePath as string) + ] + + if (file) { + const preloads = file.imports.map((d) => + path.join(opts.clientBase, manifest[d]!.file), + ) + + preloads.unshift(path.join(opts.clientBase, file.file)) + + routes[k] = { + ...v, + preloads, + } + } + }) + + if (entryFile) { + routes.__root__!.preloads = [ + path.join(opts.clientBase, entryFile.file), + ...entryFile.imports.map((d) => + path.join(opts.clientBase, manifest[d]!.file), + ), + ] + } + + const recurseRoute = ( + route: { + preloads?: Array + children?: Array + }, + seenPreloads = {} as Record, + ) => { + route.preloads = route.preloads?.filter((preload) => { + if (seenPreloads[preload]) { + return false + } + seenPreloads[preload] = true + return true + }) + + if (route.children) { + route.children.forEach((child) => { + const childRoute = routes[child]! + recurseRoute(childRoute, { ...seenPreloads }) + }) + } + } + + // @ts-expect-error + recurseRoute(routes.__root__) + + const routesManifest = { + routes, + } + + if (process.env.TSR_VITE_DEBUG) { + console.info( + 'Routes Manifest: \n' + JSON.stringify(routesManifest, null, 2), + ) + } + + return `export default () => (${JSON.stringify(routesManifest)})` + } + return + }, + } +} + +function injectDefineEnv( + key: TKey, + value: TValue, +): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } { + return { + [`process.env.${key}`]: JSON.stringify(value), + [`import.meta.env.${key}`]: JSON.stringify(value), + } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } +} diff --git a/packages/react-start-config/src/schema.ts b/packages/react-start-config/src/schema.ts new file mode 100644 index 00000000000..516e4e86fa5 --- /dev/null +++ b/packages/react-start-config/src/schema.ts @@ -0,0 +1,194 @@ +import { configSchema } from '@tanstack/router-generator' +import { z } from 'zod' +import type { PluginOption } from 'vite' +import type { AppOptions as VinxiAppOptions } from 'vinxi' +import type { NitroOptions } from 'nitropack' +import type { Options as ViteReactOptions } from '@vitejs/plugin-react' +import type { CustomizableConfig } from 'vinxi/dist/types/lib/vite-dev' + +type StartUserViteConfig = CustomizableConfig | (() => CustomizableConfig) + +export function getUserViteConfig(config?: StartUserViteConfig): { + plugins: Array | undefined + userConfig: CustomizableConfig +} { + const { plugins, ...userConfig } = + typeof config === 'function' ? config() : { ...config } + return { plugins, userConfig } +} + +/** + * Not all the deployment presets are fully functional or tested. + * @see https://github.com/TanStack/router/pull/2002 + */ +const vinxiDeploymentPresets = [ + 'alwaysdata', // untested + 'aws-amplify', // untested + 'aws-lambda', // untested + 'azure', // untested + 'azure-functions', // untested + 'base-worker', // untested + 'bun', // ✅ working + 'cleavr', // untested + 'cli', // untested + 'cloudflare', // untested + 'cloudflare-module', // untested + 'cloudflare-pages', // ✅ working + 'cloudflare-pages-static', // untested + 'deno', // untested + 'deno-deploy', // untested + 'deno-server', // untested + 'digital-ocean', // untested + 'edgio', // untested + 'firebase', // untested + 'flight-control', // untested + 'github-pages', // untested + 'heroku', // untested + 'iis', // untested + 'iis-handler', // untested + 'iis-node', // untested + 'koyeb', // untested + 'layer0', // untested + 'netlify', // ✅ working + 'netlify-builder', // untested + 'netlify-edge', // untested + 'netlify-static', // untested + 'nitro-dev', // untested + 'nitro-prerender', // untested + 'node', // partially working + 'node-cluster', // untested + 'node-server', // ✅ working + 'platform-sh', // untested + 'service-worker', // untested + 'static', // 🟧 partially working + 'stormkit', // untested + 'vercel', // ✅ working + 'vercel-edge', // untested + 'vercel-static', // untested + 'winterjs', // untested + 'zeabur', // untested + 'zeabur-static', // untested +] as const + +type DeploymentPreset = (typeof vinxiDeploymentPresets)[number] | (string & {}) + +const testedDeploymentPresets: Array = [ + 'bun', + 'netlify', + 'vercel', + 'cloudflare-pages', + 'node-server', +] + +export function checkDeploymentPresetInput(preset: string): DeploymentPreset { + if (!vinxiDeploymentPresets.includes(preset as any)) { + console.warn( + `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets + .map((p) => `"${p}"`) + .join(', ')}.`, + ) + } + + if (!testedDeploymentPresets.includes(preset as any)) { + console.warn( + `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, + ) + } + + return preset +} + +type HTTPSOptions = { + cert?: string + key?: string + pfx?: string + passphrase?: string + validityDays?: number + domains?: Array +} + +type ServerOptions_ = VinxiAppOptions['server'] & { + https?: boolean | HTTPSOptions +} + +type ServerOptions = { + [K in keyof ServerOptions_]: ServerOptions_[K] +} + +export const serverSchema = z + .object({ + routeRules: z.custom().optional(), + preset: z.custom().optional(), + static: z.boolean().optional(), + prerender: z + .object({ + routes: z.array(z.string()), + ignore: z + .array( + z.custom< + string | RegExp | ((path: string) => undefined | null | boolean) + >(), + ) + .optional(), + crawlLinks: z.boolean().optional(), + }) + .optional(), + }) + .and(z.custom()) + +const viteSchema = z.custom() + +const viteReactSchema = z.custom() + +const routersSchema = z.object({ + ssr: z + .object({ + entry: z.string().optional(), + middleware: z.string().optional(), + vite: viteSchema.optional(), + }) + .optional(), + client: z + .object({ + entry: z.string().optional(), + base: z.string().optional(), + vite: viteSchema.optional(), + }) + .optional(), + server: z + .object({ + base: z.string().optional(), + globalMiddlewareEntry: z.string().optional(), + middleware: z.string().optional(), + vite: viteSchema.optional(), + }) + .optional(), + api: z + .object({ + entry: z.string().optional(), + middleware: z.string().optional(), + vite: viteSchema.optional(), + }) + .optional(), + public: z + .object({ + dir: z.string().optional(), + base: z.string().optional(), + }) + .optional(), +}) + +const tsrConfig = configSchema.partial().extend({ + appDirectory: z.string().optional(), +}) + +export const inlineConfigSchema = z.object({ + react: viteReactSchema.optional(), + vite: viteSchema.optional(), + tsr: tsrConfig.optional(), + routers: routersSchema.optional(), + server: serverSchema.optional(), +}) + +export type TanStackStartInputConfig = z.input +export type TanStackStartOutputConfig = z.infer diff --git a/packages/react-start-config/src/vinxi-file-router.ts b/packages/react-start-config/src/vinxi-file-router.ts new file mode 100644 index 00000000000..9e6d829d1be --- /dev/null +++ b/packages/react-start-config/src/vinxi-file-router.ts @@ -0,0 +1,87 @@ +import { + BaseFileSystemRouter as VinxiBaseFileSystemRouter, + analyzeModule as vinxiFsRouterAnalyzeModule, + cleanPath as vinxiFsRouterCleanPath, +} from 'vinxi/fs-router' +import { + CONSTANTS as GENERATOR_CONSTANTS, + startAPIRouteSegmentsFromTSRFilePath, +} from '@tanstack/router-generator' +import type { configSchema } from '@tanstack/router-generator' +import type { + AppOptions as VinxiAppOptions, + RouterSchemaInput as VinxiRouterSchemaInput, +} from 'vinxi' +import type { z } from 'zod' + +export function tanstackStartVinxiFileRouter(opts: { + tsrConfig: z.infer + apiBase: string +}) { + const apiBaseSegment = opts.apiBase.split('/').filter(Boolean).join('/') + const isAPIPath = new RegExp(`/${apiBaseSegment}/`) + + return function (router: VinxiRouterSchemaInput, app: VinxiAppOptions) { + // Our own custom File Router that extends the VinxiBaseFileSystemRouter + // for splitting the API routes into its own "bundle" + // and adding the $APIRoute metadata to the route object + // This could be customized in future to support more complex splits + class TanStackStartFsRouter extends VinxiBaseFileSystemRouter { + toPath(src: string): string { + const inputPath = vinxiFsRouterCleanPath(src, this.config) + + const segments = startAPIRouteSegmentsFromTSRFilePath( + inputPath, + opts.tsrConfig, + ) + + const pathname = segments + .map((part) => { + if (part.type === 'splat') { + return `*splat` + } + + if (part.type === 'param') { + return `:${part.value}?` + } + + return part.value + }) + .join('/') + + return pathname.length > 0 ? `/${pathname}` : '/' + } + + toRoute(src: string) { + const webPath = this.toPath(src) + + const [_, exports] = vinxiFsRouterAnalyzeModule(src) + + const hasAPIRoute = exports.find( + (exp) => exp.n === GENERATOR_CONSTANTS.APIRouteExportVariable, + ) + + return { + path: webPath, + filePath: src, + $APIRoute: + isAPIPath.test(webPath) && hasAPIRoute + ? { + src, + pick: [GENERATOR_CONSTANTS.APIRouteExportVariable], + } + : undefined, + } + } + } + + return new TanStackStartFsRouter( + { + dir: opts.tsrConfig.routesDirectory, + extensions: ['js', 'jsx', 'ts', 'tsx'], + }, + router, + app, + ) + } +} diff --git a/packages/start-router-manifest/tsconfig.json b/packages/react-start-config/tsconfig.json similarity index 100% rename from packages/start-router-manifest/tsconfig.json rename to packages/react-start-config/tsconfig.json diff --git a/packages/start-plugin/README.md b/packages/react-start-plugin/README.md similarity index 100% rename from packages/start-plugin/README.md rename to packages/react-start-plugin/README.md diff --git a/packages/start-plugin/eslint.config.js b/packages/react-start-plugin/eslint.config.js similarity index 100% rename from packages/start-plugin/eslint.config.js rename to packages/react-start-plugin/eslint.config.js diff --git a/packages/start-plugin/package.json b/packages/react-start-plugin/package.json similarity index 96% rename from packages/start-plugin/package.json rename to packages/react-start-plugin/package.json index 4a6f8dc8ea8..85552136ca3 100644 --- a/packages/start-plugin/package.json +++ b/packages/react-start-plugin/package.json @@ -1,5 +1,5 @@ { - "name": "@tanstack/start-plugin", + "name": "@tanstack/react-start-plugin", "version": "1.111.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", @@ -7,7 +7,7 @@ "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start-plugin" + "directory": "packages/react-start-plugin" }, "homepage": "https://tanstack.com/start", "funding": { diff --git a/packages/start-plugin/src/compilers.ts b/packages/react-start-plugin/src/compilers.ts similarity index 98% rename from packages/start-plugin/src/compilers.ts rename to packages/react-start-plugin/src/compilers.ts index a471a50ce79..ca806fc9915 100644 --- a/packages/start-plugin/src/compilers.ts +++ b/packages/react-start-plugin/src/compilers.ts @@ -90,11 +90,11 @@ export function compileStartOutput(opts: CompileOptions): GeneratorResult { programPath.traverse({ ImportDeclaration: (path) => { - if (path.node.source.value !== '@tanstack/start') { + if (path.node.source.value !== '@tanstack/react-start') { return } - // handle a destructured imports being renamed like "import { createServerFn as myCreateServerFn } from '@tanstack/start';" + // handle a destructured imports being renamed like "import { createServerFn as myCreateServerFn } from '@tanstack/react-start';" path.node.specifiers.forEach((specifier) => { identifierKeys.forEach((identifierKey) => { const identifier = identifiers[identifierKey] @@ -109,7 +109,7 @@ export function compileStartOutput(opts: CompileOptions): GeneratorResult { } } - // handle namespace imports like "import * as TanStackStart from '@tanstack/start';" + // handle namespace imports like "import * as TanStackStart from '@tanstack/react-start';" if (specifier.type === 'ImportNamespaceSpecifier') { identifier.type = 'ImportNamespaceSpecifier' identifier.namespaceId = specifier.local.name diff --git a/packages/start-plugin/src/index.ts b/packages/react-start-plugin/src/index.ts similarity index 91% rename from packages/start-plugin/src/index.ts rename to packages/react-start-plugin/src/index.ts index a6e513c5ec1..0909c923f99 100644 --- a/packages/start-plugin/src/index.ts +++ b/packages/react-start-plugin/src/index.ts @@ -7,7 +7,7 @@ import type { Plugin } from 'vite' const debug = process.env.TSR_VITE_DEBUG && - ['true', 'start-plugin'].includes(process.env.TSR_VITE_DEBUG) + ['true', 'react-start-plugin'].includes(process.env.TSR_VITE_DEBUG) export type TanStackStartViteOptions = { globalMiddlewareEntry: string @@ -48,7 +48,9 @@ export function createTanStackStartPlugin(opts: TanStackStartViteOptions): { globalMiddlewareEntryExists = existsSync(resolvedGlobalMiddlewareEntry) if (!entry) { - throw new Error('@tanstack/start-plugin: No server entry found!') + throw new Error( + '@tanstack/react-start-plugin: No server entry found!', + ) } }, transform(code, id) { @@ -110,7 +112,7 @@ export function TanStackStartServerFnsAndMiddleware(opts: { if (code.includes('@react-refresh')) { throw new Error( - `We detected that the '@vitejs/plugin-react' was passed before '@tanstack/start-plugin'. Please make sure that '@tanstack/router-vite-plugin' is passed before '@vitejs/plugin-react' and try again: + `We detected that the '@vitejs/plugin-react' was passed before '@tanstack/react-start-plugin'. Please make sure that '@tanstack/router-vite-plugin' is passed before '@vitejs/plugin-react' and try again: e.g. plugins: [ diff --git a/packages/start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts b/packages/react-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts similarity index 92% rename from packages/start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts rename to packages/react-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts index 703f79a6b65..32a31d401c2 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts +++ b/packages/react-start-plugin/tests/createIsomorphicFn/createIsomorphicFn.test.ts @@ -55,7 +55,7 @@ describe('createIsomorphicFn compiles correctly', async () => { compileStartOutput({ env: 'client', code: ` - import { createIsomorphicFn } from '@tanstack/start' + import { createIsomorphicFn } from '@tanstack/react-start' const clientOnly = createIsomorphicFn().client()`, root: './test-files', filename: 'no-fn.ts', @@ -66,7 +66,7 @@ describe('createIsomorphicFn compiles correctly', async () => { compileStartOutput({ env: 'server', code: ` - import { createIsomorphicFn } from '@tanstack/start' + import { createIsomorphicFn } from '@tanstack/react-start' const serverOnly = createIsomorphicFn().server()`, root: './test-files', filename: 'no-fn.ts', @@ -78,7 +78,7 @@ describe('createIsomorphicFn compiles correctly', async () => { compileStartOutput({ env: 'client', code: ` - import { createIsomorphicFn } from '@tanstack/start' + import { createIsomorphicFn } from '@tanstack/react-start' const noImpl = createIsomorphicFn()`, root: './test-files', filename: 'no-fn.ts', diff --git a/packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx similarity index 89% rename from packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx index 6fcb30691c2..837195fb9c4 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx @@ -1,4 +1,4 @@ -import { createIsomorphicFn } from '@tanstack/start'; +import { createIsomorphicFn } from '@tanstack/react-start'; const noImpl = () => {}; const serverOnlyFn = () => {}; const clientOnlyFn = () => 'client'; diff --git a/packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx similarity index 86% rename from packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx index d273a49f407..4f0230416dc 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/start'; +import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start'; const noImpl = () => {}; const serverOnlyFn = () => {}; const clientOnlyFn = () => 'client'; diff --git a/packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx similarity index 89% rename from packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx index ffb2ffe79c9..296ccdbe24b 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start'; +import * as TanStackStart from '@tanstack/react-start'; const noImpl = () => {}; const serverOnlyFn = () => {}; const clientOnlyFn = () => 'client'; diff --git a/packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx similarity index 89% rename from packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx index 0e0134e347f..1656889e535 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx @@ -1,4 +1,4 @@ -import { createIsomorphicFn } from '@tanstack/start'; +import { createIsomorphicFn } from '@tanstack/react-start'; const noImpl = () => {}; const serverOnlyFn = () => 'server'; const clientOnlyFn = () => {}; diff --git a/packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx similarity index 86% rename from packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx index 3ba9d0598f9..a46f061a451 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/start'; +import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start'; const noImpl = () => {}; const serverOnlyFn = () => 'server'; const clientOnlyFn = () => {}; diff --git a/packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx similarity index 89% rename from packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx index c77c6ac839f..dc3ad9af048 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start'; +import * as TanStackStart from '@tanstack/react-start'; const noImpl = () => {}; const serverOnlyFn = () => 'server'; const clientOnlyFn = () => {}; diff --git a/packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx similarity index 93% rename from packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx index e6c5c359430..e3102bcb715 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructured.tsx @@ -1,4 +1,4 @@ -import { createIsomorphicFn } from '@tanstack/start' +import { createIsomorphicFn } from '@tanstack/react-start' const noImpl = createIsomorphicFn() diff --git a/packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx similarity index 91% rename from packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx index 9c31330b1b1..b33515ffc5f 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/start' +import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start' const noImpl = isomorphicFn() diff --git a/packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx b/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx similarity index 94% rename from packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx rename to packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx index 4c1bed57412..60ef4f66520 100644 --- a/packages/start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx +++ b/packages/react-start-plugin/tests/createIsomorphicFn/test-files/createIsomorphicFnStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start' +import * as TanStackStart from '@tanstack/react-start' const noImpl = TanStackStart.createIsomorphicFn() diff --git a/packages/start-plugin/tests/createMiddleware/createMiddleware.test.ts b/packages/react-start-plugin/tests/createMiddleware/createMiddleware.test.ts similarity index 100% rename from packages/start-plugin/tests/createMiddleware/createMiddleware.test.ts rename to packages/react-start-plugin/tests/createMiddleware/createMiddleware.test.ts diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx similarity index 92% rename from packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx index f0ed6717e41..c513c274c5f 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx @@ -1,4 +1,4 @@ -import { createMiddleware } from '@tanstack/start'; +import { createMiddleware } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createMiddleware({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx similarity index 90% rename from packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx index c13c45a86c9..4ab09a99335 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createMiddleware as middlewareFn } from '@tanstack/start'; +import { createMiddleware as middlewareFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = middlewareFn({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx similarity index 93% rename from packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx index 0af363017d9..7253e9510c9 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start'; +import * as TanStackStart from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = TanStackStart.createMiddleware({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx similarity index 60% rename from packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx index e13946f2d8d..280dc3a0670 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx @@ -1,4 +1,4 @@ -import { createMiddleware } from '@tanstack/start'; +import { createMiddleware } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createMiddleware({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx similarity index 95% rename from packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx index a29e1ecb405..8e1ddd89507 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructured.tsx @@ -1,4 +1,4 @@ -import { createMiddleware } from '@tanstack/start'; +import { createMiddleware } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createMiddleware({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx similarity index 94% rename from packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx index d529f89fe14..210d8df8e68 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createMiddleware as middlewareFn } from '@tanstack/start'; +import { createMiddleware as middlewareFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = middlewareFn({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx similarity index 96% rename from packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx index 53baf6fa9c3..13e09f0ec2d 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start'; +import * as TanStackStart from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = TanStackStart.createMiddleware({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx similarity index 71% rename from packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx rename to packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx index 1e41c79866a..411495910d0 100644 --- a/packages/start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/snapshots/server/createMiddlewareValidator.tsx @@ -1,4 +1,4 @@ -import { createMiddleware } from '@tanstack/start'; +import { createMiddleware } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createMiddleware({ id: 'test' diff --git a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx similarity index 95% rename from packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx rename to packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx index c5ea2aa5b6c..7e98897ecf8 100644 --- a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructured.tsx @@ -1,4 +1,4 @@ -import { createMiddleware } from '@tanstack/start' +import { createMiddleware } from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = createMiddleware({ diff --git a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx similarity index 94% rename from packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx rename to packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx index 2e456131feb..79c59b8eb90 100644 --- a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createMiddleware as middlewareFn } from '@tanstack/start' +import { createMiddleware as middlewareFn } from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = middlewareFn({ diff --git a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx similarity index 96% rename from packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx rename to packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx index c1df8e12b32..c1cd35f42d3 100644 --- a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start' +import * as TanStackStart from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = TanStackStart.createMiddleware({ diff --git a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx similarity index 72% rename from packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx rename to packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx index 7e0d6ba449e..894bf4608ff 100644 --- a/packages/start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx +++ b/packages/react-start-plugin/tests/createMiddleware/test-files/createMiddlewareValidator.tsx @@ -1,4 +1,4 @@ -import { createMiddleware } from '@tanstack/start' +import { createMiddleware } from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = createMiddleware({ diff --git a/packages/start-plugin/tests/createServerFn/createServerFn.test.ts b/packages/react-start-plugin/tests/createServerFn/createServerFn.test.ts similarity index 89% rename from packages/start-plugin/tests/createServerFn/createServerFn.test.ts rename to packages/react-start-plugin/tests/createServerFn/createServerFn.test.ts index 6a12d67a8bf..5c93ae90bc6 100644 --- a/packages/start-plugin/tests/createServerFn/createServerFn.test.ts +++ b/packages/react-start-plugin/tests/createServerFn/createServerFn.test.ts @@ -40,7 +40,7 @@ describe('createServerFn compiles correctly', async () => { compileStartOutput({ env: 'client', code: ` - import { createServerFn } from '@tanstack/start' + import { createServerFn } from '@tanstack/react-start' createServerFn()`, root: './test-files', filename: 'no-fn.ts', @@ -54,7 +54,7 @@ describe('createServerFn compiles correctly', async () => { compileStartOutput({ env: 'client', code: ` - import { createServerFn } from '@tanstack/start' + import { createServerFn } from '@tanstack/react-start' createServerFn().handler(async () => {})`, root: './test-files', filename: 'no-fn.ts', @@ -65,7 +65,7 @@ describe('createServerFn compiles correctly', async () => { test('should work with identifiers of functions', () => { const code = ` - import { createServerFn } from '@tanstack/start' + import { createServerFn } from '@tanstack/react-start' const myFunc = () => { return 'hello from the server' } @@ -88,7 +88,7 @@ describe('createServerFn compiles correctly', async () => { }) expect(compiledResultClient.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/start'; + "import { createServerFn } from '@tanstack/react-start'; const myServerFn = createServerFn().handler((opts, signal) => { "use server"; @@ -97,7 +97,7 @@ describe('createServerFn compiles correctly', async () => { `) expect(compiledResultServer.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/start'; + "import { createServerFn } from '@tanstack/react-start'; const myFunc = () => { return 'hello from the server'; }; @@ -111,7 +111,7 @@ describe('createServerFn compiles correctly', async () => { test('should use dce by default', () => { const code = ` - import { createServerFn } from '@tanstack/start' + import { createServerFn } from '@tanstack/react-start' const exportedVar = 'exported' export const exportedFn = createServerFn().handler(async () => { return exportedVar @@ -131,7 +131,7 @@ describe('createServerFn compiles correctly', async () => { }) expect(compiledResult.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/start'; + "import { createServerFn } from '@tanstack/react-start'; export const exportedFn = createServerFn().handler((opts, signal) => { "use server"; @@ -154,7 +154,7 @@ describe('createServerFn compiles correctly', async () => { }) expect(compiledResultServer.code).toMatchInlineSnapshot(` - "import { createServerFn } from '@tanstack/start'; + "import { createServerFn } from '@tanstack/react-start'; const exportedVar = 'exported'; export const exportedFn = createServerFn().handler((opts, signal) => { "use server"; diff --git a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx similarity index 96% rename from packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx index 22c50631b30..85aa1e2cc25 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx @@ -1,4 +1,4 @@ -import { createServerFn } from '@tanstack/start'; +import { createServerFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createServerFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx similarity index 92% rename from packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx index 4255495384f..0275eaa0b0e 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createServerFn as serverFn } from '@tanstack/start'; +import { createServerFn as serverFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = serverFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx similarity index 94% rename from packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx index a4e7f972279..5e022379bef 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start'; +import * as TanStackStart from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = TanStackStart.createServerFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx similarity index 77% rename from packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx index b08829a0bbc..57a298e8a36 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/client/createServerFnValidator.tsx @@ -1,4 +1,4 @@ -import { createServerFn } from '@tanstack/start'; +import { createServerFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createServerFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx similarity index 97% rename from packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx index 037da3e2c04..a27c1a76e27 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructured.tsx @@ -1,4 +1,4 @@ -import { createServerFn } from '@tanstack/start'; +import { createServerFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createServerFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx similarity index 96% rename from packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx index 9f16d463da8..358c28448d0 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createServerFn as serverFn } from '@tanstack/start'; +import { createServerFn as serverFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = serverFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx similarity index 96% rename from packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx index e50e66e666f..44f67330725 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start'; +import * as TanStackStart from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = TanStackStart.createServerFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx similarity index 81% rename from packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx rename to packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx index 343e15c2847..59fa8f3a44b 100644 --- a/packages/start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx +++ b/packages/react-start-plugin/tests/createServerFn/snapshots/server/createServerFnValidator.tsx @@ -1,4 +1,4 @@ -import { createServerFn } from '@tanstack/start'; +import { createServerFn } from '@tanstack/react-start'; import { z } from 'zod'; export const withUseServer = createServerFn({ method: 'GET' diff --git a/packages/start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx similarity index 96% rename from packages/start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx rename to packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx index 780c1e3370a..b1c5e9edf28 100644 --- a/packages/start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx +++ b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructured.tsx @@ -1,4 +1,4 @@ -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = createServerFn({ diff --git a/packages/start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx similarity index 95% rename from packages/start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx rename to packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx index aba9859be3e..4c4ce6dfb2c 100644 --- a/packages/start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { createServerFn as serverFn } from '@tanstack/start' +import { createServerFn as serverFn } from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = serverFn({ diff --git a/packages/start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx similarity index 96% rename from packages/start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx rename to packages/react-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx index 6d5ba022bb8..30c9f6973c6 100644 --- a/packages/start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx +++ b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanStackStart from '@tanstack/start' +import * as TanStackStart from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = TanStackStart.createServerFn({ diff --git a/packages/start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx similarity index 73% rename from packages/start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx rename to packages/react-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx index b30bcdc7319..6c0eda77f34 100644 --- a/packages/start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx +++ b/packages/react-start-plugin/tests/createServerFn/test-files/createServerFnValidator.tsx @@ -1,4 +1,4 @@ -import { createServerFn } from '@tanstack/start' +import { createServerFn } from '@tanstack/react-start' import { z } from 'zod' export const withUseServer = createServerFn({ diff --git a/packages/start-plugin/tests/envOnly/envOnly.test.ts b/packages/react-start-plugin/tests/envOnly/envOnly.test.ts similarity index 92% rename from packages/start-plugin/tests/envOnly/envOnly.test.ts rename to packages/react-start-plugin/tests/envOnly/envOnly.test.ts index ba6107fb711..0fae21d3aff 100644 --- a/packages/start-plugin/tests/envOnly/envOnly.test.ts +++ b/packages/react-start-plugin/tests/envOnly/envOnly.test.ts @@ -39,7 +39,7 @@ describe('envOnly functions compile correctly', async () => { compileStartOutput({ env: 'client', code: ` - import { clientOnly } from '@tanstack/start' + import { clientOnly } from '@tanstack/react-start' const fn = clientOnly()`, root: './test-files', filename: 'no-fn.ts', @@ -50,7 +50,7 @@ describe('envOnly functions compile correctly', async () => { compileStartOutput({ env: 'server', code: ` - import { serverOnly } from '@tanstack/start' + import { serverOnly } from '@tanstack/react-start' const fn = serverOnly()`, root: './test-files', filename: 'no-fn.ts', diff --git a/packages/start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx b/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx similarity index 69% rename from packages/start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx rename to packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx index 3dc714f6962..02eebb2c921 100644 --- a/packages/start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx +++ b/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructured.tsx @@ -1,4 +1,4 @@ -import { serverOnly, clientOnly } from '@tanstack/start'; +import { serverOnly, clientOnly } from '@tanstack/react-start'; const serverFunc = () => { throw new Error("serverOnly() functions can only be called on the server!"); }; diff --git a/packages/start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx b/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx similarity index 89% rename from packages/start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx rename to packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx index 3dd661c865c..6d1a2ddc69d 100644 --- a/packages/start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { serverOnly as serverFn, clientOnly as clientFn } from '@tanstack/start'; +import { serverOnly as serverFn, clientOnly as clientFn } from '@tanstack/react-start'; const serverFunc = () => { throw new Error("serverOnly() functions can only be called on the server!"); }; diff --git a/packages/start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx b/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx similarity index 71% rename from packages/start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx rename to packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx index 61f06779537..8ac7182b990 100644 --- a/packages/start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx +++ b/packages/react-start-plugin/tests/envOnly/snapshots/client/envOnlyStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanstackStart from '@tanstack/start'; +import * as TanstackStart from '@tanstack/react-start'; const serverFunc = () => { throw new Error("serverOnly() functions can only be called on the server!"); }; diff --git a/packages/start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx b/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx similarity index 69% rename from packages/start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx rename to packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx index 24f736eac24..48035800e3f 100644 --- a/packages/start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx +++ b/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructured.tsx @@ -1,4 +1,4 @@ -import { serverOnly, clientOnly } from '@tanstack/start'; +import { serverOnly, clientOnly } from '@tanstack/react-start'; const serverFunc = () => 'server'; const clientFunc = () => { throw new Error("clientOnly() functions can only be called on the client!"); diff --git a/packages/start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx b/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx similarity index 89% rename from packages/start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx rename to packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx index 790e1328d78..d0e31663f06 100644 --- a/packages/start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx +++ b/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx @@ -1,4 +1,4 @@ -import { serverOnly as serverFn, clientOnly as clientFn } from '@tanstack/start'; +import { serverOnly as serverFn, clientOnly as clientFn } from '@tanstack/react-start'; const serverFunc = () => 'server'; const clientFunc = () => { throw new Error("clientOnly() functions can only be called on the client!"); diff --git a/packages/start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx b/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx similarity index 71% rename from packages/start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx rename to packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx index 51e320d4a2c..34ad8a66469 100644 --- a/packages/start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx +++ b/packages/react-start-plugin/tests/envOnly/snapshots/server/envOnlyStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanstackStart from '@tanstack/start'; +import * as TanstackStart from '@tanstack/react-start'; const serverFunc = () => 'server'; const clientFunc = () => { throw new Error("clientOnly() functions can only be called on the client!"); diff --git a/packages/start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx b/packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx similarity index 59% rename from packages/start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx rename to packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx index 1389624d346..94e4fc29009 100644 --- a/packages/start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx +++ b/packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructured.tsx @@ -1,4 +1,4 @@ -import { serverOnly, clientOnly } from '@tanstack/start' +import { serverOnly, clientOnly } from '@tanstack/react-start' const serverFunc = serverOnly(() => 'server') diff --git a/packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx b/packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx new file mode 100644 index 00000000000..0912d0d7662 --- /dev/null +++ b/packages/react-start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx @@ -0,0 +1,8 @@ +import { + serverOnly as serverFn, + clientOnly as clientFn, +} from '@tanstack/react-start' + +const serverFunc = serverFn(() => 'server') + +const clientFunc = clientFn(() => 'client') diff --git a/packages/start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx b/packages/react-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx similarity index 68% rename from packages/start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx rename to packages/react-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx index cd262b54a0b..60afe0446de 100644 --- a/packages/start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx +++ b/packages/react-start-plugin/tests/envOnly/test-files/envOnlyStarImport.tsx @@ -1,4 +1,4 @@ -import * as TanstackStart from '@tanstack/start' +import * as TanstackStart from '@tanstack/react-start' const serverFunc = TanstackStart.serverOnly(() => 'server') diff --git a/packages/start-plugin/tsconfig.json b/packages/react-start-plugin/tsconfig.json similarity index 100% rename from packages/start-plugin/tsconfig.json rename to packages/react-start-plugin/tsconfig.json diff --git a/packages/start-plugin/vite.config.ts b/packages/react-start-plugin/vite.config.ts similarity index 100% rename from packages/start-plugin/vite.config.ts rename to packages/react-start-plugin/vite.config.ts diff --git a/packages/start-server-functions-client/README.md b/packages/react-start-router-manifest/README.md similarity index 100% rename from packages/start-server-functions-client/README.md rename to packages/react-start-router-manifest/README.md diff --git a/packages/start-server-functions-client/eslint.config.js b/packages/react-start-router-manifest/eslint.config.js similarity index 100% rename from packages/start-server-functions-client/eslint.config.js rename to packages/react-start-router-manifest/eslint.config.js diff --git a/packages/start-router-manifest/package.json b/packages/react-start-router-manifest/package.json similarity index 94% rename from packages/start-router-manifest/package.json rename to packages/react-start-router-manifest/package.json index b949899609a..bd090c15de7 100644 --- a/packages/start-router-manifest/package.json +++ b/packages/react-start-router-manifest/package.json @@ -1,5 +1,5 @@ { - "name": "@tanstack/start-router-manifest", + "name": "@tanstack/react-start-router-manifest", "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", @@ -7,7 +7,7 @@ "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-router-manifest" }, "homepage": "https://tanstack.com/start", "funding": { diff --git a/packages/start-router-manifest/src/index.ts b/packages/react-start-router-manifest/src/index.ts similarity index 100% rename from packages/start-router-manifest/src/index.ts rename to packages/react-start-router-manifest/src/index.ts diff --git a/packages/react-start-router-manifest/tsconfig.json b/packages/react-start-router-manifest/tsconfig.json new file mode 100644 index 00000000000..940a9cce0a5 --- /dev/null +++ b/packages/react-start-router-manifest/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig.json", + "include": ["src/index.ts"], + "compilerOptions": { + "rootDir": "src", + "outDir": "dist/esm", + "target": "esnext", + "noEmit": false + } +} diff --git a/packages/start-router-manifest/vite.config.ts b/packages/react-start-router-manifest/vite.config.ts similarity index 100% rename from packages/start-router-manifest/vite.config.ts rename to packages/react-start-router-manifest/vite.config.ts diff --git a/packages/start-server-functions-fetcher/README.md b/packages/react-start-server-functions-client/README.md similarity index 100% rename from packages/start-server-functions-fetcher/README.md rename to packages/react-start-server-functions-client/README.md diff --git a/packages/start-server-functions-fetcher/eslint.config.js b/packages/react-start-server-functions-client/eslint.config.js similarity index 100% rename from packages/start-server-functions-fetcher/eslint.config.js rename to packages/react-start-server-functions-client/eslint.config.js diff --git a/packages/start-server-functions-client/package.json b/packages/react-start-server-functions-client/package.json similarity index 89% rename from packages/start-server-functions-client/package.json rename to packages/react-start-server-functions-client/package.json index fab3c814354..cc95c7d6ec6 100644 --- a/packages/start-server-functions-client/package.json +++ b/packages/react-start-server-functions-client/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-server-functions-client", - "version": "1.111.9", + "name": "@tanstack/react-start-server-functions-client", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-server-functions-client" }, "homepage": "https://tanstack.com/start", "funding": { @@ -63,7 +63,7 @@ }, "dependencies": { "@tanstack/server-functions-plugin": "workspace:^", - "@tanstack/start-server-functions-fetcher": "workspace:^" + "@tanstack/react-start-server-functions-fetcher": "workspace:^" }, "devDependencies": { "typescript": "^5.7.2" diff --git a/packages/start-server-functions-client/src/index.ts b/packages/react-start-server-functions-client/src/index.ts similarity index 84% rename from packages/start-server-functions-client/src/index.ts rename to packages/react-start-server-functions-client/src/index.ts index 2c66bc01c9a..4da4c3e8d54 100644 --- a/packages/start-server-functions-client/src/index.ts +++ b/packages/react-start-server-functions-client/src/index.ts @@ -1,4 +1,4 @@ -import { serverFnFetcher } from '@tanstack/start-server-functions-fetcher' +import { serverFnFetcher } from '@tanstack/react-start-server-functions-fetcher' import type { CreateRpcFn } from '@tanstack/server-functions-plugin' function sanitizeBase(base: string) { diff --git a/packages/start-server-functions-client/tsconfig.json b/packages/react-start-server-functions-client/tsconfig.json similarity index 100% rename from packages/start-server-functions-client/tsconfig.json rename to packages/react-start-server-functions-client/tsconfig.json diff --git a/packages/start-server-functions-client/tsconfigs/config.tsconfig.json b/packages/react-start-server-functions-client/tsconfigs/config.tsconfig.json similarity index 100% rename from packages/start-server-functions-client/tsconfigs/config.tsconfig.json rename to packages/react-start-server-functions-client/tsconfigs/config.tsconfig.json diff --git a/packages/start-server-functions-client/tsconfigs/router-manifest.tsconfig.json b/packages/react-start-server-functions-client/tsconfigs/router-manifest.tsconfig.json similarity index 100% rename from packages/start-server-functions-client/tsconfigs/router-manifest.tsconfig.json rename to packages/react-start-server-functions-client/tsconfigs/router-manifest.tsconfig.json diff --git a/packages/start-server-functions-client/vite.config.ts b/packages/react-start-server-functions-client/vite.config.ts similarity index 100% rename from packages/start-server-functions-client/vite.config.ts rename to packages/react-start-server-functions-client/vite.config.ts diff --git a/packages/start-server-functions-handler/README.md b/packages/react-start-server-functions-fetcher/README.md similarity index 100% rename from packages/start-server-functions-handler/README.md rename to packages/react-start-server-functions-fetcher/README.md diff --git a/packages/start-server-functions-handler/eslint.config.js b/packages/react-start-server-functions-fetcher/eslint.config.js similarity index 100% rename from packages/start-server-functions-handler/eslint.config.js rename to packages/react-start-server-functions-fetcher/eslint.config.js diff --git a/packages/start-server-functions-fetcher/package.json b/packages/react-start-server-functions-fetcher/package.json similarity index 91% rename from packages/start-server-functions-fetcher/package.json rename to packages/react-start-server-functions-fetcher/package.json index 3d812bffe4d..a1fb3883887 100644 --- a/packages/start-server-functions-fetcher/package.json +++ b/packages/react-start-server-functions-fetcher/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-server-functions-fetcher", - "version": "1.111.9", + "name": "@tanstack/react-start-server-functions-fetcher", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-server-functions-fetcher" }, "homepage": "https://tanstack.com/start", "funding": { @@ -64,7 +64,7 @@ "dependencies": { "@tanstack/react-router": "workspace:^", "@tanstack/router-core": "workspace:^", - "@tanstack/start-client": "workspace:^" + "@tanstack/react-start-client": "workspace:^" }, "devDependencies": { "@vitejs/plugin-react": "^4.3.4", diff --git a/packages/start-server-functions-fetcher/src/index.ts b/packages/react-start-server-functions-fetcher/src/index.ts similarity index 96% rename from packages/start-server-functions-fetcher/src/index.ts rename to packages/react-start-server-functions-fetcher/src/index.ts index 19e7d923135..2fe5528868e 100644 --- a/packages/start-server-functions-fetcher/src/index.ts +++ b/packages/react-start-server-functions-fetcher/src/index.ts @@ -1,7 +1,7 @@ import { isNotFound, isRedirect } from '@tanstack/react-router' import { encode, isPlainObject } from '@tanstack/router-core' -import { startSerializer } from '@tanstack/start-client' -import type { MiddlewareClientFnOptions } from '@tanstack/start-client' +import { startSerializer } from '@tanstack/react-start-client' +import type { MiddlewareClientFnOptions } from '@tanstack/react-start-client' export async function serverFnFetcher( url: string, diff --git a/packages/start-server-functions-fetcher/tsconfig.json b/packages/react-start-server-functions-fetcher/tsconfig.json similarity index 100% rename from packages/start-server-functions-fetcher/tsconfig.json rename to packages/react-start-server-functions-fetcher/tsconfig.json diff --git a/packages/start-server-functions-fetcher/vite.config.ts b/packages/react-start-server-functions-fetcher/vite.config.ts similarity index 100% rename from packages/start-server-functions-fetcher/vite.config.ts rename to packages/react-start-server-functions-fetcher/vite.config.ts diff --git a/packages/start-server-functions-ssr/README.md b/packages/react-start-server-functions-handler/README.md similarity index 100% rename from packages/start-server-functions-ssr/README.md rename to packages/react-start-server-functions-handler/README.md diff --git a/packages/start-server-functions-ssr/eslint.config.js b/packages/react-start-server-functions-handler/eslint.config.js similarity index 100% rename from packages/start-server-functions-ssr/eslint.config.js rename to packages/react-start-server-functions-handler/eslint.config.js diff --git a/packages/start-server-functions-handler/package.json b/packages/react-start-server-functions-handler/package.json similarity index 89% rename from packages/start-server-functions-handler/package.json rename to packages/react-start-server-functions-handler/package.json index 4a7bb0238ba..67ea3eb4cb5 100644 --- a/packages/start-server-functions-handler/package.json +++ b/packages/react-start-server-functions-handler/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-server-functions-handler", - "version": "1.111.9", + "name": "@tanstack/react-start-server-functions-handler", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-server-functions-handler" }, "homepage": "https://tanstack.com/start", "funding": { @@ -63,8 +63,8 @@ }, "dependencies": { "@tanstack/react-router": "workspace:^", - "@tanstack/start-client": "workspace:^", - "@tanstack/start-server": "workspace:^", + "@tanstack/react-start-client": "workspace:^", + "@tanstack/react-start-server": "workspace:^", "tiny-invariant": "^1.3.3" }, "devDependencies": { diff --git a/packages/start-server-functions-handler/src/index.ts b/packages/react-start-server-functions-handler/src/index.ts similarity index 98% rename from packages/start-server-functions-handler/src/index.ts rename to packages/react-start-server-functions-handler/src/index.ts index c698235ea1c..7f7ffda69d9 100644 --- a/packages/start-server-functions-handler/src/index.ts +++ b/packages/react-start-server-functions-handler/src/index.ts @@ -5,11 +5,11 @@ import { getEvent, getResponseStatus, toWebRequest, -} from '@tanstack/start-server' -import { startSerializer } from '@tanstack/start-client' +} from '@tanstack/react-start-server' +import { startSerializer } from '@tanstack/react-start-client' // @ts-expect-error import _serverFnManifest from 'tsr:server-fn-manifest' -import type { H3Event } from '@tanstack/start-server' +import type { H3Event } from '@tanstack/react-start-server' // NOTE: This is a dummy export to silence warnings about // only having a default export. diff --git a/packages/start-server-functions-handler/tsconfig.json b/packages/react-start-server-functions-handler/tsconfig.json similarity index 100% rename from packages/start-server-functions-handler/tsconfig.json rename to packages/react-start-server-functions-handler/tsconfig.json diff --git a/packages/start-server-functions-handler/vite.config.ts b/packages/react-start-server-functions-handler/vite.config.ts similarity index 100% rename from packages/start-server-functions-handler/vite.config.ts rename to packages/react-start-server-functions-handler/vite.config.ts diff --git a/packages/start-server/README.md b/packages/react-start-server-functions-ssr/README.md similarity index 100% rename from packages/start-server/README.md rename to packages/react-start-server-functions-ssr/README.md diff --git a/packages/start-server/eslint.config.js b/packages/react-start-server-functions-ssr/eslint.config.js similarity index 100% rename from packages/start-server/eslint.config.js rename to packages/react-start-server-functions-ssr/eslint.config.js diff --git a/packages/start-server-functions-ssr/package.json b/packages/react-start-server-functions-ssr/package.json similarity index 85% rename from packages/start-server-functions-ssr/package.json rename to packages/react-start-server-functions-ssr/package.json index 0edbcac021b..e7ddc36c778 100644 --- a/packages/start-server-functions-ssr/package.json +++ b/packages/react-start-server-functions-ssr/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-server-functions-ssr", - "version": "1.111.9", + "name": "@tanstack/react-start-server-functions-ssr", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-server-functions-ssr" }, "homepage": "https://tanstack.com/start", "funding": { @@ -62,9 +62,9 @@ }, "dependencies": { "@tanstack/server-functions-plugin": "workspace:^", - "@tanstack/start-client": "workspace:^", - "@tanstack/start-server": "workspace:^", - "@tanstack/start-server-functions-fetcher": "workspace:^", + "@tanstack/react-start-client": "workspace:^", + "@tanstack/react-start-server": "workspace:^", + "@tanstack/react-start-server-functions-fetcher": "workspace:^", "tiny-invariant": "^1.3.3" }, "devDependencies": { diff --git a/packages/start-server-functions-ssr/src/index.ts b/packages/react-start-server-functions-ssr/src/index.ts similarity index 85% rename from packages/start-server-functions-ssr/src/index.ts rename to packages/react-start-server-functions-ssr/src/index.ts index 8692f9da32c..20315f01ee2 100644 --- a/packages/start-server-functions-ssr/src/index.ts +++ b/packages/react-start-server-functions-ssr/src/index.ts @@ -1,7 +1,7 @@ /// -import { serverFnFetcher } from '@tanstack/start-server-functions-fetcher' -import { mergeHeaders } from '@tanstack/start-client' -import { getEvent, getHeaders } from '@tanstack/start-server' +import { serverFnFetcher } from '@tanstack/react-start-server-functions-fetcher' +import { mergeHeaders } from '@tanstack/react-start-client' +import { getEvent, getHeaders } from '@tanstack/react-start-server' import type { CreateRpcFn } from '@tanstack/server-functions-plugin' function sanitizeBase(base: string) { diff --git a/packages/start-server-functions-ssr/tsconfig.json b/packages/react-start-server-functions-ssr/tsconfig.json similarity index 100% rename from packages/start-server-functions-ssr/tsconfig.json rename to packages/react-start-server-functions-ssr/tsconfig.json diff --git a/packages/start-server-functions-ssr/tsconfigs/config.tsconfig.json b/packages/react-start-server-functions-ssr/tsconfigs/config.tsconfig.json similarity index 100% rename from packages/start-server-functions-ssr/tsconfigs/config.tsconfig.json rename to packages/react-start-server-functions-ssr/tsconfigs/config.tsconfig.json diff --git a/packages/start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json b/packages/react-start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json similarity index 100% rename from packages/start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json rename to packages/react-start-server-functions-ssr/tsconfigs/router-manifest.tsconfig.json diff --git a/packages/start-server-functions-ssr/vite.config.ts b/packages/react-start-server-functions-ssr/vite.config.ts similarity index 100% rename from packages/start-server-functions-ssr/vite.config.ts rename to packages/react-start-server-functions-ssr/vite.config.ts diff --git a/packages/react-start-server/README.md b/packages/react-start-server/README.md new file mode 100644 index 00000000000..bb009b0c87e --- /dev/null +++ b/packages/react-start-server/README.md @@ -0,0 +1,33 @@ +> 🤫 we're cooking up something special! + + + +# TanStack Start + +![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) + +🤖 Type-safe router w/ built-in caching & URL state management for React! + + + #TanStack + + + + + + + + semantic-release + + Join the discussion on Github +Best of JS + + + + + + + +Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) + +## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/react-start-server/eslint.config.js b/packages/react-start-server/eslint.config.js new file mode 100644 index 00000000000..931f0ec774a --- /dev/null +++ b/packages/react-start-server/eslint.config.js @@ -0,0 +1,31 @@ +// @ts-check + +import pluginReact from '@eslint-react/eslint-plugin' +import pluginReactHooks from 'eslint-plugin-react-hooks' +import rootConfig from '../../eslint.config.js' + +export default [ + ...rootConfig, + { + ...pluginReact.configs.recommended, + files: ['**/*.{ts,tsx}'], + }, + { + plugins: { + 'react-hooks': pluginReactHooks, + }, + rules: { + '@eslint-react/no-unstable-context-value': 'off', + '@eslint-react/no-unstable-default-props': 'off', + '@eslint-react/dom/no-missing-button-type': 'off', + 'react-hooks/exhaustive-deps': 'error', + 'react-hooks/rules-of-hooks': 'error', + }, + }, + { + files: ['**/__tests__/**'], + rules: { + '@typescript-eslint/no-unnecessary-condition': 'off', + }, + }, +] diff --git a/packages/start-server/package.json b/packages/react-start-server/package.json similarity index 93% rename from packages/start-server/package.json rename to packages/react-start-server/package.json index 09e785aeb4b..40073468b84 100644 --- a/packages/start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,13 +1,13 @@ { - "name": "@tanstack/start-server", - "version": "1.111.9", + "name": "@tanstack/react-start-server", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/react-start-server" }, "homepage": "https://tanstack.com/start", "funding": { @@ -65,7 +65,7 @@ "@tanstack/history": "workspace:^", "@tanstack/react-router": "workspace:^", "@tanstack/router-core": "workspace:^", - "@tanstack/start-client": "workspace:^", + "@tanstack/react-start-client": "workspace:^", "tiny-warning": "^1.0.3", "h3": "1.13.0", "isbot": "^5.1.22", diff --git a/packages/start-server/src/StartServer.tsx b/packages/react-start-server/src/StartServer.tsx similarity index 100% rename from packages/start-server/src/StartServer.tsx rename to packages/react-start-server/src/StartServer.tsx diff --git a/packages/start-server/src/createRequestHandler.ts b/packages/react-start-server/src/createRequestHandler.ts similarity index 96% rename from packages/start-server/src/createRequestHandler.ts rename to packages/react-start-server/src/createRequestHandler.ts index 26cdd5582e8..a8c3914931c 100644 --- a/packages/start-server/src/createRequestHandler.ts +++ b/packages/react-start-server/src/createRequestHandler.ts @@ -1,5 +1,5 @@ import { createMemoryHistory } from '@tanstack/history' -import { mergeHeaders } from '@tanstack/start-client' +import { mergeHeaders } from '@tanstack/react-start-client' import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server' import type { HandlerCallback } from './handlerCallback' import type { AnyRouter, Manifest } from '@tanstack/react-router' diff --git a/packages/start-server/src/createStartHandler.ts b/packages/react-start-server/src/createStartHandler.ts similarity index 97% rename from packages/start-server/src/createStartHandler.ts rename to packages/react-start-server/src/createStartHandler.ts index b5554b39804..d7b38a3f104 100644 --- a/packages/start-server/src/createStartHandler.ts +++ b/packages/react-start-server/src/createStartHandler.ts @@ -1,5 +1,5 @@ import { createMemoryHistory } from '@tanstack/history' -import { mergeHeaders } from '@tanstack/start-client' +import { mergeHeaders } from '@tanstack/react-start-client' import { eventHandler, getResponseHeaders, toWebRequest } from 'h3' import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server' import type { HandlerCallback } from './handlerCallback' diff --git a/packages/start-server/src/defaultRenderHandler.tsx b/packages/react-start-server/src/defaultRenderHandler.tsx similarity index 100% rename from packages/start-server/src/defaultRenderHandler.tsx rename to packages/react-start-server/src/defaultRenderHandler.tsx diff --git a/packages/start-server/src/defaultStreamHandler.tsx b/packages/react-start-server/src/defaultStreamHandler.tsx similarity index 100% rename from packages/start-server/src/defaultStreamHandler.tsx rename to packages/react-start-server/src/defaultStreamHandler.tsx diff --git a/packages/start-server/src/handlerCallback.ts b/packages/react-start-server/src/handlerCallback.ts similarity index 100% rename from packages/start-server/src/handlerCallback.ts rename to packages/react-start-server/src/handlerCallback.ts diff --git a/packages/start-server/src/index.tsx b/packages/react-start-server/src/index.tsx similarity index 100% rename from packages/start-server/src/index.tsx rename to packages/react-start-server/src/index.tsx diff --git a/packages/start-server/src/ssr-server.ts b/packages/react-start-server/src/ssr-server.ts similarity index 98% rename from packages/start-server/src/ssr-server.ts rename to packages/react-start-server/src/ssr-server.ts index 4ad9738807a..a68b8f7527b 100644 --- a/packages/start-server/src/ssr-server.ts +++ b/packages/react-start-server/src/ssr-server.ts @@ -7,14 +7,14 @@ import { pick, } from '@tanstack/router-core' import jsesc from 'jsesc' -import { startSerializer } from '@tanstack/start-client' +import { startSerializer } from '@tanstack/react-start-client' import minifiedTsrBootStrapScript from './tsrScript?script-string' import type { ClientExtractedBaseEntry, DehydratedRouter, ResolvePromiseState, SsrMatch, -} from '@tanstack/start-client' +} from '@tanstack/react-start-client' import type { AnyRouteMatch, AnyRouter } from '@tanstack/react-router' import type { DeferredPromise, Manifest } from '@tanstack/router-core' diff --git a/packages/start-server/src/transformStreamWithRouter.ts b/packages/react-start-server/src/transformStreamWithRouter.ts similarity index 100% rename from packages/start-server/src/transformStreamWithRouter.ts rename to packages/react-start-server/src/transformStreamWithRouter.ts diff --git a/packages/start-server/src/tsrScript.ts b/packages/react-start-server/src/tsrScript.ts similarity index 97% rename from packages/start-server/src/tsrScript.ts rename to packages/react-start-server/src/tsrScript.ts index f18f1660c23..0ddf94f5d95 100644 --- a/packages/start-server/src/tsrScript.ts +++ b/packages/react-start-server/src/tsrScript.ts @@ -1,5 +1,5 @@ import type { ControllablePromise } from '@tanstack/react-router' -import type { StartSsrGlobal } from '@tanstack/start-client' +import type { StartSsrGlobal } from '@tanstack/react-start-client' const __TSR_SSR__: StartSsrGlobal = { matches: [], diff --git a/packages/start-server/src/vite-env.d.ts b/packages/react-start-server/src/vite-env.d.ts similarity index 100% rename from packages/start-server/src/vite-env.d.ts rename to packages/react-start-server/src/vite-env.d.ts diff --git a/packages/start-server/tests/h3-wrappers.test-d.ts b/packages/react-start-server/tests/h3-wrappers.test-d.ts similarity index 100% rename from packages/start-server/tests/h3-wrappers.test-d.ts rename to packages/react-start-server/tests/h3-wrappers.test-d.ts diff --git a/packages/start-server/tsconfig.json b/packages/react-start-server/tsconfig.json similarity index 100% rename from packages/start-server/tsconfig.json rename to packages/react-start-server/tsconfig.json diff --git a/packages/start-server/vite-minify-plugin.ts b/packages/react-start-server/vite-minify-plugin.ts similarity index 100% rename from packages/start-server/vite-minify-plugin.ts rename to packages/react-start-server/vite-minify-plugin.ts diff --git a/packages/start-server/vite.config.ts b/packages/react-start-server/vite.config.ts similarity index 100% rename from packages/start-server/vite.config.ts rename to packages/react-start-server/vite.config.ts diff --git a/packages/react-start/README.md b/packages/react-start/README.md new file mode 100644 index 00000000000..bb009b0c87e --- /dev/null +++ b/packages/react-start/README.md @@ -0,0 +1,33 @@ +> 🤫 we're cooking up something special! + + + +# TanStack Start + +![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png) + +🤖 Type-safe router w/ built-in caching & URL state management for React! + + + #TanStack + + + + + + + + semantic-release + + Join the discussion on Github +Best of JS + + + + + + + +Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual) + +## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more! diff --git a/packages/react-start/eslint.config.js b/packages/react-start/eslint.config.js new file mode 100644 index 00000000000..931f0ec774a --- /dev/null +++ b/packages/react-start/eslint.config.js @@ -0,0 +1,31 @@ +// @ts-check + +import pluginReact from '@eslint-react/eslint-plugin' +import pluginReactHooks from 'eslint-plugin-react-hooks' +import rootConfig from '../../eslint.config.js' + +export default [ + ...rootConfig, + { + ...pluginReact.configs.recommended, + files: ['**/*.{ts,tsx}'], + }, + { + plugins: { + 'react-hooks': pluginReactHooks, + }, + rules: { + '@eslint-react/no-unstable-context-value': 'off', + '@eslint-react/no-unstable-default-props': 'off', + '@eslint-react/dom/no-missing-button-type': 'off', + 'react-hooks/exhaustive-deps': 'error', + 'react-hooks/rules-of-hooks': 'error', + }, + }, + { + files: ['**/__tests__/**'], + rules: { + '@typescript-eslint/no-unnecessary-condition': 'off', + }, + }, +] diff --git a/packages/react-start/package.json b/packages/react-start/package.json new file mode 100644 index 00000000000..8a87eb91372 --- /dev/null +++ b/packages/react-start/package.json @@ -0,0 +1,164 @@ +{ + "name": "@tanstack/react-start", + "version": "1.111.7", + "description": "Modern and scalable routing for React applications", + "author": "Tanner Linsley", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/TanStack/router.git", + "directory": "packages/react-start" + }, + "homepage": "https://tanstack.com/start", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "keywords": [ + "react", + "location", + "router", + "routing", + "async", + "async router", + "typescript" + ], + "scripts": { + "clean": "rimraf ./dist && rimraf ./coverage", + "test": "pnpm test:build", + "test:build": "exit 0; vitest", + "build": "vite build" + }, + "type": "module", + "types": "dist/esm/client.d.ts", + "exports": { + ".": { + "import": { + "types": "./dist/esm/client.d.ts", + "default": "./dist/esm/client.js" + }, + "require": { + "types": "./dist/cjs/client.d.cts", + "default": "./dist/cjs/client.cjs" + } + }, + "./client": { + "import": { + "types": "./dist/esm/client.d.ts", + "default": "./dist/esm/client.js" + }, + "require": { + "types": "./dist/cjs/client.d.cts", + "default": "./dist/cjs/client.cjs" + } + }, + "./server": { + "import": { + "types": "./dist/esm/server.d.ts", + "default": "./dist/esm/server.js" + }, + "require": { + "types": "./dist/cjs/server.d.cts", + "default": "./dist/cjs/server.cjs" + } + }, + "./config": { + "import": { + "types": "./dist/esm/config.d.ts", + "default": "./dist/esm/config.js" + }, + "require": { + "types": "./dist/cjs/config.d.cts", + "default": "./dist/cjs/config.cjs" + } + }, + "./api": { + "import": { + "types": "./dist/esm/api.d.ts", + "default": "./dist/esm/api.js" + }, + "require": { + "types": "./dist/cjs/api.d.cts", + "default": "./dist/cjs/api.cjs" + } + }, + "./router-manifest": { + "import": { + "types": "./dist/esm/router-manifest.d.ts", + "default": "./dist/esm/router-manifest.js" + }, + "require": { + "types": "./dist/cjs/router-manifest.d.cts", + "default": "./dist/cjs/router-manifest.cjs" + } + }, + "./server-functions-client": { + "import": { + "types": "./dist/esm/server-functions-client.d.ts", + "default": "./dist/esm/server-functions-client.js" + }, + "require": { + "types": "./dist/cjs/server-functions-client.d.cts", + "default": "./dist/cjs/server-functions-client.cjs" + } + }, + "./server-functions-server": { + "import": { + "types": "./dist/esm/server-functions-server.d.ts", + "default": "./dist/esm/server-functions-server.js" + }, + "require": { + "types": "./dist/cjs/server-functions-server.d.cts", + "default": "./dist/cjs/server-functions-server.cjs" + } + }, + "./server-functions-handler": { + "import": { + "types": "./dist/esm/server-functions-handler.d.ts", + "default": "./dist/esm/server-functions-handler.js" + }, + "require": { + "types": "./dist/cjs/server-functions-handler.d.cts", + "default": "./dist/cjs/server-functions-handler.cjs" + } + }, + "./server-functions-ssr": { + "import": { + "types": "./dist/esm/server-functions-ssr.d.ts", + "default": "./dist/esm/server-functions-ssr.js" + }, + "require": { + "types": "./dist/cjs/server-functions-ssr.d.cts", + "default": "./dist/cjs/server-functions-ssr.cjs" + } + }, + "./package.json": "./package.json" + }, + "sideEffects": false, + "files": [ + "dist", + "src" + ], + "engines": { + "node": ">=12" + }, + "dependencies": { + "@tanstack/react-start-client": "workspace:^", + "@tanstack/react-start-server": "workspace:^", + "@tanstack/react-start-config": "workspace:^", + "@tanstack/react-start-router-manifest": "workspace:^", + "@tanstack/react-start-server-functions-client": "workspace:^", + "@tanstack/start-server-functions-server": "workspace:^", + "@tanstack/react-start-server-functions-handler": "workspace:^", + "@tanstack/react-start-server-functions-ssr": "workspace:^", + "@tanstack/react-start-api-routes": "workspace:^" + }, + "peerDependencies": { + "react": ">=18.0.0 || >=19.0.0", + "react-dom": ">=18.0.0 || >=19.0.0", + "vite": "^6.0.0" + }, + "devDependencies": { + "esbuild": "^0.25.0" + } +} diff --git a/packages/react-start/src/api.tsx b/packages/react-start/src/api.tsx new file mode 100644 index 00000000000..cf7b56d3b01 --- /dev/null +++ b/packages/react-start/src/api.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-api-routes' diff --git a/packages/react-start/src/client.tsx b/packages/react-start/src/client.tsx new file mode 100644 index 00000000000..3f6defdff06 --- /dev/null +++ b/packages/react-start/src/client.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-client' diff --git a/packages/react-start/src/config.tsx b/packages/react-start/src/config.tsx new file mode 100644 index 00000000000..57a7ae394d7 --- /dev/null +++ b/packages/react-start/src/config.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-config' diff --git a/packages/react-start/src/router-manifest.tsx b/packages/react-start/src/router-manifest.tsx new file mode 100644 index 00000000000..ce430d78842 --- /dev/null +++ b/packages/react-start/src/router-manifest.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-router-manifest' diff --git a/packages/react-start/src/server-functions-client.tsx b/packages/react-start/src/server-functions-client.tsx new file mode 100644 index 00000000000..e656beda00e --- /dev/null +++ b/packages/react-start/src/server-functions-client.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-server-functions-client' diff --git a/packages/react-start/src/server-functions-handler.tsx b/packages/react-start/src/server-functions-handler.tsx new file mode 100644 index 00000000000..26e58e19e49 --- /dev/null +++ b/packages/react-start/src/server-functions-handler.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-server-functions-handler' diff --git a/packages/react-start/src/server-functions-server.tsx b/packages/react-start/src/server-functions-server.tsx new file mode 100644 index 00000000000..cbbdd07a892 --- /dev/null +++ b/packages/react-start/src/server-functions-server.tsx @@ -0,0 +1 @@ +export * from '@tanstack/start-server-functions-server' diff --git a/packages/react-start/src/server-functions-ssr.tsx b/packages/react-start/src/server-functions-ssr.tsx new file mode 100644 index 00000000000..be17b180caf --- /dev/null +++ b/packages/react-start/src/server-functions-ssr.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-server-functions-ssr' diff --git a/packages/react-start/src/server.tsx b/packages/react-start/src/server.tsx new file mode 100644 index 00000000000..d2997ab85fc --- /dev/null +++ b/packages/react-start/src/server.tsx @@ -0,0 +1 @@ +export * from '@tanstack/react-start-server' diff --git a/packages/react-start/tsconfig.json b/packages/react-start/tsconfig.json new file mode 100644 index 00000000000..51dda9abf2a --- /dev/null +++ b/packages/react-start/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "jsx": "react-jsx", + "module": "esnext" + }, + "include": ["src", "vite.config.ts"] +} diff --git a/packages/react-start/vite.config.ts b/packages/react-start/vite.config.ts new file mode 100644 index 00000000000..cf9244f2814 --- /dev/null +++ b/packages/react-start/vite.config.ts @@ -0,0 +1,38 @@ +import { defineConfig, mergeConfig } from 'vitest/config' +import { tanstackViteConfig } from '@tanstack/config/vite' +import packageJson from './package.json' + +const config = defineConfig({ + test: { + name: packageJson.name, + watch: false, + environment: 'jsdom', + }, +}) + +export default mergeConfig( + config, + tanstackViteConfig({ + srcDir: './src', + entry: [ + './src/client.tsx', + './src/server.tsx', + './src/config.tsx', + './src/router-manifest.tsx', + './src/server-functions-client.tsx', + './src/server-functions-server.tsx', + './src/server-functions-ssr.tsx', + './src/api.tsx', + ], + externalDeps: [ + '@tanstack/react-start-client', + '@tanstack/react-start-server', + '@tanstack/react-start-config', + '@tanstack/react-start-router-manifest', + '@tanstack/react-start-server-functions-client', + '@tanstack/start-server-functions-server', + '@tanstack/react-start-server-functions-ssr', + '@tanstack/react-start-api-routes', + ], + }), +) diff --git a/packages/start-config/package.json b/packages/start-config/package.json index f0430501ca4..71364175b98 100644 --- a/packages/start-config/package.json +++ b/packages/start-config/package.json @@ -1,13 +1,13 @@ { "name": "@tanstack/start-config", - "version": "1.111.9", + "version": "1.111.7", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/start-config" }, "homepage": "https://tanstack.com/start", "funding": { @@ -55,8 +55,8 @@ "@tanstack/router-generator": "workspace:^", "@tanstack/router-plugin": "workspace:^", "@tanstack/server-functions-plugin": "workspace:^", - "@tanstack/start-plugin": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", + "@tanstack/react-start-plugin": "workspace:^", + "@tanstack/react-start-server-functions-handler": "workspace:^", "@vitejs/plugin-react": "^4.3.4", "import-meta-resolve": "^4.1.0", "nitropack": "^2.10.4", diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts index 2137c807a62..5eb0a193ca4 100644 --- a/packages/start-config/src/index.ts +++ b/packages/start-config/src/index.ts @@ -11,7 +11,7 @@ import { config } from 'vinxi/plugins/config' // // @ts-expect-error // import { serverComponents } from '@vinxi/server-components/plugin' import { createTanStackServerFnPlugin } from '@tanstack/server-functions-plugin' -import { createTanStackStartPlugin } from '@tanstack/start-plugin' +import { createTanStackStartPlugin } from '@tanstack/react-start-plugin' import { createFetch } from 'ofetch' import { createNitro } from 'nitropack' import { tanstackStartVinxiFileRouter } from './vinxi-file-router.js' @@ -305,7 +305,7 @@ export async function defineConfig( // TODO: RSCS - enable this // worker: true, handler: importToProjectRelative( - '@tanstack/start-server-functions-handler', + '@tanstack/react-start-server-functions-handler', ), plugins: () => { const routerType = 'server' @@ -379,17 +379,18 @@ export async function defineConfig( const noExternal = [ '@tanstack/start', - '@tanstack/start/server', - '@tanstack/start-client', - '@tanstack/start-server', - '@tanstack/start-server-functions-fetcher', - '@tanstack/start-server-functions-handler', - '@tanstack/start-server-functions-client', - '@tanstack/start-server-functions-ssr', + '@tanstack/react-start', + '@tanstack/react-start/server', + '@tanstack/react-start-client', + '@tanstack/react-start-server', + '@tanstack/react-start-server-functions-fetcher', + '@tanstack/react-start-server-functions-handler', + '@tanstack/react-start-server-functions-client', + '@tanstack/react-start-server-functions-ssr', '@tanstack/start-server-functions-server', - '@tanstack/start-router-manifest', + '@tanstack/react-start-router-manifest', '@tanstack/start-config', - '@tanstack/start-api-routes', + '@tanstack/react-start-api-routes', '@tanstack/server-functions-plugin', 'tsr:routes-manifest', 'tsr:server-fn-manifest', diff --git a/packages/start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx b/packages/start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx deleted file mode 100644 index ac34f06134a..00000000000 --- a/packages/start-plugin/tests/envOnly/test-files/envOnlyDestructuredRename.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { serverOnly as serverFn, clientOnly as clientFn } from '@tanstack/start' - -const serverFunc = serverFn(() => 'server') - -const clientFunc = clientFn(() => 'client') diff --git a/packages/start-server-functions-server/package.json b/packages/start-server-functions-server/package.json index 415e7c42d3c..7e75db73d3e 100644 --- a/packages/start-server-functions-server/package.json +++ b/packages/start-server-functions-server/package.json @@ -7,7 +7,7 @@ "repository": { "type": "git", "url": "https://github.com/TanStack/router.git", - "directory": "packages/start" + "directory": "packages/start-server-functions-server" }, "homepage": "https://tanstack.com/start", "funding": { diff --git a/packages/start/package.json b/packages/start/package.json index 34ee6c5efbc..15a16f8d803 100644 --- a/packages/start/package.json +++ b/packages/start/package.json @@ -143,22 +143,14 @@ "node": ">=12" }, "dependencies": { - "@tanstack/start-client": "workspace:^", - "@tanstack/start-server": "workspace:^", + "@tanstack/react-start-client": "workspace:^", + "@tanstack/react-start-server": "workspace:^", "@tanstack/start-config": "workspace:^", - "@tanstack/start-router-manifest": "workspace:^", - "@tanstack/start-server-functions-client": "workspace:^", + "@tanstack/react-start-router-manifest": "workspace:^", + "@tanstack/react-start-server-functions-client": "workspace:^", "@tanstack/start-server-functions-server": "workspace:^", - "@tanstack/start-server-functions-handler": "workspace:^", - "@tanstack/start-server-functions-ssr": "workspace:^", - "@tanstack/start-api-routes": "workspace:^" - }, - "peerDependencies": { - "react": ">=18.0.0 || >=19.0.0", - "react-dom": ">=18.0.0 || >=19.0.0", - "vite": "^6.0.0" - }, - "devDependencies": { - "esbuild": "^0.25.0" + "@tanstack/react-start-server-functions-handler": "workspace:^", + "@tanstack/react-start-server-functions-ssr": "workspace:^", + "@tanstack/react-start-api-routes": "workspace:^" } } diff --git a/packages/start/src/api.tsx b/packages/start/src/api.tsx index fff3bec5ea9..c7a6f18c768 100644 --- a/packages/start/src/api.tsx +++ b/packages/start/src/api.tsx @@ -1 +1,4 @@ -export * from '@tanstack/start-api-routes' +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) +export * from '@tanstack/react-start-api-routes' diff --git a/packages/start/src/client.tsx b/packages/start/src/client.tsx index b27243a7895..e2a9aa5466a 100644 --- a/packages/start/src/client.tsx +++ b/packages/start/src/client.tsx @@ -1 +1,4 @@ -export * from '@tanstack/start-client' +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) +export * from '@tanstack/react-start-client' diff --git a/packages/start/src/config.tsx b/packages/start/src/config.tsx index 89ad9153457..262bac966cf 100644 --- a/packages/start/src/config.tsx +++ b/packages/start/src/config.tsx @@ -1 +1,4 @@ +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) export * from '@tanstack/start-config' diff --git a/packages/start/src/router-manifest.tsx b/packages/start/src/router-manifest.tsx index 38f6fdac0a7..10e98ba06d2 100644 --- a/packages/start/src/router-manifest.tsx +++ b/packages/start/src/router-manifest.tsx @@ -1 +1,4 @@ -export * from '@tanstack/start-router-manifest' +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) +export * from '@tanstack/react-start-router-manifest' diff --git a/packages/start/src/server-functions-client.tsx b/packages/start/src/server-functions-client.tsx index 6fc38947aab..33e414c7ed7 100644 --- a/packages/start/src/server-functions-client.tsx +++ b/packages/start/src/server-functions-client.tsx @@ -1 +1,4 @@ -export * from '@tanstack/start-server-functions-client' +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) +export * from '@tanstack/react-start-server-functions-client' diff --git a/packages/start/src/server-functions-handler.tsx b/packages/start/src/server-functions-handler.tsx index c3cc9770d2e..4ecd303e629 100644 --- a/packages/start/src/server-functions-handler.tsx +++ b/packages/start/src/server-functions-handler.tsx @@ -1 +1,4 @@ -export * from '@tanstack/start-server-functions-handler' +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) +export * from '@tanstack/react-start-server-functions-handler' diff --git a/packages/start/src/server-functions-server.tsx b/packages/start/src/server-functions-server.tsx index cbbdd07a892..b78ff17125e 100644 --- a/packages/start/src/server-functions-server.tsx +++ b/packages/start/src/server-functions-server.tsx @@ -1 +1,4 @@ +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) export * from '@tanstack/start-server-functions-server' diff --git a/packages/start/src/server-functions-ssr.tsx b/packages/start/src/server-functions-ssr.tsx index 7359e26f45b..3999f632db5 100644 --- a/packages/start/src/server-functions-ssr.tsx +++ b/packages/start/src/server-functions-ssr.tsx @@ -1 +1,4 @@ -export * from '@tanstack/start-server-functions-ssr' +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) +export * from '@tanstack/react-start-server-functions-ssr' diff --git a/packages/start/src/server.tsx b/packages/start/src/server.tsx index 5c03f993a3a..502e50b6804 100644 --- a/packages/start/src/server.tsx +++ b/packages/start/src/server.tsx @@ -1 +1,4 @@ -export * from '@tanstack/start-server' +console.warn( + '[@tanstack/start] Warning: This package has moved to @tanstack/react-start. Please switch to the new package, as this package will be dropped soon.', +) +export * from '@tanstack/react-start-server' diff --git a/packages/start/vite.config.ts b/packages/start/vite.config.ts index 3cd9726fba6..c0d7ce210e7 100644 --- a/packages/start/vite.config.ts +++ b/packages/start/vite.config.ts @@ -25,14 +25,14 @@ export default mergeConfig( './src/api.tsx', ], externalDeps: [ - '@tanstack/start-client', - '@tanstack/start-server', + '@tanstack/react-start-client', + '@tanstack/react-start-server', '@tanstack/start-config', - '@tanstack/start-router-manifest', - '@tanstack/start-server-functions-client', + '@tanstack/react-start-router-manifest', + '@tanstack/react-start-server-functions-client', '@tanstack/start-server-functions-server', - '@tanstack/start-server-functions-ssr', - '@tanstack/start-api-routes', + '@tanstack/react-start-server-functions-ssr', + '@tanstack/react-start-api-routes', ], }), ) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7de64c37de7..11c8b071912 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,18 +26,18 @@ overrides: '@tanstack/zod-adapter': workspace:* '@tanstack/valibot-adapter': workspace:* '@tanstack/arktype-adapter': workspace:* - '@tanstack/start': workspace:* - '@tanstack/start-client': workspace:* - '@tanstack/start-server': workspace:* - '@tanstack/start-api-routes': workspace:* - '@tanstack/start-server-functions-fetcher': workspace:* - '@tanstack/start-server-functions-handler': workspace:* - '@tanstack/start-server-functions-client': workspace:* - '@tanstack/start-server-functions-ssr': workspace:* + '@tanstack/react-start': workspace:* + '@tanstack/react-start-client': workspace:* + '@tanstack/react-start-server': workspace:* + '@tanstack/react-start-api-routes': workspace:* + '@tanstack/react-start-server-functions-fetcher': workspace:* + '@tanstack/react-start-server-functions-handler': workspace:* + '@tanstack/react-start-server-functions-client': workspace:* + '@tanstack/react-start-server-functions-ssr': workspace:* '@tanstack/start-server-functions-server': workspace:* - '@tanstack/start-router-manifest': workspace:* - '@tanstack/start-config': workspace:* - '@tanstack/start-plugin': workspace:* + '@tanstack/react-start-router-manifest': workspace:* + '@tanstack/react-start-config': workspace:* + '@tanstack/react-start-plugin': workspace:* '@tanstack/eslint-plugin-router': workspace:* '@tanstack/server-functions-plugin': workspace:* '@tanstack/directive-functions-plugin': workspace:* @@ -1322,12 +1322,12 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start react: specifier: ^19.0.0 version: 19.0.0 @@ -1392,12 +1392,12 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start prisma: specifier: ^5.22.0 version: 5.22.0 @@ -1465,12 +1465,12 @@ importers: '@tanstack/react-router-with-query': specifier: workspace:* version: link:../../../packages/react-router-with-query + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start react: specifier: ^19.0.0 version: 19.0.0 @@ -1529,12 +1529,12 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start react: specifier: ^19.0.0 version: 19.0.0 @@ -1581,9 +1581,9 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router - '@tanstack/start': + '@tanstack/react-start': specifier: workspace:* - version: link:../../../packages/start + version: link:../../../packages/react-start react: specifier: ^19.0.0 version: 19.0.0 @@ -1618,12 +1618,12 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start react: specifier: ^19.0.0 version: 19.0.0 @@ -1679,12 +1679,12 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start '@tanstack/zod-adapter': specifier: workspace:* version: link:../../../packages/zod-adapter @@ -1749,12 +1749,12 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start js-cookie: specifier: ^3.0.5 version: 3.0.5 @@ -1822,12 +1822,12 @@ importers: '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router + '@tanstack/react-start': + specifier: workspace:* + version: link:../../../packages/react-start '@tanstack/router-devtools': specifier: workspace:* version: link:../../../packages/router-devtools - '@tanstack/start': - specifier: workspace:* - version: link:../../../packages/start react: specifier: ^19.0.0 version: 19.0.0 @@ -2187,7 +2187,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start get-port: specifier: ^7.1.0 @@ -2257,7 +2257,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start get-port: specifier: ^7.1.0 @@ -3698,7 +3698,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -3744,7 +3744,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -3799,7 +3799,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start prisma: specifier: ^5.22.0 @@ -3863,7 +3863,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -3918,7 +3918,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -3967,7 +3967,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -4022,7 +4022,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -4086,7 +4086,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start concurrently: specifier: ^8.2.2 @@ -4153,7 +4153,7 @@ importers: specifier: workspace:* version: link:../../../packages/react-router '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -4190,7 +4190,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -4254,7 +4254,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start react: specifier: ^19.0.0 @@ -4306,7 +4306,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start ky: specifier: ^1.7.4 @@ -4422,7 +4422,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start '@trpc/client': specifier: 11.0.0-rc.772 @@ -4483,7 +4483,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/start': - specifier: workspace:* + specifier: ^1.111.9 version: link:../../../packages/start '@trpc/client': specifier: 11.0.0-rc.772 @@ -4739,7 +4739,7 @@ importers: specifier: workspace:* version: link:../router-devtools '@tanstack/start': - specifier: workspace:* + specifier: workspace:^ version: link:../start '@types/react': specifier: ^19.0.8 @@ -4940,76 +4940,158 @@ importers: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - packages/router-cli: + packages/react-start: dependencies: - '@tanstack/router-generator': + '@tanstack/react-start-api-routes': specifier: workspace:* - version: link:../router-generator - chokidar: - specifier: ^3.6.0 - version: 3.6.0 - yargs: - specifier: ^17.7.2 - version: 17.7.2 + version: link:../react-start-api-routes + '@tanstack/react-start-client': + specifier: workspace:* + version: link:../react-start-client + '@tanstack/react-start-config': + specifier: workspace:* + version: link:../react-start-config + '@tanstack/react-start-router-manifest': + specifier: workspace:* + version: link:../react-start-router-manifest + '@tanstack/react-start-server': + specifier: workspace:* + version: link:../react-start-server + '@tanstack/react-start-server-functions-client': + specifier: workspace:* + version: link:../react-start-server-functions-client + '@tanstack/react-start-server-functions-handler': + specifier: workspace:* + version: link:../react-start-server-functions-handler + '@tanstack/react-start-server-functions-ssr': + specifier: workspace:* + version: link:../react-start-server-functions-ssr + '@tanstack/start-server-functions-server': + specifier: workspace:* + version: link:../start-server-functions-server + react: + specifier: ^19.0.0 + version: 19.0.0 + react-dom: + specifier: ^19.0.0 + version: 19.0.0(react@19.0.0) + vite: + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: - '@types/yargs': - specifier: ^17.0.33 - version: 17.0.33 + esbuild: + specifier: ^0.25.0 + version: 0.25.0 - packages/router-core: + packages/react-start-api-routes: dependencies: - '@tanstack/history': + '@tanstack/react-start-server': specifier: workspace:* - version: link:../history - '@tanstack/store': - specifier: ^0.7.0 - version: 0.7.0 + version: link:../react-start-server + '@tanstack/router-core': + specifier: workspace:* + version: link:../router-core + vinxi: + specifier: 0.5.3 + version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + devDependencies: + typescript: + specifier: ^5.7.2 + version: 5.7.3 - packages/router-devtools: + packages/react-start-client: dependencies: '@tanstack/react-router': specifier: workspace:* version: link:../react-router - clsx: - specifier: ^2.1.1 - version: 2.1.1 - csstype: - specifier: ^3.0.10 - version: 3.1.3 - goober: - specifier: ^2.1.16 - version: 2.1.16(csstype@3.1.3) - devDependencies: - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + '@tanstack/router-core': + specifier: workspace:* + version: link:../router-core + cookie-es: + specifier: ^1.2.2 + version: 1.2.2 + jsesc: + specifier: ^3.1.0 + version: 3.1.0 react: specifier: ^19.0.0 version: 19.0.0 react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) + tiny-invariant: + specifier: ^1.3.3 + version: 1.3.3 + tiny-warning: + specifier: ^1.0.3 + version: 1.0.3 + vinxi: + specifier: ^0.5.3 + version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + devDependencies: + '@testing-library/react': + specifier: ^16.2.0 + version: 16.2.0(@testing-library/dom@10.4.0)(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@types/jsesc': + specifier: ^3.0.3 + version: 3.0.3 + '@vitejs/plugin-react': + specifier: ^4.3.4 + version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - packages/router-generator: + packages/react-start-config: dependencies: '@tanstack/react-router': specifier: workspace:* version: link:../react-router - '@tanstack/virtual-file-routes': + '@tanstack/react-start-plugin': specifier: workspace:* - version: link:../virtual-file-routes - prettier: - specifier: ^3.5.0 - version: 3.5.0 - tsx: - specifier: ^4.19.2 - version: 4.19.2 + version: link:../react-start-plugin + '@tanstack/react-start-server-functions-handler': + specifier: workspace:* + version: link:../react-start-server-functions-handler + '@tanstack/router-generator': + specifier: workspace:* + version: link:../router-generator + '@tanstack/router-plugin': + specifier: workspace:* + version: link:../router-plugin + '@tanstack/server-functions-plugin': + specifier: workspace:* + version: link:../server-functions-plugin + '@vitejs/plugin-react': + specifier: ^4.3.4 + version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + import-meta-resolve: + specifier: ^4.1.0 + version: 4.1.0 + nitropack: + specifier: ^2.10.4 + version: 2.10.4(typescript@5.7.3) + ofetch: + specifier: ^1.4.1 + version: 1.4.1 + react: + specifier: ^19.0.0 + version: 19.0.0 + react-dom: + specifier: ^19.0.0 + version: 19.0.0(react@19.0.0) + vinxi: + specifier: 0.5.3 + version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + vite: + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) zod: specifier: ^3.24.1 version: 3.24.1 - packages/router-plugin: + packages/react-start-plugin: dependencies: + '@babel/code-frame': + specifier: 7.26.2 + version: 7.26.2 '@babel/core': specifier: ^7.26.8 version: 7.26.8 @@ -5028,24 +5110,22 @@ importers: '@babel/types': specifier: ^7.26.8 version: 7.26.8 - '@rsbuild/core': - specifier: '>=1.0.2' - version: 1.2.4 - '@tanstack/react-router': - specifier: workspace:* - version: link:../react-router - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - '@tanstack/router-generator': - specifier: workspace:* - version: link:../router-generator '@tanstack/router-utils': specifier: workspace:* version: link:../router-utils - '@tanstack/virtual-file-routes': - specifier: workspace:* - version: link:../virtual-file-routes + babel-dead-code-elimination: + specifier: ^1.0.9 + version: 1.0.9 + tiny-invariant: + specifier: ^1.3.3 + version: 1.3.3 + vite: + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + devDependencies: + '@types/babel__code-frame': + specifier: ^7.0.6 + version: 7.0.6 '@types/babel__core': specifier: ^7.20.5 version: 7.20.5 @@ -5055,308 +5135,329 @@ importers: '@types/babel__traverse': specifier: ^7.20.6 version: 7.20.6 - babel-dead-code-elimination: - specifier: ^1.0.9 - version: 1.0.9 - chokidar: - specifier: ^3.6.0 - version: 3.6.0 - unplugin: - specifier: ^2.1.2 - version: 2.1.2 - vite: - specifier: 6.1.0 - version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - vite-plugin-solid: - specifier: ^2.11.2 - version: 2.11.2(@testing-library/jest-dom@6.6.3)(solid-js@1.9.4)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - webpack: - specifier: '>=5.92.0' - version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0) - zod: - specifier: ^3.24.1 - version: 3.24.1 - packages/router-utils: + packages/react-start-router-manifest: dependencies: - '@babel/generator': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/parser': - specifier: ^7.26.8 - version: 7.26.8 - ansis: - specifier: ^3.11.0 - version: 3.11.0 - diff: - specifier: ^7.0.0 - version: 7.0.0 - devDependencies: - '@babel/types': - specifier: ^7.26.8 - version: 7.26.8 - '@types/babel__generator': - specifier: ^7.6.8 - version: 7.6.8 - '@types/diff': - specifier: ^6.0.0 - version: 6.0.0 - - packages/router-vite-plugin: - dependencies: - '@tanstack/router-plugin': - specifier: workspace:* - version: link:../router-plugin - - packages/server-functions-plugin: - dependencies: - '@babel/code-frame': - specifier: 7.26.2 - version: 7.26.2 - '@babel/core': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/plugin-syntax-jsx': - specifier: ^7.25.9 - version: 7.25.9(@babel/core@7.26.8) - '@babel/plugin-syntax-typescript': - specifier: ^7.25.9 - version: 7.25.9(@babel/core@7.26.8) - '@babel/template': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/traverse': - specifier: ^7.26.8 - version: 7.26.8 - '@babel/types': - specifier: ^7.26.8 - version: 7.26.8 - '@tanstack/directive-functions-plugin': + '@tanstack/router-core': specifier: workspace:* - version: link:../directive-functions-plugin - babel-dead-code-elimination: - specifier: ^1.0.9 - version: 1.0.9 - dedent: - specifier: ^1.5.3 - version: 1.5.3 + version: link:../router-core tiny-invariant: specifier: ^1.3.3 version: 1.3.3 + vinxi: + specifier: 0.5.3 + version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) devDependencies: - '@types/babel__code-frame': - specifier: ^7.0.6 - version: 7.0.6 - '@types/babel__core': - specifier: ^7.20.5 - version: 7.20.5 - '@types/babel__template': - specifier: ^7.4.4 - version: 7.4.4 - '@types/babel__traverse': - specifier: ^7.20.6 - version: 7.20.6 + typescript: + specifier: ^5.7.2 + version: 5.7.3 - packages/solid-router: + packages/react-start-server: dependencies: - '@solid-devtools/logger': - specifier: ^0.9.4 - version: 0.9.7(solid-js@1.9.4) - '@solid-primitives/refs': - specifier: ^1.0.8 - version: 1.1.0(solid-js@1.9.4) '@tanstack/history': specifier: workspace:* version: link:../history + '@tanstack/react-router': + specifier: workspace:* + version: link:../react-router + '@tanstack/react-start-client': + specifier: workspace:* + version: link:../react-start-client '@tanstack/router-core': specifier: workspace:* version: link:../router-core - '@tanstack/solid-store': - specifier: ^0.7.0 - version: 0.7.0(solid-js@1.9.4) + h3: + specifier: 1.13.0 + version: 1.13.0 + isbot: + specifier: ^5.1.22 + version: 5.1.22 jsesc: - specifier: ^3.0.2 + specifier: ^3.1.0 version: 3.1.0 - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 tiny-warning: specifier: ^1.0.3 version: 1.0.3 + unctx: + specifier: ^2.4.1 + version: 2.4.1 devDependencies: - '@solidjs/testing-library': - specifier: ^0.8.10 - version: 0.8.10(solid-js@1.9.4) - '@testing-library/jest-dom': - specifier: ^6.6.3 - version: 6.6.3 '@types/jsesc': specifier: ^3.0.3 version: 3.0.3 - combinate: - specifier: ^1.1.11 - version: 1.1.11 - eslint-plugin-solid: - specifier: ^0.14.5 - version: 0.14.5(eslint@9.20.0(jiti@2.4.2))(typescript@5.7.3) - solid-js: - specifier: ^1 - version: 1.9.4 - vite-plugin-solid: - specifier: ^2.11.2 - version: 2.11.2(@testing-library/jest-dom@6.6.3)(solid-js@1.9.4)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - zod: - specifier: ^3.23.8 - version: 3.24.1 - - packages/start: - dependencies: - '@tanstack/start-api-routes': - specifier: workspace:* - version: link:../start-api-routes - '@tanstack/start-client': - specifier: workspace:* - version: link:../start-client - '@tanstack/start-config': - specifier: workspace:* - version: link:../start-config - '@tanstack/start-router-manifest': - specifier: workspace:* - version: link:../start-router-manifest - '@tanstack/start-server': - specifier: workspace:* - version: link:../start-server - '@tanstack/start-server-functions-client': - specifier: workspace:* - version: link:../start-server-functions-client - '@tanstack/start-server-functions-handler': - specifier: workspace:* - version: link:../start-server-functions-handler - '@tanstack/start-server-functions-server': - specifier: workspace:* - version: link:../start-server-functions-server - '@tanstack/start-server-functions-ssr': - specifier: workspace:* - version: link:../start-server-functions-ssr + '@vitejs/plugin-react': + specifier: ^4.3.4 + version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + esbuild: + specifier: ^0.25.0 + version: 0.25.0 react: specifier: ^19.0.0 version: 19.0.0 react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vite: - specifier: 6.1.0 - version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) - devDependencies: - esbuild: - specifier: ^0.25.0 - version: 0.25.0 + typescript: + specifier: ^5.7.2 + version: 5.7.3 - packages/start-api-routes: + packages/react-start-server-functions-client: dependencies: - '@tanstack/router-core': + '@tanstack/react-start-server-functions-fetcher': specifier: workspace:* - version: link:../router-core - '@tanstack/start-server': + version: link:../react-start-server-functions-fetcher + '@tanstack/server-functions-plugin': specifier: workspace:* - version: link:../start-server - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + version: link:../server-functions-plugin devDependencies: typescript: specifier: ^5.7.2 version: 5.7.3 - packages/start-client: + packages/react-start-server-functions-fetcher: dependencies: '@tanstack/react-router': specifier: workspace:* version: link:../react-router + '@tanstack/react-start-client': + specifier: workspace:* + version: link:../react-start-client '@tanstack/router-core': specifier: workspace:* version: link:../router-core - cookie-es: - specifier: ^1.2.2 - version: 1.2.2 - jsesc: - specifier: ^3.1.0 - version: 3.1.0 + devDependencies: + '@vitejs/plugin-react': + specifier: ^4.3.4 + version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) react: specifier: ^19.0.0 version: 19.0.0 react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) + typescript: + specifier: ^5.7.2 + version: 5.7.3 + + packages/react-start-server-functions-handler: + dependencies: + '@tanstack/react-router': + specifier: workspace:* + version: link:../react-router + '@tanstack/react-start-client': + specifier: workspace:* + version: link:../react-start-client + '@tanstack/react-start-server': + specifier: workspace:* + version: link:../react-start-server tiny-invariant: specifier: ^1.3.3 version: 1.3.3 - tiny-warning: - specifier: ^1.0.3 - version: 1.0.3 - vinxi: - specifier: ^0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) devDependencies: - '@testing-library/react': - specifier: ^16.2.0 - version: 16.2.0(@testing-library/dom@10.4.0)(@types/react-dom@19.0.3(@types/react@19.0.8))(@types/react@19.0.8)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@types/jsesc': - specifier: ^3.0.3 - version: 3.0.3 '@vitejs/plugin-react': specifier: ^4.3.4 version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + react: + specifier: ^19.0.0 + version: 19.0.0 + react-dom: + specifier: ^19.0.0 + version: 19.0.0(react@19.0.0) + typescript: + specifier: ^5.7.2 + version: 5.7.3 - packages/start-config: + packages/react-start-server-functions-ssr: dependencies: - '@tanstack/react-router': + '@tanstack/react-start-client': specifier: workspace:* - version: link:../react-router - '@tanstack/router-generator': + version: link:../react-start-client + '@tanstack/react-start-server': specifier: workspace:* - version: link:../router-generator - '@tanstack/router-plugin': + version: link:../react-start-server + '@tanstack/react-start-server-functions-fetcher': specifier: workspace:* - version: link:../router-plugin + version: link:../react-start-server-functions-fetcher '@tanstack/server-functions-plugin': specifier: workspace:* version: link:../server-functions-plugin - '@tanstack/start-plugin': + tiny-invariant: + specifier: ^1.3.3 + version: 1.3.3 + devDependencies: + typescript: + specifier: ^5.7.2 + version: 5.7.3 + + packages/router-cli: + dependencies: + '@tanstack/router-generator': + specifier: workspace:* + version: link:../router-generator + chokidar: + specifier: ^3.6.0 + version: 3.6.0 + yargs: + specifier: ^17.7.2 + version: 17.7.2 + devDependencies: + '@types/yargs': + specifier: ^17.0.33 + version: 17.0.33 + + packages/router-core: + dependencies: + '@tanstack/history': specifier: workspace:* - version: link:../start-plugin - '@tanstack/start-server-functions-handler': + version: link:../history + '@tanstack/store': + specifier: ^0.7.0 + version: 0.7.0 + + packages/router-devtools: + dependencies: + '@tanstack/react-router': specifier: workspace:* - version: link:../start-server-functions-handler + version: link:../react-router + clsx: + specifier: ^2.1.1 + version: 2.1.1 + csstype: + specifier: ^3.0.10 + version: 3.1.3 + goober: + specifier: ^2.1.16 + version: 2.1.16(csstype@3.1.3) + devDependencies: '@vitejs/plugin-react': specifier: ^4.3.4 version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - import-meta-resolve: - specifier: ^4.1.0 - version: 4.1.0 - nitropack: - specifier: ^2.10.4 - version: 2.10.4(typescript@5.7.3) - ofetch: - specifier: ^1.4.1 - version: 1.4.1 react: specifier: ^19.0.0 version: 19.0.0 react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + + packages/router-generator: + dependencies: + '@tanstack/react-router': + specifier: workspace:* + version: link:../react-router + '@tanstack/virtual-file-routes': + specifier: workspace:* + version: link:../virtual-file-routes + prettier: + specifier: ^3.5.0 + version: 3.5.0 + tsx: + specifier: ^4.19.2 + version: 4.19.2 + zod: + specifier: ^3.24.1 + version: 3.24.1 + + packages/router-plugin: + dependencies: + '@babel/core': + specifier: ^7.26.8 + version: 7.26.8 + '@babel/plugin-syntax-jsx': + specifier: ^7.25.9 + version: 7.25.9(@babel/core@7.26.8) + '@babel/plugin-syntax-typescript': + specifier: ^7.25.9 + version: 7.25.9(@babel/core@7.26.8) + '@babel/template': + specifier: ^7.26.8 + version: 7.26.8 + '@babel/traverse': + specifier: ^7.26.8 + version: 7.26.8 + '@babel/types': + specifier: ^7.26.8 + version: 7.26.8 + '@rsbuild/core': + specifier: '>=1.0.2' + version: 1.2.4 + '@tanstack/react-router': + specifier: workspace:* + version: link:../react-router + '@tanstack/router-core': + specifier: workspace:* + version: link:../router-core + '@tanstack/router-generator': + specifier: workspace:* + version: link:../router-generator + '@tanstack/router-utils': + specifier: workspace:* + version: link:../router-utils + '@tanstack/virtual-file-routes': + specifier: workspace:* + version: link:../virtual-file-routes + '@types/babel__core': + specifier: ^7.20.5 + version: 7.20.5 + '@types/babel__template': + specifier: ^7.4.4 + version: 7.4.4 + '@types/babel__traverse': + specifier: ^7.20.6 + version: 7.20.6 + babel-dead-code-elimination: + specifier: ^1.0.9 + version: 1.0.9 + chokidar: + specifier: ^3.6.0 + version: 3.6.0 + unplugin: + specifier: ^2.1.2 + version: 2.1.2 vite: specifier: 6.1.0 version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + vite-plugin-solid: + specifier: ^2.11.2 + version: 2.11.2(@testing-library/jest-dom@6.6.3)(solid-js@1.9.4)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + webpack: + specifier: '>=5.92.0' + version: 5.97.1(@swc/core@1.10.15(@swc/helpers@0.5.15))(esbuild@0.25.0) zod: specifier: ^3.24.1 version: 3.24.1 - packages/start-plugin: + packages/router-utils: + dependencies: + '@babel/generator': + specifier: ^7.26.8 + version: 7.26.8 + '@babel/parser': + specifier: ^7.26.8 + version: 7.26.8 + ansis: + specifier: ^3.11.0 + version: 3.11.0 + diff: + specifier: ^7.0.0 + version: 7.0.0 + devDependencies: + '@babel/types': + specifier: ^7.26.8 + version: 7.26.8 + '@types/babel__generator': + specifier: ^7.6.8 + version: 7.6.8 + '@types/diff': + specifier: ^6.0.0 + version: 6.0.0 + + packages/router-vite-plugin: + dependencies: + '@tanstack/router-plugin': + specifier: workspace:* + version: link:../router-plugin + + packages/server-functions-plugin: dependencies: '@babel/code-frame': specifier: 7.26.2 @@ -5379,18 +5480,18 @@ importers: '@babel/types': specifier: ^7.26.8 version: 7.26.8 - '@tanstack/router-utils': + '@tanstack/directive-functions-plugin': specifier: workspace:* - version: link:../router-utils + version: link:../directive-functions-plugin babel-dead-code-elimination: specifier: ^1.0.9 version: 1.0.9 + dedent: + specifier: ^1.5.3 + version: 1.5.3 tiny-invariant: specifier: ^1.3.3 version: 1.3.3 - vite: - specifier: 6.1.0 - version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) devDependencies: '@types/babel__code-frame': specifier: ^7.0.6 @@ -5405,136 +5506,135 @@ importers: specifier: ^7.20.6 version: 7.20.6 - packages/start-router-manifest: - dependencies: - '@tanstack/router-core': - specifier: workspace:* - version: link:../router-core - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - vinxi: - specifier: 0.5.3 - version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.7.3 - - packages/start-server: + packages/solid-router: dependencies: + '@solid-devtools/logger': + specifier: ^0.9.4 + version: 0.9.7(solid-js@1.9.4) + '@solid-primitives/refs': + specifier: ^1.0.8 + version: 1.1.0(solid-js@1.9.4) '@tanstack/history': specifier: workspace:* version: link:../history - '@tanstack/react-router': - specifier: workspace:* - version: link:../react-router '@tanstack/router-core': specifier: workspace:* version: link:../router-core - '@tanstack/start-client': - specifier: workspace:* - version: link:../start-client - h3: - specifier: 1.13.0 - version: 1.13.0 - isbot: - specifier: ^5.1.22 - version: 5.1.22 + '@tanstack/solid-store': + specifier: ^0.7.0 + version: 0.7.0(solid-js@1.9.4) jsesc: - specifier: ^3.1.0 + specifier: ^3.0.2 version: 3.1.0 + tiny-invariant: + specifier: ^1.3.3 + version: 1.3.3 tiny-warning: specifier: ^1.0.3 version: 1.0.3 - unctx: - specifier: ^2.4.1 - version: 2.4.1 devDependencies: + '@solidjs/testing-library': + specifier: ^0.8.10 + version: 0.8.10(solid-js@1.9.4) + '@testing-library/jest-dom': + specifier: ^6.6.3 + version: 6.6.3 '@types/jsesc': specifier: ^3.0.3 version: 3.0.3 - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - esbuild: - specifier: ^0.25.0 - version: 0.25.0 - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - typescript: - specifier: ^5.7.2 - version: 5.7.3 + combinate: + specifier: ^1.1.11 + version: 1.1.11 + eslint-plugin-solid: + specifier: ^0.14.5 + version: 0.14.5(eslint@9.20.0(jiti@2.4.2))(typescript@5.7.3) + solid-js: + specifier: ^1 + version: 1.9.4 + vite-plugin-solid: + specifier: ^2.11.2 + version: 2.11.2(@testing-library/jest-dom@6.6.3)(solid-js@1.9.4)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + zod: + specifier: ^3.23.8 + version: 3.24.1 - packages/start-server-functions-client: + packages/start: dependencies: - '@tanstack/server-functions-plugin': + '@tanstack/react-start-api-routes': specifier: workspace:* - version: link:../server-functions-plugin - '@tanstack/start-server-functions-fetcher': + version: link:../react-start-api-routes + '@tanstack/react-start-client': specifier: workspace:* - version: link:../start-server-functions-fetcher - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.7.3 - - packages/start-server-functions-fetcher: - dependencies: - '@tanstack/react-router': + version: link:../react-start-client + '@tanstack/react-start-router-manifest': specifier: workspace:* - version: link:../react-router - '@tanstack/router-core': + version: link:../react-start-router-manifest + '@tanstack/react-start-server': specifier: workspace:* - version: link:../router-core - '@tanstack/start-client': + version: link:../react-start-server + '@tanstack/react-start-server-functions-client': specifier: workspace:* - version: link:../start-client - devDependencies: - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - typescript: - specifier: ^5.7.2 - version: 5.7.3 + version: link:../react-start-server-functions-client + '@tanstack/react-start-server-functions-handler': + specifier: workspace:* + version: link:../react-start-server-functions-handler + '@tanstack/react-start-server-functions-ssr': + specifier: workspace:* + version: link:../react-start-server-functions-ssr + '@tanstack/start-config': + specifier: workspace:^ + version: link:../start-config + '@tanstack/start-server-functions-server': + specifier: workspace:* + version: link:../start-server-functions-server - packages/start-server-functions-handler: + packages/start-config: dependencies: '@tanstack/react-router': specifier: workspace:* version: link:../react-router - '@tanstack/start-client': + '@tanstack/react-start-plugin': specifier: workspace:* - version: link:../start-client - '@tanstack/start-server': + version: link:../react-start-plugin + '@tanstack/react-start-server-functions-handler': specifier: workspace:* - version: link:../start-server - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - devDependencies: + version: link:../react-start-server-functions-handler + '@tanstack/router-generator': + specifier: workspace:* + version: link:../router-generator + '@tanstack/router-plugin': + specifier: workspace:* + version: link:../router-plugin + '@tanstack/server-functions-plugin': + specifier: workspace:* + version: link:../server-functions-plugin '@vitejs/plugin-react': specifier: ^4.3.4 version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) + import-meta-resolve: + specifier: ^4.1.0 + version: 4.1.0 + nitropack: + specifier: ^2.10.4 + version: 2.10.4(typescript@5.7.3) + ofetch: + specifier: ^1.4.1 + version: 1.4.1 react: specifier: ^19.0.0 version: 19.0.0 react-dom: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) - typescript: - specifier: ^5.7.2 - version: 5.7.3 + vinxi: + specifier: 0.5.3 + version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + vite: + specifier: 6.1.0 + version: 6.1.0(@types/node@22.13.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) + zod: + specifier: ^3.24.1 + version: 3.24.1 packages/start-server-functions-server: dependencies: @@ -5549,28 +5649,6 @@ importers: specifier: ^5.7.2 version: 5.7.3 - packages/start-server-functions-ssr: - dependencies: - '@tanstack/server-functions-plugin': - specifier: workspace:* - version: link:../server-functions-plugin - '@tanstack/start-client': - specifier: workspace:* - version: link:../start-client - '@tanstack/start-server': - specifier: workspace:* - version: link:../start-server - '@tanstack/start-server-functions-fetcher': - specifier: workspace:* - version: link:../start-server-functions-fetcher - tiny-invariant: - specifier: ^1.3.3 - version: 1.3.3 - devDependencies: - typescript: - specifier: ^5.7.2 - version: 5.7.3 - packages/valibot-adapter: devDependencies: '@tanstack/react-router': @@ -5853,7 +5931,7 @@ packages: engines: {node: '>=18.17.0'} peerDependencies: '@tanstack/react-router': workspace:* - '@tanstack/start': workspace:* + '@tanstack/start': '>=1.85.9' react: ^19.0.0 react-dom: ^19.0.0 @@ -18176,7 +18254,7 @@ snapshots: node-fetch-native: 1.6.6 nypm: 0.5.2 ohash: 1.1.4 - pathe: 2.0.2 + pathe: 2.0.3 tar: 6.2.1 glob-parent@5.1.2: @@ -19362,7 +19440,7 @@ snapshots: dependencies: citty: 0.1.6 consola: 3.4.0 - pathe: 2.0.2 + pathe: 2.0.3 pkg-types: 1.3.1 tinyexec: 0.3.2 ufo: 1.5.4 @@ -20876,7 +20954,7 @@ snapshots: local-pkg: 1.0.0 magic-string: 0.30.17 mlly: 1.7.4 - pathe: 2.0.2 + pathe: 2.0.3 picomatch: 4.0.2 pkg-types: 1.3.1 scule: 1.3.0 diff --git a/scripts/publish.js b/scripts/publish.js index 92cbd057264..db8db849a4a 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -73,64 +73,72 @@ await publish({ packageDir: 'packages/server-functions-plugin', }, { - name: '@tanstack/start-plugin', - packageDir: 'packages/start-plugin', + name: '@tanstack/create-router', + packageDir: 'packages/create-router', }, { - name: '@tanstack/start', - packageDir: 'packages/start', + name: '@tanstack/eslint-plugin-router', + packageDir: 'packages/eslint-plugin-router', }, { - name: '@tanstack/start-client', - packageDir: 'packages/start-client', + name: '@tanstack/create-start', + packageDir: 'packages/create-start', }, { - name: '@tanstack/start-server', - packageDir: 'packages/start-server', + name: '@tanstack/react-start', + packageDir: 'packages/react-start', }, { - name: '@tanstack/create-router', - packageDir: 'packages/create-router', + name: '@tanstack/react-start-plugin', + packageDir: 'packages/react-start-plugin', }, { - name: '@tanstack/eslint-plugin-router', - packageDir: 'packages/eslint-plugin-router', + name: '@tanstack/react-start-client', + packageDir: 'packages/react-start-client', }, { - name: '@tanstack/create-start', - packageDir: 'packages/create-start', + name: '@tanstack/react-start-server', + packageDir: 'packages/react-start-server', }, { name: '@tanstack/start-config', packageDir: 'packages/start-config', }, { - name: '@tanstack/start-api-routes', - packageDir: 'packages/start-api-routes', + name: '@tanstack/react-start-config', + packageDir: 'packages/react-start-config', + }, + { + name: '@tanstack/react-start-api-routes', + packageDir: 'packages/react-start-api-routes', }, { - name: '@tanstack/start-server-functions-fetcher', - packageDir: 'packages/start-server-functions-fetcher', + name: '@tanstack/react-start-server-functions-fetcher', + packageDir: 'packages/react-start-server-functions-fetcher', }, { - name: '@tanstack/start-server-functions-handler', - packageDir: 'packages/start-server-functions-handler', + name: '@tanstack/react-start-server-functions-handler', + packageDir: 'packages/react-start-server-functions-handler', }, { - name: '@tanstack/start-server-functions-client', - packageDir: 'packages/start-server-functions-client', + name: '@tanstack/react-start-server-functions-client', + packageDir: 'packages/react-start-server-functions-client', }, { - name: '@tanstack/start-server-functions-ssr', - packageDir: 'packages/start-server-functions-ssr', + name: '@tanstack/react-start-server-functions-ssr', + packageDir: 'packages/react-start-server-functions-ssr', }, { name: '@tanstack/start-server-functions-server', packageDir: 'packages/start-server-functions-server', }, { - name: '@tanstack/start-router-manifest', - packageDir: 'packages/start-router-manifest', + name: '@tanstack/react-start-router-manifest', + packageDir: 'packages/react-start-router-manifest', + }, + { + name: '@tanstack/start', + packageDir: 'packages/start', }, { name: '@tanstack/router-utils',