Merge branch 'canary' into fix/500_response_status

Author: dpnolte

.cargo/config.toml

@@ -35,8 +35,4 @@ rustflags = [
   "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
   "-Aclippy::too_many_arguments",
-  # Clippy's needless mut lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11299
-  "-Aclippy::needless_pass_by_ref_mut",
-  # Clippy's partial_eq lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11178
-  "-Aclippy::non_canonical_partial_ord_impl",
 ]

.eslintrc.json

@@ -213,6 +213,18 @@
         ],
         "eslint-plugin/require-meta-docs-url": "error"
       }
+    },
+    {
+      "files": ["packages/**/*.tsx", "packages/**/*.ts"],
+      "rules": {
+        "@typescript-eslint/consistent-type-imports": [
+          "error",
+          {
+            "disallowTypeAnnotations": false
+          }
+        ],
+        "@typescript-eslint/no-import-type-side-effects": "error"
+      }
     }
   ],
   "rules": {

.github/CODEOWNERS

@@ -28,13 +28,13 @@
 
 # Tooling & Telemetry
 
-/packages/next/src/build/                                @timneutkens @ijjk @shuding @huozhi @ztanner @vercel/web-tooling
-/packages/next/src/server/lib/router-utils/setup-dev.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
-/packages/next/src/telemetry/                            @timneutkens @ijjk @shuding @padmaia
-/packages/next-swc/                                      @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-Cargo.toml                                               @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-Cargo.lock                                               @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/.cargo/config.toml                                      @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/.config/nextest.toml                                    @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/test/build-turbopack-tests-manifest.js                  @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
-/test/turbopack-tests-manifest.json                      @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/packages/next/src/build/                                        @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/web-tooling
+/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/web-tooling
+/packages/next/src/telemetry/                                    @timneutkens @ijjk @shuding @padmaia
+/packages/next-swc/                                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+Cargo.toml                                                       @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+Cargo.lock                                                       @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/.cargo/config.toml                                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/.config/nextest.toml                                            @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/test/build-turbopack-tests-manifest.js                          @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling
+/test/turbopack-tests-manifest.json                              @timneutkens @ijjk @shuding @huozhi @vercel/web-tooling

.github/actions/next-stats-action/package.json

@@ -4,7 +4,6 @@
   "dependencies": {
     "async-sema": "^3.1.0",
     "execa": "2.0.3",
-    "fs-extra": "^8.1.0",
     "get-port": "^5.0.0",
     "glob": "^7.1.4",
     "gzip-size": "^5.1.1",
@@ -20,7 +19,7 @@
   },
   "engines": {
     "node": ">=16.14.0",
-    "pnpm": "8.7.1"
+    "pnpm": "8.9.0"
   },
-  "packageManager": "pnpm@8.7.1"
+  "packageManager": "pnpm@8.9.0"
 }

.github/actions/next-stats-action/src/add-comment.js

@@ -24,6 +24,8 @@ const shortenLabel = (itemKey) =>
     : itemKey
 
 const twoMB = 2 * 1024 * 1024
