Skip to content

refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacekradko merged 14 commits into from
May 5, 2026
Merged

refactor(shared): rename clerk-rq directory to query #8445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e491aca
fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5
jacekradko Apr 30, 2026
36331b4
refactor(shared,clerk-js,react): move QueryClient ownership into @cle…
jacekradko Apr 30, 2026
67dad2b
Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…
jacekradko Apr 30, 2026
c93141d
chore: drop already-released changeset
jacekradko Apr 30, 2026
dbdfe39
Merge branch 'main' into jacek/clerk-rq-invert-ownership
jacekradko May 1, 2026
3021aaf
fix(clerk-js): drop query-core-vendors chunk split
jacekradko May 1, 2026
b0a9abb
fix(ui): bump bundlewatch limits for query-core ownership inversion
jacekradko May 1, 2026
a87be02
fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule
jacekradko May 1, 2026
4ad3234
Merge branch 'main' into jacek/clerk-rq-invert-ownership
jacekradko May 1, 2026
affd00d
test(shared): cover clerk-rq QueryClient singleton invariants
jacekradko May 2, 2026
550cbdd
refactor(shared): rename clerk-rq directory to query
jacekradko May 2, 2026
e950f20
Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…
jacekradko May 5, 2026
edca0c0
fix(shared): sort imports after clerk-rq → query rename
jacekradko May 5, 2026
ccb282c
Merge branch 'main' into jacek/rename-clerk-rq-dir
jacekradko May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/rename-clerk-rq-to-query.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
1 change: 1 addition & 0 deletions packages/shared/src/keyless/nodeFileStorage.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

/**
* The framework name for the README message.
*
* @example '@clerk/nextjs'
*/
frameworkPackageName?: string;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/organization.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
* Finds the Organization membership for a given Organization ID from a list of memberships
*
* @param organizationMemberships - Array of Organization memberships to search through
* @param organizationId - ID of the Organization to find the membership for
* @returns The matching Organization membership or undefined if not found
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/src/react/billing/useInitializePaymentMethod.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
for?: ForPayerType;
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/billing/useStripeClerkLibs.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/billing/useStripeLoader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/__tests__/mocks/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
* Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
* Simple mock Clerk factory with common properties. The clerk-rq query client
* Simple mock Clerk factory with common properties. The shared query client
* is no longer attached to the Clerk instance — pass `queryClient: null` to
* reset the shared singleton, or omit the option to install a fresh default.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/useOAuthConsent.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down
8 changes: 4 additions & 4 deletions packages/shared/src/react/hooks/usePagesOrInfinite.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/usePlanDetailsQuery.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/useStatementQuery.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/src/react/hooks/useSubscription.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
EnterpriseConnectionResource,
UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
__resetClerkQueryClientForTest,
__setClerkQueryClientForTest,
getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';
0 ...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts
View file
Open in desktop
File renamed without changes.
0 .../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
* The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
* The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
* `QueryObserver` that observes it and the `Query` objects inside it always
* resolve to the same `@tanstack/query-core` (no cross-bundle drift between
* the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down
0 ...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts
View file
Open in desktop
File renamed without changes.
0 .../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts
View file
Open in desktop
File renamed without changes.
0 ...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts
View file
Open in desktop
File renamed without changes.
0 packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts
View file
Open in desktop
File renamed without changes.
0 .../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts
View file
Open in desktop
File renamed without changes.
0 ...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts
View file
Open in desktop
File renamed without changes.
0 ...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts
View file
Open in desktop
File renamed without changes.
0 ...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts
View file
Open in desktop
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
refactor(shared): rename clerk-rq directory to query by jacekradko · Pull Request #8445 · clerk/javascript · GitHub
Skip to content
refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jacekradko
merged 14 commits into

from

May 5, 2026
 Merged


refactor(shared): rename clerk-rq directory to query
#8445
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e491aca

fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5


jacekradko Apr 30, 2026
36331b4

refactor(shared,clerk-js,react): move QueryClient ownership into @cle…


jacekradko Apr 30, 2026
67dad2b

Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…


jacekradko Apr 30, 2026
c93141d

chore: drop already-released changeset


jacekradko Apr 30, 2026
dbdfe39

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
3021aaf

fix(clerk-js): drop query-core-vendors chunk split


jacekradko May 1, 2026
b0a9abb

fix(ui): bump bundlewatch limits for query-core ownership inversion


jacekradko May 1, 2026
a87be02

fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule


jacekradko May 1, 2026
4ad3234

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
affd00d

test(shared): cover clerk-rq QueryClient singleton invariants


jacekradko May 2, 2026
550cbdd

refactor(shared): rename clerk-rq directory to query


jacekradko May 2, 2026
e950f20

Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…


jacekradko May 5, 2026
edca0c0

fix(shared): sort imports after clerk-rq → query rename


jacekradko May 5, 2026
ccb282c

Merge branch 'main' into jacek/rename-clerk-rq-dir


jacekradko May 5, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/rename-clerk-rq-to-query.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 1 addition & 0 deletions
packages/shared/src/keyless/nodeFileStorage.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

 /**
 * The framework name for the README message.
 *
 * @example '@clerk/nextjs'
 */
 frameworkPackageName?: string;
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
 * Finds the Organization membership for a given Organization ID from a list of memberships
 *
 * @param organizationMemberships - Array of Organization memberships to search through
 * @param organizationId - ID of the Organization to find the membership for
 * @returns The matching Organization membership or undefined if not found
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/billing/useInitializePaymentMethod.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
 for?: ForPayerType;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeClerkLibs.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeLoader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/__tests__/mocks/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
 * Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
 * Simple mock Clerk factory with common properties. The clerk-rq query client
 * Simple mock Clerk factory with common properties. The shared query client
 * is no longer attached to the Clerk instance — pass `queryClient: null` to
 * reset the shared singleton, or omit the option to install a fresh default.
 */
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
 useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down

8 changes: 4 additions & 4 deletions
packages/shared/src/react/hooks/usePagesOrInfinite.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePlanDetailsQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useStatementQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useSubscription.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
 EnterpriseConnectionResource,
 UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
 __resetClerkQueryClientForTest,
 __setClerkQueryClientForTest,
 getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';

0
...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts

View file


Open in desktop


File renamed without changes.


0
.../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
.../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
 * The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
 * The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
 * `QueryObserver` that observes it and the `Query` objects inside it always
 * resolve to the same `@tanstack/query-core` (no cross-bundle drift between
 * the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down

0
...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts

View file


Open in desktop


File renamed without changes.


0
.../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts

View file


Open in desktop


File renamed without changes.


0
packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts

View file


Open in desktop


File renamed without changes.


0
.../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts

View file


Open in desktop


File renamed without changes.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor(shared): rename clerk-rq directory to query by jacekradko · Pull Request #8445 · clerk/javascript · GitHub
Skip to content
refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jacekradko
merged 14 commits into

from

May 5, 2026
 Merged


refactor(shared): rename clerk-rq directory to query
#8445
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e491aca

fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5


jacekradko Apr 30, 2026
36331b4

refactor(shared,clerk-js,react): move QueryClient ownership into @cle…


jacekradko Apr 30, 2026
67dad2b

Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…


jacekradko Apr 30, 2026
c93141d

chore: drop already-released changeset


jacekradko Apr 30, 2026
dbdfe39

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
3021aaf

fix(clerk-js): drop query-core-vendors chunk split


jacekradko May 1, 2026
b0a9abb

fix(ui): bump bundlewatch limits for query-core ownership inversion


jacekradko May 1, 2026
a87be02

fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule


jacekradko May 1, 2026
4ad3234

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
affd00d

test(shared): cover clerk-rq QueryClient singleton invariants


jacekradko May 2, 2026
550cbdd

refactor(shared): rename clerk-rq directory to query


jacekradko May 2, 2026
e950f20

Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…


jacekradko May 5, 2026
edca0c0

fix(shared): sort imports after clerk-rq → query rename


jacekradko May 5, 2026
ccb282c

Merge branch 'main' into jacek/rename-clerk-rq-dir


jacekradko May 5, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/rename-clerk-rq-to-query.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 1 addition & 0 deletions
packages/shared/src/keyless/nodeFileStorage.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

 /**
 * The framework name for the README message.
 *
 * @example '@clerk/nextjs'
 */
 frameworkPackageName?: string;
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
 * Finds the Organization membership for a given Organization ID from a list of memberships
 *
 * @param organizationMemberships - Array of Organization memberships to search through
 * @param organizationId - ID of the Organization to find the membership for
 * @returns The matching Organization membership or undefined if not found
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/billing/useInitializePaymentMethod.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
 for?: ForPayerType;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeClerkLibs.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeLoader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/__tests__/mocks/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
 * Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
 * Simple mock Clerk factory with common properties. The clerk-rq query client
 * Simple mock Clerk factory with common properties. The shared query client
 * is no longer attached to the Clerk instance — pass `queryClient: null` to
 * reset the shared singleton, or omit the option to install a fresh default.
 */
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
 useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down

8 changes: 4 additions & 4 deletions
packages/shared/src/react/hooks/usePagesOrInfinite.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePlanDetailsQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useStatementQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useSubscription.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
 EnterpriseConnectionResource,
 UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
 __resetClerkQueryClientForTest,
 __setClerkQueryClientForTest,
 getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';

0
...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts

View file


Open in desktop


File renamed without changes.


0
.../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
.../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
 * The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
 * The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
 * `QueryObserver` that observes it and the `Query` objects inside it always
 * resolve to the same `@tanstack/query-core` (no cross-bundle drift between
 * the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down

0
...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts

View file


Open in desktop


File renamed without changes.


0
.../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts

View file


Open in desktop


File renamed without changes.


0
packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts

View file


Open in desktop


File renamed without changes.


0
.../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts

View file


Open in desktop


File renamed without changes.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor(shared): rename clerk-rq directory to query by jacekradko · Pull Request #8445 · clerk/javascript · GitHub
Skip to content
refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jacekradko
merged 14 commits into

from

May 5, 2026
 Merged


refactor(shared): rename clerk-rq directory to query
#8445
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e491aca

fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5


jacekradko Apr 30, 2026
36331b4

refactor(shared,clerk-js,react): move QueryClient ownership into @cle…


jacekradko Apr 30, 2026
67dad2b

Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…


jacekradko Apr 30, 2026
c93141d

chore: drop already-released changeset


jacekradko Apr 30, 2026
dbdfe39

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
3021aaf

fix(clerk-js): drop query-core-vendors chunk split


jacekradko May 1, 2026
b0a9abb

fix(ui): bump bundlewatch limits for query-core ownership inversion


jacekradko May 1, 2026
a87be02

fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule


jacekradko May 1, 2026
4ad3234

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
affd00d

test(shared): cover clerk-rq QueryClient singleton invariants


jacekradko May 2, 2026
550cbdd

refactor(shared): rename clerk-rq directory to query


jacekradko May 2, 2026
e950f20

Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…


jacekradko May 5, 2026
edca0c0

fix(shared): sort imports after clerk-rq → query rename


jacekradko May 5, 2026
ccb282c

Merge branch 'main' into jacek/rename-clerk-rq-dir


jacekradko May 5, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/rename-clerk-rq-to-query.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 1 addition & 0 deletions
packages/shared/src/keyless/nodeFileStorage.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

 /**
 * The framework name for the README message.
 *
 * @example '@clerk/nextjs'
 */
 frameworkPackageName?: string;
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
 * Finds the Organization membership for a given Organization ID from a list of memberships
 *
 * @param organizationMemberships - Array of Organization memberships to search through
 * @param organizationId - ID of the Organization to find the membership for
 * @returns The matching Organization membership or undefined if not found
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/billing/useInitializePaymentMethod.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
 for?: ForPayerType;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeClerkLibs.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeLoader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/__tests__/mocks/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
 * Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
 * Simple mock Clerk factory with common properties. The clerk-rq query client
 * Simple mock Clerk factory with common properties. The shared query client
 * is no longer attached to the Clerk instance — pass `queryClient: null` to
 * reset the shared singleton, or omit the option to install a fresh default.
 */
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
 useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down

8 changes: 4 additions & 4 deletions
packages/shared/src/react/hooks/usePagesOrInfinite.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePlanDetailsQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useStatementQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useSubscription.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
 EnterpriseConnectionResource,
 UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
 __resetClerkQueryClientForTest,
 __setClerkQueryClientForTest,
 getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';

0
...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts

View file


Open in desktop


File renamed without changes.


0
.../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
.../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
 * The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
 * The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
 * `QueryObserver` that observes it and the `Query` objects inside it always
 * resolve to the same `@tanstack/query-core` (no cross-bundle drift between
 * the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down

0
...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts

View file


Open in desktop


File renamed without changes.


0
.../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts

View file


Open in desktop


File renamed without changes.


0
packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts

View file


Open in desktop


File renamed without changes.


0
.../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts

View file


Open in desktop


File renamed without changes.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
refactor(shared): rename clerk-rq directory to query by jacekradko · Pull Request #8445 · clerk/javascript · GitHub
Skip to content
refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jacekradko
merged 14 commits into

from

May 5, 2026
 Merged


refactor(shared): rename clerk-rq directory to query
#8445
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e491aca

fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5


jacekradko Apr 30, 2026
36331b4

refactor(shared,clerk-js,react): move QueryClient ownership into @cle…


jacekradko Apr 30, 2026
67dad2b

Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…


jacekradko Apr 30, 2026
c93141d

chore: drop already-released changeset


jacekradko Apr 30, 2026
dbdfe39

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
3021aaf

fix(clerk-js): drop query-core-vendors chunk split


jacekradko May 1, 2026
b0a9abb

fix(ui): bump bundlewatch limits for query-core ownership inversion


jacekradko May 1, 2026
a87be02

fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule


jacekradko May 1, 2026
4ad3234

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
affd00d

test(shared): cover clerk-rq QueryClient singleton invariants


jacekradko May 2, 2026
550cbdd

refactor(shared): rename clerk-rq directory to query


jacekradko May 2, 2026
e950f20

Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…


jacekradko May 5, 2026
edca0c0

fix(shared): sort imports after clerk-rq → query rename


jacekradko May 5, 2026
ccb282c

Merge branch 'main' into jacek/rename-clerk-rq-dir


jacekradko May 5, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/rename-clerk-rq-to-query.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 1 addition & 0 deletions
packages/shared/src/keyless/nodeFileStorage.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

 /**
 * The framework name for the README message.
 *
 * @example '@clerk/nextjs'
 */
 frameworkPackageName?: string;
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
 * Finds the Organization membership for a given Organization ID from a list of memberships
 *
 * @param organizationMemberships - Array of Organization memberships to search through
 * @param organizationId - ID of the Organization to find the membership for
 * @returns The matching Organization membership or undefined if not found
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/billing/useInitializePaymentMethod.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
 for?: ForPayerType;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeClerkLibs.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeLoader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/__tests__/mocks/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
 * Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
 * Simple mock Clerk factory with common properties. The clerk-rq query client
 * Simple mock Clerk factory with common properties. The shared query client
 * is no longer attached to the Clerk instance — pass `queryClient: null` to
 * reset the shared singleton, or omit the option to install a fresh default.
 */
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
 useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down

8 changes: 4 additions & 4 deletions
packages/shared/src/react/hooks/usePagesOrInfinite.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePlanDetailsQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useStatementQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useSubscription.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
 EnterpriseConnectionResource,
 UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
 __resetClerkQueryClientForTest,
 __setClerkQueryClientForTest,
 getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';

0
...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts

View file


Open in desktop


File renamed without changes.


0
.../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
.../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
 * The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
 * The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
 * `QueryObserver` that observes it and the `Query` objects inside it always
 * resolve to the same `@tanstack/query-core` (no cross-bundle drift between
 * the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down

0
...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts

View file


Open in desktop


File renamed without changes.


0
.../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts

View file


Open in desktop


File renamed without changes.


0
packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts

View file


Open in desktop


File renamed without changes.


0
.../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts

View file


Open in desktop


File renamed without changes.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor(shared): rename clerk-rq directory to query by jacekradko · Pull Request #8445 · clerk/javascript · GitHub
Skip to content
refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jacekradko
merged 14 commits into

from

May 5, 2026
 Merged


refactor(shared): rename clerk-rq directory to query
#8445
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e491aca

fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5


jacekradko Apr 30, 2026
36331b4

refactor(shared,clerk-js,react): move QueryClient ownership into @cle…


jacekradko Apr 30, 2026
67dad2b

Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…


jacekradko Apr 30, 2026
c93141d

chore: drop already-released changeset


jacekradko Apr 30, 2026
dbdfe39

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
3021aaf

fix(clerk-js): drop query-core-vendors chunk split


jacekradko May 1, 2026
b0a9abb

fix(ui): bump bundlewatch limits for query-core ownership inversion


jacekradko May 1, 2026
a87be02

fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule


jacekradko May 1, 2026
4ad3234

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
affd00d

test(shared): cover clerk-rq QueryClient singleton invariants


jacekradko May 2, 2026
550cbdd

refactor(shared): rename clerk-rq directory to query


jacekradko May 2, 2026
e950f20

Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…


jacekradko May 5, 2026
edca0c0

fix(shared): sort imports after clerk-rq → query rename


jacekradko May 5, 2026
ccb282c

Merge branch 'main' into jacek/rename-clerk-rq-dir


jacekradko May 5, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/rename-clerk-rq-to-query.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 1 addition & 0 deletions
packages/shared/src/keyless/nodeFileStorage.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

 /**
 * The framework name for the README message.
 *
 * @example '@clerk/nextjs'
 */
 frameworkPackageName?: string;
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
 * Finds the Organization membership for a given Organization ID from a list of memberships
 *
 * @param organizationMemberships - Array of Organization memberships to search through
 * @param organizationId - ID of the Organization to find the membership for
 * @returns The matching Organization membership or undefined if not found
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/billing/useInitializePaymentMethod.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
 for?: ForPayerType;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeClerkLibs.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeLoader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/__tests__/mocks/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
 * Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
 * Simple mock Clerk factory with common properties. The clerk-rq query client
 * Simple mock Clerk factory with common properties. The shared query client
 * is no longer attached to the Clerk instance — pass `queryClient: null` to
 * reset the shared singleton, or omit the option to install a fresh default.
 */
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
 useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down

8 changes: 4 additions & 4 deletions
packages/shared/src/react/hooks/usePagesOrInfinite.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePlanDetailsQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useStatementQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useSubscription.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
 EnterpriseConnectionResource,
 UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
 __resetClerkQueryClientForTest,
 __setClerkQueryClientForTest,
 getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';

0
...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts

View file


Open in desktop


File renamed without changes.


0
.../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
.../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
 * The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
 * The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
 * `QueryObserver` that observes it and the `Query` objects inside it always
 * resolve to the same `@tanstack/query-core` (no cross-bundle drift between
 * the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down

0
...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts

View file


Open in desktop


File renamed without changes.


0
.../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts

View file


Open in desktop


File renamed without changes.


0
packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts

View file


Open in desktop


File renamed without changes.


0
.../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts

View file


Open in desktop


File renamed without changes.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
refactor(shared): rename clerk-rq directory to query by jacekradko · Pull Request #8445 · clerk/javascript · GitHub
Skip to content
refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jacekradko
merged 14 commits into

from

May 5, 2026
 Merged


refactor(shared): rename clerk-rq directory to query
#8445
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e491aca

fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5


jacekradko Apr 30, 2026
36331b4

refactor(shared,clerk-js,react): move QueryClient ownership into @cle…


jacekradko Apr 30, 2026
67dad2b

Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…


jacekradko Apr 30, 2026
c93141d

chore: drop already-released changeset


jacekradko Apr 30, 2026
dbdfe39

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
3021aaf

fix(clerk-js): drop query-core-vendors chunk split


jacekradko May 1, 2026
b0a9abb

fix(ui): bump bundlewatch limits for query-core ownership inversion


jacekradko May 1, 2026
a87be02

fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule


jacekradko May 1, 2026
4ad3234

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
affd00d

test(shared): cover clerk-rq QueryClient singleton invariants


jacekradko May 2, 2026
550cbdd

refactor(shared): rename clerk-rq directory to query


jacekradko May 2, 2026
e950f20

Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…


jacekradko May 5, 2026
edca0c0

fix(shared): sort imports after clerk-rq → query rename


jacekradko May 5, 2026
ccb282c

Merge branch 'main' into jacek/rename-clerk-rq-dir


jacekradko May 5, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/rename-clerk-rq-to-query.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 1 addition & 0 deletions
packages/shared/src/keyless/nodeFileStorage.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

 /**
 * The framework name for the README message.
 *
 * @example '@clerk/nextjs'
 */
 frameworkPackageName?: string;
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
 * Finds the Organization membership for a given Organization ID from a list of memberships
 *
 * @param organizationMemberships - Array of Organization memberships to search through
 * @param organizationId - ID of the Organization to find the membership for
 * @returns The matching Organization membership or undefined if not found
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/billing/useInitializePaymentMethod.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
 for?: ForPayerType;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeClerkLibs.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeLoader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/__tests__/mocks/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
 * Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
 * Simple mock Clerk factory with common properties. The clerk-rq query client
 * Simple mock Clerk factory with common properties. The shared query client
 * is no longer attached to the Clerk instance — pass `queryClient: null` to
 * reset the shared singleton, or omit the option to install a fresh default.
 */
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
 useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down

8 changes: 4 additions & 4 deletions
packages/shared/src/react/hooks/usePagesOrInfinite.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePlanDetailsQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useStatementQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useSubscription.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
 EnterpriseConnectionResource,
 UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
 __resetClerkQueryClientForTest,
 __setClerkQueryClientForTest,
 getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';

0
...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts

View file


Open in desktop


File renamed without changes.


0
.../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
.../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
 * The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
 * The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
 * `QueryObserver` that observes it and the `Query` objects inside it always
 * resolve to the same `@tanstack/query-core` (no cross-bundle drift between
 * the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down

0
...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts

View file


Open in desktop


File renamed without changes.


0
.../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts

View file


Open in desktop


File renamed without changes.


0
packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts

View file


Open in desktop


File renamed without changes.


0
.../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts

View file


Open in desktop


File renamed without changes.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
refactor(shared): rename clerk-rq directory to query by jacekradko · Pull Request #8445 · clerk/javascript · GitHub
Skip to content
refactor(shared): rename clerk-rq directory to query#8445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jacekradko
merged 14 commits into

from

May 5, 2026
 Merged


refactor(shared): rename clerk-rq directory to query
#8445
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e491aca

fix(shared,clerk-js): raise @tanstack/query-core floor to ^5.100.5


jacekradko Apr 30, 2026
36331b4

refactor(shared,clerk-js,react): move QueryClient ownership into @cle…


jacekradko Apr 30, 2026
67dad2b

Merge remote-tracking branch 'origin/main' into jacek/clerk-rq-invert…


jacekradko Apr 30, 2026
c93141d

chore: drop already-released changeset


jacekradko Apr 30, 2026
dbdfe39

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
3021aaf

fix(clerk-js): drop query-core-vendors chunk split


jacekradko May 1, 2026
b0a9abb

fix(ui): bump bundlewatch limits for query-core ownership inversion


jacekradko May 1, 2026
a87be02

fix(shared): use @/ alias in mocks/clerk.ts to satisfy lint depth rule


jacekradko May 1, 2026
4ad3234

Merge branch 'main' into jacek/clerk-rq-invert-ownership


jacekradko May 1, 2026
affd00d

test(shared): cover clerk-rq QueryClient singleton invariants


jacekradko May 2, 2026
550cbdd

refactor(shared): rename clerk-rq directory to query


jacekradko May 2, 2026
e950f20

Merge remote-tracking branch 'origin/main' into jacek/rename-clerk-rq…


jacekradko May 5, 2026
edca0c0

fix(shared): sort imports after clerk-rq → query rename


jacekradko May 5, 2026
ccb282c

Merge branch 'main' into jacek/rename-clerk-rq-dir


jacekradko May 5, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/rename-clerk-rq-to-query.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 1 addition & 0 deletions
packages/shared/src/keyless/nodeFileStorage.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export interface NodeFileStorageOptions {

 /**
 * The framework name for the README message.
 *
 * @example '@clerk/nextjs'
 */
 frameworkPackageName?: string;
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { OrganizationMembershipResource } from './types';

/**
 * Finds the Organization membership for a given Organization ID from a list of memberships
 *
 * @param organizationMemberships - Array of Organization memberships to search through
 * @param organizationId - ID of the Organization to find the membership for
 * @returns The matching Organization membership or undefined if not found
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/billing/useInitializePaymentMethod.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { useCallback, useMemo } from 'react';

import type { BillingInitializedPaymentMethodResource, ForPayerType } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { useClearQueriesOnSignOut } from '../hooks/useClearQueriesOnSignOut';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';

type InitializePaymentMethodOptions = {
 for?: ForPayerType;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeClerkLibs.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { loadStripe } from '@stripe/stripe-js';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerk } from '../hooks/useClerk';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';

type LoadStripeFn = typeof loadStripe;

Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/billing/useStripeLoader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import type { Stripe } from '@stripe/stripe-js';
import { useMemo } from 'react';

import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

type StripeLoaderOptions = {
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/__tests__/mocks/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';
import { vi } from 'vitest';

import { __setClerkQueryClientForTest } from '@/react/clerk-rq/clerk-query-client';
import { __setClerkQueryClientForTest } from '@/react/query/clerk-query-client';

/**
 * Builds a deterministic QueryClient and installs it as the shared singleton.
Expand All@@ -28,7 +28,7 @@ export function createMockQueryClient() {
}

/**
 * Simple mock Clerk factory with common properties. The clerk-rq query client
 * Simple mock Clerk factory with common properties. The shared query client
 * is no longer attached to the Clerk instance — pass `queryClient: null` to
 * reset the shared singleton, or omit the option to install a fresh default.
 */
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { createMockQueryClient } from './mocks/clerk';

const mockQueryClient = createMockQueryClient();

vi.mock('../../clerk-rq/use-clerk-query-client', () => ({
vi.mock('../../query/use-clerk-query-client', () => ({
 useClerkQueryClient: () => [mockQueryClient.client],
}));

Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';

import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { usePreviousValue } from './usePreviousValue';

export const withInfiniteKey = <T extends string>(key: T) => [key, `${key}-inf`] as const;
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { LoadedClerk } from '../../types/clerk';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
import type { UseOAuthConsentParams, UseOAuthConsentReturn } from './useOAuthConsent.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useOrganizationCreationDefaults.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { eventMethodCalled } from '../../telemetry/events/method-called';
import type { EnvironmentResource } from '../../types/environment';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
import type {
Expand Down

8 changes: 4 additions & 4 deletions
packages/shared/src/react/hooks/usePagesOrInfinite.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useMemo, useRef, useState } from 'react';

import type { ClerkPaginatedResponse } from '../../types';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../clerk-rq/useInfiniteQuery';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkInfiniteQuery } from '../query/useInfiniteQuery';
import { useClerkQuery } from '../query/useQuery';
import type { CacheSetter, ValueOrSetter } from '../types';
import { useClearQueriesOnSignOut, withInfiniteKey } from './useClearQueriesOnSignOut';
import type { UsePagesOrInfiniteSignature } from './usePageOrInfinite.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePaymentAttemptQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/usePlanDetailsQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
import type { PlanDetailsQueryResult, UsePlanDetailsQueryParams } from './usePlanDetailsQuery.types';
Expand Down

4 changes: 2 additions & 2 deletions
packages/shared/src/react/hooks/useStatementQuery.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useSubscription.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef } from 'react';

import { eventMethodCalled } from '../../telemetry/events';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
import { useBillingIsEnabled } from './useBillingIsEnabled';
Expand Down

6 changes: 3 additions & 3 deletions
packages/shared/src/react/hooks/useUserEnterpriseConnections.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type {
 EnterpriseConnectionResource,
 UpdateMeEnterpriseConnectionParams,
} from '../../types/enterpriseConnection';
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQueryClient } from '../clerk-rq/use-clerk-query-client';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useUserEnterpriseConnectionsCacheKeys } from './useUserEnterpriseConnections.shared';
Expand Down

2 changes: 1 addition & 1 deletion
packages/shared/src/react/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,4 +24,4 @@ export {
 __resetClerkQueryClientForTest,
 __setClerkQueryClientForTest,
 getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';

0
...k-rq/__tests__/clerk-query-client.spec.ts → ...uery/__tests__/clerk-query-client.spec.ts

View file


Open in desktop


File renamed without changes.


0
.../clerk-rq/__tests__/useBaseQuery.spec.tsx → ...act/query/__tests__/useBaseQuery.spec.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
.../src/react/clerk-rq/clerk-query-client.ts → ...red/src/react/query/clerk-query-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { QueryClient } from '@tanstack/query-core';

/**
 * The QueryClient backing every clerk-rq hook. Owned by `@clerk/shared` so the
 * The QueryClient backing every clerk-query hook. Owned by `@clerk/shared` so the
 * `QueryObserver` that observes it and the `Query` objects inside it always
 * resolve to the same `@tanstack/query-core` (no cross-bundle drift between
 * the consumer-side `@clerk/shared` and the production CDN `clerk-js` bundle).
Expand Down

0
...rc/react/clerk-rq/infiniteQueryOptions.ts → ...d/src/react/query/infiniteQueryOptions.ts

View file


Open in desktop


File renamed without changes.


0
.../src/react/clerk-rq/keep-previous-data.ts → ...red/src/react/query/keep-previous-data.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/queryOptions.ts → ...es/shared/src/react/query/queryOptions.ts

View file


Open in desktop


File renamed without changes.


0
packages/shared/src/react/clerk-rq/types.ts → packages/shared/src/react/query/types.ts

View file


Open in desktop


File renamed without changes.


0
.../react/clerk-rq/use-clerk-query-client.ts → ...src/react/query/use-clerk-query-client.ts

View file


Open in desktop


File renamed without changes.


0
...shared/src/react/clerk-rq/useBaseQuery.ts → ...es/shared/src/react/query/useBaseQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ed/src/react/clerk-rq/useInfiniteQuery.ts → ...hared/src/react/query/useInfiniteQuery.ts

View file


Open in desktop


File renamed without changes.


0
...ges/shared/src/react/clerk-rq/useQuery.ts → packages/shared/src/react/query/useQuery.ts

View file


Open in desktop


File renamed without changes.

Loading