Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ecmascript): support jsximport/runtime options #4198

Merged
merged 1 commit into from Mar 20, 2023
Merged

feat(ecmascript): support jsximport/runtime options #4198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 41 additions & 14 deletions crates/turbopack-ecmascript/src/transform/mod.rs
View file
Open in desktop
Expand Up @@ -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;

Expand All @@ -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,
Comment on lines +38 to +39
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather this be an enum instead, since there are only two valid values. This avoids downstream validation.

},
StyledComponents,
StyledJsx,
Expand Down Expand Up @@ -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,
));
}
Expand Down
6 changes: 4 additions & 2 deletions crates/turbopack-tests/tests/snapshot.rs
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ use turbo_tasks_memory::MemoryBackend;
use turbopack::{
condition::ContextCondition,
ecmascript::{chunk::EcmascriptChunkPlaceablesVc, EcmascriptModuleAssetVc},
module_options::ModuleOptionsContext,
module_options::{JsxTransformOptions, JsxTransformOptionsVc, ModuleOptionsContext},
resolve_options_context::ResolveOptionsContext,
transition::TransitionsByNameVc,
ModuleAssetContextVc,
Expand Down Expand Up @@ -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),
Expand Down
6 changes: 5 additions & 1 deletion crates/turbopack/src/module_options/mod.rs
View file
Open in desktop
Expand Up @@ -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},
Expand Down Expand Up @@ -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()),
});
}

Expand Down
10 changes: 9 additions & 1 deletion crates/turbopack/src/module_options/module_options_context.rs
View file
Open in desktop
Expand Up @@ -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)]
Expand Down