Merge pull request #9 from clerk/integrate-clerk-core2-with-nextjs

Integrate clerk core2 with nextjs
clerk · Apr 23, 2024 · 6a9c1b3 · 6a9c1b3
2 parents 7328a3e + 929540b
commit 6a9c1b3
Show file tree

Hide file tree

Showing 12 changed files with 1,795 additions and 1,435 deletions.
diff --git a/middleware.ts b/middleware.ts
@@ -0,0 +1,7 @@
+import { clerkMiddleware } from "@clerk/nextjs/server";
+
+export default clerkMiddleware();
+
+export const config = {
+  matcher: ['/((?!.*\\..*|_next).*)', '/', '/(api|trpc)(.*)'],
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@clerk/nextjs": "^4.29.7",
+    "@clerk/nextjs": "^5.0.1",
     "next": "14.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -0,0 +1,28 @@
+import "@/styles/globals.css";
+import {
+  ClerkProvider,
+  SignInButton,
+  SignedIn,
+  SignedOut,
+  UserButton,
+} from "@clerk/nextjs";
+import type { AppProps } from "next/app";
+
+function MyApp({ Component, pageProps }: AppProps) {
+  return (
+    <ClerkProvider {...pageProps}>
+      <header>
+        <SignedOut>
+          <SignInButton />
+        </SignedOut>
+        <SignedIn>
+          <UserButton afterSignOutUrl="/" />
+        </SignedIn>
+      </header>
+
+      <Component {...pageProps} />
+    </ClerkProvider>
+  );
+}
+
+export default MyApp;
diff --git a/src/pages/_document.tsx → pages/_document.tsx b/src/pages/_document.tsx → pages/_document.tsx
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1>Home Page</h1>;
+}
diff --git a/src/middleware.ts b/src/middleware.ts
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
diff --git a/src/pages/api/hello.ts b/src/pages/api/hello.ts
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
diff --git a/src/styles/globals.css → styles/globals.css b/src/styles/globals.css → styles/globals.css
diff --git a/tsconfig.json b/tsconfig.json
@@ -14,7 +14,7 @@
     "jsx": "preserve",
     "incremental": true,
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],