feat(shared): Remove SWR

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",

.changeset/polite-cars-lose.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Fix `useClearQueriesOnSignOut` hook to comply with React Rules of Hooks

.changeset/remove-swr-switches.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': major
+---
+
+Remove SWR hooks and env-based switchovers in favor of the React Query implementations; promote @tanstack/query-core to a runtime dependency.

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
  unit-tests:
  needs: [check-permissions, build-packages]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Unit Tests (${{ matrix.filter-label }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Unit Tests (${{ matrix.filter-label }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -220,12 +220,7 @@ jobs:
  include:
  - node-version: 22
  test-filter: "**"
- clerk-use-rq: "false"
  filter-label: "**"
- - node-version: 22
- test-filter: "--filter=@clerk/shared --filter=@clerk/clerk-js"
- clerk-use-rq: "true"
- filter-label: "shared, clerk-js"
 
  steps:
  - name: Checkout Repo
@@ -247,18 +242,6 @@ jobs:
  # turbo-team: ${{ vars.TURBO_TEAM }}
  # turbo-token: ${{ secrets.TURBO_TOKEN }}
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Run tests in packages
  run: |
  if [ "${{ matrix.test-filter }}" = "**" ]; then
@@ -270,7 +253,6 @@ jobs:
  fi
  env:
  NODE_VERSION: ${{ matrix.node-version }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
 
  - name: Run Typedoc tests
  run: |
@@ -286,15 +268,15 @@ jobs:
  if: ${{ env.TURBO_SUMMARIZE == 'true' }}
  continue-on-error: true
  with:
- name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: turbo-summary-report-unit-${{ github.run_id }}-${{ github.run_attempt }}-node-${{ matrix.node-version }}
  path: .turbo/runs
  retention-days: 5
 
  integration-tests:
  # needs: [check-permissions, build-packages]
  needs: [check-permissions]
  if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
- name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && ', RQ' || '' }})
+ name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }}${{ matrix.next-version && format(', {0}', matrix.next-version) || '' }})
  permissions:
  contents: read
  actions: write # needed for actions/upload-artifact
@@ -328,23 +310,11 @@ jobs:
  include:
  - test-name: "billing"
  test-project: "chrome"
- clerk-use-rq: "false"
- - test-name: "billing"
- test-project: "chrome"
- clerk-use-rq: "true"
- - test-name: "machine"
- test-project: "chrome"
- clerk-use-rq: "false"
  - test-name: "machine"
  test-project: "chrome"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "15"
- - test-name: "nextjs"
- test-project: "chrome"
- next-version: "16"
- clerk-use-rq: "true"
  - test-name: "nextjs"
  test-project: "chrome"
  next-version: "16"
@@ -406,18 +376,6 @@ jobs:
  echo "affected=${AFFECTED}"
  echo "affected=${AFFECTED}" >> $GITHUB_OUTPUT
 
- - name: Rebuild @clerk/shared with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared --force
- env:
- CLERK_USE_RQ: true
-
- - name: Rebuild dependent packages with CLERK_USE_RQ=true
- if: ${{ steps.task-status.outputs.affected == '1' && matrix.clerk-use-rq == 'true' }}
- run: pnpm turbo build $TURBO_ARGS --filter=@clerk/shared^... --force
- env:
- CLERK_USE_RQ: true
-
  - name: Version packages for snapshot
  if: ${{ steps.task-status.outputs.affected == '1' }}
  run: npm run version-packages:snapshot ci
@@ -427,7 +385,7 @@ jobs:
  uses: ./.github/actions/verdaccio
  with:
  publish-cmd: |
- if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else ${{ matrix.clerk-use-rq == 'true' && 'CLERK_USE_RQ=true' || '' }} pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
+ if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
 
  - name: Edit .npmrc [link-workspace-packages=false]
  run: sed -i -E 's/link-workspace-packages=(deep|true)/link-workspace-packages=false/' .npmrc
@@ -501,7 +459,6 @@ jobs:
  E2E_NEXTJS_VERSION: ${{ matrix.next-version }}
  E2E_PROJECT: ${{ matrix.test-project }}
  E2E_CLERK_ENCRYPTION_KEY: ${{ matrix.clerk-encryption-key }}
