Skip to content

Commit f641da5

Browse files
authored
Merge branch 'main' into theo/protect-check-sdk-support
2 parents 0f726f7 + 2f48ea8 commit f641da5

165 files changed

Lines changed: 4524 additions & 5378 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/expo-native-component-theming.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

.changeset/fair-doodles-change.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/fix-oauth-consent-redirect.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/green-sides-tickle.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.cursor/commands/cmt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Generate a commit message for changes in this chat. **Do not commit or push** (s
1717

1818
Scopes must match package/app names. No scope is also valid. Invalid scope = commitlint rejection.
1919

20-
- **Packages:** agent-toolkit, astro, backend, chrome-extension, clerk-js, dev-cli, elements, expo, expo-passkeys, express, fastify, localizations, nextjs, nuxt, react, react-router, remix, shared, tanstack-react-start, testing, themes, types, ui, upgrade, vue
20+
- **Packages:** astro, backend, chrome-extension, clerk-js, dev-cli, elements, expo, expo-passkeys, express, fastify, localizations, nextjs, nuxt, react, react-router, remix, shared, tanstack-react-start, testing, themes, types, ui, upgrade, vue
2121
- **Other:** docs, repo, release, e2e, \*
2222

2323
---

.cursor/rules/monorepo.mdc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Core Package Categories
2222
- **Backend**: `@clerk/backend` - Server-side utilities and JWT verification
2323
- **Shared Utilities**: `@clerk/shared`, `@clerk/types` - Common utilities and TypeScript types
2424
- **Developer Tools**: `@clerk/testing`, `@clerk/dev-cli`, `@clerk/upgrade`
25-
- **Specialized**: `@clerk/agent-toolkit` - AI agent integration tools
2625

2726
Directory Structure
2827

.github/labeler.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ integration:
9292
- changed-files:
9393
- any-glob-to-any-file: integration/**
9494

95-
agent-toolkit:
96-
- changed-files:
97-
- any-glob-to-any-file: packages/agent-toolkit/**
98-
9995
# Base branch labels
10096
core-2:
10197
- base-branch: '^release/core-2$'

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22
1+
22.11.0

integration/presets/react.ts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,18 @@ import { applicationConfig } from '../models/applicationConfig';
22
import { templates } from '../templates';
33
import { PKGLAB } from './utils';
44

5-
const cra = applicationConfig()
6-
.setName('react-cra')
7-
.useTemplate(templates['react-cra'])
8-
.setEnvFormatter('public', key => `REACT_APP_${key}`)
5+
const vite = applicationConfig()
6+
.setName('react-vite')
7+
.useTemplate(templates['react-vite'])
8+
.setEnvFormatter('public', key => `VITE_${key}`)
99
.addScript('setup', 'pnpm install')
10-
.addScript('dev', 'pnpm start')
10+
.addScript('dev', 'pnpm dev')
1111
.addScript('build', 'pnpm build')
12-
.addScript('serve', 'pnpm start')
12+
.addScript('serve', 'pnpm preview')
1313
.addDependency('@clerk/react', PKGLAB)
1414
.addDependency('@clerk/shared', PKGLAB)
1515
.addDependency('@clerk/ui', PKGLAB);
1616

17-
const vite = cra
18-
.clone()
19-
.setName('react-vite')
20-
.useTemplate(templates['react-vite'])
21-
.setEnvFormatter('public', key => `VITE_${key}`)
22-
.addScript('dev', 'pnpm dev')
23-
.addScript('serve', 'pnpm preview');
24-
2517
export const react = {
26-
cra,
2718
vite,
2819
} as const;

integration/templates/chrome-extension-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
"vite": "^4.3.9"
2020
},
2121
"engines": {
22-
"node": ">=20.9.0"
22+
"node": ">=22.11.0"
2323
}
2424
}

0 commit comments

Comments
 (0)