Skip to content

Elef/test commerce 2 #6249

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.

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

Draft
wants to merge 49 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 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
55e340c
chore(clerk-js, shared): Expose `useCheckout` as experimental
panteliselef Jun 24, 2025
f000508
wip nested useCheckout
panteliselef Jun 24, 2025
1689aac
wip singleton checkout
panteliselef Jun 24, 2025
a1cea14
remove singleton
panteliselef Jun 25, 2025
f46e630
flatten properties
panteliselef Jun 25, 2025
ffbbd05
remove duplicate code from mutation methods
panteliselef Jun 25, 2025
6d6d527
wip
panteliselef Jun 25, 2025
87d3e6a
derive state in manager
panteliselef Jun 25, 2025
752a244
introduce CheckoutProvider
panteliselef Jun 25, 2025
24a22f0
refactor subscribe of useSyncExternalStore
panteliselef Jun 25, 2025
f3e2c79
create vanilla js api
panteliselef Jun 26, 2025
17e54ed
export useCheckout to nextjs
panteliselef Jun 26, 2025
2e1a850
fix isomorphicClerk.ts
panteliselef Jun 26, 2025
e1ed2c7
track inflight requests
panteliselef Jun 26, 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
ba5f4bc
Merge branch 'refs/heads/main' into elef/com-960-useCheckout
panteliselef Jun 27, 2025
6b275b5
expose `getState()` from useCheckout
panteliselef Jun 27, 2025
f563d05
mark checkout as experimental and cleanup
panteliselef Jun 27, 2025
078e5db
add unit tests for manager
panteliselef Jun 27, 2025
61fe81d
experimental provider
panteliselef Jun 27, 2025
ec9ea1c
introduce `ClerkAPIResponseError` in @clerk/types
panteliselef Jun 27, 2025
907d149
handle public types
panteliselef Jun 27, 2025
33e17b3
Merge branch 'main' into elef/com-960-useCheckout
panteliselef Jun 27, 2025
f501d70
update snapshot
panteliselef Jun 27, 2025
4d08e8e
wip store
panteliselef Jun 27, 2025
d525dcf
Merge branch 'elef/com-960-useCheckout' into elef/test-commerce-2
panteliselef Jul 3, 2025
4f361c4
Revert "wip store"
panteliselef Jul 3, 2025
ec4e0cc
Merge branch 'elef/com-960-dx-guide-introduce-checkout-utilities' int…
panteliselef Jul 3, 2025
c61fb72
set loader never
panteliselef Jul 3, 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.
9 changes: 9 additions & 0 deletions .changeset/stale-pillows-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@clerk/clerk-js': minor
'@clerk/nextjs': minor
'@clerk/shared': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
---

wip
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.7KB" },
{ "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?
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
21 changes: 21 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import {
import { addClerkPrefix, isAbsoluteUrl, stripScheme } from '@clerk/shared/url';
import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__experimental_CheckoutInstance,
__experimental_CheckoutOptions,
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
Expand Down Expand Up @@ -136,6 +138,7 @@ import type { FapiClient, FapiRequestCallback } from './fapiClient';
import { createFapiClient } from './fapiClient';
import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { createCheckoutInstance } from './modules/checkout/instance';
import { CommerceBilling } from './modules/commerce';
import {
BaseResource,
Expand Down Expand Up @@ -195,6 +198,7 @@ export class Clerk implements ClerkInterface {
};
private static _billing: CommerceBillingNamespace;
private static _apiKeys: APIKeysNamespace;
private _checkout: ClerkInterface['__experimental_checkout'] | undefined;

public client: ClientResource | undefined;
public session: SignedInSessionResource | null | undefined;
Expand Down Expand Up @@ -337,6 +341,13 @@ export class Clerk implements ClerkInterface {
return Clerk._apiKeys;
}

__experimental_checkout(options: __experimental_CheckoutOptions): __experimental_CheckoutInstance {
if (!this._checkout) {
this._checkout = params => createCheckoutInstance(this, params);
}
return this._checkout(options);
}

public __internal_getOption<K extends keyof ClerkOptions>(key: K): ClerkOptions[K] {
return this.#options[key];
}
Expand Down Expand Up @@ -645,6 +656,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
Loading