Merge branch 'canary' into hrmny/template-edge-ssr-loader

vercel · Oct 20, 2023 · 1bd66f8 · 1bd66f8
2 parents 3d6c7f1 + 888c3a7
commit 1bd66f8
Show file tree

Hide file tree

Showing 1,056 changed files with 27,879 additions and 19,696 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -100,17 +100,8 @@
           }
         ],
         "no-use-before-define": "off",
-        "@typescript-eslint/no-use-before-define": [
-          "warn",
-          {
-            "functions": true,
-            "classes": true,
-            "variables": true,
-            "enums": true,
-            "typedefs": true
-          }
-        ],
         "no-useless-constructor": "off",
+        "@typescript-eslint/no-use-before-define": "off",
         "@typescript-eslint/no-useless-constructor": "warn",
         "@typescript-eslint/prefer-literal-enum-member": "error"
       }
@@ -318,14 +309,7 @@
         "ignoreRestSiblings": true
       }
     ],
-    "no-use-before-define": [
-      "warn",
-      {
-        "functions": false,
-        "classes": false,
-        "variables": false
-      }
-    ],
+    "no-use-before-define": "off",
     "no-useless-computed-key": "warn",
     "no-useless-concat": "warn",
     "no-useless-constructor": "warn",

diff --git a/.github/actions/needs-triage/action.yaml b/.github/actions/needs-triage/action.yaml
@@ -2,5 +2,5 @@ name: 'Issue auto label'
 description: 'vercel/next.js specific auto-labeling action'
 author: 'Next.js team'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'index.js'
diff --git a/.github/actions/next-stats-action/Dockerfile b/.github/actions/next-stats-action/Dockerfile
@@ -9,7 +9,7 @@ RUN apt install unzip wget curl nano htop screen build-essential pkg-config libs
 
 RUN ln $(which python3) /usr/bin/python
 
-RUN curl -sfLS https://install-node.vercel.app/v18 | bash -s -- -f
+RUN curl -sfLS https://install-node.vercel.app/v18.17.0 | bash -s -- -f
 RUN corepack enable
 
 WORKDIR /next-stats

diff --git a/.github/actions/next-stats-action/package.json b/.github/actions/next-stats-action/package.json
@@ -18,7 +18,7 @@
     "typescript": "5.1.6"
   },
   "engines": {
-    "node": ">=16.14.0",
+    "node": ">=18.17.0",
     "pnpm": "8.9.0"
   },
   "packageManager": "pnpm@8.9.0"

diff --git a/.github/actions/validate-docs-links/src/index.ts b/.github/actions/validate-docs-links/src/index.ts
@@ -189,7 +189,7 @@ async function prepareDocumentMapEntry(
 // Checks if the links point to existing documents
 function validateInternalLink(errors: Errors, href: string): void {
   // /docs/api/example#heading -> ["api/example", "heading""]
-  const [link, hash] = href.replace(DOCS_PATH, '').split('#')
+  const [link, hash] = href.replace(DOCS_PATH, '').split('#', 2)
 
   let foundPage
 

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -8,8 +8,7 @@ on:
 env:
   NAPI_CLI_VERSION: 2.16.2
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
   CARGO_PROFILE_RELEASE_LTO: 'true'
   TURBO_TEAM: 'vercel'
   TURBO_REMOTE_ONLY: 'true'

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -9,8 +9,7 @@ on:
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 8
   # disable backtrace for test snapshots
   RUST_BACKTRACE: 0
@@ -147,7 +146,7 @@ jobs:
         group: [1, 2, 3, 4, 5]
     uses: ./.github/workflows/build_reusable.yml
     with:
-      nodeVersion: 16
+      nodeVersion: 18.17.0
       skipForDocsOnly: 'yes'
       afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.json" TURBOPACK=1 node run-tests.js --timings -g ${{ matrix.group }}/5 -c ${TEST_CONCURRENCY} --type integration
     secrets: inherit
@@ -212,7 +211,7 @@ jobs:
 
     uses: ./.github/workflows/build_reusable.yml
     with:
-      nodeVersion: 16
+      nodeVersion: 18.17.0
       skipForDocsOnly: 'yes'
       afterBuild: node run-tests.js --timings -g ${{ matrix.group }}/12 -c ${TEST_CONCURRENCY} --type integration
     secrets: inherit

diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml
@@ -57,8 +57,7 @@ on:
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 8
   # disable backtrace for test snapshots
   RUST_BACKTRACE: 0

diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
@@ -18,8 +18,7 @@ name: Code Freeze
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
 
 jobs:
   start:

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -7,8 +7,7 @@ name: Generate Pull Request Stats
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 6
 
   TURBO_TEAM: 'vercel'

diff --git a/.github/workflows/test_e2e_deploy.yml b/.github/workflows/test_e2e_deploy.yml
@@ -10,14 +10,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     env:
       VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
       VERCEL_TEST_TEAM: vtest314-next-e2e-tests
       DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
       NAPI_CLI_VERSION: 2.16.2
       TURBO_VERSION: 1.10.9
-      NODE_MAINTENANCE_VERSION: 16
-      NODE_LTS_VERSION: 18
+      NODE_LTS_VERSION: 20
       CARGO_PROFILE_RELEASE_LTO: 'true'
       TURBO_TEAM: 'vercel'
       TURBO_REMOTE_ONLY: 'true'
@@ -50,7 +50,7 @@ jobs:
       - run: RESET_VC_PROJECT=true node scripts/reset-vercel-project.mjs
         name: Reset test project
 
-      - run: docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.35.1-jammy /bin/bash -c "cd /work && NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && corepack enable > /dev/null && DATADOG_TRACE_NEXTJS_TEST=TRUE DATADOG_API_KEY=${DATADOG_API_KEY} DD_ENV=ci VERCEL_TEST_TOKEN=${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TEAM=vtest314-next-e2e-tests NEXT_TEST_JOB=1 NEXT_TEST_MODE=deploy TEST_TIMINGS_TOKEN=${{ secrets.TEST_TIMINGS_TOKEN }} NEXT_TEST_CONTINUE_ON_ERROR=1 xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 2 >> /proc/1/fd/1"
+      - run: docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.35.1-jammy /bin/bash -c "cd /work && NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && corepack enable > /dev/null && DATADOG_TRACE_NEXTJS_TEST=TRUE DATADOG_API_KEY=${DATADOG_API_KEY} DD_ENV=ci VERCEL_TEST_TOKEN=${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TEAM=vtest314-next-e2e-tests NEXT_TEST_JOB=1 NEXT_TEST_MODE=deploy TEST_TIMINGS_TOKEN=${{ secrets.TEST_TIMINGS_TOKEN }} NEXT_TEST_CONTINUE_ON_ERROR=1 xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1"
         name: Run test/e2e (deploy)
 
       - name: Upload test trace

diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18]
+        node: [18, 20]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -37,7 +37,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           check-latest: true
       - run: corepack enable
 

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
@@ -30,8 +30,7 @@ name: Trigger Release
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
 
 jobs:
   start:

diff --git a/.github/workflows/update_fonts_data.yml b/.github/workflows/update_fonts_data.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
 
 jobs:
   create-pull-request: