Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8771fe7
feat(tanstack-start): Support TanStack Router out of the box
octoper Aug 12, 2024
b68ae01
chore(repo): Add changeset
octoper Aug 12, 2024
37d8ff6
chore(tanstack-start): Apply formatting
octoper Aug 12, 2024
23d00c7
feat(e2e): Add TanStack Start test suite (#3935)
octoper Aug 13, 2024
0343b8c
test(e2e): Update TanStack Start preset
octoper Aug 13, 2024
077abe7
chore(repo): Add Tanstack label
octoper Aug 13, 2024
3613cd8
chore(repo): Remove unused changesets
octoper Aug 13, 2024
6c25ddf
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
a7935df
test(e2e): Add test for Clerk Handler
octoper Aug 13, 2024
77b1223
feat(e2e): Add E2E tests for TanStack Router
octoper Aug 13, 2024
2d3ed87
ci(repo): Add test:integration:tanstack-router in turbo.json
octoper Aug 13, 2024
b44cc15
chore(e2e): Fix formatting
octoper Aug 13, 2024
624585b
fix(e2e): Fix Tanstack test suites
octoper Aug 13, 2024
1be01f2
chore(e2e): Added test for TanStack Router
octoper Aug 16, 2024
7d4caa1
Update .changeset/hip-spiders-behave.md
octoper Aug 16, 2024
c8e7e17
Update .changeset/hip-spiders-behave.md
LekoArts Aug 19, 2024
a524441
feat(tanstack-start): Support path based routing
octoper Aug 21, 2024
1bd8d55
chore(repo): Update changeset
octoper Aug 21, 2024
20d731f
chore(repo): Update changeset
octoper Aug 21, 2024
49abab7
chore(tanstack-start): Fix formatting
octoper Aug 21, 2024
68643b4
fix(tanstack-auth): Only require passing Request object in getAuth
octoper Aug 22, 2024
7e4e1b2
Update packages/tanstack-start/src/utils/env.ts
octoper Aug 22, 2024
457b98a
Update packages/tanstack-start/src/utils/errors.ts
octoper Aug 22, 2024
54f957e
chore(backend): Remove wrongly commited changes
octoper Aug 22, 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
5 changes: 5 additions & 0 deletions .changeset/hip-spiders-behave.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": minor
---

Add support for path based routing and TanStack Router only apps
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,6 @@ actions:

integration:
- integration/**

tanstack:
- packages/tanstack-start/**
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ jobs:

strategy:
matrix:
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web']
test-name: ['generic', 'express', 'quickstart', 'ap-flows', 'elements', 'sessions', 'astro', 'expo-web', 'tanstack-start', 'tanstack-router']
test-project: ['chrome']
include:
- test-name: 'nextjs'
Expand Down
Empty file modified.husky/pre-commit
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions integration/presets/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { createLongRunningApps } from './longRunningApps';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

export const appConfigs = {
envs,
Expand All@@ -18,6 +19,7 @@ export const appConfigs = {
elements,
expo,
astro,
tanstack,
secrets: {
instanceKeys,
},
Expand Down
3 changes: 3 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { express } from './express';
import { next } from './next';
import { react } from './react';
import { remix } from './remix';
import { tanstack } from './tanstack';

/**
* A list of long-running applications that can be used in tests.
Expand All@@ -27,6 +28,8 @@ export const createLongRunningApps = () => {
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
{ id: 'expo.expo-web', config: expo.expoWeb, env: envs.withEmailCodes },
{ id: 'tanstack.start', config: tanstack.start, env: envs.withEmailCodes },
{ id: 'tanstack.router', config: tanstack.router, env: envs.withEmailCodes },
] as const;

const apps = configs.map(longRunningApplication);
Expand Down
33 changes: 33 additions & 0 deletions integration/presets/tanstack.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { applicationConfig } from '../models/applicationConfig.js';
import { templates } from '../templates/index.js';

const clerkTanStackLocal = `file:${process.cwd()}/packages/tanstack-start`;

const router = applicationConfig()
.setName('tanstack-router')
.useTemplate(templates['tanstack-router'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
Comment thread
octoper marked this conversation as resolved.
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

const start = applicationConfig()
.setName('tanstack-start')
.useTemplate(templates['tanstack-start'])
.setEnvFormatter('public', key => `VITE_${key}`)
// `--install-links` ensures that the @clerk/tanstack-start is installed as a regular dependancie instead of creating symlink
// please do not remove this flag as it's going to break the setup
.addScript('setup', 'npm i --install-links')
.addScript('dev', 'npm run dev')
.addScript('build', 'npm run build')
.addScript('serve', 'npm run start')
.addDependency('@clerk/tanstack-start', clerkTanStackLocal);

export const tanstack = {
start,
router,
} as const;
2 changes: 2 additions & 0 deletions integration/templates/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ export const templates = {
'astro-node': resolve(__dirname, './astro-node'),
'astro-hybrid': resolve(__dirname, './astro-hybrid'),
'expo-web': resolve(__dirname, './expo-web'),
'tanstack-start': resolve(__dirname, './tanstack-start'),
'tanstack-router': resolve(__dirname, './tanstack-router'),
} as const;

if (new Set([...Object.values(templates)]).size !== Object.values(templates).length) {
Expand Down
10 changes: 10 additions & 0 deletions integration/templates/tanstack-router/.gitignore
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
6 changes: 6 additions & 0 deletions integration/templates/tanstack-router/README.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Example

To run this example:

- `npm install` or `yarn`
- `npm start` or `yarn start`
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/index.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite App</title>
<script src="https://cdn.tailwindcss.com"></script>
<style type="text/tailwindcss">
html {
color-scheme: light dark;
}
* {
@apply border-gray-200 dark:border-gray-800;
}
body {
@apply bg-gray-50 text-gray-950 dark:bg-gray-900 dark:text-gray-200;
}
</style>
</head>
<body>
<div id="app"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
24 changes: 24 additions & 0 deletions integration/templates/tanstack-router/package.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
{
"name": "tanstack-router-react-example-basic-file-based",
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port=$PORT",
"build": "vite build",
"serve": "vite preview --port=$PORT",
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.47.1",
"@tanstack/router-devtools": "^1.47.1",
"@tanstack/router-plugin": "^1.47.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
}
}
25 changes: 25 additions & 0 deletions integration/templates/tanstack-router/src/main.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';

// Set up a Router instance
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultStaleTime: 5000,
});

// Register things for typesafety
declare module '@tanstack/react-router' {
interface Register {
router: typeof router;
}
}

const rootElement = document.getElementById('app')!;

if (!rootElement.innerHTML) {
const root = ReactDOM.createRoot(rootElement);
root.render(<RouterProvider router={router} />);
}
30 changes: 30 additions & 0 deletions integration/templates/tanstack-router/src/posts.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import { notFound } from '@tanstack/react-router';
import axios from 'redaxios';

export type PostType = {
id: string;
title: string;
body: string;
};

export const fetchPost = async (postId: string) => {
console.info(`Fetching post with id ${postId}...`);
await new Promise(r => setTimeout(r, 500));
const post = await axios
.get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
.then(r => r.data)
.catch(err => {
if (err.status === 404) {
throw notFound();
}
throw err;
});

return post;
};

export const fetchPosts = async () => {
console.info('Fetching posts...');
await new Promise(r => setTimeout(r, 500));
return axios.get<Array<PostType>>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10));
};
Loading