Merge branch 'canary' into schniz/ec-612-pick-up-modules-exposing-edg…

…e-light-when
vercel · Jan 24, 2023 · c7b0c75 · c7b0c75
2 parents 23240e6 + b386f68
commit c7b0c75
Show file tree

Hide file tree

Showing 124 changed files with 3,559 additions and 310 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -73,6 +73,7 @@ jobs:
         run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: cache-pnpm-store
         with:
           path: ${{ steps.get-store-path.outputs.STORE_PATH }}
@@ -101,6 +102,7 @@ jobs:
         run: echo "WEEK=$(date +%U)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: cache-build
         with:
           path: ./*
@@ -119,6 +121,7 @@ jobs:
       - run: npm i -g pnpm@${PNPM_VERSION}
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: restore-build
         with:
           path: ./*
@@ -131,6 +134,7 @@ jobs:
     needs: build
     steps:
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: restore-build
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         with:
@@ -152,13 +156,15 @@ jobs:
 
       - name: Cache cargo registry
         uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.swc-change.outputs.SWC_CHANGE == 'yup' }}
         with:
           path: ~/.cargo/registry
           key: stable-ubuntu-clippy-cargo-registry
 
       - name: Cache cargo index
         uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.swc-change.outputs.SWC_CHANGE == 'yup' }}
         with:
           path: ~/.cargo/git
@@ -197,6 +203,7 @@ jobs:
         if: ${{needs.build.outputs.docsChange == 'nope'}}
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -233,6 +240,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -272,6 +280,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -332,6 +341,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -391,6 +401,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -441,6 +452,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -486,6 +498,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ needs.build.outputs.docsChange == 'nope' }}
         id: restore-build
         with:
@@ -561,6 +574,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -616,6 +630,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -663,6 +678,7 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
     steps:
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -691,6 +707,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -715,6 +732,7 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
     steps:
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -754,6 +772,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: restore-build
         with:
           path: ./*
@@ -784,6 +803,7 @@ jobs:
       VERCEL_TEST_TEAM: vtest314-next-e2e-tests
     steps:
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: restore-build
         with:
           path: ./*
@@ -823,6 +843,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: restore-build
         with:
           path: ./*
@@ -857,13 +878,15 @@ jobs:
 
       - name: Cache cargo registry
         uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/registry
           key: stable-ubuntu-latest-cargo-registry
 
       - name: Cache cargo index
         uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/git
@@ -876,6 +899,7 @@ jobs:
       - name: Turbo Cache
         id: turbo-cache
         uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: .turbo
@@ -895,6 +919,7 @@ jobs:
       # So we get latest cache
       - name: Cache built files
         uses: actions/cache@v3
+        timeout-minutes: 2
         with:
           path: ./packages/next-swc/target
           key: next-swc-cargo-cache-dev-ubuntu-latest-${{ hashFiles('**/Cargo.lock') }}
@@ -962,6 +987,7 @@ jobs:
 
     steps:
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -1146,6 +1172,7 @@ jobs:
       # So we get latest cache
       - name: Cache built files
         uses: actions/cache@v3
+        timeout-minutes: 2
         with:
           path: ./packages/next-swc/target
           key: next-swc-cargo-cache-${{ matrix.settings.target }}--${{ hashFiles('**/Cargo.lock') }}
@@ -1170,12 +1197,14 @@ jobs:
 
       - name: Cache cargo registry
         uses: actions/cache@v3
+        timeout-minutes: 2
         with:
           path: ~/.cargo/registry
           key: ${{ matrix.settings.target }}-cargo-registry
 
       - name: Cache cargo index
         uses: actions/cache@v3
+        timeout-minutes: 2
         with:
           path: ~/.cargo/git
           key: ${{ matrix.settings.target }}-cargo-index
@@ -1354,6 +1383,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         id: restore-build
         with:
@@ -1381,6 +1411,7 @@ jobs:
       - name: Turbo Cache
         id: turbo-cache
         uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         with:
           path: .turbo
