chore(ui): Cherry pick APIKeys naming changes#7237

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
wobsoriano merged 2 commits into from
Nov 17, 2025
Merged

chore(ui): Cherry pick APIKeys naming changes #7237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81ffea9
chore: Cherry pick APIKeys naming changes
wobsoriano Nov 17, 2025
204cd4a
import fix
wobsoriano Nov 17, 2025
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: 1 addition & 1 deletion packages/clerk-js/sandbox/app.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/api-keys': () => {
Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
* @param targetNode Target to mount the APIKeys component.
* @param props Configuration parameters.
*/
public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
*
* @param targetNode Target node to unmount the ApiKeys component from.
*/
public unmountApiKeys = (node: HTMLDivElement) => {
public unmountAPIKeys = (node: HTMLDivElement) => {
void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
};

Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/uiComponents.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
{clerk.loaded && (
<ClerkHostRenderer
component={component}
mount={clerk.mountApiKeys}
unmount={clerk.unmountApiKeys}
mount={clerk.mountAPIKeys}
unmount={clerk.unmountAPIKeys}
updateProps={(clerk as any).__unstable__updateProps}
props={props}
rootProps={rendererRootProps}
Expand Down
18 changes: 9 additions & 9 deletions packages/react/src/isomorphicClerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
clerkjs.mountPricingTable(node, props);
});

this.premountApiKeysNodes.forEach((props, node) => {
clerkjs.mountApiKeys(node, props);
this.premountAPIKeysNode.forEach((props, node) => {
clerkjs.mountAPIKeys(node, props);
});

this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.mountApiKeys(node, props);
this.clerkjs.mountAPIKeys(node, props);
} else {
this.premountApiKeysNodes.set(node, props);
this.premountAPIKeysNode.set(node, props);
}
};

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
if (this.clerkjs && this.loaded) {
this.clerkjs.unmountApiKeys(node);
this.clerkjs.unmountAPIKeys(node);
} else {
this.premountApiKeysNodes.delete(node);
this.premountAPIKeysNode.delete(node);
}
};

Expand Down
18 changes: 9 additions & 9 deletions packages/shared/src/react/hooks/useAPIKeys.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
* @interface
*/
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
GetAPIKeysParams & {
/**
* If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
* @interface
*/
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
APIKeyResource,
T extends { infinite: true } ? true : false
>;

/**
* The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
* The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
*
* @example
* ### Basic usage with default pagination
*
* ```tsx
* const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
* const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
* subject: 'user_123',
* pageSize: 10,
* initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
* const [searchValue, setSearchValue] = useState('');
* const debouncedSearch = useDebounce(searchValue, 500);
*
* const { data, isLoading } = useApiKeys({
* const { data, isLoading } = useAPIKeys({
* subject: 'user_123',
* query: debouncedSearch.trim(),
* pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
* ### Infinite scroll
*
* ```tsx
* const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
* const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
* subject: 'user_123',
* infinite: true,
* });
* ```
*/
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
useAssertWrappedByClerkProvider('useApiKeys');

const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
subject: '',
query: '',
enabled: true,
} as UseApiKeysParams);
} as UseAPIKeysParams);

const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
type: 'apiKeys',
subject: safeValues.subject || '',
},
) as UseApiKeysReturn<T>;
) as UseAPIKeysReturn<T>;
}
4 changes: 2 additions & 2 deletions packages/shared/src/types/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
* @param targetNode - Target to mount the APIKeys component.
* @param props - Configuration parameters.
*/
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

/**
* This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
*
* @param targetNode - Target node to unmount the ApiKeys component from.
*/
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

/**
* Mounts a OAuth consent component at the target element.
Expand Down
0 ...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down
0 ...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx
View file
Open in desktop
File renamed without changes.
0 ...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx
View file
Open in desktop
File renamed without changes.
0 ...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx
View file
Open in desktop
File renamed without changes.
0 ...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down
0 packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
const { organization } = useOrganization();
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
default: module.OrganizationAPIKeysPage,
})),
);
Expand Down
2 changes: 1 addition & 1 deletion ...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
const { user } = useUser();
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/UserProfile/UserProfileRoutes.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
default: module.APIKeysPage,
})),
);
Expand Down
0 ...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/ui/src/contexts/components/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/lazyModules/components.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore(ui): Cherry pick APIKeys naming changes#7237

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

wobsoriano
merged 2 commits into

from

Nov 17, 2025
 Merged


chore(ui): Cherry pick APIKeys naming changes
#7237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81ffea9

chore: Cherry pick APIKeys naming changes


wobsoriano Nov 17, 2025
204cd4a

import fix


wobsoriano Nov 17, 2025

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: 1 addition & 1 deletion
packages/clerk-js/sandbox/app.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
 Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
 },
 '/api-keys': () => {
 Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
 Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
 },
 '/oauth-consent': () => {
 const searchParams = new URLSearchParams(window.location.search);
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
 * @param targetNode Target to mount the APIKeys component.
 * @param props Configuration parameters.
 */
 public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

 if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
 *
 * @param targetNode Target node to unmount the ApiKeys component from.
 */
 public unmountApiKeys = (node: HTMLDivElement) => {
 public unmountAPIKeys = (node: HTMLDivElement) => {
 void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
 };

Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
 {clerk.loaded && (
 <ClerkHostRenderer
 component={component}
 mount={clerk.mountApiKeys}
 unmount={clerk.unmountApiKeys}
 mount={clerk.mountAPIKeys}
 unmount={clerk.unmountAPIKeys}
 updateProps={(clerk as any).__unstable__updateProps}
 props={props}
 rootProps={rendererRootProps}
Expand Down

18 changes: 9 additions & 9 deletions
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
 private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
 private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
 private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
 private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 clerkjs.mountPricingTable(node, props);
 });

 this.premountApiKeysNodes.forEach((props, node) => {
 clerkjs.mountApiKeys(node, props);
 this.premountAPIKeysNode.forEach((props, node) => {
 clerkjs.mountAPIKeys(node, props);
 });

 this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 }
 };

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.mountApiKeys(node, props);
 this.clerkjs.mountAPIKeys(node, props);
 } else {
 this.premountApiKeysNodes.set(node, props);
 this.premountAPIKeysNode.set(node, props);
 }
 };

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.unmountApiKeys(node);
 this.clerkjs.unmountAPIKeys(node);
 } else {
 this.premountApiKeysNodes.delete(node);
 this.premountAPIKeysNode.delete(node);
 }
 };

