[pull] canary from vercel:canary

.github/workflows/build_and_deploy.yml

@@ -183,13 +183,10 @@ jobs:
             build_task: build-native-release
             os:
               mac:
+                host: "['macos-15']"
                 vendor: apple
                 sys: darwin
-                arch:
-                  x86_64:
-                    host: "['macos-15-intel']"
-                  aarch64:
-                    host: "['macos-15']"
+                arch: [x86_64, aarch64]
               windows:
                 host: "['windows-latest-8-core-oss']"
                 vendor: pc
@@ -226,7 +223,7 @@ jobs:
 
     name: stable - ${{ matrix.target }} - node@20
     runs-on: ${{ fromJSON(matrix.host) }}
-    timeout-minutes: ${{ matrix.os == 'mac' && 90 || 45 }}
+    timeout-minutes: 45
     env:
       # Disable all build caches for production/staging/force-preview deploys
       NEXT_SKIP_BUILD_CACHE: ${{ contains(fromJSON('["production","staging","force-preview"]'), needs.deploy-target.outputs.value) && '1' || '' }}

.github/workflows/build_and_test.yml

@@ -238,6 +238,7 @@ jobs:
       needsRust: 'yes'
       needsNextest: 'yes'
       skipNativeBuild: 'yes'
+      skipInstallBuild: 'yes'
       afterBuild: pnpm dlx turbo@${TURBO_VERSION} run test-cargo-unit ${TURBO_ARGS}
       stepName: 'test-cargo-unit'
     secrets: inherit

.github/workflows/build_reusable.yml

@@ -309,7 +309,7 @@ jobs:
         if: ${{ inputs.skipInstallBuild != 'yes' }}
 
       - run: pnpm install
-        if: ${{ inputs.skipInstallBuild != 'yes' }}
+        if: ${{ inputs.skipInstallBuild != 'yes' || inputs.needsNextest == 'yes' }}
 
       - name: Install node-file-trace test dependencies
         if: ${{ inputs.needsNextest == 'yes' }}

Cargo.toml

@@ -258,7 +258,7 @@ console-subscriber = "0.4.1"
 const_format = "0.2.30"
 crc32fast = "1.5.0"
 criterion = { package = "codspeed-criterion-compat", version = "4.3.0" }
-ctor = "0.8"
+ctor = "0.10"
 crossbeam-channel = "0.5.8"
 crossbeam-utils = "0.8"
 dashmap = "6.1.0"
@@ -348,8 +348,8 @@ tempfile = "3.20.0"
 terminal_size = "0.3.0"
 thiserror = "1.0.48"
 thread_local = "1.1.8"
-tokio = "~1.47.3"
-tokio-util = { version = "0.7.13", features = ["io", "rt"] }
+tokio = "1.52.1"
+tokio-util = { version = "0.7.18", features = ["io", "rt"] }
 tracing = "0.1.44"
 tracing-subscriber = "0.3.16"
 triomphe = { git = "https://github.com/sokra/triomphe", branch = "sokra/unstable" }

crates/next-api/src/client_references.rs

@@ -31,9 +31,9 @@ pub struct ClientReferenceData(FxHashMap<ResolvedVc<Box<dyn Module>>, ClientMani
 pub async fn map_client_references(
     graph: ResolvedVc<ModuleGraphLayer>,
 ) -> Result<Vc<ClientReferenceData>> {
-    let graph = graph.await?;
     let manifest = graph
-        .iter_nodes()
+        .await?
+        .iter_reachable_modules()?
         .map(|module| async move {
             if let Some(client_reference_module) =
                 ResolvedVc::try_downcast_type::<EcmascriptClientReferenceModule>(module)

crates/next-api/src/dynamic_imports.rs

@@ -123,7 +123,7 @@ pub async fn map_next_dynamic(
     let actions =
         graph
             .await?
-            .iter_nodes()
+            .iter_reachable_modules()?
             .map(|module| async move {
                 if let Some(dynamic_entry_module) =
                     ResolvedVc::try_downcast_type::<NextDynamicEntryModule>(module)

crates/next-api/src/project.rs

@@ -2482,7 +2482,7 @@ async fn scale_down_node_pool(project: ResolvedVc<Project>) -> Result<()> {
 async fn whole_app_module_graph_operation(
     project: ResolvedVc<Project>,
 ) -> Result<Vc<BaseAndFullModuleGraph>> {
-    let span = tracing::info_span!("whole app module graph", modules = Empty);
+    let span = tracing::info_span!("whole app module graph", modules = Empty, edges = Empty);
     let span_clone = span.clone();
     async move {
         let next_mode = project.next_mode();
@@ -2529,15 +2529,24 @@ async fn whole_app_module_graph_operation(
                 .connect()
                 .module_count()
                 .untracked()
-                .owned()
                 .await?;
             let additional_module_count = additional_module_graph
                 .connect()
                 .module_count()
                 .untracked()
-                .owned()
                 .await?;
-            span.record("modules", base_module_count + additional_module_count);
+            span.record("modules", *base_module_count + *additional_module_count);
+            let base_edge_count = base_single_module_graph
+                .connect()
+                .edge_count()
+                .untracked()
+                .await?;
+            let additional_edge_count = additional_module_graph
+                .connect()
+                .edge_count()
+                .untracked()
+                .await?;
+            span.record("edges", *base_edge_count + *additional_edge_count);
         }
 
         let graphs = vec![base_single_module_graph, additional_module_graph];

crates/next-api/src/server_actions.rs

@@ -527,7 +527,7 @@ pub async fn map_server_actions(
 ) -> Result<Vc<AllModuleActions>> {
     let actions = graph
         .await?
-        .iter_nodes()
+        .iter_reachable_modules()?
         .map(async |module| {
             // TODO: compare module contexts instead?
             let layer = match module.ident().await?.layer.as_ref() {

lerna.json

@@ -15,5 +15,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "16.3.0-canary.4"
-}
+  "version": "16.3.0-canary.5"
+}

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "16.3.0-canary.4",
+  "version": "16.3.0-canary.5",
   "keywords": [
     "react",
     "next",