diff --git a/.changeset/config.json b/.changeset/config.json index b8640520ed4..ace011cb04b 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -19,6 +19,5 @@ "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": { "onlyUpdatePeerDependentsWhenOutOfRange": true, "updateInternalDependents": "always" - }, - "ignore": ["@clerk/tanstack-start"] + } } diff --git a/.github/labeler.yml b/.github/labeler.yml index c60c1ed50e5..c84d8ae5e4d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -43,7 +43,7 @@ remix: - packages/remix/** tanstack: - - packages/tanstack-start/** + - packages/tanstack-react-start/** testing: - packages/testing/** diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0dcd080378a..55fad9d6439 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,7 @@ jobs: run: | if [ "${{ matrix.node-version }}" == "18" ]; then echo "Running tests on Node 18 only for packages with LTS support." - pnpm turbo test $TURBO_ARGS --filter="@clerk/astro" --filter="@clerk/backend" --filter="@clerk/express" --filter="@clerk/nextjs" --filter="@clerk/clerk-react" --filter="@clerk/shared" --filter="@clerk/remix" --filter="@clerk/tanstack-start" --filter="@clerk/elements" --filter="@clerk/vue" --filter="@clerk/nuxt" --filter="@clerk/clerk-expo" + pnpm turbo test $TURBO_ARGS --filter="@clerk/astro" --filter="@clerk/backend" --filter="@clerk/express" --filter="@clerk/nextjs" --filter="@clerk/clerk-react" --filter="@clerk/shared" --filter="@clerk/remix" --filter="@clerk/tanstack-react-start" --filter="@clerk/elements" --filter="@clerk/vue" --filter="@clerk/nuxt" --filter="@clerk/clerk-expo" else echo "Running tests for all packages on Node 22." pnpm turbo test $TURBO_ARGS @@ -171,7 +171,7 @@ jobs: strategy: fail-fast: false matrix: - test-name: [ 'generic', 'express', 'quickstart', 'ap-flows', 'elements', 'localhost', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router', 'vue', 'nuxt', 'react-router'] + test-name: [ 'generic', 'express', 'quickstart', 'ap-flows', 'elements', 'localhost', 'sessions', 'astro', 'expo-web', 'tanstack-react-start', 'tanstack-react-router', 'vue', 'nuxt', 'react-router'] test-project: ['chrome'] include: - test-name: 'nextjs' diff --git a/integration/presets/longRunningApps.ts b/integration/presets/longRunningApps.ts index f595591a3c3..ef8054eceaf 100644 --- a/integration/presets/longRunningApps.ts +++ b/integration/presets/longRunningApps.ts @@ -47,8 +47,8 @@ export const createLongRunningApps = () => { { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles }, { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles }, { id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes }, - { id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes }, - { id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes }, + { id: 'tanstack.react-start', config: tanstack.reactRouter, env: envs.withEmailCodes }, + { id: 'tanstack.react-router', config: tanstack.reactStart, env: envs.withEmailCodes }, { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles }, { id: 'nuxt.node', config: nuxt.node, env: envs.withCustomRoles }, { id: 'react-router.node', config: reactRouter.reactRouterNode, env: envs.withEmailCodes }, diff --git a/integration/presets/tanstack.ts b/integration/presets/tanstack.ts index ed5898c0930..07b07b53661 100644 --- a/integration/presets/tanstack.ts +++ b/integration/presets/tanstack.ts @@ -2,27 +2,27 @@ import { applicationConfig } from '../models/applicationConfig'; import { templates } from '../templates'; import { linkPackage } from './utils'; -const router = applicationConfig() - .setName('tanstack-router') - .useTemplate(templates['tanstack-router']) +const reactRouter = applicationConfig() + .setName('tanstack-react-router') + .useTemplate(templates['tanstack-react-router']) .setEnvFormatter('public', key => `VITE_${key}`) .addScript('setup', 'pnpm install') .addScript('dev', 'pnpm dev') .addScript('build', 'pnpm build') .addScript('serve', 'pnpm start') - .addDependency('@clerk/tanstack-start', linkPackage('tanstack-start')); + .addDependency('@clerk/tanstack-react-start', linkPackage('tanstack-react-start')); -const start = applicationConfig() - .setName('tanstack-start') - .useTemplate(templates['tanstack-start']) +const reactStart = applicationConfig() + .setName('tanstack-react-start') + .useTemplate(templates['tanstack-react-start']) .setEnvFormatter('public', key => `VITE_${key}`) .addScript('setup', 'pnpm install') .addScript('dev', 'pnpm dev') .addScript('build', 'pnpm build') .addScript('serve', 'pnpm start') - .addDependency('@clerk/tanstack-start', linkPackage('tanstack-start')); + .addDependency('@clerk/tanstack-react-start', linkPackage('tanstack-react-start')); export const tanstack = { - start, - router, + reactStart, + reactRouter, } as const; diff --git a/integration/templates/index.ts b/integration/templates/index.ts index 26c115fe1b2..ea75de29bc9 100644 --- a/integration/templates/index.ts +++ b/integration/templates/index.ts @@ -13,8 +13,8 @@ export const templates = { 'astro-node': resolve(__dirname, './astro-node'), 'astro-hybrid': resolve(__dirname, './astro-hybrid'), 'expo-web': resolve(__dirname, './expo-web'), - 'tanstack-start': resolve(__dirname, './tanstack-start'), - 'tanstack-router': resolve(__dirname, './tanstack-router'), + 'tanstack-react-start': resolve(__dirname, './tanstack-react-start'), + 'tanstack-react-router': resolve(__dirname, './tanstack-react-router'), 'vue-vite': resolve(__dirname, './vue-vite'), 'nuxt-node': resolve(__dirname, './nuxt-node'), 'react-router-node': resolve(__dirname, './react-router-node'), diff --git a/integration/templates/tanstack-router/.gitignore b/integration/templates/tanstack-react-router/.gitignore similarity index 100% rename from integration/templates/tanstack-router/.gitignore rename to integration/templates/tanstack-react-router/.gitignore diff --git a/integration/templates/tanstack-router/README.md b/integration/templates/tanstack-react-router/README.md similarity index 100% rename from integration/templates/tanstack-router/README.md rename to integration/templates/tanstack-react-router/README.md diff --git a/integration/templates/tanstack-router/index.html b/integration/templates/tanstack-react-router/index.html similarity index 100% rename from integration/templates/tanstack-router/index.html rename to integration/templates/tanstack-react-router/index.html diff --git a/integration/templates/tanstack-router/package.json b/integration/templates/tanstack-react-router/package.json similarity index 80% rename from integration/templates/tanstack-router/package.json rename to integration/templates/tanstack-react-router/package.json index 14180d8865e..f7924de9793 100644 --- a/integration/templates/tanstack-router/package.json +++ b/integration/templates/tanstack-react-router/package.json @@ -1,5 +1,5 @@ { - "name": "tanstack-router-react-example-basic-file-based", + "name": "tanstack-react-router-react-example-basic-file-based", "private": true, "type": "module", "scripts": { @@ -10,7 +10,7 @@ }, "dependencies": { "@tanstack/react-router": "^1.111.7", - "@tanstack/router-devtools": "^1.111.7", + "@tanstack/react-router-devtools": "^1.111.7", "@tanstack/router-plugin": "^1.111.7", "react": "18.3.1", "react-dom": "18.3.1" diff --git a/integration/templates/tanstack-router/src/main.tsx b/integration/templates/tanstack-react-router/src/main.tsx similarity index 100% rename from integration/templates/tanstack-router/src/main.tsx rename to integration/templates/tanstack-react-router/src/main.tsx diff --git a/integration/templates/tanstack-router/src/posts.tsx b/integration/templates/tanstack-react-router/src/posts.tsx similarity index 100% rename from integration/templates/tanstack-router/src/posts.tsx rename to integration/templates/tanstack-react-router/src/posts.tsx diff --git a/integration/templates/tanstack-router/src/routeTree.gen.ts b/integration/templates/tanstack-react-router/src/routeTree.gen.ts similarity index 100% rename from integration/templates/tanstack-router/src/routeTree.gen.ts rename to integration/templates/tanstack-react-router/src/routeTree.gen.ts diff --git a/integration/templates/tanstack-router/src/routes/__root.tsx b/integration/templates/tanstack-react-router/src/routes/__root.tsx similarity index 79% rename from integration/templates/tanstack-router/src/routes/__root.tsx rename to integration/templates/tanstack-react-router/src/routes/__root.tsx index 7addf20d386..e7003655cc6 100644 --- a/integration/templates/tanstack-router/src/routes/__root.tsx +++ b/integration/templates/tanstack-react-router/src/routes/__root.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Link, Outlet, createRootRoute } from '@tanstack/react-router'; -import { TanStackRouterDevtools } from '@tanstack/router-devtools'; -import { ClerkProvider } from '@clerk/tanstack-start'; +import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'; +import { ClerkProvider } from '@clerk/tanstack-react-start'; export const Route = createRootRoute({ component: RootComponent, diff --git a/integration/templates/tanstack-router/src/routes/_layout.tsx b/integration/templates/tanstack-react-router/src/routes/_layout.tsx similarity index 100% rename from integration/templates/tanstack-router/src/routes/_layout.tsx rename to integration/templates/tanstack-react-router/src/routes/_layout.tsx diff --git a/integration/templates/tanstack-router/src/routes/index.tsx b/integration/templates/tanstack-react-router/src/routes/index.tsx similarity index 94% rename from integration/templates/tanstack-router/src/routes/index.tsx rename to integration/templates/tanstack-react-router/src/routes/index.tsx index 6cfb8851a89..9825886a7fa 100644 --- a/integration/templates/tanstack-router/src/routes/index.tsx +++ b/integration/templates/tanstack-react-router/src/routes/index.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { createFileRoute } from '@tanstack/react-router'; -import { SignedIn, SignedOut, SignIn, SignOutButton, UserButton } from '@clerk/tanstack-start'; +import { SignedIn, SignedOut, SignIn, SignOutButton, UserButton } from '@clerk/tanstack-react-start'; export const Route = createFileRoute('/')({ component: Home, diff --git a/integration/templates/tanstack-router/src/routes/sign-in.tsx b/integration/templates/tanstack-react-router/src/routes/sign-in.tsx similarity index 76% rename from integration/templates/tanstack-router/src/routes/sign-in.tsx rename to integration/templates/tanstack-react-router/src/routes/sign-in.tsx index 498a2df8b39..353ccdcf24a 100644 --- a/integration/templates/tanstack-router/src/routes/sign-in.tsx +++ b/integration/templates/tanstack-react-router/src/routes/sign-in.tsx @@ -1,4 +1,4 @@ -import { SignIn } from '@clerk/tanstack-start'; +import { SignIn } from '@clerk/tanstack-react-start'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/sign-in')({ diff --git a/integration/templates/tanstack-router/tsconfig.dev.json b/integration/templates/tanstack-react-router/tsconfig.dev.json similarity index 100% rename from integration/templates/tanstack-router/tsconfig.dev.json rename to integration/templates/tanstack-react-router/tsconfig.dev.json diff --git a/integration/templates/tanstack-router/tsconfig.json b/integration/templates/tanstack-react-router/tsconfig.json similarity index 100% rename from integration/templates/tanstack-router/tsconfig.json rename to integration/templates/tanstack-react-router/tsconfig.json diff --git a/integration/templates/tanstack-router/vite.config.js b/integration/templates/tanstack-react-router/vite.config.js similarity index 100% rename from integration/templates/tanstack-router/vite.config.js rename to integration/templates/tanstack-react-router/vite.config.js diff --git a/integration/templates/tanstack-start/.gitignore b/integration/templates/tanstack-react-start/.gitignore similarity index 100% rename from integration/templates/tanstack-start/.gitignore rename to integration/templates/tanstack-react-start/.gitignore diff --git a/integration/templates/tanstack-start/.prettierignore b/integration/templates/tanstack-react-start/.prettierignore similarity index 100% rename from integration/templates/tanstack-start/.prettierignore rename to integration/templates/tanstack-react-start/.prettierignore diff --git a/integration/templates/tanstack-start/.prettierrc b/integration/templates/tanstack-react-start/.prettierrc similarity index 100% rename from integration/templates/tanstack-start/.prettierrc rename to integration/templates/tanstack-react-start/.prettierrc diff --git a/integration/templates/tanstack-start/README.md b/integration/templates/tanstack-react-start/README.md similarity index 81% rename from integration/templates/tanstack-start/README.md rename to integration/templates/tanstack-react-start/README.md index bd62e67737f..d7ccfa61303 100644 --- a/integration/templates/tanstack-start/README.md +++ b/integration/templates/tanstack-react-start/README.md @@ -1,5 +1,5 @@

- + Clerk Logo for light background @@ -29,10 +29,10 @@ Clerk is a developer-first authentication and user management solution. It provides pre-built components and hooks for sign-in, sign-up, user profile, and organization management. Clerk is designed to be easy to use and customize, and can be integrated into any TanStack Start application. -After following the [Clerk TanStack Start quickstart](https://clerk.com/docs/quickstarts/tanstack-start?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-start-quickstart), you will have learned how to: +After following the [Clerk TanStack Start quickstart](https://clerk.com/docs/quickstarts/tanstack-react-start?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-react-start-quickstart), you will have learned how to: - Create a new TanStack Start application -- Install `@clerk/tanstack-start` +- Install `@clerk/tanstack-react-start` - Set up your environment keys - Wrap your Root Component with `` - Configure `clerkHandler()` in the SSR entrypoint @@ -43,12 +43,12 @@ After following the [Clerk TanStack Start quickstart](https://clerk.com/docs/qui ## Running the template ```bash -git clone https://github.com/clerk/clerk-tanstack-start-quickstart +git clone https://github.com/clerk/clerk-tanstack-react-start-quickstart ``` To run the example locally, you need to: -1. Sign up for a Clerk account at [https://clerk.com](https://www.clerk.com?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-start-quickstart). +1. Sign up for a Clerk account at [https://clerk.com](https://www.clerk.com?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-react-start-quickstart). 2. Go to the [Clerk dashboard](https://dashboard.clerk.com) and create an application. @@ -62,8 +62,8 @@ To run the example locally, you need to: To learn more about Clerk and TanStack Start, check out the following resources: -- [Quickstart: Get started with TanStack Start and Clerk](https://clerk.com/docs/quickstarts/tanstack-start?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-start-quickstart) -- [Clerk Documentation](https://clerk.com/docs?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-start-quickstart) +- [Quickstart: Get started with TanStack Start and Clerk](https://clerk.com/docs/quickstarts/tanstack-react-start?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-react-start-quickstart) +- [Clerk Documentation](https://clerk.com/docs?utm_source=DevRel&utm_medium=docs&utm_campaign=templates&utm_content=08-05-2023&utm_term=clerk-tanstack-react-start-quickstart) ## Found an issue or want to leave feedback diff --git a/integration/templates/tanstack-start/app.config.ts b/integration/templates/tanstack-react-start/app.config.ts similarity index 100% rename from integration/templates/tanstack-start/app.config.ts rename to integration/templates/tanstack-react-start/app.config.ts diff --git a/integration/templates/tanstack-start/app/client.tsx b/integration/templates/tanstack-react-start/app/client.tsx similarity index 100% rename from integration/templates/tanstack-start/app/client.tsx rename to integration/templates/tanstack-react-start/app/client.tsx diff --git a/integration/templates/tanstack-start/app/components/DefaultCatchBoundary.tsx b/integration/templates/tanstack-react-start/app/components/DefaultCatchBoundary.tsx similarity index 100% rename from integration/templates/tanstack-start/app/components/DefaultCatchBoundary.tsx rename to integration/templates/tanstack-react-start/app/components/DefaultCatchBoundary.tsx diff --git a/integration/templates/tanstack-start/app/components/NotFound.tsx b/integration/templates/tanstack-react-start/app/components/NotFound.tsx similarity index 100% rename from integration/templates/tanstack-start/app/components/NotFound.tsx rename to integration/templates/tanstack-react-start/app/components/NotFound.tsx diff --git a/integration/templates/tanstack-start/app/routeTree.gen.ts b/integration/templates/tanstack-react-start/app/routeTree.gen.ts similarity index 100% rename from integration/templates/tanstack-start/app/routeTree.gen.ts rename to integration/templates/tanstack-react-start/app/routeTree.gen.ts diff --git a/integration/templates/tanstack-start/app/router.tsx b/integration/templates/tanstack-react-start/app/router.tsx similarity index 95% rename from integration/templates/tanstack-start/app/router.tsx rename to integration/templates/tanstack-react-start/app/router.tsx index 0886de701f0..c76eb0210cc 100644 --- a/integration/templates/tanstack-start/app/router.tsx +++ b/integration/templates/tanstack-react-start/app/router.tsx @@ -9,6 +9,7 @@ export function createRouter() { defaultPreload: 'intent', defaultErrorComponent: DefaultCatchBoundary, defaultNotFoundComponent: () => , + scrollRestoration: true, }) return router diff --git a/integration/templates/tanstack-start/app/routes/__root.tsx b/integration/templates/tanstack-react-start/app/routes/__root.tsx similarity index 85% rename from integration/templates/tanstack-start/app/routes/__root.tsx rename to integration/templates/tanstack-react-start/app/routes/__root.tsx index c7504699e65..8f0fd9d5d57 100644 --- a/integration/templates/tanstack-start/app/routes/__root.tsx +++ b/integration/templates/tanstack-react-start/app/routes/__root.tsx @@ -1,15 +1,14 @@ import { Outlet, - ScrollRestoration, createRootRoute, Scripts, HeadContent, } from '@tanstack/react-router' -import { TanStackRouterDevtools } from '@tanstack/router-devtools' +import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' import * as React from 'react' import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' import { NotFound } from '~/components/NotFound' -import { ClerkProvider } from '@clerk/tanstack-start' +import { ClerkProvider } from '@clerk/tanstack-react-start' import appCss from '~/styles/app.css?url' export const Route = createRootRoute({ @@ -40,7 +39,6 @@ function RootDocument({ children }: { children: React.ReactNode }) { {children} - diff --git a/integration/templates/tanstack-start/app/routes/_layout.tsx b/integration/templates/tanstack-react-start/app/routes/_layout.tsx similarity index 100% rename from integration/templates/tanstack-start/app/routes/_layout.tsx rename to integration/templates/tanstack-react-start/app/routes/_layout.tsx diff --git a/integration/templates/tanstack-start/app/routes/index.tsx b/integration/templates/tanstack-react-start/app/routes/index.tsx similarity index 94% rename from integration/templates/tanstack-start/app/routes/index.tsx rename to integration/templates/tanstack-react-start/app/routes/index.tsx index 78c7cba02a5..c8817f9d48d 100644 --- a/integration/templates/tanstack-start/app/routes/index.tsx +++ b/integration/templates/tanstack-react-start/app/routes/index.tsx @@ -6,7 +6,7 @@ import { SignInButton, SignUpButton, SignIn, -} from '@clerk/tanstack-start' +} from '@clerk/tanstack-react-start' import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ diff --git a/integration/templates/tanstack-start/app/routes/sign-in.tsx b/integration/templates/tanstack-react-start/app/routes/sign-in.tsx similarity index 76% rename from integration/templates/tanstack-start/app/routes/sign-in.tsx rename to integration/templates/tanstack-react-start/app/routes/sign-in.tsx index 0a718fe7e21..09d8f6fe184 100644 --- a/integration/templates/tanstack-start/app/routes/sign-in.tsx +++ b/integration/templates/tanstack-react-start/app/routes/sign-in.tsx @@ -1,4 +1,4 @@ -import { SignIn } from '@clerk/tanstack-start' +import { SignIn } from '@clerk/tanstack-react-start' import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/sign-in')({ diff --git a/integration/templates/tanstack-start/app/ssr.tsx b/integration/templates/tanstack-react-start/app/ssr.tsx similarity index 88% rename from integration/templates/tanstack-start/app/ssr.tsx rename to integration/templates/tanstack-react-start/app/ssr.tsx index c0502dfe1a8..f7f4190c34b 100644 --- a/integration/templates/tanstack-start/app/ssr.tsx +++ b/integration/templates/tanstack-react-start/app/ssr.tsx @@ -4,7 +4,7 @@ import { } from '@tanstack/react-start/server' import { getRouterManifest } from '@tanstack/react-start/router-manifest' import { createRouter } from './router' -import { createClerkHandler } from '@clerk/tanstack-start/server' +import { createClerkHandler } from '@clerk/tanstack-react-start/server' const handler = createStartHandler({ createRouter, diff --git a/integration/templates/tanstack-start/app/styles/app.css b/integration/templates/tanstack-react-start/app/styles/app.css similarity index 100% rename from integration/templates/tanstack-start/app/styles/app.css rename to integration/templates/tanstack-react-start/app/styles/app.css diff --git a/integration/templates/tanstack-start/package.json b/integration/templates/tanstack-react-start/package.json similarity index 84% rename from integration/templates/tanstack-start/package.json rename to integration/templates/tanstack-react-start/package.json index cec33155e5e..2010dd94188 100644 --- a/integration/templates/tanstack-start/package.json +++ b/integration/templates/tanstack-react-start/package.json @@ -1,5 +1,5 @@ { - "name": "clerk-tanstack-start-quickstart", + "name": "clerk-tanstack-react-start-quickstart", "private": true, "type": "module", "scripts": { @@ -9,8 +9,7 @@ }, "dependencies": { "@tanstack/react-router": "^1.111.7", - "@tanstack/router-devtools": "^1.111.7", - "@tanstack/router-plugin": "^1.111.7", + "@tanstack/react-router-devtools": "^1.111.7", "@tanstack/react-start": "^1.111.10", "@typescript-eslint/parser": "^7.18.0", "isbot": "^5.1.17", diff --git a/integration/templates/tanstack-start/postcss.config.cjs b/integration/templates/tanstack-react-start/postcss.config.cjs similarity index 100% rename from integration/templates/tanstack-start/postcss.config.cjs rename to integration/templates/tanstack-react-start/postcss.config.cjs diff --git a/integration/templates/tanstack-start/tailwind.config.cjs b/integration/templates/tanstack-react-start/tailwind.config.cjs similarity index 100% rename from integration/templates/tanstack-start/tailwind.config.cjs rename to integration/templates/tanstack-react-start/tailwind.config.cjs diff --git a/integration/templates/tanstack-start/tsconfig.json b/integration/templates/tanstack-react-start/tsconfig.json similarity index 100% rename from integration/templates/tanstack-start/tsconfig.json rename to integration/templates/tanstack-react-start/tsconfig.json diff --git a/integration/tests/tanstack-router/basic.test.ts b/integration/tests/tanstack-react-router/basic.test.ts similarity index 97% rename from integration/tests/tanstack-router/basic.test.ts rename to integration/tests/tanstack-react-router/basic.test.ts index 44fdb1ff98f..b274086a63c 100644 --- a/integration/tests/tanstack-router/basic.test.ts +++ b/integration/tests/tanstack-react-router/basic.test.ts @@ -5,7 +5,7 @@ import type { FakeUser } from '../../testUtils'; import { createTestUtils, testAgainstRunningApps } from '../../testUtils'; testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })( - 'basic tests for TanStack Router @tanstack-router', + 'basic tests for TanStack React Router @tanstack-react-router', ({ app }) => { test.describe.configure({ mode: 'parallel' }); diff --git a/integration/tests/tanstack-start/basic.test.ts b/integration/tests/tanstack-react-start/basic.test.ts similarity index 94% rename from integration/tests/tanstack-start/basic.test.ts rename to integration/tests/tanstack-react-start/basic.test.ts index 951835f4c2f..2c6a573db10 100644 --- a/integration/tests/tanstack-start/basic.test.ts +++ b/integration/tests/tanstack-react-start/basic.test.ts @@ -11,7 +11,7 @@ declare global { } testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })( - 'basic tests for TanStack Start @tanstack-start', + 'basic tests for TanStack React Start @tanstack-react-start', ({ app }) => { test.describe.configure({ mode: 'parallel' }); @@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })( await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]); }); - test('clerk handler has ran', async ({ page, context }) => { + test.skip('clerk handler has ran', async ({ page, context }) => { const u = createTestUtils({ app, page, context }); await u.po.signIn.goTo(); diff --git a/package.json b/package.json index 1f535901cd9..2e83f289bf7 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "changeset": "changeset", "changeset:empty": "pnpm changeset --empty", "clean": "turbo clean", - "dev": "TURBO_UI=0 FORCE_COLOR=1 turbo dev --filter=@clerk/* --filter=!@clerk/clerk-expo --filter=!@clerk/tanstack-start --filter=!@clerk/elements --filter=!@clerk/remix --filter=!@clerk/chrome-extension", + "dev": "TURBO_UI=0 FORCE_COLOR=1 turbo dev --filter=@clerk/* --filter=!@clerk/clerk-expo --filter=!@clerk/tanstack-react-start --filter=!@clerk/elements --filter=!@clerk/remix --filter=!@clerk/chrome-extension", "dev:js": "TURBO_UI=0 FORCE_COLOR=1 turbo dev:current --filter=@clerk/clerk-js", "format": "prettier --write .", "format:check": "prettier --cache --check .", @@ -44,8 +44,8 @@ "test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart", "test:integration:react-router": "E2E_APP_ID=react-router.* npm run test:integration:base -- --grep @react-router", "test:integration:sessions": "DISABLE_WEB_SECURITY=true pnpm test:integration:base --grep @sessions", - "test:integration:tanstack-router": "E2E_APP_ID=tanstack.router pnpm test:integration:base --grep @tanstack-router", - "test:integration:tanstack-start": "E2E_APP_ID=tanstack.start pnpm test:integration:base --grep @tanstack-start", + "test:integration:tanstack-react-router": "E2E_APP_ID=tanstack.react-router pnpm test:integration:base --grep @tanstack-react-router", + "test:integration:tanstack-react-start": "E2E_APP_ID=tanstack.react-start pnpm test:integration:base --grep @tanstack-react-start", "test:integration:vue": "E2E_APP_ID=vue.vite pnpm test:integration:base --grep @vue", "turbo:clean": "turbo daemon clean", "typedoc:generate": "pnpm build:declarations && typedoc --tsconfig tsconfig.typedoc.json", diff --git a/packages/tanstack-start/.gitignore b/packages/tanstack-react-start/.gitignore similarity index 100% rename from packages/tanstack-start/.gitignore rename to packages/tanstack-react-start/.gitignore diff --git a/packages/tanstack-start/CHANGELOG.md b/packages/tanstack-react-start/CHANGELOG.md similarity index 96% rename from packages/tanstack-start/CHANGELOG.md rename to packages/tanstack-react-start/CHANGELOG.md index 59378477b95..a16408423d0 100644 --- a/packages/tanstack-start/CHANGELOG.md +++ b/packages/tanstack-react-start/CHANGELOG.md @@ -1,16 +1,4 @@ -# @clerk/tanstack-start - -## 0.11.5 - -### Patch Changes - -- Added a warning message to inform users that the package has been renamed from `@clerk/tanstack-start` to `@clerk/tanstack-react-start`. This change aligns our package naming with TanStack Start's conventions. Users should update their dependencies to use the new package name, as this is the last release under the old name. ([#5327](https://github.com/clerk/javascript/pull/5327)) by [@wobsoriano](https://github.com/wobsoriano) - -- Updated dependencies [[`725918d`](https://github.com/clerk/javascript/commit/725918df2e74cea15e9b748aaf103a52df8e8500), [`10247ba`](https://github.com/clerk/javascript/commit/10247ba2d08d98d6c440b254a4b786f4f1e8967a), [`91d0f0b`](https://github.com/clerk/javascript/commit/91d0f0b0dccab7168ad4dc06c8629808938c235f), [`9572bf5`](https://github.com/clerk/javascript/commit/9572bf5bdfb7dc309ec8714989b98ab12174965b), [`39bbc51`](https://github.com/clerk/javascript/commit/39bbc5189a33dc6cebdc269ac2184dc4ffff2534), [`3dddcda`](https://github.com/clerk/javascript/commit/3dddcda191d8f8d6a9b02464f1f6374d3c6aacb9), [`7524943`](https://github.com/clerk/javascript/commit/7524943300d7e693d61cc1820b520abfadec1c64), [`150b5c8`](https://github.com/clerk/javascript/commit/150b5c89477abb0feab15e0a886179473f653cac), [`23c931e`](https://github.com/clerk/javascript/commit/23c931e9e95e6de992549ad499b477aca9a9c344), [`730262f`](https://github.com/clerk/javascript/commit/730262f0f973923c8749b09078c80c2fc966a8ec), [`5601a15`](https://github.com/clerk/javascript/commit/5601a15e69a7d5e2496dcd82541ca3e6d73b0a3f), [`0b18bb1`](https://github.com/clerk/javascript/commit/0b18bb1fe6fa3ded97547bb6b4d2c73030aad329), [`021bc5f`](https://github.com/clerk/javascript/commit/021bc5f40044d34e49956ce3c9b61d833d815b42), [`1a61390`](https://github.com/clerk/javascript/commit/1a61390d3482bd4af58508b972ad89dea56fa224)]: - - @clerk/types@4.49.0 - - @clerk/clerk-react@5.25.0 - - @clerk/backend@1.25.3 - - @clerk/shared@3.0.2 +# @clerk/tanstack-react-start ## 0.11.4 diff --git a/packages/tanstack-start/LICENSE b/packages/tanstack-react-start/LICENSE similarity index 100% rename from packages/tanstack-start/LICENSE rename to packages/tanstack-react-start/LICENSE diff --git a/packages/tanstack-start/README.md b/packages/tanstack-react-start/README.md similarity index 86% rename from packages/tanstack-start/README.md rename to packages/tanstack-react-start/README.md index 0b1fa24ca7e..d59a8f71da4 100644 --- a/packages/tanstack-start/README.md +++ b/packages/tanstack-react-start/README.md @@ -6,7 +6,7 @@
-

@clerk/tanstack-start

+

@clerk/tanstack-react-start

@@ -15,7 +15,7 @@ [![Clerk documentation](https://img.shields.io/badge/documentation-clerk-green.svg)](https://clerk.com/docs?utm_source=github&utm_medium=clerk_tanstack_start) [![Follow on Twitter](https://img.shields.io/twitter/follow/ClerkDev?style=social)](https://twitter.com/intent/follow?screen_name=ClerkDev) -[Changelog](https://github.com/clerk/javascript/blob/main/packages/tanstack-start/CHANGELOG.md) +[Changelog](https://github.com/clerk/javascript/blob/main/packages/tanstack-react-start/CHANGELOG.md) · [Report a Bug](https://github.com/clerk/javascript/issues/new?assignees=&labels=needs-triage&projects=&template=BUG_REPORT.yml) · @@ -29,7 +29,7 @@ [Clerk](https://clerk.com/?utm_source=github&utm_medium=clerk_tanstack_start) is the easiest way to add authentication and user management to your Tanstack Start application. Add sign up, sign in, and profile management to your application in minutes. -> [!WARNING] > `@clerk/tanstack-start` is currently in beta. It's not recommended to use it in production just yet, but it would be much appreciated if you give it a try. +> [!WARNING] > `@clerk/tanstack-react-start` is currently in beta. It's not recommended to use it in production just yet, but it would be much appreciated if you give it a try. ### Prerequisites @@ -42,7 +42,7 @@ ### Installation ```sh -npm install @clerk/tanstack-start +npm install @clerk/tanstack-react-start ``` ## Usage @@ -59,10 +59,10 @@ You can get these from the [API Keys](https://dashboard.clerk.com/last-active?pa To initialize Clerk with your TanStack Start application, you will need to make one modification to `app/routes/_root.tsx`. Wrap the children of the `RootComponent` with `` ```tsx -import { ClerkProvider } from '@clerk/tanstack-start' +import { ClerkProvider } from '@clerk/tanstack-react-start' import { createRootRoute } from '@tanstack/react-router' -import { Link, Outlet, ScrollRestoration } from '@tanstack/react-router' -import { TanStackRouterDevtools } from '@tanstack/router-devtools' +import { Link, Outlet } from '@tanstack/react-router' +import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' import { Body, Head, Html, Meta, Scripts } from '@tanstack/start' import * as React from 'react' import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary' @@ -112,7 +112,7 @@ You will also need to make on more modification to you SSR entrypoint (default: import { createStartHandler, defaultStreamHandler } from '@tanstack/start/server'; import { getRouterManifest } from '@tanstack/start/router-manifest'; import { createRouter } from './router'; -import { createClerkHandler } from '@clerk/tanstack-start/server'; +import { createClerkHandler } from '@clerk/tanstack-react-start/server'; const handler = createStartHandler({ createRouter, @@ -136,7 +136,7 @@ After those changes are made, you can use Clerk components in your routes. For example, in `app/routes/index.tsx`: ```tsx -import { SignIn, SignedIn, SignedOut, UserButton } from '@clerk/tanstack-start'; +import { SignIn, SignedIn, SignedOut, UserButton } from '@clerk/tanstack-react-start'; import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/')({ @@ -171,9 +171,9 @@ We're open to all community contributions! If you'd like to contribute in any wa ## Security -`@clerk/tanstack-start` follows good practices of security, but 100% security cannot be assured. +`@clerk/tanstack-react-start` follows good practices of security, but 100% security cannot be assured. -`@clerk/tanstack-start` is provided **"as is"** without any **warranty**. Use at your own risk. +`@clerk/tanstack-react-start` is provided **"as is"** without any **warranty**. Use at your own risk. _For more information and to report security issues, please refer to our [security documentation](https://github.com/clerk/javascript/blob/main/docs/SECURITY.md)._ @@ -181,4 +181,4 @@ _For more information and to report security issues, please refer to our [securi This project is licensed under the **MIT license**. -See [LICENSE](https://github.com/clerk/javascript/blob/main/packages/tanstack-start/LICENSE) for more information. +See [LICENSE](https://github.com/clerk/javascript/blob/main/packages/tanstack-react-start/LICENSE) for more information. diff --git a/packages/tanstack-start/errors/package.json b/packages/tanstack-react-start/errors/package.json similarity index 100% rename from packages/tanstack-start/errors/package.json rename to packages/tanstack-react-start/errors/package.json diff --git a/packages/tanstack-start/package.json b/packages/tanstack-react-start/package.json similarity index 92% rename from packages/tanstack-start/package.json rename to packages/tanstack-react-start/package.json index 4e25f0a26e2..dda3f0e88ae 100644 --- a/packages/tanstack-start/package.json +++ b/packages/tanstack-react-start/package.json @@ -1,6 +1,6 @@ { - "name": "@clerk/tanstack-start", - "version": "0.11.5", + "name": "@clerk/tanstack-react-start", + "version": "0.11.4", "description": "Clerk SDK for TanStack Start", "keywords": [ "clerk", @@ -19,7 +19,7 @@ "repository": { "type": "git", "url": "git+https://github.com/clerk/javascript.git", - "directory": "packages/tanstack-start" + "directory": "packages/tanstack-react-start" }, "license": "MIT", "author": "Clerk", @@ -63,8 +63,7 @@ "@clerk/clerk-react": "workspace:^", "@clerk/shared": "workspace:^", "@clerk/types": "workspace:^", - "tslib": "catalog:repo", - "vinxi": "^0.5.3" + "tslib": "catalog:repo" }, "devDependencies": { "@tanstack/react-router": "^1.114.17", diff --git a/packages/tanstack-start/server/package.json b/packages/tanstack-react-start/server/package.json similarity index 100% rename from packages/tanstack-start/server/package.json rename to packages/tanstack-react-start/server/package.json diff --git a/packages/tanstack-start/src/client/ClerkProvider.tsx b/packages/tanstack-react-start/src/client/ClerkProvider.tsx similarity index 100% rename from packages/tanstack-start/src/client/ClerkProvider.tsx rename to packages/tanstack-react-start/src/client/ClerkProvider.tsx diff --git a/packages/tanstack-start/src/client/OptionsContext.tsx b/packages/tanstack-react-start/src/client/OptionsContext.tsx similarity index 100% rename from packages/tanstack-start/src/client/OptionsContext.tsx rename to packages/tanstack-react-start/src/client/OptionsContext.tsx diff --git a/packages/tanstack-start/src/client/index.ts b/packages/tanstack-react-start/src/client/index.ts similarity index 100% rename from packages/tanstack-start/src/client/index.ts rename to packages/tanstack-react-start/src/client/index.ts diff --git a/packages/tanstack-start/src/client/types.ts b/packages/tanstack-react-start/src/client/types.ts similarity index 100% rename from packages/tanstack-start/src/client/types.ts rename to packages/tanstack-react-start/src/client/types.ts diff --git a/packages/tanstack-start/src/client/uiComponents.tsx b/packages/tanstack-react-start/src/client/uiComponents.tsx similarity index 100% rename from packages/tanstack-start/src/client/uiComponents.tsx rename to packages/tanstack-react-start/src/client/uiComponents.tsx diff --git a/packages/tanstack-start/src/client/useAwaitableNavigate.ts b/packages/tanstack-react-start/src/client/useAwaitableNavigate.ts similarity index 100% rename from packages/tanstack-start/src/client/useAwaitableNavigate.ts rename to packages/tanstack-react-start/src/client/useAwaitableNavigate.ts diff --git a/packages/tanstack-start/src/client/utils.ts b/packages/tanstack-react-start/src/client/utils.ts similarity index 100% rename from packages/tanstack-start/src/client/utils.ts rename to packages/tanstack-react-start/src/client/utils.ts diff --git a/packages/tanstack-start/src/errors.ts b/packages/tanstack-react-start/src/errors.ts similarity index 69% rename from packages/tanstack-start/src/errors.ts rename to packages/tanstack-react-start/src/errors.ts index 8ae902cdec9..9548c1104db 100644 --- a/packages/tanstack-start/src/errors.ts +++ b/packages/tanstack-react-start/src/errors.ts @@ -1,7 +1,3 @@ -import { warnPackageRenaming } from './utils/errors'; - -warnPackageRenaming(); - export { isClerkAPIResponseError, isEmailLinkError, diff --git a/packages/tanstack-start/src/global.d.ts b/packages/tanstack-react-start/src/global.d.ts similarity index 100% rename from packages/tanstack-start/src/global.d.ts rename to packages/tanstack-react-start/src/global.d.ts diff --git a/packages/tanstack-start/src/index.ts b/packages/tanstack-react-start/src/index.ts similarity index 67% rename from packages/tanstack-start/src/index.ts rename to packages/tanstack-react-start/src/index.ts index f7b1a210c0a..cadd693ad6b 100644 --- a/packages/tanstack-start/src/index.ts +++ b/packages/tanstack-react-start/src/index.ts @@ -1,9 +1,5 @@ -import { warnPackageRenaming } from './utils/errors'; - -warnPackageRenaming(); - export * from './client/index'; -// Override Clerk React error thrower to show that errors come from @clerk/tanstack-start +// Override Clerk React error thrower to show that errors come from @clerk/tanstack-react-start import { setErrorThrowerOptions } from '@clerk/clerk-react/internal'; setErrorThrowerOptions({ packageName: PACKAGE_NAME }); diff --git a/packages/tanstack-start/src/server/authenticateRequest.ts b/packages/tanstack-react-start/src/server/authenticateRequest.ts similarity index 100% rename from packages/tanstack-start/src/server/authenticateRequest.ts rename to packages/tanstack-react-start/src/server/authenticateRequest.ts diff --git a/packages/tanstack-start/src/server/clerkClient.ts b/packages/tanstack-react-start/src/server/clerkClient.ts similarity index 100% rename from packages/tanstack-start/src/server/clerkClient.ts rename to packages/tanstack-react-start/src/server/clerkClient.ts diff --git a/packages/tanstack-start/src/server/constants.ts b/packages/tanstack-react-start/src/server/constants.ts similarity index 96% rename from packages/tanstack-start/src/server/constants.ts rename to packages/tanstack-react-start/src/server/constants.ts index ee90395c551..2ab44527ad0 100644 --- a/packages/tanstack-start/src/server/constants.ts +++ b/packages/tanstack-react-start/src/server/constants.ts @@ -1,6 +1,6 @@ import { apiUrlFromPublishableKey } from '@clerk/shared/apiUrlFromPublishableKey'; import { getEnvVariable } from '@clerk/shared/getEnvVariable'; -import { getEvent } from 'vinxi/http'; +import { getEvent } from '@tanstack/react-start/server'; import { getPublicEnvVariables } from '../utils/env'; diff --git a/packages/tanstack-start/src/server/getAuth.ts b/packages/tanstack-react-start/src/server/getAuth.ts similarity index 100% rename from packages/tanstack-start/src/server/getAuth.ts rename to packages/tanstack-react-start/src/server/getAuth.ts diff --git a/packages/tanstack-start/src/server/index.ts b/packages/tanstack-react-start/src/server/index.ts similarity index 88% rename from packages/tanstack-start/src/server/index.ts rename to packages/tanstack-react-start/src/server/index.ts index 28ec67a97cb..4a56c1e5c15 100644 --- a/packages/tanstack-start/src/server/index.ts +++ b/packages/tanstack-react-start/src/server/index.ts @@ -1,7 +1,3 @@ -import { warnPackageRenaming } from '../utils/errors'; - -warnPackageRenaming(); - export * from './middlewareHandler'; export * from './getAuth'; diff --git a/packages/tanstack-start/src/server/loadOptions.ts b/packages/tanstack-react-start/src/server/loadOptions.ts similarity index 98% rename from packages/tanstack-start/src/server/loadOptions.ts rename to packages/tanstack-react-start/src/server/loadOptions.ts index f45128334e1..5c879f6946c 100644 --- a/packages/tanstack-start/src/server/loadOptions.ts +++ b/packages/tanstack-react-start/src/server/loadOptions.ts @@ -4,7 +4,7 @@ import { getEnvVariable } from '@clerk/shared/getEnvVariable'; import { isDevelopmentFromSecretKey } from '@clerk/shared/keys'; import { isHttpOrHttps, isProxyUrlRelative } from '@clerk/shared/proxy'; import { handleValueOrFn } from '@clerk/shared/utils'; -import { getEvent } from 'vinxi/http'; +import { getEvent } from '@tanstack/react-start/server'; import { errorThrower } from '../utils'; import { getPublicEnvVariables } from '../utils/env'; diff --git a/packages/tanstack-start/src/server/middlewareHandler.ts b/packages/tanstack-react-start/src/server/middlewareHandler.ts similarity index 96% rename from packages/tanstack-start/src/server/middlewareHandler.ts rename to packages/tanstack-react-start/src/server/middlewareHandler.ts index 3faa31b9eae..6178ecd0313 100644 --- a/packages/tanstack-start/src/server/middlewareHandler.ts +++ b/packages/tanstack-react-start/src/server/middlewareHandler.ts @@ -1,5 +1,5 @@ import type { AnyRouter } from '@tanstack/react-router'; -import type { EventHandler } from 'vinxi/http'; +import type { EventHandler } from '@tanstack/react-start/server'; import { authenticateRequest } from './authenticateRequest'; import { loadOptions } from './loadOptions'; diff --git a/packages/tanstack-start/src/server/types.ts b/packages/tanstack-react-start/src/server/types.ts similarity index 100% rename from packages/tanstack-start/src/server/types.ts rename to packages/tanstack-react-start/src/server/types.ts diff --git a/packages/tanstack-start/src/server/utils/index.ts b/packages/tanstack-react-start/src/server/utils/index.ts similarity index 98% rename from packages/tanstack-start/src/server/utils/index.ts rename to packages/tanstack-react-start/src/server/utils/index.ts index e9b431bd644..b3e25fdd2b5 100644 --- a/packages/tanstack-start/src/server/utils/index.ts +++ b/packages/tanstack-react-start/src/server/utils/index.ts @@ -2,7 +2,7 @@ import type { RequestState } from '@clerk/backend/internal'; import { debugRequestState } from '@clerk/backend/internal'; import { getEnvVariable } from '@clerk/shared/getEnvVariable'; import { isTruthy } from '@clerk/shared/underscore'; -import { getEvent } from 'vinxi/http'; +import { getEvent } from '@tanstack/react-start/server'; import type { AdditionalStateOptions } from '../types'; diff --git a/packages/tanstack-start/src/utils/env.ts b/packages/tanstack-react-start/src/utils/env.ts similarity index 94% rename from packages/tanstack-start/src/utils/env.ts rename to packages/tanstack-react-start/src/utils/env.ts index 039a16c99ca..8c4c6d42dea 100644 --- a/packages/tanstack-start/src/utils/env.ts +++ b/packages/tanstack-react-start/src/utils/env.ts @@ -1,6 +1,6 @@ import { getEnvVariable } from '@clerk/shared/getEnvVariable'; import { isTruthy } from '@clerk/shared/underscore'; -import type { H3EventContext } from 'vinxi/http'; +import type { H3EventContext } from '@tanstack/react-start/server'; export const getPublicEnvVariables = (context?: H3EventContext) => { const getValue = (name: string): string => { diff --git a/packages/tanstack-start/src/utils/errors.ts b/packages/tanstack-react-start/src/utils/errors.ts similarity index 71% rename from packages/tanstack-start/src/utils/errors.ts rename to packages/tanstack-react-start/src/utils/errors.ts index 0ac9124ad9f..4b71ba3e9d1 100644 --- a/packages/tanstack-start/src/utils/errors.ts +++ b/packages/tanstack-react-start/src/utils/errors.ts @@ -22,11 +22,5 @@ It looks like you're trying to use Clerk without configuring the Clerk handler. To fix this, make sure you have the \`clerkHandler()\` configure in you SSR entry file (example: app/ssr.tsx). -For more info, check out the docs: https://github.com/clerk/javascript/tree/main/packages/tanstack-start#setup-clerkhandler-in-the-ssr-entrypoint, +For more info, check out the docs: https://github.com/clerk/javascript/tree/main/packages/tanstack-react-start#setup-clerkhandler-in-the-ssr-entrypoint, `); - -export const warnPackageRenaming = () => { - console.warn( - '[@clerk/tanstack-start] Warning: This package has moved to @clerk/tanstack-react-start. Please switch to the new package, as this is the last release under this package name.', - ); -}; diff --git a/packages/tanstack-start/src/utils/index.ts b/packages/tanstack-react-start/src/utils/index.ts similarity index 100% rename from packages/tanstack-start/src/utils/index.ts rename to packages/tanstack-react-start/src/utils/index.ts diff --git a/packages/tanstack-start/tsconfig.declarations.json b/packages/tanstack-react-start/tsconfig.declarations.json similarity index 100% rename from packages/tanstack-start/tsconfig.declarations.json rename to packages/tanstack-react-start/tsconfig.declarations.json diff --git a/packages/tanstack-start/tsconfig.json b/packages/tanstack-react-start/tsconfig.json similarity index 100% rename from packages/tanstack-start/tsconfig.json rename to packages/tanstack-react-start/tsconfig.json diff --git a/packages/tanstack-start/tsup.config.ts b/packages/tanstack-react-start/tsup.config.ts similarity index 100% rename from packages/tanstack-start/tsup.config.ts rename to packages/tanstack-react-start/tsup.config.ts diff --git a/packages/tanstack-start/vite-env.d.ts b/packages/tanstack-react-start/vite-env.d.ts similarity index 100% rename from packages/tanstack-start/vite-env.d.ts rename to packages/tanstack-react-start/vite-env.d.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9c9e1e40e8..82e61225ee4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -920,7 +920,7 @@ importers: specifier: 0.25.0 version: 0.25.0 - packages/tanstack-start: + packages/tanstack-react-start: dependencies: '@clerk/backend': specifier: workspace:^ @@ -943,9 +943,6 @@ importers: tslib: specifier: catalog:repo version: 2.8.1 - vinxi: - specifier: ^0.5.3 - version: 0.5.3(@types/node@22.13.10)(db0@0.3.1)(ioredis@5.6.0)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.8.2)(yaml@2.7.0) devDependencies: '@tanstack/react-router': specifier: ^1.114.17 @@ -2820,7 +2817,7 @@ packages: '@expo/bunyan@4.0.1': resolution: {integrity: sha512-+Lla7nYSiHZirgK+U/uYzsLv/X+HaJienbD5AKX1UQZHYfWaP+9uuQluRB4GrEVWF0GZ7vEVp/jzaOT9k/SQlg==} - engines: {node: '>=0.10.0'} + engines: {'0': node >=0.10.0} '@expo/cli@0.18.30': resolution: {integrity: sha512-V90TUJh9Ly8stYo8nwqIqNWCsYjE28GlVFWEhAFCUOp99foiQr8HSTpiiX5GIrprcPoWmlGoY+J5fQA29R4lFg==} @@ -3297,82 +3294,66 @@ packages: '@miniflare/cache@2.14.4': resolution: {integrity: sha512-ayzdjhcj+4mjydbNK7ZGDpIXNliDbQY4GPcY2KrYw0v1OSUdj5kZUkygD09fqoGRfAks0d91VelkyRsAXX8FQA==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/core@2.14.4': resolution: {integrity: sha512-FMmZcC1f54YpF4pDWPtdQPIO8NXfgUxCoR9uyrhxKJdZu7M6n8QKopPVNuaxR40jcsdxb7yKoQoFWnHfzJD9GQ==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/d1@2.14.4': resolution: {integrity: sha512-pMBVq9XWxTDdm+RRCkfXZP+bREjPg1JC8s8C0JTovA9OGmLQXqGTnFxIaS9vf1d8k3uSUGhDzPTzHr0/AUW1gA==} engines: {node: '>=16.7'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/durable-objects@2.14.4': resolution: {integrity: sha512-+JrmHP6gHHrjxV8S3axVw5lGHLgqmAGdcO/1HJUPswAyJEd3Ah2YnKhpo+bNmV4RKJCtEq9A2hbtVjBTD2YzwA==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/html-rewriter@2.14.4': resolution: {integrity: sha512-GB/vZn7oLbnhw+815SGF+HU5EZqSxbhIa3mu2L5MzZ2q5VOD5NHC833qG8c2GzDPhIaZ99ITY+ZJmbR4d+4aNQ==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/kv@2.14.4': resolution: {integrity: sha512-QlERH0Z+klwLg0xw+/gm2yC34Nnr/I0GcQ+ASYqXeIXBwjqOtMBa3YVQnocaD+BPy/6TUtSpOAShHsEj76R2uw==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/queues@2.14.4': resolution: {integrity: sha512-aXQ5Ik8Iq1KGMBzGenmd6Js/jJgqyYvjom95/N9GptCGpiVWE5F0XqC1SL5rCwURbHN+aWY191o8XOFyY2nCUA==} engines: {node: '>=16.7'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/r2@2.14.4': resolution: {integrity: sha512-4ctiZWh7Ty7LB3brUjmbRiGMqwyDZgABYaczDtUidblo2DxX4JZPnJ/ZAyxMPNJif32kOJhcg6arC2hEthR9Sw==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/runner-vm@2.14.4': resolution: {integrity: sha512-Nog0bB9SVhPbZAkTWfO4lpLAUsBXKEjlb4y+y66FJw77mPlmPlVdpjElCvmf8T3VN/pqh83kvELGM+/fucMf4g==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/shared-test-environment@2.14.4': resolution: {integrity: sha512-FdU2/8wEd00vIu+MfofLiHcfZWz+uCbE2VTL85KpyYfBsNGAbgRtzFMpOXdoXLqQfRu6MBiRwWpb2FbMrBzi7g==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/shared@2.14.4': resolution: {integrity: sha512-upl4RSB3hyCnITOFmRZjJj4A72GmkVrtfZTilkdq5Qe5TTlzsjVeDJp7AuNUM9bM8vswRo+N5jOiot6O4PVwwQ==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/sites@2.14.4': resolution: {integrity: sha512-O5npWopi+fw9W9Ki0gy99nuBbgDva/iXy8PDC4dAXDB/pz45nISDqldabk0rL2t4W2+lY6LXKzdOw+qJO1GQTA==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/storage-file@2.14.4': resolution: {integrity: sha512-JxcmX0hXf4cB0cC9+s6ZsgYCq+rpyUKRPCGzaFwymWWplrO3EjPVxKCcMxG44jsdgsII6EZihYUN2J14wwCT7A==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/storage-memory@2.14.4': resolution: {integrity: sha512-9jB5BqNkMZ3SFjbPFeiVkLi1BuSahMhc/W1Y9H0W89qFDrrD+z7EgRgDtHTG1ZRyi9gIlNtt9qhkO1B6W2qb2A==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/watcher@2.14.4': resolution: {integrity: sha512-PYn05ET2USfBAeXF6NZfWl0O32KVyE8ncQ/ngysrh3hoIV7l3qGGH7ubeFx+D8VWQ682qYhwGygUzQv2j1tGGg==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@miniflare/web-sockets@2.14.4': resolution: {integrity: sha512-stTxvLdJ2IcGOs76AnvGYAzGvx8JvQPRxC5DW0P5zdAAnhL33noqb5LKdPt3P37BKp9FzBKZHuihQI9oVqwm0g==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 '@modelcontextprotocol/sdk@1.7.0': resolution: {integrity: sha512-IYPe/FLpvF3IZrd/f5p5ffmWhMc3aEMuM2wGJASDqC2Ge7qatVCdbfPx3n/5xFeb19xN0j/911M2AaFuircsWA==} @@ -13899,7 +13880,6 @@ packages: vitest-environment-miniflare@2.14.4: resolution: {integrity: sha512-DzwQWdY42sVYR6aUndw9FdCtl/i0oh3NkbkQpw+xq5aYQw5eiJn5kwnKaKQEWaoBe8Cso71X2i1EJGvi1jZ2xw==} engines: {node: '>=16.13'} - deprecated: Miniflare v2 is no longer supported. Please upgrade to Miniflare v4 peerDependencies: vitest: '>=0.23.0' diff --git a/scripts/snapshot.mjs b/scripts/snapshot.mjs index 72928b03f41..da99c5ebbc0 100755 --- a/scripts/snapshot.mjs +++ b/scripts/snapshot.mjs @@ -21,6 +21,7 @@ const snapshot = `--- '@clerk/express': patch '@clerk/testing': patch '@clerk/elements': patch +'@clerk/tanstack-react-start': patch --- Snapshot release diff --git a/turbo.json b/turbo.json index b233e4b350f..3b1856dcec3 100644 --- a/turbo.json +++ b/turbo.json @@ -217,14 +217,14 @@ "inputs": ["integration/**"], "outputLogs": "new-only" }, - "//#test:integration:tanstack-start": { - "dependsOn": ["@clerk/clerk-js#build", "@clerk/tanstack-start#build", "@clerk/clerk-react#build"], + "//#test:integration:tanstack-react-start": { + "dependsOn": ["@clerk/clerk-js#build", "@clerk/tanstack-react-start#build", "@clerk/clerk-react#build"], "env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"], "inputs": ["integration/**"], "outputLogs": "new-only" }, - "//#test:integration:tanstack-router": { - "dependsOn": ["@clerk/clerk-js#build", "@clerk/tanstack-start#build", "@clerk/clerk-react#build"], + "//#test:integration:tanstack-react-router": { + "dependsOn": ["@clerk/clerk-js#build", "@clerk/tanstack-react-start#build", "@clerk/clerk-react#build"], "env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"], "inputs": ["integration/**"], "outputLogs": "new-only"