[pull] canary from vercel:canary

lerna.json

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

packages/create-next-app/package.json

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

packages/devlow-bench/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/devlow-bench",
-  "version": "16.4.0-canary.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "description": "ESLint configuration used by Next.js.",
   "license": "MIT",
   "repository": {
@@ -12,7 +12,7 @@
     "dist"
   ],
   "dependencies": {
-    "@next/eslint-plugin-next": "16.4.0-canary.31",
+    "@next/eslint-plugin-next": "16.4.0-canary.32",
     "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

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

packages/next-mdx/package.json

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

packages/next-playwright/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/playwright",
-  "version": "16.4.0-canary.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "keywords": [
     "react",
     "next",

packages/next-rspack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-rspack",
-  "version": "16.4.0-canary.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "private": true,
   "files": [
     "native/"

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "16.4.0-canary.31",
+  "version": "16.4.0-canary.32",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -100,7 +100,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "16.4.0-canary.31",
+    "@next/env": "16.4.0-canary.32",
     "@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.5",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "16.4.0-canary.31",
-    "@next/polyfill-module": "16.4.0-canary.31",
-    "@next/polyfill-nomodule": "16.4.0-canary.31",
-    "@next/react-refresh-utils": "16.4.0-canary.31",
-    "@next/swc": "16.4.0-canary.31",
+    "@next/font": "16.4.0-canary.32",
+    "@next/polyfill-module": "16.4.0-canary.32",
+    "@next/polyfill-nomodule": "16.4.0-canary.32",
+    "@next/react-refresh-utils": "16.4.0-canary.32",
+    "@next/swc": "16.4.0-canary.32",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.61.0",
     "@rspack/core": "1.6.7",

packages/react-refresh-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "16.4.0-canary.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+  "version": "16.4.0-canary.32",
   "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.31",
+    "next": "16.4.0-canary.32",
     "outdent": "0.8.0",
     "prettier": "2.5.1",
     "typescript": "6.0.2"

test/e2e/app-dir/nx-handling/nx-handling.test.ts

@@ -4,14 +4,12 @@ describe('nx-handling', () => {
   const { next } = nextTestSetup({
     skipDeployment: true,
     files: __dirname,
-    installCommand: 'npm i',
-    buildCommand: 'npm run build',
-    startCommand: isNextDev ? 'npm run dev' : 'npm run start',
+    buildCommand: 'pnpm run build',
+    startCommand: isNextDev ? 'pnpm run dev' : 'pnpm run start',
     packageJson: {
       name: '@nx-next/source',
       version: '0.0.0',
       private: true,
-      packageManager: 'npm@10.9.2',
       scripts: {
         build: 'rm -rf dist; nx run next-nx-test:build',
         dev: 'nx run next-nx-test:dev',

test/e2e/app-dir/nx-handling/package.json

@@ -6,7 +6,7 @@
     "build": "nx run next-nx-test:build",
     "dev": "nx run next-nx-test:dev",
     "start": "nx run next-nx-test:serve:production",
-    "repro": "rm -rf dist && npm run build && npm run start"
+    "repro": "rm -rf dist && pnpm run build && pnpm run start"
   },
   "private": true,
   "dependencies": {
@@ -27,6 +27,5 @@
   },
   "workspaces": [
     "apps/*"
-  ],
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  ]
 }

test/e2e/app-dir/nx-handling/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+packages:
+  - 'apps/*'

test/e2e/filesystem-cache/evict-after-snapshot.test.ts

@@ -1,4 +1,5 @@
 import { nextTestSetup } from 'e2e-utils'
+import { getPnpmRealpathWorkaround } from '../../lib/pnpm-realpath-workaround'
 import { retry, waitFor } from 'next-test-utils'
 
 // Eviction requires the dev server (HMR) and persistent caching (Turbopack).
@@ -8,25 +9,20 @@ import { retry, waitFor } from 'next-test-utils'
 // @force-gate !deploy
 // @force-gate dev
 describe('evict-after-snapshot', () => {
-  const envVars = [
-    'ENABLE_CACHING=1',
-    'TURBO_ENGINE_IGNORE_DIRTY=1',
-    'TURBO_ENGINE_SNAPSHOT_IDLE_TIMEOUT_MILLIS=1000',
+  const env = {
+    ENABLE_CACHING: '1',
+    TURBO_ENGINE_IGNORE_DIRTY: '1',
+    TURBO_ENGINE_SNAPSHOT_IDLE_TIMEOUT_MILLIS: '1000',
     // Persist even tiny snapshots so the test doesn't depend on the
     // minimum-compilation-time threshold.
-    'TURBO_ENGINE_SNAPSHOT_MIN_ACTIVE_TIME_MILLIS=0',
-    'ENABLE_EVICTION=1',
-  ].join(' ')
+    TURBO_ENGINE_SNAPSHOT_MIN_ACTIVE_TIME_MILLIS: '0',
+    ENABLE_EVICTION: '1',
+  }
 
   const { next } = nextTestSetup({
     files: __dirname,
-    packageJson: {
-      scripts: {
-        dev: `${envVars} next dev`,
-      },
-    },
-    installCommand: 'npm i',
-    startCommand: 'npm run dev',
+    overrideFiles: getPnpmRealpathWorkaround(),
+    env,
   })
 
   async function waitForSnapshotAndEviction() {