Merge branch 'canary' into update-snapshot

Author: SyMind

.github/pnpm-lock.yaml

@@ -521,6 +521,50 @@ jobs:
 
     secrets: inherit
 
+  # TODO: Remove this once we bump minimum Node.js version to v22
+  test-next-config-ts-native-ts-dev:
+    name: test next-config-ts-native-ts dev
+    needs: ['changes', 'build-next', 'build-native']
+    if: ${{ needs.changes.outputs.docs-only == 'false' }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [22, 24]
+
+    uses: ./.github/workflows/build_reusable.yml
+    with:
+      nodeVersion: ${{ matrix.node }}
+      afterBuild: |
+        export NEXT_TEST_MODE=dev
+        export NODE_OPTIONS=--experimental-transform-types
+        node run-tests.js test/e2e/app-dir/next-config-ts-native-ts/**/*.test.ts
+      stepName: 'test-next-config-ts-native-ts-dev-${{ matrix.node }}'
+
+    secrets: inherit
+
+  # TODO: Remove this once we bump minimum Node.js version to v22
+  test-next-config-ts-native-ts-prod:
+    name: test next-config-ts-native-ts prod
+    needs: ['changes', 'build-next', 'build-native']
+    if: ${{ needs.changes.outputs.docs-only == 'false' }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [22, 24]
+
+    uses: ./.github/workflows/build_reusable.yml
+    with:
+      nodeVersion: ${{ matrix.node }}
+      afterBuild: |
+        export NEXT_TEST_MODE=start
+        export NODE_OPTIONS=--experimental-transform-types
+        node run-tests.js test/e2e/app-dir/next-config-ts-native-ts/**/*.test.ts
+      stepName: 'test-next-config-ts-native-ts-prod-${{ matrix.node }}'
+
+    secrets: inherit
+
   test-unit-windows:
     name: test unit windows
     needs: ['changes', 'build-native', 'build-native-windows']
@@ -956,6 +1000,8 @@ jobs:
         'validate-docs-links',
         'check-types-precompiled',
         'test-unit',
+        'test-next-config-ts-native-ts-dev',
+        'test-next-config-ts-native-ts-prod',
         'test-dev',
         'test-prod',
         'test-integration',

.github/workflows/build_and_test.yml

@@ -525,8 +525,7 @@ async fn benchmark_file_io(
     directory: FileSystemPath,
 ) -> Result<Vc<Completion>> {
     // try to get the real file path on disk so that we can use it with tokio
-    let fs = Vc::try_resolve_downcast_type::<DiskFileSystem>(directory.fs())
-        .await?
+    let fs = ResolvedVc::try_downcast_type::<DiskFileSystem>(directory.fs)
         .context(anyhow!(
             "expected node_root to be a DiskFileSystem, cannot benchmark"
         ))?

Cargo.lock

@@ -383,7 +383,7 @@ impl AppProject {
                         )),
                         module_styles_rule_condition(),
                     ]),
-                    ResolvedVc::upcast(self.css_client_reference_transition().to_resolved().await?),
+                    self.css_client_reference_transition().to_resolved().await?,
                 ),
                 // Don't wrap in marker module but change context, this is used to determine
                 // the list of CSS module classes.
@@ -399,7 +399,7 @@ impl AppProject {
                 // Mark as client reference all regular CSS imports
                 TransitionRule::new(
                     styles_rule_condition(),
-                    ResolvedVc::upcast(self.css_client_reference_transition().to_resolved().await?),
+                    self.css_client_reference_transition().to_resolved().await?,
                 ),
             ],
             ..Default::default()
