Merge dedf85b into dd05689

vercel · Aug 24, 2023 · 642fd5a · 642fd5a
2 parents dd05689 + dedf85b
commit 642fd5a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/crates/turbopack/src/condition.rs b/crates/turbopack/src/condition.rs
@@ -48,7 +48,7 @@ impl ContextCondition {
                 // False positive.
                 #[allow(clippy::manual_try_fold)]
                 stream::iter(conditions)
-                    .fold(Ok(true), |acc, c| async move {
+                    .fold(Ok(false), |acc, c| async move {
                         Ok(acc? || c.matches(path).await?)
                     })
                     .await

diff --git a/crates/turbopack/src/evaluate_context.rs b/crates/turbopack/src/evaluate_context.rs
@@ -12,8 +12,9 @@ use turbopack_core::{
 use turbopack_node::execution_context::ExecutionContext;
 
 use crate::{
-    module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext,
-    transition::TransitionsByName, ModuleAssetContext,
+    condition::ContextCondition, module_options::ModuleOptionsContext,
+    resolve_options_context::ResolveOptionsContext, transition::TransitionsByName,
+    ModuleAssetContext,
 };
 
 #[turbo_tasks::function]
@@ -49,31 +50,36 @@ pub async fn node_evaluate_asset_context(
         } else {
             "development".to_string()
         };
+    let resolve_options_context = ResolveOptionsContext {
+        enable_node_modules: Some(execution_context.project_path().root().resolve().await?),
+        enable_node_externals: true,
+        enable_node_native_modules: true,
+        custom_conditions: vec![node_env.clone(), "node".to_string()],
+        ..Default::default()
+    };
+    let resolve_options_context = ResolveOptionsContext {
+        enable_typescript: true,
+        import_map: Some(import_map),
+        rules: vec![(
+            ContextCondition::InDirectory("node_modules".to_string()),
+            resolve_options_context.clone().cell(),
+        )],
+        ..resolve_options_context
+    }
+    .cell();
     Ok(Vc::upcast(ModuleAssetContext::new(
         transitions.unwrap_or_else(|| Vc::cell(Default::default())),
         CompileTimeInfo::builder(node_build_environment())
             .defines(
-                compile_time_defines!(
-                    process.turbopack = true,
-                    process.env.NODE_ENV = node_env.clone(),
-                )
-                .cell(),
+                compile_time_defines!(process.turbopack = true, process.env.NODE_ENV = node_env,)
+                    .cell(),
             )
             .cell(),
         ModuleOptionsContext {
             enable_typescript_transform: Some(Default::default()),
             ..Default::default()
         }
         .cell(),
-        ResolveOptionsContext {
-            enable_typescript: true,
-            enable_node_modules: Some(execution_context.project_path().root().resolve().await?),
-            enable_node_externals: true,
-            enable_node_native_modules: true,
-            custom_conditions: vec![node_env, "node".to_string()],
-            import_map: Some(import_map),
-            ..Default::default()
-        }
-        .cell(),
+        resolve_options_context,
     )))
 }