chore(clerk-js): Address leftover commerce TODOs#6183

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
aeliox merged 6 commits into from
Jul 1, 2025
Merged

chore(clerk-js): Address leftover commerce TODOs #6183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10bb031
chore(clerk-js): Address leftover commerce TODOs
aeliox Jun 23, 2025
0c37d58
Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…
aeliox Jun 30, 2025
b005be4
pass resource profile urls to applepay config
aeliox Jun 30, 2025
e805ab0
Merge branch 'main' into keiran/com-928
aeliox Jul 1, 2025
bfe3def
Merge branch 'main' into keiran/com-928
aeliox Jul 1, 2025
dd89e06
changeset tweak
aeliox Jul 1, 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
3 changes: 3 additions & 0 deletions .changeset/silent-zebras-refuse.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---
10 changes: 7 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
{ "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
{ "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "14KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
{ "path": "./dist/onetap*.js", "maxSize": "1KB" },
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
{ "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
{ "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
{ "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
{ "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
Comment on lines +30 to +31

@panteliselefpanteliselefJun 26, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?

@aelioxaelioxJun 30, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?

{ "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
]
}
2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui/components/Checkout/parts.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
padding: t.space.$4,
})}
>
{/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.
<EmailForm
title={localizationKeys('commerce.checkout.emailForm.title')}
subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down
24 changes: 18 additions & 6 deletions packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
})),
);

const OrganizationPlansPage = lazy(() =>
import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
default: module.OrganizationPlansPage,
})),
);

const OrganizationStatementPage = lazy(() =>
import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
default: module.OrganizationStatementPage,
})),
);

const OrganizationPaymentAttemptPage = lazy(() =>
import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
default: module.OrganizationPaymentAttemptPage,
})),
);

export const OrganizationProfileRoutes = () => {
const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
</Suspense>
</Route>
<Route path='plans'>
{/* TODO(@commerce): Should this be lazy loaded ? */}
<Suspense fallback={''}>
<OrganizationPlansPage />
</Suspense>
</Route>
<Route path='statement/:statementId'>
{/* TODO(@commerce): Should this be lazy loaded ? */}
<Suspense fallback={''}>
<OrganizationStatementPage />
</Suspense>
</Route>
<Route path='payment-attempt/:paymentAttemptId'>
{/* TODO(@commerce): Should this be lazy loaded ? */}
<Suspense fallback={''}>
<OrganizationPaymentAttemptPage />
</Suspense>
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
const elements = useElements();
const { displayConfig } = useEnvironment();
const { t } = useLocalizations();
const subscriberType = useSubscriberTypeContext();
const localizationRoot = useSubscriberTypeLocalizationRoot();

const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
const { setupIntent, error } = await stripe.confirmSetup({
elements,
confirmParams: {
return_url: '', // TODO(@COMMERCE): need to figure this out
return_url: window.location.href,
},
redirect: 'if_required',
});
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
? {
recurringPaymentRequest: {
paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
managementURL:
subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
regularBilling: {
amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
label: checkout.plan.name,
Expand Down
24 changes: 18 additions & 6 deletions packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
})),
);

const PlansPage = lazy(() =>
import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
default: module.PlansPage,
})),
);

const StatementPage = lazy(() =>
import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
default: module.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
default: module.PaymentAttemptPage,
})),
);

export const UserProfileRoutes = () => {
const { pages } = useUserProfileContext();
const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
</Suspense>
</Route>
<Route path='plans'>
{/* TODO(@commerce): Should this be lazy loaded ? */}
<Suspense fallback={''}>
<PlansPage />
</Suspense>
</Route>
<Route path='statement/:statementId'>
{/* TODO(@commerce): Should this be lazy loaded ? */}
<Suspense fallback={''}>
<StatementPage />
</Suspense>
</Route>
<Route path='payment-attempt/:paymentAttemptId'>
{/* TODO(@commerce): Should this be lazy loaded ? */}
<Suspense fallback={''}>
<PaymentAttemptPage />
</Suspense>
Expand Down
, '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): Address leftover commerce TODOs#6183

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

aeliox
merged 6 commits into

from

Jul 1, 2025
 Merged


chore(clerk-js): Address leftover commerce TODOs
#6183
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
10bb031

chore(clerk-js): Address leftover commerce TODOs


aeliox Jun 23, 2025
0c37d58

Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…


aeliox Jun 30, 2025
b005be4

pass resource profile urls to applepay config


aeliox Jun 30, 2025
e805ab0

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
bfe3def

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
dd89e06

changeset tweak


aeliox Jul 1, 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


3 changes: 3 additions & 0 deletions
.changeset/silent-zebras-refuse.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---

10 changes: 7 additions & 3 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "14KB" },
 { "path": "./dist/signup*.js", "maxSize": "8.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },

Comment on lines

+30
 to 
+31

@panteliselefpanteliselefJun 26, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?
@aelioxaelioxJun 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui/components/Checkout/parts.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
 padding: t.space.$4,
 })}
 >
 {/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.

 <EmailForm
 title={localizationKeys('commerce.checkout.emailForm.title')}
 subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
 import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
 })),
);

