Merge branch 'main' into brk.feat/redirect-on-session-exists

Author: brkalow

.changeset/lucky-lamps-repair.md

@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Fix useFetch to update fetcher ref

.changeset/open-streets-drum.md

@@ -0,0 +1,5 @@
+---
+'@clerk/backend': minor
+---
+
+Fix TypeScript return type for `clerk.client.waitlistEntries.list()` and export `WaitlistEntry` type.

.changeset/whole-dancers-pay.md

@@ -0,0 +1,2 @@
+---
+---

.github/workflows/release-canary.yml

@@ -34,7 +34,7 @@ jobs:
           turbo-team: ${{ vars.TURBO_TEAM }}
           turbo-token: ${{ secrets.TURBO_TOKEN }}
           playwright-enabled: true # Must be present to enable caching on branched workflows
-          registry-url: 'https://registry.npmjs.org'
+          registry-url: "https://registry.npmjs.org"
 
       - name: Version packages for canary
         id: version-packages
@@ -65,9 +65,9 @@ jobs:
               github.rest.actions.createWorkflowDispatch({
                 owner: 'clerk',
                 repo: 'sdk-infra-workers',
-                workflow_id: 'update-clerkjs.yml',
+                workflow_id: 'update-pkg-versions.yml',
                 ref: 'main',
-                inputs: { version: clerkjsVersion }
+                inputs: { clerkjsVersion: clerkjsVersion }
               })
 
             if (nextjsVersion.includes('canary')) {

.github/workflows/release.yml

@@ -55,8 +55,8 @@ jobs:
         id: changesets
         uses: changesets/action@v1
         with:
-          commit: 'ci(repo): Version packages'
-          title: 'ci(repo): Version packages'
+          commit: "ci(repo): Version packages"
+          title: "ci(repo): Version packages"
           publish: pnpm release
           # Workaround for https://github.com/changesets/changesets/issues/421
           version: pnpm version-packages
@@ -83,7 +83,7 @@ jobs:
               github.rest.actions.createWorkflowDispatch({
                 owner: 'clerk',
                 repo: 'sdk-infra-workers',
-                workflow_id: 'update-clerkjs.yml',
+                workflow_id: 'update-pkg-versions.yml',
                 ref: 'main',
                 inputs: { version: clerkjsVersion }
               })
@@ -145,5 +145,5 @@ jobs:
         uses: ./.github/actions/init
         with:
           node-version: ${{ matrix.version }}
-          turbo-team: ''
-          turbo-token: ''
+          turbo-team: ""
+          turbo-token: ""

packages/backend/src/api/endpoints/WaitlistEntryApi.ts

@@ -37,7 +37,7 @@ export class WaitlistEntryAPI extends AbstractAPI {
    * @param params Optional parameters (e.g., `query`, `status`, `orderBy`).
    */
   public async list(params: WaitlistEntryListParams = {}) {
-    return this.request<PaginatedResourceResponse<WaitlistEntry>>({
+    return this.request<PaginatedResourceResponse<WaitlistEntry[]>>({
       method: 'GET',
       path: basePath,
       queryParams: params,

packages/backend/src/index.ts

@@ -145,6 +145,7 @@ export type {
   Token,
   User,
   TestingToken,
+  WaitlistEntry,
   BillingPlan,
   BillingSubscription,
   BillingSubscriptionItem,

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

@@ -1,5 +1,7 @@
 export type { Clerk } from '../clerk';
+//  Ordering matters. If you change the order of `Base` you will be fired !! jk
 export * from './Base';
+// -------
 export * from './UserSettings';
 export * from './CommerceSettings';
 export * from './AuthConfig';
@@ -40,6 +42,6 @@ export * from './TOTP';
 export * from './User';
 export * from './UserOrganizationInvitation';
 export * from './Verification';
-export * from './Web3Wallet';  
+export * from './Web3Wallet';
 export * from './Waitlist';
 export * from './APIKey';

packages/clerk-js/src/ui/hooks/useFetch.ts

@@ -130,6 +130,7 @@ export const useFetch = <K, T>(
   }, [setCache, setRevalidationCounter]);
 
   useEffect(() => {
+    fetcherRef.current = fetcher;
     const fetcherMissing = !fetcherRef.current;
     const isCacheStale =
       typeof getCache()?.cachedAt === 'undefined' ? true : Date.now() - (getCache()?.cachedAt || 0) >= staleTime;