Skip to content

Commit 453695c

Browse files
committed
Merge branch 'main' into feat/signal-handshake-nonce-support-oauth
2 parents 1d60de9 + 5491491 commit 453695c

File tree

168 files changed

+4028
-596
lines changed

Some content is hidden

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

168 files changed

+4028
-596
lines changed

.changeset/bright-wombats-invite.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/full-bushes-heal.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/types': minor
3+
---
4+
5+
Add `onClose` to `__internal_CheckoutProps`.

.changeset/good-wasps-find.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/little-cases-knock.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/long-bananas-agree.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+
Bug fix: Call `setActive` after closing Checkout to ensure RSCs re-render with the new auth context.

.changeset/mighty-forks-joke.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
'@clerk/types': patch
4+
---
5+
6+
Add `drawerRoot` descriptor and adjust z-index approach.

.changeset/ready-places-arrive.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/localizations': minor
3+
'@clerk/clerk-js': minor
4+
'@clerk/types': minor
5+
---
6+
7+
Replaces strings with localizations throughout billing components.

.changeset/stupid-gifts-juggle.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
---
2-
import { PricingTable } from "@clerk/astro/components";
3-
import Layout from "../layouts/Layout.astro";
2+
import { PricingTable } from '@clerk/astro/components';
3+
import Layout from '../layouts/Layout.astro';
4+
5+
const newSubscriptionRedirectUrl = Astro.url.searchParams.get('newSubscriptionRedirectUrl');
46
---
57

6-
<Layout title="Pricing Table">
7-
<div class="w-full flex justify-center">
8-
<PricingTable />
8+
<Layout title='Pricing Table'>
9+
<div class='w-full flex justify-center'>
10+
<PricingTable newSubscriptionRedirectUrl={newSubscriptionRedirectUrl} />
911
</div>
1012
</Layout>
Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
1-
import { PricingTable } from '@clerk/nextjs';
1+
import { PricingTable, Protect } from '@clerk/nextjs';
22

3-
export default function PricingTablePage() {
4-
return <PricingTable />;
3+
export default async function PricingTablePage({
4+
searchParams,
5+
}: {
6+
searchParams: Promise<{ newSubscriptionRedirectUrl: string }>;
7+
}) {
8+
const newSubscriptionRedirectUrl = (await searchParams).newSubscriptionRedirectUrl;
9+
return (
10+
<>
11+
<Protect plan='free_user'>
12+
<p>user in free</p>
13+
</Protect>
14+
<Protect plan='pro'>
15+
<p>user in pro</p>
16+
</Protect>
17+
<Protect plan='plus'>
18+
<p>user in plus</p>
19+
</Protect>
20+
<PricingTable newSubscriptionRedirectUrl={newSubscriptionRedirectUrl} />
21+
</>
22+
);
523
}

0 commit comments

Comments
 (0)