const OrganizationPlansPage = lazy(() =>
 import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
 default: module.OrganizationPlansPage,
 })),
);

const OrganizationStatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
 default: module.OrganizationStatementPage,
 })),
);

const OrganizationPaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
 default: module.OrganizationPaymentAttemptPage,
 })),
);

export const OrganizationProfileRoutes = () => {
 const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
 useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationStatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPaymentAttemptPage />
 </Suspense>
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const elements = useElements();
 const { displayConfig } = useEnvironment();
 const { t } = useLocalizations();
 const subscriberType = useSubscriberTypeContext();
 const localizationRoot = useSubscriberTypeLocalizationRoot();

 const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const { setupIntent, error } = await stripe.confirmSetup({
 elements,
 confirmParams: {
 return_url: '', // TODO(@COMMERCE): need to figure this out
 return_url: window.location.href,
 },
 redirect: 'if_required',
 });
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 ? {
 recurringPaymentRequest: {
 paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
 managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
 managementURL:
 subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
 regularBilling: {
 amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
 label: checkout.plan.name,
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
 })),
);

const PlansPage = lazy(() =>
 import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
 default: module.PlansPage,
 })),
);

const StatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
 default: module.StatementPage,
 })),
);

const PaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
 default: module.PaymentAttemptPage,
 })),
);

export const UserProfileRoutes = () => {
 const { pages } = useUserProfileContext();
 const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <StatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PaymentAttemptPage />
 </Suspense>
Expand Down

, '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): Address leftover commerce TODOs#6183

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

aeliox
merged 6 commits into

from

Jul 1, 2025
 Merged


chore(clerk-js): Address leftover commerce TODOs
#6183
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
10bb031

chore(clerk-js): Address leftover commerce TODOs


aeliox Jun 23, 2025
0c37d58

Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…


aeliox Jun 30, 2025
b005be4

pass resource profile urls to applepay config


aeliox Jun 30, 2025
e805ab0

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
bfe3def

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
dd89e06

changeset tweak


aeliox Jul 1, 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


3 changes: 3 additions & 0 deletions
.changeset/silent-zebras-refuse.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---

10 changes: 7 additions & 3 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "14KB" },
 { "path": "./dist/signup*.js", "maxSize": "8.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },

Comment on lines

+30
 to 
+31

@panteliselefpanteliselefJun 26, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?
@aelioxaelioxJun 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui/components/Checkout/parts.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
 padding: t.space.$4,
 })}
 >
 {/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.

 <EmailForm
 title={localizationKeys('commerce.checkout.emailForm.title')}
 subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
 import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
 })),
);

const OrganizationPlansPage = lazy(() =>
 import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
 default: module.OrganizationPlansPage,
 })),
);

const OrganizationStatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
 default: module.OrganizationStatementPage,
 })),
);

const OrganizationPaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
 default: module.OrganizationPaymentAttemptPage,
 })),
);

export const OrganizationProfileRoutes = () => {
 const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
 useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationStatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPaymentAttemptPage />
 </Suspense>
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const elements = useElements();
 const { displayConfig } = useEnvironment();
 const { t } = useLocalizations();
 const subscriberType = useSubscriberTypeContext();
 const localizationRoot = useSubscriberTypeLocalizationRoot();

 const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const { setupIntent, error } = await stripe.confirmSetup({
 elements,
 confirmParams: {
 return_url: '', // TODO(@COMMERCE): need to figure this out
 return_url: window.location.href,
 },
 redirect: 'if_required',
 });
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 ? {
 recurringPaymentRequest: {
 paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
 managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
 managementURL:
 subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
 regularBilling: {
 amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
 label: checkout.plan.name,
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
 })),
);

const PlansPage = lazy(() =>
 import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
 default: module.PlansPage,
 })),
);

const StatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
 default: module.StatementPage,
 })),
);

const PaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
 default: module.PaymentAttemptPage,
 })),
);

export const UserProfileRoutes = () => {
 const { pages } = useUserProfileContext();
 const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <StatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PaymentAttemptPage />
 </Suspense>
Expand Down

, '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): Address leftover commerce TODOs#6183

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

aeliox
merged 6 commits into

from

Jul 1, 2025
 Merged


chore(clerk-js): Address leftover commerce TODOs
#6183
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
10bb031

chore(clerk-js): Address leftover commerce TODOs


aeliox Jun 23, 2025
0c37d58

Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…


aeliox Jun 30, 2025
b005be4

pass resource profile urls to applepay config


aeliox Jun 30, 2025
e805ab0

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
bfe3def

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
dd89e06

changeset tweak


aeliox Jul 1, 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


3 changes: 3 additions & 0 deletions
.changeset/silent-zebras-refuse.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---

10 changes: 7 additions & 3 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "14KB" },
 { "path": "./dist/signup*.js", "maxSize": "8.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },

Comment on lines

+30
 to 
+31

@panteliselefpanteliselefJun 26, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?
@aelioxaelioxJun 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui/components/Checkout/parts.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
 padding: t.space.$4,
 })}
 >
 {/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.

 <EmailForm
 title={localizationKeys('commerce.checkout.emailForm.title')}
 subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
 import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
 })),
);

const OrganizationPlansPage = lazy(() =>
 import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
 default: module.OrganizationPlansPage,
 })),
);

const OrganizationStatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
 default: module.OrganizationStatementPage,
 })),
);

const OrganizationPaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
 default: module.OrganizationPaymentAttemptPage,
 })),
);

export const OrganizationProfileRoutes = () => {
 const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
 useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationStatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPaymentAttemptPage />
 </Suspense>
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const elements = useElements();
 const { displayConfig } = useEnvironment();
 const { t } = useLocalizations();
 const subscriberType = useSubscriberTypeContext();
 const localizationRoot = useSubscriberTypeLocalizationRoot();

 const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const { setupIntent, error } = await stripe.confirmSetup({
 elements,
 confirmParams: {
 return_url: '', // TODO(@COMMERCE): need to figure this out
 return_url: window.location.href,
 },
 redirect: 'if_required',
 });
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 ? {
 recurringPaymentRequest: {
 paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
 managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
 managementURL:
 subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
 regularBilling: {
 amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
 label: checkout.plan.name,
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
 })),
);

const PlansPage = lazy(() =>
 import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
 default: module.PlansPage,
 })),
);

const StatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
 default: module.StatementPage,
 })),
);

const PaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
 default: module.PaymentAttemptPage,
 })),
);

export const UserProfileRoutes = () => {
 const { pages } = useUserProfileContext();
 const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <StatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PaymentAttemptPage />
 </Suspense>
Expand Down

, '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): Address leftover commerce TODOs#6183

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

aeliox
merged 6 commits into

from

Jul 1, 2025
 Merged


chore(clerk-js): Address leftover commerce TODOs
#6183
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
10bb031

chore(clerk-js): Address leftover commerce TODOs


aeliox Jun 23, 2025
0c37d58

Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…


aeliox Jun 30, 2025
b005be4

pass resource profile urls to applepay config


aeliox Jun 30, 2025
e805ab0

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
bfe3def

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
dd89e06

changeset tweak


aeliox Jul 1, 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


3 changes: 3 additions & 0 deletions
.changeset/silent-zebras-refuse.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---

10 changes: 7 additions & 3 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "14KB" },
 { "path": "./dist/signup*.js", "maxSize": "8.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },

Comment on lines

+30
 to 
+31

@panteliselefpanteliselefJun 26, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?
@aelioxaelioxJun 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui/components/Checkout/parts.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
 padding: t.space.$4,
 })}
 >
 {/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.

 <EmailForm
 title={localizationKeys('commerce.checkout.emailForm.title')}
 subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
 import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
 })),
);

const OrganizationPlansPage = lazy(() =>
 import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
 default: module.OrganizationPlansPage,
 })),
);

const OrganizationStatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
 default: module.OrganizationStatementPage,
 })),
);

const OrganizationPaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
 default: module.OrganizationPaymentAttemptPage,
 })),
);