Expand Down

18 changes: 9 additions & 9 deletions
packages/shared/src/react/hooks/useAPIKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @interface
 */
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
 GetAPIKeysParams & {
 /**
 * If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
 * @interface
 */
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
 APIKeyResource,
 T extends { infinite: true } ? true : false
>;

/**
 * The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
 * The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
 *
 * @example
 * ### Basic usage with default pagination
 *
 * ```tsx
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
 * subject: 'user_123',
 * pageSize: 10,
 * initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * const [searchValue, setSearchValue] = useState('');
 * const debouncedSearch = useDebounce(searchValue, 500);
 *
 * const { data, isLoading } = useApiKeys({
 * const { data, isLoading } = useAPIKeys({
 * subject: 'user_123',
 * query: debouncedSearch.trim(),
 * pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * ### Infinite scroll
 *
 * ```tsx
 * const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
 * const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
 * subject: 'user_123',
 * infinite: true,
 * });
 * ```
 */
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
 useAssertWrappedByClerkProvider('useApiKeys');

 const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 subject: '',
 query: '',
 enabled: true,
 } as UseApiKeysParams);
 } as UseAPIKeysParams);

 const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 type: 'apiKeys',
 subject: safeValues.subject || '',
 },
 ) as UseApiKeysReturn<T>;
 ) as UseAPIKeysReturn<T>;
}

4 changes: 2 additions & 2 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
 * @param targetNode - Target to mount the APIKeys component.
 * @param props - Configuration parameters.
 */
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

 /**
 * This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
 *
 * @param targetNode - Target node to unmount the ApiKeys component from.
 */
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

 /**
 * Mounts a OAuth consent component at the target element.
Expand Down

0
...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down

0
...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx

View file


Open in desktop


File renamed without changes.


0
...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


0
...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down

0
packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
 const { organization } = useOrganization();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
 default: module.OrganizationAPIKeysPage,
 })),
);
Expand Down

2 changes: 1 addition & 1 deletion
...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
 const { user } = useUser();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
 import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
 import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
 default: module.APIKeysPage,
 })),
);
Expand Down

0
...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/ui/src/contexts/components/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/lazyModules/components.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
 import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
 PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
 SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
 OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading

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

Skip to content
chore(ui): Cherry pick APIKeys naming changes#7237

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

wobsoriano
merged 2 commits into

from

Nov 17, 2025
 Merged


chore(ui): Cherry pick APIKeys naming changes
#7237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81ffea9

chore: Cherry pick APIKeys naming changes


wobsoriano Nov 17, 2025
204cd4a

import fix


wobsoriano Nov 17, 2025

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: 1 addition & 1 deletion
packages/clerk-js/sandbox/app.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
 Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
 },
 '/api-keys': () => {
 Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
 Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
 },
 '/oauth-consent': () => {
 const searchParams = new URLSearchParams(window.location.search);
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
 * @param targetNode Target to mount the APIKeys component.
 * @param props Configuration parameters.
 */
 public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

 if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
 *
 * @param targetNode Target node to unmount the ApiKeys component from.
 */
 public unmountApiKeys = (node: HTMLDivElement) => {
 public unmountAPIKeys = (node: HTMLDivElement) => {
 void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
 };

Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
 {clerk.loaded && (
 <ClerkHostRenderer
 component={component}
 mount={clerk.mountApiKeys}
 unmount={clerk.unmountApiKeys}
 mount={clerk.mountAPIKeys}
 unmount={clerk.unmountAPIKeys}
 updateProps={(clerk as any).__unstable__updateProps}
 props={props}
 rootProps={rendererRootProps}
Expand Down

18 changes: 9 additions & 9 deletions
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
 private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
 private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
 private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
 private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 clerkjs.mountPricingTable(node, props);
 });

 this.premountApiKeysNodes.forEach((props, node) => {
 clerkjs.mountApiKeys(node, props);
 this.premountAPIKeysNode.forEach((props, node) => {
 clerkjs.mountAPIKeys(node, props);
 });

 this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 }
 };

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.mountApiKeys(node, props);
 this.clerkjs.mountAPIKeys(node, props);
 } else {
 this.premountApiKeysNodes.set(node, props);
 this.premountAPIKeysNode.set(node, props);
 }
 };

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.unmountApiKeys(node);
 this.clerkjs.unmountAPIKeys(node);
 } else {
 this.premountApiKeysNodes.delete(node);
 this.premountAPIKeysNode.delete(node);
 }
 };