- CLERK_USE_RQ: ${{ matrix.clerk-use-rq }}
  INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
  NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
  VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -510,7 +467,7 @@ jobs:
  if: ${{ cancelled() || failure() }}
  uses: actions/upload-artifact@v4
  with:
- name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}${{ matrix.clerk-use-rq == 'true' && '-rq' || '' }}
+ name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
  path: integration/test-results
  retention-days: 1
 

packages/clerk-js/package.json

@@ -67,7 +67,7 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/stripe-js": "5.6.0",
  "@swc/helpers": "catalog:repo",
- "@tanstack/query-core": "5.87.4",
+ "@tanstack/query-core": "5.90.16",
  "@wallet-standard/core": "catalog:module-manager",
  "@zxcvbn-ts/core": "catalog:module-manager",
  "@zxcvbn-ts/language-common": "catalog:module-manager",

packages/clerk-js/src/core/auth/AuthCookieService.ts

@@ -141,7 +141,7 @@ export class AuthCookieService {
  private refreshTokenOnFocus() {
  window.addEventListener('focus', () => {
  if (document.visibilityState === 'visible') {
- // Certain data-fetching libraries that refetch on focus (such as swr) use setTimeout(cb, 0) to schedule a task on the event loop.
+ // Certain data-fetching libraries that refetch on focus use setTimeout(cb, 0) to schedule a task on the event loop.
  // This gives us an opportunity to ensure the session cookie is updated with a fresh token before the fetch occurs, but it needs to
  // be done with a microtask. Promises schedule microtasks, and so by using `updateCookieImmediately: true`, we ensure that the cookie
  // is updated as part of the scheduled microtask. Our existing event-based mechanism to update the cookie schedules a task, and so the cookie

packages/clerk-js/src/test/create-fixtures.tsx

@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 import type { ClerkOptions, ClientJSON, EnvironmentJSON, LoadedClerk } from '@clerk/shared/types';
-import { useState } from 'react';
 import { vi } from 'vitest';
 
 import { Clerk as ClerkCtor } from '@/core/clerk';
@@ -87,7 +86,6 @@ const unboundCreateFixtures = (
 
  const MockClerkProvider = (props: any) => {
  const { children } = props;
- const [swrConfig] = useState(() => ({ provider: () => new Map() }));
 
  const componentsWithoutContext = [
  'UsernameSection',
@@ -108,11 +106,7 @@ const unboundCreateFixtures = (
  );
 
  return (
- <CoreClerkContextWrapper
- clerk={clerkMock}
- // Clear swr cache
- swrConfig={swrConfig}
- >
+ <CoreClerkContextWrapper clerk={clerkMock}>
  <EnvironmentProvider value={environmentMock}>
  <OptionsProvider value={optionsMock}>
  <RouteContext.Provider value={routerMock}>

packages/shared/global.d.ts

@@ -4,7 +4,6 @@ declare const JS_PACKAGE_VERSION: string;
 declare const UI_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
 declare const __BUILD_DISABLE_RHC__: boolean;
-declare const __CLERK_USE_RQ__: boolean;
 
 interface ImportMetaEnv {
  readonly [key: string]: string;

packages/shared/package.json

@@ -124,11 +124,11 @@
  "test:coverage": "vitest --collectCoverage && open coverage/lcov-report/index.html"
  },
  "dependencies": {
+ "@tanstack/query-core": "5.90.16",
  "dequal": "2.0.3",
  "glob-to-regexp": "0.4.1",
  "js-cookie": "3.0.5",
- "std-env": "^3.9.0",
- "swr": "2.3.4"
+ "std-env": "^3.9.0"
  },
  "devDependencies": {
  "@base-org/account": "catalog:module-manager",
@@ -138,7 +138,6 @@
  "@solana/wallet-standard": "catalog:module-manager",
  "@stripe/react-stripe-js": "3.1.1",
  "@stripe/stripe-js": "5.6.0",
- "@tanstack/query-core": "5.87.4",
  "@types/glob-to-regexp": "0.4.4",
  "@types/js-cookie": "3.0.6",
  "@wallet-standard/core": "catalog:module-manager",