chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LekoArts merged 6 commits into from
Nov 15, 2024
Merged

chore(tanstack-start): Update deps & integration tests #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2816d2
fix: Unrelated nextjs build fix
LekoArts Nov 15, 2024
f2ee058
chore(tanstack-start): Update deps
LekoArts Nov 15, 2024
4b5f73c
chore: Update Tanstack Start integration test deps
LekoArts Nov 15, 2024
5f79939
add placeholder changeset
LekoArts Nov 15, 2024
b88ec2c
Revert "fix: Unrelated nextjs build fix"
LekoArts Nov 15, 2024
04714c6
Update beige-parrots-yawn.md
LekoArts Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/beige-parrots-yawn.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.
2 changes: 1 addition & 1 deletion integration/templates/tanstack-start/app/client.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)
135 changes: 64 additions & 71 deletions integration/templates/tanstack-start/app/routeTree.gen.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
id: '/sign-in',
path: '/sign-in',
getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
id: '/_layout',
getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
id: '/',
path: '/',
getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
id: '/_layout-2',
getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
path: '/layout-b',
getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
path: '/layout-a',
getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof LayoutImport
parentRoute: typeof rootRoute
}
'/_layout/_layout-2': {
id: '/_layout/_layout-2'
path: ''
fullPath: ''
preLoaderRoute: typeof LayoutLayout2Import
parentRoute: typeof LayoutImport
}
'/_layout/_layout-2/layout-a': {
id: '/_layout/_layout-2/layout-a'
path: '/layout-a'
fullPath: '/layout-a'
preLoaderRoute: typeof LayoutLayout2LayoutAImport
parentRoute: typeof LayoutLayout2Import
}
'/_layout/_layout-2/layout-b': {
id: '/_layout/_layout-2/layout-b'
path: '/layout-b'
fullPath: '/layout-b'
preLoaderRoute: typeof LayoutLayout2LayoutBImport
parentRoute: typeof LayoutLayout2Import
'/sign-in': {
id: '/sign-in'
path: '/sign-in'
fullPath: '/sign-in'
preLoaderRoute: typeof SignInImport
parentRoute: typeof rootRoute
}
}
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
IndexRoute,
LayoutRoute: LayoutRoute.addChildren({
LayoutLayout2Route: LayoutLayout2Route.addChildren({
LayoutLayout2LayoutARoute,
LayoutLayout2LayoutBRoute,
}),
}),
})
export interface FileRoutesByFullPath {
'/': typeof IndexRoute
'': typeof LayoutRoute
'/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
'/': typeof IndexRoute
'': typeof LayoutRoute
'/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
__root__: typeof rootRoute
'/': typeof IndexRoute
'/_layout': typeof LayoutRoute
'/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
fullPaths: '/' | '' | '/sign-in'
fileRoutesByTo: FileRoutesByTo
to: '/' | '' | '/sign-in'
id: '__root__' | '/' | '/_layout' | '/sign-in'
fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
IndexRoute: typeof IndexRoute
LayoutRoute: typeof LayoutRoute
SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
IndexRoute: IndexRoute,
LayoutRoute: LayoutRoute,
SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
._addFileChildren(rootRouteChildren)
._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
"filePath": "__root.tsx",
"children": [
"/",
"/_layout"
"/_layout",
"/sign-in"
]
},
"/": {
"filePath": "index.tsx"
},
"/_layout": {
"filePath": "_layout.tsx",
"children": [
"/_layout/_layout-2"
]
},
"/_layout/_layout-2": {
"filePath": "_layout/_layout-2.tsx",
"parent": "/_layout",
"children": [
"/_layout/_layout-2/layout-a",
"/_layout/_layout-2/layout-b"
]
},
"/_layout/_layout-2/layout-a": {
"filePath": "_layout/_layout-2/layout-a.tsx",
"parent": "/_layout/_layout-2"
"filePath": "_layout.tsx"
},
"/_layout/_layout-2/layout-b": {
"filePath": "_layout/_layout-2/layout-b.tsx",
"parent": "/_layout/_layout-2"
"/sign-in": {
"filePath": "sign-in.tsx"
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions integration/templates/tanstack-start/app/routes/__root.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
return (
<ClerkProvider>
<Html>
<Head>
<html>
<head>
<Meta />
</Head>
<Body>
</head>
<body>
{children}
<ScrollRestoration />
<TanStackRouterDevtools position="bottom-right" />
<Scripts />
</Body>
</Html>
</body>
</html>
</ClerkProvider>
)
}
17 changes: 8 additions & 9 deletions integration/templates/tanstack-start/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
"start": "vinxi start --port=$PORT"
},
"dependencies": {
"@tanstack/react-router": "^1.46.4",
"@tanstack/router-devtools": "^1.46.5",
"@tanstack/router-plugin": "^1.45.13",
"@tanstack/start": "^1.46.4",
"@tanstack/react-router": "^1.81.9",
"@tanstack/router-devtools": "^1.81.9",
"@tanstack/router-plugin": "^1.81.9",
"@tanstack/start": "^1.81.9",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-react": "^4.3.1",
"isbot": "^5.1.14",
"isbot": "^5.1.17",
"react": "18.3.1",
"react-dom": "18.3.1",
"tailwind-merge": "^2.4.0",
"vinxi": "0.4.1"
"tailwind-merge": "^2.5.4",
"vinxi": "0.4.3"
},
"devDependencies": {
"@types/node": "^20.12.11",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@vitejs/plugin-react": "^4.3.1",
"@vitejs/plugin-react": "^4.3.3",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/tanstack-start/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
},
"devDependencies": {
"@clerk/eslint-config-custom": "workspace:*",
"@tanstack/react-router": "^1.49.1",
"@tanstack/start": "^1.49.1",
"@tanstack/react-router": "^1.81.9",
"@tanstack/start": "^1.81.9",
"@types/node": "^18.19.43",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
"vinxi": "^0.4.1"
},
"peerDependencies": {
"@tanstack/react-router": ">=1.49.1",
"@tanstack/start": ">=1.49.1",
"@tanstack/react-router": ">=1.81.9",
"@tanstack/start": ">=1.81.9",
"react": ">=18 || >=19.0.0-beta",
"react-dom": ">=18 || >=19.0.0-beta"
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LekoArts
merged 6 commits into

from

Nov 15, 2024
 Merged


chore(tanstack-start): Update deps & integration tests
#4575
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2816d2

fix: Unrelated nextjs build fix


LekoArts Nov 15, 2024
f2ee058

chore(tanstack-start): Update deps


LekoArts Nov 15, 2024
4b5f73c

chore: Update Tanstack Start integration test deps


LekoArts Nov 15, 2024
5f79939

add placeholder changeset


LekoArts Nov 15, 2024
b88ec2c

Revert "fix: Unrelated nextjs build fix"


LekoArts Nov 15, 2024
04714c6

Update beige-parrots-yawn.md


LekoArts Nov 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/beige-parrots-yawn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.

2 changes: 1 addition & 1 deletion
integration/templates/tanstack-start/app/client.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)