Expand Down

18 changes: 9 additions & 9 deletions
packages/shared/src/react/hooks/useAPIKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @interface
 */
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
 GetAPIKeysParams & {
 /**
 * If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
 * @interface
 */
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
 APIKeyResource,
 T extends { infinite: true } ? true : false
>;

/**
 * The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
 * The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
 *
 * @example
 * ### Basic usage with default pagination
 *
 * ```tsx
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
 * subject: 'user_123',
 * pageSize: 10,
 * initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * const [searchValue, setSearchValue] = useState('');
 * const debouncedSearch = useDebounce(searchValue, 500);
 *
 * const { data, isLoading } = useApiKeys({
 * const { data, isLoading } = useAPIKeys({
 * subject: 'user_123',
 * query: debouncedSearch.trim(),
 * pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * ### Infinite scroll
 *
 * ```tsx
 * const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
 * const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
 * subject: 'user_123',
 * infinite: true,
 * });
 * ```
 */
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
 useAssertWrappedByClerkProvider('useApiKeys');

 const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 subject: '',
 query: '',
 enabled: true,
 } as UseApiKeysParams);
 } as UseAPIKeysParams);

 const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 type: 'apiKeys',
 subject: safeValues.subject || '',
 },
 ) as UseApiKeysReturn<T>;
 ) as UseAPIKeysReturn<T>;
}

4 changes: 2 additions & 2 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
 * @param targetNode - Target to mount the APIKeys component.
 * @param props - Configuration parameters.
 */
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

 /**
 * This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
 *
 * @param targetNode - Target node to unmount the ApiKeys component from.
 */
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

 /**
 * Mounts a OAuth consent component at the target element.
Expand Down

0
...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down

0
...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx

View file


Open in desktop


File renamed without changes.


0
...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


0
...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down

0
packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
 const { organization } = useOrganization();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
 default: module.OrganizationAPIKeysPage,
 })),
);
Expand Down

2 changes: 1 addition & 1 deletion
...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
 const { user } = useUser();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
 import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
 import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
 default: module.APIKeysPage,
 })),
);
Expand Down

0
...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/ui/src/contexts/components/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/lazyModules/components.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
 import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
 PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
 SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
 OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading

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

Skip to content
chore(ui): Cherry pick APIKeys naming changes#7237

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

wobsoriano
merged 2 commits into

from

Nov 17, 2025
 Merged


chore(ui): Cherry pick APIKeys naming changes
#7237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81ffea9

chore: Cherry pick APIKeys naming changes


wobsoriano Nov 17, 2025
204cd4a

import fix


wobsoriano Nov 17, 2025

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: 1 addition & 1 deletion
packages/clerk-js/sandbox/app.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
 Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
 },
 '/api-keys': () => {
 Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
 Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
 },
 '/oauth-consent': () => {
 const searchParams = new URLSearchParams(window.location.search);
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
 * @param targetNode Target to mount the APIKeys component.
 * @param props Configuration parameters.
 */
 public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

 if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
 *
 * @param targetNode Target node to unmount the ApiKeys component from.
 */
 public unmountApiKeys = (node: HTMLDivElement) => {
 public unmountAPIKeys = (node: HTMLDivElement) => {
 void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
 };

Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
 {clerk.loaded && (
 <ClerkHostRenderer
 component={component}
 mount={clerk.mountApiKeys}
 unmount={clerk.unmountApiKeys}
 mount={clerk.mountAPIKeys}
 unmount={clerk.unmountAPIKeys}
 updateProps={(clerk as any).__unstable__updateProps}
 props={props}
 rootProps={rendererRootProps}
Expand Down

18 changes: 9 additions & 9 deletions
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
 private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
 private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
 private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
 private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 clerkjs.mountPricingTable(node, props);
 });

 this.premountApiKeysNodes.forEach((props, node) => {
 clerkjs.mountApiKeys(node, props);
 this.premountAPIKeysNode.forEach((props, node) => {
 clerkjs.mountAPIKeys(node, props);
 });

 this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 }
 };

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.mountApiKeys(node, props);
 this.clerkjs.mountAPIKeys(node, props);
 } else {
 this.premountApiKeysNodes.set(node, props);
 this.premountAPIKeysNode.set(node, props);
 }
 };

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.unmountApiKeys(node);
 this.clerkjs.unmountAPIKeys(node);
 } else {
 this.premountApiKeysNodes.delete(node);
 this.premountAPIKeysNode.delete(node);
 }
 };

Expand Down

18 changes: 9 additions & 9 deletions
packages/shared/src/react/hooks/useAPIKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @interface
 */
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
 GetAPIKeysParams & {
 /**
 * If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
 * @interface
 */
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
 APIKeyResource,
 T extends { infinite: true } ? true : false
>;

/**
 * The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
 * The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
 *
 * @example
 * ### Basic usage with default pagination
 *
 * ```tsx
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
 * subject: 'user_123',
 * pageSize: 10,
 * initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * const [searchValue, setSearchValue] = useState('');
 * const debouncedSearch = useDebounce(searchValue, 500);
 *
 * const { data, isLoading } = useApiKeys({
 * const { data, isLoading } = useAPIKeys({
 * subject: 'user_123',
 * query: debouncedSearch.trim(),
 * pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * ### Infinite scroll
 *
 * ```tsx
 * const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
 * const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
 * subject: 'user_123',
 * infinite: true,
 * });
 * ```
 */
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
 useAssertWrappedByClerkProvider('useApiKeys');

 const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 subject: '',
 query: '',
 enabled: true,
 } as UseApiKeysParams);
 } as UseAPIKeysParams);

 const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 type: 'apiKeys',
 subject: safeValues.subject || '',
 },
 ) as UseApiKeysReturn<T>;
 ) as UseAPIKeysReturn<T>;
}

