Merge branch 'canary' into sam/fetch-cache/fix-check

vercel · Apr 22, 2024 · 67dc59c · 67dc59c
2 parents 8f72817 + 3ea57cd
commit 67dc59c
Show file tree

Hide file tree

Showing 159 changed files with 922 additions and 564 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.16.2
-  TURBO_VERSION: 1.13.2
+  TURBO_VERSION: 1.12.5
   NODE_LTS_VERSION: 20
   CARGO_PROFILE_RELEASE_LTO: 'true'
   TURBO_TEAM: 'vercel'

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.2
+  TURBO_VERSION: 1.12.5
   NODE_MAINTENANCE_VERSION: 18
   NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 8

diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml
@@ -52,7 +52,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.2
+  TURBO_VERSION: 1.12.5
   NODE_LTS_VERSION: 20.9.0
   TEST_CONCURRENCY: 8
   # disable backtrace for test snapshots

diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
@@ -17,7 +17,7 @@ name: Code Freeze
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.2
+  TURBO_VERSION: 1.12.5
   NODE_LTS_VERSION: 20
 
 jobs:

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -6,7 +6,7 @@ name: Generate Pull Request Stats
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.2
+  TURBO_VERSION: 1.12.5
   NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 6
 

diff --git a/.github/workflows/test_e2e_deploy.yml b/.github/workflows/test_e2e_deploy.yml
diff --git a/.github/workflows/test_e2e_deploy_related.yml b/.github/workflows/test_e2e_deploy_related.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test:
-    if: github.repository_owner == 'vercel'
+    if: '!github.event.pull_request.head.repo.fork'
     runs-on: ubuntu-latest
 
     env:
@@ -22,7 +22,7 @@ jobs:
       TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
       TURBO_REMOTE_ONLY: 'true'
       TURBO_TEAM: 'vercel'
-      TURBO_VERSION: 1.13.2
+      TURBO_VERSION: 1.12.5
       VERCEL_TEST_TEAM: vtest314-next-e2e-tests
       VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
 
@@ -54,11 +54,11 @@ jobs:
       - name: Run tests
         run: |
           docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \
-          NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \
+          NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \ 
           corepack enable > /dev/null && \
           NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
           DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
-          DD_ENV=${{ env.DD_ENV }} \
+          DD_ENV=${{ env.DD_ENV }} \ 
           VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
           VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
           NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \

diff --git a/.github/workflows/test_e2e_deploy_scheduled.yml b/.github/workflows/test_e2e_deploy_scheduled.yml
@@ -26,7 +26,7 @@ jobs:
       TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
       TURBO_REMOTE_ONLY: 'true'
       TURBO_TEAM: 'vercel'
-      TURBO_VERSION: 1.13.2
+      TURBO_VERSION: 1.12.5
       VERCEL_TEST_TEAM: vtest314-next-e2e-tests
       VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
 
@@ -60,11 +60,11 @@ jobs:
       - name: Run tests
         run: |
           docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \
-          NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \
+          NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \ 
           corepack enable > /dev/null && \
           NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
           DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
-          DD_ENV=${{ env.DD_ENV }} \
+          DD_ENV=${{ env.DD_ENV }} \ 
           VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
           VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
           NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
@@ -29,7 +29,7 @@ name: Trigger Release
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.2
+  TURBO_VERSION: 1.12.5
   NODE_LTS_VERSION: 20
 
 jobs:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,44 +9,79 @@
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["debug", "dev", "test/e2e/app-dir/app"],
+      "runtimeExecutable": "node",
+      "runtimeArgs": [
+        "packages/next/dist/bin/next",
+        "dev",
+        "test/e2e/app-dir/app"
+      ],
       "skipFiles": ["<node_internals>/**"],
+      "sourceMapPathOverrides": {
+        "webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
+        "webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
+      },
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1",
+        "NEXT_TELEMETRY_DISABLED": "1"
       }
     },
     {
       "name": "Launch test/e2e/app-dir/app build",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["debug", "build", "test/e2e/app-dir/app"],
+      "runtimeExecutable": "node",
+      "runtimeArgs": [
+        "packages/next/dist/bin/next",
+        "build",
+        "test/e2e/app-dir/app"
+      ],
       "skipFiles": ["<node_internals>/**"],
+      "sourceMapPathOverrides": {
+        "webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
+        "webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
+      },
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1",
+        "NEXT_TELEMETRY_DISABLED": "1"
       }
     },
     {
       "name": "Launch examples/hello-world development",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["debug", "dev", "examples/hello-world"],
+      "runtimeExecutable": "node",
+      "runtimeArgs": [
+        "packages/next/dist/bin/next",
+        "dev",
+        "examples/hello-world"
+      ],
       "skipFiles": ["<node_internals>/**"],
+      "sourceMapPathOverrides": {
+        "webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
+        "webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
+      },
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1",
+        "NEXT_TELEMETRY_DISABLED": "1"
       }
     },
     {
       "name": "Launch examples/hello-world build",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["debug", "build", "examples/hello-world"],
+      "runtimeExecutable": "node",
+      "runtimeArgs": [
+        "packages/next/dist/bin/next",
+        "build",
+        "examples/hello-world"
+      ],
+      "sourceMapPathOverrides": {
+        "webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
+        "webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
+      },
       "skipFiles": ["<node_internals>/**"],
       "env": {
         "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
@@ -57,23 +92,37 @@
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["debug", "start", "examples/hello-world"],
+      "runtimeExecutable": "node",
+      "runtimeArgs": [
+        "packages/next/dist/bin/next",
+        "start",
+        "examples/hello-world"
+      ],
       "skipFiles": ["<node_internals>/**"],
+      "sourceMapPathOverrides": {
+        "webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
+        "webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
+      },
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1",
+        "NEXT_TELEMETRY_DISABLED": "1"
       }
     },
     {
       "name": "Launch current directory in development",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["debug", "dev", "${fileDirname}"],
+      "runtimeExecutable": "node",
+      "runtimeArgs": ["packages/next/dist/bin/next", "dev", "${fileDirname}"],
       "skipFiles": ["<node_internals>/**"],
+      "sourceMapPathOverrides": {
+        "webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
+        "webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
+      },
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1",
+        "NEXT_TELEMETRY_DISABLED": "1"
       }
     },
     {