chore(clerk-js,types): Rename commerce files to billing#6813

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
panteliselef merged 3 commits into from
Sep 19, 2025
Merged

chore(clerk-js,types): Rename commerce files to billing #6813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aa9210
chore(clerk-js,types): Rename commerce files to billing
panteliselef Sep 19, 2025
9aa2f3c
patch import paths
panteliselef Sep 19, 2025
6c5e6a4
fix lint
panteliselef Sep 19, 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: 2 additions & 0 deletions .changeset/all-papers-call.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
BaseResource,
Client,
Expand Down
2 changes: 1 addition & 1 deletion ...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';
0 .../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts
View file
Open in desktop
File renamed without changes.
0 ...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down
0 ...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts
View file
Open in desktop
File renamed without changes.
0 ...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts
View file
Open in desktop
File renamed without changes.
0 ...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down
0 ...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts
View file
Open in desktop
File renamed without changes.
0 ...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts
View file
Open in desktop
File renamed without changes.
0 ...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/clerk-js/src/core/resources/Organization.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/core/resources/User.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
BaseResource,
Expand Down
14 changes: 7 additions & 7 deletions packages/clerk-js/src/core/resources/internal.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down
6 changes: 1 addition & 5 deletions packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
};
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
if ('credit' in data) {
totals.credit = billingMoneyAmountFromJSON(data.credit);
}
if (hasPastDue(data)) {
if ('past_due' in data) {
totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/utils/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down
11 changes: 4 additions & 7 deletions ...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
* @internal
*/
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
hookName: string;
resourceType: string;
useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
*
* @internal
*/
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
hookName,
resourceType,
useFetcher,
options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
for?: ForPayerType;
};

return function useCommerceHook<T extends HookParams>(
return function useBillingHook<T extends HookParams>(
params?: T,
): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
return result;
};
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/usePaymentAttempts.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
* @internal
*/
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
hookName: 'usePaymentAttempts',
resourceType: 'billing-payment-attempts',
useFetcher: () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/usePaymentMethods.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
* @internal
*/
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
hookName: 'usePaymentMethods',
resourceType: 'commerce-payment-methods',
useFetcher: resource => {
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/usePlans.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
* @internal
*/
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
hookName: 'usePlans',
resourceType: 'billing-plans',
useFetcher: _for => {
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/react/hooks/useStatements.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
* @internal
*/
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
hookName: 'useStatements',
resourceType: 'billing-statements',
useFetcher: () => {
Expand Down
0 packages/types/src/commerce.ts → packages/types/src/billing.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
UserVerificationTheme,
WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
BillingCheckoutResource,
BillingNamespace,
BillingPlanResource,
BillingSubscriptionPlanPeriod,
ConfirmCheckoutParams,
ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/json.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
BillingStatementStatus,
BillingSubscriptionPlanPeriod,
BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/organization.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/user.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
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(clerk-js,types): Rename commerce files to billing#6813

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

panteliselef
merged 3 commits into

from

Sep 19, 2025
 Merged


chore(clerk-js,types): Rename commerce files to billing
#6813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3aa9210

chore(clerk-js,types): Rename commerce files to billing


panteliselef Sep 19, 2025
9aa2f3c

patch import paths


panteliselef Sep 19, 2025
6c5e6a4

fix lint


panteliselef Sep 19, 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: 2 additions & 0 deletions
.changeset/all-papers-call.md

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
 BaseResource,
 Client,
Expand Down

2 changes: 1 addition & 1 deletion
...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';

0
.../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts

View file


Open in desktop


File renamed without changes.


0
...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down

0
...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts

View file


Open in desktop


File renamed without changes.


0
...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down

0
...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts

View file


Open in desktop


File renamed without changes.


0
...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/Organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/User.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
 BaseResource,
Expand Down

14 changes: 7 additions & 7 deletions
packages/clerk-js/src/core/resources/internal.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down

6 changes: 1 addition & 5 deletions
packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
 };
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
 return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
 data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
 if ('credit' in data) {
 totals.credit = billingMoneyAmountFromJSON(data.credit);
 }
 if (hasPastDue(data)) {
 if ('past_due' in data) {
 totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
 }

Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down

11 changes: 4 additions & 7 deletions
...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @internal
 */
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
 hookName: string;
 resourceType: string;
 useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
 *
 * @internal
 */
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
 hookName,
 resourceType,
 useFetcher,
 options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
 type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
 for?: ForPayerType;
 };

 return function useCommerceHook<T extends HookParams>(
 return function useBillingHook<T extends HookParams>(
 params?: T,
 ): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
 const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
 return result;
 };
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
 hookName: 'usePaymentAttempts',
 resourceType: 'billing-payment-attempts',
 useFetcher: () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
 hookName: 'usePaymentMethods',
 resourceType: 'commerce-payment-methods',
 useFetcher: resource => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
 hookName: 'usePlans',
 resourceType: 'billing-plans',
 useFetcher: _for => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
 hookName: 'useStatements',
 resourceType: 'billing-statements',
 useFetcher: () => {
Expand Down

0
packages/types/src/commerce.ts → packages/types/src/billing.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
 UserVerificationTheme,
 WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
 BillingCheckoutResource,
 BillingNamespace,
 BillingPlanResource,
 BillingSubscriptionPlanPeriod,
 ConfirmCheckoutParams,
 ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
 BillingStatementStatus,
 BillingSubscriptionPlanPeriod,
 BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/user.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
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(clerk-js,types): Rename commerce files to billing#6813

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

panteliselef
merged 3 commits into

from

Sep 19, 2025
 Merged


chore(clerk-js,types): Rename commerce files to billing
#6813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3aa9210

chore(clerk-js,types): Rename commerce files to billing


panteliselef Sep 19, 2025
9aa2f3c

patch import paths


panteliselef Sep 19, 2025
6c5e6a4

fix lint


panteliselef Sep 19, 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: 2 additions & 0 deletions
.changeset/all-papers-call.md

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
 BaseResource,
 Client,
Expand Down

2 changes: 1 addition & 1 deletion
...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';

0
.../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts

View file


Open in desktop


File renamed without changes.


0
...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down

0
...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts

View file


Open in desktop


File renamed without changes.


0
...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down

0
...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts

View file


Open in desktop


File renamed without changes.


0
...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/Organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/User.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
 BaseResource,
Expand Down

14 changes: 7 additions & 7 deletions
packages/clerk-js/src/core/resources/internal.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down

6 changes: 1 addition & 5 deletions
packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
 };
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
 return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
 data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
 if ('credit' in data) {
 totals.credit = billingMoneyAmountFromJSON(data.credit);
 }
 if (hasPastDue(data)) {
 if ('past_due' in data) {
 totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
 }

Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down

11 changes: 4 additions & 7 deletions
...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @internal
 */
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
 hookName: string;
 resourceType: string;
 useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
 *
 * @internal
 */
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
 hookName,
 resourceType,
 useFetcher,
 options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
 type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
 for?: ForPayerType;
 };

 return function useCommerceHook<T extends HookParams>(
 return function useBillingHook<T extends HookParams>(
 params?: T,
 ): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
 const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
 return result;
 };
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
 hookName: 'usePaymentAttempts',
 resourceType: 'billing-payment-attempts',
 useFetcher: () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
 hookName: 'usePaymentMethods',
 resourceType: 'commerce-payment-methods',
 useFetcher: resource => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
 hookName: 'usePlans',
 resourceType: 'billing-plans',
 useFetcher: _for => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
 hookName: 'useStatements',
 resourceType: 'billing-statements',
 useFetcher: () => {
Expand Down

0
packages/types/src/commerce.ts → packages/types/src/billing.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
 UserVerificationTheme,
 WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
 BillingCheckoutResource,
 BillingNamespace,
 BillingPlanResource,
 BillingSubscriptionPlanPeriod,
 ConfirmCheckoutParams,
 ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
 BillingStatementStatus,
 BillingSubscriptionPlanPeriod,
 BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/user.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
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(clerk-js,types): Rename commerce files to billing#6813

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

panteliselef
merged 3 commits into

from

Sep 19, 2025
 Merged


chore(clerk-js,types): Rename commerce files to billing
#6813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3aa9210

chore(clerk-js,types): Rename commerce files to billing


panteliselef Sep 19, 2025
9aa2f3c

patch import paths


panteliselef Sep 19, 2025
6c5e6a4

fix lint


panteliselef Sep 19, 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: 2 additions & 0 deletions
.changeset/all-papers-call.md

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
 BaseResource,
 Client,
Expand Down

2 changes: 1 addition & 1 deletion
...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';

0
.../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts

View file


Open in desktop


File renamed without changes.


0
...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down

0
...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts

View file


Open in desktop


File renamed without changes.


0
...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down

0
...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts

View file


Open in desktop


File renamed without changes.


0
...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/Organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/User.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
 BaseResource,
Expand Down

14 changes: 7 additions & 7 deletions
packages/clerk-js/src/core/resources/internal.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down

6 changes: 1 addition & 5 deletions
packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
 };
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
 return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
 data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
 if ('credit' in data) {
 totals.credit = billingMoneyAmountFromJSON(data.credit);
 }
 if (hasPastDue(data)) {
 if ('past_due' in data) {
 totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
 }

Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down

11 changes: 4 additions & 7 deletions
...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @internal
 */
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
 hookName: string;
 resourceType: string;
 useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
 *
 * @internal
 */
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
 hookName,
 resourceType,
 useFetcher,
 options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
 type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
 for?: ForPayerType;
 };

 return function useCommerceHook<T extends HookParams>(
 return function useBillingHook<T extends HookParams>(
 params?: T,
 ): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
 const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
 return result;
 };
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
 hookName: 'usePaymentAttempts',
 resourceType: 'billing-payment-attempts',
 useFetcher: () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
 hookName: 'usePaymentMethods',
 resourceType: 'commerce-payment-methods',
 useFetcher: resource => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
 hookName: 'usePlans',
 resourceType: 'billing-plans',
 useFetcher: _for => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
 hookName: 'useStatements',
 resourceType: 'billing-statements',
 useFetcher: () => {
Expand Down

0
packages/types/src/commerce.ts → packages/types/src/billing.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
 UserVerificationTheme,
 WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
 BillingCheckoutResource,
 BillingNamespace,
 BillingPlanResource,
 BillingSubscriptionPlanPeriod,
 ConfirmCheckoutParams,
 ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
 BillingStatementStatus,
 BillingSubscriptionPlanPeriod,
 BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/user.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
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(clerk-js,types): Rename commerce files to billing#6813

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

panteliselef
merged 3 commits into

from

Sep 19, 2025
 Merged


chore(clerk-js,types): Rename commerce files to billing
#6813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3aa9210

chore(clerk-js,types): Rename commerce files to billing


panteliselef Sep 19, 2025
9aa2f3c

patch import paths


panteliselef Sep 19, 2025
6c5e6a4

fix lint


panteliselef Sep 19, 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: 2 additions & 0 deletions
.changeset/all-papers-call.md

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
 BaseResource,
 Client,
Expand Down

2 changes: 1 addition & 1 deletion
...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';

0
.../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts

View file


Open in desktop


File renamed without changes.


0
...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down

0
...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts

View file


Open in desktop


File renamed without changes.


0
...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down

0
...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts

View file


Open in desktop


File renamed without changes.


0
...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/Organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/User.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
 BaseResource,
Expand Down

14 changes: 7 additions & 7 deletions
packages/clerk-js/src/core/resources/internal.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down

6 changes: 1 addition & 5 deletions
packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
 };
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
 return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
 data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
 if ('credit' in data) {
 totals.credit = billingMoneyAmountFromJSON(data.credit);
 }
 if (hasPastDue(data)) {
 if ('past_due' in data) {
 totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
 }

Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down

11 changes: 4 additions & 7 deletions
...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @internal
 */
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
 hookName: string;
 resourceType: string;
 useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
 *
 * @internal
 */
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
 hookName,
 resourceType,
 useFetcher,
 options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
 type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
 for?: ForPayerType;
 };

 return function useCommerceHook<T extends HookParams>(
 return function useBillingHook<T extends HookParams>(
 params?: T,
 ): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
 const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
 return result;
 };
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
 hookName: 'usePaymentAttempts',
 resourceType: 'billing-payment-attempts',
 useFetcher: () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
 hookName: 'usePaymentMethods',
 resourceType: 'commerce-payment-methods',
 useFetcher: resource => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
 hookName: 'usePlans',
 resourceType: 'billing-plans',
 useFetcher: _for => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
 hookName: 'useStatements',
 resourceType: 'billing-statements',
 useFetcher: () => {
Expand Down

0
packages/types/src/commerce.ts → packages/types/src/billing.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
 UserVerificationTheme,
 WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
 BillingCheckoutResource,
 BillingNamespace,
 BillingPlanResource,
 BillingSubscriptionPlanPeriod,
 ConfirmCheckoutParams,
 ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
 BillingStatementStatus,
 BillingSubscriptionPlanPeriod,
 BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/user.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
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(clerk-js,types): Rename commerce files to billing#6813

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

panteliselef
merged 3 commits into

from

Sep 19, 2025
 Merged


chore(clerk-js,types): Rename commerce files to billing
#6813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3aa9210

chore(clerk-js,types): Rename commerce files to billing


panteliselef Sep 19, 2025
9aa2f3c

patch import paths


panteliselef Sep 19, 2025
6c5e6a4

fix lint


panteliselef Sep 19, 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: 2 additions & 0 deletions
.changeset/all-papers-call.md

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
 BaseResource,
 Client,
Expand Down

2 changes: 1 addition & 1 deletion
...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';

0
.../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts

View file


Open in desktop


File renamed without changes.


0
...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down

0
...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts

View file


Open in desktop


File renamed without changes.


0
...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down

0
...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts

View file


Open in desktop


File renamed without changes.


0
...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/Organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/User.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
 BaseResource,
Expand Down

14 changes: 7 additions & 7 deletions
packages/clerk-js/src/core/resources/internal.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down

6 changes: 1 addition & 5 deletions
packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
 };
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
 return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
 data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
 if ('credit' in data) {
 totals.credit = billingMoneyAmountFromJSON(data.credit);
 }
 if (hasPastDue(data)) {
 if ('past_due' in data) {
 totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
 }

Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down

11 changes: 4 additions & 7 deletions
...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @internal
 */
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
 hookName: string;
 resourceType: string;
 useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
 *
 * @internal
 */
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
 hookName,
 resourceType,
 useFetcher,
 options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
 type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
 for?: ForPayerType;
 };

 return function useCommerceHook<T extends HookParams>(
 return function useBillingHook<T extends HookParams>(
 params?: T,
 ): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
 const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
 return result;
 };
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
 hookName: 'usePaymentAttempts',
 resourceType: 'billing-payment-attempts',
 useFetcher: () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
 hookName: 'usePaymentMethods',
 resourceType: 'commerce-payment-methods',
 useFetcher: resource => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
 hookName: 'usePlans',
 resourceType: 'billing-plans',
 useFetcher: _for => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
 hookName: 'useStatements',
 resourceType: 'billing-statements',
 useFetcher: () => {
Expand Down

0
packages/types/src/commerce.ts → packages/types/src/billing.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
 UserVerificationTheme,
 WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
 BillingCheckoutResource,
 BillingNamespace,
 BillingPlanResource,
 BillingSubscriptionPlanPeriod,
 ConfirmCheckoutParams,
 ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
 BillingStatementStatus,
 BillingSubscriptionPlanPeriod,
 BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/user.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
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(clerk-js,types): Rename commerce files to billing#6813

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

panteliselef
merged 3 commits into

from

Sep 19, 2025
 Merged


chore(clerk-js,types): Rename commerce files to billing
#6813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3aa9210

chore(clerk-js,types): Rename commerce files to billing


panteliselef Sep 19, 2025
9aa2f3c

patch import paths


panteliselef Sep 19, 2025
6c5e6a4

fix lint


panteliselef Sep 19, 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: 2 additions & 0 deletions
.changeset/all-papers-call.md

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
 BaseResource,
 Client,
Expand Down

2 changes: 1 addition & 1 deletion
...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';

0
.../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts

View file


Open in desktop


File renamed without changes.


0
...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down

0
...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts

View file


Open in desktop


File renamed without changes.


0
...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down

0
...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts

View file


Open in desktop


File renamed without changes.


0
...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/Organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/User.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
 BaseResource,
Expand Down

14 changes: 7 additions & 7 deletions
packages/clerk-js/src/core/resources/internal.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down

6 changes: 1 addition & 5 deletions
packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
 };
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
 return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
 data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
 if ('credit' in data) {
 totals.credit = billingMoneyAmountFromJSON(data.credit);
 }
 if (hasPastDue(data)) {
 if ('past_due' in data) {
 totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
 }

Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down

11 changes: 4 additions & 7 deletions
...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @internal
 */
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
 hookName: string;
 resourceType: string;
 useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
 *
 * @internal
 */
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
 hookName,
 resourceType,
 useFetcher,
 options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
 type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
 for?: ForPayerType;
 };

 return function useCommerceHook<T extends HookParams>(
 return function useBillingHook<T extends HookParams>(
 params?: T,
 ): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
 const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
 return result;
 };
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
 hookName: 'usePaymentAttempts',
 resourceType: 'billing-payment-attempts',
 useFetcher: () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
 hookName: 'usePaymentMethods',
 resourceType: 'commerce-payment-methods',
 useFetcher: resource => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
 hookName: 'usePlans',
 resourceType: 'billing-plans',
 useFetcher: _for => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
 hookName: 'useStatements',
 resourceType: 'billing-statements',
 useFetcher: () => {
Expand Down

0
packages/types/src/commerce.ts → packages/types/src/billing.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
 UserVerificationTheme,
 WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
 BillingCheckoutResource,
 BillingNamespace,
 BillingPlanResource,
 BillingSubscriptionPlanPeriod,
 ConfirmCheckoutParams,
 ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
 BillingStatementStatus,
 BillingSubscriptionPlanPeriod,
 BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/user.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
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(clerk-js,types): Rename commerce files to billing#6813

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

panteliselef
merged 3 commits into

from

Sep 19, 2025
 Merged


chore(clerk-js,types): Rename commerce files to billing
#6813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3aa9210

chore(clerk-js,types): Rename commerce files to billing


panteliselef Sep 19, 2025
9aa2f3c

patch import paths


panteliselef Sep 19, 2025
6c5e6a4

fix lint


panteliselef Sep 19, 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: 2 additions & 0 deletions
.changeset/all-papers-call.md

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,8 +147,8 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Billing } from './modules/commerce';
import {
 BaseResource,
 Client,
Expand Down

2 changes: 1 addition & 1 deletion
...erk-js/src/core/modules/commerce/index.ts → ...lerk-js/src/core/modules/billing/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
export * from './CommerceBilling';
export * from './namespace';
export * from './payment-source-methods';

0
.../core/modules/commerce/CommerceBilling.ts → ...-js/src/core/modules/billing/namespace.ts

View file


Open in desktop


File renamed without changes.


0
...odules/commerce/payment-source-methods.ts → ...modules/billing/payment-source-methods.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...js/src/core/resources/CommerceCheckout.ts → ...-js/src/core/resources/BillingCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
import { unixEpochToDate } from '@/utils/date';

import { billingTotalsFromJSON } from '../../utils';
import { BillingPayer } from './CommercePayer';
import { BillingPayer } from './BillingPayer';
import { BaseResource, BillingPaymentSource, BillingPlan, isClerkAPIResponseError } from './internal';

export class BillingCheckout extends BaseResource implements BillingCheckoutResource {
Expand Down

0
...rk-js/src/core/resources/CommercePayer.ts → ...erk-js/src/core/resources/BillingPayer.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommercePayment.ts → ...k-js/src/core/resources/BillingPayment.ts

View file


Open in desktop


File renamed without changes.


0
...c/core/resources/CommercePaymentSource.ts → ...rc/core/resources/BillingPaymentSource.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...erk-js/src/core/resources/CommercePlan.ts → ...lerk-js/src/core/resources/BillingPlan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { BillingMoneyAmount, BillingPayerResourceType, BillingPlanJSON, BillingPlanResource } from '@clerk/types';

import { billingMoneyAmountFromJSON } from '@/utils/commerce';
import { billingMoneyAmountFromJSON } from '@/utils/billing';

import { BaseResource, Feature } from './internal';

Expand Down

0
...s/src/core/resources/CommerceStatement.ts → ...js/src/core/resources/BillingStatement.ts

View file


Open in desktop


File renamed without changes.


0
...rc/core/resources/CommerceSubscription.ts → ...src/core/resources/BillingSubscription.ts

View file


Open in desktop


File renamed without changes.


0
...-js/src/core/resources/CommerceFeature.ts → ...es/clerk-js/src/core/resources/Feature.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/Organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ import type {

import { convertPageToOffsetSearchParams } from '../../utils/convertPageToOffsetSearchParams';
import { unixEpochToDate } from '../../utils/date';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BaseResource, OrganizationInvitation, OrganizationMembership } from './internal';
import { OrganizationDomain } from './OrganizationDomain';
import { OrganizationMembershipRequest } from './OrganizationMembershipRequest';
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/core/resources/User.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ import { unixEpochToDate } from '../../utils/date';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
import { getFullName } from '../../utils/user';
import { eventBus, events } from '../events';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/commerce';
import { addPaymentSource, getPaymentSources, initializePaymentSource } from '../modules/billing';
import { BackupCode } from './BackupCode';
import {
 BaseResource,
Expand Down

14 changes: 7 additions & 7 deletions
packages/clerk-js/src/core/resources/internal.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,13 @@ export * from './UserSettings';
export * from './CommerceSettings';
export * from './AuthConfig';
export * from './Client';
export * from './CommerceCheckout';
export * from './CommerceFeature';
export * from './CommerceStatement';
export * from './CommercePayment';
export * from './CommercePaymentSource';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './BillingCheckout';
export * from './Feature';
export * from './BillingStatement';
export * from './BillingPayment';
export * from './BillingPaymentSource';
export * from './BillingPlan';
export * from './BillingSubscription';
export * from './DeletedObject';
export * from './DisplayConfig';
export * from './EmailAddress';
Expand Down

6 changes: 1 addition & 5 deletions
packages/clerk-js/src/utils/commerce.ts → packages/clerk-js/src/utils/billing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,6 @@ export const billingMoneyAmountFromJSON = (data: BillingMoneyAmountJSON): Billin
 };
};

const hasPastDue = (data: unknown): data is { past_due: BillingMoneyAmountJSON } => {
 return typeof data === 'object' && data !== null && 'past_due' in data;
};

export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | BillingCheckoutTotalsJSON>(
 data: T,
): T extends { total_due_now: BillingMoneyAmountJSON } ? BillingCheckoutTotals : BillingStatementTotals => {
Expand All@@ -35,7 +31,7 @@ export const billingTotalsFromJSON = <T extends BillingStatementTotalsJSON | Bil
 if ('credit' in data) {
 totals.credit = billingMoneyAmountFromJSON(data.credit);
 }
 if (hasPastDue(data)) {
 if ('past_due' in data) {
 totals.pastDue = billingMoneyAmountFromJSON(data.past_due);
 }

Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/src/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
export * from './beforeUnloadTracker';
export * from './appearance';
export * from './commerce';
export * from './billing';
export * from './completeSignUpFlow';
export * from './componentGuards';
export * from './dynamicParamParser';
Expand Down

11 changes: 4 additions & 7 deletions
...ed/src/react/hooks/createCommerceHook.tsx → ...eact/hooks/createBillingPaginatedHook.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import { usePagesOrInfinite, useWithSafeValues } from './usePagesOrInfinite';
/**
 * @internal
 */
type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions> = {
 hookName: string;
 resourceType: string;
 useFetcher: (
Expand All@@ -38,17 +38,17 @@ type CommerceHookConfig<TResource extends ClerkResource, TParams extends PagesOr
 *
 * @internal
 */
export function createCommercePaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
export function createBillingPaginatedHook<TResource extends ClerkResource, TParams extends PagesOrInfiniteOptions>({
 hookName,
 resourceType,
 useFetcher,
 options,
}: CommerceHookConfig<TResource, TParams>) {
}: BillingHookConfig<TResource, TParams>) {
 type HookParams = PaginatedHookConfig<PagesOrInfiniteOptions> & {
 for?: ForPayerType;
 };

 return function useCommerceHook<T extends HookParams>(
 return function useBillingHook<T extends HookParams>(
 params?: T,
 ): PaginatedResources<TResource, T extends { infinite: true } ? true : false> {
 const { for: _for, ...paginationParams } = params || ({} as Partial<T>);
Expand DownExpand Up@@ -110,6 +110,3 @@ export function createCommercePaginatedHook<TResource extends ClerkResource, TPa
 return result;
 };
}

// Billing alias factory for paginated hooks
export const createBillingPaginatedHook = createCommercePaginatedHook;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentResource, GetPaymentAttemptsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentAttempts = createCommercePaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
export const usePaymentAttempts = createBillingPaginatedHook<BillingPaymentResource, GetPaymentAttemptsParams>({
 hookName: 'usePaymentAttempts',
 resourceType: 'billing-payment-attempts',
 useFetcher: () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPaymentSourceResource, GetPaymentSourcesParams } from '@clerk/types';

import { useOrganizationContext, useUserContext } from '../contexts';
import { createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePaymentMethods = createCommercePaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
export const usePaymentMethods = createBillingPaginatedHook<BillingPaymentSourceResource, GetPaymentSourcesParams>({
 hookName: 'usePaymentMethods',
 resourceType: 'commerce-payment-methods',
 useFetcher: resource => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingPlanResource, GetPlansParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const usePlans = createCommercePaginatedHook<BillingPlanResource, GetPlansParams>({
export const usePlans = createBillingPaginatedHook<BillingPlanResource, GetPlansParams>({
 hookName: 'usePlans',
 resourceType: 'billing-plans',
 useFetcher: _for => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { BillingStatementResource, GetStatementsParams } from '@clerk/types';

import { useClerkInstanceContext } from '../contexts';
import { createBillingPaginatedHook as createCommercePaginatedHook } from './createCommerceHook';
import { createBillingPaginatedHook } from './createBillingPaginatedHook';

/**
 * @internal
 */
export const useStatements = createCommercePaginatedHook<BillingStatementResource, GetStatementsParams>({
export const useStatements = createBillingPaginatedHook<BillingStatementResource, GetStatementsParams>({
 hookName: 'useStatements',
 resourceType: 'billing-statements',
 useFetcher: () => {
Expand Down

0
packages/types/src/commerce.ts → packages/types/src/billing.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,15 +20,15 @@ import type {
 UserVerificationTheme,
 WaitlistTheme,
} from './appearance';
import type { ClientResource } from './client';
import type {
 BillingCheckoutResource,
 BillingNamespace,
 BillingPlanResource,
 BillingSubscriptionPlanPeriod,
 ConfirmCheckoutParams,
 ForPayerType,
} from './commerce';
} from './billing';
import type { ClientResource } from './client';
import type { CustomMenuItem } from './customMenuItems';
import type { CustomPage } from './customPages';
import type { InstanceType } from './instance';
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,9 @@ export * from './attributes';
export * from './authConfig';
export * from './authObject';
export * from './backupCode';
export * from './billing';
export * from './clerk';
export * from './client';
export * from './commerce';
export * from './commerceSettings';
export * from './customMenuItems';
export * from './customPages';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ import type {
 BillingStatementStatus,
 BillingSubscriptionPlanPeriod,
 BillingSubscriptionStatus,
} from './commerce';
} from './billing';
import type { CommerceSettingsJSON } from './commerceSettings';
import type { DisplayConfigJSON } from './displayConfig';
import type { EnterpriseProtocol, EnterpriseProvider } from './enterpriseAccount';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/organization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { OrganizationDomainResource, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationResource, OrganizationInvitationStatus } from './organizationInvitation';
import type { OrganizationCustomRoleKey, OrganizationMembershipResource } from './organizationMembership';
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/user.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { BackupCodeResource } from './backupCode';
import type { BillingPaymentSourceMethods } from './commerce';
import type { BillingPaymentSourceMethods } from './billing';
import type { DeletedObjectResource } from './deletedObject';
import type { EmailAddressResource } from './emailAddress';
import type { EnterpriseAccountResource } from './enterpriseAccount';
Expand Down
Loading