Skip to content

test(shared): add query-client hotload compatibility regression#8618

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 4 commits into from
May 26, 2026
Merged

test(shared): add query-client hotload compatibility regression #8618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ec94f7
test(shared): add query-client hotload compatibility regression
jacekradko May 21, 2026
c3759d3
test(shared): note transitive use of __internal_attemptToEnableEnviro…
jacekradko May 21, 2026
573c23b
test(shared): type fapiRequest mock to accept request arg
jacekradko May 22, 2026
e6c9543
Merge branch 'main' into jacek/query-client-compat-regression
jacekradko May 26, 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/query-client-compat-regression.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
191 changes: 191 additions & 0 deletions packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
clerk: undefined as any,
user: undefined as any,
}));

vi.mock('../../contexts', () => ({
useAssertWrappedByClerkProvider: () => {},
useClerkInstanceContext: () => mockState.clerk,
useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
type RecursiveMock = {
(...args: unknown[]): RecursiveMock;
} & {
readonly [key in string | symbol]: RecursiveMock;
};

function createRecursiveProxy(label: string): RecursiveMock {
const callableTarget = function noop(): void {};
const handler: ProxyHandler<typeof callableTarget> = {
get(_target, prop) {
if (prop === 'then') {
return undefined;
}
if (prop === 'toString') {
return () => `[${label}]`;
}
if (prop === Symbol.toPrimitive) {
return () => 0;
}
return self;
},
apply() {
return self;
},
construct() {
return self as unknown as object;
},
has() {
return false;
},
set() {
return false;
},
};

const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
return self;
}

const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
typeof value === 'object' &&
value !== null &&
'__tag' in value &&
(value as { __tag?: string }).__tag === 'clerk-rq-client';

const useClerkQueryClient = (): [QueryClient, boolean] => {
const clerk = mockState.clerk;
const queryClient = clerk.__internal_queryClient;
const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

React.useEffect(() => {
const setLoaded = () => setQueryClientLoaded(true);
clerk.on('queryClientStatus', setLoaded);
return () => clerk.off('queryClientStatus', setLoaded);
}, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
};

return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
const listeners = new Set<(status: 'ready') => void>();
let isResolving = false;
let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

return {
loaded: true,
telemetry: { record: vi.fn() },
setActive: vi.fn(),
createOrganization: vi.fn(),
// Reached transitively via useAttemptToEnableOrganizations.
__internal_attemptToEnableEnvironmentSetting: vi.fn(),
get __internal_queryClient() {
if (!queryClient && !isResolving) {
isResolving = true;
void Promise.resolve().then(() => {
queryClient = {
__tag: 'clerk-rq-client',
client: new TanstackQueryClient({
defaultOptions: {
queries: {
retry: false,
staleTime: Infinity,
refetchOnMount: false,
refetchOnReconnect: false,
refetchOnWindowFocus: false,
},
},
}),
};
listeners.forEach(listener => listener('ready'));
});
}
return queryClient;
},
on: vi.fn((event: string, listener: (status: 'ready') => void) => {
if (event === 'queryClientStatus') {
listeners.add(listener);
}
}),
off: vi.fn((event: string, listener: (status: 'ready') => void) => {
if (event === 'queryClientStatus') {
listeners.delete(listener);
}
}),
};
}

afterEach(() => {
vi.clearAllMocks();
mockState.clerk = undefined;
mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
it('leaves the legacy mock query-client state and requests organization memberships', async () => {
const fapiRequest = vi.fn((_request: unknown) =>
Promise.resolve({
data: [],
total_count: 0,
}),
);
const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
return fapiRequest({
path: '/me/organization_memberships',
method: 'GET',
search: params,
});
});

mockState.clerk = createHotloadedClerkQueryClientShim();
mockState.user = {
id: 'user_123',
getOrganizationMemberships: membershipRequest,
};

const { result } = renderHook(() =>
useOrganizationList({
userMemberships: {
pageSize: 2,
},
}),
);

expect(result.current.isLoaded).toBe(true);
expect(result.current.userMemberships.isLoading).toBe(true);
expect(membershipRequest).not.toHaveBeenCalled();

await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
expect(fapiRequest).toHaveBeenCalledWith({
path: '/me/organization_memberships',
method: 'GET',
search: { initialPage: 1, pageSize: 2 },
});
await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

expect(result.current.userMemberships.isFetching).toBe(false);
expect(result.current.userMemberships.count).toBe(0);
});
});
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" + '
test(shared): add query-client hotload compatibility regression by jacekradko · Pull Request #8618 · clerk/javascript · GitHub
Skip to content
test(shared): add query-client hotload compatibility regression#8618

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 4 commits into

from

May 26, 2026
 Merged


test(shared): add query-client hotload compatibility regression
#8618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8ec94f7

test(shared): add query-client hotload compatibility regression


jacekradko May 21, 2026
c3759d3

test(shared): note transitive use of __internal_attemptToEnableEnviro…


jacekradko May 21, 2026
573c23b

test(shared): type fapiRequest mock to accept request arg


jacekradko May 22, 2026
e6c9543

Merge branch 'main' into jacek/query-client-compat-regression


jacekradko May 26, 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/query-client-compat-regression.md

View file


Open in desktop

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

191 changes: 191 additions & 0 deletions
packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
 clerk: undefined as any,
 user: undefined as any,
}));

