Merge branch 'main' into feat/auth-request-response

* fix: docs build

* chore: move next-auth output to dist

* chore: add next-auth as deps for doc

* Revert "chore: move next-auth output to dist"

This reverts commit 9596a9134e6de4f4bd8dcfaa6d3002e98863d8f8.

* remove dist prefix

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,7 @@ merge of your pull request!
 > _NOTE_:
 >
 > - It's a good idea to open an issue first to discuss potential changes.
-> - Please make sure that you are _NOT_ opening a PR to fix a potential security vulnerability. Instead, please follow the [Security guidelines](../Security.md) to disclose the issue to us confidentially.
+> - Please make sure that you are _NOT_ opening a PR to fix a potential security vulnerability. Instead, please follow the [Security guidelines](https://github.com/nextauthjs/.github/blob/main/SECURITY.md) to disclose the issue to us confidentially.
 
 ## ☕️ Reasoning
 
@@ -28,7 +28,7 @@ Fixes: INSERT_ISSUE_LINK_HERE
 
 ## 📌 Resources
 
-- [Security guidelines](../Security.md)
-- [Contributing guidelines](../CONTRIBUTING.md)
-- [Code of conduct](../CODE_OF_CONDUCT.md)
+- [Security guidelines](https://github.com/nextauthjs/.github/blob/main/SECURITY.md)
+- [Contributing guidelines](https://github.com/nextauthjs/.github/blob/main/CONTRIBUTING.md)
+- [Code of conduct](https://github.com/nextauthjs/.github/blob/main/CODE_OF_CONDUCT.md)
 - [Contributing to Open Source](https://kcd.im/pull-request)

.github/pr-labeler.yml

@@ -1,74 +1,26 @@
 # https://github.com/actions/labeler#create-githublabeleryml
-
-test:
-  - test/**/*
-  - types/tests/**/*
-
-providers:
-  - packages/next-auth/src/providers/**/*
-  - test/integration/**/*
-
-adapters:
-  - packages/next-auth/src/adapters.ts
-  - packages/adapter-*/**
-
-dgraph:
-  - packages/adapter-dgraph/**
-
-dynamodb:
-  - packages/adapter-dynamodb/**
-
-fauna:
-  - packages/adapter-fauna/**
-
-firebase:
-  - packages/adapter-firebase/**
-
-mikro-orm:
-  - packages/adapter-mikro-orm/**
-
-mongodb:
-  - packages/adapter-mongodb/**
-
-neo4j:
-  - packages/adapter-neo4j/**
-
-pouchdb:
-  - packages/adapter-pouchdb/**
-
-prisma:
-  - packages/adapter-prisma/**
-
-sequelize:
-  - packages/adapter-sequelize/**
-
-supabase:
-  - packages/adapter-supabase/**
-
-typeorm-legacy:
-  - packages/adapter-typeorm-legacy/**
-
-upstash-redis:
-  - packages/adapter-upstash-redis/**
-
-xata:
-  - packages/adapter-xata/**
-
-core:
-  - packages/next-auth/src/**/*
-
-style:
-  - packages/next-auth/src/css/**/*
-
-client:
-  - packages/next-auth/src/client/**/*
-  - packages/next-auth/src/react/**/*
-
-pages:
-  - packages/next-auth/src/core/pages/**/*
-
-TypeScript:
-  - packages/next-auth/src/**/types.ts
-
-documentation:
-  - packages/docs/docs/**/*
+adapters: ["packages/core/src/adapters.ts", "packages/adapter-*/**/*"]
+core: ["packages/core/src/**/*"]
+dgraph: ["packages/adapter-dgraph/**/*"]
+documentation: ["packages/docs/docs/**/*"]
+dynamodb: ["packages/adapter-dynamodb/**/*"]
+examples: ["apps/examples/**/*"]
+fauna: ["packages/adapter-fauna/**/*"]
+firebase: ["packages/adapter-firebase/**/*"]
+frameworks: ["packages/frameworks-*/**/*"]
+legacy: ["packages/next-auth/**/*"]
+mikro-orm: ["packages/adapter-mikro-orm/**/*"]
+mongodb: ["packages/adapter-mongodb/**/*"]
+neo4j: ["packages/adapter-neo4j/**/*"]
+playgrounds: ["apps/playgrounds/**/*"]
+pouchdb: ["packages/adapter-pouchdb/**/*"]
+prisma: ["packages/adapter-prisma/**/*"]
+providers: ["packages/core/src/providers/**/*"]
+sequelize: ["packages/adapter-sequelize/**/*"]
+solidjs: ["packages/frameworks-solid-start/**/*"]
+supabase: ["packages/adapter-supabase/**/*"]
+svelte: ["packages/frameworks-sveltekit/**/*"]
+test: ["**test**/*"]
+typeorm-legacy: ["packages/adapter-typeorm-legacy/**/*"]
+upstash-redis: ["packages/adapter-upstash-redis/**/*"]
+xata: ["packages/adapter-xata/**/*"]

.github/sync.yml

@@ -1,14 +1,24 @@
 # Note that nextauthjs/next-auth-example syncs from the v4 branch
 
 nextauthjs/sveltekit-auth-example:
-  - source: apps/example-sveltekit
+  - source: apps/examples/sveltekit
     dest: .
     deleteOrphaned: true
   - .github/FUNDING.yml
   - LICENSE
 
+# FIXME: Should re-enable, but currently fails:
+# https://github.com/nextauthjs/next-auth/actions/runs/3811709391/jobs/6484533340
+# (issue seems to be the name of the target repo)
+# nextauthjs/solid-start-auth-example:
+#   - source: "apps/examples/solid-start"
+#     dest: .
+#     deleteOrphaned: true
+#   - .github/FUNDING.yml
+#   - LICENSE
+
 nextauthjs/next-auth-gatsby-example:
-  - source: apps/playground-gatsby
+  - source: apps/playgrounds/gatsby
     dest: .
     deleteOrphaned: true
   - .github/FUNDING.yml

.github/workflows/release.yml

@@ -29,9 +29,12 @@ jobs:
         run: pnpm install
       - name: Run tests
         run: pnpm test
+        timeout-minutes: 15
         env:
           UPSTASH_REDIS_URL: ${{ secrets.UPSTASH_REDIS_URL }}
           UPSTASH_REDIS_KEY: ${{ secrets.UPSTASH_REDIS_KEY }}
+          TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+          TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       # - name: Coverage
       #   uses: codecov/codecov-action@v1
       #   with:

.gitignore

@@ -86,6 +86,7 @@ packages/core/*.d.ts
 packages/core/*.d.ts.map
 packages/core/lib
 packages/core/providers
+packages/core/src/lib/pages/styles.ts
 docs/docs/reference/03-core
 docs/docs/reference/04-sveltekit
 

.prettierrc.js

@@ -9,6 +9,7 @@ module.exports = {
       files: [
         "apps/dev/pages/api/auth/[...nextauth].ts",
         "docs/{sidebars,docusaurus.config}.js",
+        "packages/core/src/index.ts",
       ],
       options: { printWidth: 150 },
     },

apps/dev/.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-  "typescript.tsdk": "../../node_modules/.pnpm/typescript@4.9.4/node_modules/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true
-}

apps/dev/nextjs/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "typescript.tsdk": "../../../node_modules/.pnpm/typescript@4.9.4/node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
+}

apps/dev/nextjs/README.md

@@ -3,4 +3,4 @@
 This folder contains a Next.js app using NextAuth.js for local development. See the following section on how to start:
 
 [Setting up local environment
-](https://github.com/nextauthjs/next-auth/blob/main/CONTRIBUTING.md#setting-up-local-environment)
+](https://github.com/nextauthjs/.github/blob/main/CONTRIBUTING.md#setting-up-local-environment)

apps/dev/nextjs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "next-auth-app",
   "version": "1.0.0",
-  "description": "NextAuth.js Developer app",
+  "description": "Next.js + Auth.js Developer app",
   "private": true,
   "scripts": {
     "clean": "rm -rf .next",

apps/dev/nextjs/pages/api/examples/session.ts

@@ -0,0 +1,21 @@
+import { Auth, SessionRequest } from "@auth/core"
+import { authConfig } from "../auth/[...nextauth]"
+
+export default async function handle(req: Request) {
+  authConfig.secret = process.env.AUTH_SECRET
+
+  const response = await Auth(new SessionRequest(req), authConfig)
+  const session = await response.session()
+  if (!session) {
+    return new Response("Not authenticated", { status: 401 })
+  }
+
+  console.log(session.user) // Do something with the session
+  // Pass the original headers to set cookies (eg.: updating the session expiry)
+  response.headers.set("content-type", "text/plain")
+  return new Response("Authenticated", { headers: response.headers })
+}
+
+export const config = {
+  runtime: "experimental-edge",
+}

apps/dev/pages/api/examples/session.js

@@ -1,8 +0,0 @@
-// This is an example of how to access a session from an API route
-import { unstable_getServerSession } from "next-auth/next"
-import { authOptions } from "../auth/[...nextauth]"
-
-export default async (req, res) => {
-  const session = await unstable_getServerSession(req, res, authOptions)
-  res.json(session)
-}

apps/dev/sveltekit/package.json

@@ -1,4 +1,8 @@
 {
+  "name": "sveltekit-auth-app",
+  "version": "1.0.0",
+  "description": "SvelteKit + Auth.js Developer app",
+  "private": true,
   "scripts": {
     "dev": "vite dev",
     "build": "vite build",

apps/dev/sveltekit/src/routes/protected/+page.svelte

@@ -2,9 +2,18 @@
   import { page } from "$app/stores"
 </script>
 
+{#if $page.data.session}
 <h1>Protected page</h1>
 <p>
   This is a protected content. You can access this content because you are
   signed in.
 </p>
 <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}

apps/example-nextjs/next-env.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.

apps/example-sveltekit/src/routes/protected/+page.ts

@@ -1,10 +0,0 @@
-import { redirect } from "@sveltejs/kit"
-import type { PageLoad } from "./$types"
-
-export const load: PageLoad = async ({ parent }) => {
-  const { session } = await parent()
-  if (!session?.user) {
-    throw redirect(302, "/")
-  }
-  return {}
-}

apps/examples/solid-start/.env.example

@@ -0,0 +1,3 @@
+GITHUB_ID=
+GITHUB_SECRET=
+AUTH_SECRET=

apps/examples/solid-start/.gitignore

@@ -0,0 +1,27 @@
+dist
+.solid
+.output
+.vercel
+.netlify
+netlify
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+*.launch
+.settings/
+
+# Temp
+gitignore
+
+# System Files
+.DS_Store
+Thumbs.db
+
+.env
+
+.vercel

apps/examples/solid-start/README.MD

@@ -0,0 +1,37 @@
+# Create JD App
+
+This project was created using [Create JD App](https://github.com/OrJDev/create-jd-app)
+
+## Deploying To Vercel
+
+### Installing
+
+```bash
+npm install solid-start-vercel@latest -D
+```
+
+### Adding to vite config
+
+```ts
+import solid from "solid-start/vite";
+import dotenv from "dotenv";
+import { defineConfig } from "vite";
+// @ts-expect-error no typing
+import vercel from "solid-start-vercel";
+  
+export default defineConfig(() => {
+  dotenv.config();
+  return {
+    plugins: [solid({ ssr: true, adapter: vercel({ edge: false }) })],
+  };
+});
+  
+```
+
+### Enviroment Variables
+
+- `ENABLE_VC_BUILD`=`1` .
+
+### You Are Done
+
+Create a github repo and push your code to it, then deploy it to vercel (:

apps/examples/solid-start/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "my-app",
+  "scripts": {
+    "dev": "solid-start dev",
+    "build": "solid-start build",
+    "start": "solid-start start",
+    "lint": "eslint --fix \"**/*.{ts,tsx,js,jsx}\""
+  },
+  "type": "module",
+  "devDependencies": {
+    "autoprefixer": "^10.4.13",
+    "postcss": "^8.4.19",
+    "solid-start-node": "^0.2.9",
+    "solid-start-vercel": "^0.2.9",
+    "tailwindcss": "^3.2.4",
+    "typescript": "^4.8.3",
+    "vite": "^3.1.0"
+  },
+  "dependencies": {
+    "@auth/core": "^0.1.4",
+    "@solid-auth/next": "^0.0.19",
+    "@solidjs/meta": "^0.28.0",
+    "@solidjs/router": "^0.6.0",
+    "solid-js": "^1.5.7",
+    "solid-start": "^0.2.9",
+    "undici": "5.11.0",
+    "zod": "^3.19.1"
+  },
+  "engines": {
+    "node": ">=16"
+  }
+}

apps/examples/solid-start/postcss.config.cjs

@@ -0,0 +1,6 @@
+module.exports = {
+    plugins: {
+        tailwindcss: {},
+        autoprefixer: {},
+    },
+};