135 changes: 64 additions & 71 deletions
integration/templates/tanstack-start/app/routeTree.gen.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
 id: '/sign-in',
 path: '/sign-in',
 getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
 id: '/_layout',
 getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
 id: '/',
 path: '/',
 getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
 id: '/_layout-2',
 getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
 path: '/layout-b',
 getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
 path: '/layout-a',
 getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
 preLoaderRoute: typeof LayoutImport
 parentRoute: typeof rootRoute
 }
 '/_layout/_layout-2': {
 id: '/_layout/_layout-2'
 path: ''
 fullPath: ''
 preLoaderRoute: typeof LayoutLayout2Import
 parentRoute: typeof LayoutImport
 }
 '/_layout/_layout-2/layout-a': {
 id: '/_layout/_layout-2/layout-a'
 path: '/layout-a'
 fullPath: '/layout-a'
 preLoaderRoute: typeof LayoutLayout2LayoutAImport
 parentRoute: typeof LayoutLayout2Import
 }
 '/_layout/_layout-2/layout-b': {
 id: '/_layout/_layout-2/layout-b'
 path: '/layout-b'
 fullPath: '/layout-b'
 preLoaderRoute: typeof LayoutLayout2LayoutBImport
 parentRoute: typeof LayoutLayout2Import
 '/sign-in': {
 id: '/sign-in'
 path: '/sign-in'
 fullPath: '/sign-in'
 preLoaderRoute: typeof SignInImport
 parentRoute: typeof rootRoute
 }
 }
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
 IndexRoute,
 LayoutRoute: LayoutRoute.addChildren({
 LayoutLayout2Route: LayoutLayout2Route.addChildren({
 LayoutLayout2LayoutARoute,
 LayoutLayout2LayoutBRoute,
 }),
 }),
})
export interface FileRoutesByFullPath {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
 __root__: typeof rootRoute
 '/': typeof IndexRoute
 '/_layout': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
 fullPaths: '/' | '' | '/sign-in'
 fileRoutesByTo: FileRoutesByTo
 to: '/' | '' | '/sign-in'
 id: '__root__' | '/' | '/_layout' | '/sign-in'
 fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
 IndexRoute: typeof IndexRoute
 LayoutRoute: typeof LayoutRoute
 SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
 IndexRoute: IndexRoute,
 LayoutRoute: LayoutRoute,
 SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
 ._addFileChildren(rootRouteChildren)
 ._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
 "filePath": "__root.tsx",
 "children": [
 "/",
 "/_layout"
 "/_layout",
 "/sign-in"
 ]
 },
 "/": {
 "filePath": "index.tsx"
 },
 "/_layout": {
 "filePath": "_layout.tsx",
 "children": [
 "/_layout/_layout-2"
 ]
 },
 "/_layout/_layout-2": {
 "filePath": "_layout/_layout-2.tsx",
 "parent": "/_layout",
 "children": [
 "/_layout/_layout-2/layout-a",
 "/_layout/_layout-2/layout-b"
 ]
 },
 "/_layout/_layout-2/layout-a": {
 "filePath": "_layout/_layout-2/layout-a.tsx",
 "parent": "/_layout/_layout-2"
 "filePath": "_layout.tsx"
 },
 "/_layout/_layout-2/layout-b": {
 "filePath": "_layout/_layout-2/layout-b.tsx",
 "parent": "/_layout/_layout-2"
 "/sign-in": {
 "filePath": "sign-in.tsx"
 }
 }
}
Expand Down

14 changes: 7 additions & 7 deletions
integration/templates/tanstack-start/app/routes/__root.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
 createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
 return (
 <ClerkProvider>
 <Html>
 <Head>
 <html>
 <head>
 <Meta />
 </Head>
 <Body>
 </head>
 <body>
 {children}
 <ScrollRestoration />
 <TanStackRouterDevtools position="bottom-right" />
 <Scripts />
 </Body>
 </Html>
 </body>
 </html>
 </ClerkProvider>
 )
}

17 changes: 8 additions & 9 deletions
integration/templates/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
 "start": "vinxi start --port=$PORT"
 },
 "dependencies": {
 "@tanstack/react-router": "^1.46.4",
 "@tanstack/router-devtools": "^1.46.5",
 "@tanstack/router-plugin": "^1.45.13",
 "@tanstack/start": "^1.46.4",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/router-devtools": "^1.81.9",
 "@tanstack/router-plugin": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@typescript-eslint/parser": "^7.18.0",
 "@vitejs/plugin-react": "^4.3.1",
 "isbot": "^5.1.14",
 "isbot": "^5.1.17",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "tailwind-merge": "^2.4.0",
 "vinxi": "0.4.1"
 "tailwind-merge": "^2.5.4",
 "vinxi": "0.4.3"
 },
 "devDependencies": {
 "@types/node": "^20.12.11",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
 "@vitejs/plugin-react": "^4.3.1",
 "@vitejs/plugin-react": "^4.3.3",
 "autoprefixer": "^10.4.20",
 "postcss": "^8.4.47",
 "prettier": "^3.3.3",
Expand Down

8 changes: 4 additions & 4 deletions
packages/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
 },
 "devDependencies": {
 "@clerk/eslint-config-custom": "workspace:*",
 "@tanstack/react-router": "^1.49.1",
 "@tanstack/start": "^1.49.1",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@types/node": "^18.19.43",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
 "vinxi": "^0.4.1"
 },
 "peerDependencies": {
 "@tanstack/react-router": ">=1.49.1",
 "@tanstack/start": ">=1.49.1",
 "@tanstack/react-router": ">=1.81.9",
 "@tanstack/start": ">=1.81.9",
 "react": ">=18 || >=19.0.0-beta",
 "react-dom": ">=18 || >=19.0.0-beta"
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LekoArts
merged 6 commits into

from

Nov 15, 2024
 Merged


chore(tanstack-start): Update deps & integration tests
#4575
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2816d2

fix: Unrelated nextjs build fix


LekoArts Nov 15, 2024
f2ee058

chore(tanstack-start): Update deps


LekoArts Nov 15, 2024
4b5f73c

chore: Update Tanstack Start integration test deps


LekoArts Nov 15, 2024
5f79939

add placeholder changeset


LekoArts Nov 15, 2024
b88ec2c

Revert "fix: Unrelated nextjs build fix"


LekoArts Nov 15, 2024
04714c6

Update beige-parrots-yawn.md


LekoArts Nov 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/beige-parrots-yawn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.

2 changes: 1 addition & 1 deletion
integration/templates/tanstack-start/app/client.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)

