code · pull · Aug 29, 2026 · Aug 28, 2026 · Aug 28, 2026 · Aug 28, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lerna.json b/lerna.json
@@ -15,5 +15,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "16.4.0-canary.10"
+  "version": "16.4.0-canary.11"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "keywords": [
     "react",
     "next",

diff --git a/packages/devlow-bench/package.json b/packages/devlow-bench/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vercel/devlow-bench",
   "private": true,
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "description": "Benchmarking tool for the developer workflow",
   "repository": {
     "type": "git",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "description": "ESLint configuration used by Next.js.",
   "license": "MIT",
   "repository": {
@@ -12,7 +12,7 @@
     "dist"
   ],
   "dependencies": {
-    "@next/eslint-plugin-next": "16.4.0-canary.10",
+    "@next/eslint-plugin-next": "16.4.0-canary.11",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^3.5.2",
     "eslint-plugin-import": "^2.32.0",

diff --git a/packages/eslint-plugin-internal/package.json b/packages/eslint-plugin-internal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/eslint-plugin-internal",
   "private": true,
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "description": "ESLint plugin for working on Next.js.",
   "exports": {
     ".": "./src/eslint-plugin-internal.js"

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/bin/transform.ts b/packages/next-codemod/bin/transform.ts
@@ -80,7 +80,7 @@ export async function runTransform(
     transformer = res.transformer
   }
 
-  if (transformer === 'next-request-geo-ip') {
+  if (transformer === 'next-request-geo-ip' && !options.nonInteractive) {
     const { isAppDeployedToVercel } = await prompts(
       {
         type: 'confirm',
@@ -139,7 +139,7 @@ export async function runTransform(
   args.push('--ignore-pattern=**/node_modules/**')
   args.push('--ignore-pattern=**/.next/**')
 
-  args.push('--extensions=tsx,ts,jsx,js')
+  args.push('--extensions=tsx,ts,jsx,js,mjs')
 
   args = args.concat(['--transform', transformerPath])
 

diff --git a/packages/next-codemod/bin/upgrade.ts b/packages/next-codemod/bin/upgrade.ts
@@ -447,7 +447,11 @@ export async function runUpgrade(
   runInstallation(packageManager, { cwd })
 
   for (const codemod of codemods) {
-    await runTransform(codemod, cwd, { force: true, verbose })
+    await runTransform(codemod, cwd, {
+      force: true,
+      verbose,
+      nonInteractive,
+    })
   }
 
   // To reduce user-side burden of selecting which codemods to run as it needs additional

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-playwright/package.json b/packages/next-playwright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/playwright",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-playwright"

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "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",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-routing/package.json b/packages/next-routing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/routing",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-rspack/package.json b/packages/next-rspack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-rspack",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-rspack"

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "private": true,
   "files": [
     "native/"

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "16.4.0-canary.10",
+  "version": "16.4.0-canary.11",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -100,7 +100,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "16.4.0-canary.10",
+    "@next/env": "16.4.0-canary.11",
     "@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.10",
-    "@next/polyfill-module": "16.4.0-canary.10",
-    "@next/polyfill-nomodule": "16.4.0-canary.10",
-    "@next/react-refresh-utils": "16.4.0-canary.10",
-    "@next/swc": "16.4.0-canary.10",
+    "@next/font": "16.4.0-canary.11",
+    "@next/polyfill-module": "16.4.0-canary.11",
+    "@next/polyfill-nomodule": "16.4.0-canary.11",
+    "@next/react-refresh-utils": "16.4.0-canary.11",
+    "@next/swc": "16.4.0-canary.11",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.61.0",
     "@rspack/core": "1.6.7",

diff --git a/packages/next/src/client/components/segment-cache/optimistic-routes.ts b/packages/next/src/client/components/segment-cache/optimistic-routes.ts
@@ -921,7 +921,7 @@ function matchKnownRoutePart(
         ) {
           resolvedParams.set(
             paramName,
-            pathnameParts.slice(partIndex).join('/')
+            pathnameParts.slice(partIndex).map(canonicalizeURLPart).join('/')
           )
           return { part: dynamicPart, pattern: dynamicPattern }
         }
@@ -932,7 +932,7 @@ function matchKnownRoutePart(
           if (urlPart !== null) {
             resolvedParams.set(
               paramName,
-              pathnameParts.slice(partIndex).join('/')
+              pathnameParts.slice(partIndex).map(canonicalizeURLPart).join('/')
             )
             return { part: dynamicPart, pattern: dynamicPattern }
           }
@@ -951,7 +951,7 @@ function matchKnownRoutePart(
         // Unlike catch-all which terminates here, regular dynamic must
         // continue recursing to find the leaf pattern.
         if (urlPart !== null) {
-          resolvedParams.set(paramName, urlPart)
+          resolvedParams.set(paramName, canonicalizeURLPart(urlPart))
           return matchKnownRoutePart(
             now,
             dynamicPart,