chore: move to pnpm (nextauthjs#4420)

* feat: pnpm * Update publish script * gitignore the pnpm debug log * Fix workspace * Fix dev commands * feat: pnpm * Update publish script * gitignore the pnpm debug log * Fix workspace * Fix dev commands * chore: fix pnpm install in GitHub Action * fix: update tsconfig path * pnpm run -> pnpm * chore: remove cache-node and add back setup-node * fix: tsconfig dependencies * chore: fix tsconfig path * fix: adapter-test dependencies * fix: setup-node for release-pr * fix: import adapter-test * chore: update workspace dependency for next-auth * fix: test failure * fix: add jest for adapters * fix: jest again * fix: mongo in prisma * fix: `--no-git-checks` for `release-pr` Co-authored-by: Balázs Orbán <[email protected]>
cobbvanth · May 3, 2022 · 4f29d39 · 4f29d39
1 parent 042ed82
commit 4f29d39
Show file tree

Hide file tree

Showing 53 changed files with 21,800 additions and 19,751 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,26 +16,21 @@ jobs:
     steps:
       - name: Init
         uses: actions/checkout@v2
+      - name: Install pnpm
+        uses: pnpm/[email protected]
+        with:
+          version: 6.32.8
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: "yarn"
-      - name: Cache Node Modules
-        id: cache-node
-        uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
-          restore-keys: |
-            cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
-            cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
+          cache: "pnpm"
       - name: Install dependencies
-        run: yarn --prefer-offline --frozen-lockfile
+        run: pnpm install
       - name: Build
-        run: yarn build
+        run: pnpm build
       - name: Run tests
-        run: yarn test
+        run: pnpm test
         env:
           UPSTASH_REDIS_URL: ${{ secrets.UPSTASH_REDIS_URL }}
           UPSTASH_REDIS_KEY: ${{ secrets.UPSTASH_REDIS_KEY }}
@@ -55,27 +50,22 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - name: Install pnpm
+        uses: pnpm/[email protected]
+        with:
+          version: 6.32.8
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: "yarn"
-      - name: Cache Node Modules
-        id: cache-node
-        uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
-          restore-keys: |
-            cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
-            cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
+          cache: "pnpm"
       - name: Install dependencies
-        run: yarn --prefer-offline --frozen-lockfile
+        run: pnpm install
       - name: Publish to npm and GitHub
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Balázs Orbán"
-          yarn release
+          pnpm release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN_PKG: ${{ secrets.NPM_TOKEN_PKG }}
@@ -89,22 +79,17 @@ jobs:
     steps:
       - name: Init
         uses: actions/checkout@v2
+      - name: Install pnpm
+        uses: pnpm/[email protected]
+        with:
+          version: 6.32.8
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16
-          cache: "yarn"
-      - name: Cache Node Modules
-        id: cache-node
-        uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
-          restore-keys: |
-            cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
-            cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
+          cache: "pnpm"
       - name: Install dependencies
-        run: yarn --prefer-offline --frozen-lockfile
+        run: pnpm install
       - name: Determine version
         uses: ./.github/version-pr
         id: determine-version
@@ -114,7 +99,7 @@ jobs:
         run: |
           cd packages/next-auth
           echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
-          npm publish --access public --tag experimental
+          pnpm publish --no-git-checks --access public --tag experimental
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Comment version on PR

diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 firebase-debug.log
+.pnpm-debug.log
 
 
 # Dependencies

diff --git a/apps/dev/package.json b/apps/dev/package.json
@@ -6,19 +6,20 @@
   "scripts": {
     "clean": "rm -rf .next",
     "copy:css": "cpx \"../../packages/next-auth/css/**/*\" src/css --watch",
-    "watch:css": "cd ../../packages/next-auth && npm run watch:css",
-    "dev": "npm-run-all --parallel dev:next watch:css copy:css",
-    "dev:next": "npx next dev",
-    "build": "npx next build",
+    "watch:css": "cd ../../packages/next-auth && pnpm watch:css",
+    "dev": "concurrently \"pnpm dev:next\" \"pnpm watch:css\" \"pnpm copy:css\"",
+    "dev:next": "next dev",
+    "build": "next build",
     "start": "next start",
-    "email": "npx fake-smtp-server",
-    "start:email": "npm run email"
+    "email": "fake-smtp-server",
+    "start:email": "pnpm email"
   },
   "license": "ISC",
   "dependencies": {
     "@next-auth/fauna-adapter": "^1.0.1",
     "@next-auth/prisma-adapter": "^1.0.1",
     "@prisma/client": "^3.10.0",
+    "cpx": "^1.5.0",
     "fake-smtp-server": "^0.8.0",
     "faunadb": "^4.4.1",
     "next": "^12.1.0",
@@ -29,6 +30,7 @@
   "devDependencies": {
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
+    "concurrently": "^7.1.0",
     "prisma": "^3.10.0"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -2,13 +2,6 @@
   "name": "root",
   "version": "0.0.0",
   "private": true,
-  "workspaces": {
-    "packages": [
-      "packages/*",
-      "apps/dev",
-      "docs"
-    ]
-  },
   "repository": "https://github.com/nextauthjs/next-auth.git",
   "scripts": {
     "build:app": "turbo run build --scope=next-auth-app --include-dependencies",
@@ -17,7 +10,7 @@
     "lint:fix": "turbo run lint -- --fix",
     "test": "turbo run test --concurrency=1 --scope=!@next-auth/pouchdb-adapter --scope=!next-auth-*",
     "setup": "turbo run setup",
-    "dev": "yarn dev:app",
+    "dev": "pnpm dev:app",
     "dev:app": "turbo run dev --parallel --no-deps --no-cache --scope=next-auth-app",
     "dev:docs": "turbo run dev --parallel --no-deps --no-cache --scope=next-auth-docs",
     "version:pr": "node ./config/version-pr",
@@ -26,6 +19,7 @@
   "devDependencies": {
     "@actions/core": "^1.6.0",
     "@commitlint/parse": "16.0.0",
+    "@types/node": "^17.0.25",
     "@types/semver": "7.3.9",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^4.33.0",
@@ -47,7 +41,8 @@
     "typescript": "^4.5.2"
   },
   "engines": {
-    "node": "^12.19.0 || ^14.15.0 || ^16.13.0"
+    "node": "^12.19.0 || ^14.15.0 || ^16.13.0",
+    "pnpm": ">=6.32.3"
   },
   "prettier": {
     "semi": false,
@@ -102,7 +97,7 @@
     "**/tests",
     "**/__tests__"
   ],
-  "packageManager": "[email protected]",
+  "packageManager": "[email protected]",
   "funding": [
     {
       "type": "github",

diff --git a/packages/adapter-dgraph/package.json b/packages/adapter-dgraph/package.json
@@ -31,21 +31,23 @@
   },
   "peerDependencies": {
     "jsonwebtoken": "^8.5.1",
-    "next-auth": "^4.0.1"
+    "next-auth": "workspace:*"
   },
   "devDependencies": {
+    "@next-auth/adapter-test": "workspace:^0.0.0",
+    "@next-auth/tsconfig": "workspace:^0.0.0",
     "@types/jest": "^26.0.24",
     "@types/jsonwebtoken": "^8.5.5",
     "@types/node-fetch": "^2.5.11",
-    "jest": "^27.0.6",
-    "next-auth": "^4.0.1",
+    "jest": "^27.4.3",
+    "next-auth": "workspace:*",
     "ts-jest": "^27.0.3"
   },
   "dependencies": {
     "jsonwebtoken": "^8.5.1",
     "node-fetch": "^2.6.1"
   },
   "jest": {
-    "preset": "adapter-test/jest"
+    "preset": "@next-auth/adapter-test/jest"
   }
 }
diff --git a/packages/adapter-dgraph/tests/index.test.ts b/packages/adapter-dgraph/tests/index.test.ts
@@ -1,7 +1,7 @@
 import { DgraphAdapter, format } from "../src"
 import { client as dgraphClient } from "../src/client"
 import * as fragments from "../src/graphql/fragments"
-import { runBasicTests } from "adapter-test"
+import { runBasicTests } from "@next-auth/adapter-test"
 import fs from "fs"
 import path from "path"
 

diff --git a/packages/adapter-dgraph/tsconfig.json b/packages/adapter-dgraph/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "tsconfig/adapters.json",
+  "extends": "@next-auth/tsconfig/adapters.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist"

diff --git a/packages/adapter-dynamodb/jest.config.js b/packages/adapter-dynamodb/jest.config.js
@@ -3,7 +3,7 @@
  * https://jestjs.io/docs/en/configuration.html
  */
 module.exports = {
-  ...require("adapter-test/jest/jest-preset"),
+  ...require("@next-auth/adapter-test/jest/jest-preset"),
   // // Indicates whether the coverage information should be collected while executing the test
   // collectCoverage: true,
   // // Indicates which provider should be used to instrument code for coverage

diff --git a/packages/adapter-dynamodb/package.json b/packages/adapter-dynamodb/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "test:default": "jest",
     "test:custom": "CUSTOM_MODEL=1 jest",
-    "test": "yarn test:default && yarn test:custom",
+    "test": "pnpm test:default && pnpm test:custom",
     "build": "tsc"
   },
   "files": [
@@ -32,12 +32,15 @@
   "license": "ISC",
   "peerDependencies": {
     "@aws-sdk/lib-dynamodb": "^3.36.1",
-    "next-auth": "^4.0.1"
+    "next-auth": "workspace:*"
   },
   "devDependencies": {
     "@aws-sdk/client-dynamodb": "^3.36.1",
     "@aws-sdk/lib-dynamodb": "^3.36.1",
+    "@next-auth/adapter-test": "workspace:^0.0.0",
+    "@next-auth/tsconfig": "workspace:^0.0.0",
     "@shelf/jest-dynamodb": "^2.1.0",
-    "next-auth": "^4.0.1"
+    "jest": "^27.4.3",
+    "next-auth": "workspace:*"
   }
 }
diff --git a/packages/adapter-dynamodb/tests/index.test.ts b/packages/adapter-dynamodb/tests/index.test.ts
@@ -1,7 +1,7 @@
 import { DynamoDB } from "@aws-sdk/client-dynamodb"
 import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb"
 import { DynamoDBAdapter } from "../src"
-import { runBasicTests } from "adapter-test"
+import { runBasicTests } from "@next-auth/adapter-test"
 import { format } from "../src/"
 const config = {
   endpoint: "http://127.0.0.1:8000",

diff --git a/packages/adapter-dynamodb/tsconfig.json b/packages/adapter-dynamodb/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "tsconfig/adapters.json",
+  "extends": "@next-auth/tsconfig/adapters.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist"

diff --git a/packages/adapter-fauna/package.json b/packages/adapter-fauna/package.json
@@ -7,7 +7,10 @@
   "bugs": {
     "url": "https://github.com/nextauthjs/next-auth/issues"
   },
-  "files": ["dist", "README.md"],
+  "files": [
+    "dist",
+    "README.md"
+  ],
   "author": "Bhanu Teja P",
   "contributors": [
     {
@@ -21,7 +24,12 @@
   ],
   "main": "dist/index.js",
   "license": "ISC",
-  "keywords": ["next-auth", "next.js", "fauna", "faunadb"],
+  "keywords": [
+    "next-auth",
+    "next.js",
+    "fauna",
+    "faunadb"
+  ],
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -33,14 +41,17 @@
   },
   "peerDependencies": {
     "faunadb": "^4.3.0",
-    "next-auth": "^4.0.1"
+    "next-auth": "workspace:*"
   },
   "devDependencies": {
     "@fauna-labs/fauna-schema-migrate": "^2.1.3",
+    "@next-auth/adapter-test": "workspace:^0.0.0",
+    "@next-auth/tsconfig": "workspace:^0.0.0",
     "faunadb": "^4.3.0",
-    "next-auth": "^4.0.1"
+    "jest": "^27.4.3",
+    "next-auth": "workspace:*"
   },
   "jest": {
-    "preset": "adapter-test/jest"
+    "preset": "@next-auth/adapter-test/jest"
   }
 }
diff --git a/packages/adapter-fauna/tests/index.test.ts b/packages/adapter-fauna/tests/index.test.ts
@@ -1,5 +1,5 @@
 import { collections, FaunaAdapter, format, indexes, query } from "../src"
-import { runBasicTests } from "adapter-test"
+import { runBasicTests } from "@next-auth/adapter-test"
 import { Client as FaunaClient, Get, Match, Ref } from "faunadb"
 
 const client = new FaunaClient({

diff --git a/packages/adapter-fauna/tsconfig.json b/packages/adapter-fauna/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "tsconfig/adapters.json",
+  "extends": "@next-auth/tsconfig/adapters.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist"

diff --git a/packages/adapter-firebase/jest.config.js b/packages/adapter-firebase/jest.config.js
@@ -1 +1 @@
-module.exports = require("../adapter-test/jest.config")
+module.exports = require("@next-auth/adapter-test/jest.config")
diff --git a/packages/adapter-firebase/package.json b/packages/adapter-firebase/package.json
@@ -33,11 +33,14 @@
   },
   "peerDependencies": {
     "firebase": "^8.6.2",
-    "next-auth": "latest"
+    "next-auth": "workspace:*"
   },
   "devDependencies": {
+    "@next-auth/adapter-test": "workspace:^0.0.0",
+    "@next-auth/tsconfig": "workspace:^0.0.0",
     "firebase": "^8.6.2",
     "firebase-tools": "^9.11.0",
-    "next-auth": "^4.0.1"
+    "jest": "^27.4.3",
+    "next-auth": "workspace:*"
   }
 }
diff --git a/packages/adapter-firebase/tests/index.test.ts b/packages/adapter-firebase/tests/index.test.ts
@@ -1,4 +1,4 @@
-import { runBasicTests } from "adapter-test"
+import { runBasicTests } from "@next-auth/adapter-test"
 import { FirebaseAdapter } from "../src"
 import { docSnapshotToObject, querySnapshotToObject } from "../src/utils"
 

diff --git a/packages/adapter-firebase/tsconfig.json b/packages/adapter-firebase/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "tsconfig/base.json",
+  "extends": "@next-auth/tsconfig/base.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = require("../adapter-test/jest.config")
		module.exports = require("@next-auth/adapter-test/jest.config")