vi.mock('../../contexts', () => ({
 useAssertWrappedByClerkProvider: () => {},
 useClerkInstanceContext: () => mockState.clerk,
 useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
 useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
 type RecursiveMock = {
 (...args: unknown[]): RecursiveMock;
 } & {
 readonly [key in string | symbol]: RecursiveMock;
 };

 function createRecursiveProxy(label: string): RecursiveMock {
 const callableTarget = function noop(): void {};
 const handler: ProxyHandler<typeof callableTarget> = {
 get(_target, prop) {
 if (prop === 'then') {
 return undefined;
 }
 if (prop === 'toString') {
 return () => `[${label}]`;
 }
 if (prop === Symbol.toPrimitive) {
 return () => 0;
 }
 return self;
 },
 apply() {
 return self;
 },
 construct() {
 return self as unknown as object;
 },
 has() {
 return false;
 },
 set() {
 return false;
 },
 };

 const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
 return self;
 }

 const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
 const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
 typeof value === 'object' &&
 value !== null &&
 '__tag' in value &&
 (value as { __tag?: string }).__tag === 'clerk-rq-client';

 const useClerkQueryClient = (): [QueryClient, boolean] => {
 const clerk = mockState.clerk;
 const queryClient = clerk.__internal_queryClient;
 const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

 React.useEffect(() => {
 const setLoaded = () => setQueryClientLoaded(true);
 clerk.on('queryClientStatus', setLoaded);
 return () => clerk.off('queryClientStatus', setLoaded);
 }, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
 return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
 };

 return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
 const listeners = new Set<(status: 'ready') => void>();
 let isResolving = false;
 let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

 return {
 loaded: true,
 telemetry: { record: vi.fn() },
 setActive: vi.fn(),
 createOrganization: vi.fn(),
 // Reached transitively via useAttemptToEnableOrganizations.
 __internal_attemptToEnableEnvironmentSetting: vi.fn(),
 get __internal_queryClient() {
 if (!queryClient && !isResolving) {
 isResolving = true;
 void Promise.resolve().then(() => {
 queryClient = {
 __tag: 'clerk-rq-client',
 client: new TanstackQueryClient({
 defaultOptions: {
 queries: {
 retry: false,
 staleTime: Infinity,
 refetchOnMount: false,
 refetchOnReconnect: false,
 refetchOnWindowFocus: false,
 },
 },
 }),
 };
 listeners.forEach(listener => listener('ready'));
 });
 }
 return queryClient;
 },
 on: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.add(listener);
 }
 }),
 off: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.delete(listener);
 }
 }),
 };
}

afterEach(() => {
 vi.clearAllMocks();
 mockState.clerk = undefined;
 mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
 it('leaves the legacy mock query-client state and requests organization memberships', async () => {
 const fapiRequest = vi.fn((_request: unknown) =>
 Promise.resolve({
 data: [],
 total_count: 0,
 }),
 );
 const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
 return fapiRequest({
 path: '/me/organization_memberships',
 method: 'GET',
 search: params,
 });
 });

 mockState.clerk = createHotloadedClerkQueryClientShim();
 mockState.user = {
 id: 'user_123',
 getOrganizationMemberships: membershipRequest,
 };

 const { result } = renderHook(() =>
 useOrganizationList({
 userMemberships: {
 pageSize: 2,
 },
 }),
 );

 expect(result.current.isLoaded).toBe(true);
 expect(result.current.userMemberships.isLoading).toBe(true);
 expect(membershipRequest).not.toHaveBeenCalled();

 await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
 expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
 expect(fapiRequest).toHaveBeenCalledWith({
 path: '/me/organization_memberships',
 method: 'GET',
 search: { initialPage: 1, pageSize: 2 },
 });
 await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

 expect(result.current.userMemberships.isFetching).toBe(false);
 expect(result.current.userMemberships.count).toBe(0);
 });
});
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('^' + ".*" + '
test(shared): add query-client hotload compatibility regression by jacekradko · Pull Request #8618 · clerk/javascript · GitHub
Skip to content
test(shared): add query-client hotload compatibility regression#8618

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 4 commits into

from

May 26, 2026
 Merged


test(shared): add query-client hotload compatibility regression
#8618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8ec94f7

test(shared): add query-client hotload compatibility regression


jacekradko May 21, 2026
c3759d3

test(shared): note transitive use of __internal_attemptToEnableEnviro…


jacekradko May 21, 2026
573c23b

test(shared): type fapiRequest mock to accept request arg


jacekradko May 22, 2026
e6c9543

Merge branch 'main' into jacek/query-client-compat-regression


jacekradko May 26, 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/query-client-compat-regression.md

View file


Open in desktop

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

191 changes: 191 additions & 0 deletions
packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
 clerk: undefined as any,
 user: undefined as any,
}));

