Merge branch 'main' into renovate/react-router-dev-minor

wobsoriano · web-flow · commit 386612e338db · 2026-05-04T21:55:22.000-07:00
diff --git a/.changeset/ci-ready-for-review.md b/.changeset/ci-ready-for-review.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/fix-native-session-sync-reload.md b/.changeset/fix-native-session-sync-reload.md
@@ -0,0 +1,7 @@
+---
+'@clerk/expo': patch
+---
+
+Fix session loss on Expo JS reload (pressing R in dev)
+
+`NativeSessionSync` was calling native `signOut()` during the loading phase when `isSignedIn` is `undefined`. On a JS reload, the native module persists from the previous session, so `signOut()` revokes the session server-side and clears all keychain items, forcing the user to log in again. This adds an `isLoaded` guard so native `signOut()` is only called when Clerk has confirmed the user is actually signed out.
diff --git a/.changeset/invert-clerk-rq-ownership.md b/.changeset/invert-clerk-rq-ownership.md
@@ -0,0 +1,11 @@
+---
+'@clerk/shared': patch
+'@clerk/clerk-js': patch
+'@clerk/react': patch
+---
+
+Move ownership of the clerk-rq `QueryClient` from `@clerk/clerk-js` into `@clerk/shared`. The `QueryObserver` (constructed in `@clerk/shared`) and the `Query` objects it observes now always come from a single `@tanstack/query-core` resolution — the cross-bundle API contract that produced #8428 (`Query.isFetched is not a function`) no longer exists.
+
+This removes the undocumented `clerk.__internal_queryClient` getter from both `@clerk/clerk-js` and `@clerk/react`'s `IsomorphicClerk`. The `QueryClient` is owned by an internal singleton in `@clerk/shared`, lazily instantiated on the browser only — server renders return `undefined`, preserving SSR safety and avoiding cross-request cache sharing.
+
+`@tanstack/query-core` is no longer a direct dependency of `@clerk/clerk-js`; it remains a dep of `@clerk/shared` and resolves consumer-side as before.
diff --git a/.changeset/silver-gifts-kick.md b/.changeset/silver-gifts-kick.md
@@ -0,0 +1,5 @@
+---
+"@clerk/nuxt": patch
+---
+
+Follow Nuxt module conventions for server-side imports.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ name: CI
 on:
   merge_group:
   pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
     branches:
       - main
       - release/v4
