[pull] canary from vercel:canary

.eslintignore

@@ -34,3 +34,4 @@ packages/next-swc/crates/**
 bench/nested-deps/pages/**
 bench/nested-deps/components/**
 packages/next-bundle-analyzer/index.d.ts
+examples/with-typescript-graphql/lib/gql/

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -44,7 +44,7 @@ body:
   - type: input
     attributes:
       label: Link to reproduction
-      description: A link to a GitHub repository, a [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template), or a [CodeSandbox](https://codesandbox.io/s/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue.
+      description: A link to a GitHub repository, a [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template), or a [CodeSandbox](https://codesandbox.io/s/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue.
     validations:
       required: true
   - type: textarea

.github/pull_request_template.md

@@ -21,5 +21,5 @@ Choose the right checklist for the change that you're making:
 
 ## Documentation / Examples
 
-- [ ] Make sure the linting passes by running `pnpm lint`
+- [ ] Make sure the linting passes by running `pnpm build && pnpm lint`
 - [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)

.github/workflows/build_test_deploy.yml

@@ -316,82 +316,6 @@ jobs:
           path: |
             test/traces
 
-  testDevReact17:
-    name: Test Development (react v17)
-    runs-on: ubuntu-latest
-    needs: [build, build-native-test]
-    env:
-      NEXT_TELEMETRY_DISABLED: 1
-      NEXT_TEST_JOB: 1
-      NEXT_TEST_REACT_VERSION: ^17
-    strategy:
-      fail-fast: false
-      matrix:
-        group: [1, 2]
-    steps:
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          node-version: 16
-          check-latest: true
-
-      - run: echo ${{needs.build.outputs.docsChange}}
-
-      # https://github.com/actions/virtual-environments/issues/1187
-      - name: tune linux network
-        run: sudo ethtool -K eth0 tx off rx off
-
-      - uses: actions/cache@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        id: restore-build
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
-
-      - uses: actions/download-artifact@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          name: next-swc-test-binary
-          path: packages/next-swc/native
-
-      - run: npm i -g pnpm@${PNPM_VERSION}
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npm i -g playwright-chromium@1.22.2 && npx playwright install-deps
-        timeout-minutes: 10
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npx @replayio/playwright install chromium
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: node run-tests.js --type development --timings -g ${{ matrix.group }}/2
-        name: Run test/development
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        env:
-          RECORD_REPLAY_METADATA_TEST_RUN_TITLE: testDevReact17 / Group ${{ matrix.group }}
-          RECORD_ALL_CONTENT: 1
-          RECORD_REPLAY: 1
-          RECORD_REPLAY_TEST_METRICS: 1
-          RECORD_REPLAY_WEBHOOK_URL: ${{ secrets.RECORD_REPLAY_WEBHOOK_URL }}
-
-      - uses: replayio/action-upload@v0.4.5
-        if: always()
-        with:
-          api-key: rwk_iKsQnEoQwKd31WAJxgN9ARPFuAlyXlVrDH4uhYpRnti
-          public: true
-          filter: ${{ 'function($v) { $v.metadata.test.result = "failed" }' }}
-
-      - name: Upload test trace
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-trace
-          if-no-files-found: ignore
-          retention-days: 2
-          path: |
-            test/traces
-
   testDevE2E:
     name: Test Development (E2E)
     runs-on: ubuntu-latest
@@ -471,84 +395,6 @@ jobs:
           path: |
             test/traces
 
-  testDevE2EReact17:
-    name: Test Development (E2E) (react v17)
-    runs-on: ubuntu-latest
-    needs: [build, build-native-test]
-    env:
-      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:
-        group: [1, 2, 3]
-    steps:
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          node-version: 16
-          check-latest: true
-
-      - run: echo ${{needs.build.outputs.docsChange}}
-
-      # https://github.com/actions/virtual-environments/issues/1187
-      - name: tune linux network
-        run: sudo ethtool -K eth0 tx off rx off
-
-      - uses: actions/cache@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        id: restore-build
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
-
-      - uses: actions/download-artifact@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          name: next-swc-test-binary
-          path: packages/next-swc/native
-
-      - run: npm i -g pnpm@${PNPM_VERSION}
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npm i -g playwright-chromium@1.22.2 && npx playwright install-deps
-        timeout-minutes: 10
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npx @replayio/playwright install chromium
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: node run-tests.js --type e2e --timings -g ${{ matrix.group }}/3
-        name: Run test/e2e (dev)
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        env:
-          RECORD_REPLAY_METADATA_TEST_RUN_TITLE: testDevE2EReact17 / Group ${{ matrix.group }}
-          RECORD_ALL_CONTENT: 1
-          RECORD_REPLAY: 1
-          NEXT_TEST_MODE: dev
-          RECORD_REPLAY_TEST_METRICS: 1
-          RECORD_REPLAY_WEBHOOK_URL: ${{ secrets.RECORD_REPLAY_WEBHOOK_URL }}
-
-      - uses: replayio/action-upload@v0.4.5
-        if: always()
-        with:
-          api-key: rwk_iKsQnEoQwKd31WAJxgN9ARPFuAlyXlVrDH4uhYpRnti
-          public: true
-          filter: ${{ 'function($v) { $v.metadata.test.result = "failed" }' }}
-
-      - name: Upload test trace
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-trace
-          if-no-files-found: ignore
-          retention-days: 2
-          path: |
-            test/traces
-
   testProd:
     name: Test Production
     runs-on: ubuntu-latest
@@ -616,72 +462,6 @@ jobs:
           public: true
           filter: ${{ 'function($v) { $v.metadata.test.result = "failed" }' }}
 
-  testProdReact17:
-    name: Test Production (react v17)
-    runs-on: ubuntu-latest
-    needs: [build, build-native-test]
-    env:
-      NEXT_TELEMETRY_DISABLED: 1
-      NEXT_TEST_JOB: 1
-      NEXT_TEST_REACT_VERSION: ^17
-    strategy:
-      fail-fast: false
-      matrix:
-        group: [1, 2]
-    steps:
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          node-version: 16
-          check-latest: true
-
-      - run: echo ${{needs.build.outputs.docsChange}}
-
-      # https://github.com/actions/virtual-environments/issues/1187
-      - name: tune linux network
-        run: sudo ethtool -K eth0 tx off rx off
-
-      - uses: actions/cache@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        id: restore-build
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
-
-      - uses: actions/download-artifact@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          name: next-swc-test-binary
-          path: packages/next-swc/native
-
-      - run: npm i -g pnpm@${PNPM_VERSION}
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npm i -g playwright-chromium@1.22.2 && npx playwright install-deps
-        timeout-minutes: 10
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npx @replayio/playwright install chromium
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: node run-tests.js --type production --timings -g ${{ matrix.group }}/2
-        name: Run test/production
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        env:
-          RECORD_REPLAY_METADATA_TEST_RUN_TITLE: testProdReact17 / Group ${{ matrix.group }}
-          RECORD_ALL_CONTENT: 1
-          RECORD_REPLAY: 1
-          RECORD_REPLAY_TEST_METRICS: 1
-          RECORD_REPLAY_WEBHOOK_URL: ${{ secrets.RECORD_REPLAY_WEBHOOK_URL }}
-
-      - uses: replayio/action-upload@v0.4.5
-        if: always()
-        with:
-          api-key: rwk_iKsQnEoQwKd31WAJxgN9ARPFuAlyXlVrDH4uhYpRnti
-          public: true
-          filter: ${{ 'function($v) { $v.metadata.test.result = "failed" }' }}
-
   testProdE2E:
     name: Test Production (E2E)
     runs-on: ubuntu-latest
@@ -751,74 +531,6 @@ jobs:
           public: true
           filter: ${{ 'function($v) { $v.metadata.test.result = "failed" }' }}
 
-  testProdE2EReact17:
-    name: Test Production (E2E) (react v17)
-    runs-on: ubuntu-latest
-    needs: [build, build-native-test]
-    env:
-      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:
-        group: [1, 2, 3]
-    steps:
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          node-version: ${{ matrix.node }}
-          check-latest: true
-
-      - run: echo ${{needs.build.outputs.docsChange}}
-
-      # https://github.com/actions/virtual-environments/issues/1187
-      - name: tune linux network
-        run: sudo ethtool -K eth0 tx off rx off
-
-      - uses: actions/cache@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        id: restore-build
-        with:
-          path: ./*
-          key: ${{ github.sha }}-${{ github.run_number }}
-
-      - uses: actions/download-artifact@v3
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        with:
-          name: next-swc-test-binary
-          path: packages/next-swc/native
-
-      - run: npm i -g pnpm@${PNPM_VERSION}
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npm i -g playwright-chromium@1.22.2 && npx playwright install-deps
-        timeout-minutes: 10
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: npx @replayio/playwright install chromium
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-
-      - run: node run-tests.js --type e2e --timings -g ${{ matrix.group }}/3
-        name: Run test/e2e (production)
-        if: ${{needs.build.outputs.docsChange == 'nope'}}
-        env:
-          RECORD_REPLAY_METADATA_TEST_RUN_TITLE: testProdE2EReact17 / Group ${{ matrix.group }}
-          RECORD_ALL_CONTENT: 1
-          RECORD_REPLAY: 1
-          NEXT_TEST_MODE: start
-          RECORD_REPLAY_TEST_METRICS: 1
-          RECORD_REPLAY_WEBHOOK_URL: ${{ secrets.RECORD_REPLAY_WEBHOOK_URL }}
-
-      - uses: replayio/action-upload@v0.4.5
-        if: always()
-        with:
-          api-key: rwk_iKsQnEoQwKd31WAJxgN9ARPFuAlyXlVrDH4uhYpRnti
-          public: true
-          filter: ${{ 'function($v) { $v.metadata.test.result = "failed" }' }}
-
   testIntegration:
     name: Test Integration
     runs-on: ubuntu-latest
@@ -1455,18 +1167,19 @@ jobs:
             target: 'i686-pc-windows-msvc'
           - host: ubuntu-latest
             target: 'x86_64-unknown-linux-gnu'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-x64
             build: >-
               set -e &&
               rustup toolchain install "${RUST_TOOLCHAIN}" &&
               rustup default "${RUST_TOOLCHAIN}" &&
               rustup target add x86_64-unknown-linux-gnu &&
               npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" && if [ ! -f $(dirname $(which yarn))/pnpm ]; then ln -s $(which yarn) $(dirname $(which yarn))/pnpm;fi &&
+              unset CC_x86_64_unknown_linux_gnu && unset CC &&
               turbo run build-native --cache-dir=".turbo" -- --release --target x86_64-unknown-linux-gnu &&
               strip packages/next-swc/native/next-swc.*.node
           - host: ubuntu-latest
             target: 'x86_64-unknown-linux-musl'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-alpine
             build: >-
               set -e &&
               rustup toolchain install "${RUST_TOOLCHAIN}" &&
@@ -1488,7 +1201,7 @@ jobs:
               strip -x packages/next-swc/native/next-swc.*.node
           - host: ubuntu-latest
             target: 'aarch64-unknown-linux-gnu'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-aarch64
             build: >-
               set -e &&
               export JEMALLOC_SYS_WITH_LG_PAGE=16 &&
@@ -1540,7 +1253,7 @@ jobs:
               ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip packages/next-swc/native/next-swc.*.node
           - host: ubuntu-latest
             target: 'aarch64-unknown-linux-musl'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-alpine
             build: >-
               set -e &&
               export JEMALLOC_SYS_WITH_LG_PAGE=16 &&

.prettierignore_staged

@@ -7,6 +7,6 @@ packages/next/bundles/webpack/packages/*.runtime.js
 lerna.json
 packages/next-codemod/transforms/__testfixtures__/**/*
 packages/next-codemod/transforms/__tests__/**/*
-pnpm-lock.yam
+pnpm-lock.yaml
 .github/actions/issue-validator/index.mjs
-**/convex/_generated/**
+**/convex/_generated/**

.vscode/launch.json

@@ -10,7 +10,7 @@
       "request": "launch",
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["debug-react-exp", "dev", "test/e2e/app-dir/app"],
+      "runtimeArgs": ["debug", "dev", "test/e2e/app-dir/app"],
       "skipFiles": ["<node_internals>/**"],
       "env": {
         "NEXT_PRIVATE_LOCAL_WEBPACK": "1"