vi.mock('../../contexts', () => ({
 useAssertWrappedByClerkProvider: () => {},
 useClerkInstanceContext: () => mockState.clerk,
 useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
 useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
 type RecursiveMock = {
 (...args: unknown[]): RecursiveMock;
 } & {
 readonly [key in string | symbol]: RecursiveMock;
 };

 function createRecursiveProxy(label: string): RecursiveMock {
 const callableTarget = function noop(): void {};
 const handler: ProxyHandler<typeof callableTarget> = {
 get(_target, prop) {
 if (prop === 'then') {
 return undefined;
 }
 if (prop === 'toString') {
 return () => `[${label}]`;
 }
 if (prop === Symbol.toPrimitive) {
 return () => 0;
 }
 return self;
 },
 apply() {
 return self;
 },
 construct() {
 return self as unknown as object;
 },
 has() {
 return false;
 },
 set() {
 return false;
 },
 };

 const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
 return self;
 }

 const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
 const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
 typeof value === 'object' &&
 value !== null &&
 '__tag' in value &&
 (value as { __tag?: string }).__tag === 'clerk-rq-client';

 const useClerkQueryClient = (): [QueryClient, boolean] => {
 const clerk = mockState.clerk;
 const queryClient = clerk.__internal_queryClient;
 const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

 React.useEffect(() => {
 const setLoaded = () => setQueryClientLoaded(true);
 clerk.on('queryClientStatus', setLoaded);
 return () => clerk.off('queryClientStatus', setLoaded);
 }, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
 return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
 };

 return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
 const listeners = new Set<(status: 'ready') => void>();
 let isResolving = false;
 let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

 return {
 loaded: true,
 telemetry: { record: vi.fn() },
 setActive: vi.fn(),
 createOrganization: vi.fn(),
 // Reached transitively via useAttemptToEnableOrganizations.
 __internal_attemptToEnableEnvironmentSetting: vi.fn(),
 get __internal_queryClient() {
 if (!queryClient && !isResolving) {
 isResolving = true;
 void Promise.resolve().then(() => {
 queryClient = {
 __tag: 'clerk-rq-client',
 client: new TanstackQueryClient({
 defaultOptions: {
 queries: {
 retry: false,
 staleTime: Infinity,
 refetchOnMount: false,
 refetchOnReconnect: false,
 refetchOnWindowFocus: false,
 },
 },
 }),
 };
 listeners.forEach(listener => listener('ready'));
 });
 }
 return queryClient;
 },
 on: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.add(listener);
 }
 }),
 off: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.delete(listener);
 }
 }),
 };
}

afterEach(() => {
 vi.clearAllMocks();
 mockState.clerk = undefined;
 mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
 it('leaves the legacy mock query-client state and requests organization memberships', async () => {
 const fapiRequest = vi.fn((_request: unknown) =>
 Promise.resolve({
 data: [],
 total_count: 0,
 }),
 );
 const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
 return fapiRequest({
 path: '/me/organization_memberships',
 method: 'GET',
 search: params,
 });
 });

 mockState.clerk = createHotloadedClerkQueryClientShim();
 mockState.user = {
 id: 'user_123',
 getOrganizationMemberships: membershipRequest,
 };

 const { result } = renderHook(() =>
 useOrganizationList({
 userMemberships: {
 pageSize: 2,
 },
 }),
 );

 expect(result.current.isLoaded).toBe(true);
 expect(result.current.userMemberships.isLoading).toBe(true);
 expect(membershipRequest).not.toHaveBeenCalled();

 await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
 expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
 expect(fapiRequest).toHaveBeenCalledWith({
 path: '/me/organization_memberships',
 method: 'GET',
 search: { initialPage: 1, pageSize: 2 },
 });
 await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

 expect(result.current.userMemberships.isFetching).toBe(false);
 expect(result.current.userMemberships.count).toBe(0);
 });
});
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('^' + ".*" + '
test(shared): add query-client hotload compatibility regression by jacekradko · Pull Request #8618 · clerk/javascript · GitHub
Skip to content
test(shared): add query-client hotload compatibility regression#8618

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 4 commits into

from

May 26, 2026
 Merged


test(shared): add query-client hotload compatibility regression
#8618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8ec94f7

test(shared): add query-client hotload compatibility regression


jacekradko May 21, 2026
c3759d3

test(shared): note transitive use of __internal_attemptToEnableEnviro…


jacekradko May 21, 2026
573c23b

test(shared): type fapiRequest mock to accept request arg


jacekradko May 22, 2026
e6c9543

Merge branch 'main' into jacek/query-client-compat-regression


jacekradko May 26, 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/query-client-compat-regression.md

View file


Open in desktop

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

191 changes: 191 additions & 0 deletions
packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
 clerk: undefined as any,
 user: undefined as any,
}));

