Revert "WIP debug"

This reverts commit 6154d26423af84971d826f5c60e0e0a6dacccec1.

Author: mischnic

crates/napi/src/next_api/project.rs

@@ -975,28 +975,27 @@ async fn output_assets_operation(
     container: ResolvedVc<ProjectContainer>,
     app_dir_only: bool,
 ) -> Result<Vc<OutputAssets>> {
-    // let endpoint_assets = container
-    //     .project()
-    //     .get_all_endpoints(app_dir_only)
-    //     .await?
-    //     .iter()
-    //     .map(|endpoint| async move { endpoint.output().await?.output_assets.await })
-    //     .try_join()
-    //     .await?;
-
-    // let output_assets: FxIndexSet<ResolvedVc<Box<dyn OutputAsset>>> = endpoint_assets
-    //     .iter()
-    //     .flat_map(|assets| assets.iter().copied())
-    //     .collect();
+    let endpoint_assets = container
+        .project()
+        .get_all_endpoints(app_dir_only)
+        .await?
+        .iter()
+        .map(|endpoint| async move { endpoint.output().await?.output_assets.await })
+        .try_join()
+        .await?;
+
+    let output_assets: FxIndexSet<ResolvedVc<Box<dyn OutputAsset>>> = endpoint_assets
+        .iter()
+        .flat_map(|assets| assets.iter().copied())
+        .collect();
 
     let nft = next_server_nft_assets(container.project()).await?;
 
     Ok(Vc::cell(
-        // output_assets
-        //     .into_iter()
-        //     .chain(nft.iter().copied())
-        //     .collect(),
-        nft.iter().copied().collect(),
+        output_assets
+            .into_iter()
+            .chain(nft.iter().copied())
+            .collect(),
     ))
 }
 

crates/next-api/src/next_server_nft.rs

@@ -112,13 +112,13 @@ pub async fn next_server_nft_assets(project: Vc<Project>) -> Result<Vc<OutputAss
         .try_join()
         .await?;
 
-    // let minimal_server_entries = shared_entries
-    //     .iter()
-    //     .copied()
-    //     .chain(resolve_entry("next/dist/compiled/next-server/server.runtime.prod").await?)
-    //     .map(|m| Vc::upcast::<Box<dyn OutputAsset>>(TracedAsset::new(m)).to_resolved())
-    //     .try_join()
-    //     .await?;
+    let minimal_server_entries = shared_entries
+        .iter()
+        .copied()
+        .chain(resolve_entry("next/dist/compiled/next-server/server.runtime.prod").await?)
+        .map(|m| Vc::upcast::<Box<dyn OutputAsset>>(TracedAsset::new(m)).to_resolved())
+        .try_join()
+        .await?;
 
     let server_ignores_glob = [
         "**/node_modules/react{,-dom,-dom-server-turbopack}/**/*.development.js",
@@ -203,16 +203,16 @@ pub async fn next_server_nft_assets(project: Vc<Project>) -> Result<Vc<OutputAss
             .to_resolved()
             .await?,
         ),
-        // ResolvedVc::upcast(
-        //     ServerNftJsonAsset::new(
-        //         project,
-        //         RcStr::from("next-minimal-server.turbo"),
-        //         Vc::cell(minimal_server_entries),
-        //         minimal_server_ignores_glob,
-        //     )
-        //     .to_resolved()
-        //     .await?,
-        // ),
+        ResolvedVc::upcast(
+            ServerNftJsonAsset::new(
+                project,
+                RcStr::from("next-minimal-server.turbo"),
+                Vc::cell(minimal_server_entries),
+                minimal_server_ignores_glob,
+            )
+            .to_resolved()
+            .await?,
+        ),
     ]))
 }