Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/cyan-dancers-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
1 change: 0 additions & 1 deletion .changeset/deprecate-clerk-types.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
'@clerk/types': minor
'@clerk/shared': minor
'@clerk/astro': patch
'@clerk/backend': patch
Expand Down
1 change: 0 additions & 1 deletion .changeset/fuzzy-chefs-stand.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ testing:
themes:
- packages/themes/**

types:
- packages/types/**

vue:
- packages/vue/**

Expand Down
1 change: 0 additions & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion integration/presets/astro.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down
3 changes: 1 addition & 2 deletions integration/presets/next.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
Original file line number Diff line number Diff line change
@@ -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();

Expand Down
2 changes: 1 addition & 1 deletion integration/tests/last-authentication-strategy.test.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion integration/types.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Clerk } from '@clerk/types';
import type { Clerk } from '@clerk/clerk-js';

declare global {
interface Window {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/agent-toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion packages/astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
"dependencies": {
"@clerk/backend": "workspace:^",
"@clerk/shared": "workspace:^",
"@clerk/types": "workspace:^",
"nanoid": "5.1.6",
"nanostores": "1.0.1"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { HandleOAuthCallbackParams } from '@clerk/types';
import type { HandleOAuthCallbackParams } from '@clerk/shared/types';

type Props = HandleOAuthCallbackParams;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const {
<script>
import { $sessionStore } from '@clerk/astro/client';
import { type AuthState, BaseClerkControlElement } from './BaseClerkControlElement';
import type { CheckAuthorization } from '@clerk/types';
import type { CheckAuthorization } from '@clerk/shared/types';

class ClerkProtect extends BaseClerkControlElement {
private defaultSlot: HTMLDivElement | null = null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { CreateOrganizationProps } from '@clerk/types';
import type { CreateOrganizationProps } from '@clerk/shared/types';
type Props = CreateOrganizationProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { GoogleOneTapProps } from '@clerk/types';
import type { GoogleOneTapProps } from '@clerk/shared/types';
type Props = GoogleOneTapProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { OrganizationListProps } from '@clerk/types';
import type { OrganizationListProps } from '@clerk/shared/types';
type Props = OrganizationListProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { OrganizationProfileProps, Without } from '@clerk/types';
import type { OrganizationProfileProps, Without } from '@clerk/shared/types';

type Props = Without<OrganizationProfileProps, 'customPages'>;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { OrganizationSwitcherProps } from '@clerk/types';
import type { OrganizationSwitcherProps } from '@clerk/shared/types';
type Props = OrganizationSwitcherProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { OrganizationProfileProps, OrganizationSwitcherProps, Without } from '@clerk/types';
import type { OrganizationProfileProps, OrganizationSwitcherProps, Without } from '@clerk/shared/types';

type Props = Without<OrganizationSwitcherProps, 'organizationProfileProps'> & {
organizationProfileProps?: Pick<OrganizationProfileProps, 'appearance'>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { PricingTableProps } from '@clerk/types';
import type { PricingTableProps } from '@clerk/shared/types';
type Props = PricingTableProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { SignInProps } from '@clerk/types';
import type { SignInProps } from '@clerk/shared/types';
type Props = SignInProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { SignUpProps } from '@clerk/types';
import type { SignUpProps } from '@clerk/shared/types';
type Props = SignUpProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { UserAvatarProps } from '@clerk/types';
import type { UserAvatarProps } from '@clerk/shared/types';
type Props = UserAvatarProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { UserButtonProps, UserProfileProps, Without } from '@clerk/types';
import type { UserButtonProps, UserProfileProps, Without } from '@clerk/shared/types';

type Props = Without<UserButtonProps, 'userProfileProps'> & {
userProfileProps?: Pick<UserProfileProps, 'additionalOAuthScopes' | 'appearance'>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { UserProfileProps, Without } from '@clerk/types';
import type { UserProfileProps, Without } from '@clerk/shared/types';

type Props = Without<UserProfileProps, 'customPages'>;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { WaitlistProps } from '@clerk/types';
import type { WaitlistProps } from '@clerk/shared/types';
type Props = WaitlistProps;

import InternalUIComponentRenderer from './InternalUIComponentRenderer.astro';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import type { HTMLTag, Polymorphic } from 'astro/types';
import type { __experimental_CheckoutButtonProps } from '@clerk/types';
import type { __experimental_CheckoutButtonProps } from '@clerk/shared/types';
import type { ButtonProps } from '../../types';
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import type { HTMLTag, Polymorphic } from 'astro/types';
import type { __experimental_PlanDetailsButtonProps } from '@clerk/types';
import type { __experimental_PlanDetailsButtonProps } from '@clerk/shared/types';
import type { ButtonProps } from '../../types';
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import type { HTMLTag, Polymorphic } from 'astro/types';
import type { SignInButtonProps } from '@clerk/types';
import type { SignInButtonProps } from '@clerk/shared/types';
import type { ButtonProps } from '../../types';
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import type { HTMLTag, Polymorphic } from 'astro/types';
import type { SignOutOptions, Without } from '@clerk/types';
import type { SignOutOptions, Without } from '@clerk/shared/types';
import type { ButtonProps } from '../../types';
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import type { HTMLTag, Polymorphic } from 'astro/types';
import type { SignUpButtonProps } from '@clerk/types';
import type { SignUpButtonProps } from '@clerk/shared/types';
import type { ButtonProps } from '../../types';
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import type { __experimental_SubscriptionDetailsButtonProps } from '@clerk/types';
import type { __experimental_SubscriptionDetailsButtonProps } from '@clerk/shared/types';

import type { HTMLTag, Polymorphic } from 'astro/types';
import type { ButtonProps } from '../../types';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/integration/create-integration.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ClerkOptions } from '@clerk/types';
import type { ClerkOptions } from '@clerk/shared/types';
import type { AstroIntegration } from 'astro';
import { envField } from 'astro/config';

Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/internal/create-clerk-instance.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { loadClerkJsScript, setClerkJsLoadingErrorPackageName } from '@clerk/shared/loadClerkJsScript';
import type { ClerkOptions } from '@clerk/types';
import type { ClerkOptions } from '@clerk/shared/types';

import { $clerkStore } from '../stores/external';
import { $clerk, $csrState } from '../stores/internal';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Clerk } from '@clerk/types';
import type { Clerk } from '@clerk/shared/types';

import { $clerk } from '../stores/internal';
import type { InternalUIComponentId } from '../types';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/CheckoutButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { __experimental_CheckoutButtonProps } from '@clerk/types';
import type { __experimental_CheckoutButtonProps } from '@clerk/shared/types';
import React from 'react';

import type { WithClerkProp } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/PlanDetailsButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { __experimental_PlanDetailsButtonProps } from '@clerk/types';
import type { __experimental_PlanDetailsButtonProps } from '@clerk/shared/types';
import React from 'react';

import type { WithClerkProp } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/SignInButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { SignInButtonProps, SignInProps } from '@clerk/types';
import type { SignInButtonProps, SignInProps } from '@clerk/shared/types';
import React from 'react';

import { assertSingleChild, normalizeWithDefaultValue, safeExecute, withClerk, type WithClerkProp } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/SignOutButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { SignOutOptions } from '@clerk/types';
import type { SignOutOptions } from '@clerk/shared/types';
import React from 'react';

import type { WithClerkProp } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/SignUpButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { SignUpButtonProps, SignUpProps } from '@clerk/types';
import type { SignUpButtonProps, SignUpProps } from '@clerk/shared/types';
import React from 'react';

import { assertSingleChild, normalizeWithDefaultValue, safeExecute, withClerk, type WithClerkProp } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/SubscriptionDetailsButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { __experimental_SubscriptionDetailsButtonProps } from '@clerk/types';
import type { __experimental_SubscriptionDetailsButtonProps } from '@clerk/shared/types';
import React from 'react';

import type { WithClerkProp } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/controlComponents.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { HandleOAuthCallbackParams, PendingSessionOptions } from '@clerk/types';
import type { HandleOAuthCallbackParams, PendingSessionOptions } from '@clerk/shared/types';
import { computed } from 'nanostores';
import type { PropsWithChildren } from 'react';
import React, { useEffect, useState } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
PendingSessionOptions,
SignOut,
UseAuthReturn,
} from '@clerk/types';
} from '@clerk/shared/types';
import type { Store, StoreValue } from 'nanostores';
import { useCallback, useSyncExternalStore } from 'react';

Expand Down
5 changes: 4 additions & 1 deletion packages/astro/src/react/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import type { SignInButtonProps as _SignInButtonProps, SignUpButtonProps as _SignUpButtonProps } from '@clerk/types';
import type {
SignInButtonProps as _SignInButtonProps,
SignUpButtonProps as _SignUpButtonProps,
} from '@clerk/shared/types';

export type SignInButtonProps = _SignInButtonProps & {
children?: React.ReactNode;
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/uiComponents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
UserButtonProps,
UserProfileProps,
WaitlistProps,
} from '@clerk/types';
} from '@clerk/shared/types';
import React from 'react';

import { withClerk, type WithClerkProp } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/react/utils.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { LoadedClerk } from '@clerk/types';
import type { LoadedClerk } from '@clerk/shared/types';
import { computed, type Store, type StoreValue } from 'nanostores';
import React from 'react';

Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/server/clerk-middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import {
import { isDevelopmentFromSecretKey } from '@clerk/shared/keys';
import { handleNetlifyCacheInDevInstance } from '@clerk/shared/netlifyCacheHandler';
import { isHttpOrHttps } from '@clerk/shared/proxy';
import type { PendingSessionOptions } from '@clerk/shared/types';
import { handleValueOrFn } from '@clerk/shared/utils';
import type { PendingSessionOptions } from '@clerk/types';
import type { APIContext } from 'astro';

import { authAsyncStorage } from '#async-local-storage';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/stores/external.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { deriveState } from '@clerk/shared/deriveState';
import { eventMethodCalled } from '@clerk/shared/telemetry';
import type { SignedInSessionResource } from '@clerk/types';
import type { SignedInSessionResource } from '@clerk/shared/types';
import { batched, computed, onMount, type Store } from 'nanostores';

import { $clerk, $csrState, $initialState } from './internal';
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/stores/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
OrganizationResource,
SignedInSessionResource,
UserResource,
} from '@clerk/types';
} from '@clerk/shared/types';
import { atom, map } from 'nanostores';

export const $csrState = map<{
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
MultiDomainAndOrProxyPrimitives,
ProtectProps,
Without,
} from '@clerk/types';
} from '@clerk/shared/types';

type AstroClerkUpdateOptions = Pick<ClerkOptions, 'appearance' | 'localization'>;

Expand Down
1 change: 0 additions & 1 deletion packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
},
"dependencies": {
"@clerk/shared": "workspace:^",
"@clerk/types": "workspace:^",
"cookie": "1.0.2",
"standardwebhooks": "^1.0.0",
"tslib": "catalog:repo"
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/__tests__/createRedirect.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { SessionStatusClaim } from '@clerk/types';
import type { SessionStatusClaim } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { createRedirect } from '../createRedirect';
Expand Down
Loading
Loading