wip

Author: nikosdouvlis

eslint.config.mjs

@@ -120,6 +120,7 @@ export default tseslint.config([
       'packages/backend/src/runtime/**/*',
       'packages/clerk-js/rspack.config.js',
       'packages/shared/src/compiled/path-to-regexp/index.js',
+      'packages/shared/tsdown.config.mjs',
     ],
   },
   {

package.json

@@ -135,9 +135,11 @@
     "react": "catalog:react",
     "react-dom": "catalog:react",
     "rimraf": "6.0.1",
+    "rolldown": "catalog:repo",
     "statuses": "^1.5.0",
     "tree-kill": "^1.2.2",
     "ts-jest": "29.2.5",
+    "tsdown": "catalog:repo",
     "tsup": "catalog:repo",
     "turbo": "^2.5.4",
     "turbo-ignore": "^2.5.4",
@@ -165,9 +167,6 @@
     "overrides": {
       "jest": "29.7.0",
       "jest-snapshot-prettier": "npm:prettier@^3.5.3"
-    },
-    "patchedDependencies": {
-      "[email protected]": "patches/[email protected]"
     }
   }
 }

packages/astro/src/stores/external.ts

@@ -1,5 +1,6 @@
 import { deriveState } from '@clerk/shared/deriveState';
 import { eventMethodCalled } from '@clerk/shared/telemetry';
+import type { SignedInSessionResource } from '@clerk/types';
 import { batched, computed, onMount, type Store } from 'nanostores';
 
 import { $clerk, $csrState, $initialState } from './internal';
@@ -51,7 +52,7 @@ export const $userStore = computed([$authStore], auth => auth.user);
  * @example
  * $sessionStore.subscribe((session) => console.log(session.id))
  */
