Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3c59cf7
chore(clerk-js, shared): Create experimental PaymentElement
panteliselef Jun 23, 2025
2d6d48b
mark as experimental
panteliselef Jun 23, 2025
cc91f08
add wip changeset
panteliselef Jun 23, 2025
240cca9
Merge branch 'main' into elef/com-960-dx-guide-introduce-checkout-uti…
panteliselef Jun 27, 2025
814e37a
export all experimental apis
panteliselef Jun 26, 2025
d038eec
re implement react stripe
panteliselef Jun 26, 2025
9899b0c
cleanup stripe-react.tsx
panteliselef Jun 27, 2025
053b1e6
remove usage of `@stripe/react-stripe-js` from clerk-js
panteliselef Jun 27, 2025
dddbb09
bump bundle size of ui common
panteliselef Jun 27, 2025
f9f4edb
remove unnecessary state handling
panteliselef Jun 27, 2025
ffe90af
decrease stripe-vendors size
panteliselef Jun 27, 2025
860234e
cleanup
panteliselef Jun 27, 2025
2eb7bfb
cleanup 2
panteliselef Jun 27, 2025
a645207
add changesets
panteliselef Jun 27, 2025
ce930d0
remove wip changeset
panteliselef Jun 27, 2025
2005c75
handle export snapshot tests
panteliselef Jun 27, 2025
493e052
update `waitForStipeElements`
panteliselef Jun 27, 2025
10be49d
rest of sdks
panteliselef Jun 27, 2025
0b407f7
exclude payment elemnent from chrome-extension
panteliselef Jun 27, 2025
aee12d0
revert integration test change
panteliselef Jun 27, 2025
41401b1
Merge branch 'main' into elef/com-960-dx-guide-introduce-checkout-uti…
panteliselef Jun 27, 2025
8769c58
Merge branch 'main' into elef/com-960-dx-guide-introduce-checkout-uti…
panteliselef Jul 4, 2025
c69e771
address pr comments
panteliselef Jul 4, 2025
8ff115f
strict types for usePaymentElement
panteliselef Jul 4, 2025
3d2c595
bump
panteliselef Jul 4, 2025
02d3552
forgot to pass children
panteliselef Jul 4, 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
5 changes: 5 additions & 0 deletions .changeset/great-bees-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/chrome-extension': patch
---

Refactor re-exports from `@clerk/clerk-react`.
10 changes: 10 additions & 0 deletions .changeset/happy-kiwis-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@clerk/nextjs': minor
'@clerk/clerk-react': minor
'@clerk/shared': minor
---

Export experimental hooks and components for PaymentElement
- `__experimental_usePaymentElement`
- `__experimental_PaymentElementProvider`
- `__experimental_PaymentElement`
5 changes: 5 additions & 0 deletions .changeset/hot-seas-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Remove `@stripe/react-stripe-js` dependency and only allow loading of stripe-js via `Clerk.__internal_loadStripeJs()`.
10 changes: 10 additions & 0 deletions .changeset/many-mirrors-vanish.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@clerk/tanstack-react-start': minor
'@clerk/react-router': minor
'@clerk/remix': minor
---

Export experimental hooks and components for PaymentElement
- `__experimental_usePaymentElement`
- `__experimental_PaymentElementProvider`
- `__experimental_PaymentElement`
5 changes: 5 additions & 0 deletions .changeset/olive-streets-fall.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/types': minor
---

Add `__internal_loadStripeJs` in Clerk interface.
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "110KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "111.8KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
{ "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
Expand All @@ -21,9 +22,8 @@
{ "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.5KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.34KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "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" },
Expand Down
1 change: 0 additions & 1 deletion packages/clerk-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
"@floating-ui/react": "0.27.12",
"@floating-ui/react-dom": "^2.1.3",
"@formkit/auto-animate": "^0.8.2",
"@stripe/react-stripe-js": "3.1.1",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
Expand Down
18 changes: 7 additions & 11 deletions packages/clerk-js/rspack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const common = ({ mode, variant, disableRHC = false }) => {
* Necessary to prevent the Stripe dependencies from being bundled into
* SDKs such as Browser Extensions.
*/
// TODO: @COMMERCE: Do we still need this?
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tmilewski do we need these to be set as external ? We are now stop using react-stripe-js' and I think only stripe-js' loads remote hosted code.

Also now don't import @stripe/stripe-js directly in the AIOs, but instead we dynamically import it from Clerk.__internal_loadStripeJs()

externals: disableRHC ? ['@stripe/stripe-js', '@stripe/react-stripe-js'] : undefined,
optimization: {
splitChunks: {
Expand All @@ -100,6 +101,12 @@ const common = ({ mode, variant, disableRHC = false }) => {
name: 'coinbase-wallet-sdk',
chunks: 'all',
},
stripeVendor: {
test: /[\\/]node_modules[\\/](@stripe\/stripe-js)[\\/]/,
name: 'stripe-vendors',
chunks: 'all',
enforce: true,
},
/**
* Sign up is shared between the SignUp component and the SignIn component.
*/
Expand All @@ -108,17 +115,6 @@ const common = ({ mode, variant, disableRHC = false }) => {
name: 'signup',
test: module => !!(module.resource && module.resource.includes('/ui/components/SignUp')),
},
paymentSources: {
minChunks: 1,
name: 'paymentSources',
test: module =>
!!(
module.resource &&
(module.resource.includes('/ui/components/PaymentSources') ||
// Include `@stripe/react-stripe-js` and `@stripe/stripe-js` in the checkout chunk
module.resource.includes('/node_modules/@stripe'))
),
},
common: {
minChunks: 1,
name: 'ui-common',
Expand Down
10 changes: 10 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,16 @@ export class Clerk implements ClerkInterface {
.then(controls => controls.closeModal('blankCaptcha'));
};

public __internal_loadStripeJs = async () => {
if (__BUILD_DISABLE_RHC__) {
clerkUnsupportedEnvironmentWarning('Stripe');
return { loadStripe: () => Promise.resolve(null) };
}

const { loadStripe } = await import('@stripe/stripe-js');
return loadStripe;
};

public openSignUp = (props?: SignUpProps): void => {
this.assertComponentsReady(this.#componentControls);
if (sessionExistsAndSingleSessionModeEnabled(this, this.environment)) {
Expand Down
14 changes: 3 additions & 11 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import type {
CommercePaymentSourceResource,
ConfirmCheckoutParams,
} from '@clerk/types';
import type { SetupIntent } from '@stripe/stripe-js';
import { useMemo, useState } from 'react';

import { Card } from '@/ui/elements/Card';
Expand Down Expand Up @@ -146,25 +145,18 @@ const useCheckoutMutations = () => {
}
};

const payWithExistingPaymentSource = async (e: React.FormEvent<HTMLFormElement>) => {
const payWithExistingPaymentSource = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();

const data = new FormData(e.currentTarget);
const paymentSourceId = data.get('payment_source_id') as string;

await confirmCheckout({
return confirmCheckout({
paymentSourceId,
...(subscriberType === 'org' ? { orgId: organization?.id } : {}),
});
};

const addPaymentSourceAndPay = async (ctx: { stripeSetupIntent?: SetupIntent }) => {
await confirmCheckout({
gateway: 'stripe',
paymentToken: ctx.stripeSetupIntent?.payment_method as string,
...(subscriberType === 'org' ? { orgId: organization?.id } : {}),
});
};
const addPaymentSourceAndPay = (ctx: { gateway: 'stripe'; paymentToken: string }) => confirmCheckout(ctx);

const payWithTestCard = async () => {
card.setLoading();
Expand Down
Loading
Loading