4 changes: 2 additions & 2 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
 * @param targetNode - Target to mount the APIKeys component.
 * @param props - Configuration parameters.
 */
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

 /**
 * This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
 *
 * @param targetNode - Target node to unmount the ApiKeys component from.
 */
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

 /**
 * Mounts a OAuth consent component at the target element.
Expand Down

0
...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down

0
...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx

View file


Open in desktop


File renamed without changes.


0
...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


0
...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down

0
packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
 const { organization } = useOrganization();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
 default: module.OrganizationAPIKeysPage,
 })),
);
Expand Down

2 changes: 1 addition & 1 deletion
...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
 const { user } = useUser();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
 import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
 import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
 default: module.APIKeysPage,
 })),
);
Expand Down

0
...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/ui/src/contexts/components/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/lazyModules/components.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
 import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
 PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
 SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
 OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading

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

Skip to content
chore(ui): Cherry pick APIKeys naming changes#7237

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

wobsoriano
merged 2 commits into

from

Nov 17, 2025
 Merged


chore(ui): Cherry pick APIKeys naming changes
#7237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81ffea9

chore: Cherry pick APIKeys naming changes


wobsoriano Nov 17, 2025
204cd4a

import fix


wobsoriano Nov 17, 2025

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: 1 addition & 1 deletion
packages/clerk-js/sandbox/app.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
 Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
 },
 '/api-keys': () => {
 Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
 Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
 },
 '/oauth-consent': () => {
 const searchParams = new URLSearchParams(window.location.search);
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
 * @param targetNode Target to mount the APIKeys component.
 * @param props Configuration parameters.
 */
 public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

 if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
 *
 * @param targetNode Target node to unmount the ApiKeys component from.
 */
 public unmountApiKeys = (node: HTMLDivElement) => {
 public unmountAPIKeys = (node: HTMLDivElement) => {
 void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
 };

Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
 {clerk.loaded && (
 <ClerkHostRenderer
 component={component}
 mount={clerk.mountApiKeys}
 unmount={clerk.unmountApiKeys}
 mount={clerk.mountAPIKeys}
 unmount={clerk.unmountAPIKeys}
 updateProps={(clerk as any).__unstable__updateProps}
 props={props}
 rootProps={rendererRootProps}
Expand Down

18 changes: 9 additions & 9 deletions
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
 private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
 private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
 private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
 private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 clerkjs.mountPricingTable(node, props);
 });

 this.premountApiKeysNodes.forEach((props, node) => {
 clerkjs.mountApiKeys(node, props);
 this.premountAPIKeysNode.forEach((props, node) => {
 clerkjs.mountAPIKeys(node, props);
 });

 this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 }
 };

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.mountApiKeys(node, props);
 this.clerkjs.mountAPIKeys(node, props);
 } else {
 this.premountApiKeysNodes.set(node, props);
 this.premountAPIKeysNode.set(node, props);
 }
 };

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.unmountApiKeys(node);
 this.clerkjs.unmountAPIKeys(node);
 } else {
 this.premountApiKeysNodes.delete(node);
 this.premountAPIKeysNode.delete(node);
 }
 };

Expand Down

18 changes: 9 additions & 9 deletions
packages/shared/src/react/hooks/useAPIKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @interface
 */
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
 GetAPIKeysParams & {
 /**
 * If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
 * @interface
 */
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
 APIKeyResource,
 T extends { infinite: true } ? true : false
>;

/**
 * The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
 * The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
 *
 * @example
 * ### Basic usage with default pagination
 *
 * ```tsx
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
 * subject: 'user_123',
 * pageSize: 10,
 * initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * const [searchValue, setSearchValue] = useState('');
 * const debouncedSearch = useDebounce(searchValue, 500);
 *
 * const { data, isLoading } = useApiKeys({
 * const { data, isLoading } = useAPIKeys({
 * subject: 'user_123',
 * query: debouncedSearch.trim(),
 * pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * ### Infinite scroll
 *
 * ```tsx
 * const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
 * const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
 * subject: 'user_123',
 * infinite: true,
 * });
 * ```
 */
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
 useAssertWrappedByClerkProvider('useApiKeys');

 const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 subject: '',
 query: '',
 enabled: true,
 } as UseApiKeysParams);
 } as UseAPIKeysParams);

 const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 type: 'apiKeys',
 subject: safeValues.subject || '',
 },
 ) as UseApiKeysReturn<T>;
 ) as UseAPIKeysReturn<T>;
}

