tweaks

brenelz · brenelz · commit b25579227a99 · 2025-11-09T22:27:50.000-06:00
diff --git a/examples/solid/start-clerk-basic/src/routes/__root.tsx b/examples/solid/start-clerk-basic/src/routes/__root.tsx
@@ -102,6 +102,7 @@ function RootDocument({ children }: { children: JSXElement }) {
       <body>
         <HeadContent />
 
+<<<<<<< Updated upstream
         <div class="p-2 flex gap-2 text-lg">
           <Link
             to="/"
@@ -127,6 +128,36 @@ function RootDocument({ children }: { children: JSXElement }) {
             <SignedOut>
               <SignInButton mode="modal" />
             </SignedOut>
+=======
+
+        <ClerkProvider publishableKey={import.meta.env.VITE_CLERK_PUBLISHABLE_KEY}>
+          <div class="p-2 flex gap-2 text-lg">
+            <Link
+              to="/"
+              activeProps={{
+                class: 'font-bold',
+              }}
+              activeOptions={{ exact: true }}
+            >
+              Home
+            </Link>{' '}
+            <Link
+              to="/posts"
+              activeProps={{
+                class: 'font-bold',
+              }}
+            >
+              Posts
+            </Link>
+            <div class="ml-auto">
+              <SignedIn>
+                <UserButton />
+              </SignedIn>
+              <SignedOut>
+                <SignInButton mode="modal" />
+              </SignedOut>
+            </div>
+>>>>>>> Stashed changes
           </div>
         </div>
         <hr />
diff --git a/examples/solid/start-clerk-basic/src/start.ts b/examples/solid/start-clerk-basic/src/start.ts
@@ -1,8 +1,9 @@
 import { clerkMiddleware } from '@clerk/tanstack-react-start/server'
 import { createStart } from '@tanstack/solid-start'
+import type { AnyRequestMiddleware } from '@tanstack/solid-start'
 
 export const startInstance = createStart(() => {
   return {
-    requestMiddleware: [clerkMiddleware()],
+    requestMiddleware: [clerkMiddleware() as AnyRequestMiddleware],
   }
 })