@@ -1440,6 +1471,7 @@ jobs:
           check-latest: true
 
       - uses: actions/cache@v3
+        timeout-minutes: 2
         id: restore-build
         if: ${{needs.build.outputs.docsChange == 'nope'}}
         with:

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -28,14 +28,16 @@ jobs:
         id: docs-change
 
       - name: Cache cargo registry
-        uses: actions/cache@v1
+        uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/registry
           key: stable-ubuntu-latest-node@14-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v1
+        uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: ~/.cargo/git
@@ -48,6 +50,7 @@ jobs:
       - name: Turbo Cache
         id: turbo-cache
         uses: actions/cache@v3
+        timeout-minutes: 2
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           path: .turbo
@@ -62,6 +65,7 @@ jobs:
       # So we get latest cache
       - name: Cache built files
         uses: actions/cache@v3
+        timeout-minutes: 2
         with:
           path: ./packages/next-target
           key: next-swc-cargo-cache-ubuntu-latest--${{ hashFiles('**/Cargo.lock') }}

diff --git a/contributing/core/testing.md b/contributing/core/testing.md
@@ -38,8 +38,6 @@ When you run an e2e test, a local version of next will be created inside your sy
 which is then linked to the app, also created inside a temp folder. A server is started on a random port, against which the tests will run.
 After all tests have finished, the server is destroyed and all remaining files are deleted from the temp folder.
 
-You will need `yarn` for running e2e tests. Installing it `corepack` won't work because `next.js` is `pnpm` workspace.
-
 ## Writing tests for Next.js
 
 ### Getting Started

diff --git a/docs/testing.md b/docs/testing.md
@@ -86,7 +86,7 @@ export default function About() {
 Add a test to check your navigation is working correctly:
 
 ```jsx
-// cypress/integration/app.spec.js
+// cypress/e2e/app.cy.js
 
 describe('Navigation', () => {
   it('should navigate to the about page', () => {

diff --git a/errors/invalid-new-link-with-extra-anchor.md b/errors/invalid-new-link-with-extra-anchor.md
@@ -14,7 +14,7 @@ npx @next/codemod new-link .
 
 This will change `<Link><a id="link">Home<a></Link>` to `<Link id="link">Home</Link>`.
 
-Alternatively, you can add the `legacyBehavior` prop `<Link legacyBehavior><a id="link">Home<a></Link>`.
+Alternatively, you can add the `legacyBehavior` prop `<Link legacyBehavior><a id="link">Home</a></Link>`.
 
 ### Useful Links
 

diff --git a/examples/convex/package.json b/examples/convex/package.json
@@ -10,7 +10,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "convex": "latest",
+    "convex": "0.6.0",
     "next": "latest",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/examples/with-mqtt-js/README.md b/examples/with-mqtt-js/README.md
@@ -14,8 +14,14 @@ Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packag
 
 ```bash
 npx create-next-app --example with-mqtt-js with-mqtt-js-app
-# or
-yarn create-next-app --example with-mqtt-js with-mqtt-js-app
+```
+
+```bash
+yarn create next-app --example with-mqtt-js with-mqtt-js-app
+```
+
+```bash
+pnpm create next-app --example with-mqtt-js with-mqtt-js-app
 ```
 
 To set up a connection URI with a mqtt client, copy the `.env.local.example` file in this directory to `.env.local` (which will be ignored by Git):

diff --git a/jest.config.js b/jest.config.js
@@ -9,6 +9,7 @@ const customJestConfig = {
   setupFilesAfterEnv: ['<rootDir>/jest-setup-after-env.ts'],
   verbose: true,
   rootDir: 'test',
+  roots: ['<rootDir>', '<rootDir>/../packages/next/src/'],
   modulePaths: ['<rootDir>/lib'],
   transformIgnorePatterns: ['/next[/\\\\]dist/', '/\\.next/'],
   globals: {

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.1.5-canary.2"
+  "version": "13.1.6-canary.0"
 }