Merge branch 'canary' into ijjk/fix-not-found-tags

Author: ijjk

.github/workflows/test_e2e_deploy_release.yml

@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        group: [1/5, 2/5, 3/5, 4/5, 5/5, 6/6]
+        group: [1/6, 2/6, 3/6, 4/6, 5/6, 6/6]
     with:
       afterBuild: npm i -g vercel@latest && NEXT_E2E_TEST_TIMEOUT=240000 NEXT_TEST_MODE=deploy NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json" node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e
       skipNativeBuild: 'yes'

Cargo.lock

@@ -190,7 +190,7 @@ serde_path_to_error = "0.1.9"
 serde_qs = "0.11.0"
 serde_with = "2.3.2"
 serde_yaml = "0.9.17"
-shadow-rs = { version = "0.35.0", default-features = false, features = [
+shadow-rs = { version = "0.37.0", default-features = false, features = [
   "tzdb",
 ] }
 smallvec = { version = "1.13.1", features = [

Cargo.toml

@@ -1,10 +1,19 @@
+use std::fs;
+
 extern crate napi_build;
 
 fn main() {
     // Generates, stores build-time information as static values.
     // There are some places relying on correct values for this (i.e telemetry),
     // So failing build if this fails.
-    shadow_rs::new().expect("Should able to generate build time information");
+    shadow_rs::ShadowBuilder::builder()
+        .build()
+        .expect("Should able to generate build time information");
+
+    let git_head = fs::read_to_string("../../.git/HEAD").unwrap_or_default();
+    if !git_head.is_empty() && !git_head.starts_with("ref: ") {
+        println!("cargo:warning=git version {}", git_head);
+    }
 
     #[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
     napi_build::setup();

crates/napi/build.rs

@@ -4,7 +4,10 @@ fn main() {
     // Generates, stores build-time information as static values.
     // There are some places relying on correct values for this (i.e telemetry),
     // So failing build if this fails.
-    shadow_rs::new().expect("Should able to generate build time information");
+    shadow_rs::ShadowBuilder::builder()
+        .build_pattern(shadow_rs::BuildPattern::Lazy)
+        .build()
+        .expect("Should able to generate build time information");
 
     generate_register();
 }

crates/next-api/build.rs

@@ -70,11 +70,13 @@ impl EcmascriptClientReferenceProxyModule {
     #[turbo_tasks::function]
     async fn proxy_module(&self) -> Result<Vc<Box<dyn EcmascriptChunkPlaceable>>> {
         let mut code = CodeBuilder::default();
+        let is_esm: bool;
 
         let server_module_path = &*self.server_module_ident.to_string().await?;
 
         // Adapted from https://github.com/facebook/react/blob/c5b9375767e2c4102d7e5559d383523736f1c902/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js#L323-L354
         if let EcmascriptExports::EsmExports(exports) = &*self.client_module.get_exports().await? {
+            is_esm = true;
             let exports = exports.expand_exports().await?;
 
             if !exports.dynamic_exports.is_empty() {
@@ -130,6 +132,7 @@ impl EcmascriptClientReferenceProxyModule {
                 }
             }
         } else {
+            is_esm = false;
             writedoc!(
                 code,
                 r#"
@@ -146,7 +149,13 @@ impl EcmascriptClientReferenceProxyModule {
             AssetContent::file(File::from(code.source_code().clone()).into());
 
         let proxy_source = VirtualSource::new(
-            self.server_module_ident.path().join("proxy.js".into()),
+            self.server_module_ident.path().join(
+                // Depending on the original format, we call the file `proxy.mjs` or `proxy.cjs`.
+                // This is because we're placing the virtual module next to the original code, so
+                // its parsing will be affected by `type` fields in package.json --
+                // a bare `proxy.js` may end up being unexpectedly parsed as the wrong format.
+                format!("proxy.{}", if is_esm { "mjs" } else { "cjs" }).into(),
+            ),
             proxy_module_content,
         );
 

crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.1.1-canary.26"
+  "version": "15.1.1-canary.27"
 }

lerna.json

@@ -211,16 +211,16 @@
     "pretty-ms": "7.0.0",
     "random-seed": "0.3.0",
     "react": "19.0.0",
-    "react-builtin": "npm:[email protected]3b009b4c-20250102",
+    "react-builtin": "npm:[email protected]3ce77d55-20250106",
     "react-dom": "19.0.0",
-    "react-dom-builtin": "npm:[email protected]3b009b4c-20250102",
-    "react-dom-experimental-builtin": "npm:[email protected]3b009b4c-20250102",
-    "react-experimental-builtin": "npm:[email protected]3b009b4c-20250102",
-    "react-is-builtin": "npm:[email protected]3b009b4c-20250102",
-    "react-server-dom-turbopack": "19.1.0-canary-3b009b4c-20250102",
-    "react-server-dom-turbopack-experimental": "npm:[email protected]3b009b4c-20250102",
-    "react-server-dom-webpack": "19.1.0-canary-3b009b4c-20250102",
-    "react-server-dom-webpack-experimental": "npm:[email protected]3b009b4c-20250102",
+    "react-dom-builtin": "npm:[email protected]3ce77d55-20250106",
+    "react-dom-experimental-builtin": "npm:[email protected]3ce77d55-20250106",
+    "react-experimental-builtin": "npm:[email protected]3ce77d55-20250106",
+    "react-is-builtin": "npm:[email protected]3ce77d55-20250106",
+    "react-server-dom-turbopack": "19.1.0-canary-3ce77d55-20250106",
+    "react-server-dom-turbopack-experimental": "npm:[email protected]3ce77d55-20250106",
+    "react-server-dom-webpack": "19.1.0-canary-3ce77d55-20250106",
+    "react-server-dom-webpack-experimental": "npm:[email protected]3ce77d55-20250106",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",
@@ -230,8 +230,8 @@
     "resolve-from": "5.0.0",
     "sass": "1.54.0",
     "satori": "0.10.9",
-    "scheduler-builtin": "npm:[email protected]3b009b4c-20250102",
-    "scheduler-experimental-builtin": "npm:[email protected]3b009b4c-20250102",
+    "scheduler-builtin": "npm:[email protected]3ce77d55-20250106",
+    "scheduler-experimental-builtin": "npm:[email protected]3ce77d55-20250106",
     "seedrandom": "3.0.5",
     "semver": "7.3.7",
     "shell-quote": "1.7.3",
@@ -272,10 +272,10 @@
       "@types/react": "19.0.0",
       "@types/react-dom": "19.0.0",
       "jest-snapshot": "30.0.0-alpha.6",
-      "react": "19.1.0-canary-3b009b4c-20250102",
-      "react-dom": "19.1.0-canary-3b009b4c-20250102",
-      "react-is": "19.1.0-canary-3b009b4c-20250102",
-      "scheduler": "0.26.0-canary-3b009b4c-20250102"
+      "react": "19.1.0-canary-3ce77d55-20250106",
+      "react-dom": "19.1.0-canary-3ce77d55-20250106",
+      "react-is": "19.1.0-canary-3ce77d55-20250106",
+      "scheduler": "0.26.0-canary-3ce77d55-20250106"
     },
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "keywords": [
     "react",
     "next",

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/api-reference/config/eslint",
   "dependencies": {
-    "@next/eslint-plugin-next": "15.1.1-canary.26",
+    "@next/eslint-plugin-next": "15.1.1-canary.27",
     "@rushstack/eslint-patch": "^1.10.3",
     "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",