Merge branch 'main' into patch-2

nextauthjs · Apr 28, 2024 · 95e7122 · 95e7122
2 parents 81f80a6 + af902db
commit 95e7122
Show file tree

Hide file tree

Showing 157 changed files with 5,444 additions and 1,059 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,10 +62,15 @@ on:
           - "adapter-upstash-redis"
           - "adapter-xata"
           - "next-auth"
+
+permissions:
+  id-token: write
+
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
   FORCE_COLOR: true
+  NPM_CONFIG_PROVENANCE: true
 
 jobs:
   test:

diff --git a/apps/dev/nextjs/components/footer.module.css b/apps/dev/nextjs/components/footer.module.css
@@ -15,6 +15,7 @@
   justify-content: space-between;
   align-items: center;
 }
+
 .navItemsLeft {
   display: flex;
   align-items: center;
@@ -31,19 +32,21 @@
   display: flex;
   align-items: center;
 }
+
 .navItem a {
-  color: black;
-  font-weight: 300;
-  text-decoration: none;
+  color: rgb(2, 8, 23);
+  text-underline-offset: 4px;
+  font-size: 14px;
 }
+
 .navItem svg {
-  margin-left: 0.2rem;
+  margin-left: 4px;
   height: 16px;
   width: 16px;
 }
 
 .footerLogo {
-  height: 24px;
-  width: 24px;
+  height: 20px;
+  width: 20px;
   margin-right: 0.5rem;
 }
diff --git a/apps/dev/nextjs/components/footer.tsx b/apps/dev/nextjs/components/footer.tsx
@@ -11,8 +11,8 @@ export default function Footer() {
             <a href="https://authjs.dev">Documentation</a>
             <svg
               xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
+              width="16"
+              height="16"
               viewBox="0 0 24 24"
               fill="none"
               stroke="currentColor"
@@ -29,8 +29,8 @@ export default function Footer() {
             <a href="https://www.npmjs.com/package/next-auth">NPM</a>
             <svg
               xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
+              width="16"
+              height="16"
               viewBox="0 0 24 24"
               fill="none"
               stroke="currentColor"
@@ -47,8 +47,8 @@ export default function Footer() {
             <a href="https://github.com/nextauthjs/next-auth-example">GitHub</a>
             <svg
               xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
+              width="16"
+              height="16"
               viewBox="0 0 24 24"
               fill="none"
               stroke="currentColor"
@@ -71,7 +71,24 @@ export default function Footer() {
             src="https://authjs.dev/img/logo-sm.png"
             alt="Auth.js Logo"
           />
-          <span>{packageJSON.version}</span>
+          <Link href="https://npmjs.org/package/next-auth">
+            {packageJSON.version}
+          </Link>
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="16"
+            height="16"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+            strokeLinecap="round"
+            strokeLinejoin="round"
+          >
+            <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path>
+            <polyline points="15 3 21 3 21 9"></polyline>
+            <line x1="10" x2="21" y1="14" y2="3"></line>
+          </svg>
         </li>
       </ul>
     </footer>

diff --git a/apps/dev/nextjs/package.json b/apps/dev/nextjs/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@auth/prisma-adapter": "workspace:*",
     "@prisma/client": "^5",
-    "next": "14.2.0-canary.58",
+    "next": "14.2.0-canary.47",
     "next-auth": "workspace:*",
     "nodemailer": "^6.9.3",
     "react": "^18",

diff --git a/apps/dev/sveltekit/src/routes/protected/+page.svelte b/apps/dev/sveltekit/src/routes/protected/+page.svelte
@@ -11,7 +11,4 @@
   <p>Session expiry: {$page.data.session?.expires}</p>
 {:else}
   <h1>Access Denied</h1>
-  <p>
-    <a href="/auth/signin"> You must be signed in to view this page </a>
-  </p>
 {/if}
diff --git a/apps/examples/express/api/index.js b/apps/examples/express/api/index.js
@@ -1,5 +1,3 @@
-import "../src/globals.js"
-
 const { app } = await import("../src/app.js")
 
 export default app
diff --git a/apps/examples/express/package.json b/apps/examples/express/package.json
@@ -1,44 +1,35 @@
 {
-  "type": "module",
   "description": "Express Auth example app",
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=20.11.0"
   },
+  "type": "module",
   "private": true,
   "scripts": {
     "start": "node dist/server.js",
+    "clean": "rm -rf dist",
     "build": "pnpm build:ts && pnpm build:css",
     "build:ts": "tsc",
     "build:css": "tailwindcss -i ./public/css/style.css -o ./public/css/output.css",
-    "build:watch": "pnpm build:ts -w & pnpm build:css -w",
-    "dev": "concurrently -k -p \"[{name}]\" -n \"Build,Node\" -c \"cyan.bold,green.bold\" \"pnpm run build:watch\" \"pnpm run dev:node\"",
-    "dev:node": "nodemon dist/server.js",
+    "dev": "tsx watch --env-file=.env src/server.ts & pnpm build:css -w",
     "lint": "eslint src/*.ts --fix",
     "prettier": "prettier src/*.ts --write"
   },
   "author": "Rexford Essilfie <rexfordessilfie09@gmail.com>",
   "license": "MIT",
   "dependencies": {
     "@auth/express": "latest",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "morgan": "^1.10.0",
     "pug": "^3.0.2",
-    "tailwindcss": "^3.4.1"
+    "tailwindcss": "^3.4.3"
   },
   "devDependencies": {
-    "@prettier/plugin-pug": "^3.0.0",
     "@types/express": "^4.17.21",
     "@types/morgan": "^1.9.9",
-    "@types/node": "^20.10.7",
+    "@types/node": "^20.12.7",
     "@types/pug": "^2.0.10",
-    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/parser": "^6.18.0",
-    "concurrently": "6.5.1",
-    "eslint": "^8.56.0",
-    "nodemon": "2.0.22",
-    "prettier": "3.1.1",
-    "prettier-plugin-tailwindcss": "^0.5.11",
+    "tsx": "^4.7.0",
     "typescript": "5.3.3"
   }
 }