Skip to content

Commit

Permalink
fix: await clerkAuthLoader in root loader
Browse files Browse the repository at this point in the history
  • Loading branch information
stilt0n committed Apr 8, 2024
1 parent d9a5fab commit 29de1c2
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions app/root.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LinksFunction /* ,LoaderFunction */ } from '@vercel/remix';
import { LinksFunction, LoaderFunction } from '@vercel/remix';
import {
Links,
Meta,
Expand All @@ -8,8 +8,8 @@ import {
isRouteErrorResponse,
useRouteError,
} from '@remix-run/react';
// import { rootAuthLoader } from '@clerk/remix/ssr.server';
// import { ClerkApp, SignedIn } from '@clerk/remix';
import { rootAuthLoader } from '@clerk/remix/ssr.server';
import { ClerkApp, SignedIn } from '@clerk/remix';
import { HandledError, UnhandledError } from '~/components/errors';
import { SiteHeader, SiteHeaderLink } from '~/components/layout/siteHeader';
import stylesheet from '~/tailwind.css?url';
Expand All @@ -18,7 +18,9 @@ export const links: LinksFunction = () => {
return [{ rel: 'stylesheet', href: stylesheet }];
};

// export const loader: LoaderFunction = (args) => rootAuthLoader(args);
export const loader: LoaderFunction = async (args) => {
return await rootAuthLoader(args);
};

export function Layout({ children }: { children: React.ReactNode }) {
return (
Expand All @@ -44,9 +46,9 @@ const App = () => {
<SiteHeader>
<SiteHeaderLink to='/recipes'>Recipes</SiteHeaderLink>
<SiteHeaderLink to='/about'>About</SiteHeaderLink>
{/* <SignedIn> */}
<SiteHeaderLink to='/permissionsTest'>temporary</SiteHeaderLink>
{/* </SignedIn> */}
<SignedIn>
<SiteHeaderLink to='/permissionsTest'>temporary</SiteHeaderLink>
</SignedIn>
</SiteHeader>
<main className='mt-2 px-6'>
<Outlet />
Expand All @@ -68,4 +70,4 @@ export const ErrorBoundary = () => {
);
};

export default App;
export default ClerkApp(App);

0 comments on commit 29de1c2

Please sign in to comment.