vi.mock('../../contexts', () => ({
 useAssertWrappedByClerkProvider: () => {},
 useClerkInstanceContext: () => mockState.clerk,
 useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
 useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
 type RecursiveMock = {
 (...args: unknown[]): RecursiveMock;
 } & {
 readonly [key in string | symbol]: RecursiveMock;
 };

 function createRecursiveProxy(label: string): RecursiveMock {
 const callableTarget = function noop(): void {};
 const handler: ProxyHandler<typeof callableTarget> = {
 get(_target, prop) {
 if (prop === 'then') {
 return undefined;
 }
 if (prop === 'toString') {
 return () => `[${label}]`;
 }
 if (prop === Symbol.toPrimitive) {
 return () => 0;
 }
 return self;
 },
 apply() {
 return self;
 },
 construct() {
 return self as unknown as object;
 },
 has() {
 return false;
 },
 set() {
 return false;
 },
 };

 const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
 return self;
 }

 const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
 const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
 typeof value === 'object' &&
 value !== null &&
 '__tag' in value &&
 (value as { __tag?: string }).__tag === 'clerk-rq-client';

 const useClerkQueryClient = (): [QueryClient, boolean] => {
 const clerk = mockState.clerk;
 const queryClient = clerk.__internal_queryClient;
 const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

 React.useEffect(() => {
 const setLoaded = () => setQueryClientLoaded(true);
 clerk.on('queryClientStatus', setLoaded);
 return () => clerk.off('queryClientStatus', setLoaded);
 }, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
 return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
 };

 return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
 const listeners = new Set<(status: 'ready') => void>();
 let isResolving = false;
 let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

 return {
 loaded: true,
 telemetry: { record: vi.fn() },
 setActive: vi.fn(),
 createOrganization: vi.fn(),
 // Reached transitively via useAttemptToEnableOrganizations.
 __internal_attemptToEnableEnvironmentSetting: vi.fn(),
 get __internal_queryClient() {
 if (!queryClient && !isResolving) {
 isResolving = true;
 void Promise.resolve().then(() => {
 queryClient = {
 __tag: 'clerk-rq-client',
 client: new TanstackQueryClient({
 defaultOptions: {
 queries: {
 retry: false,
 staleTime: Infinity,
 refetchOnMount: false,
 refetchOnReconnect: false,
 refetchOnWindowFocus: false,
 },
 },
 }),
 };
 listeners.forEach(listener => listener('ready'));
 });
 }
 return queryClient;
 },
 on: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.add(listener);
 }
 }),
 off: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.delete(listener);
 }
 }),
 };
}

afterEach(() => {
 vi.clearAllMocks();
 mockState.clerk = undefined;
 mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
 it('leaves the legacy mock query-client state and requests organization memberships', async () => {
 const fapiRequest = vi.fn((_request: unknown) =>
 Promise.resolve({
 data: [],
 total_count: 0,
 }),
 );
 const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
 return fapiRequest({
 path: '/me/organization_memberships',
 method: 'GET',
 search: params,
 });
 });

 mockState.clerk = createHotloadedClerkQueryClientShim();
 mockState.user = {
 id: 'user_123',
 getOrganizationMemberships: membershipRequest,
 };

 const { result } = renderHook(() =>
 useOrganizationList({
 userMemberships: {
 pageSize: 2,
 },
 }),
 );

 expect(result.current.isLoaded).toBe(true);
 expect(result.current.userMemberships.isLoading).toBe(true);
 expect(membershipRequest).not.toHaveBeenCalled();

 await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
 expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
 expect(fapiRequest).toHaveBeenCalledWith({
 path: '/me/organization_memberships',
 method: 'GET',
 search: { initialPage: 1, pageSize: 2 },
 });
 await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

 expect(result.current.userMemberships.isFetching).toBe(false);
 expect(result.current.userMemberships.count).toBe(0);
 });
});
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" + '
test(shared): add query-client hotload compatibility regression by jacekradko · Pull Request #8618 · clerk/javascript · GitHub
Skip to content
test(shared): add query-client hotload compatibility regression#8618

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 4 commits into

from

May 26, 2026
 Merged


test(shared): add query-client hotload compatibility regression
#8618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8ec94f7

test(shared): add query-client hotload compatibility regression


jacekradko May 21, 2026
c3759d3

test(shared): note transitive use of __internal_attemptToEnableEnviro…


jacekradko May 21, 2026
573c23b

test(shared): type fapiRequest mock to accept request arg


jacekradko May 22, 2026
e6c9543

Merge branch 'main' into jacek/query-client-compat-regression


jacekradko May 26, 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/query-client-compat-regression.md

View file


Open in desktop

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

191 changes: 191 additions & 0 deletions
packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
 clerk: undefined as any,
 user: undefined as any,
}));

