Skip to content

Commit 1e7b53e

Browse files
authored
Merge branch 'main' into jacek/rate-limit-retry-bapi
2 parents da6b998 + ee3a213 commit 1e7b53e

22 files changed

Lines changed: 500 additions & 182 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/hungry-chicken-flash.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

integration/templates/next-cache-components/src/app/api/use-cache-error-trigger/route.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1-
export default async function DynamicPage({ params }: { params: Promise<{ id: string }> }) {
1+
import { Suspense } from 'react';
2+
3+
async function DynamicContent({ params }: { params: Promise<{ id: string }> }) {
24
const { id } = await params;
5+
return <p data-testid='route-id'>{id}</p>;
6+
}
7+
8+
export default function DynamicPage({ params }: { params: Promise<{ id: string }> }) {
39
return (
410
<main>
511
<h1>Dynamic Route</h1>
6-
<p data-testid='route-id'>{id}</p>
12+
<Suspense fallback={<div>Loading...</div>}>
13+
<DynamicContent params={params} />
14+
</Suspense>
715
</main>
816
);
917
}
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import { SignIn } from '@clerk/nextjs';
2+
import { Suspense } from 'react';
23

34
export default function SignInPage() {
45
return (
56
<main>
67
<h1>Sign In</h1>
7-
<SignIn />
8+
<Suspense fallback={<div>Loading...</div>}>
9+
<SignIn />
10+
</Suspense>
811
</main>
912
);
1013
}

integration/templates/next-cache-components/src/app/use-cache-error-trigger/page.tsx

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

integration/templates/next-cache-components/src/app/use-cache-error/page.tsx

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

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,48 @@ const routes = [
6868
path: '/billing/subscription-details-btn',
6969
component: () => import('./views/billing/SubscriptionDetailsBtn.vue'),
7070
},
71+
// Composable state routes (public, for testing composable output)
72+
{
73+
name: 'AuthState',
74+
path: '/auth-state',
75+
component: () => import('./views/AuthState.vue'),
76+
},
77+
{
78+
name: 'UserState',
79+
path: '/user-state',
80+
component: () => import('./views/UserState.vue'),
81+
},
82+
{
83+
name: 'SessionState',
84+
path: '/session-state',
85+
component: () => import('./views/SessionState.vue'),
86+
},
87+
{
88+
name: 'OrgState',
89+
path: '/org-state',
90+
component: () => import('./views/OrgState.vue'),
91+
},
92+
// Component test routes
93+
{
94+
name: 'SignOut',
95+
path: '/sign-out',
96+
component: () => import('./views/SignOutPage.vue'),
97+
},
98+
{
99+
name: 'OrganizationList',
100+
path: '/org-list',
101+
component: () => import('./views/OrganizationListPage.vue'),
102+
},
103+
{
104+
name: 'CreateOrganization',
105+
path: '/create-org',
106+
component: () => import('./views/CreateOrganizationPage.vue'),
107+
},
108+
{
109+
name: 'ShowComponent',
110+
path: '/show-component',
111+
component: () => import('./views/ShowComponent.vue'),
112+
},
71113
];
72114

73115
const router = createRouter({
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<script setup lang="ts">
2+
import { useAuth } from '@clerk/vue';
3+
4+
const { isLoaded, isSignedIn, userId, sessionId, orgId, orgRole, orgSlug } = useAuth();
5+
</script>
6+
7+
<template>
8+
<div id="auth-state">
9+
<p data-auth-is-loaded>{{ isLoaded }}</p>
10+
<p data-auth-is-signed-in>{{ isSignedIn }}</p>
11+
<p data-auth-user-id>{{ userId }}</p>
12+
<p data-auth-session-id>{{ sessionId }}</p>
13+
<p data-auth-org-id>{{ orgId }}</p>
14+
<p data-auth-org-role>{{ orgRole }}</p>
15+
<p data-auth-org-slug>{{ orgSlug }}</p>
16+
</div>
17+
</template>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<script setup lang="ts">
2+
import { CreateOrganization } from '@clerk/vue';
3+
</script>
4+
5+
<template>
6+
<CreateOrganization />
7+
</template>

0 commit comments

Comments
 (0)