135 changes: 64 additions & 71 deletions
integration/templates/tanstack-start/app/routeTree.gen.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
 id: '/sign-in',
 path: '/sign-in',
 getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
 id: '/_layout',
 getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
 id: '/',
 path: '/',
 getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
 id: '/_layout-2',
 getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
 path: '/layout-b',
 getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
 path: '/layout-a',
 getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
 preLoaderRoute: typeof LayoutImport
 parentRoute: typeof rootRoute
 }
 '/_layout/_layout-2': {
 id: '/_layout/_layout-2'
 path: ''
 fullPath: ''
 preLoaderRoute: typeof LayoutLayout2Import
 parentRoute: typeof LayoutImport
 }
 '/_layout/_layout-2/layout-a': {
 id: '/_layout/_layout-2/layout-a'
 path: '/layout-a'
 fullPath: '/layout-a'
 preLoaderRoute: typeof LayoutLayout2LayoutAImport
 parentRoute: typeof LayoutLayout2Import
 }
 '/_layout/_layout-2/layout-b': {
 id: '/_layout/_layout-2/layout-b'
 path: '/layout-b'
 fullPath: '/layout-b'
 preLoaderRoute: typeof LayoutLayout2LayoutBImport
 parentRoute: typeof LayoutLayout2Import
 '/sign-in': {
 id: '/sign-in'
 path: '/sign-in'
 fullPath: '/sign-in'
 preLoaderRoute: typeof SignInImport
 parentRoute: typeof rootRoute
 }
 }
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
 IndexRoute,
 LayoutRoute: LayoutRoute.addChildren({
 LayoutLayout2Route: LayoutLayout2Route.addChildren({
 LayoutLayout2LayoutARoute,
 LayoutLayout2LayoutBRoute,
 }),
 }),
})
export interface FileRoutesByFullPath {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
 __root__: typeof rootRoute
 '/': typeof IndexRoute
 '/_layout': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
 fullPaths: '/' | '' | '/sign-in'
 fileRoutesByTo: FileRoutesByTo
 to: '/' | '' | '/sign-in'
 id: '__root__' | '/' | '/_layout' | '/sign-in'
 fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
 IndexRoute: typeof IndexRoute
 LayoutRoute: typeof LayoutRoute
 SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
 IndexRoute: IndexRoute,
 LayoutRoute: LayoutRoute,
 SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
 ._addFileChildren(rootRouteChildren)
 ._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
 "filePath": "__root.tsx",
 "children": [
 "/",
 "/_layout"
 "/_layout",
 "/sign-in"
 ]
 },
 "/": {
 "filePath": "index.tsx"
 },
 "/_layout": {
 "filePath": "_layout.tsx",
 "children": [
 "/_layout/_layout-2"
 ]
 },
 "/_layout/_layout-2": {
 "filePath": "_layout/_layout-2.tsx",
 "parent": "/_layout",
 "children": [
 "/_layout/_layout-2/layout-a",
 "/_layout/_layout-2/layout-b"
 ]
 },
 "/_layout/_layout-2/layout-a": {
 "filePath": "_layout/_layout-2/layout-a.tsx",
 "parent": "/_layout/_layout-2"
 "filePath": "_layout.tsx"
 },
 "/_layout/_layout-2/layout-b": {
 "filePath": "_layout/_layout-2/layout-b.tsx",
 "parent": "/_layout/_layout-2"
 "/sign-in": {
 "filePath": "sign-in.tsx"
 }
 }
}
Expand Down

14 changes: 7 additions & 7 deletions
integration/templates/tanstack-start/app/routes/__root.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
 createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
 return (
 <ClerkProvider>
 <Html>
 <Head>
 <html>
 <head>
 <Meta />
 </Head>
 <Body>
 </head>
 <body>
 {children}
 <ScrollRestoration />
 <TanStackRouterDevtools position="bottom-right" />
 <Scripts />
 </Body>
 </Html>
 </body>
 </html>
 </ClerkProvider>
 )
}

17 changes: 8 additions & 9 deletions
integration/templates/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
 "start": "vinxi start --port=$PORT"
 },
 "dependencies": {
 "@tanstack/react-router": "^1.46.4",
 "@tanstack/router-devtools": "^1.46.5",
 "@tanstack/router-plugin": "^1.45.13",
 "@tanstack/start": "^1.46.4",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/router-devtools": "^1.81.9",
 "@tanstack/router-plugin": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@typescript-eslint/parser": "^7.18.0",
 "@vitejs/plugin-react": "^4.3.1",
 "isbot": "^5.1.14",
 "isbot": "^5.1.17",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "tailwind-merge": "^2.4.0",
 "vinxi": "0.4.1"
 "tailwind-merge": "^2.5.4",
 "vinxi": "0.4.3"
 },
 "devDependencies": {
 "@types/node": "^20.12.11",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
 "@vitejs/plugin-react": "^4.3.1",
 "@vitejs/plugin-react": "^4.3.3",
 "autoprefixer": "^10.4.20",
 "postcss": "^8.4.47",
 "prettier": "^3.3.3",
Expand Down

8 changes: 4 additions & 4 deletions
packages/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
 },
 "devDependencies": {
 "@clerk/eslint-config-custom": "workspace:*",
 "@tanstack/react-router": "^1.49.1",
 "@tanstack/start": "^1.49.1",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@types/node": "^18.19.43",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
 "vinxi": "^0.4.1"
 },
 "peerDependencies": {
 "@tanstack/react-router": ">=1.49.1",
 "@tanstack/start": ">=1.49.1",
 "@tanstack/react-router": ">=1.81.9",
 "@tanstack/start": ">=1.81.9",
 "react": ">=18 || >=19.0.0-beta",
 "react-dom": ">=18 || >=19.0.0-beta"
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LekoArts
merged 6 commits into

from

Nov 15, 2024
 Merged


chore(tanstack-start): Update deps & integration tests
#4575
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2816d2

fix: Unrelated nextjs build fix


LekoArts Nov 15, 2024
f2ee058

chore(tanstack-start): Update deps


LekoArts Nov 15, 2024
4b5f73c

chore: Update Tanstack Start integration test deps


LekoArts Nov 15, 2024
5f79939

add placeholder changeset


LekoArts Nov 15, 2024
b88ec2c

Revert "fix: Unrelated nextjs build fix"


LekoArts Nov 15, 2024
04714c6

Update beige-parrots-yawn.md


LekoArts Nov 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/beige-parrots-yawn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.

2 changes: 1 addition & 1 deletion
integration/templates/tanstack-start/app/client.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)