vi.mock('../../contexts', () => ({
 useAssertWrappedByClerkProvider: () => {},
 useClerkInstanceContext: () => mockState.clerk,
 useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
 useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
 type RecursiveMock = {
 (...args: unknown[]): RecursiveMock;
 } & {
 readonly [key in string | symbol]: RecursiveMock;
 };

 function createRecursiveProxy(label: string): RecursiveMock {
 const callableTarget = function noop(): void {};
 const handler: ProxyHandler<typeof callableTarget> = {
 get(_target, prop) {
 if (prop === 'then') {
 return undefined;
 }
 if (prop === 'toString') {
 return () => `[${label}]`;
 }
 if (prop === Symbol.toPrimitive) {
 return () => 0;
 }
 return self;
 },
 apply() {
 return self;
 },
 construct() {
 return self as unknown as object;
 },
 has() {
 return false;
 },
 set() {
 return false;
 },
 };

 const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
 return self;
 }

 const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
 const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
 typeof value === 'object' &&
 value !== null &&
 '__tag' in value &&
 (value as { __tag?: string }).__tag === 'clerk-rq-client';

 const useClerkQueryClient = (): [QueryClient, boolean] => {
 const clerk = mockState.clerk;
 const queryClient = clerk.__internal_queryClient;
 const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

 React.useEffect(() => {
 const setLoaded = () => setQueryClientLoaded(true);
 clerk.on('queryClientStatus', setLoaded);
 return () => clerk.off('queryClientStatus', setLoaded);
 }, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
 return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
 };

 return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
 const listeners = new Set<(status: 'ready') => void>();
 let isResolving = false;
 let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

 return {
 loaded: true,
 telemetry: { record: vi.fn() },
 setActive: vi.fn(),
 createOrganization: vi.fn(),
 // Reached transitively via useAttemptToEnableOrganizations.
 __internal_attemptToEnableEnvironmentSetting: vi.fn(),
 get __internal_queryClient() {
 if (!queryClient && !isResolving) {
 isResolving = true;
 void Promise.resolve().then(() => {
 queryClient = {
 __tag: 'clerk-rq-client',
 client: new TanstackQueryClient({
 defaultOptions: {
 queries: {
 retry: false,
 staleTime: Infinity,
 refetchOnMount: false,
 refetchOnReconnect: false,
 refetchOnWindowFocus: false,
 },
 },
 }),
 };
 listeners.forEach(listener => listener('ready'));
 });
 }
 return queryClient;
 },
 on: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.add(listener);
 }
 }),
 off: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.delete(listener);
 }
 }),
 };
}

afterEach(() => {
 vi.clearAllMocks();
 mockState.clerk = undefined;
 mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
 it('leaves the legacy mock query-client state and requests organization memberships', async () => {
 const fapiRequest = vi.fn((_request: unknown) =>
 Promise.resolve({
 data: [],
 total_count: 0,
 }),
 );
 const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
 return fapiRequest({
 path: '/me/organization_memberships',
 method: 'GET',
 search: params,
 });
 });

 mockState.clerk = createHotloadedClerkQueryClientShim();
 mockState.user = {
 id: 'user_123',
 getOrganizationMemberships: membershipRequest,
 };

 const { result } = renderHook(() =>
 useOrganizationList({
 userMemberships: {
 pageSize: 2,
 },
 }),
 );

 expect(result.current.isLoaded).toBe(true);
 expect(result.current.userMemberships.isLoading).toBe(true);
 expect(membershipRequest).not.toHaveBeenCalled();

 await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
 expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
 expect(fapiRequest).toHaveBeenCalledWith({
 path: '/me/organization_memberships',
 method: 'GET',
 search: { initialPage: 1, pageSize: 2 },
 });
 await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

 expect(result.current.userMemberships.isFetching).toBe(false);
 expect(result.current.userMemberships.count).toBe(0);
 });
});
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('^' + ".*" + '
test(shared): add query-client hotload compatibility regression by jacekradko · Pull Request #8618 · clerk/javascript · GitHub
Skip to content
test(shared): add query-client hotload compatibility regression#8618

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 4 commits into

from

May 26, 2026
 Merged


test(shared): add query-client hotload compatibility regression
#8618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8ec94f7

test(shared): add query-client hotload compatibility regression


jacekradko May 21, 2026
c3759d3

test(shared): note transitive use of __internal_attemptToEnableEnviro…


jacekradko May 21, 2026
573c23b

test(shared): type fapiRequest mock to accept request arg


jacekradko May 22, 2026
e6c9543

Merge branch 'main' into jacek/query-client-compat-regression


jacekradko May 26, 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/query-client-compat-regression.md

View file


Open in desktop

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

191 changes: 191 additions & 0 deletions
packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
 clerk: undefined as any,
 user: undefined as any,
}));