4 changes: 2 additions & 2 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
 * @param targetNode - Target to mount the APIKeys component.
 * @param props - Configuration parameters.
 */
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

 /**
 * This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
 *
 * @param targetNode - Target node to unmount the ApiKeys component from.
 */
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

 /**
 * Mounts a OAuth consent component at the target element.
Expand Down

0
...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down

0
...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx

View file


Open in desktop


File renamed without changes.


0
...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


0
...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down

0
packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
 const { organization } = useOrganization();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
 default: module.OrganizationAPIKeysPage,
 })),
);
Expand Down

2 changes: 1 addition & 1 deletion
...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
 const { user } = useUser();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
 import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
 import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
 default: module.APIKeysPage,
 })),
);
Expand Down

0
...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/ui/src/contexts/components/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/lazyModules/components.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
 import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
 PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
 SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
 OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(ui): Cherry pick APIKeys naming changes#7237

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

wobsoriano
merged 2 commits into

from

Nov 17, 2025
 Merged


chore(ui): Cherry pick APIKeys naming changes
#7237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81ffea9

chore: Cherry pick APIKeys naming changes


wobsoriano Nov 17, 2025
204cd4a

import fix


wobsoriano Nov 17, 2025

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: 1 addition & 1 deletion
packages/clerk-js/sandbox/app.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
 Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
 },
 '/api-keys': () => {
 Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
 Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
 },
 '/oauth-consent': () => {
 const searchParams = new URLSearchParams(window.location.search);
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
 * @param targetNode Target to mount the APIKeys component.
 * @param props Configuration parameters.
 */
 public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

 if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
 *
 * @param targetNode Target node to unmount the ApiKeys component from.
 */
 public unmountApiKeys = (node: HTMLDivElement) => {
 public unmountAPIKeys = (node: HTMLDivElement) => {
 void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
 };

Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
 {clerk.loaded && (
 <ClerkHostRenderer
 component={component}
 mount={clerk.mountApiKeys}
 unmount={clerk.unmountApiKeys}
 mount={clerk.mountAPIKeys}
 unmount={clerk.unmountAPIKeys}
 updateProps={(clerk as any).__unstable__updateProps}
 props={props}
 rootProps={rendererRootProps}
Expand Down

18 changes: 9 additions & 9 deletions
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
 private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
 private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
 private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
 private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 clerkjs.mountPricingTable(node, props);
 });

 this.premountApiKeysNodes.forEach((props, node) => {
 clerkjs.mountApiKeys(node, props);
 this.premountAPIKeysNode.forEach((props, node) => {
 clerkjs.mountAPIKeys(node, props);
 });

 this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 }
 };

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.mountApiKeys(node, props);
 this.clerkjs.mountAPIKeys(node, props);
 } else {
 this.premountApiKeysNodes.set(node, props);
 this.premountAPIKeysNode.set(node, props);
 }
 };

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.unmountApiKeys(node);
 this.clerkjs.unmountAPIKeys(node);
 } else {
 this.premountApiKeysNodes.delete(node);
 this.premountAPIKeysNode.delete(node);
 }
 };

Expand Down

18 changes: 9 additions & 9 deletions
packages/shared/src/react/hooks/useAPIKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @interface
 */
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
 GetAPIKeysParams & {
 /**
 * If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
 * @interface
 */
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
 APIKeyResource,
 T extends { infinite: true } ? true : false
>;

/**
 * The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
 * The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
 *
 * @example
 * ### Basic usage with default pagination
 *
 * ```tsx
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
 * subject: 'user_123',
 * pageSize: 10,
 * initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * const [searchValue, setSearchValue] = useState('');
 * const debouncedSearch = useDebounce(searchValue, 500);
 *
 * const { data, isLoading } = useApiKeys({
 * const { data, isLoading } = useAPIKeys({
 * subject: 'user_123',
 * query: debouncedSearch.trim(),
 * pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * ### Infinite scroll
 *
 * ```tsx
 * const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
 * const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
 * subject: 'user_123',
 * infinite: true,
 * });
 * ```
 */
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
 useAssertWrappedByClerkProvider('useApiKeys');

 const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 subject: '',
 query: '',
 enabled: true,
 } as UseApiKeysParams);
 } as UseAPIKeysParams);

 const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 type: 'apiKeys',
 subject: safeValues.subject || '',
 },
 ) as UseApiKeysReturn<T>;
 ) as UseAPIKeysReturn<T>;
}

