add support for .jsx and .tsx files (#276)

vercel · Aug 26, 2022 · ec88fc2 · ec88fc2
1 parent 49e759b
commit ec88fc2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/crates/turbopack/src/module_options/mod.rs b/crates/turbopack/src/module_options/mod.rs
@@ -26,7 +26,10 @@ pub async fn the_module_options() -> ModuleOptionsVc {
                 vec![ModuleRuleEffect::ModuleType(ModuleType::Css)],
             ),
             ModuleRule::new(
-                ModuleRuleCondition::ResourcePathEndsWith(".js".to_string()),
+                ModuleRuleCondition::any(vec![
+                    ModuleRuleCondition::ResourcePathEndsWith(".js".to_string()),
+                    ModuleRuleCondition::ResourcePathEndsWith(".jsx".to_string()),
+                ]),
                 vec![ModuleRuleEffect::ModuleType(ModuleType::Ecmascript(
                     app_transforms,
                 ))],
@@ -71,7 +74,10 @@ pub async fn the_module_options() -> ModuleOptionsVc {
                 ))],
             ),
             ModuleRule::new(
-                ModuleRuleCondition::ResourcePathEndsWith(".ts".to_string()),
+                ModuleRuleCondition::any(vec![
+                    ModuleRuleCondition::ResourcePathEndsWith(".ts".to_string()),
+                    ModuleRuleCondition::ResourcePathEndsWith(".tsx".to_string()),
+                ]),
                 vec![ModuleRuleEffect::ModuleType(ModuleType::Typescript(
                     no_transforms,
                 ))],

diff --git a/crates/turbopack/src/resolve.rs b/crates/turbopack/src/resolve.rs
@@ -110,7 +110,14 @@ pub async fn resolve_options(
         extensions: if emulating {
             environment.resolve_extensions().await?.clone()
         } else {
-            vec![".js".to_string(), ".node".to_string(), ".json".to_string()]
+            vec![
+                ".tsx".to_string(),
+                ".ts".to_string(),
+                ".js".to_string(),
+                ".jsx".to_string(),
+                ".node".to_string(),
+                ".json".to_string(),
+            ]
         },
         modules: if emulating {
             if *environment.resolve_node_modules().await? {