135 changes: 64 additions & 71 deletions
integration/templates/tanstack-start/app/routeTree.gen.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
 id: '/sign-in',
 path: '/sign-in',
 getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
 id: '/_layout',
 getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
 id: '/',
 path: '/',
 getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
 id: '/_layout-2',
 getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
 path: '/layout-b',
 getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
 path: '/layout-a',
 getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
 preLoaderRoute: typeof LayoutImport
 parentRoute: typeof rootRoute
 }
 '/_layout/_layout-2': {
 id: '/_layout/_layout-2'
 path: ''
 fullPath: ''
 preLoaderRoute: typeof LayoutLayout2Import
 parentRoute: typeof LayoutImport
 }
 '/_layout/_layout-2/layout-a': {
 id: '/_layout/_layout-2/layout-a'
 path: '/layout-a'
 fullPath: '/layout-a'
 preLoaderRoute: typeof LayoutLayout2LayoutAImport
 parentRoute: typeof LayoutLayout2Import
 }
 '/_layout/_layout-2/layout-b': {
 id: '/_layout/_layout-2/layout-b'
 path: '/layout-b'
 fullPath: '/layout-b'
 preLoaderRoute: typeof LayoutLayout2LayoutBImport
 parentRoute: typeof LayoutLayout2Import
 '/sign-in': {
 id: '/sign-in'
 path: '/sign-in'
 fullPath: '/sign-in'
 preLoaderRoute: typeof SignInImport
 parentRoute: typeof rootRoute
 }
 }
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
 IndexRoute,
 LayoutRoute: LayoutRoute.addChildren({
 LayoutLayout2Route: LayoutLayout2Route.addChildren({
 LayoutLayout2LayoutARoute,
 LayoutLayout2LayoutBRoute,
 }),
 }),
})
export interface FileRoutesByFullPath {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
 __root__: typeof rootRoute
 '/': typeof IndexRoute
 '/_layout': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
 fullPaths: '/' | '' | '/sign-in'
 fileRoutesByTo: FileRoutesByTo
 to: '/' | '' | '/sign-in'
 id: '__root__' | '/' | '/_layout' | '/sign-in'
 fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
 IndexRoute: typeof IndexRoute
 LayoutRoute: typeof LayoutRoute
 SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
 IndexRoute: IndexRoute,
 LayoutRoute: LayoutRoute,
 SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
 ._addFileChildren(rootRouteChildren)
 ._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
 "filePath": "__root.tsx",
 "children": [
 "/",
 "/_layout"
 "/_layout",
 "/sign-in"
 ]
 },
 "/": {
 "filePath": "index.tsx"
 },
 "/_layout": {
 "filePath": "_layout.tsx",
 "children": [
 "/_layout/_layout-2"
 ]
 },
 "/_layout/_layout-2": {
 "filePath": "_layout/_layout-2.tsx",
 "parent": "/_layout",
 "children": [
 "/_layout/_layout-2/layout-a",
 "/_layout/_layout-2/layout-b"
 ]
 },
 "/_layout/_layout-2/layout-a": {
 "filePath": "_layout/_layout-2/layout-a.tsx",
 "parent": "/_layout/_layout-2"
 "filePath": "_layout.tsx"
 },
 "/_layout/_layout-2/layout-b": {
 "filePath": "_layout/_layout-2/layout-b.tsx",
 "parent": "/_layout/_layout-2"
 "/sign-in": {
 "filePath": "sign-in.tsx"
 }
 }
}
Expand Down

14 changes: 7 additions & 7 deletions
integration/templates/tanstack-start/app/routes/__root.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
 createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
 return (
 <ClerkProvider>
 <Html>
 <Head>
 <html>
 <head>
 <Meta />
 </Head>
 <Body>
 </head>
 <body>
 {children}
 <ScrollRestoration />
 <TanStackRouterDevtools position="bottom-right" />
 <Scripts />
 </Body>
 </Html>
 </body>
 </html>
 </ClerkProvider>
 )
}

17 changes: 8 additions & 9 deletions
integration/templates/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
 "start": "vinxi start --port=$PORT"
 },
 "dependencies": {
 "@tanstack/react-router": "^1.46.4",
 "@tanstack/router-devtools": "^1.46.5",
 "@tanstack/router-plugin": "^1.45.13",
 "@tanstack/start": "^1.46.4",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/router-devtools": "^1.81.9",
 "@tanstack/router-plugin": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@typescript-eslint/parser": "^7.18.0",
 "@vitejs/plugin-react": "^4.3.1",
 "isbot": "^5.1.14",
 "isbot": "^5.1.17",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "tailwind-merge": "^2.4.0",
 "vinxi": "0.4.1"
 "tailwind-merge": "^2.5.4",
 "vinxi": "0.4.3"
 },
 "devDependencies": {
 "@types/node": "^20.12.11",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
 "@vitejs/plugin-react": "^4.3.1",
 "@vitejs/plugin-react": "^4.3.3",
 "autoprefixer": "^10.4.20",
 "postcss": "^8.4.47",
 "prettier": "^3.3.3",
Expand Down

8 changes: 4 additions & 4 deletions
packages/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
 },
 "devDependencies": {
 "@clerk/eslint-config-custom": "workspace:*",
 "@tanstack/react-router": "^1.49.1",
 "@tanstack/start": "^1.49.1",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@types/node": "^18.19.43",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
 "vinxi": "^0.4.1"
 },
 "peerDependencies": {
 "@tanstack/react-router": ">=1.49.1",
 "@tanstack/start": ">=1.49.1",
 "@tanstack/react-router": ">=1.81.9",
 "@tanstack/start": ">=1.81.9",
 "react": ">=18 || >=19.0.0-beta",
 "react-dom": ">=18 || >=19.0.0-beta"
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LekoArts
merged 6 commits into

from

Nov 15, 2024
 Merged


chore(tanstack-start): Update deps & integration tests
#4575
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2816d2

fix: Unrelated nextjs build fix


LekoArts Nov 15, 2024
f2ee058

chore(tanstack-start): Update deps


LekoArts Nov 15, 2024
4b5f73c

chore: Update Tanstack Start integration test deps


LekoArts Nov 15, 2024
5f79939

add placeholder changeset


LekoArts Nov 15, 2024
b88ec2c

Revert "fix: Unrelated nextjs build fix"


LekoArts Nov 15, 2024
04714c6

Update beige-parrots-yawn.md


LekoArts Nov 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/beige-parrots-yawn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.

2 changes: 1 addition & 1 deletion
integration/templates/tanstack-start/app/client.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)

