Automatic babel-loader followup

crates/next-core/src/babel.rs

@@ -3,7 +3,7 @@ use turbo_tasks::{
     primitives::{BoolVc, StringVc},
     Value,
 };
-use turbo_tasks_fs::FileSystemPathVc;
+use turbo_tasks_fs::{FileSystemEntryType, FileSystemPathVc};
 use turbopack::{
     module_options::WebpackLoadersOptionsVc, resolve_options,
     resolve_options_context::ResolveOptionsContext,
@@ -37,8 +37,8 @@ pub async fn maybe_add_babel_loader(
     let has_babel_config = {
         let mut has_babel_config = false;
         for filename in BABEL_CONFIG_FILES {
-            let metadata = project_root.join(filename).metadata().await;
-            if metadata.is_ok() {
+            let filetype = *project_root.join(filename).get_type().await?;
+            if matches!(filetype, FileSystemEntryType::File) {
                 has_babel_config = true;
                 break;
             }
@@ -48,6 +48,7 @@ pub async fn maybe_add_babel_loader(
 
     if has_babel_config {
         let mut options = (*webpack_options.await?).clone();
+        let mut has_emitted_babel_resolve_issue = false;
         for ext in [".js", ".jsx", ".ts", ".tsx", ".cjs", ".mjs"] {
             let configs = options.extension_to_loaders.get(ext);
             let has_babel_loader = match configs {
@@ -73,7 +74,9 @@ pub async fn maybe_add_babel_loader(
             };
 
             if !has_babel_loader {
-                if !*(is_babel_loader_available(project_root).await?) {
+                if !has_emitted_babel_resolve_issue
+                    && !*is_babel_loader_available(project_root).await?
+                {
                     BabelIssue {
                         path: project_root,
                         title: StringVc::cell(
@@ -88,7 +91,9 @@ pub async fn maybe_add_babel_loader(
                     }
                     .cell()
                     .as_issue()
-                    .emit()
+                    .emit();
+
+                    has_emitted_babel_resolve_issue = true;
                 }
 
                 let loader = WebpackLoaderConfigItem::LoaderName("babel-loader".to_owned());

crates/turbopack/Cargo.toml

@@ -15,6 +15,7 @@ bench_against_node_nft = []
 
 [dependencies]
 anyhow = "1.0.47"
+async-recursion = "1.0.2"
 indexmap = { workspace = true, features = ["serde"] }
 lazy_static = "1.4.0"
 regex = "1.5.4"

crates/turbopack/src/lib.rs

@@ -172,7 +172,7 @@ async fn module(
     let mut current_source = source;
     let mut current_module_type = None;
     for rule in options.await?.rules.iter() {
-        if rule.matches(&*path.await?, &reference_type) {
+        if rule.matches(source, &*path.await?, &reference_type).await? {
             for effect in rule.effects() {
                 match effect {
                     ModuleRuleEffect::SourceTransforms(transforms) => {

crates/turbopack/src/module_options/mod.rs

@@ -264,7 +264,10 @@ impl ModuleOptionsVc {
             };
             for (ext, loaders) in webpack_loaders_options.extension_to_loaders.iter() {
                 rules.push(ModuleRule::new(
-                    ModuleRuleCondition::ResourcePathEndsWith(ext.to_string()),
+                    ModuleRuleCondition::All(vec![
+                        ModuleRuleCondition::ResourcePathEndsWith(ext.to_string()),
+                        ModuleRuleCondition::not(ModuleRuleCondition::ResourceIsVirtualAsset),
+                    ]),
                     vec![
                         ModuleRuleEffect::ModuleType(ModuleType::Ecmascript(app_transforms)),
                         ModuleRuleEffect::SourceTransforms(SourceTransformsVc::cell(vec![

crates/turbopack/src/module_options/module_rule.rs

@@ -2,7 +2,9 @@ use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use turbo_tasks::trace::TraceRawVcs;
 use turbo_tasks_fs::FileSystemPath;
-use turbopack_core::{reference_type::ReferenceType, source_transform::SourceTransformsVc};
+use turbopack_core::{
+    asset::AssetVc, reference_type::ReferenceType, source_transform::SourceTransformsVc,
+};
 use turbopack_css::CssInputTransformsVc;
 use turbopack_ecmascript::EcmascriptInputTransformsVc;
 
@@ -23,8 +25,13 @@ impl ModuleRule {
         self.effects.iter()
     }
 
-    pub fn matches(&self, path: &FileSystemPath, reference_type: &ReferenceType) -> bool {
-        self.condition.matches(path, reference_type)
+    pub async fn matches(
+        &self,
+        source: AssetVc,
+        path: &FileSystemPath,
+        reference_type: &ReferenceType,
+    ) -> Result<bool> {
+        self.condition.matches(source, path, reference_type).await
     }
 }
 

crates/turbopack/src/module_options/rule_condition.rs

@@ -1,14 +1,19 @@
+use anyhow::Result;
+use async_recursion::async_recursion;
 use serde::{Deserialize, Serialize};
 use turbo_tasks::{primitives::Regex, trace::TraceRawVcs};
 use turbo_tasks_fs::{FileSystemPath, FileSystemPathReadRef};
-use turbopack_core::reference_type::ReferenceType;
+use turbopack_core::{
+    asset::AssetVc, reference_type::ReferenceType, virtual_asset::VirtualAssetVc,
+};
 
 #[derive(Debug, Clone, Serialize, Deserialize, TraceRawVcs, PartialEq, Eq)]
 pub enum ModuleRuleCondition {
     All(Vec<ModuleRuleCondition>),
     Any(Vec<ModuleRuleCondition>),
     Not(Box<ModuleRuleCondition>),
     ReferenceType(ReferenceType),
+    ResourceIsVirtualAsset,
     ResourcePathEquals(FileSystemPathReadRef),
     ResourcePathHasNoExtension,
     ResourcePathEndsWith(String),
@@ -33,15 +38,33 @@ impl ModuleRuleCondition {
 }
 
 impl ModuleRuleCondition {
-    pub fn matches(&self, path: &FileSystemPath, reference_type: &ReferenceType) -> bool {
-        match self {
+    #[async_recursion]
+    pub async fn matches(
+        &self,
+        source: AssetVc,
+        path: &FileSystemPath,
+        reference_type: &ReferenceType,
+    ) -> Result<bool> {
+        Ok(match self {
             ModuleRuleCondition::All(conditions) => {
-                conditions.iter().all(|c| c.matches(path, reference_type))
+                for condition in conditions {
+                    if !condition.matches(source, path, reference_type).await? {
+                        return Ok(false);
+                    }
+                }
+                true
             }
             ModuleRuleCondition::Any(conditions) => {
-                conditions.iter().any(|c| c.matches(path, reference_type))
+                for condition in conditions {
+                    if condition.matches(source, path, reference_type).await? {
+                        return Ok(true);
+                    }
+                }
+                false
+            }
+            ModuleRuleCondition::Not(condition) => {
+                !condition.matches(source, path, reference_type).await?
             }
-            ModuleRuleCondition::Not(condition) => !condition.matches(path, reference_type),
             ModuleRuleCondition::ResourcePathEquals(other) => path == &**other,
             ModuleRuleCondition::ResourcePathEndsWith(end) => path.path.ends_with(end),
             ModuleRuleCondition::ResourcePathHasNoExtension => {
@@ -64,7 +87,10 @@ impl ModuleRuleCondition {
             ModuleRuleCondition::ReferenceType(condition_ty) => {
                 condition_ty.includes(reference_type)
             }
+            ModuleRuleCondition::ResourceIsVirtualAsset => {
+                VirtualAssetVc::resolve_from(source).await?.is_some()
+            }
             _ => todo!("not implemented yet"),
-        }
+        })
     }
 }