Skip to content

Commit 4f29d39

Browse files
ThangHuuVubalazsorban44
ThangHuuVu
and
balazsorban44
authored
chore: move to pnpm (#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]>
1 parent 042ed82 commit 4f29d39

File tree

53 files changed

+21800
-19751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+21800
-19751
lines changed

‎.github/workflows/release.yml‎

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,21 @@ jobs:
1616
steps:
1717
- name: Init
1818
uses: actions/checkout@v2
19+
- name: Install pnpm
20+
uses: pnpm/[email protected]
21+
with:
22+
version: 6.32.8
1923
- name: Setup Node
20-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v3
2125
with:
2226
node-version: 16
23-
cache: "yarn"
24-
- name: Cache Node Modules
25-
id: cache-node
26-
uses: actions/cache@v2
27-
with:
28-
path: "**/node_modules"
29-
key: cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
30-
restore-keys: |
31-
cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
32-
cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
27+
cache: "pnpm"
3328
- name: Install dependencies
34-
run: yarn --prefer-offline --frozen-lockfile
29+
run: pnpm install
3530
- name: Build
36-
run: yarn build
31+
run: pnpm build
3732
- name: Run tests
38-
run: yarn test
33+
run: pnpm test
3934
env:
4035
UPSTASH_REDIS_URL: ${{ secrets.UPSTASH_REDIS_URL }}
4136
UPSTASH_REDIS_KEY: ${{ secrets.UPSTASH_REDIS_KEY }}
@@ -55,27 +50,22 @@ jobs:
5550
uses: actions/checkout@v2
5651
with:
5752
fetch-depth: 0
53+
- name: Install pnpm
54+
uses: pnpm/[email protected]
55+
with:
56+
version: 6.32.8
5857
- name: Setup Node
59-
uses: actions/setup-node@v2
58+
uses: actions/setup-node@v3
6059
with:
6160
node-version: 16
62-
cache: "yarn"
63-
- name: Cache Node Modules
64-
id: cache-node
65-
uses: actions/cache@v2
66-
with:
67-
path: "**/node_modules"
68-
key: cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
69-
restore-keys: |
70-
cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
71-
cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
61+
cache: "pnpm"
7262
- name: Install dependencies
73-
run: yarn --prefer-offline --frozen-lockfile
63+
run: pnpm install
7464
- name: Publish to npm and GitHub
7565
run: |
7666
git config --global user.email "[email protected]"
7767
git config --global user.name "Balázs Orbán"
78-
yarn release
68+
pnpm release
7969
env:
8070
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8171
NPM_TOKEN_PKG: ${{ secrets.NPM_TOKEN_PKG }}
@@ -89,22 +79,17 @@ jobs:
8979
steps:
9080
- name: Init
9181
uses: actions/checkout@v2
82+
- name: Install pnpm
83+
uses: pnpm/[email protected]
84+
with:
85+
version: 6.32.8
9286
- name: Setup Node
93-
uses: actions/setup-node@v2
87+
uses: actions/setup-node@v3
9488
with:
9589
node-version: 16
96-
cache: "yarn"
97-
- name: Cache Node Modules
98-
id: cache-node
99-
uses: actions/cache@v2
100-
with:
101-
path: "**/node_modules"
102-
key: cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
103-
restore-keys: |
104-
cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ github.run_id }}
105-
cache-node_modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
90+
cache: "pnpm"
10691
- name: Install dependencies
107-
run: yarn --prefer-offline --frozen-lockfile
92+
run: pnpm install
10893
- name: Determine version
10994
uses: ./.github/version-pr
11095
id: determine-version
@@ -114,7 +99,7 @@ jobs:
11499
run: |
115100
cd packages/next-auth
116101
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
117-
npm publish --access public --tag experimental
102+
pnpm publish --no-git-checks --access public --tag experimental
118103
env:
119104
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
120105
- name: Comment version on PR

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ npm-debug.log*
1212
yarn-debug.log*
1313
yarn-error.log*
1414
firebase-debug.log
15+
.pnpm-debug.log
1516

1617

1718
# Dependencies

‎apps/dev/package.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@
66
"scripts": {
77
"clean": "rm -rf .next",
88
"copy:css": "cpx \"../../packages/next-auth/css/**/*\" src/css --watch",
9-
"watch:css": "cd ../../packages/next-auth && npm run watch:css",
10-
"dev": "npm-run-all --parallel dev:next watch:css copy:css",
11-
"dev:next": "npx next dev",
12-
"build": "npx next build",
9+
"watch:css": "cd ../../packages/next-auth && pnpm watch:css",
10+
"dev": "concurrently \"pnpm dev:next\" \"pnpm watch:css\" \"pnpm copy:css\"",
11+
"dev:next": "next dev",
12+
"build": "next build",
1313
"start": "next start",
14-
"email": "npx fake-smtp-server",
15-
"start:email": "npm run email"
14+
"email": "fake-smtp-server",
15+
"start:email": "pnpm email"
1616
},
1717
"license": "ISC",
1818
"dependencies": {
1919
"@next-auth/fauna-adapter": "^1.0.1",
2020
"@next-auth/prisma-adapter": "^1.0.1",
2121
"@prisma/client": "^3.10.0",
22+
"cpx": "^1.5.0",
2223
"fake-smtp-server": "^0.8.0",
2324
"faunadb": "^4.4.1",
2425
"next": "^12.1.0",
@@ -29,6 +30,7 @@
2930
"devDependencies": {
3031
"@types/react": "^17.0.37",
3132
"@types/react-dom": "^17.0.11",
33+
"concurrently": "^7.1.0",
3234
"prisma": "^3.10.0"
3335
}
34-
}
36+
}