135 changes: 64 additions & 71 deletions
integration/templates/tanstack-start/app/routeTree.gen.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
 id: '/sign-in',
 path: '/sign-in',
 getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
 id: '/_layout',
 getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
 id: '/',
 path: '/',
 getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
 id: '/_layout-2',
 getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
 path: '/layout-b',
 getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
 path: '/layout-a',
 getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
 preLoaderRoute: typeof LayoutImport
 parentRoute: typeof rootRoute
 }
 '/_layout/_layout-2': {
 id: '/_layout/_layout-2'
 path: ''
 fullPath: ''
 preLoaderRoute: typeof LayoutLayout2Import
 parentRoute: typeof LayoutImport
 }
 '/_layout/_layout-2/layout-a': {
 id: '/_layout/_layout-2/layout-a'
 path: '/layout-a'
 fullPath: '/layout-a'
 preLoaderRoute: typeof LayoutLayout2LayoutAImport
 parentRoute: typeof LayoutLayout2Import
 }
 '/_layout/_layout-2/layout-b': {
 id: '/_layout/_layout-2/layout-b'
 path: '/layout-b'
 fullPath: '/layout-b'
 preLoaderRoute: typeof LayoutLayout2LayoutBImport
 parentRoute: typeof LayoutLayout2Import
 '/sign-in': {
 id: '/sign-in'
 path: '/sign-in'
 fullPath: '/sign-in'
 preLoaderRoute: typeof SignInImport
 parentRoute: typeof rootRoute
 }
 }
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
 IndexRoute,
 LayoutRoute: LayoutRoute.addChildren({
 LayoutLayout2Route: LayoutLayout2Route.addChildren({
 LayoutLayout2LayoutARoute,
 LayoutLayout2LayoutBRoute,
 }),
 }),
})
export interface FileRoutesByFullPath {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
 __root__: typeof rootRoute
 '/': typeof IndexRoute
 '/_layout': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
 fullPaths: '/' | '' | '/sign-in'
 fileRoutesByTo: FileRoutesByTo
 to: '/' | '' | '/sign-in'
 id: '__root__' | '/' | '/_layout' | '/sign-in'
 fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
 IndexRoute: typeof IndexRoute
 LayoutRoute: typeof LayoutRoute
 SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
 IndexRoute: IndexRoute,
 LayoutRoute: LayoutRoute,
 SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
 ._addFileChildren(rootRouteChildren)
 ._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
 "filePath": "__root.tsx",
 "children": [
 "/",
 "/_layout"
 "/_layout",
 "/sign-in"
 ]
 },
 "/": {
 "filePath": "index.tsx"
 },
 "/_layout": {
 "filePath": "_layout.tsx",
 "children": [
 "/_layout/_layout-2"
 ]
 },
 "/_layout/_layout-2": {
 "filePath": "_layout/_layout-2.tsx",
 "parent": "/_layout",
 "children": [
 "/_layout/_layout-2/layout-a",
 "/_layout/_layout-2/layout-b"
 ]
 },
 "/_layout/_layout-2/layout-a": {
 "filePath": "_layout/_layout-2/layout-a.tsx",
 "parent": "/_layout/_layout-2"
 "filePath": "_layout.tsx"
 },
 "/_layout/_layout-2/layout-b": {
 "filePath": "_layout/_layout-2/layout-b.tsx",
 "parent": "/_layout/_layout-2"
 "/sign-in": {
 "filePath": "sign-in.tsx"
 }
 }
}
Expand Down

14 changes: 7 additions & 7 deletions
integration/templates/tanstack-start/app/routes/__root.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
 createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
 return (
 <ClerkProvider>
 <Html>
 <Head>
 <html>
 <head>
 <Meta />
 </Head>
 <Body>
 </head>
 <body>
 {children}
 <ScrollRestoration />
 <TanStackRouterDevtools position="bottom-right" />
 <Scripts />
 </Body>
 </Html>
 </body>
 </html>
 </ClerkProvider>
 )
}

17 changes: 8 additions & 9 deletions
integration/templates/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
 "start": "vinxi start --port=$PORT"
 },
 "dependencies": {
 "@tanstack/react-router": "^1.46.4",
 "@tanstack/router-devtools": "^1.46.5",
 "@tanstack/router-plugin": "^1.45.13",
 "@tanstack/start": "^1.46.4",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/router-devtools": "^1.81.9",
 "@tanstack/router-plugin": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@typescript-eslint/parser": "^7.18.0",
 "@vitejs/plugin-react": "^4.3.1",
 "isbot": "^5.1.14",
 "isbot": "^5.1.17",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "tailwind-merge": "^2.4.0",
 "vinxi": "0.4.1"
 "tailwind-merge": "^2.5.4",
 "vinxi": "0.4.3"
 },
 "devDependencies": {
 "@types/node": "^20.12.11",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
 "@vitejs/plugin-react": "^4.3.1",
 "@vitejs/plugin-react": "^4.3.3",
 "autoprefixer": "^10.4.20",
 "postcss": "^8.4.47",
 "prettier": "^3.3.3",
Expand Down

8 changes: 4 additions & 4 deletions
packages/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
 },
 "devDependencies": {
 "@clerk/eslint-config-custom": "workspace:*",
 "@tanstack/react-router": "^1.49.1",
 "@tanstack/start": "^1.49.1",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@types/node": "^18.19.43",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
 "vinxi": "^0.4.1"
 },
 "peerDependencies": {
 "@tanstack/react-router": ">=1.49.1",
 "@tanstack/start": ">=1.49.1",
 "@tanstack/react-router": ">=1.81.9",
 "@tanstack/start": ">=1.81.9",
 "react": ">=18 || >=19.0.0-beta",
 "react-dom": ">=18 || >=19.0.0-beta"
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LekoArts
merged 6 commits into

from

Nov 15, 2024
 Merged


chore(tanstack-start): Update deps & integration tests
#4575
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2816d2

fix: Unrelated nextjs build fix


LekoArts Nov 15, 2024
f2ee058

chore(tanstack-start): Update deps


LekoArts Nov 15, 2024
4b5f73c

chore: Update Tanstack Start integration test deps


LekoArts Nov 15, 2024
5f79939

add placeholder changeset


LekoArts Nov 15, 2024
b88ec2c

Revert "fix: Unrelated nextjs build fix"


LekoArts Nov 15, 2024
04714c6

Update beige-parrots-yawn.md


LekoArts Nov 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/beige-parrots-yawn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.

2 changes: 1 addition & 1 deletion
integration/templates/tanstack-start/app/client.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)

