tweaks

brenelz · brenelz · commit 400280fb05a7 · 2025-11-09T22:31:38.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
@@ -5,7 +5,7 @@ import {
   SignedIn,
   SignedOut,
   UserButton,
-} from '@clerk/tanstack-react-start'
+} from '@clerk/tanstack-solid-start'
 import { TanStackRouterDevtools } from '@tanstack/solid-router-devtools'
 import { createServerFn } from '@tanstack/solid-start'
 
@@ -16,7 +16,7 @@ import {
   Scripts,
   createRootRoute,
 } from '@tanstack/solid-router'
-import { auth } from '@clerk/tanstack-react-start/server'
+import { auth } from '@clerk/tanstack-solid-start/server'
 import { HydrationScript } from 'solid-js/web'
 import type { JSXElement } from 'solid-js'
 import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js'
@@ -85,11 +85,9 @@ export const Route = createRootRoute({
 
 function RootComponent() {
   return (
-    <ClerkProvider>
-      <RootDocument>
-        <Outlet />
-      </RootDocument>
-    </ClerkProvider>
+    <RootDocument>
+      <Outlet />
+    </RootDocument>
   )
 }
 
@@ -102,34 +100,6 @@ function RootDocument({ children }: { children: JSXElement }) {
       <body>
         <HeadContent />
 
-<<<<<<< Updated upstream
-        <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>
-=======
-
         <ClerkProvider publishableKey={import.meta.env.VITE_CLERK_PUBLISHABLE_KEY}>
           <div class="p-2 flex gap-2 text-lg">
             <Link
@@ -157,11 +127,11 @@ function RootDocument({ children }: { children: JSXElement }) {
                 <SignInButton mode="modal" />
               </SignedOut>
             </div>
->>>>>>> Stashed changes
           </div>
-        </div>
-        <hr />
-        {children}
+          <hr />
+          {children}
+
+        </ClerkProvider>
         <TanStackRouterDevtools position="bottom-right" />
         <Scripts />
       </body>
diff --git a/examples/solid/start-clerk-basic/src/routes/_authed.tsx b/examples/solid/start-clerk-basic/src/routes/_authed.tsx
@@ -1,5 +1,5 @@
 import { createFileRoute } from '@tanstack/solid-router'
-import { SignIn } from '@clerk/tanstack-react-start'
+import { SignIn } from '@clerk/tanstack-solid-start'
 
 export const Route = createFileRoute('/_authed')({
   beforeLoad: ({ context }) => {
diff --git a/examples/solid/start-clerk-basic/src/start.ts b/examples/solid/start-clerk-basic/src/start.ts
@@ -1,4 +1,4 @@
-import { clerkMiddleware } from '@clerk/tanstack-react-start/server'
+import { clerkMiddleware } from '@clerk/tanstack-solid-start/server'
 import { createStart } from '@tanstack/solid-start'
 import type { AnyRequestMiddleware } from '@tanstack/solid-start'
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { clerkMiddleware } from '@clerk/tanstack-react-start/server'`
	`1`	`+import { clerkMiddleware } from '@clerk/tanstack-solid-start/server'`
`2`	`2`	`import { createStart } from '@tanstack/solid-start'`
`3`	`3`	`import type { AnyRequestMiddleware } from '@tanstack/solid-start'`
`4`	`4`