Apply sokra's suggestion, defer add_code_gen resolution until build

vercel · Jan 10, 2025 · e56d201 · e56d201
1 parent 11eabbe
commit e56d201
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 178 deletions.
diff --git a/turbopack/crates/turbopack-ecmascript/src/code_gen.rs b/turbopack/crates/turbopack-ecmascript/src/code_gen.rs
@@ -1,3 +1,4 @@
+use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use swc_core::ecma::{
     ast::Stmt,
@@ -106,6 +107,22 @@ pub trait CodeGenerateableWithAsyncModuleInfo {
     ) -> Vc<CodeGeneration>;
 }
 
+pub enum UnresolvedCodeGen {
+    CodeGenerateable(Vc<Box<dyn CodeGenerateable>>),
+    CodeGenerateableWithAsyncModuleInfo(Vc<Box<dyn CodeGenerateableWithAsyncModuleInfo>>),
+}
+
+impl UnresolvedCodeGen {
+    pub async fn to_resolved(&self) -> Result<CodeGen> {
+        Ok(match self {
+            Self::CodeGenerateable(vc) => CodeGen::CodeGenerateable(vc.to_resolved().await?),
+            Self::CodeGenerateableWithAsyncModuleInfo(vc) => {
+                CodeGen::CodeGenerateableWithAsyncModuleInfo(vc.to_resolved().await?)
+            }
+        })
+    }
+}
+
 #[derive(
     Clone, Copy, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue,
 )]

diff --git a/turbopack/crates/turbopack-ecmascript/src/references/esm/module_item.rs b/turbopack/crates/turbopack-ecmascript/src/references/esm/module_item.rs
@@ -21,7 +21,7 @@ use crate::{
 /// Makes code changes to remove export/import declarations and places the
 /// expr/decl in a normal statement. Unnamed expr/decl will be named with the
 /// magic identifier "export default"
-#[turbo_tasks::value(shared)]
+#[turbo_tasks::value]
 #[derive(Hash, Debug)]
 pub struct EsmModuleItem {
     pub path: ResolvedVc<AstPath>,