‎package.json‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
"name": "root",
33
"version": "0.0.0",
44
"private": true,
5-
"workspaces": {
6-
"packages": [
7-
"packages/*",
8-
"apps/dev",
9-
"docs"
10-
]
11-
},
125
"repository": "https://github.com/nextauthjs/next-auth.git",
136
"scripts": {
147
"build:app": "turbo run build --scope=next-auth-app --include-dependencies",
@@ -17,7 +10,7 @@
1710
"lint:fix": "turbo run lint -- --fix",
1811
"test": "turbo run test --concurrency=1 --scope=!@next-auth/pouchdb-adapter --scope=!next-auth-*",
1912
"setup": "turbo run setup",
20-
"dev": "yarn dev:app",
13+
"dev": "pnpm dev:app",
2114
"dev:app": "turbo run dev --parallel --no-deps --no-cache --scope=next-auth-app",
2215
"dev:docs": "turbo run dev --parallel --no-deps --no-cache --scope=next-auth-docs",
2316
"version:pr": "node ./config/version-pr",
@@ -26,6 +19,7 @@
2619
"devDependencies": {
2720
"@actions/core": "^1.6.0",
2821
"@commitlint/parse": "16.0.0",
22+
"@types/node": "^17.0.25",
2923
"@types/semver": "7.3.9",
3024
"@typescript-eslint/eslint-plugin": "^5.10.2",
3125
"@typescript-eslint/parser": "^4.33.0",
@@ -47,7 +41,8 @@
4741
"typescript": "^4.5.2"
4842
},
4943
"engines": {
50-
"node": "^12.19.0 || ^14.15.0 || ^16.13.0"
44+
"node": "^12.19.0 || ^14.15.0 || ^16.13.0",
45+
"pnpm": ">=6.32.3"
5146
},
5247
"prettier": {
5348
"semi": false,
@@ -102,7 +97,7 @@
10297
"**/tests",
10398
"**/__tests__"
10499
],
105-
"packageManager": "[email protected]",
100+
"packageManager": "[email protected]",
106101
"funding": [
107102
{
108103
"type": "github",

‎packages/adapter-dgraph/package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,23 @@
3131
},
3232
"peerDependencies": {
3333
"jsonwebtoken": "^8.5.1",
34-
"next-auth": "^4.0.1"
34+
"next-auth": "workspace:*"
3535
},
3636
"devDependencies": {
37+
"@next-auth/adapter-test": "workspace:^0.0.0",
38+
"@next-auth/tsconfig": "workspace:^0.0.0",
3739
"@types/jest": "^26.0.24",
3840
"@types/jsonwebtoken": "^8.5.5",
3941
"@types/node-fetch": "^2.5.11",
40-
"jest": "^27.0.6",
41-
"next-auth": "^4.0.1",
42+
"jest": "^27.4.3",
43+
"next-auth": "workspace:*",
4244
"ts-jest": "^27.0.3"
4345
},
4446
"dependencies": {
4547
"jsonwebtoken": "^8.5.1",
4648
"node-fetch": "^2.6.1"
4749
},
4850
"jest": {
49-
"preset": "adapter-test/jest"
51+
"preset": "@next-auth/adapter-test/jest"
5052
}
5153
}

‎packages/adapter-dgraph/tests/index.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { DgraphAdapter, format } from "../src"
22
import { client as dgraphClient } from "../src/client"
33
import * as fragments from "../src/graphql/fragments"
4-
import { runBasicTests } from "adapter-test"
4+
import { runBasicTests } from "@next-auth/adapter-test"
55
import fs from "fs"
66
import path from "path"
77

‎packages/adapter-dgraph/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "tsconfig/adapters.json",
2+
"extends": "@next-auth/tsconfig/adapters.json",
33
"compilerOptions": {
44
"rootDir": "src",
55
"outDir": "dist"

‎packages/adapter-dynamodb/jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://jestjs.io/docs/en/configuration.html
44
*/
55
module.exports = {
6-
...require("adapter-test/jest/jest-preset"),
6+
...require("@next-auth/adapter-test/jest/jest-preset"),
77
// // Indicates whether the coverage information should be collected while executing the test
88
// collectCoverage: true,
99
// // Indicates which provider should be used to instrument code for coverage

‎packages/adapter-dynamodb/package.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"scripts": {
2222
"test:default": "jest",
2323
"test:custom": "CUSTOM_MODEL=1 jest",
24-
"test": "yarn test:default && yarn test:custom",
24+
"test": "pnpm test:default && pnpm test:custom",
2525
"build": "tsc"
2626
},
2727
"files": [
@@ -32,12 +32,15 @@
3232
"license": "ISC",
3333
"peerDependencies": {
3434
"@aws-sdk/lib-dynamodb": "^3.36.1",
35-
"next-auth": "^4.0.1"
35+
"next-auth": "workspace:*"
3636
},
3737
"devDependencies": {
3838
"@aws-sdk/client-dynamodb": "^3.36.1",
3939
"@aws-sdk/lib-dynamodb": "^3.36.1",
40+
"@next-auth/adapter-test": "workspace:^0.0.0",
41+
"@next-auth/tsconfig": "workspace:^0.0.0",
4042
"@shelf/jest-dynamodb": "^2.1.0",
41-
"next-auth": "^4.0.1"
43+
"jest": "^27.4.3",
44+
"next-auth": "workspace:*"
4245
}
4346
}

‎packages/adapter-dynamodb/tests/index.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { DynamoDB } from "@aws-sdk/client-dynamodb"
22
import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb"
33
import { DynamoDBAdapter } from "../src"
4-
import { runBasicTests } from "adapter-test"
4+
import { runBasicTests } from "@next-auth/adapter-test"
55
import { format } from "../src/"
66
const config = {
77
endpoint: "http://127.0.0.1:8000",

0 commit comments

Comments
 (0)