135 changes: 64 additions & 71 deletions
integration/templates/tanstack-start/app/routeTree.gen.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
 id: '/sign-in',
 path: '/sign-in',
 getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
 id: '/_layout',
 getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
 id: '/',
 path: '/',
 getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
 id: '/_layout-2',
 getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
 path: '/layout-b',
 getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
 path: '/layout-a',
 getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
 preLoaderRoute: typeof LayoutImport
 parentRoute: typeof rootRoute
 }
 '/_layout/_layout-2': {
 id: '/_layout/_layout-2'
 path: ''
 fullPath: ''
 preLoaderRoute: typeof LayoutLayout2Import
 parentRoute: typeof LayoutImport
 }
 '/_layout/_layout-2/layout-a': {
 id: '/_layout/_layout-2/layout-a'
 path: '/layout-a'
 fullPath: '/layout-a'
 preLoaderRoute: typeof LayoutLayout2LayoutAImport
 parentRoute: typeof LayoutLayout2Import
 }
 '/_layout/_layout-2/layout-b': {
 id: '/_layout/_layout-2/layout-b'
 path: '/layout-b'
 fullPath: '/layout-b'
 preLoaderRoute: typeof LayoutLayout2LayoutBImport
 parentRoute: typeof LayoutLayout2Import
 '/sign-in': {
 id: '/sign-in'
 path: '/sign-in'
 fullPath: '/sign-in'
 preLoaderRoute: typeof SignInImport
 parentRoute: typeof rootRoute
 }
 }
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
 IndexRoute,
 LayoutRoute: LayoutRoute.addChildren({
 LayoutLayout2Route: LayoutLayout2Route.addChildren({
 LayoutLayout2LayoutARoute,
 LayoutLayout2LayoutBRoute,
 }),
 }),
})
export interface FileRoutesByFullPath {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
 __root__: typeof rootRoute
 '/': typeof IndexRoute
 '/_layout': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
 fullPaths: '/' | '' | '/sign-in'
 fileRoutesByTo: FileRoutesByTo
 to: '/' | '' | '/sign-in'
 id: '__root__' | '/' | '/_layout' | '/sign-in'
 fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
 IndexRoute: typeof IndexRoute
 LayoutRoute: typeof LayoutRoute
 SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
 IndexRoute: IndexRoute,
 LayoutRoute: LayoutRoute,
 SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
 ._addFileChildren(rootRouteChildren)
 ._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
 "filePath": "__root.tsx",
 "children": [
 "/",
 "/_layout"
 "/_layout",
 "/sign-in"
 ]
 },
 "/": {
 "filePath": "index.tsx"
 },
 "/_layout": {
 "filePath": "_layout.tsx",
 "children": [
 "/_layout/_layout-2"
 ]
 },
 "/_layout/_layout-2": {
 "filePath": "_layout/_layout-2.tsx",
 "parent": "/_layout",
 "children": [
 "/_layout/_layout-2/layout-a",
 "/_layout/_layout-2/layout-b"
 ]
 },
 "/_layout/_layout-2/layout-a": {
 "filePath": "_layout/_layout-2/layout-a.tsx",
 "parent": "/_layout/_layout-2"
 "filePath": "_layout.tsx"
 },
 "/_layout/_layout-2/layout-b": {
 "filePath": "_layout/_layout-2/layout-b.tsx",
 "parent": "/_layout/_layout-2"
 "/sign-in": {
 "filePath": "sign-in.tsx"
 }
 }
}
Expand Down

14 changes: 7 additions & 7 deletions
integration/templates/tanstack-start/app/routes/__root.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
 createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
 return (
 <ClerkProvider>
 <Html>
 <Head>
 <html>
 <head>
 <Meta />
 </Head>
 <Body>
 </head>
 <body>
 {children}
 <ScrollRestoration />
 <TanStackRouterDevtools position="bottom-right" />
 <Scripts />
 </Body>
 </Html>
 </body>
 </html>
 </ClerkProvider>
 )
}

17 changes: 8 additions & 9 deletions
integration/templates/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
 "start": "vinxi start --port=$PORT"
 },
 "dependencies": {
 "@tanstack/react-router": "^1.46.4",
 "@tanstack/router-devtools": "^1.46.5",
 "@tanstack/router-plugin": "^1.45.13",
 "@tanstack/start": "^1.46.4",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/router-devtools": "^1.81.9",
 "@tanstack/router-plugin": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@typescript-eslint/parser": "^7.18.0",
 "@vitejs/plugin-react": "^4.3.1",
 "isbot": "^5.1.14",
 "isbot": "^5.1.17",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "tailwind-merge": "^2.4.0",
 "vinxi": "0.4.1"
 "tailwind-merge": "^2.5.4",
 "vinxi": "0.4.3"
 },
 "devDependencies": {
 "@types/node": "^20.12.11",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
 "@vitejs/plugin-react": "^4.3.1",
 "@vitejs/plugin-react": "^4.3.3",
 "autoprefixer": "^10.4.20",
 "postcss": "^8.4.47",
 "prettier": "^3.3.3",
Expand Down

8 changes: 4 additions & 4 deletions
packages/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
 },
 "devDependencies": {
 "@clerk/eslint-config-custom": "workspace:*",
 "@tanstack/react-router": "^1.49.1",
 "@tanstack/start": "^1.49.1",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@types/node": "^18.19.43",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
 "vinxi": "^0.4.1"
 },
 "peerDependencies": {
 "@tanstack/react-router": ">=1.49.1",
 "@tanstack/start": ">=1.49.1",
 "@tanstack/react-router": ">=1.81.9",
 "@tanstack/start": ">=1.81.9",
 "react": ">=18 || >=19.0.0-beta",
 "react-dom": ">=18 || >=19.0.0-beta"
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LekoArts
merged 6 commits into

from

Nov 15, 2024
 Merged


chore(tanstack-start): Update deps & integration tests
#4575
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2816d2

fix: Unrelated nextjs build fix


LekoArts Nov 15, 2024
f2ee058

chore(tanstack-start): Update deps


LekoArts Nov 15, 2024
4b5f73c

chore: Update Tanstack Start integration test deps


LekoArts Nov 15, 2024
5f79939

add placeholder changeset


LekoArts Nov 15, 2024
b88ec2c

Revert "fix: Unrelated nextjs build fix"


LekoArts Nov 15, 2024
04714c6

Update beige-parrots-yawn.md


LekoArts Nov 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/beige-parrots-yawn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.

2 changes: 1 addition & 1 deletion
integration/templates/tanstack-start/app/client.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)