-export const $sessionStore = computed([$authStore], auth => auth.session);
+export const $sessionStore = computed([$authStore], auth => auth.session as SignedInSessionResource | null | undefined);
 
 /**
  * A client side store that is populated after clerk-js has loaded.

packages/backend/src/util/shared.ts

@@ -1,13 +1,13 @@
-export { addClerkPrefix, getScriptUrl, getClerkJsMajorVersionOrTag } from '@clerk/shared/url';
-export { retry } from '@clerk/shared/retry';
+export { deprecated, deprecatedProperty } from '@clerk/shared/deprecated';
 export {
+  getCookieSuffix,
+  getSuffixedCookieName,
   isDevelopmentFromSecretKey,
   isProductionFromSecretKey,
   parsePublishableKey,
-  getCookieSuffix,
-  getSuffixedCookieName,
 } from '@clerk/shared/keys';
-export { deprecated, deprecatedProperty } from '@clerk/shared/deprecated';
+export { retry } from '@clerk/shared/retry';
+export { addClerkPrefix, getClerkJsMajorVersionOrTag, getScriptUrl } from '@clerk/shared/url';
 
 import { buildErrorThrower } from '@clerk/shared/error';
 import { createDevOrStagingUrlCache } from '@clerk/shared/keys';

packages/chrome-extension/tsconfig.json

@@ -9,8 +9,8 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
-    "moduleResolution": "node",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react-jsx",

packages/clerk-js/src/core/resources/BillingSubscription.ts

@@ -60,6 +60,7 @@ export class BillingSubscription extends BaseResource implements BillingSubscrip
 
 export class BillingSubscriptionItem extends BaseResource implements BillingSubscriptionItemResource {
   id!: string;
+  paymentMethodId!: string;
   plan!: BillingPlan;
   planPeriod!: BillingSubscriptionPlanPeriod;
   status!: BillingSubscriptionStatus;
@@ -86,6 +87,7 @@ export class BillingSubscriptionItem extends BaseResource implements BillingSubs
     }
 
     this.id = data.id;
+    this.paymentMethodId = data.payment_method_id;
     this.plan = new BillingPlan(data.plan);
     this.planPeriod = data.plan_period;
     this.status = data.status;

packages/elements/src/react/hooks/use-password.hook.ts

@@ -1,6 +1,6 @@
 import { useClerk } from '@clerk/shared/react';
+import type { PasswordSettingsData, PasswordValidation } from '@clerk/shared/types';
 import { noop } from '@clerk/shared/utils';
-import type { PasswordSettingsData, PasswordValidation } from '@clerk/types';
 import * as React from 'react';
 
 import type { ErrorCodeOrTuple } from '../utils/generate-password-error-text';
@@ -21,6 +21,7 @@ type UsePasswordCallbacks = {
 
 export const usePassword = (callbacks?: UsePasswordCallbacks) => {
   const clerk = useClerk();
+  // @ts-expect-error - ignore error for now
   const passwordSettings = clerk.__unstable__environment?.userSettings.passwordSettings as PasswordSettingsData;
   const { disable_hibp, min_zxcvbn_strength, show_zxcvbn, ...config } = passwordSettings || {};
 

packages/elements/src/react/sign-in/root.tsx

@@ -41,6 +41,7 @@ function SignInFlowProvider({ children, exampleMode, fallback, isRootPath }: Sig
     const cb = () => {
       const evt: SignInRouterInitEvent = {
         type: 'INIT',
+        // @ts-expect-error - ignore error for now
         clerk,
         exampleMode,
         formRef,

packages/elements/src/react/sign-up/root.tsx

@@ -41,6 +41,7 @@ function SignUpFlowProvider({ children, exampleMode, fallback, isRootPath }: Sig
     const cb = () => {
       const evt: SignUpRouterInitEvent = {
         type: 'INIT',
+        // @ts-expect-error - ignore error for now
         clerk,
         exampleMode,
         formRef,

packages/shared/package.json

@@ -12,75 +12,76 @@
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
+        "types": "./dist/runtime/index.d.mts",
+        "default": "./dist/runtime/index.mjs"
       },
       "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
+        "types": "./dist/runtime/index.d.ts",
+        "default": "./dist/runtime/index.js"
       }
     },
     "./*": {
       "import": {
-        "types": "./dist/*.d.mts",
-        "default": "./dist/*.mjs"
+        "types": "./dist/runtime/*.d.mts",
+        "default": "./dist/runtime/*.mjs"
       },
       "require": {
-        "types": "./dist/*.d.ts",
-        "default": "./dist/*.js"
+        "types": "./dist/runtime/*.d.ts",
+        "default": "./dist/runtime/*.js"
       }
     },
     "./react": {
       "import": {
-        "types": "./dist/react/index.d.mts",
-        "default": "./dist/react/index.mjs"
+        "types": "./dist/runtime/react/index.d.mts",
+        "default": "./dist/runtime/react/index.mjs"
       },
       "require": {
-        "types": "./dist/react/index.d.ts",
-        "default": "./dist/react/index.js"
+        "types": "./dist/runtime/react/index.d.ts",
+        "default": "./dist/runtime/react/index.js"
       }
     },
     "./utils": {
       "import": {
-        "types": "./dist/utils/index.d.mts",
-        "default": "./dist/utils/index.mjs"
+        "types": "./dist/runtime/utils/index.d.mts",
+        "default": "./dist/runtime/utils/index.mjs"
       },
       "require": {
-        "types": "./dist/utils/index.d.ts",
-        "default": "./dist/utils/index.js"
+        "types": "./dist/runtime/utils/index.d.ts",
+        "default": "./dist/runtime/utils/index.js"
       }
     },
     "./workerTimers": {
       "import": {
-        "types": "./dist/workerTimers/index.d.mts",
-        "default": "./dist/workerTimers/index.mjs"
+        "types": "./dist/runtime/workerTimers/index.d.mts",
+        "default": "./dist/runtime/workerTimers/index.mjs"
       },
       "require": {
-        "types": "./dist/workerTimers/index.d.ts",
-        "default": "./dist/workerTimers/index.js"
+        "types": "./dist/runtime/workerTimers/index.d.ts",
+        "default": "./dist/runtime/workerTimers/index.js"
       }
     },
     "./dom": {
       "import": {
-        "types": "./dist/dom/index.d.mts",
-        "default": "./dist/dom/index.mjs"
+        "types": "./dist/runtime/dom/index.d.mts",
+        "default": "./dist/runtime/dom/index.mjs"
       },
       "require": {
-        "types": "./dist/dom/index.d.ts",
-        "default": "./dist/dom/index.js"
+        "types": "./dist/runtime/dom/index.d.ts",
+        "default": "./dist/runtime/dom/index.js"
       }
     },
     "./types": {
       "import": {
-        "types": "./dist/types/index.d.mts"
+        "types": "./dist/types/index.d.mts",
+        "default": "./dist/types/index.mjs"
       },
       "require": {
-        "types": "./dist/types/index.d.ts"
+        "types": "./dist/types/index.d.ts",
+        "default": "./dist/types/index.js"
       }
     },
     "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
   "files": [
     "dist",
     "scripts",
@@ -135,11 +136,10 @@
     "types"
   ],
   "scripts": {
-    "build": "tsup",
+    "build": "tsdown",
     "postbuild": "node ../../scripts/subpath-workaround.mjs shared",
-    "build:declarations": "tsc -p tsconfig.declarations.json",
     "clean": "rimraf ./dist",
-    "dev": "tsup --watch",
+    "dev": "tsdown --watch src",
     "dev:publish": "pnpm dev -- --env.publish",
     "format": "node ../../scripts/format-package.mjs",
     "format:check": "node ../../scripts/format-package.mjs --check",
@@ -153,7 +153,7 @@
     "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
   },
   "dependencies": {
-    "@clerk/types": "workspace:^",
+    "csstype": "3.1.3",
     "dequal": "2.0.3",
     "glob-to-regexp": "0.4.1",
     "js-cookie": "3.0.5",
@@ -166,7 +166,7 @@
     "@types/glob-to-regexp": "0.4.4",
     "@types/js-cookie": "3.0.6",
     "cross-fetch": "^4.1.0",
-    "esbuild": "0.25.0"
+    "rolldown": "catalog:repo"
   },
   "peerDependencies": {
     "react": "catalog:peer-react",