4 changes: 2 additions & 2 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
 * @param targetNode - Target to mount the APIKeys component.
 * @param props - Configuration parameters.
 */
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

 /**
 * This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
 *
 * @param targetNode - Target node to unmount the ApiKeys component from.
 */
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

 /**
 * Mounts a OAuth consent component at the target element.
Expand Down

0
...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down

0
...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx

View file


Open in desktop


File renamed without changes.


0
...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


0
...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down

0
packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
 const { organization } = useOrganization();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
 default: module.OrganizationAPIKeysPage,
 })),
);
Expand Down

2 changes: 1 addition & 1 deletion
...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
 const { user } = useUser();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
 import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
 import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
 default: module.APIKeysPage,
 })),
);
Expand Down

0
...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/ui/src/contexts/components/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/lazyModules/components.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
 import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
 PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
 SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
 OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(ui): Cherry pick APIKeys naming changes#7237

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

wobsoriano
merged 2 commits into

from

Nov 17, 2025
 Merged


chore(ui): Cherry pick APIKeys naming changes
#7237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81ffea9

chore: Cherry pick APIKeys naming changes


wobsoriano Nov 17, 2025
204cd4a

import fix


wobsoriano Nov 17, 2025

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: 1 addition & 1 deletion
packages/clerk-js/sandbox/app.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
 Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
 },
 '/api-keys': () => {
 Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
 Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
 },
 '/oauth-consent': () => {
 const searchParams = new URLSearchParams(window.location.search);
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
 * @param targetNode Target to mount the APIKeys component.
 * @param props Configuration parameters.
 */
 public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

 if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
 *
 * @param targetNode Target node to unmount the ApiKeys component from.
 */
 public unmountApiKeys = (node: HTMLDivElement) => {
 public unmountAPIKeys = (node: HTMLDivElement) => {
 void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
 };

Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
 {clerk.loaded && (
 <ClerkHostRenderer
 component={component}
 mount={clerk.mountApiKeys}
 unmount={clerk.unmountApiKeys}
 mount={clerk.mountAPIKeys}
 unmount={clerk.unmountAPIKeys}
 updateProps={(clerk as any).__unstable__updateProps}
 props={props}
 rootProps={rendererRootProps}
Expand Down

18 changes: 9 additions & 9 deletions
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
 private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
 private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
 private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
 private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 clerkjs.mountPricingTable(node, props);
 });

 this.premountApiKeysNodes.forEach((props, node) => {
 clerkjs.mountApiKeys(node, props);
 this.premountAPIKeysNode.forEach((props, node) => {
 clerkjs.mountAPIKeys(node, props);
 });

 this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 }
 };

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.mountApiKeys(node, props);
 this.clerkjs.mountAPIKeys(node, props);
 } else {
 this.premountApiKeysNodes.set(node, props);
 this.premountAPIKeysNode.set(node, props);
 }
 };

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.unmountApiKeys(node);
 this.clerkjs.unmountAPIKeys(node);
 } else {
 this.premountApiKeysNodes.delete(node);
 this.premountAPIKeysNode.delete(node);
 }
 };

Expand Down

18 changes: 9 additions & 9 deletions
packages/shared/src/react/hooks/useAPIKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @interface
 */
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
 GetAPIKeysParams & {
 /**
 * If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
 * @interface
 */
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
 APIKeyResource,
 T extends { infinite: true } ? true : false
>;

/**
 * The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
 * The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
 *
 * @example
 * ### Basic usage with default pagination
 *
 * ```tsx
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
 * subject: 'user_123',
 * pageSize: 10,
 * initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * const [searchValue, setSearchValue] = useState('');
 * const debouncedSearch = useDebounce(searchValue, 500);
 *
 * const { data, isLoading } = useApiKeys({
 * const { data, isLoading } = useAPIKeys({
 * subject: 'user_123',
 * query: debouncedSearch.trim(),
 * pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * ### Infinite scroll
 *
 * ```tsx
 * const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
 * const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
 * subject: 'user_123',
 * infinite: true,
 * });
 * ```
 */
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
 useAssertWrappedByClerkProvider('useApiKeys');

 const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 subject: '',
 query: '',
 enabled: true,
 } as UseApiKeysParams);
 } as UseAPIKeysParams);

 const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 type: 'apiKeys',
 subject: safeValues.subject || '',
 },
 ) as UseApiKeysReturn<T>;
 ) as UseAPIKeysReturn<T>;
}

