Skip to content

Commit 0d95cdc

Browse files
wobsorianowobsoriano
authored
Merge branch 'main' into fix_async_hooks_import
2 parents 3e00c87 + 7c731a4 commit 0d95cdc

File tree

56 files changed

+3930
-380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3930
-380
lines changed

‎.changeset/curly-rules-fall.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/types': patch
3+
---
4+
5+
Add notice for upcoming/possible breaking changes in commerce related APIs.

‎.changeset/every-buttons-travel.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
'@clerk/tanstack-react-start': minor
3+
'@clerk/react-router': minor
4+
'@clerk/nextjs': minor
5+
'@clerk/shared': minor
6+
'@clerk/clerk-react': minor
7+
'@clerk/remix': minor
8+
---
9+
10+
[Billing Beta]: Introduce experimental `useCheckout()` hook and `<CheckoutProvider/>`.

‎.changeset/fair-olives-wish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
---
4+
5+
Bugfix: Fixed incorrect field validation when using password authentication with email or phone number during sign-up. Optional email and phone fields now correctly display their requirement status.

‎.changeset/good-toys-serve.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/shared': patch
3+
'@clerk/types': patch
4+
---
5+
6+
Export `ClerkAPIResponseError` interface from types package.

‎.changeset/great-roses-punch.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/clerk-react': minor
4+
'@clerk/types': minor
5+
---
6+
7+
[Billing Beta]: Introduce experimental `Clerk.__experimental_checkout()` for managing the state of a checkout session.

‎.changeset/itchy-rings-spend.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/backend': patch
3+
---
4+
5+
Add `query`, `orderBy`, and `organizationId` to the `SamlConnectionListParams` type.

‎.changeset/stale-pillows-sneeze.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/nextjs': minor
4+
'@clerk/shared': minor
5+
'@clerk/clerk-react': minor
6+
'@clerk/types': minor
7+
---
8+
9+
wip

‎.changeset/tall-dolls-wish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
---
4+
5+
Navigate to tasks when switching sessions

‎.typedoc/__tests__/__snapshots__/file-structure.test.ts.snap

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
55
"types/act-claim.mdx",
66
"types/act-jwt-claim.mdx",
77
"types/active-session-resource.mdx",
8+
"types/add-payment-source-params.mdx",
9+
"types/cancel-subscription-params.mdx",
810
"types/check-authorization-fn.mdx",
911
"types/check-authorization-from-session-claims.mdx",
1012
"types/check-authorization-params-from-session-claims.mdx",
1113
"types/check-authorization-with-custom-permissions.mdx",
1214
"types/clerk-api-error.mdx",
15+
"types/clerk-api-response-error.mdx",
1316
"types/clerk-host-router.mdx",
1417
"types/clerk-jwt-claims.mdx",
1518
"types/clerk-paginated-response.mdx",
@@ -18,15 +21,61 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
1821
"types/clerk-resource.mdx",
1922
"types/clerk-status.mdx",
2023
"types/clerk.mdx",
24+
"types/commerce-billing-namespace.mdx",
25+
"types/commerce-checkout-json.mdx",
26+
"types/commerce-checkout-resource.mdx",
27+
"types/commerce-checkout-totals-json.mdx",
28+
"types/commerce-checkout-totals.mdx",
29+
"types/commerce-feature-json.mdx",
30+
"types/commerce-feature-resource.mdx",
31+
"types/commerce-initialized-payment-source-json.mdx",
32+
"types/commerce-initialized-payment-source-resource.mdx",
33+
"types/commerce-money-json.mdx",
34+
"types/commerce-money.mdx",
35+
"types/commerce-payment-charge-type.mdx",
36+
"types/commerce-payment-json.mdx",
37+
"types/commerce-payment-resource.mdx",
38+
"types/commerce-payment-source-json.mdx",
39+
"types/commerce-payment-source-methods.mdx",
40+
"types/commerce-payment-source-resource.mdx",
41+
"types/commerce-payment-source-status.mdx",
42+
"types/commerce-payment-status.mdx",
43+
"types/commerce-plan-json.mdx",
44+
"types/commerce-plan-resource.mdx",
45+
"types/commerce-product-json.mdx",
46+
"types/commerce-product-resource.mdx",
47+
"types/commerce-statement-group-json.mdx",
48+
"types/commerce-statement-group.mdx",
49+
"types/commerce-statement-json.mdx",
50+
"types/commerce-statement-resource.mdx",
51+
"types/commerce-statement-status.mdx",
52+
"types/commerce-statement-totals-json.mdx",
53+
"types/commerce-statement-totals.mdx",
54+
"types/commerce-subscriber-type.mdx",
55+
"types/commerce-subscription-json.mdx",
56+
"types/commerce-subscription-plan-period.mdx",
57+
"types/commerce-subscription-resource.mdx",
58+
"types/commerce-subscription-status.mdx",
59+
"types/confirm-checkout-params.mdx",
60+
"types/create-checkout-params.mdx",
2161
"types/create-organization-params.mdx",
2262
"types/element-object-key.mdx",
2363
"types/elements-config.mdx",
64+
"types/get-payment-attempts-params.mdx",
65+
"types/get-payment-sources-params.mdx",
66+
"types/get-plans-params.mdx",
67+
"types/get-statements-params.mdx",
68+
"types/get-subscriptions-params.mdx",
2469
"types/get-token.mdx",
2570
"types/id-selectors.mdx",
71+
"types/initialize-payment-source-params.mdx",
72+
"types/internal_checkout-props.mdx",
73+
"types/internal_plan-details-props.mdx",
2674
"types/jwt-claims.mdx",
2775
"types/jwt-header.mdx",
2876
"types/legacy-redirect-props.mdx",
2977
"types/localization-resource.mdx",
78+
"types/make-default-payment-source-params.mdx",
3079
"types/multi-domain-and-or-proxy.mdx",
3180
"types/organization-custom-role-key.mdx",
3281
"types/organization-domain-resource.mdx",
@@ -43,11 +92,13 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
4392
"types/organizations-jwt-claim.mdx",
4493
"types/override.mdx",
4594
"types/path-value.mdx",
95+
"types/payment-gateway.mdx",
4696
"types/pending-session-options.mdx",
4797
"types/pending-session-resource.mdx",
4898
"types/protect-props.mdx",
4999
"types/record-to-path.mdx",
50100
"types/redirect-options.mdx",
101+
"types/remove-payment-source-params.mdx",
51102
"types/reverification-config.mdx",
52103
"types/saml-strategy.mdx",
53104
"types/sdk-metadata.mdx",

‎integration/templates/next-app-router/src/app/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
1+
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
22
import Link from 'next/link';
33
import { ClientId } from './client-id';
44

@@ -11,7 +11,7 @@ export default function Home() {
1111
<SignedOut>SignedOut</SignedOut>
1212
<Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
1313
<SignIn
14-
path={'/'}
14+
routing='hash'
1515
signUpUrl={'/sign-up'}
1616
/>
1717
<ul>

0 commit comments

Comments
 (0)