export const OrganizationProfileRoutes = () => {
 const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
 useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationStatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPaymentAttemptPage />
 </Suspense>
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const elements = useElements();
 const { displayConfig } = useEnvironment();
 const { t } = useLocalizations();
 const subscriberType = useSubscriberTypeContext();
 const localizationRoot = useSubscriberTypeLocalizationRoot();

 const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const { setupIntent, error } = await stripe.confirmSetup({
 elements,
 confirmParams: {
 return_url: '', // TODO(@COMMERCE): need to figure this out
 return_url: window.location.href,
 },
 redirect: 'if_required',
 });
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 ? {
 recurringPaymentRequest: {
 paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
 managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
 managementURL:
 subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
 regularBilling: {
 amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
 label: checkout.plan.name,
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
 })),
);

const PlansPage = lazy(() =>
 import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
 default: module.PlansPage,
 })),
);

const StatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
 default: module.StatementPage,
 })),
);

const PaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
 default: module.PaymentAttemptPage,
 })),
);

export const UserProfileRoutes = () => {
 const { pages } = useUserProfileContext();
 const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <StatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PaymentAttemptPage />
 </Suspense>
Expand Down

, '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): Address leftover commerce TODOs#6183

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

aeliox
merged 6 commits into

from

Jul 1, 2025
 Merged


chore(clerk-js): Address leftover commerce TODOs
#6183
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
10bb031

chore(clerk-js): Address leftover commerce TODOs


aeliox Jun 23, 2025
0c37d58

Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…


aeliox Jun 30, 2025
b005be4

pass resource profile urls to applepay config


aeliox Jun 30, 2025
e805ab0

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
bfe3def

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
dd89e06

changeset tweak


aeliox Jul 1, 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


3 changes: 3 additions & 0 deletions
.changeset/silent-zebras-refuse.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---

10 changes: 7 additions & 3 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "14KB" },
 { "path": "./dist/signup*.js", "maxSize": "8.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },

Comment on lines

+30
 to 
+31

@panteliselefpanteliselefJun 26, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?
@aelioxaelioxJun 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui/components/Checkout/parts.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
 padding: t.space.$4,
 })}
 >
 {/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.

 <EmailForm
 title={localizationKeys('commerce.checkout.emailForm.title')}
 subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
 import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
 })),
);

const OrganizationPlansPage = lazy(() =>
 import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
 default: module.OrganizationPlansPage,
 })),
);

const OrganizationStatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
 default: module.OrganizationStatementPage,
 })),
);

const OrganizationPaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
 default: module.OrganizationPaymentAttemptPage,
 })),
);

export const OrganizationProfileRoutes = () => {
 const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
 useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationStatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPaymentAttemptPage />
 </Suspense>
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const elements = useElements();
 const { displayConfig } = useEnvironment();
 const { t } = useLocalizations();
 const subscriberType = useSubscriberTypeContext();
 const localizationRoot = useSubscriberTypeLocalizationRoot();

 const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const { setupIntent, error } = await stripe.confirmSetup({
 elements,
 confirmParams: {
 return_url: '', // TODO(@COMMERCE): need to figure this out
 return_url: window.location.href,
 },
 redirect: 'if_required',
 });
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 ? {
 recurringPaymentRequest: {
 paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
 managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
 managementURL:
 subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
 regularBilling: {
 amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
 label: checkout.plan.name,
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
 })),
);

const PlansPage = lazy(() =>
 import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
 default: module.PlansPage,
 })),
);

const StatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
 default: module.StatementPage,
 })),
);

const PaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
 default: module.PaymentAttemptPage,
 })),
);

export const UserProfileRoutes = () => {
 const { pages } = useUserProfileContext();
 const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <StatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PaymentAttemptPage />
 </Suspense>
Expand Down

, '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): Address leftover commerce TODOs#6183

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

aeliox
merged 6 commits into

from

Jul 1, 2025
 Merged


chore(clerk-js): Address leftover commerce TODOs
#6183
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
10bb031

chore(clerk-js): Address leftover commerce TODOs


aeliox Jun 23, 2025
0c37d58

Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…


aeliox Jun 30, 2025
b005be4

pass resource profile urls to applepay config


aeliox Jun 30, 2025
e805ab0

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
bfe3def

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
dd89e06

changeset tweak


aeliox Jul 1, 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


3 changes: 3 additions & 0 deletions
.changeset/silent-zebras-refuse.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---

10 changes: 7 additions & 3 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "14KB" },
 { "path": "./dist/signup*.js", "maxSize": "8.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },

Comment on lines

+30
 to 
+31

@panteliselefpanteliselefJun 26, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?
@aelioxaelioxJun 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui/components/Checkout/parts.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
 padding: t.space.$4,
 })}
 >
 {/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.

 <EmailForm
 title={localizationKeys('commerce.checkout.emailForm.title')}
 subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
 import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
 })),
);