4 changes: 2 additions & 2 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
 * @param targetNode - Target to mount the APIKeys component.
 * @param props - Configuration parameters.
 */
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

 /**
 * This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
 *
 * @param targetNode - Target node to unmount the ApiKeys component from.
 */
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

 /**
 * Mounts a OAuth consent component at the target element.
Expand Down

0
...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down

0
...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx

View file


Open in desktop


File renamed without changes.


0
...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


0
...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down

0
packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
 const { organization } = useOrganization();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
 default: module.OrganizationAPIKeysPage,
 })),
);
Expand Down

2 changes: 1 addition & 1 deletion
...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
 const { user } = useUser();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
 import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
 import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
 default: module.APIKeysPage,
 })),
);
Expand Down

0
...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/ui/src/contexts/components/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/lazyModules/components.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
 import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
 PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
 SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
 OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading

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

Skip to content
chore(ui): Cherry pick APIKeys naming changes#7237

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

wobsoriano
merged 2 commits into

from

Nov 17, 2025
 Merged


chore(ui): Cherry pick APIKeys naming changes
#7237
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81ffea9

chore: Cherry pick APIKeys naming changes


wobsoriano Nov 17, 2025
204cd4a

import fix


wobsoriano Nov 17, 2025

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: 1 addition & 1 deletion
packages/clerk-js/sandbox/app.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -325,7 +325,7 @@ void (async () => {
 Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
 },
 '/api-keys': () => {
 Clerk.mountApiKeys(app, componentControls.apiKeys.getProps() ?? {});
 Clerk.mountAPIKeys(app, componentControls.apiKeys.getProps() ?? {});
 },
 '/oauth-consent': () => {
 const searchParams = new URLSearchParams(window.location.search);
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,7 +1204,7 @@ export class Clerk implements ClerkInterface {
 * @param targetNode Target to mount the APIKeys component.
 * @param props Configuration parameters.
 */
 public mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 public mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps) => {
 logger.warnOnce('Clerk: <APIKeys /> component is in early access and not yet recommended for production use.');

 if (disabledAllAPIKeysFeatures(this, this.environment)) {
Expand DownExpand Up@@ -1258,7 +1258,7 @@ export class Clerk implements ClerkInterface {
 *
 * @param targetNode Target node to unmount the ApiKeys component from.
 */
 public unmountApiKeys = (node: HTMLDivElement) => {
 public unmountAPIKeys = (node: HTMLDivElement) => {
 void this.#clerkUi?.then(ui => ui.ensureMounted()).then(controls => controls.unmountComponent({ node }));
 };

Expand Down

4 changes: 2 additions & 2 deletions
packages/react/src/components/uiComponents.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -628,8 +628,8 @@ export const APIKeys = withClerk(
 {clerk.loaded && (
 <ClerkHostRenderer
 component={component}
 mount={clerk.mountApiKeys}
 unmount={clerk.unmountApiKeys}
 mount={clerk.mountAPIKeys}
 unmount={clerk.unmountAPIKeys}
 updateProps={(clerk as any).__unstable__updateProps}
 props={props}
 rootProps={rendererRootProps}
Expand Down

18 changes: 9 additions & 9 deletions
packages/react/src/isomorphicClerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 private premountMethodCalls = new Map<MethodName<BrowserClerk>, MethodCallback>();
 private premountWaitlistNodes = new Map<HTMLDivElement, WaitlistProps | undefined>();
 private premountPricingTableNodes = new Map<HTMLDivElement, PricingTableProps | undefined>();
 private premountApiKeysNodes = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountAPIKeysNode = new Map<HTMLDivElement, APIKeysProps | undefined>();
 private premountOAuthConsentNodes = new Map<HTMLDivElement, __internal_OAuthConsentProps | undefined>();
 private premountTaskChooseOrganizationNodes = new Map<HTMLDivElement, TaskChooseOrganizationProps | undefined>();

Expand DownExpand Up@@ -661,8 +661,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 clerkjs.mountPricingTable(node, props);
 });

 this.premountApiKeysNodes.forEach((props, node) => {
 clerkjs.mountApiKeys(node, props);
 this.premountAPIKeysNode.forEach((props, node) => {
 clerkjs.mountAPIKeys(node, props);
 });

 this.premountOAuthConsentNodes.forEach((props, node) => {
Expand DownExpand Up@@ -1151,19 +1151,19 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
 }
 };

mountApiKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
mountAPIKeys = (node: HTMLDivElement, props?: APIKeysProps): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.mountApiKeys(node, props);
 this.clerkjs.mountAPIKeys(node, props);
 } else {
 this.premountApiKeysNodes.set(node, props);
 this.premountAPIKeysNode.set(node, props);
 }
 };

unmountApiKeys = (node: HTMLDivElement): void => {
unmountAPIKeys = (node: HTMLDivElement): void => {
 if (this.clerkjs && this.loaded) {
 this.clerkjs.unmountApiKeys(node);
 this.clerkjs.unmountAPIKeys(node);
 } else {
 this.premountApiKeysNodes.delete(node);
 this.premountAPIKeysNode.delete(node);
 }
 };

Expand Down

18 changes: 9 additions & 9 deletions
packages/shared/src/react/hooks/useAPIKeys.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @interface
 */
export type UseApiKeysParams = PaginatedHookConfig<
export type UseAPIKeysParams = PaginatedHookConfig<
 GetAPIKeysParams & {
 /**
 * If `true`, a request will be triggered when the hook is mounted.
Expand All@@ -23,19 +23,19 @@ export type UseApiKeysParams = PaginatedHookConfig<
/**
 * @interface
 */
export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
export type UseAPIKeysReturn<T extends UseAPIKeysParams> = PaginatedResources<
 APIKeyResource,
 T extends { infinite: true } ? true : false
>;

/**
 * The `useApiKeys()` hook provides access to paginated API keys for the current user or organization.
 * The `useAPIKeys()` hook provides access to paginated API keys for the current user or organization.
 *
 * @example
 * ### Basic usage with default pagination
 *
 * ```tsx
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useApiKeys({
 * const { data, isLoading, page, pageCount, fetchNext, fetchPrevious } = useAPIKeys({
 * subject: 'user_123',
 * pageSize: 10,
 * initialPage: 1,
Expand All@@ -49,7 +49,7 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * const [searchValue, setSearchValue] = useState('');
 * const debouncedSearch = useDebounce(searchValue, 500);
 *
 * const { data, isLoading } = useApiKeys({
 * const { data, isLoading } = useAPIKeys({
 * subject: 'user_123',
 * query: debouncedSearch.trim(),
 * pageSize: 10,
Expand All@@ -60,13 +60,13 @@ export type UseApiKeysReturn<T extends UseApiKeysParams> = PaginatedResources<
 * ### Infinite scroll
 *
 * ```tsx
 * const { data, isLoading, fetchNext, hasNextPage } = useApiKeys({
 * const { data, isLoading, fetchNext, hasNextPage } = useAPIKeys({
 * subject: 'user_123',
 * infinite: true,
 * });
 * ```
 */
export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysReturn<T> {
export function useApiKeys<T extends UseAPIKeysParams>(params?: T): UseAPIKeysReturn<T> {
 useAssertWrappedByClerkProvider('useApiKeys');

 const safeValues = useWithSafeValues(params, {
Expand All@@ -77,7 +77,7 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 subject: '',
 query: '',
 enabled: true,
 } as UseApiKeysParams);
 } as UseAPIKeysParams);

 const clerk = useClerkInstanceContext();

Expand All@@ -104,5 +104,5 @@ export function useApiKeys<T extends UseApiKeysParams>(params?: T): UseApiKeysRe
 type: 'apiKeys',
 subject: safeValues.subject || '',
 },
 ) as UseApiKeysReturn<T>;
 ) as UseAPIKeysReturn<T>;
}

4 changes: 2 additions & 2 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -585,7 +585,7 @@ export interface Clerk {
 * @param targetNode - Target to mount the APIKeys component.
 * @param props - Configuration parameters.
 */
mountApiKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;
mountAPIKeys: (targetNode: HTMLDivElement, props?: APIKeysProps) => void;

 /**
 * This API is in early access and may change in future releases.
Expand All@@ -597,7 +597,7 @@ export interface Clerk {
 *
 * @param targetNode - Target node to unmount the ApiKeys component from.
 */
unmountApiKeys: (targetNode: HTMLDivElement) => void;
unmountAPIKeys: (targetNode: HTMLDivElement) => void;

 /**
 * Mounts a OAuth consent component at the target element.
Expand Down

0
...ui/src/components/ApiKeys/APIKeyModal.tsx → ...ui/src/components/APIKeys/APIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
...ges/ui/src/components/ApiKeys/ApiKeys.tsx → ...ges/ui/src/components/APIKeys/APIKeys.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,8 @@ import { MagnifyingGlass } from '@/ui/icons';
import { mqu } from '@/ui/styledSystem';

import { APIKeysTable } from './ApiKeysTable';
import type { OnCreateParams } from './CreateApiKeyForm';
import { CreateAPIKeyForm } from './CreateApiKeyForm';
import type { OnCreateParams } from './CreateAPIKeyForm';
import { CreateAPIKeyForm } from './CreateAPIKeyForm';
import { useAPIKeysPagination } from './utils';

type APIKeysPageProps = {
Expand Down

0
...i/src/components/ApiKeys/ApiKeysTable.tsx → ...i/src/components/APIKeys/ApiKeysTable.tsx

View file


Open in desktop


File renamed without changes.


0
...rc/components/ApiKeys/CopyAPIKeyModal.tsx → ...rc/components/APIKeys/CopyAPIKeyModal.tsx

View file


Open in desktop


File renamed without changes.


0
...c/components/ApiKeys/CreateApiKeyForm.tsx → ...c/components/APIKeys/CreateAPIKeyForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ApiKeys/RevokeAPIKeyConfirmationModal.tsx → ...APIKeys/RevokeAPIKeyConfirmationModal.tsx

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...onents/ApiKeys/__tests__/ApiKeys.spec.tsx → ...onents/APIKeys/__tests__/APIKeys.spec.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, waitFor } from '@/test/utils';

import { APIKeys } from '../ApiKeys';
import { APIKeys } from '../APIKeys';

const { createFixtures } = bindCreateFixtures('APIKeys');

Expand Down

0
packages/ui/src/components/ApiKeys/utils.ts → packages/ui/src/components/APIKeys/utils.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...zationProfile/OrganizationApiKeysPage.tsx → ...zationProfile/OrganizationAPIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage } from '../ApiKeys/ApiKeys';
import { APIKeysPage } from '../APIKeys/APIKeys';

export const OrganizationAPIKeysPage = () => {
 const { organization } = useOrganization();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const OrganizationBillingPage = lazy(() =>
);

const OrganizationAPIKeysPage = lazy(() =>
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationApiKeysPage').then(module => ({
 import(/* webpackChunkName: "op-api-keys-page"*/ './OrganizationAPIKeysPage').then(module => ({
 default: module.OrganizationAPIKeysPage,
 })),
);
Expand Down

2 changes: 1 addition & 1 deletion
...rc/components/UserProfile/ApiKeysPage.tsx → ...rc/components/UserProfile/APIKeysPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Col, descriptors, localizationKeys } from '@/ui/customizables';
import { Header } from '@/ui/elements/Header';
import { useUnsafeNavbarContext } from '@/ui/elements/Navbar';

import { APIKeysPage as APIKeysPageInternal } from '../ApiKeys/ApiKeys';
import { APIKeysPage as APIKeysPageInternal } from '../APIKeys/APIKeys';

export const APIKeysPage = () => {
 const { user } = useUser();
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const BillingPage = lazy(() =>
);

const APIKeysPage = lazy(() =>
 import(/* webpackChunkName: "up-api-keys-page"*/ './ApiKeysPage').then(module => ({
 import(/* webpackChunkName: "up-api-keys-page"*/ './APIKeysPage').then(module => ({
 default: module.APIKeysPage,
 })),
);
Expand Down

0
...ges/ui/src/contexts/components/ApiKeys.ts → ...ges/ui/src/contexts/components/APIKeys.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/ui/src/contexts/components/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
export * from './ApiKeys';
export * from './APIKeys';
export * from './Checkout';
export * from './CreateOrganization';
export * from './GoogleOneTap';
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/src/lazyModules/components.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ const componentImportPaths = {
 import(/* webpackChunkName: "taskChooseOrganization" */ '../components/SessionTasks/tasks/TaskChooseOrganization'),
 PlanDetails: () => import(/* webpackChunkName: "planDetails" */ '../components/Plans/PlanDetails'),
 SubscriptionDetails: () => import(/* webpackChunkName: "subscriptionDetails" */ '../components/SubscriptionDetails'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/ApiKeys/ApiKeys'),
 APIKeys: () => import(/* webpackChunkName: "apiKeys" */ '../components/APIKeys/APIKeys'),
 OAuthConsent: () => import(/* webpackChunkName: "oauthConsent" */ '../components/OAuthConsent/OAuthConsent'),
} as const;

Expand Down
Loading