vi.mock('../../contexts', () => ({
 useAssertWrappedByClerkProvider: () => {},
 useClerkInstanceContext: () => mockState.clerk,
 useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
 useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
 type RecursiveMock = {
 (...args: unknown[]): RecursiveMock;
 } & {
 readonly [key in string | symbol]: RecursiveMock;
 };

 function createRecursiveProxy(label: string): RecursiveMock {
 const callableTarget = function noop(): void {};
 const handler: ProxyHandler<typeof callableTarget> = {
 get(_target, prop) {
 if (prop === 'then') {
 return undefined;
 }
 if (prop === 'toString') {
 return () => `[${label}]`;
 }
 if (prop === Symbol.toPrimitive) {
 return () => 0;
 }
 return self;
 },
 apply() {
 return self;
 },
 construct() {
 return self as unknown as object;
 },
 has() {
 return false;
 },
 set() {
 return false;
 },
 };

 const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
 return self;
 }

 const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
 const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
 typeof value === 'object' &&
 value !== null &&
 '__tag' in value &&
 (value as { __tag?: string }).__tag === 'clerk-rq-client';

 const useClerkQueryClient = (): [QueryClient, boolean] => {
 const clerk = mockState.clerk;
 const queryClient = clerk.__internal_queryClient;
 const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

 React.useEffect(() => {
 const setLoaded = () => setQueryClientLoaded(true);
 clerk.on('queryClientStatus', setLoaded);
 return () => clerk.off('queryClientStatus', setLoaded);
 }, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
 return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
 };

 return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
 const listeners = new Set<(status: 'ready') => void>();
 let isResolving = false;
 let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

 return {
 loaded: true,
 telemetry: { record: vi.fn() },
 setActive: vi.fn(),
 createOrganization: vi.fn(),
 // Reached transitively via useAttemptToEnableOrganizations.
 __internal_attemptToEnableEnvironmentSetting: vi.fn(),
 get __internal_queryClient() {
 if (!queryClient && !isResolving) {
 isResolving = true;
 void Promise.resolve().then(() => {
 queryClient = {
 __tag: 'clerk-rq-client',
 client: new TanstackQueryClient({
 defaultOptions: {
 queries: {
 retry: false,
 staleTime: Infinity,
 refetchOnMount: false,
 refetchOnReconnect: false,
 refetchOnWindowFocus: false,
 },
 },
 }),
 };
 listeners.forEach(listener => listener('ready'));
 });
 }
 return queryClient;
 },
 on: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.add(listener);
 }
 }),
 off: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.delete(listener);
 }
 }),
 };
}

afterEach(() => {
 vi.clearAllMocks();
 mockState.clerk = undefined;
 mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
 it('leaves the legacy mock query-client state and requests organization memberships', async () => {
 const fapiRequest = vi.fn((_request: unknown) =>
 Promise.resolve({
 data: [],
 total_count: 0,
 }),
 );
 const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
 return fapiRequest({
 path: '/me/organization_memberships',
 method: 'GET',
 search: params,
 });
 });

 mockState.clerk = createHotloadedClerkQueryClientShim();
 mockState.user = {
 id: 'user_123',
 getOrganizationMemberships: membershipRequest,
 };

 const { result } = renderHook(() =>
 useOrganizationList({
 userMemberships: {
 pageSize: 2,
 },
 }),
 );

 expect(result.current.isLoaded).toBe(true);
 expect(result.current.userMemberships.isLoading).toBe(true);
 expect(membershipRequest).not.toHaveBeenCalled();

 await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
 expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
 expect(fapiRequest).toHaveBeenCalledWith({
 path: '/me/organization_memberships',
 method: 'GET',
 search: { initialPage: 1, pageSize: 2 },
 });
 await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

 expect(result.current.userMemberships.isFetching).toBe(false);
 expect(result.current.userMemberships.count).toBe(0);
 });
});
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('^' + ".*" + '
test(shared): add query-client hotload compatibility regression by jacekradko · Pull Request #8618 · clerk/javascript · GitHub
Skip to content
test(shared): add query-client hotload compatibility regression#8618

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 4 commits into

from

May 26, 2026
 Merged


test(shared): add query-client hotload compatibility regression
#8618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8ec94f7

test(shared): add query-client hotload compatibility regression


jacekradko May 21, 2026
c3759d3

test(shared): note transitive use of __internal_attemptToEnableEnviro…


jacekradko May 21, 2026
573c23b

test(shared): type fapiRequest mock to accept request arg


jacekradko May 22, 2026
e6c9543

Merge branch 'main' into jacek/query-client-compat-regression


jacekradko May 26, 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/query-client-compat-regression.md

View file


Open in desktop

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

191 changes: 191 additions & 0 deletions
packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
 clerk: undefined as any,
 user: undefined as any,
}));

