refactor(turbopack-core): Use ResolvedVc in ContextCondition

vercel · Jan 10, 2025 · 9d0f736 · 9d0f736
1 parent e0d0daa
commit 9d0f736
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 23 deletions.
diff --git a/crates/next-core/src/next_client/context.rs b/crates/next-core/src/next_client/context.rs
@@ -212,12 +212,22 @@ pub async fn get_client_resolve_options_context(
     .cell())
 }
 
-fn internal_assets_conditions() -> ContextCondition {
-    ContextCondition::any(vec![
-        ContextCondition::InPath(next_js_fs().root()),
-        ContextCondition::InPath(turbopack_ecmascript_runtime::embed_fs().root()),
-        ContextCondition::InPath(turbopack_node::embed_js::embed_fs().root()),
-    ])
+async fn internal_assets_conditions() -> Result<ContextCondition> {
+    Ok(ContextCondition::any(vec![
+        ContextCondition::InPath(next_js_fs().root().to_resolved().await?),
+        ContextCondition::InPath(
+            turbopack_ecmascript_runtime::embed_fs()
+                .root()
+                .to_resolved()
+                .await?,
+        ),
+        ContextCondition::InPath(
+            turbopack_node::embed_js::embed_fs()
+                .root()
+                .to_resolved()
+                .await?,
+        ),
+    ]))
 }
 
 #[turbo_tasks::function]
@@ -387,7 +397,7 @@ pub async fn get_client_module_options_context(
                 foreign_codes_options_context.resolved_cell(),
             ),
             (
-                internal_assets_conditions(),
+                internal_assets_conditions().await?,
                 internal_context.resolved_cell(),
             ),
         ],

diff --git a/crates/next-core/src/next_server/context.rs b/crates/next-core/src/next_server/context.rs
@@ -403,12 +403,22 @@ pub async fn get_server_compile_time_info(
 /// turbopack itself and user config should not try to leak this. However,
 /// currently we apply few transform options subject to next.js's configuration
 /// even if it's embedded assets.
-fn internal_assets_conditions() -> ContextCondition {
-    ContextCondition::any(vec![
-        ContextCondition::InPath(next_js_fs().root()),
-        ContextCondition::InPath(turbopack_ecmascript_runtime::embed_fs().root()),
-        ContextCondition::InPath(turbopack_node::embed_js::embed_fs().root()),
-    ])
+async fn internal_assets_conditions() -> Result<ContextCondition> {
+    Ok(ContextCondition::any(vec![
+        ContextCondition::InPath(next_js_fs().root().to_resolved().await?),
+        ContextCondition::InPath(
+            turbopack_ecmascript_runtime::embed_fs()
+                .root()
+                .to_resolved()
+                .await?,
+        ),
+        ContextCondition::InPath(
+            turbopack_node::embed_js::embed_fs()
+                .root()
+                .to_resolved()
+                .await?,
+        ),
+    ]))
 }
 
 #[turbo_tasks::function]
@@ -648,7 +658,7 @@ pub async fn get_server_module_options_context(
                         foreign_code_module_options_context.resolved_cell(),
                     ),
                     (
-                        internal_assets_conditions(),
+                        internal_assets_conditions().await?,
                         internal_module_options_context.resolved_cell(),
                     ),
                 ],
@@ -713,7 +723,7 @@ pub async fn get_server_module_options_context(
                         foreign_code_module_options_context.resolved_cell(),
                     ),
                     (
-                        internal_assets_conditions(),
+                        internal_assets_conditions().await?,
                         internal_module_options_context.resolved_cell(),
                     ),
                 ],
@@ -789,7 +799,7 @@ pub async fn get_server_module_options_context(
                         foreign_code_module_options_context.resolved_cell(),
                     ),
                     (
-                        internal_assets_conditions(),
+                        internal_assets_conditions().await?,
                         internal_module_options_context.resolved_cell(),
                     ),
                 ],
@@ -864,7 +874,7 @@ pub async fn get_server_module_options_context(
                         foreign_code_module_options_context.resolved_cell(),
                     ),
                     (
-                        internal_assets_conditions(),
+                        internal_assets_conditions().await?,
                         internal_module_options_context.resolved_cell(),
                     ),
                 ],
@@ -961,7 +971,7 @@ pub async fn get_server_module_options_context(
                         foreign_code_module_options_context.resolved_cell(),
                     ),
                     (
-                        internal_assets_conditions(),
+                        internal_assets_conditions().await?,
                         internal_module_options_context.resolved_cell(),
                     ),
                 ],

diff --git a/crates/next-core/src/util.rs b/crates/next-core/src/util.rs
@@ -121,7 +121,10 @@ pub async fn foreign_code_context_condition(
     // of the `node_modules` specific resolve options (the template files are
     // technically node module files).
     let not_next_template_dir = ContextCondition::not(ContextCondition::InPath(
-        get_next_package(*project_path).join(NEXT_TEMPLATE_PATH.into()),
+        get_next_package(*project_path)
+            .join(NEXT_TEMPLATE_PATH.into())
+            .to_resolved()
+            .await?,
     ));
 
     let result = ContextCondition::all(vec![

diff --git a/turbopack/crates/turbopack-core/src/condition.rs b/turbopack/crates/turbopack-core/src/condition.rs
@@ -1,16 +1,16 @@
 use anyhow::Result;
 use futures::{stream, StreamExt};
 use serde::{Deserialize, Serialize};
-use turbo_tasks::{trace::TraceRawVcs, Vc};
+use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc};
 use turbo_tasks_fs::FileSystemPath;
 
-#[derive(Debug, Clone, Serialize, Deserialize, TraceRawVcs, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, NonLocalValue)]
 pub enum ContextCondition {
     All(Vec<ContextCondition>),
     Any(Vec<ContextCondition>),
     Not(Box<ContextCondition>),
     InDirectory(String),
-    InPath(Vc<FileSystemPath>),
+    InPath(ResolvedVc<FileSystemPath>),
 }
 
 impl ContextCondition {

diff --git a/turbopack/crates/turbopack-resolve/src/resolve_options_context.rs b/turbopack/crates/turbopack-resolve/src/resolve_options_context.rs
@@ -11,7 +11,7 @@ use turbopack_core::{
     },
 };
 
-#[turbo_tasks::value(shared, local)]
+#[turbo_tasks::value(shared)]
 #[derive(Default, Clone)]
 pub struct ResolveOptionsContext {
     #[serde(default)]