Merge branch 'main' into rob/mobile-594-expo-usesso-sessions-killed-by-lazy-client-rollout

Author: wobsoriano

.typedoc/__tests__/catch-all-replacements.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest';
+
+// @ts-expect-error — .mjs plugin has no type declarations
+import { applyCatchAllMdReplacements } from '../custom-plugin.mjs';
+
+/**
+ * Unit coverage for the `getCatchAllReplacements()` rules exercised through the
+ * exported `applyCatchAllMdReplacements()` entry point.
+ */
+describe('applyCatchAllMdReplacements', () => {
+  it('renders a single `@example` as "Example: `value`."', () => {
+    expect(applyCatchAllMdReplacements('**Example** `foo`')).toBe('Example: `foo`.');
+  });
+
+  it('joins multiple `@example` blocks with ", "', () => {
+    expect(applyCatchAllMdReplacements('**Examples** `a` `b` `c`')).toBe('Examples: `a`, `b`, `c`.');
+  });
+
+  it('does not corrupt examples that contain internal spaces', () => {
+    // Regression: splitting the captured group on ' ' rejoined each example's
+    // internal spaces with ", ", producing a spurious `,,` inside array literals.
+    const input = '**Examples** `["/orgs/:slug", "/orgs/:slug/(.*)"]` `["/orgs/:id", "/orgs/:id/(.*)"]`';
+    expect(applyCatchAllMdReplacements(input)).toBe(
+      'Examples: `["/orgs/:slug", "/orgs/:slug/(.*)"]`, `["/orgs/:id", "/orgs/:id/(.*)"]`.',
+    );
+  });
+});

.typedoc/custom-plugin.mjs

@@ -395,7 +395,9 @@ function getCatchAllReplacements() {
        */
       pattern: /\*\*Examples\*\* ((?:`[^`]+`)(?: `[^`]+`)*)/g,
       replace: (/** @type {string} */ _match, /** @type {string} */ capturedGroup) => {
-        return `Examples: ${capturedGroup.split(' ').join(', ')}.`;
+        // Match backtick-delimited examples individually; splitting on ' ' breaks examples with internal spaces.
+        const examples = capturedGroup.match(/`[^`]+`/g) ?? [];
+        return `Examples: ${examples.join(', ')}.`;
       },
     },
   ];

integration/templates/astro-node/astro.config.mjs

@@ -3,8 +3,6 @@ import node from '@astrojs/node';
 import clerk from '@clerk/astro';
 import react from '@astrojs/react';
 
-import tailwind from '@astrojs/tailwind';
-
 export default defineConfig({
   output: 'server',
   adapter: node({
@@ -19,7 +17,6 @@ export default defineConfig({
       },
     }),
     react(),
-    tailwind(),
   ],
   server: {
     port: process.env.PORT ? Number(process.env.PORT) : undefined,

integration/templates/astro-node/package.json

@@ -10,16 +10,14 @@
     "start": "astro dev --port $PORT"
   },
   "dependencies": {
-    "@astrojs/check": "^0.9.4",
-    "@astrojs/node": "^9.0.0",
-    "@astrojs/react": "^4.0.0",
-    "@astrojs/tailwind": "^5.1.3",
+    "@astrojs/check": "^0.9.9",
+    "@astrojs/node": "^11.0.0",
+    "@astrojs/react": "^6.0.0",
     "@types/react": "18.3.7",
     "@types/react-dom": "18.3.0",
-    "astro": "^5.15.9",
+    "astro": "^7.0.2",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "tailwindcss": "^3.4.17",
     "typescript": "^5.7.3"
   }
 }

integration/templates/astro-node/src/middleware.ts

@@ -1,35 +1,9 @@
-import { clerkMiddleware, createRouteMatcher } from '@clerk/astro/server';
-
-const unautorized = () =>
-  new Response(JSON.stringify({ error: 'unathorized access' }), {
-    status: 401,
-  });
-
-/**
- * 3. Support handler
- */
-const isProtectedPage = createRouteMatcher(['/user(.*)', '/discover(.*)']);
-
-const isProtectedApiRoute = createRouteMatcher(['/api/protected(.*)']);
+import { clerkMiddleware } from '@clerk/astro/server';
 
 export const onRequest = clerkMiddleware((auth, context, next) => {
   const requestURL = new URL(context.request.url);
-  if (['/sign-in', '/', '/sign-up'].includes(requestURL.pathname)) {
-    return next();
-  }
-
-  if (isProtectedApiRoute(context.request) && !auth().userId) {
-    return unautorized();
-  }
-
-  if (isProtectedPage(context.request) && !auth().userId) {
-    return auth().redirectToSignIn();
-  }
 
-  if (!auth().orgId && requestURL.pathname !== '/discover' && requestURL.pathname === '/organization') {
-    if (!auth().userId) {
-      return next();
-    }
+  if (requestURL.pathname === '/organization' && auth().userId && !auth().orgId) {
     const searchParams = new URLSearchParams({
       redirectUrl: requestURL.href,
     });

integration/templates/astro-node/src/pages/api/protected/current-org.ts

@@ -1,14 +1,13 @@
 import type { APIRoute } from 'astro';
 import { clerkClient } from '@clerk/astro/server';
 
-const empty = () => new Response(null);
-
 export const GET: APIRoute = async context => {
   const { locals } = context;
   const { userId, orgId } = locals.auth();
   if (!userId) {
-    // We are handling this at the middleware level
-    return empty();
+    return new Response(JSON.stringify({ error: 'unauthorized access' }), {
+      status: 401,
+    });
   }
 
   if (!orgId) {

integration/templates/astro-node/src/pages/api/protected/only-admin.ts

@@ -5,6 +5,12 @@ export const GET: APIRoute = async context => {
   const { locals } = context;
   const { auth } = locals;
 
+  if (!auth().userId) {
+    return new Response(JSON.stringify({ error: 'unauthorized access' }), {
+      status: 401,
+    });
+  }
+
   if (auth().has({ role: 'org:admin' })) {
     return new Response(
       JSON.stringify(

integration/templates/astro-node/src/pages/discover.astro

@@ -1,6 +1,12 @@
 ---
 import { OrganizationList } from '@clerk/astro/components';
 import Layout from '../layouts/Layout.astro';
+
+const { userId, redirectToSignIn } = Astro.locals.auth();
+
+if (!userId) {
+  return redirectToSignIn();
+}
 ---
 
 <Layout title='Welcome to Astro.'>

integration/templates/astro-node/src/pages/user.astro

@@ -2,6 +2,12 @@
 import { UserProfile } from '@clerk/astro/components';
 import Layout from '../layouts/Layout.astro';
 import StreamUser from '../components/StreamUser.astro';
+
+const { userId, redirectToSignIn } = Astro.locals.auth();
+
+if (!userId) {
+  return redirectToSignIn();
+}
 ---
 
 <Layout title='Welcome to Astro.'>