Merge branch 'canary' into fix/link-middleware

Author: samcx

.github/workflows/issue_stale.yml

@@ -14,7 +14,7 @@ jobs:
         id: stale-no-repro
         name: 'Close stale issues with no reproduction'
         with:
-          repo-token: ${{ secrets.STALE_TOKEN }}
+          repo-token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
           any-of-labels: 'please add a complete reproduction'
           close-issue-message: 'This issue has been automatically closed due to 2 days of inactivity and the absence of a complete reproduction. If you believe this was done in error, please leave a comment. If you are experiencing a similar issue, consider opening a new issue with a complete reproduction. Thank you.'
           days-before-issue-close: 1
@@ -27,7 +27,7 @@ jobs:
         id: stale-simple-repro
         name: 'Close issues with no simple repro'
         with:
-          repo-token: ${{ secrets.STALE_TOKEN }}
+          repo-token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
           any-of-labels: 'please simplify reproduction'
           close-issue-message: 'This issue has been automatically closed due to 14 days of inactivity and the absence of a simple reproduction for investigation. If you believe this was done in error, please leave a comment. If you are experiencing a similar issue, consider opening a new issue with a simple reproduction. Thank you.'
           days-before-issue-close: 1
@@ -40,7 +40,7 @@ jobs:
         id: stale-no-canary
         name: 'Close issues not verified on canary'
         with:
-          repo-token: ${{ secrets.STALE_TOKEN }}
+          repo-token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
           any-of-labels: 'please verify canary'
           close-issue-message: 'This issue has been automatically closed due to 14 days of inactivity and the absence of testing against next@canary. If you believe this was done in error, please leave a comment. If you are experiencing a similar issue, consider opening a new issue with a reproduction. Thank you.'
           days-before-issue-close: 1

.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'

.vscode/settings.json

@@ -68,8 +68,8 @@
   // Enable file nesting for unit test files.
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
-    "*.ts": "$(capture).test.ts, $(capture).test.tsx",
-    "*.tsx": "$(capture).test.ts, $(capture).test.tsx"
+    "*.ts": "$(capture).test.ts, $(capture).test.tsx, $(capture).stories.tsx",
+    "*.tsx": "$(capture).test.ts, $(capture).test.tsx, $(capture).stories.tsx"
   },
   // Compile rust-analyzer in a separate directory to avoid conflicts with the main project.
   "rust-analyzer.cargo.targetDir": true,

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

@@ -10,9 +10,7 @@ use turbo_tasks::{
     debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc,
 };
 use turbopack::css::CssModuleAsset;
-use turbopack_core::module::Module;
-
-use crate::module_graph::SingleModuleGraph;
+use turbopack_core::{module::Module, module_graph::SingleModuleGraph};
 
 #[derive(
     Clone, Serialize, Deserialize, Eq, PartialEq, TraceRawVcs, ValueDebugFormat, NonLocalValue,

crates/next-api/src/client_references.rs

@@ -34,10 +34,11 @@ use turbopack_core::{
         ChunkingContext, ModuleId,
     },
     module::Module,
+    module_graph::SingleModuleGraph,
     output::OutputAssets,
 };
 
-use crate::module_graph::{DynamicImportEntriesWithImporter, SingleModuleGraph};
+use crate::module_graph::DynamicImportEntriesWithImporter;
 
 pub(crate) enum NextDynamicChunkAvailability<'a> {
     /// In App Router, the client references