135 changes: 64 additions & 71 deletions
integration/templates/tanstack-start/app/routeTree.gen.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
 id: '/sign-in',
 path: '/sign-in',
 getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
 id: '/_layout',
 getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
 id: '/',
 path: '/',
 getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
 id: '/_layout-2',
 getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
 path: '/layout-b',
 getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
 path: '/layout-a',
 getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
 preLoaderRoute: typeof LayoutImport
 parentRoute: typeof rootRoute
 }
 '/_layout/_layout-2': {
 id: '/_layout/_layout-2'
 path: ''
 fullPath: ''
 preLoaderRoute: typeof LayoutLayout2Import
 parentRoute: typeof LayoutImport
 }
 '/_layout/_layout-2/layout-a': {
 id: '/_layout/_layout-2/layout-a'
 path: '/layout-a'
 fullPath: '/layout-a'
 preLoaderRoute: typeof LayoutLayout2LayoutAImport
 parentRoute: typeof LayoutLayout2Import
 }
 '/_layout/_layout-2/layout-b': {
 id: '/_layout/_layout-2/layout-b'
 path: '/layout-b'
 fullPath: '/layout-b'
 preLoaderRoute: typeof LayoutLayout2LayoutBImport
 parentRoute: typeof LayoutLayout2Import
 '/sign-in': {
 id: '/sign-in'
 path: '/sign-in'
 fullPath: '/sign-in'
 preLoaderRoute: typeof SignInImport
 parentRoute: typeof rootRoute
 }
 }
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
 IndexRoute,
 LayoutRoute: LayoutRoute.addChildren({
 LayoutLayout2Route: LayoutLayout2Route.addChildren({
 LayoutLayout2LayoutARoute,
 LayoutLayout2LayoutBRoute,
 }),
 }),
})
export interface FileRoutesByFullPath {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
 __root__: typeof rootRoute
 '/': typeof IndexRoute
 '/_layout': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
 fullPaths: '/' | '' | '/sign-in'
 fileRoutesByTo: FileRoutesByTo
 to: '/' | '' | '/sign-in'
 id: '__root__' | '/' | '/_layout' | '/sign-in'
 fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
 IndexRoute: typeof IndexRoute
 LayoutRoute: typeof LayoutRoute
 SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
 IndexRoute: IndexRoute,
 LayoutRoute: LayoutRoute,
 SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
 ._addFileChildren(rootRouteChildren)
 ._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
 "filePath": "__root.tsx",
 "children": [
 "/",
 "/_layout"
 "/_layout",
 "/sign-in"
 ]
 },
 "/": {
 "filePath": "index.tsx"
 },
 "/_layout": {
 "filePath": "_layout.tsx",
 "children": [
 "/_layout/_layout-2"
 ]
 },
 "/_layout/_layout-2": {
 "filePath": "_layout/_layout-2.tsx",
 "parent": "/_layout",
 "children": [
 "/_layout/_layout-2/layout-a",
 "/_layout/_layout-2/layout-b"
 ]
 },
 "/_layout/_layout-2/layout-a": {
 "filePath": "_layout/_layout-2/layout-a.tsx",
 "parent": "/_layout/_layout-2"
 "filePath": "_layout.tsx"
 },
 "/_layout/_layout-2/layout-b": {
 "filePath": "_layout/_layout-2/layout-b.tsx",
 "parent": "/_layout/_layout-2"
 "/sign-in": {
 "filePath": "sign-in.tsx"
 }
 }
}
Expand Down

14 changes: 7 additions & 7 deletions
integration/templates/tanstack-start/app/routes/__root.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
 createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
 return (
 <ClerkProvider>
 <Html>
 <Head>
 <html>
 <head>
 <Meta />
 </Head>
 <Body>
 </head>
 <body>
 {children}
 <ScrollRestoration />
 <TanStackRouterDevtools position="bottom-right" />
 <Scripts />
 </Body>
 </Html>
 </body>
 </html>
 </ClerkProvider>
 )
}

