From f494291c7385d50e5e8cba65258893925808fa43 Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Mon, 24 Jul 2023 23:35:40 +0700 Subject: [PATCH 01/11] Update index.ts --- packages/adapter-prisma/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/adapter-prisma/src/index.ts b/packages/adapter-prisma/src/index.ts index 1d48d7268a..4700425289 100644 --- a/packages/adapter-prisma/src/index.ts +++ b/packages/adapter-prisma/src/index.ts @@ -13,6 +13,7 @@ * npm install prisma --save-dev * ``` * + * * @module @auth/prisma-adapter */ import type { PrismaClient, Prisma } from "@prisma/client" From 5e9b1fa81dd8e67034347e2e0875fe77323e6dcd Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 13:09:17 +0700 Subject: [PATCH 02/11] Revert "Update index.ts" This reverts commit f494291c7385d50e5e8cba65258893925808fa43. --- packages/adapter-prisma/src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/adapter-prisma/src/index.ts b/packages/adapter-prisma/src/index.ts index 4700425289..1d48d7268a 100644 --- a/packages/adapter-prisma/src/index.ts +++ b/packages/adapter-prisma/src/index.ts @@ -13,7 +13,6 @@ * npm install prisma --save-dev * ``` * - * * @module @auth/prisma-adapter */ import type { PrismaClient, Prisma } from "@prisma/client" From 8222edd3ed331eacd3d7dbd808fdea8b5562f4df Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 20:25:18 +0700 Subject: [PATCH 03/11] try this --- .github/workflows/release.yml | 8 +++++-- package.json | 2 +- pnpm-lock.yaml | 44 +++++++++++++++++------------------ pnpm-workspace.yaml | 2 ++ 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 007d88da00..65255cd91d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,6 +56,10 @@ on: - "adapter-upstash-redis" - "adapter-xata" - "next-auth" +env: + TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} + TURBO_TEAM: ${{ secrets.TURBO_TEAM }} + FORCE_COLOR: true jobs: test: @@ -81,8 +85,8 @@ jobs: 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 }} + # TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} + # TURBO_TEAM: ${{ secrets.TURBO_TEAM }} # - name: Run E2E tests # if: github.repository == 'nextauthjs/next-auth' # run: pnpm e2e diff --git a/package.json b/package.json index e9db985c85..93e577a371 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "eslint-plugin-svelte3": "^4.0.0", "prettier": "2.8.1", "prettier-plugin-svelte": "^2.8.1", - "turbo": "1.10.1", + "turbo": "^1.10.3", "typescript": "4.9.4" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e7282180c0..77f78e9c3a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,7 +27,7 @@ importers: eslint-plugin-svelte3: ^4.0.0 prettier: 2.8.1 prettier-plugin-svelte: ^2.8.1 - turbo: 1.10.1 + turbo: ^1.10.3 typescript: 4.9.4 devDependencies: '@actions/core': 1.10.0 @@ -48,7 +48,7 @@ importers: eslint-plugin-svelte3: 4.0.0_eslint@8.30.0 prettier: 2.8.1 prettier-plugin-svelte: 2.8.1_prettier@2.8.1 - turbo: 1.10.1 + turbo: 1.10.11 typescript: 4.9.4 apps/dev/nextjs: @@ -27800,65 +27800,65 @@ packages: engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} dev: true - /turbo-darwin-64/1.10.1: - resolution: {integrity: sha512-isLLoPuAOMNsYovOq9BhuQOZWQuU13zYsW988KkkaA4OJqOn7qwa9V/KBYCJL8uVQqtG+/Y42J37lO8RJjyXuA==} + /turbo-darwin-64/1.10.11: + resolution: {integrity: sha512-pHNz6D5XUVB+bgZMKXIOegvH9GzPXucwgiHFatQcRoscAW1te1Zvn3fAWYo/mJ550AqPWQLmALZZel3z3lllLA==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64/1.10.1: - resolution: {integrity: sha512-x1nloPR10fLElNCv17BKr0kCx/O5gse/UXAcVscMZH2tvRUtXrdBmut62uw2YU3J9hli2fszYjUWXkulVpQvFA==} + /turbo-darwin-arm64/1.10.11: + resolution: {integrity: sha512-j3yGAvkBu0BqR+5nb9LiRs8UZsUQDOqpdP4S9OW3+W5jorJIxUxLawwk3XqoYVGhmPh84LWWOOrMgFQ/Y/3WSg==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64/1.10.1: - resolution: {integrity: sha512-abV+ODCeOlz0503OZlHhPWdy3VwJZc1jObf1VQj7uQM+JqJ/kXbMyqJIMQVz+m7QJUFdferYPRxGhYT/NbYK7Q==} + /turbo-linux-64/1.10.11: + resolution: {integrity: sha512-FZ+/VT3Yt188VvPuvqIwIyvosYALzu7e8ewxpl8yiYDwQbLwxMOEt2UKACsL+D7wzNtIMPRDxNmnhNvTbx9Afw==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64/1.10.1: - resolution: {integrity: sha512-zRC3nZbHQ63tofOmbuySzEn1ROISWTkemYYr1L98rpmT5aVa0kERlGiYcfDwZh3cBso/Ylg/wxexRAaPzcCJYQ==} + /turbo-linux-arm64/1.10.11: + resolution: {integrity: sha512-IfxO8S1FiikunmUnlul1sd5piPlunU1QlnNNGFfhKJkMidkJ0rXsSbh2epn/pXO8RRPBnFRxYkp6gJz/FTUUTg==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64/1.10.1: - resolution: {integrity: sha512-Irqz8IU+o7Q/5V44qatZBTunk+FQAOII1hZTsEU54ah62f9Y297K6/LSp+yncmVQOZlFVccXb6MDqcETExIQtA==} + /turbo-windows-64/1.10.11: + resolution: {integrity: sha512-5qwTEk27duxYIsDycgZdpti1b41Xu2D3W+WRlg++sylwqhAgcPhfcppXMGd70h/SScgIh7IeLjzgTK7+YPE77g==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64/1.10.1: - resolution: {integrity: sha512-124IT15d2gyjC+NEn11pHOaVFvZDRHpxfF+LDUzV7YxfNIfV0mGkR3R/IyVXtQHOgqOdtQTbC4y411sm31+SEw==} + /turbo-windows-arm64/1.10.11: + resolution: {integrity: sha512-FGvWCWvii4PZqy+4VBoanKaMkqeRD146iHL67YpY5sp8z5H/Gkywtu8xxBbkgP14lBr6fAsyRarHBuR+c52cDg==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo/1.10.1: - resolution: {integrity: sha512-wq0YeSv6P/eEDXOL42jkMUr+T4z34dM8mdHu5u6C6OOAq8JuLJ72F/v4EVR1JmY8icyTkFz10ICLV0haUUYhbQ==} + /turbo/1.10.11: + resolution: {integrity: sha512-6GzYbsG5Ro6dK62dJuBjA53RdpMr1PWVwN6ZZRSMgYgkvFmNDMwxzJUKuCSi+jfDSt6avwT7koNlwRPfgTFuOw==} hasBin: true requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.10.1 - turbo-darwin-arm64: 1.10.1 - turbo-linux-64: 1.10.1 - turbo-linux-arm64: 1.10.1 - turbo-windows-64: 1.10.1 - turbo-windows-arm64: 1.10.1 + turbo-darwin-64: 1.10.11 + turbo-darwin-arm64: 1.10.11 + turbo-linux-64: 1.10.11 + turbo-linux-arm64: 1.10.11 + turbo-windows-64: 1.10.11 + turbo-windows-arm64: 1.10.11 dev: true /tweetnacl/0.14.5: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 3764a36163..53d4fd79df 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,3 +2,5 @@ packages: - "packages/*" - "apps/dev/*" - "docs" + # Below excludes are only for Turbo because it doesn't respect gitignore like pnpm does + - '!**/.vercel/**' From 2f021d533a5920882d273a4dd54714e1060ddf8e Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 20:38:01 +0700 Subject: [PATCH 04/11] Update release.yml --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 65255cd91d..0fdc314d0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,12 +79,20 @@ jobs: cache: "pnpm" - name: Install dependencies run: pnpm install + # Reset changes so that Turbo can reuse the old build cache + - name: Reset changes + run: git reset --hard - name: Run tests run: pnpm test timeout-minutes: 15 env: UPSTASH_REDIS_URL: ${{ secrets.UPSTASH_REDIS_URL }} UPSTASH_REDIS_KEY: ${{ secrets.UPSTASH_REDIS_KEY }} + - name: Upload Turbo artifacts + uses: actions/upload-artifact@v3 + with: + name: turbo-report + path: next-auth/next-auth/.turbo/runs/ # TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} # TURBO_TEAM: ${{ secrets.TURBO_TEAM }} # - name: Run E2E tests From 7a76b7ca2c2a5b76abfdd911fa2bf8300577ca56 Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 20:49:31 +0700 Subject: [PATCH 05/11] Update release.yml --- .github/workflows/release.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0fdc314d0d..19e07cd922 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,9 +79,8 @@ jobs: cache: "pnpm" - name: Install dependencies run: pnpm install - # Reset changes so that Turbo can reuse the old build cache - - name: Reset changes - run: git reset --hard + - name: Build + run: pnpm build - name: Run tests run: pnpm test timeout-minutes: 15 @@ -92,7 +91,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: turbo-report - path: next-auth/next-auth/.turbo/runs/ + path: .turbo/runs/ # TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} # TURBO_TEAM: ${{ secrets.TURBO_TEAM }} # - name: Run E2E tests From 54d5e0c2e944c68957f5c0cfc209f92c9748578d Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 21:23:54 +0700 Subject: [PATCH 06/11] try --- .github/workflows/release.yml | 6 ++---- package.json | 2 +- turbo.json | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 19e07cd922..6f6d9b8c4a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,8 +57,6 @@ on: - "adapter-xata" - "next-auth" env: - TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} - TURBO_TEAM: ${{ secrets.TURBO_TEAM }} FORCE_COLOR: true jobs: @@ -87,13 +85,13 @@ jobs: 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: Upload Turbo artifacts uses: actions/upload-artifact@v3 with: name: turbo-report path: .turbo/runs/ - # TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} - # TURBO_TEAM: ${{ secrets.TURBO_TEAM }} # - name: Run E2E tests # if: github.repository == 'nextauthjs/next-auth' # run: pnpm e2e diff --git a/package.json b/package.json index 93e577a371..af3aff569a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "build:app": "turbo run build --filter=next-auth-app", "build:docs": "turbo run build --filter=docs", - "build": "turbo run build --filter=next-auth --filter=@next-auth/* --filter=@auth/* --no-deps", + "build": "turbo run build --filter=next-auth --filter=@next-auth/* --filter=@auth/* --no-deps --summarize", "test": "turbo run test --concurrency=1 --summarize --filter=[HEAD^1] --filter=./packages/* --filter=!@*upstash* --filter=!*dynamodb-* --filter=!*app*", "clean": "turbo run clean --no-cache", "dev:db": "turbo run dev --parallel --continue --filter=next-auth-app...", diff --git a/turbo.json b/turbo.json index 49f4eeb3a9..c6a0d5937a 100644 --- a/turbo.json +++ b/turbo.json @@ -46,6 +46,7 @@ "cache": false }, "test": { + "env": ["UPSTASH_REDIS_KEY", "UPSTASH_REDIS_URL"], "outputMode": "new-only" }, "e2e": { From 00972a4ea5f3649f5e3f38d3475a9e04e1e7365f Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 21:40:29 +0700 Subject: [PATCH 07/11] Update turbo.json --- turbo.json | 1 - 1 file changed, 1 deletion(-) diff --git a/turbo.json b/turbo.json index c6a0d5937a..49f4eeb3a9 100644 --- a/turbo.json +++ b/turbo.json @@ -46,7 +46,6 @@ "cache": false }, "test": { - "env": ["UPSTASH_REDIS_KEY", "UPSTASH_REDIS_URL"], "outputMode": "new-only" }, "e2e": { From 57e94e7017ab9a86b05fb0a66c7a2b3049a533ab Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 21:53:41 +0700 Subject: [PATCH 08/11] Update release.yml --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f6d9b8c4a..0d39d2259b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,6 +79,9 @@ jobs: run: pnpm install - name: Build run: pnpm build + env: + TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} + TURBO_TEAM: ${{ secrets.TURBO_TEAM }} - name: Run tests run: pnpm test timeout-minutes: 15 From a5e56687e0bb60fcefb6c7a2f36d7135fb365e61 Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 22:07:37 +0700 Subject: [PATCH 09/11] Update README.md --- packages/next-auth/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/next-auth/README.md b/packages/next-auth/README.md index d9743432c3..fee24f620b 100644 --- a/packages/next-auth/README.md +++ b/packages/next-auth/README.md @@ -259,3 +259,4 @@ our [Contributing Guide](https://github.com/nextauthjs/.github/blob/main/CONTRIB ## License ISC + From 7183c429b418a91d74638bb05db2efe9825d83a7 Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 22:24:27 +0700 Subject: [PATCH 10/11] Revert "Update README.md" This reverts commit a5e56687e0bb60fcefb6c7a2f36d7135fb365e61. --- packages/next-auth/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/next-auth/README.md b/packages/next-auth/README.md index fee24f620b..d9743432c3 100644 --- a/packages/next-auth/README.md +++ b/packages/next-auth/README.md @@ -259,4 +259,3 @@ our [Contributing Guide](https://github.com/nextauthjs/.github/blob/main/CONTRIB ## License ISC - From 40c6e5353871b15815e57fb0a1e925033c52d280 Mon Sep 17 00:00:00 2001 From: Thang Vu Date: Tue, 25 Jul 2023 22:26:31 +0700 Subject: [PATCH 11/11] Update pnpm-workspace.yaml --- pnpm-workspace.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 53d4fd79df..fd7036ba85 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,5 +2,4 @@ packages: - "packages/*" - "apps/dev/*" - "docs" - # Below excludes are only for Turbo because it doesn't respect gitignore like pnpm does - - '!**/.vercel/**' + \ No newline at end of file