const OrganizationPlansPage = lazy(() =>
 import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
 default: module.OrganizationPlansPage,
 })),
);

const OrganizationStatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
 default: module.OrganizationStatementPage,
 })),
);

const OrganizationPaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
 default: module.OrganizationPaymentAttemptPage,
 })),
);

export const OrganizationProfileRoutes = () => {
 const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
 useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationStatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPaymentAttemptPage />
 </Suspense>
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const elements = useElements();
 const { displayConfig } = useEnvironment();
 const { t } = useLocalizations();
 const subscriberType = useSubscriberTypeContext();
 const localizationRoot = useSubscriberTypeLocalizationRoot();

 const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const { setupIntent, error } = await stripe.confirmSetup({
 elements,
 confirmParams: {
 return_url: '', // TODO(@COMMERCE): need to figure this out
 return_url: window.location.href,
 },
 redirect: 'if_required',
 });
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 ? {
 recurringPaymentRequest: {
 paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
 managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
 managementURL:
 subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
 regularBilling: {
 amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
 label: checkout.plan.name,
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
 })),
);

const PlansPage = lazy(() =>
 import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
 default: module.PlansPage,
 })),
);

const StatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
 default: module.StatementPage,
 })),
);

const PaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
 default: module.PaymentAttemptPage,
 })),
);

export const UserProfileRoutes = () => {
 const { pages } = useUserProfileContext();
 const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <StatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PaymentAttemptPage />
 </Suspense>
Expand Down

, '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): Address leftover commerce TODOs#6183

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

aeliox
merged 6 commits into

from

Jul 1, 2025
 Merged


chore(clerk-js): Address leftover commerce TODOs
#6183
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
10bb031

chore(clerk-js): Address leftover commerce TODOs


aeliox Jun 23, 2025
0c37d58

Update packages/clerk-js/src/ui/components/PaymentSources/AddPaymentS…


aeliox Jun 30, 2025
b005be4

pass resource profile urls to applepay config


aeliox Jun 30, 2025
e805ab0

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
bfe3def

Merge branch 'main' into keiran/com-928


aeliox Jul 1, 2025
dd89e06

changeset tweak


aeliox Jul 1, 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


3 changes: 3 additions & 0 deletions
.changeset/silent-zebras-refuse.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
---
'@clerk/clerk-js': patch
---

10 changes: 7 additions & 3 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,22 +9,26 @@
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "12KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "14KB" },
 { "path": "./dist/signup*.js", "maxSize": "8.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16.5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "7.3KB" },
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.5KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },

Comment on lines

+30
 to 
+31

@panteliselefpanteliselefJun 26, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason we have seperate chunks between UP and OP for plans, but not for statements and PAs ?
@aelioxaelioxJun 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only because based on what I observed, webpack seemed to handle pricing table chunks distinctly and appropriately for OP and UP, but wasn't doing the same for statement page or payment attempt page – instead just grabbing a (seemingly) random one. For example, the UserProfile would always grab up_pricing_table, but would grab op_statement_page for some reason – maybe they aren't different enough and webpack is being smart?
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui/components/Checkout/parts.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { LineItems } from '@/ui/elements/LineItems';

import { useCheckoutContext } from '../../contexts';
import { Box, descriptors, Flex, localizationKeys, useLocalizations } from '../../customizables';
// TODO(@COMMERCE): Is this causing bundle size issues ?
import { EmailForm } from '../UserProfile/EmailForm';
import { useCheckoutContextRoot } from './CheckoutPage';

Expand DownExpand Up@@ -101,7 +100,6 @@ export const AddEmailForm = () => {
 padding: t.space.$4,
 })}
 >
 {/* TODO(@COMMERCE): How does ths operate for orgs ? */}
Comment thread
aeliox marked this conversation as resolved.

 <EmailForm
 title={localizationKeys('commerce.checkout.emailForm.title')}
 subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,6 @@ import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { OrganizationGeneralPage } from './OrganizationGeneralPage';
import { OrganizationMembers } from './OrganizationMembers';
import { OrganizationPaymentAttemptPage } from './OrganizationPaymentAttemptPage';
import { OrganizationPlansPage } from './OrganizationPlansPage';
import { OrganizationStatementPage } from './OrganizationStatementPage';

