Merge branch 'canary' into exprimental-warning-fix

vercel · Jun 16, 2022 · 0ce8972 · 0ce8972
2 parents d8fb286 + a4abc1e
commit 0ce8972
Show file tree

Hide file tree

Showing 9 changed files with 438 additions and 16 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -344,6 +344,7 @@ jobs:
     env:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
+      TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
@@ -401,6 +402,7 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
       NEXT_TEST_REACT_VERSION: ^17
+      TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
@@ -543,6 +545,7 @@ jobs:
     env:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
+      TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
@@ -590,6 +593,7 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
       NEXT_TEST_REACT_VERSION: ^17
+      TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
     strategy:
       fail-fast: false
       matrix:

diff --git a/errors/manifest.json b/errors/manifest.json
@@ -4,6 +4,10 @@
       "title": "Messages",
       "heading": true,
       "routes": [
+        {
+          "title": "middleware-upgrade-guide",
+          "path": "/errors/middleware-upgrade-guide.md"
+        },
         {
           "title": "react-hydration-error",
           "path": "/errors/react-hydration-error.md"