Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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 { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from '../hooks/base/useOrganizationBase';
import { useUserBase } from '../hooks/base/useUserBase';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/billing/useStripeClerkLibs.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { loadStripe } from '@stripe/stripe-js';

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

type LoadStripeFn = typeof loadStripe;
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/billing/useStripeLoader.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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 { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useBillingIsEnabled } from '../hooks/useBillingIsEnabled';
import type { UseStripeClerkLibsResult } from './useStripeClerkLibs';

Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/__tests__/mocks/clerk.ts
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { useUserBase } from './base/useUserBase';
import { useOAuthConsentCacheKeys } from './useOAuthConsent.shared';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { useUserBase } from './base/useUserBase';
import { useOrganizationCreationDefaultsCacheKeys } from './useOrganizationCreationDefaults.shared';
Expand Down
8 changes: 4 additions & 4 deletions packages/shared/src/react/hooks/usePagesOrInfinite.tsx
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/usePlanDetailsQuery.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { useBillingIsEnabled } from './useBillingIsEnabled';
import { usePlanDetailsQueryCacheKeys } from './usePlanDetailsQuery.shared';
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/useStatementQuery.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineKeepPreviousDataFn } from '../clerk-rq/keep-previous-data';
import { useClerkQuery } from '../clerk-rq/useQuery';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQuery } from '../query/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/src/react/hooks/useSubscription.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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 { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext } from '../contexts';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useUserBase } from './base/useUserBase';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ 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 { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useClerkInstanceContext } from '../contexts';
import { useUserBase } from './base/useUserBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ export {
__resetClerkQueryClientForTest,
__setClerkQueryClientForTest,
getClerkQueryClient,
} from './clerk-rq/clerk-query-client';
} from './query/clerk-query-client';
Original file line number Diff line number Diff 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
Loading