const OrganizationBillingPage = lazy(() =>
 import(/* webpackChunkName: "op-billing-page"*/ './OrganizationBillingPage').then(module => ({
Expand All@@ -22,6 +19,24 @@ const OrganizationAPIKeysPage = lazy(() =>
 })),
);

const OrganizationPlansPage = lazy(() =>
 import(/* webpackChunkName: "op-plans-page"*/ './OrganizationPlansPage').then(module => ({
 default: module.OrganizationPlansPage,
 })),
);

const OrganizationStatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ './OrganizationStatementPage').then(module => ({
 default: module.OrganizationStatementPage,
 })),
);

const OrganizationPaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ './OrganizationPaymentAttemptPage').then(module => ({
 default: module.OrganizationPaymentAttemptPage,
 })),
);

export const OrganizationProfileRoutes = () => {
 const { pages, isMembersPageRoot, isGeneralPageRoot, isBillingPageRoot, isApiKeysPageRoot } =
 useOrganizationProfileContext();
Expand DownExpand Up@@ -82,19 +97,16 @@ export const OrganizationProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationStatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <OrganizationPaymentAttemptPage />
 </Suspense>
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui/components/PaymentSources/AddPaymentSource.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,6 +237,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const elements = useElements();
 const { displayConfig } = useEnvironment();
 const { t } = useLocalizations();
 const subscriberType = useSubscriberTypeContext();
 const localizationRoot = useSubscriberTypeLocalizationRoot();

 const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
Expand All@@ -251,7 +252,7 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 const { setupIntent, error } = await stripe.confirmSetup({
 elements,
 confirmParams: {
 return_url: '', // TODO(@COMMERCE): need to figure this out
 return_url: window.location.href,
 },
 redirect: 'if_required',
 });
Expand DownExpand Up@@ -295,7 +296,8 @@ const AddPaymentSourceForm = ({ children }: PropsWithChildren) => {
 ? {
 recurringPaymentRequest: {
 paymentDescription: `${t(localizationKeys(checkout.planPeriod === 'month' ? 'commerce.paymentSource.applePayDescription.monthly' : 'commerce.paymentSource.applePayDescription.annual'))}`,
 managementURL: displayConfig.homeUrl, // TODO(@COMMERCE): is this the right URL?
 managementURL:
 subscriberType === 'org' ? displayConfig.organizationProfileUrl : displayConfig.userProfileUrl,
 regularBilling: {
 amount: checkout.totals.totalDueNow?.amount || checkout.totals.grandTotal.amount,
 label: checkout.plan.name,
Expand Down

24 changes: 18 additions & 6 deletions
packages/clerk-js/src/ui/components/UserProfile/UserProfileRoutes.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,7 @@ import { CustomPageContentContainer } from '../../common/CustomPageContentContai
import { USER_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Route, Switch } from '../../router';
import { PaymentAttemptPage } from '../PaymentAttempts';
import { StatementPage } from '../Statements';
import { AccountPage } from './AccountPage';
import { PlansPage } from './PlansPage';
import { SecurityPage } from './SecurityPage';

const BillingPage = lazy(() =>
Expand All@@ -22,6 +19,24 @@ const APIKeysPage = lazy(() =>
 })),
);

const PlansPage = lazy(() =>
 import(/* webpackChunkName: "up-plans-page"*/ './PlansPage').then(module => ({
 default: module.PlansPage,
 })),
);

const StatementPage = lazy(() =>
 import(/* webpackChunkName: "statement-page"*/ '../Statements').then(module => ({
 default: module.StatementPage,
 })),
);

const PaymentAttemptPage = lazy(() =>
 import(/* webpackChunkName: "payment-attempt-page"*/ '../PaymentAttempts').then(module => ({
 default: module.PaymentAttemptPage,
 })),
);

export const UserProfileRoutes = () => {
 const { pages } = useUserProfileContext();
 const { apiKeysSettings, commerceSettings } = useEnvironment();
Expand DownExpand Up@@ -74,19 +89,16 @@ export const UserProfileRoutes = () => {
 </Suspense>
 </Route>
 <Route path='plans'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PlansPage />
 </Suspense>
 </Route>
 <Route path='statement/:statementId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <StatementPage />
 </Suspense>
 </Route>
 <Route path='payment-attempt/:paymentAttemptId'>
 {/* TODO(@commerce): Should this be lazy loaded ? */}
 <Suspense fallback={''}>
 <PaymentAttemptPage />
 </Suspense>
Expand Down