Skip to content

Commit e389b96

Browse files
authored
Merge branch 'main' into fix/clear-fetch-cache-on-sign-out
2 parents 890c85f + ea65f20 commit e389b96

Some content is hidden

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

45 files changed

+375
-50
lines changed

.changeset/cold-parks-push.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/vue': minor
3+
---
4+
5+
Expose billing buttons as experimental

.changeset/four-mice-crash.md

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

.changeset/ninety-crews-find.md

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

.changeset/short-ravens-sell.md

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

.changeset/shy-places-grab.md

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

integration/templates/vue-vite/src/router.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,22 @@ const routes = [
4747
path: '/user',
4848
component: () => import('./views/Profile.vue'),
4949
},
50+
// Billing button routes
51+
{
52+
name: 'CheckoutBtn',
53+
path: '/billing/checkout-btn',
54+
component: () => import('./views/billing/CheckoutBtn.vue'),
55+
},
56+
{
57+
name: 'PlanDetailsBtn',
58+
path: '/billing/plan-details-btn',
59+
component: () => import('./views/billing/PlanDetailsBtn.vue'),
60+
},
61+
{
62+
name: 'SubscriptionDetailsBtn',
63+
path: '/billing/subscription-details-btn',
64+
component: () => import('./views/billing/SubscriptionDetailsBtn.vue'),
65+
},
5066
];
5167

5268
const router = createRouter({
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<template>
2+
<main>
3+
<SignedIn>
4+
<CheckoutButton
5+
planId="cplan_2wMjqdlza0hTJc4HLCoBwAiExhF"
6+
planPeriod="month"
7+
>
8+
Checkout Now
9+
</CheckoutButton>
10+
</SignedIn>
11+
</main>
12+
</template>
13+
14+
<script setup lang="ts">
15+
import { SignedIn } from '@clerk/vue';
16+
import { CheckoutButton } from '@clerk/vue/experimental';
17+
</script>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<template>
2+
<main>
3+
<PlanDetailsButton planId="cplan_2wMjqdlza0hTJc4HLCoBwAiExhF"> Plan details </PlanDetailsButton>
4+
</main>
5+
</template>
6+
7+
<script setup lang="ts">
8+
import { PlanDetailsButton } from '@clerk/vue/experimental';
9+
</script>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<template>
2+
<main>
3+
<SubscriptionDetailsButton> Subscription details </SubscriptionDetailsButton>
4+
</main>
5+
</template>
6+
7+
<script setup lang="ts">
8+
import { SubscriptionDetailsButton } from '@clerk/vue/experimental';
9+
</script>

integration/tests/pricing-table.test.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
3232
});
3333

3434
test('renders pricing details of a specific plan', async ({ page, context }) => {
35-
if (!app.name.includes('next')) {
36-
return;
37-
}
35+
test.skip(app.name.includes('astro'), 'Still working on it');
36+
3837
const u = createTestUtils({ app, page, context });
3938
await u.po.page.goToRelative('/billing/plan-details-btn');
4039

@@ -83,9 +82,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
8382
page,
8483
context,
8584
}) => {
86-
if (!app.name.includes('next')) {
87-
return;
88-
}
85+
test.skip(app.name.includes('astro'), 'Still working on it');
8986
const u = createTestUtils({ app, page, context });
9087
await u.po.signIn.goTo();
9188
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
@@ -100,9 +97,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
10097
});
10198

10299
test('when signed in, clicking checkout button open checkout drawer', async ({ page, context }) => {
103-
if (!app.name.includes('next')) {
104-
return;
105-
}
100+
test.skip(app.name.includes('astro'), 'Still working on it');
106101
const u = createTestUtils({ app, page, context });
107102
await u.po.signIn.goTo();
108103
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
@@ -137,9 +132,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
137132
});
138133

139134
test('opens subscription details drawer', async ({ page, context }) => {
140-
if (!app.name.includes('next')) {
141-
return;
142-
}
135+
test.skip(app.name.includes('astro'), 'Still working on it');
143136
const u = createTestUtils({ app, page, context });
144137
await u.po.signIn.goTo();
145138
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });

0 commit comments

Comments
 (0)