diff --git a/.changeset/cyan-dancers-chew.md b/.changeset/cyan-dancers-chew.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/cyan-dancers-chew.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/.changeset/deprecate-clerk-types.md b/.changeset/deprecate-clerk-types.md index bafff5d708a..ee37cc4f709 100644 --- a/.changeset/deprecate-clerk-types.md +++ b/.changeset/deprecate-clerk-types.md @@ -1,5 +1,4 @@ --- -'@clerk/types': minor '@clerk/shared': minor '@clerk/astro': patch '@clerk/backend': patch diff --git a/.changeset/fuzzy-chefs-stand.md b/.changeset/fuzzy-chefs-stand.md index 66866bdf35b..875ce1de5a5 100644 --- a/.changeset/fuzzy-chefs-stand.md +++ b/.changeset/fuzzy-chefs-stand.md @@ -2,7 +2,6 @@ '@clerk/nextjs': major '@clerk/shared': major '@clerk/react': major -'@clerk/types': major --- Updating minimum version of Node to v20.9.0 diff --git a/.github/labeler.yml b/.github/labeler.yml index bff68abae9c..e36a1ab7131 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -48,9 +48,6 @@ testing: themes: - packages/themes/** -types: - - packages/types/** - vue: - packages/vue/** diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 003bf9dafab..cd792b06f1a 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -45,7 +45,6 @@ All packages of the monorepo are inside [packages](../packages). For package spe - [`@clerk/backend`](../packages/backend): Functionalities regarded as "core" for Clerk to operate with. _Authentication resolution, API Resources etc._ - [`@clerk/clerk-js`](../packages/clerk-js): Core JavaScript implementation used by Clerk in the browser. - [`@clerk/react`](../packages/react) Clerk package for React applications. -- [`@clerk/types`](../packages/types): Main TypeScript typings for Clerk libraries. - Browse [packages](../packages) to see more Additionally there are packages which act as shared utilities or building blocks. diff --git a/integration/presets/astro.ts b/integration/presets/astro.ts index 7995725b97b..b34b7fb041c 100644 --- a/integration/presets/astro.ts +++ b/integration/presets/astro.ts @@ -11,7 +11,6 @@ const astroNode = applicationConfig() .addScript('build', 'pnpm build') .addScript('serve', 'pnpm preview') .addDependency('@clerk/astro', linkPackage('astro')) - .addDependency('@clerk/types', linkPackage('types')) .addDependency('@clerk/localizations', linkPackage('localizations')); const astroStatic = astroNode.clone().setName('astro-hybrid').useTemplate(templates['astro-hybrid']); diff --git a/integration/presets/next.ts b/integration/presets/next.ts index e2397d2a236..13f00dea7ad 100644 --- a/integration/presets/next.ts +++ b/integration/presets/next.ts @@ -15,8 +15,7 @@ const appRouter = applicationConfig() .addDependency('react', constants.E2E_REACT_VERSION) .addDependency('react-dom', constants.E2E_REACT_DOM_VERSION) .addDependency('@clerk/nextjs', constants.E2E_CLERK_VERSION || linkPackage('nextjs')) - .addDependency('@clerk/shared', linkPackage('shared')) - .addDependency('@clerk/types', linkPackage('types')); + .addDependency('@clerk/shared', linkPackage('shared')); const appRouterTurbo = appRouter.clone().setName('next-app-router-turbopack').addScript('dev', 'pnpm dev'); diff --git a/integration/templates/next-app-router/src/app/(reverification)/actions.ts b/integration/templates/next-app-router/src/app/(reverification)/actions.ts index 54334730534..76750881672 100644 --- a/integration/templates/next-app-router/src/app/(reverification)/actions.ts +++ b/integration/templates/next-app-router/src/app/(reverification)/actions.ts @@ -1,7 +1,7 @@ 'use server'; import { auth, reverificationError } from '@clerk/nextjs/server'; -import { ReverificationConfig } from '@clerk/types'; +import type { ReverificationConfig } from '@clerk/shared/types'; const logUserIdActionReverification = async () => { const { userId, has } = await auth.protect(); diff --git a/integration/tests/last-authentication-strategy.test.ts b/integration/tests/last-authentication-strategy.test.ts index e9d18230380..458a35c5dac 100644 --- a/integration/tests/last-authentication-strategy.test.ts +++ b/integration/tests/last-authentication-strategy.test.ts @@ -1,7 +1,7 @@ +import type { LastAuthenticationStrategy } from '@clerk/shared/types'; import type { Page } from '@playwright/test'; import { expect, test } from '@playwright/test'; -import type { LastAuthenticationStrategy } from '../../packages/types'; import { appConfigs } from '../presets'; import { createTestUtils, testAgainstRunningApps } from '../testUtils'; diff --git a/integration/types.d.ts b/integration/types.d.ts index 8df81fba45b..dccc31eb76a 100644 --- a/integration/types.d.ts +++ b/integration/types.d.ts @@ -1,4 +1,4 @@ -import type { Clerk } from '@clerk/types'; +import type { Clerk } from '@clerk/clerk-js'; declare global { interface Window { diff --git a/package.json b/package.json index f98243f7692..54f37ad01e4 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "MIT", "scripts": { "build": "FORCE_COLOR=1 turbo build --concurrency=${TURBO_CONCURRENCY:-80%} --filter=!@clerk/elements", - "build:declarations": "FORCE_COLOR=1 turbo build:declarations --concurrency=${TURBO_CONCURRENCY:-80%} --filter=@clerk/nextjs --filter=@clerk/react --filter=@clerk/shared --filter=@clerk/types", + "build:declarations": "FORCE_COLOR=1 turbo build:declarations --concurrency=${TURBO_CONCURRENCY:-80%} --filter=@clerk/nextjs --filter=@clerk/react --filter=@clerk/shared", "bundlewatch": "turbo bundlewatch", "changeset": "changeset", "changeset:empty": "pnpm changeset --empty", diff --git a/packages/agent-toolkit/package.json b/packages/agent-toolkit/package.json index e7a48d69cf0..621aac1a9c9 100644 --- a/packages/agent-toolkit/package.json +++ b/packages/agent-toolkit/package.json @@ -49,7 +49,6 @@ "dependencies": { "@clerk/backend": "workspace:^", "@clerk/shared": "workspace:^", - "@clerk/types": "workspace:^", "@modelcontextprotocol/sdk": "1.7.0", "yargs": "17.7.2", "zod": "3.24.2" diff --git a/packages/astro/package.json b/packages/astro/package.json index e97a6b0e6da..5bac39c09f6 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -90,7 +90,6 @@ "dependencies": { "@clerk/backend": "workspace:^", "@clerk/shared": "workspace:^", - "@clerk/types": "workspace:^", "nanoid": "5.1.6", "nanostores": "1.0.1" }, diff --git a/packages/astro/src/astro-components/control/AuthenticateWithRedirectCallback.astro b/packages/astro/src/astro-components/control/AuthenticateWithRedirectCallback.astro index aef20144140..43032416254 100644 --- a/packages/astro/src/astro-components/control/AuthenticateWithRedirectCallback.astro +++ b/packages/astro/src/astro-components/control/AuthenticateWithRedirectCallback.astro @@ -1,5 +1,5 @@ --- -import type { HandleOAuthCallbackParams } from '@clerk/types'; +import type { HandleOAuthCallbackParams } from '@clerk/shared/types'; type Props = HandleOAuthCallbackParams; diff --git a/packages/astro/src/astro-components/control/ProtectCSR.astro b/packages/astro/src/astro-components/control/ProtectCSR.astro index cee284935c5..e3aa5ca8f3c 100644 --- a/packages/astro/src/astro-components/control/ProtectCSR.astro +++ b/packages/astro/src/astro-components/control/ProtectCSR.astro @@ -44,7 +44,7 @@ const {