vi.mock('../../contexts', () => ({
 useAssertWrappedByClerkProvider: () => {},
 useClerkInstanceContext: () => mockState.clerk,
 useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
 useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
 type RecursiveMock = {
 (...args: unknown[]): RecursiveMock;
 } & {
 readonly [key in string | symbol]: RecursiveMock;
 };

 function createRecursiveProxy(label: string): RecursiveMock {
 const callableTarget = function noop(): void {};
 const handler: ProxyHandler<typeof callableTarget> = {
 get(_target, prop) {
 if (prop === 'then') {
 return undefined;
 }
 if (prop === 'toString') {
 return () => `[${label}]`;
 }
 if (prop === Symbol.toPrimitive) {
 return () => 0;
 }
 return self;
 },
 apply() {
 return self;
 },
 construct() {
 return self as unknown as object;
 },
 has() {
 return false;
 },
 set() {
 return false;
 },
 };

 const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
 return self;
 }

 const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
 const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
 typeof value === 'object' &&
 value !== null &&
 '__tag' in value &&
 (value as { __tag?: string }).__tag === 'clerk-rq-client';

 const useClerkQueryClient = (): [QueryClient, boolean] => {
 const clerk = mockState.clerk;
 const queryClient = clerk.__internal_queryClient;
 const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

 React.useEffect(() => {
 const setLoaded = () => setQueryClientLoaded(true);
 clerk.on('queryClientStatus', setLoaded);
 return () => clerk.off('queryClientStatus', setLoaded);
 }, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
 return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
 };

 return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
 const listeners = new Set<(status: 'ready') => void>();
 let isResolving = false;
 let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

 return {
 loaded: true,
 telemetry: { record: vi.fn() },
 setActive: vi.fn(),
 createOrganization: vi.fn(),
 // Reached transitively via useAttemptToEnableOrganizations.
 __internal_attemptToEnableEnvironmentSetting: vi.fn(),
 get __internal_queryClient() {
 if (!queryClient && !isResolving) {
 isResolving = true;
 void Promise.resolve().then(() => {
 queryClient = {
 __tag: 'clerk-rq-client',
 client: new TanstackQueryClient({
 defaultOptions: {
 queries: {
 retry: false,
 staleTime: Infinity,
 refetchOnMount: false,
 refetchOnReconnect: false,
 refetchOnWindowFocus: false,
 },
 },
 }),
 };
 listeners.forEach(listener => listener('ready'));
 });
 }
 return queryClient;
 },
 on: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.add(listener);
 }
 }),
 off: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.delete(listener);
 }
 }),
 };
}

afterEach(() => {
 vi.clearAllMocks();
 mockState.clerk = undefined;
 mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
 it('leaves the legacy mock query-client state and requests organization memberships', async () => {
 const fapiRequest = vi.fn((_request: unknown) =>
 Promise.resolve({
 data: [],
 total_count: 0,
 }),
 );
 const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
 return fapiRequest({
 path: '/me/organization_memberships',
 method: 'GET',
 search: params,
 });
 });

 mockState.clerk = createHotloadedClerkQueryClientShim();
 mockState.user = {
 id: 'user_123',
 getOrganizationMemberships: membershipRequest,
 };

 const { result } = renderHook(() =>
 useOrganizationList({
 userMemberships: {
 pageSize: 2,
 },
 }),
 );

 expect(result.current.isLoaded).toBe(true);
 expect(result.current.userMemberships.isLoading).toBe(true);
 expect(membershipRequest).not.toHaveBeenCalled();

 await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
 expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
 expect(fapiRequest).toHaveBeenCalledWith({
 path: '/me/organization_memberships',
 method: 'GET',
 search: { initialPage: 1, pageSize: 2 },
 });
 await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

 expect(result.current.userMemberships.isFetching).toBe(false);
 expect(result.current.userMemberships.count).toBe(0);
 });
});
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); }
})();
})();
test(shared): add query-client hotload compatibility regression by jacekradko · Pull Request #8618 · clerk/javascript · GitHub
Skip to content
test(shared): add query-client hotload compatibility regression#8618

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 4 commits into

from

May 26, 2026
 Merged


test(shared): add query-client hotload compatibility regression
#8618
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8ec94f7

test(shared): add query-client hotload compatibility regression


jacekradko May 21, 2026
c3759d3

test(shared): note transitive use of __internal_attemptToEnableEnviro…


jacekradko May 21, 2026
573c23b

test(shared): type fapiRequest mock to accept request arg


jacekradko May 22, 2026
e6c9543

Merge branch 'main' into jacek/query-client-compat-regression


jacekradko May 26, 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/query-client-compat-regression.md

View file


Open in desktop

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

191 changes: 191 additions & 0 deletions
packages/shared/src/react/hooks/__tests__/useOrganizationList.hotload-compat.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
import type { QueryClient } from '@tanstack/query-core';
import { QueryClient as TanstackQueryClient } from '@tanstack/query-core';
import { renderHook, waitFor } from '@testing-library/react';
import React from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

const mockState = vi.hoisted(() => ({
 clerk: undefined as any,
 user: undefined as any,
}));

vi.mock('../../contexts', () => ({
 useAssertWrappedByClerkProvider: () => {},
 useClerkInstanceContext: () => mockState.clerk,
 useInitialStateContext: () => undefined,
}));

vi.mock('../base/useUserBase', () => ({
 useUserBase: () => mockState.user,
}));

