Merge branch 'canary' into web-vitals-attribution-2

.github/CODEOWNERS

@@ -4,6 +4,7 @@
 *          @timneutkens @ijjk @shuding @huozhi
 /.github/  @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @balazsorban44
 /docs/     @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @balazsorban44
+/errors/   @balazsorban44
 /examples/ @timneutkens @ijjk @shuding @leerob @steven-tey @balazsorban44
 
 # SWC Build & Telemetry (@padmaia)

.github/actions/next-stats-action/src/run/index.js

@@ -253,9 +253,13 @@ async function linkPkgs(pkgDir = '', pkgPaths) {
   await fs.writeFile(pkgJsonPath, JSON.stringify(pkgData, null, 2), 'utf8')
 
   await fs.remove(yarnEnvValues.YARN_CACHE_FOLDER)
-  await exec(`cd ${pkgDir} && pnpm install`, false, {
-    env: yarnEnvValues,
-  })
+  await exec(
+    `cd ${pkgDir} && pnpm install --strict-peer-dependencies=false`,
+    false,
+    {
+      env: yarnEnvValues,
+    }
+  )
 }
 
 module.exports = runConfigs

.github/pull_request_template.md

@@ -1,14 +1,14 @@
 <!--
 Thanks for opening a PR! Your contribution is much appreciated.
-In order to make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
+To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
 Choose the right checklist for the change that you're making:
 -->
 
 ## Bug
 
 - [ ] Related issues linked using `fixes #number`
 - [ ] Integration tests added
-- [ ] Errors have helpful link attached, see `contributing.md`
+- [ ] Errors have a helpful link attached, see `contributing.md`
 
 ## Feature
 
@@ -17,9 +17,9 @@ Choose the right checklist for the change that you're making:
 - [ ] Integration tests added
 - [ ] Documentation added
 - [ ] Telemetry added. In case of a feature if it's used or not.
-- [ ] Errors have helpful link attached, see `contributing.md`
+- [ ] Errors have a helpful link attached, see `contributing.md`
 
 ## Documentation / Examples
 
 - [ ] Make sure the linting passes by running `pnpm lint`
-- [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
+- [ ] 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

@@ -9,7 +9,7 @@ name: Build, test, and deploy
 env:
   NAPI_CLI_VERSION: 2.7.0
   TURBO_VERSION: 1.3.2-canary.1
-  RUST_TOOLCHAIN: nightly-2022-06-12
+  RUST_TOOLCHAIN: nightly-2022-09-14
   PNPM_VERSION: 7.2.1
 
 jobs:
@@ -1008,7 +1008,7 @@ jobs:
       - run: npm i -g pnpm@${PNPM_VERSION}
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
       - run: ./scripts/publish-native.js $GITHUB_REF
-      - run: ./scripts/publish-release.sh
+      - run: ./scripts/publish-release.js
 
   testDeployE2E:
     name: E2E (deploy)

.github/workflows/validate_issue.yml

@@ -15,4 +15,3 @@ jobs:
         run: node ./.github/actions/issue-validator/index.mjs
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DEBUG: 1

.vscode/launch.json

@@ -9,92 +9,81 @@
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["run", "debug-react-exp", "dev", "test/e2e/app-dir/app"],
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["debug-react-exp", "dev", "test/e2e/app-dir/app"],
       "skipFiles": ["<node_internals>/**"],
-      "outFiles": ["${workspaceFolder}/packages/next/dist/**/*"],
-      "port": 9229,
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK5": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
       }
     },
     {
       "name": "Launch app development",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["run", "debug", "dev", "bench/nested-deps"],
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["debug", "dev", "examples/hello-world"],
       "skipFiles": ["<node_internals>/**"],
-      "outFiles": ["${workspaceFolder}/packages/next/dist/**/*"],
-      "port": 9229,
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK5": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
       }
     },
     {
       "name": "Launch app build",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["run", "debug", "build", "bench/nested-deps"],
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["debug", "build", "examples/hello-world"],
       "skipFiles": ["<node_internals>/**"],
-      "port": 9229,
-      "outFiles": ["${workspaceFolder}/packages/next/dist/**/*"],
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK5": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
       }
     },
     {
-      "name": "Launch app build trace jaeger",
+      "name": "Launch app production",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["run", "clean-trace-jaeger"],
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["debug", "start", "examples/hello-world"],
       "skipFiles": ["<node_internals>/**"],
-      "port": 9229,
-      "outFiles": ["${workspaceFolder}/packages/next/dist/**/*"],
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK5": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
       }
     },
     {
-      "name": "Launch app production",
+      "name": "Launch current directory in development",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["run", "debug", "start", "bench/nested-deps"],
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["debug", "dev", "${fileDirname}"],
       "skipFiles": ["<node_internals>/**"],
-      "port": 9229,
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK5": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
       }
     },
     {
+      "name": "Launch app build trace jaeger",
       "type": "node",
-      "request": "attach",
-      "name": "Attach to existing debugger",
-      "port": 9229,
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["clean-trace-jaeger"],
       "skipFiles": ["<node_internals>/**"],
-      "outFiles": ["${workspaceFolder}/packages/next/dist/**/*"],
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK5": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
       }
     },
     {
-      "name": "Launch this example",
       "type": "node",
-      "request": "launch",
-      "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["run", "debug", "dev", "${fileDirname}"],
-      "skipFiles": ["<node_internals>/**"],
+      "request": "attach",
+      "name": "Attach to existing debugger",
       "port": 9229,
+      "skipFiles": ["<node_internals>/**"],
       "env": {
-        "NEXT_PRIVATE_LOCAL_WEBPACK5": "1"
+        "NEXT_PRIVATE_LOCAL_WEBPACK": "1"
       }
     }
   ]

.vscode/settings.json

@@ -5,5 +5,10 @@
     { "language": "typescript", "autoFix": true },
     { "language": "typescriptreact", "autoFix": true }
   ],
-  "debug.javascript.unmapMissingSources": true
+  "debug.javascript.unmapMissingSources": true,
+  "files.exclude": {
+    "**/node_modules": false,
+    "node_modules": true,
+    "*[!test]**/node_modules": true
+  }
 }

bench/nested-deps/package.json

@@ -1,11 +1,11 @@
 {
   "scripts": {
     "prepare": "rimraf components && mkdir components && node ./fuzzponent.js -d 2 -s 206 -o components",
-    "dev": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK5=1 node ../../node_modules/next/dist/bin/next dev",
-    "build": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK5=1 node ../../node_modules/next/dist/bin/next build",
-    "start": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK5=1 node ../../node_modules/next/dist/bin/next start",
+    "dev": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK=1 node ../../node_modules/next/dist/bin/next dev",
+    "build": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK=1 node ../../node_modules/next/dist/bin/next build",
+    "start": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK=1 node ../../node_modules/next/dist/bin/next start",
     "dev-nocache": "rimraf .next && yarn dev",
-    "dev-cpuprofile-nocache": "rimraf .next && cross-env NEXT_PRIVATE_LOCAL_WEBPACK5=1 node --cpu-prof ../../node_modules/next/dist/bin/next",
+    "dev-cpuprofile-nocache": "rimraf .next && cross-env NEXT_PRIVATE_LOCAL_WEBPACK=1 node --cpu-prof ../../node_modules/next/dist/bin/next",
     "build-nocache": "rimraf .next && yarn build"
   },
   "devDependencies": {