@@ -413,7 +413,7 @@ impl AppProject {
             self.get_rsc_transitions(
                 self.ecmascript_client_reference_transition(),
                 Vc::upcast(self.ssr_transition()),
-                Vc::upcast(self.shared_transition()),
+                self.shared_transition(),
             ),
             self.project().server_compile_time_info(),
             self.rsc_module_options_context(),
@@ -428,7 +428,7 @@ impl AppProject {
             self.get_rsc_transitions(
                 self.edge_ecmascript_client_reference_transition(),
                 Vc::upcast(self.edge_ssr_transition()),
-                Vc::upcast(self.edge_shared_transition()),
+                self.edge_shared_transition(),
             ),
             self.project().edge_compile_time_info(),
             self.edge_rsc_module_options_context(),
@@ -467,7 +467,7 @@ impl AppProject {
             ),
             (
                 rcstr!("next-shared"),
-                ResolvedVc::upcast(self.shared_transition().to_resolved().await?),
+                self.shared_transition().to_resolved().await?,
             ),
             (
                 rcstr!("next-server-utility"),
@@ -518,7 +518,7 @@ impl AppProject {
             ),
             (
                 rcstr!("next-shared"),
-                ResolvedVc::upcast(self.edge_shared_transition().to_resolved().await?),
+                self.edge_shared_transition().to_resolved().await?,
             ),
             (
                 rcstr!("next-server-utility"),
@@ -640,7 +640,7 @@ impl AppProject {
             ),
             (
                 rcstr!("next-shared"),
-                ResolvedVc::upcast(self.shared_transition().to_resolved().await?),
+                self.shared_transition().to_resolved().await?,
             ),
         ]
         .into_iter()
@@ -712,7 +712,7 @@ impl AppProject {
             ),
             (
                 rcstr!("next-shared"),
-                ResolvedVc::upcast(self.edge_shared_transition().to_resolved().await?),
+                self.edge_shared_transition().to_resolved().await?,
             ),
         ]
         .into_iter()
@@ -877,8 +877,7 @@ impl AppProject {
             // Implements layout segment optimization to compute a graph "chain" for each layout
             // segment
             async move {
-                let rsc_entry_chunk_group =
-                    ChunkGroupEntry::Entry(vec![ResolvedVc::upcast(rsc_entry)]);
+                let rsc_entry_chunk_group = ChunkGroupEntry::Entry(vec![rsc_entry]);
 
                 let mut graphs = vec![];
                 let mut visited_modules = if has_layout_segments {
@@ -1389,18 +1388,16 @@ impl AppEndpoint {
                 polyfill_files: vec![polyfill_output_asset],
                 ..Default::default()
             };
-            let build_manifest_output = ResolvedVc::upcast(
-                build_manifest
-                    .build_output(
-                        node_root.join(&format!(
-                            "server/app{manifest_path_prefix}/build-manifest.json",
-                        ))?,
-                        client_relative_path.clone(),
-                    )
-                    .await?
-                    .to_resolved()
-                    .await?,
-            );
+            let build_manifest_output = build_manifest
+                .build_output(
+                    node_root.join(&format!(
+                        "server/app{manifest_path_prefix}/build-manifest.json",
+                    ))?,
+                    client_relative_path.clone(),
+                )
+                .await?
+                .to_resolved()
+                .await?;
             server_assets.insert(build_manifest_output);
         }
 
@@ -1548,7 +1545,7 @@ impl AppEndpoint {
                 if emit_manifests == EmitManifests::Full {
                     let dynamic_import_entries = collect_next_dynamic_chunks(
                         *module_graphs.full,
-                        *ResolvedVc::upcast(client_chunking_context),
+                        *client_chunking_context,
                         next_dynamic_imports,
                         NextDynamicChunkAvailability::ClientReferences(
                             &*(client_references_chunks.await?),
@@ -1663,7 +1660,7 @@ impl AppEndpoint {
                     // create react-loadable-manifest for next/dynamic
                     let dynamic_import_entries = collect_next_dynamic_chunks(
                         *module_graphs.full,
-                        *ResolvedVc::upcast(client_chunking_context),
+                        *client_chunking_context,
                         next_dynamic_imports,
                         NextDynamicChunkAvailability::ClientReferences(
                             &*(client_references_chunks.await?),

crates/napi/src/next_api/project.rs

@@ -80,7 +80,7 @@ pub(crate) async fn collect_next_dynamic_chunks(
             let async_chunk_group = async_loader.references().to_resolved().await?;
 
             let module_id = dynamic_entry
-                .chunk_item_id(Vc::upcast(chunking_context))
+                .chunk_item_id(chunking_context)
                 .to_resolved()
                 .await?;
 

crates/next-api/src/app.rs

@@ -398,7 +398,7 @@ pub async fn all_assets_from_entries_filtered(
                     .iter()
                     .map(async |asset| {
                         Ok((
-                            ResolvedVc::upcast(*asset),
+                            *asset,
                             if emit_spans {
                                 Some(asset.path().to_string().await?)
                             } else {

crates/next-api/src/dynamic_imports.rs

@@ -322,7 +322,7 @@ impl PagesProject {
                 (
                     rcstr!("next-dynamic-client"),
                     ResolvedVc::upcast(
-                        NextDynamicTransition::new_client(Vc::upcast(self.client_transition()))
+                        NextDynamicTransition::new_client(self.client_transition())
                             .to_resolved()
                             .await?,
                     ),
@@ -1073,7 +1073,7 @@ impl PageEndpoint {
             {
                 collect_next_dynamic_chunks(
                     self.client_module_graph(),
-                    Vc::upcast(project.client_chunking_context()),
+                    project.client_chunking_context(),
                     next_dynamic_imports,
                     NextDynamicChunkAvailability::AvailabilityInfo(client_availability_info),
                 )
@@ -1084,7 +1084,7 @@ impl PageEndpoint {
 
             let chunking_context: Vc<Box<dyn ChunkingContext>> = match runtime {
                 NextRuntime::NodeJs => Vc::upcast(node_chunking_context),
-                NextRuntime::Edge => Vc::upcast(edge_chunking_context),
+                NextRuntime::Edge => edge_chunking_context,
             };
 
             let mut current_chunks = OutputAssets::empty();
@@ -1342,16 +1342,14 @@ impl PageEndpoint {
             ..Default::default()
         };
         let manifest_path_prefix = get_asset_prefix_from_pathname(&self.pathname);
-        Ok(Vc::upcast(
-            build_manifest
-                .build_output(
-                    node_root.join(&format!(
-                        "server/pages{manifest_path_prefix}/build-manifest.json",
-                    ))?,
-                    client_relative_path,
-                )
-                .await?,
-        ))
+        build_manifest
+            .build_output(
+                node_root.join(&format!(
+                    "server/pages{manifest_path_prefix}/build-manifest.json",
+                ))?,
+                client_relative_path,
+            )
+            .await
     }
 
     #[turbo_tasks::function]

crates/next-api/src/nft_json.rs

@@ -1380,7 +1380,7 @@ impl Project {
 
         let middleware = self.find_middleware();
         let FindContextFileResult::Found(fs_path, _) = &*middleware.await? else {
-            return Ok(Vc::upcast(edge_module_context));
+            return Ok(edge_module_context);
         };
         let source = Vc::upcast(FileSource::new(fs_path.clone()));
 

crates/next-api/src/pages.rs

@@ -77,7 +77,7 @@ pub(crate) async fn create_server_actions_manifest(
         .to_resolved()
         .await?;
 
-    let chunk_item = loader.as_chunk_item(module_graph, Vc::upcast(chunking_context));
+    let chunk_item = loader.as_chunk_item(module_graph, chunking_context);
     let manifest = build_manifest(
         node_root,
         page_name,
@@ -275,14 +275,13 @@ pub fn parse_server_actions(
 /// If found, we return the mapping of every action's hashed id to the name of
 /// the exported action function. If not, we return a None.
 #[turbo_tasks::function]
-async fn parse_actions(module: Vc<Box<dyn Module>>) -> Result<Vc<OptionActionMap>> {
-    let Some(ecmascript_asset) =
-        Vc::try_resolve_sidecast::<Box<dyn EcmascriptParsable>>(module).await?
+async fn parse_actions(module: ResolvedVc<Box<dyn Module>>) -> Result<Vc<OptionActionMap>> {
+    let Some(ecmascript_asset) = ResolvedVc::try_sidecast::<Box<dyn EcmascriptParsable>>(module)
     else {
         return Ok(Vc::cell(None));
     };
 
-    if let Some(module) = Vc::try_resolve_downcast_type::<EcmascriptModulePartAsset>(module).await?
+    if let Some(module) = ResolvedVc::try_downcast_type::<EcmascriptModulePartAsset>(module)
         && matches!(
             module.await?.part,
             ModulePart::Evaluation | ModulePart::Facade