+const ONE_HUNDRED_BYTES = 100
+const ONE_HUNDRED_MS = 100
 
 module.exports = async function addComment(
   results = [],
@@ -82,24 +84,21 @@ module.exports = async function addComment(
         // otherwise only show gzip values
         else if (!isGzipItem && !groupKey.match(gzipIgnoreRegex)) return
 
-        if (
-          !itemKey.startsWith('buildDuration') ||
-          (isBenchmark && itemKey.match(/req\/sec/))
-        ) {
-          if (typeof mainItemVal === 'number') mainRepoTotal += mainItemVal
-          if (typeof diffItemVal === 'number') diffRepoTotal += diffItemVal
-        }
-
         // calculate the change
         if (mainItemVal !== diffItemVal) {
           if (
             typeof mainItemVal === 'number' &&
             typeof diffItemVal === 'number'
           ) {
-            change = round(diffItemVal - mainItemVal, 2)
+            const roundedValue = round(diffItemVal - mainItemVal, 2)
 
             // check if there is still a change after rounding
-            if (change !== 0) {
+            if (
+              roundedValue !== 0 &&
+              ((prettyType === 'ms' && roundedValue > ONE_HUNDRED_MS) ||
+                (prettyType === 'bytes' && roundedValue > ONE_HUNDRED_BYTES))
+            ) {
+              change = roundedValue
               const absChange = Math.abs(change)
               const warnIfNegative = isBenchmark && itemKey.match(/req\/sec/)
               const warn = warnIfNegative
@@ -112,12 +111,22 @@ module.exports = async function addComment(
               change = `${warn}${change < 0 ? '-' : '+'}${
                 useRawValue ? absChange : prettify(absChange, prettyType)
               }`
+            } else {
+              change = 'N/A'
             }
           } else {
             change = 'N/A'
           }
         }
 
+        if (
+          (change !== 'N/A' && !itemKey.startsWith('buildDuration')) ||
+          (isBenchmark && itemKey.match(/req\/sec/))
+        ) {
+          if (typeof mainItemVal === 'number') mainRepoTotal += mainItemVal
+          if (typeof diffItemVal === 'number') diffRepoTotal += diffItemVal
+        }
+
         groupTable += `| ${
           isBenchmark ? itemKey : shortenLabel(itemKey)
         } | ${mainItemStr} | ${diffItemStr} | ${change} |\n`
@@ -169,8 +178,7 @@ module.exports = async function addComment(
 
     // add diffs
     if (result.diffs) {
-      const diffHeading = '#### Diffs\n'
-      let diffContent = diffHeading
+      let diffContent = ''
 
       Object.keys(result.diffs).forEach((itemKey) => {
         const curDiff = result.diffs[itemKey]
@@ -187,8 +195,11 @@ module.exports = async function addComment(
         diffContent += `\n</details>\n`
       })
 
-      if (diffContent !== diffHeading) {
+      if (diffContent.length > 0) {
+        resultContent += `<details>\n`
+        resultContent += `<summary><strong>Diff details</strong></summary>\n\n`
         resultContent += diffContent
+        resultContent += `\n</details>\n\n`
       }
     }
     let increaseDecreaseNote = ''
@@ -199,7 +210,7 @@ module.exports = async function addComment(
       increaseDecreaseNote = ' (Decrease detected ✓)'
     }
 
-    comment += `<details>\n`
+    comment += `<details open>\n`
     comment += `<summary><strong>${result.title}</strong>${increaseDecreaseNote}</summary>\n\n<br/>\n\n`
     comment += resultContent
     comment += '</details>\n'

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

@@ -1,5 +1,6 @@
 const path = require('path')
-const fs = require('fs-extra')
+const fs = require('fs/promises')
+const { existsSync } = require('fs')
 const exec = require('./util/exec')
 const logger = require('./util/logger')
 const runConfigs = require('./run')
@@ -21,7 +22,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
 
 ;(async () => {
   try {
-    if (await fs.pathExists(path.join(__dirname, '../SKIP_NEXT_STATS.txt'))) {
+    if (existsSync(path.join(__dirname, '../SKIP_NEXT_STATS.txt'))) {
       console.log(
         'SKIP_NEXT_STATS.txt file present, exiting stats generation..'
       )
@@ -100,7 +101,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
     for (const dir of repoDirs) {
       logger(`Running initial build for ${dir}`)
       if (!actionInfo.skipClone) {
-        const usePnpm = await fs.pathExists(path.join(dir, 'pnpm-lock.yaml'))
+        const usePnpm = existsSync(path.join(dir, 'pnpm-lock.yaml'))
 
         if (!statsConfig.skipInitialInstall) {
           await exec.spawnPromise(
@@ -121,15 +122,13 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
       }
 
       await fs
-        .copy(
+        .cp(
           path.join(__dirname, '../native'),
-          path.join(dir, 'packages/next-swc/native')
+          path.join(dir, 'packages/next-swc/native'),
+          { recursive: true, force: true }
         )
         .catch(console.error)
 
-      console.log(await exec(`ls ${path.join(__dirname, '../native')}`))
-      console.log(await exec(`cd ${dir} && ls ${dir}/packages/next-swc/native`))
-
       logger(`Linking packages in ${dir}`)
       const isMainRepo = dir === mainRepoDir
       const pkgPaths = await linkPackages({