[pull] canary from vercel:canary

.github/labeler.json

@@ -5,7 +5,7 @@
     "examples": ["examples/**"],
     "Font (next/font)": ["**/*font*"],
     "tests": ["test/**", "bench/**"],
-    "Turbopack": ["crates/next-*/**", "crates/napi/**", "turbopack/**"],
+    "Turbopack": ["crates/next-*/**", "turbopack/**"],
     "Rspack": [
       { "type": "user", "pattern": "9aoy" },
       { "type": "user", "pattern": "ahabhgk" },

.github/workflows/build_and_deploy.yml

@@ -318,7 +318,7 @@ jobs:
       # it can fail to restore in different OS'
       - uses: actions/checkout@v4
         with:
-          # crates/napi/build.rs uses git-describe to find the most recent git tag. It's okay if
+          # crates/next-napi-bindings/build.rs uses git-describe to find the most recent git tag. It's okay if
           # this fails, but fetch with enough depth that we're likely to find a recent tag.
           fetch-depth: 100
 

.github/workflows/build_and_test.yml

@@ -523,7 +523,7 @@ jobs:
     secrets: inherit
 
   #[NOTE] currently this only checks building wasi target
-  test-next-swc-napi-wasi:
+  test-next-napi-bindings-wasi:
     name: test next-swc wasi
     needs: ['optimize-ci', 'changes', 'build-next']
     # TODO: Re-enable this when https://github.com/napi-rs/napi-rs/issues/2009 is addressed.
@@ -539,7 +539,7 @@ jobs:
       afterBuild: |
         rustup target add wasm32-wasip1-threads
         pnpm dlx turbo@${TURBO_VERSION} run build-native-wasi
-      stepName: 'test-next-swc-napi-wasi'
+      stepName: 'test-next-napi-bindings-wasi'
     secrets: inherit
 
   test-unit:

.github/workflows/test-turbopack-rust-bench-test.yml

@@ -49,12 +49,12 @@ jobs:
       - name: Build benchmarks for tests
         timeout-minutes: 120
         run: |
-          cargo test --benches --workspace --release --no-fail-fast --exclude turbopack-bench --exclude next-swc-napi --no-run
+          cargo test --benches --workspace --release --no-fail-fast --exclude turbopack-bench --exclude next-napi-bindings --no-run
 
       - name: Run cargo test on benchmarks
         timeout-minutes: 120
         run: |
-          cargo test --benches --workspace --release --no-fail-fast --exclude turbopack-bench --exclude next-swc-napi
+          cargo test --benches --workspace --release --no-fail-fast --exclude turbopack-bench --exclude next-napi-bindings
 
       - name: Build benchmarks for tests for other bundlers
         if: inputs.all

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 
 members = [
   "scripts/send-trace-to-jaeger",
-  "crates/napi",
+  "crates/next-napi-bindings",
   "crates/wasm",
   "crates/next-api",
   "crates/next-build-test",

crates/next-core/src/next_server/context.rs

@@ -859,6 +859,7 @@ pub async fn get_server_module_options_context(
 
             next_server_rules.extend(common_next_server_rules.iter().cloned());
             internal_custom_rules.extend(common_next_server_rules);
+            foreign_next_server_rules.extend(internal_custom_rules.clone());
 
             next_server_rules.extend(source_transform_rules);
 
@@ -870,7 +871,7 @@ pub async fn get_server_module_options_context(
                 ..module_options_context
             };
             let foreign_code_module_options_context = ModuleOptionsContext {
-                module_rules: internal_custom_rules.clone(),
+                module_rules: foreign_next_server_rules.clone(),
                 enable_webpack_loaders: foreign_enable_webpack_loaders,
                 // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
                 enable_postcss_transform: enable_foreign_postcss_transform,

crates/next-core/src/tracing_presets.rs

@@ -7,7 +7,7 @@ pub static TRACING_NEXT_OVERVIEW_TARGETS: Lazy<Vec<&str>> = Lazy::new(|| {
     [
         &TRACING_OVERVIEW_TARGETS[..],
         &[
-            "next_swc_napi=info",
+            "next_napi_bindings=info",
             "next_swc=info",
             "next_api=info",
             "next_dev=info",
@@ -23,7 +23,7 @@ pub static TRACING_NEXT_TARGETS: Lazy<Vec<&str>> = Lazy::new(|| {
     [
         &TRACING_NEXT_OVERVIEW_TARGETS[..],
         &[
-            "next_swc_napi=trace",
+            "next_napi_bindings=trace",
             "next_swc=trace",
             "next_api=trace",
             "next_dev=trace",

crates/napi/Cargo.toml → crates/next-napi-bindings/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 edition = "2024"
-name = "next-swc-napi"
+name = "next-napi-bindings"
 version = "0.0.0"
 publish = false
 

crates/napi/npm/darwin-arm64/package.json → crates/next-napi-bindings/npm/darwin-arm64/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/darwin-arm64"
+    "directory": "crates/next-napi-bindings/npm/darwin-arm64"
   },
   "os": [
     "darwin"

crates/napi/npm/darwin-x64/package.json → crates/next-napi-bindings/npm/darwin-x64/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/darwin-x64"
+    "directory": "crates/next-napi-bindings/npm/darwin-x64"
   },
   "os": [
     "darwin"

crates/napi/npm/linux-arm64-gnu/package.json → crates/next-napi-bindings/npm/linux-arm64-gnu/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/linux-arm64-gnu"
+    "directory": "crates/next-napi-bindings/npm/linux-arm64-gnu"
   },
   "os": [
     "linux"

crates/napi/npm/linux-arm64-musl/package.json → crates/next-napi-bindings/npm/linux-arm64-musl/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/linux-arm64-musl"
+    "directory": "crates/next-napi-bindings/npm/linux-arm64-musl"
   },
   "os": [
     "linux"

crates/napi/npm/linux-x64-gnu/package.json → crates/next-napi-bindings/npm/linux-x64-gnu/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/linux-x64-gnu"
+    "directory": "crates/next-napi-bindings/npm/linux-x64-gnu"
   },
   "os": [
     "linux"

crates/napi/npm/linux-x64-musl/package.json → crates/next-napi-bindings/npm/linux-x64-musl/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/linux-x64-musl"
+    "directory": "crates/next-napi-bindings/npm/linux-x64-musl"
   },
   "os": [
     "linux"

crates/napi/npm/win32-arm64-msvc/package.json → crates/next-napi-bindings/npm/win32-arm64-msvc/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/win32-arm64-msvc"
+    "directory": "crates/next-napi-bindings/npm/win32-arm64-msvc"
   },
   "os": [
     "win32"

crates/napi/npm/win32-x64-msvc/package.json → crates/next-napi-bindings/npm/win32-x64-msvc/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vercel/next.js",
-    "directory": "crates/napi/npm/win32-x64-msvc"
+    "directory": "crates/next-napi-bindings/npm/win32-x64-msvc"
   },
   "os": [
     "win32"

lerna.json

@@ -15,5 +15,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "16.2.0-canary.19"
+  "version": "16.2.0-canary.22"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "description": "ESLint configuration used by Next.js.",
   "license": "MIT",
   "repository": {
@@ -12,7 +12,7 @@
     "dist"
   ],
   "dependencies": {
-    "@next/eslint-plugin-next": "16.2.0-canary.19",
+    "@next/eslint-plugin-next": "16.2.0-canary.22",
     "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.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "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.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "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.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

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

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "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.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "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.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "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.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "keywords": [
     "react",
     "next",

packages/next-rspack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-rspack",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-rspack"

packages/next-swc/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@next/swc",
-  "version": "16.2.0-canary.19",
+  "version": "16.2.0-canary.22",
   "private": true,
   "files": [
     "native/"
   ],
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",
-    "build-native": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --features plugin,image-extended --js false native",
-    "build-native-release": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --release --features plugin,image-extended,tracing/release_max_level_trace --js false native",
-    "build-native-release-with-assertions": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --profile release-with-assertions --features plugin,image-extended,tracing/release_max_level_trace --js false native",
-    "build-native-no-plugin": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --features image-webp --js false native",
-    "build-native-no-plugin-release": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --release --features image-webp,tracing/release_max_level_trace --js false native",
-    "build-native-wasi": "npx --package=@napi-rs/cli@3.0.0-alpha.45 napi build --platform --target wasm32-wasip1-threads -p next-swc-napi --cwd ../../ --output-dir packages/next-swc/native --no-default-features",
+    "build-native": "napi build --platform -p next-napi-bindings --cargo-cwd ../../ --cargo-name next_napi_bindings --features plugin,image-extended --js false native",
+    "build-native-release": "napi build --platform -p next-napi-bindings --cargo-cwd ../../ --cargo-name next_napi_bindings --release --features plugin,image-extended,tracing/release_max_level_trace --js false native",
+    "build-native-release-with-assertions": "napi build --platform -p next-napi-bindings --cargo-cwd ../../ --cargo-name next_napi_bindings --profile release-with-assertions --features plugin,image-extended,tracing/release_max_level_trace --js false native",
+    "build-native-no-plugin": "napi build --platform -p next-napi-bindings --cargo-cwd ../../ --cargo-name next_napi_bindings --features image-webp --js false native",
+    "build-native-no-plugin-release": "napi build --platform -p next-napi-bindings --cargo-cwd ../../ --cargo-name next_napi_bindings --release --features image-webp,tracing/release_max_level_trace --js false native",
+    "build-native-wasi": "npx --package=@napi-rs/cli@3.0.0-alpha.45 napi build --platform --target wasm32-wasip1-threads -p next-napi-bindings --cwd ../../ --output-dir packages/next-swc/native --no-default-features",
     "build-wasm": "wasm-pack build ../../crates/wasm --scope=next",
     "cache-build-native": "[ -d native ] && echo $(ls native)",
     "rust-check-fmt": "cd ../..; cargo fmt -- --check",
     "rust-check-clippy": "cargo clippy --workspace --all-targets -- -D warnings -A deprecated",
-    "rust-check-napi": "cargo check -p next-swc-napi",
-    "test-cargo-unit": "cargo nextest run --workspace --exclude next-swc-napi --exclude turbo-tasks-macros --cargo-profile release-with-assertions --no-fail-fast"
+    "rust-check-napi": "cargo check -p next-napi-bindings",
+    "test-cargo-unit": "cargo nextest run --workspace --exclude next-napi-bindings --exclude turbo-tasks-macros --cargo-profile release-with-assertions --no-fail-fast"
   },
   "napi": {
     "name": "next-swc",

packages/next/errors.json

@@ -986,6 +986,5 @@
   "985": "No response is returned from route handler '%s'. Expected a Response object but received '%s' (method: %s, url: %s). Ensure you return a \\`Response\\` or a \\`NextResponse\\` in all branches of your handler.",
   "986": "Server Action arguments list is too long (%s). Maximum allowed is %s.",
   "987": "Invalid \\`deploymentId\\` configuration: must be a string. See https://nextjs.org/docs/messages/deploymentid-not-a-string",
-  "988": "Invalid \\`deploymentId\\` configuration: contains invalid characters. Only alphanumeric characters, hyphens, and underscores are allowed. See https://nextjs.org/docs/messages/deploymentid-invalid-characters",
-  "989": "Loaded static props were from an outdated deployment, forcing a hard reload"
+  "988": "Invalid \\`deploymentId\\` configuration: contains invalid characters. Only alphanumeric characters, hyphens, and underscores are allowed. See https://nextjs.org/docs/messages/deploymentid-invalid-characters"
 }

packages/next/package.json

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