diff --git a/.typedoc/custom-plugin.mjs b/.typedoc/custom-plugin.mjs
@@ -74,6 +74,8 @@ const LINK_REPLACEMENTS = [
   ['identification-link', '/docs/reference/backend/types/backend-identification-link'],
   ['verification', '/docs/reference/backend/types/backend-verification'],
   ['email-address', '/docs/reference/backend/types/backend-email-address'],
+  ['enterprise-account', '/docs/reference/backend/types/backend-enterprise-account'],
+  ['enterprise-account-connection', '/docs/reference/backend/types/backend-enterprise-account-connection'],
   ['external-account', '/docs/reference/backend/types/backend-external-account'],
   ['phone-number', '/docs/reference/backend/types/backend-phone-number'],
   ['saml-account', '/docs/reference/backend/types/backend-saml-account'],
@@ -85,10 +87,15 @@ const LINK_REPLACEMENTS = [
   ['billing-payment-method-resource', '/docs/reference/types/billing-payment-method-resource'],
   ['billing-payer-resource', '/docs/reference/types/billing-payer-resource'],
   ['billing-plan-resource', '/docs/reference/types/billing-plan-resource'],
+  ['billing-plan-unit-price', '/docs/reference/types/billing-plan-unit-price'],
+  ['billing-plan-unit-price-tier', '/docs/reference/types/billing-plan-unit-price-tier'],
   ['billing-checkout-totals', '/docs/reference/types/billing-checkout-totals'],
   ['billing-checkout-resource', '/docs/reference/types/billing-checkout-resource'],
   ['billing-money-amount', '/docs/reference/types/billing-money-amount'],
+  ['billing-per-unit-total', '/docs/reference/types/billing-per-unit-total'],
+  ['billing-per-unit-total-tier', '/docs/reference/types/billing-per-unit-total-tier'],
   ['billing-subscription-item-resource', '/docs/reference/types/billing-subscription-item-resource'],
+  ['billing-subscription-item-seats', '/docs/reference/types/billing-subscription-item-seats'],
   ['feature-resource', '/docs/reference/types/feature-resource'],
   ['billing-statement-group', '/docs/reference/types/billing-statement-group'],
   ['billing-statement-resource', '/docs/reference/types/billing-statement-resource'],
diff --git a/integration/testUtils/machineAuthHelpers.ts b/integration/testUtils/machineAuthHelpers.ts
@@ -12,8 +12,8 @@ import type { ApplicationConfig } from '../models/applicationConfig';
 import type { EnvironmentConfig } from '../models/environment';
 import { appConfigs } from '../presets';
 import { instanceKeys } from '../presets/envs';
-import type { FakeAPIKey, FakeUser } from './usersService';
 import { createTestUtils } from './index';
+import type { FakeAPIKey, FakeUser } from './usersService';
 
 export type FakeMachineNetwork = {
   primaryServer: Machine;
diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -97,7 +97,7 @@
   },
   "devDependencies": {
     "@clerk/ui": "workspace:^",
-    "astro": "^5.18.1"
+    "astro": "^6.0.0"
   },
   "peerDependencies": {
     "astro": "^4.15.0 || ^5.0.0 || ^6.0.0"
diff --git a/packages/clerk-js/bundlewatch.config.json b/packages/clerk-js/bundlewatch.config.json
@@ -9,7 +9,6 @@
     { "path": "./dist/coinbase*.js", "maxSize": "36KB" },
     { "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
     { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
-    { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
     { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
     { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
   ]
diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json
@@ -91,7 +91,6 @@
     "@solana/wallet-standard": "catalog:module-manager",
     "@stripe/stripe-js": "5.6.0",
     "@swc/helpers": "catalog:repo",
-    "@tanstack/query-core": "catalog:repo",
     "@wallet-standard/core": "catalog:module-manager",
     "@zxcvbn-ts/core": "catalog:module-manager",
     "@zxcvbn-ts/language-common": "catalog:module-manager",
diff --git a/packages/clerk-js/rspack.config.js b/packages/clerk-js/rspack.config.js
@@ -110,12 +110,6 @@ const common = ({ mode, variant, disableRHC = false }) => {
             chunks: 'all',
             enforce: true,
           },
-          queryCoreVendor: {
-            test: /[\\/]node_modules[\\/](@tanstack\/query-core)[\\/]/,
-            name: 'query-core-vendors',
-            chunks: 'all',
-            enforce: true,
-          },
           defaultVendors: {
             minChunks: 1,
             test: module => {
diff --git a/packages/clerk-js/src/core/clerk.ts b/packages/clerk-js/src/core/clerk.ts
@@ -138,7 +138,6 @@ import type {
 import type { ClerkUI } from '@clerk/shared/ui';
 import { addClerkPrefix, isAbsoluteUrl, stripScheme } from '@clerk/shared/url';
 import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
-import type { QueryClient } from '@tanstack/query-core';
 
 import { debugLogger, initDebugLogger } from '@/utils/debug';
 import { ModuleManager } from '@/utils/moduleManager';
@@ -248,7 +247,6 @@ export class Clerk implements ClerkInterface {
   // converted to protected environment to support `updateEnvironment` type assertion
   protected environment?: EnvironmentResource | null;
 
-  #queryClient: QueryClient | undefined;
   #publishableKey = '';
   #domain: DomainOrProxyUrl['domain'];
   #proxyUrl: DomainOrProxyUrl['proxyUrl'];
@@ -268,28 +266,6 @@ export class Clerk implements ClerkInterface {
   #touchThrottledUntil = 0;
   #publicEventBus = createClerkEventBus();
 
-  get __internal_queryClient(): { __tag: 'clerk-rq-client'; client: QueryClient } | undefined {
-    if (!this.#queryClient) {
-      void import('./query-core')
-        .then(module => module.QueryClient)
-        .then(QueryClient => {
-          if (this.#queryClient) {
-            return;
-          }
-          this.#queryClient = new QueryClient();
-          // @ts-expect-error - queryClientStatus is not typed
-          this.#publicEventBus.emit('queryClientStatus', 'ready');
-        });
-    }
-
-    return this.#queryClient
-      ? {
-          __tag: 'clerk-rq-client',
-          client: this.#queryClient,
-        }
-      : undefined;
-  }
-
   public __internal_getCachedResources:
     | (() => Promise<{ client: ClientJSONSnapshot | null; environment: EnvironmentJSONSnapshot | null }>)
     | undefined;
diff --git a/packages/clerk-js/src/core/query-core.ts b/packages/clerk-js/src/core/query-core.ts
diff --git a/packages/clerk-js/src/test/mock-helpers.ts b/packages/clerk-js/src/test/mock-helpers.ts
@@ -1,7 +1,7 @@
+import { __createClerkTestQueryClient } from '@clerk/shared/react';
 import type { ActiveSessionResource, LoadedClerk } from '@clerk/shared/types';
 import { type Mocked, vi } from 'vitest';
 
-import { QueryClient } from '../core/query-core';
 import type { RouteContextValue } from '../ui/router';
 
 type FunctionLike = (...args: any) => any;
@@ -46,19 +46,7 @@ export const mockClerkMethods = (clerk: LoadedClerk): DeepVitestMocked<LoadedCle
   // Cast clerk to any to allow mocking properties
   const clerkAny = clerk as any;
 
-  const defaultQueryClient = {
-    __tag: 'clerk-rq-client' as const,
-    client: new QueryClient({
-      defaultOptions: {
-        queries: {
-          retry: false,
-          // Setting staleTime to Infinity will not cause issues between tests as long as each test
-          // case has its own wrapper that initializes a Clerk instance with a new QueryClient.
-          staleTime: Infinity,
-        },
-      },
-    }),
-  };
+  __createClerkTestQueryClient();
 
   mockMethodsOf(clerkAny);
   if (clerkAny.client) {
@@ -92,12 +80,6 @@ export const mockClerkMethods = (clerk: LoadedClerk): DeepVitestMocked<LoadedCle
     mockMethodsOf(clerkAny.billing);
   }
 
-  // Mock the __internal_queryClient getter property
-  Object.defineProperty(clerkAny, '__internal_queryClient', {
-    get: vi.fn(() => defaultQueryClient),
-    configurable: true,
-  });
-
   mockProp(clerkAny, 'navigate');
   mockProp(clerkAny, 'setActive');
   mockProp(clerkAny, 'redirectWithAuth');
diff --git a/packages/expo/src/provider/ClerkProvider.tsx b/packages/expo/src/provider/ClerkProvider.tsx
@@ -70,7 +70,7 @@ function NativeSessionSync({
   publishableKey: string;
   tokenCache: TokenCache | undefined;
 }) {
-  const { isSignedIn } = useAuth();
+  const { isSignedIn, isLoaded } = useAuth();
   const hasSyncedRef = useRef(false);
   // Use the provided tokenCache, falling back to the default SecureStore cache
   const effectiveTokenCache = tokenCache ?? defaultTokenCache;
@@ -79,15 +79,20 @@ function NativeSessionSync({
     if (!isSignedIn) {
       hasSyncedRef.current = false;
 
-      // Clear the native session so native components (UserButton, etc.)
-      // don't continue showing a signed-in state after JS-side sign out.
-      const ClerkExpo = NativeClerkModule;
-      if (ClerkExpo?.signOut) {
-        void ClerkExpo.signOut().catch((error: unknown) => {
-          if (__DEV__) {
-            console.warn('[NativeSessionSync] Failed to clear native session:', error);
-          }
-        });
+      // Only call native signOut when Clerk has fully loaded and confirmed
+      // the user is actually signed out. Without this check, a JS reload
+      // (e.g. pressing R in Expo) triggers signOut during the loading phase
+      // (when isSignedIn is undefined), which revokes the session server-side
+      // and clears all keychain items, forcing the user to log in again.
+      if (isLoaded) {
+        const ClerkExpo = NativeClerkModule;
+        if (ClerkExpo?.signOut) {
+          void ClerkExpo.signOut().catch((error: unknown) => {
+            if (__DEV__) {
+              console.warn('[NativeSessionSync] Failed to clear native session:', error);
+            }
+          });
+        }
       }
 
       return;
@@ -130,7 +135,7 @@ function NativeSessionSync({
     };
 
     void syncToNative();
-  }, [isSignedIn, publishableKey, effectiveTokenCache]);
+  }, [isSignedIn, isLoaded, publishableKey, effectiveTokenCache]);
 
   return null;
 }
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -74,10 +74,10 @@
     "@clerk/shared": "workspace:^",
     "@clerk/vue": "workspace:^",
     "@nuxt/kit": "^4.1.3",
-    "@nuxt/schema": "^4.1.3",
-    "h3": "^1.15.4"
+    "@nuxt/schema": "^4.1.3"
   },
   "devDependencies": {
+    "h3": "^1.15.4",
     "nuxt": "^4.1.2",
     "typescript": "catalog:repo",
     "vue": "catalog:repo"
diff --git a/packages/nuxt/src/runtime/server/__tests__/clerkClient.test.ts b/packages/nuxt/src/runtime/server/__tests__/clerkClient.test.ts
@@ -18,7 +18,6 @@ vi.mock('@clerk/backend', () => {
 
 import { createClerkClient } from '@clerk/backend';
 
-// @ts-expect-error: Nitro import. Handled by Nuxt.
 import { useRuntimeConfig } from '#imports';
 
 import { clerkClient } from '../clerkClient';
diff --git a/packages/nuxt/src/runtime/server/__tests__/clerkMiddleware.test.ts b/packages/nuxt/src/runtime/server/__tests__/clerkMiddleware.test.ts
@@ -38,9 +38,16 @@ const MOCK_OPTIONS = {
   signUpUrl: '/bar',
 };
 
-vi.mock('#imports', () => {
+vi.mock('#imports', async () => {
+  const h3 = await import('h3');
   return {
     useRuntimeConfig: () => ({}),
+    createError,
+    eventHandler,
+    setResponseHeader,
+    getRequestHeaders: h3.getRequestHeaders,
+    getRequestProtocol: h3.getRequestProtocol,
+    getRequestURL: h3.getRequestURL,
   };
 });
 
diff --git a/packages/nuxt/src/runtime/server/clerkClient.ts b/packages/nuxt/src/runtime/server/clerkClient.ts
@@ -4,7 +4,6 @@ import { deprecated } from '@clerk/shared/deprecated';
 import { isTruthy } from '@clerk/shared/underscore';
 import type { H3Event } from 'h3';
 
-// @ts-expect-error: Nitro import. Handled by Nuxt.
 import { useRuntimeConfig } from '#imports';
 
 function resolveApiUrl(runtimeConfig: ReturnType<typeof useRuntimeConfig>): string {
diff --git a/packages/nuxt/src/runtime/server/clerkMiddleware.ts b/packages/nuxt/src/runtime/server/clerkMiddleware.ts
@@ -4,10 +4,8 @@ import { handleNetlifyCacheInDevInstance } from '@clerk/shared/netlifyCacheHandl
 import { isMalformedURLError } from '@clerk/shared/pathMatcher';
 import type { PendingSessionOptions } from '@clerk/shared/types';
 import type { EventHandler } from 'h3';
-import { createError, eventHandler, setResponseHeader } from 'h3';
 
-// @ts-expect-error: Nitro import. Handled by Nuxt.
-import { useRuntimeConfig } from '#imports';
+import { createError, eventHandler, setResponseHeader, useRuntimeConfig } from '#imports';
 
 import { canUseKeyless } from '../utils/feature-flags';
 import { clerkClient } from './clerkClient';
@@ -27,13 +25,13 @@ interface ClerkMiddleware {
    * @example
    * export default clerkMiddleware((event) => { ... }, options);
    */
-  (handler: EventHandler, options?: AuthenticateRequestOptions): ReturnType<typeof eventHandler>;
+  (handler: EventHandler, options?: AuthenticateRequestOptions): EventHandler;
 
   /**
    * @example
    * export default clerkMiddleware(options);
    */
-  (options?: AuthenticateRequestOptions): ReturnType<typeof eventHandler>;
+  (options?: AuthenticateRequestOptions): EventHandler;
 }
 
 /**
diff --git a/packages/nuxt/src/runtime/server/routeMatcher.ts b/packages/nuxt/src/runtime/server/routeMatcher.ts
@@ -1,7 +1,8 @@
 import type { PathMatcherParam } from '@clerk/shared/pathMatcher';
 import { createPathMatcher } from '@clerk/shared/pathMatcher';
 import type { H3Event } from 'h3';
-import { getRequestURL } from 'h3';
+
+import { getRequestURL } from '#imports';
 
 export type RouteMatcherParam = PathMatcherParam;
 
diff --git a/packages/nuxt/src/runtime/server/utils.ts b/packages/nuxt/src/runtime/server/utils.ts
@@ -2,7 +2,8 @@ import type { AuthObject } from '@clerk/backend';
 import { makeAuthObjectSerializable, stripPrivateDataFromObject } from '@clerk/backend/internal';
 import type { InitialState } from '@clerk/shared/types';
 import type { H3Event } from 'h3';
-import { getRequestHeaders, getRequestProtocol } from 'h3';
+
+import { getRequestHeaders, getRequestProtocol } from '#imports';
 
 /**
  * Converts an H3 event into a Fetch Request object.
diff --git a/packages/nuxt/src/runtime/types/nitro-server.d.ts b/packages/nuxt/src/runtime/types/nitro-server.d.ts
@@ -0,0 +1,17 @@
+import type { H3Event } from 'h3';
+
+export {
+  createError,
+  eventHandler,
+  getRequestHeaders,
+  getRequestProtocol,
+  getRequestURL,
+  setResponseHeader,
+  toWebRequest,
+} from 'h3';
+export type { EventHandler, H3Event } from 'h3';
+
+// useRuntimeConfig is provided by Nitro at runtime. The consuming Nuxt app
+// augments this type via its own generated .nuxt types.
+declare function useRuntimeConfig(event?: H3Event): any;
+export { useRuntimeConfig };
diff --git a/packages/nuxt/src/runtime/webhooks.ts b/packages/nuxt/src/runtime/webhooks.ts
@@ -2,10 +2,8 @@
 import type { VerifyWebhookOptions } from '@clerk/backend/webhooks';
 import { verifyWebhook as verifyWebhookBase } from '@clerk/backend/webhooks';
 import type { H3Event } from 'h3';
-import { toWebRequest } from 'h3';
 
-// @ts-expect-error: Nitro import. Handled by Nuxt.
-import { useRuntimeConfig } from '#imports';
+import { toWebRequest, useRuntimeConfig } from '#imports';
 
 // Ordering of exports matter here since
 // we're overriding the base verifyWebhook
diff --git a/packages/nuxt/tsconfig.json b/packages/nuxt/tsconfig.json
@@ -10,7 +10,10 @@
     "noEmit": true,
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": false,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "paths": {
+      "#imports": ["./src/runtime/types/nitro-server"]
+    }
   },
   "include": ["src"]
 }
diff --git a/packages/react/src/isomorphicClerk.ts b/packages/react/src/isomorphicClerk.ts
diff --git a/packages/shared/src/react/clerk-rq/__tests__/clerk-query-client.spec.ts b/packages/shared/src/react/clerk-rq/__tests__/clerk-query-client.spec.ts
diff --git a/packages/shared/src/react/clerk-rq/__tests__/useBaseQuery.spec.tsx b/packages/shared/src/react/clerk-rq/__tests__/useBaseQuery.spec.tsx
diff --git a/packages/shared/src/react/clerk-rq/clerk-query-client.ts b/packages/shared/src/react/clerk-rq/clerk-query-client.ts
diff --git a/packages/shared/src/react/clerk-rq/use-clerk-query-client.ts b/packages/shared/src/react/clerk-rq/use-clerk-query-client.ts
diff --git a/packages/shared/src/react/hooks/__tests__/mocks/clerk.ts b/packages/shared/src/react/hooks/__tests__/mocks/clerk.ts
diff --git a/packages/shared/src/react/index.ts b/packages/shared/src/react/index.ts
diff --git a/packages/ui/bundlewatch.config.json b/packages/ui/bundlewatch.config.json
diff --git a/packages/ui/src/test/mock-helpers.ts b/packages/ui/src/test/mock-helpers.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@clerk/nuxt": patch
 +---
++
 +Follow Nuxt module conventions for server-side imports.
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },`
`10`	`10`	`{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },`
`11`	`11`	`{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },`
`12`		`- { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },`
`13`	`12`	`{ "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },`
`14`	`13`	`{ "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }`
`15`	`14`	`]`