[pull] canary from vercel:canary

.github/workflows/next-maintainer-auto-close.yml

@@ -1,8 +1,8 @@
 name: Next Maintainer Auto Close
 
 on:
-  # schedule:
-  #   - cron: '0 * * * *'
+  schedule:
+    - cron: '0 * * * *'
   workflow_dispatch:
 
 permissions: {}

lerna.json

@@ -15,5 +15,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "16.4.0-canary.15"
+  "version": "16.4.0-canary.16"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "keywords": [
     "react",
     "next",

packages/devlow-bench/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/devlow-bench",
   "private": true,
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "Benchmarking tool for the developer workflow",
   "repository": {
     "type": "git",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "ESLint configuration used by Next.js.",
   "license": "MIT",
   "repository": {
@@ -12,7 +12,7 @@
     "dist"
   ],
   "dependencies": {
-    "@next/eslint-plugin-next": "16.4.0-canary.15",
+    "@next/eslint-plugin-next": "16.4.0-canary.16",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^3.5.2",
     "eslint-plugin-import": "^2.32.0",

packages/eslint-plugin-internal/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@next/eslint-plugin-internal",
   "private": true,
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "ESLint plugin for working on Next.js.",
   "exports": {
     ".": "./src/eslint-plugin-internal.js"

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/font/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-playwright/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/playwright",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-playwright"

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-routing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/routing",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "keywords": [
     "react",
     "next",

packages/next-rspack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-rspack",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-rspack"

packages/next-swc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "private": true,
   "files": [
     "native/"

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -100,7 +100,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "16.4.0-canary.15",
+    "@next/env": "16.4.0-canary.16",
     "@swc/helpers": "0.5.23",
     "baseline-browser-mapping": "^2.9.19",
     "caniuse-lite": "^1.0.30001579",
@@ -164,11 +164,11 @@
     "@modelcontextprotocol/sdk": "1.18.1",
     "@mswjs/interceptors": "0.42.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "16.4.0-canary.15",
-    "@next/polyfill-module": "16.4.0-canary.15",
-    "@next/polyfill-nomodule": "16.4.0-canary.15",
-    "@next/react-refresh-utils": "16.4.0-canary.15",
-    "@next/swc": "16.4.0-canary.15",
+    "@next/font": "16.4.0-canary.16",
+    "@next/polyfill-module": "16.4.0-canary.16",
+    "@next/polyfill-nomodule": "16.4.0-canary.16",
+    "@next/react-refresh-utils": "16.4.0-canary.16",
+    "@next/swc": "16.4.0-canary.16",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.61.0",
     "@rspack/core": "1.6.7",

packages/next/src/cli/next-info.ts

@@ -78,12 +78,15 @@ async function getNextConfig() {
 function getBinaryVersion(binaryName: string) {
   try {
     return childProcess
-      .execFileSync(binaryName, ['--version'])
+      .execFileSync(binaryName, ['--version'], { stdio: 'pipe' })
       .toString()
       .trim()
   } catch {
     try {
-      return childProcess.execSync(`${binaryName} --version`).toString().trim()
+      return childProcess
+        .execSync(`${binaryName} --version`, { stdio: 'pipe' })
+        .toString()
+        .trim()
     } catch {
       return 'N/A'
     }

packages/react-refresh-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

packages/third-parties/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "16.4.0-canary.15",
+  "version": "16.4.0-canary.16",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "16.4.0-canary.15",
+    "next": "16.4.0-canary.16",
     "outdent": "0.8.0",
     "prettier": "2.5.1",
     "typescript": "6.0.2"

test/deploy-tests-manifest.json

@@ -104,7 +104,6 @@
       "test/e2e/app-dir/modularizeimports/modularizeimports.test.ts",
       "test/e2e/app-dir/third-parties/basic.test.ts",
       "test/e2e/app-dir/app-static/app-static-custom-handler.test.ts",
-      "test/e2e/app-dir/options-request/options-request.test.ts",
       "test/e2e/app-dir/revalidate-dynamic/revalidate-dynamic.test.ts",
       "test/e2e/app-dir/syntax-highlighter-crash/syntax-highlighter-crash.test.ts",
       "test/e2e/new-link-behavior/stitches.test.ts",
@@ -117,8 +116,7 @@
       "test/e2e/postcss-config-cjs/index.test.ts",
       "test/e2e/socket-io/index.test.ts",
       "test/e2e/middleware-matcher/index.test.ts",
-      "test/e2e/next-script/index.test.ts",
-      "test/production/standalone-mode/**/*"
+      "test/e2e/next-script/index.test.ts"
     ]
   }
 }

test/e2e/cli/cli.test.ts

@@ -4,6 +4,7 @@ import path, { join } from 'path'
 // @ts-expect-error
 import pkg from 'next/package'
 import http from 'http'
+import { promises as fs } from 'fs'
 import stripAnsi from 'strip-ansi'
 import type { ChildProcess } from 'child_process'
 
@@ -1151,6 +1152,44 @@ Next.js Config:
       matchInfoOutput(info.stdout)
     })
 
+    test('should not leak package manager command errors', async () => {
+      const marker = 'next-info-yarn-command-not-found'
+      const binDir = await fs.mkdtemp(join(next.testDir, 'next-info-bin-'))
+      const pathKey =
+        Object.keys(process.env).find((key) => key.toLowerCase() === 'path') ??
+        'PATH'
+      const yarnPath = join(
+        binDir,
+        process.platform === 'win32' ? 'yarn.cmd' : 'yarn'
+      )
+
+      try {
+        await fs.writeFile(
+          yarnPath,
+          process.platform === 'win32'
+            ? `@echo off\r\necho ${marker} 1>&2\r\nexit /b 1\r\n`
+            : `#!/bin/sh\necho ${marker} >&2\nexit 1\n`
+        )
+        if (process.platform !== 'win32') {
+          await fs.chmod(yarnPath, 0o755)
+        }
+
+        const info = await next.runCommand(['info'], {
+          env: {
+            [pathKey]: `${binDir}${path.delimiter}${process.env[pathKey] ?? ''}`,
+            // Match issue #97932's npm project so the fake Yarn only exercises
+            // binary version detection, not registry discovery.
+            npm_config_user_agent: 'npm',
+          },
+        })
+
+        expect(info.stdout).toContain('Yarn: N/A')
+        expect(info.stderr).not.toContain(marker)
+      } finally {
+        await fs.rm(binDir, { recursive: true, force: true })
+      }
+    })
+
     test('should print output with next.config.mjs', async () => {
       let info = { stdout: '', stderr: '' }
       const originalPkg = await next.readFile('package.json')