17 changes: 8 additions & 9 deletions
integration/templates/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
 "start": "vinxi start --port=$PORT"
 },
 "dependencies": {
 "@tanstack/react-router": "^1.46.4",
 "@tanstack/router-devtools": "^1.46.5",
 "@tanstack/router-plugin": "^1.45.13",
 "@tanstack/start": "^1.46.4",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/router-devtools": "^1.81.9",
 "@tanstack/router-plugin": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@typescript-eslint/parser": "^7.18.0",
 "@vitejs/plugin-react": "^4.3.1",
 "isbot": "^5.1.14",
 "isbot": "^5.1.17",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "tailwind-merge": "^2.4.0",
 "vinxi": "0.4.1"
 "tailwind-merge": "^2.5.4",
 "vinxi": "0.4.3"
 },
 "devDependencies": {
 "@types/node": "^20.12.11",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
 "@vitejs/plugin-react": "^4.3.1",
 "@vitejs/plugin-react": "^4.3.3",
 "autoprefixer": "^10.4.20",
 "postcss": "^8.4.47",
 "prettier": "^3.3.3",
Expand Down

8 changes: 4 additions & 4 deletions
packages/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
 },
 "devDependencies": {
 "@clerk/eslint-config-custom": "workspace:*",
 "@tanstack/react-router": "^1.49.1",
 "@tanstack/start": "^1.49.1",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@types/node": "^18.19.43",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
 "vinxi": "^0.4.1"
 },
 "peerDependencies": {
 "@tanstack/react-router": ">=1.49.1",
 "@tanstack/start": ">=1.49.1",
 "@tanstack/react-router": ">=1.81.9",
 "@tanstack/start": ">=1.81.9",
 "react": ">=18 || >=19.0.0-beta",
 "react-dom": ">=18 || >=19.0.0-beta"
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
chore(tanstack-start): Update deps & integration tests#4575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LekoArts
merged 6 commits into

from

Nov 15, 2024
 Merged


chore(tanstack-start): Update deps & integration tests
#4575
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f2816d2

fix: Unrelated nextjs build fix


LekoArts Nov 15, 2024
f2ee058

chore(tanstack-start): Update deps


LekoArts Nov 15, 2024
4b5f73c

chore: Update Tanstack Start integration test deps


LekoArts Nov 15, 2024
5f79939

add placeholder changeset


LekoArts Nov 15, 2024
b88ec2c

Revert "fix: Unrelated nextjs build fix"


LekoArts Nov 15, 2024
04714c6

Update beige-parrots-yawn.md


LekoArts Nov 15, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/beige-parrots-yawn.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/tanstack-start': minor
---

**Breaking change:** Update `@tanstack/react-router` peer dependency from `>=1.49.1` to `>=1.81.9`. Also update `@tanstack/start` peer dependency from `>=1.49.1` to `>=1.81.9`. This update coincides with the [changed server function syntax & server middleware](https://github.com/TanStack/router/pull/2513) that will allow the SDK more functionality in the future.

When updating your `@clerk/tanstack-start` version you'll need to change various pieces in your code, Clerk's documentation ([quickstart](https://clerk.com/docs/quickstarts/tanstack-start), [reference](https://clerk.com/docs/references/tanstack-start/overview)) has been updated to account for that.

2 changes: 1 addition & 1 deletion
integration/templates/tanstack-start/app/client.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,4 @@ import { createRouter } from './router'

const router = createRouter()

hydrateRoot(document.getElementById('root')!, <StartClient router={router} />)
hydrateRoot(document!, <StartClient router={router} />)

135 changes: 64 additions & 71 deletions
integration/templates/tanstack-start/app/routeTree.gen.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router
// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SignInImport } from './routes/sign-in'
import { Route as LayoutImport } from './routes/_layout'
import { Route as IndexImport } from './routes/index'
import { Route as LayoutLayout2Import } from './routes/_layout/_layout-2'
import { Route as LayoutLayout2LayoutBImport } from './routes/_layout/_layout-2/layout-b'
import { Route as LayoutLayout2LayoutAImport } from './routes/_layout/_layout-2/layout-a'

// Create/Update Routes

const SignInRoute = SignInImport.update({
 id: '/sign-in',
 path: '/sign-in',
 getParentRoute: () => rootRoute,
} as any)

const LayoutRoute = LayoutImport.update({
 id: '/_layout',
 getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
 id: '/',
 path: '/',
 getParentRoute: () => rootRoute,
} as any)

const LayoutLayout2Route = LayoutLayout2Import.update({
 id: '/_layout-2',
 getParentRoute: () => LayoutRoute,
} as any)

const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBImport.update({
 path: '/layout-b',
 getParentRoute: () => LayoutLayout2Route,
} as any)

const LayoutLayout2LayoutARoute = LayoutLayout2LayoutAImport.update({
 path: '/layout-a',
 getParentRoute: () => LayoutLayout2Route,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
Expand All@@ -62,43 +52,61 @@ declare module '@tanstack/react-router' {
 preLoaderRoute: typeof LayoutImport
 parentRoute: typeof rootRoute
 }
 '/_layout/_layout-2': {
 id: '/_layout/_layout-2'
 path: ''
 fullPath: ''
 preLoaderRoute: typeof LayoutLayout2Import
 parentRoute: typeof LayoutImport
 }
 '/_layout/_layout-2/layout-a': {
 id: '/_layout/_layout-2/layout-a'
 path: '/layout-a'
 fullPath: '/layout-a'
 preLoaderRoute: typeof LayoutLayout2LayoutAImport
 parentRoute: typeof LayoutLayout2Import
 }
 '/_layout/_layout-2/layout-b': {
 id: '/_layout/_layout-2/layout-b'
 path: '/layout-b'
 fullPath: '/layout-b'
 preLoaderRoute: typeof LayoutLayout2LayoutBImport
 parentRoute: typeof LayoutLayout2Import
 '/sign-in': {
 id: '/sign-in'
 path: '/sign-in'
 fullPath: '/sign-in'
 preLoaderRoute: typeof SignInImport
 parentRoute: typeof rootRoute
 }
 }
}

// Create and export the route tree

export const routeTree = rootRoute.addChildren({
 IndexRoute,
 LayoutRoute: LayoutRoute.addChildren({
 LayoutLayout2Route: LayoutLayout2Route.addChildren({
 LayoutLayout2LayoutARoute,
 LayoutLayout2LayoutBRoute,
 }),
 }),
})
export interface FileRoutesByFullPath {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesByTo {
 '/': typeof IndexRoute
 '': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRoutesById {
 __root__: typeof rootRoute
 '/': typeof IndexRoute
 '/_layout': typeof LayoutRoute
 '/sign-in': typeof SignInRoute
}

export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
 fullPaths: '/' | '' | '/sign-in'
 fileRoutesByTo: FileRoutesByTo
 to: '/' | '' | '/sign-in'
 id: '__root__' | '/' | '/_layout' | '/sign-in'
 fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
 IndexRoute: typeof IndexRoute
 LayoutRoute: typeof LayoutRoute
 SignInRoute: typeof SignInRoute
}

const rootRouteChildren: RootRouteChildren = {
 IndexRoute: IndexRoute,
 LayoutRoute: LayoutRoute,
 SignInRoute: SignInRoute,
}

/* prettier-ignore-end */
export const routeTree = rootRoute
 ._addFileChildren(rootRouteChildren)
 ._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
Expand All@@ -107,33 +115,18 @@ export const routeTree = rootRoute.addChildren({
 "filePath": "__root.tsx",
 "children": [
 "/",
 "/_layout"
 "/_layout",
 "/sign-in"
 ]
 },
 "/": {
 "filePath": "index.tsx"
 },
 "/_layout": {
 "filePath": "_layout.tsx",
 "children": [
 "/_layout/_layout-2"
 ]
 },
 "/_layout/_layout-2": {
 "filePath": "_layout/_layout-2.tsx",
 "parent": "/_layout",
 "children": [
 "/_layout/_layout-2/layout-a",
 "/_layout/_layout-2/layout-b"
 ]
 },
 "/_layout/_layout-2/layout-a": {
 "filePath": "_layout/_layout-2/layout-a.tsx",
 "parent": "/_layout/_layout-2"
 "filePath": "_layout.tsx"
 },
 "/_layout/_layout-2/layout-b": {
 "filePath": "_layout/_layout-2/layout-b.tsx",
 "parent": "/_layout/_layout-2"
 "/sign-in": {
 "filePath": "sign-in.tsx"
 }
 }
}
Expand Down

14 changes: 7 additions & 7 deletions
integration/templates/tanstack-start/app/routes/__root.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import {
 createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { Body, Head, Html, Meta, Scripts } from '@tanstack/start'
import { Meta, Scripts } from '@tanstack/start'
import * as React from 'react'
import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary'
import { NotFound } from '~/components/NotFound'
Expand DownExpand Up@@ -33,17 +33,17 @@ export const Route = createRootRoute({
function RootDocument({ children }: { children: React.ReactNode }) {
 return (
 <ClerkProvider>
 <Html>
 <Head>
 <html>
 <head>
 <Meta />
 </Head>
 <Body>
 </head>
 <body>
 {children}
 <ScrollRestoration />
 <TanStackRouterDevtools position="bottom-right" />
 <Scripts />
 </Body>
 </Html>
 </body>
 </html>
 </ClerkProvider>
 )
}

17 changes: 8 additions & 9 deletions
integration/templates/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,23 +8,22 @@
 "start": "vinxi start --port=$PORT"
 },
 "dependencies": {
 "@tanstack/react-router": "^1.46.4",
 "@tanstack/router-devtools": "^1.46.5",
 "@tanstack/router-plugin": "^1.45.13",
 "@tanstack/start": "^1.46.4",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/router-devtools": "^1.81.9",
 "@tanstack/router-plugin": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@typescript-eslint/parser": "^7.18.0",
 "@vitejs/plugin-react": "^4.3.1",
 "isbot": "^5.1.14",
 "isbot": "^5.1.17",
 "react": "18.3.1",
 "react-dom": "18.3.1",
 "tailwind-merge": "^2.4.0",
 "vinxi": "0.4.1"
 "tailwind-merge": "^2.5.4",
 "vinxi": "0.4.3"
 },
 "devDependencies": {
 "@types/node": "^20.12.11",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
 "@vitejs/plugin-react": "^4.3.1",
 "@vitejs/plugin-react": "^4.3.3",
 "autoprefixer": "^10.4.20",
 "postcss": "^8.4.47",
 "prettier": "^3.3.3",
Expand Down

8 changes: 4 additions & 4 deletions
packages/tanstack-start/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@
 },
 "devDependencies": {
 "@clerk/eslint-config-custom": "workspace:*",
 "@tanstack/react-router": "^1.49.1",
 "@tanstack/start": "^1.49.1",
 "@tanstack/react-router": "^1.81.9",
 "@tanstack/start": "^1.81.9",
 "@types/node": "^18.19.43",
 "@types/react": "18.3.12",
 "@types/react-dom": "18.3.1",
Expand All@@ -72,8 +72,8 @@
 "vinxi": "^0.4.1"
 },
 "peerDependencies": {
 "@tanstack/react-router": ">=1.49.1",
 "@tanstack/start": ">=1.49.1",
 "@tanstack/react-router": ">=1.81.9",
 "@tanstack/start": ">=1.81.9",
 "react": ">=18 || >=19.0.0-beta",
 "react-dom": ">=18 || >=19.0.0-beta"
 },
Expand Down
Loading