// Models pre-PR #8434 @clerk/shared, which reads the hotloaded Clerk.js
// `__internal_queryClient` bridge and waits for `queryClientStatus`.
vi.mock('../../query/use-clerk-query-client', () => {
 type RecursiveMock = {
 (...args: unknown[]): RecursiveMock;
 } & {
 readonly [key in string | symbol]: RecursiveMock;
 };

 function createRecursiveProxy(label: string): RecursiveMock {
 const callableTarget = function noop(): void {};
 const handler: ProxyHandler<typeof callableTarget> = {
 get(_target, prop) {
 if (prop === 'then') {
 return undefined;
 }
 if (prop === 'toString') {
 return () => `[${label}]`;
 }
 if (prop === Symbol.toPrimitive) {
 return () => 0;
 }
 return self;
 },
 apply() {
 return self;
 },
 construct() {
 return self as unknown as object;
 },
 has() {
 return false;
 },
 set() {
 return false;
 },
 };

 const self = new Proxy(callableTarget, handler) as unknown as RecursiveMock;
 return self;
 }

 const mockQueryClient = createRecursiveProxy('LegacyClerkMockQueryClient') as unknown as QueryClient;
 const isLegacyQueryClient = (value: unknown): value is { __tag: 'clerk-rq-client'; client: QueryClient } =>
 typeof value === 'object' &&
 value !== null &&
 '__tag' in value &&
 (value as { __tag?: string }).__tag === 'clerk-rq-client';

 const useClerkQueryClient = (): [QueryClient, boolean] => {
 const clerk = mockState.clerk;
 const queryClient = clerk.__internal_queryClient;
 const [queryClientLoaded, setQueryClientLoaded] = React.useState(isLegacyQueryClient(queryClient));

 React.useEffect(() => {
 const setLoaded = () => setQueryClientLoaded(true);
 clerk.on('queryClientStatus', setLoaded);
 return () => clerk.off('queryClientStatus', setLoaded);
 }, [clerk]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 const isLoaded = queryClientLoaded && isLegacyQueryClient(queryClient);
 return [isLoaded ? queryClient.client : mockQueryClient, isLoaded];
 };

 return { useClerkQueryClient };
});

import { useOrganizationList } from '../useOrganizationList';

function createHotloadedClerkQueryClientShim() {
 const listeners = new Set<(status: 'ready') => void>();
 let isResolving = false;
 let queryClient: { __tag: 'clerk-rq-client'; client: TanstackQueryClient } | undefined;

 return {
 loaded: true,
 telemetry: { record: vi.fn() },
 setActive: vi.fn(),
 createOrganization: vi.fn(),
 // Reached transitively via useAttemptToEnableOrganizations.
 __internal_attemptToEnableEnvironmentSetting: vi.fn(),
 get __internal_queryClient() {
 if (!queryClient && !isResolving) {
 isResolving = true;
 void Promise.resolve().then(() => {
 queryClient = {
 __tag: 'clerk-rq-client',
 client: new TanstackQueryClient({
 defaultOptions: {
 queries: {
 retry: false,
 staleTime: Infinity,
 refetchOnMount: false,
 refetchOnReconnect: false,
 refetchOnWindowFocus: false,
 },
 },
 }),
 };
 listeners.forEach(listener => listener('ready'));
 });
 }
 return queryClient;
 },
 on: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.add(listener);
 }
 }),
 off: vi.fn((event: string, listener: (status: 'ready') => void) => {
 if (event === 'queryClientStatus') {
 listeners.delete(listener);
 }
 }),
 };
}

afterEach(() => {
 vi.clearAllMocks();
 mockState.clerk = undefined;
 mockState.user = undefined;
});

describe('useOrganizationList hotload compatibility', () => {
 it('leaves the legacy mock query-client state and requests organization memberships', async () => {
 const fapiRequest = vi.fn((_request: unknown) =>
 Promise.resolve({
 data: [],
 total_count: 0,
 }),
 );
 const membershipRequest = vi.fn((params?: { initialPage?: number; pageSize?: number }) => {
 return fapiRequest({
 path: '/me/organization_memberships',
 method: 'GET',
 search: params,
 });
 });

 mockState.clerk = createHotloadedClerkQueryClientShim();
 mockState.user = {
 id: 'user_123',
 getOrganizationMemberships: membershipRequest,
 };

 const { result } = renderHook(() =>
 useOrganizationList({
 userMemberships: {
 pageSize: 2,
 },
 }),
 );

 expect(result.current.isLoaded).toBe(true);
 expect(result.current.userMemberships.isLoading).toBe(true);
 expect(membershipRequest).not.toHaveBeenCalled();

 await waitFor(() => expect(membershipRequest).toHaveBeenCalledTimes(1));
 expect(membershipRequest).toHaveBeenCalledWith({ initialPage: 1, pageSize: 2 });
 expect(fapiRequest).toHaveBeenCalledWith({
 path: '/me/organization_memberships',
 method: 'GET',
 search: { initialPage: 1, pageSize: 2 },
 });
 await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));

 expect(result.current.userMemberships.isFetching).toBe(false);
 expect(result.current.userMemberships.count).toBe(0);
 });
});
Loading