feat(ecmascript): support jsximport/runtime options

vercel · Mar 20, 2023 · c817f15 · c817f15
1 parent c857d55
commit c817f15
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 17 deletions.
diff --git a/crates/turbopack-ecmascript/src/transform/mod.rs b/crates/turbopack-ecmascript/src/transform/mod.rs
@@ -16,7 +16,7 @@ use swc_core::{
         visit::{FoldWith, VisitMutWith},
     },
 };
-use turbo_tasks::primitives::StringVc;
+use turbo_tasks::primitives::{OptionStringVc, StringVc};
 use turbo_tasks_fs::json::parse_json_with_source_context;
 use turbopack_core::environment::EnvironmentVc;
 
@@ -33,6 +33,10 @@ pub enum EcmascriptInputTransform {
     React {
         #[serde(default)]
         refresh: bool,
+        // swc.jsc.transform.react.importSource
+        import_source: OptionStringVc,
+        // swc.jsc.transform.react.runtime,
+        runtime: OptionStringVc,
     },
     StyledComponents,
     StyledJsx,
@@ -104,22 +108,45 @@ impl EcmascriptInputTransform {
             ..
         } = ctx;
         match self {
-            EcmascriptInputTransform::React { refresh } => {
+            EcmascriptInputTransform::React {
+                refresh,
+                import_source,
+                runtime,
+            } => {
+                use swc_core::ecma::transforms::react::{Options, Runtime};
+                let runtime = if let Some(runtime) = &*runtime.await? {
+                    match runtime.as_str() {
+                        "classic" => Runtime::Classic,
+                        "automatic" => Runtime::Automatic,
+                        _ => {
+                            return Err(anyhow::anyhow!(
+                                "Invalid value for swc.jsc.transform.react.runtime: {}",
+                                runtime
+                            ))
+                        }
+                    }
+                } else {
+                    Runtime::Automatic
+                };
+
+                let config = Options {
+                    runtime: Some(runtime),
+                    development: Some(true),
+                    import_source: (&*import_source.await?).clone(),
+                    refresh: if *refresh {
+                        Some(swc_core::ecma::transforms::react::RefreshOptions {
+                            ..Default::default()
+                        })
+                    } else {
+                        None
+                    },
+                    ..Default::default()
+                };
+
                 program.visit_mut_with(&mut react(
                     source_map.clone(),
                     Some(comments.clone()),
-                    swc_core::ecma::transforms::react::Options {
-                        runtime: Some(swc_core::ecma::transforms::react::Runtime::Automatic),
-                        development: Some(true),
-                        refresh: if *refresh {
-                            Some(swc_core::ecma::transforms::react::RefreshOptions {
-                                ..Default::default()
-                            })
-                        } else {
-                            None
-                        },
-                        ..Default::default()
-                    },
+                    config,
                     top_level_mark,
                 ));
             }

diff --git a/crates/turbopack-tests/tests/snapshot.rs b/crates/turbopack-tests/tests/snapshot.rs
@@ -191,7 +191,9 @@ async fn run_test(resource: &str) -> Result<FileSystemPathVc> {
         TransitionsByNameVc::cell(HashMap::new()),
         compile_time_info,
         ModuleOptionsContext {
-            enable_jsx: true,
+            enable_jsx: Some(JsxTransformOptionsVc::cell(JsxTransformOptions {
+                ..Default::default()
+            })),
             enable_emotion: true,
             enable_styled_components: true,
             preset_env_versions: Some(env),

diff --git a/crates/turbopack/src/module_options/mod.rs b/crates/turbopack/src/module_options/mod.rs
@@ -6,6 +6,7 @@ use anyhow::{Context, Result};
 pub use module_options_context::*;
 pub use module_rule::*;
 pub use rule_condition::*;
+use turbo_tasks::primitives::OptionStringVc;
 use turbo_tasks_fs::FileSystemPathVc;
 use turbopack_core::{
     reference_type::{ReferenceType, UrlReferenceSubType},
@@ -97,9 +98,12 @@ impl ModuleOptionsVc {
         if enable_styled_components {
             transforms.push(EcmascriptInputTransform::StyledComponents)
         }
-        if enable_jsx {
+        if let Some(enable_jsx) = enable_jsx {
+            let jsx = enable_jsx.await?;
             transforms.push(EcmascriptInputTransform::React {
                 refresh: enable_react_refresh,
+                import_source: OptionStringVc::cell(jsx.import_source.clone()),
+                runtime: OptionStringVc::cell(jsx.runtime.clone()),
             });
         }
 

diff --git a/crates/turbopack/src/module_options/module_options_context.rs b/crates/turbopack/src/module_options/module_options_context.rs
@@ -60,11 +60,19 @@ impl WebpackLoadersOptions {
     }
 }
 
+// [TODO]: should enabled_react_refresh belong to this options?
+#[turbo_tasks::value(shared)]
+#[derive(Default, Clone, Debug)]
+pub struct JsxTransformOptions {
+    pub import_source: Option<String>,
+    pub runtime: Option<String>,
+}
+
 #[turbo_tasks::value(shared)]
 #[derive(Default, Clone)]
 pub struct ModuleOptionsContext {
     #[serde(default)]
-    pub enable_jsx: bool,
+    pub enable_jsx: Option<JsxTransformOptionsVc>,
     #[serde(default)]
     pub enable_emotion: bool,
     #[serde(default)]