Unverified Commit fb83b834 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: run styled-jsx after typescript transform (#82359)

Closes PACK-5183

Based on https://github.com/swc-project/swc/issues/10944#issuecomment-3120775091, we need to run styled-jsx after typescript


Fixes this crash
```
entered unreachable code: This visitor does not support TypeScript. This method fails for optimization purposes. Encountered in unreachable visitor: visit_ts_interface_decl
```

This has become more pressing as swc seems to have turned the debug_assertion into a proper panic/crash in recent versions (I was seeing SIGSEGV when building some app): https://vercel.slack.com/archives/C03EWR7LGEN/p1754390155508789?thread_ts=1753477535.369549&cid=C03EWR7LGEN


We now have three phases/stages:
- preprocess: to strip typescript/decorators (so to normalize the syntax)
- main: for transforms that want to operate on "standard" EcmaScript (though still with raw JSX)
- postprocess: react transform, preset-env, etc (so low level "codegen")
parent 9e9ee852
...@@ -58,7 +58,7 @@ use crate::{ ...@@ -58,7 +58,7 @@ use crate::{
get_invalid_styled_jsx_resolve_plugin, get_invalid_styled_jsx_resolve_plugin,
}, },
transforms::{ transforms::{
emotion::get_emotion_transform_rule, get_ecma_transform_rule, EcmascriptTransformStage, emotion::get_emotion_transform_rule, get_ecma_transform_rule,
next_react_server_components::get_next_react_server_components_transform_rule, next_react_server_components::get_next_react_server_components_transform_rule,
react_remove_properties::get_react_remove_properties_transform_rule, react_remove_properties::get_react_remove_properties_transform_rule,
relay::get_relay_transform_rule, remove_console::get_remove_console_transform_rule, relay::get_relay_transform_rule, remove_console::get_remove_console_transform_rule,
...@@ -768,7 +768,7 @@ pub async fn get_server_module_options_context( ...@@ -768,7 +768,7 @@ pub async fn get_server_module_options_context(
ecmascript_client_reference_transition_name, ecmascript_client_reference_transition_name,
)), )),
enable_mdx_rs.is_some(), enable_mdx_rs.is_some(),
true, EcmascriptTransformStage::Preprocess,
)); ));
} }
...@@ -844,7 +844,7 @@ pub async fn get_server_module_options_context( ...@@ -844,7 +844,7 @@ pub async fn get_server_module_options_context(
ecmascript_client_reference_transition_name, ecmascript_client_reference_transition_name,
)), )),
enable_mdx_rs.is_some(), enable_mdx_rs.is_some(),
true, EcmascriptTransformStage::Preprocess,
)); ));
} }
...@@ -922,7 +922,7 @@ pub async fn get_server_module_options_context( ...@@ -922,7 +922,7 @@ pub async fn get_server_module_options_context(
ecmascript_client_reference_transition_name, ecmascript_client_reference_transition_name,
)), )),
enable_mdx_rs.is_some(), enable_mdx_rs.is_some(),
true, EcmascriptTransformStage::Preprocess,
)); ));
} else { } else {
custom_source_transform_rules.push(get_ecma_transform_rule( custom_source_transform_rules.push(get_ecma_transform_rule(
...@@ -930,7 +930,7 @@ pub async fn get_server_module_options_context( ...@@ -930,7 +930,7 @@ pub async fn get_server_module_options_context(
"next/dist/client/use-client-disallowed.js".to_string(), "next/dist/client/use-client-disallowed.js".to_string(),
)), )),
enable_mdx_rs.is_some(), enable_mdx_rs.is_some(),
true, EcmascriptTransformStage::Preprocess,
)); ));
} }
......
...@@ -16,8 +16,9 @@ pub fn get_debug_fn_name_rule(enable_mdx_rs: bool) -> ModuleRule { ...@@ -16,8 +16,9 @@ pub fn get_debug_fn_name_rule(enable_mdx_rs: bool) -> ModuleRule {
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![debug_fn_name_transform]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![debug_fn_name_transform]),
}], }],
) )
} }
......
...@@ -4,7 +4,10 @@ use turbopack::module_options::ModuleRule; ...@@ -4,7 +4,10 @@ use turbopack::module_options::ModuleRule;
use turbopack_ecmascript_plugins::transform::emotion::EmotionTransformer; use turbopack_ecmascript_plugins::transform::emotion::EmotionTransformer;
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_config::{EmotionTransformOptionsOrBoolean, NextConfig}; use crate::{
next_config::{EmotionTransformOptionsOrBoolean, NextConfig},
next_shared::transforms::EcmascriptTransformStage,
};
pub async fn get_emotion_transform_rule(next_config: Vc<NextConfig>) -> Result<Option<ModuleRule>> { pub async fn get_emotion_transform_rule(next_config: Vc<NextConfig>) -> Result<Option<ModuleRule>> {
let enable_mdx_rs = next_config.mdx_rs().await?.is_some(); let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
...@@ -20,7 +23,13 @@ pub async fn get_emotion_transform_rule(next_config: Vc<NextConfig>) -> Result<O ...@@ -20,7 +23,13 @@ pub async fn get_emotion_transform_rule(next_config: Vc<NextConfig>) -> Result<O
EmotionTransformOptionsOrBoolean::Options(value) => EmotionTransformer::new(value), EmotionTransformOptionsOrBoolean::Options(value) => EmotionTransformer::new(value),
_ => None, _ => None,
}) })
.map(|transformer| get_ecma_transform_rule(Box::new(transformer), enable_mdx_rs, true)); .map(|transformer| {
get_ecma_transform_rule(
Box::new(transformer),
enable_mdx_rs,
EcmascriptTransformStage::Main,
)
});
Ok(module_rule) Ok(module_rule)
} }
...@@ -134,28 +134,32 @@ pub(crate) fn module_rule_match_pages_page_file( ...@@ -134,28 +134,32 @@ pub(crate) fn module_rule_match_pages_page_file(
]) ])
} }
pub(crate) enum EcmascriptTransformStage {
Preprocess,
Main,
Postprocess,
}
/// Create a new module rule for the given ecmatransform, runs against /// Create a new module rule for the given ecmatransform, runs against
/// any ecmascript (with mdx if enabled) except url reference type /// any ecmascript (with mdx if enabled) except url reference type
pub(crate) fn get_ecma_transform_rule( pub(crate) fn get_ecma_transform_rule(
transformer: Box<dyn CustomTransformer + Send + Sync>, transformer: Box<dyn CustomTransformer + Send + Sync>,
enable_mdx_rs: bool, enable_mdx_rs: bool,
prepend: bool, stage: EcmascriptTransformStage,
) -> ModuleRule { ) -> ModuleRule {
let transformer = EcmascriptInputTransform::Plugin(ResolvedVc::cell(transformer as _)); let transformer = EcmascriptInputTransform::Plugin(ResolvedVc::cell(transformer as _));
let (prepend, append) = if prepend { let (preprocess, main, postprocess) = match stage {
( EcmascriptTransformStage::Preprocess => (vec![transformer], vec![], vec![]),
ResolvedVc::cell(vec![transformer]), EcmascriptTransformStage::Main => (vec![], vec![transformer], vec![]),
ResolvedVc::cell(vec![]), EcmascriptTransformStage::Postprocess => (vec![], vec![], vec![transformer]),
)
} else {
(
ResolvedVc::cell(vec![]),
ResolvedVc::cell(vec![transformer]),
)
}; };
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { prepend, append }], vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
preprocess: ResolvedVc::cell(preprocess),
main: ResolvedVc::cell(main),
postprocess: ResolvedVc::cell(postprocess),
}],
) )
} }
...@@ -63,8 +63,9 @@ pub fn get_next_modularize_imports_rule( ...@@ -63,8 +63,9 @@ pub fn get_next_modularize_imports_rule(
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -14,8 +14,9 @@ pub fn get_next_amp_attr_rule(enable_mdx_rs: bool) -> ModuleRule { ...@@ -14,8 +14,9 @@ pub fn get_next_amp_attr_rule(enable_mdx_rs: bool) -> ModuleRule {
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![transformer]),
postprocess: ResolvedVc::cell(vec![]),
}], }],
) )
} }
......
...@@ -54,8 +54,9 @@ pub fn get_next_cjs_optimizer_rule(enable_mdx_rs: bool) -> ModuleRule { ...@@ -54,8 +54,9 @@ pub fn get_next_cjs_optimizer_rule(enable_mdx_rs: bool) -> ModuleRule {
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -19,8 +19,9 @@ pub fn get_next_disallow_export_all_in_page_rule( ...@@ -19,8 +19,9 @@ pub fn get_next_disallow_export_all_in_page_rule(
ModuleRule::new( ModuleRule::new(
module_rule_match_pages_page_file(enable_mdx_rs, pages_dir), module_rule_match_pages_page_file(enable_mdx_rs, pages_dir),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -27,8 +27,9 @@ pub async fn get_next_dynamic_transform_rule( ...@@ -27,8 +27,9 @@ pub async fn get_next_dynamic_transform_rule(
Ok(ModuleRule::new( Ok(ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![dynamic_transform]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![dynamic_transform]),
}], }],
)) ))
} }
......
...@@ -24,8 +24,9 @@ pub fn next_edge_node_api_assert( ...@@ -24,8 +24,9 @@ pub fn next_edge_node_api_assert(
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -28,8 +28,9 @@ pub fn get_next_font_transform_rule(enable_mdx_rs: bool) -> ModuleRule { ...@@ -28,8 +28,9 @@ pub fn get_next_font_transform_rule(enable_mdx_rs: bool) -> ModuleRule {
// TODO: Only match in pages (not pages/api), app/, etc. // TODO: Only match in pages (not pages/api), app/, etc.
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -6,9 +6,14 @@ use turbopack::module_options::ModuleRule; ...@@ -6,9 +6,14 @@ use turbopack::module_options::ModuleRule;
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_shared::transforms::EcmascriptTransformStage;
pub fn get_next_lint_transform_rule(enable_mdx_rs: bool) -> ModuleRule { pub fn get_next_lint_transform_rule(enable_mdx_rs: bool) -> ModuleRule {
get_ecma_transform_rule(Box::new(LintTransformer {}), enable_mdx_rs, true) get_ecma_transform_rule(
Box::new(LintTransformer {}),
enable_mdx_rs,
EcmascriptTransformStage::Preprocess,
)
} }
#[derive(Debug)] #[derive(Debug)]
......
...@@ -15,8 +15,9 @@ pub fn get_middleware_dynamic_assert_rule(enable_mdx_rs: bool) -> ModuleRule { ...@@ -15,8 +15,9 @@ pub fn get_middleware_dynamic_assert_rule(enable_mdx_rs: bool) -> ModuleRule {
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -20,8 +20,9 @@ pub fn get_next_optimize_server_react_rule( ...@@ -20,8 +20,9 @@ pub fn get_next_optimize_server_react_rule(
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -17,8 +17,9 @@ pub fn get_next_page_config_rule(enable_mdx_rs: bool, pages_dir: FileSystemPath) ...@@ -17,8 +17,9 @@ pub fn get_next_page_config_rule(enable_mdx_rs: bool, pages_dir: FileSystemPath)
ModuleRule::new( ModuleRule::new(
module_rule_match_pages_page_file(enable_mdx_rs, pages_dir), module_rule_match_pages_page_file(enable_mdx_rs, pages_dir),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -39,8 +39,9 @@ pub fn get_next_page_static_info_assert_rule( ...@@ -39,8 +39,9 @@ pub fn get_next_page_static_info_assert_rule(
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![transformer]), preprocess: ResolvedVc::cell(vec![transformer]),
append: ResolvedVc::cell(vec![]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![]),
}], }],
) )
} }
......
...@@ -14,8 +14,9 @@ pub fn get_next_pure_rule(enable_mdx_rs: bool) -> ModuleRule { ...@@ -14,8 +14,9 @@ pub fn get_next_pure_rule(enable_mdx_rs: bool) -> ModuleRule {
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -11,7 +11,7 @@ use turbopack::module_options::ModuleRule; ...@@ -11,7 +11,7 @@ use turbopack::module_options::ModuleRule;
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_config::NextConfig; use crate::{next_config::NextConfig, next_shared::transforms::EcmascriptTransformStage};
/// Returns a rule which applies the Next.js react server components transform. /// Returns a rule which applies the Next.js react server components transform.
/// This transform owns responsibility to assert various import / usage /// This transform owns responsibility to assert various import / usage
...@@ -44,7 +44,7 @@ pub async fn get_next_react_server_components_transform_rule( ...@@ -44,7 +44,7 @@ pub async fn get_next_react_server_components_transform_rule(
app_dir, app_dir,
)), )),
enable_mdx_rs, enable_mdx_rs,
true, EcmascriptTransformStage::Preprocess,
)) ))
} }
......
...@@ -16,8 +16,9 @@ pub fn get_next_shake_exports_rule(enable_mdx_rs: bool, ignore: Vec<String>) -> ...@@ -16,8 +16,9 @@ pub fn get_next_shake_exports_rule(enable_mdx_rs: bool, ignore: Vec<String>) ->
ModuleRule::new( ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![transformer]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}], }],
) )
} }
......
...@@ -40,8 +40,9 @@ pub async fn get_next_pages_transforms_rule( ...@@ -40,8 +40,9 @@ pub async fn get_next_pages_transforms_rule(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
]), ]),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]), preprocess: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![strip_transform]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![strip_transform]),
}], }],
)) ))
} }
......
...@@ -6,9 +6,14 @@ use turbopack::module_options::ModuleRule; ...@@ -6,9 +6,14 @@ use turbopack::module_options::ModuleRule;
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_shared::transforms::EcmascriptTransformStage;
pub fn get_next_track_dynamic_imports_transform_rule(mdx_rs: bool) -> ModuleRule { pub fn get_next_track_dynamic_imports_transform_rule(mdx_rs: bool) -> ModuleRule {
get_ecma_transform_rule(Box::new(NextTrackDynamicImports {}), mdx_rs, false) get_ecma_transform_rule(
Box::new(NextTrackDynamicImports {}),
mdx_rs,
EcmascriptTransformStage::Postprocess,
)
} }
#[derive(Debug)] #[derive(Debug)]
......
...@@ -6,7 +6,10 @@ use turbopack::module_options::ModuleRule; ...@@ -6,7 +6,10 @@ use turbopack::module_options::ModuleRule;
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_config::{NextConfig, ReactRemoveProperties}; use crate::{
next_config::{NextConfig, ReactRemoveProperties},
next_shared::transforms::EcmascriptTransformStage,
};
/// Returns a rule which applies the react_remove_properties transform. /// Returns a rule which applies the react_remove_properties transform.
pub async fn get_react_remove_properties_transform_rule( pub async fn get_react_remove_properties_transform_rule(
...@@ -34,7 +37,7 @@ pub async fn get_react_remove_properties_transform_rule( ...@@ -34,7 +37,7 @@ pub async fn get_react_remove_properties_transform_rule(
get_ecma_transform_rule( get_ecma_transform_rule(
Box::new(ReactRemovePropertiesTransformer { config }), Box::new(ReactRemovePropertiesTransformer { config }),
enable_mdx_rs, enable_mdx_rs,
true, EcmascriptTransformStage::Preprocess,
) )
}); });
......
...@@ -5,7 +5,7 @@ use turbopack::module_options::ModuleRule; ...@@ -5,7 +5,7 @@ use turbopack::module_options::ModuleRule;
use turbopack_ecmascript_plugins::transform::relay::RelayTransformer; use turbopack_ecmascript_plugins::transform::relay::RelayTransformer;
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_config::NextConfig; use crate::{next_config::NextConfig, next_shared::transforms::EcmascriptTransformStage};
/// Returns a transform rule for the relay graphql transform. /// Returns a transform rule for the relay graphql transform.
pub async fn get_relay_transform_rule( pub async fn get_relay_transform_rule(
...@@ -17,7 +17,7 @@ pub async fn get_relay_transform_rule( ...@@ -17,7 +17,7 @@ pub async fn get_relay_transform_rule(
get_ecma_transform_rule( get_ecma_transform_rule(
Box::new(RelayTransformer::new(config, &project_path)), Box::new(RelayTransformer::new(config, &project_path)),
enable_mdx_rs, enable_mdx_rs,
true, EcmascriptTransformStage::Preprocess,
) )
}); });
......
...@@ -6,7 +6,10 @@ use turbopack::module_options::ModuleRule; ...@@ -6,7 +6,10 @@ use turbopack::module_options::ModuleRule;
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_config::{NextConfig, RemoveConsoleConfig}; use crate::{
next_config::{NextConfig, RemoveConsoleConfig},
next_shared::transforms::EcmascriptTransformStage,
};
/// Returns a rule which applies the remove_console transform. /// Returns a rule which applies the remove_console transform.
pub async fn get_remove_console_transform_rule( pub async fn get_remove_console_transform_rule(
...@@ -37,7 +40,7 @@ pub async fn get_remove_console_transform_rule( ...@@ -37,7 +40,7 @@ pub async fn get_remove_console_transform_rule(
get_ecma_transform_rule( get_ecma_transform_rule(
Box::new(RemoveConsoleTransformer { config }), Box::new(RemoveConsoleTransformer { config }),
enable_mdx_rs, enable_mdx_rs,
true, EcmascriptTransformStage::Preprocess,
) )
}); });
......
...@@ -40,8 +40,9 @@ pub async fn get_server_actions_transform_rule( ...@@ -40,8 +40,9 @@ pub async fn get_server_actions_transform_rule(
Ok(ModuleRule::new( Ok(ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs), module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![transformer]), preprocess: ResolvedVc::cell(vec![transformer]),
append: ResolvedVc::cell(vec![]), main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![]),
}], }],
)) ))
} }
......
...@@ -5,7 +5,7 @@ use turbopack_ecmascript_plugins::transform::styled_components::StyledComponents ...@@ -5,7 +5,7 @@ use turbopack_ecmascript_plugins::transform::styled_components::StyledComponents
use crate::{ use crate::{
next_config::{NextConfig, StyledComponentsTransformOptionsOrBoolean}, next_config::{NextConfig, StyledComponentsTransformOptionsOrBoolean},
next_shared::transforms::get_ecma_transform_rule, next_shared::transforms::{EcmascriptTransformStage, get_ecma_transform_rule},
}; };
pub async fn get_styled_components_transform_rule( pub async fn get_styled_components_transform_rule(
...@@ -27,7 +27,13 @@ pub async fn get_styled_components_transform_rule( ...@@ -27,7 +27,13 @@ pub async fn get_styled_components_transform_rule(
} }
_ => None, _ => None,
}) })
.map(|transformer| get_ecma_transform_rule(Box::new(transformer), enable_mdx_rs, true)); .map(|transformer| {
get_ecma_transform_rule(
Box::new(transformer),
enable_mdx_rs,
EcmascriptTransformStage::Main,
)
});
Ok(module_rule) Ok(module_rule)
} }
...@@ -5,7 +5,7 @@ use turbopack_core::environment::RuntimeVersions; ...@@ -5,7 +5,7 @@ use turbopack_core::environment::RuntimeVersions;
use turbopack_ecmascript_plugins::transform::styled_jsx::StyledJsxTransformer; use turbopack_ecmascript_plugins::transform::styled_jsx::StyledJsxTransformer;
use super::get_ecma_transform_rule; use super::get_ecma_transform_rule;
use crate::next_config::NextConfig; use crate::{next_config::NextConfig, next_shared::transforms::EcmascriptTransformStage};
/// Returns a transform rule for the styled jsx transform. /// Returns a transform rule for the styled jsx transform.
pub async fn get_styled_jsx_transform_rule( pub async fn get_styled_jsx_transform_rule(
...@@ -19,6 +19,6 @@ pub async fn get_styled_jsx_transform_rule( ...@@ -19,6 +19,6 @@ pub async fn get_styled_jsx_transform_rule(
Ok(Some(get_ecma_transform_rule( Ok(Some(get_ecma_transform_rule(
Box::new(transformer), Box::new(transformer),
enable_mdx_rs, enable_mdx_rs,
true, EcmascriptTransformStage::Main,
))) )))
} }
...@@ -48,7 +48,7 @@ pub async fn get_swc_ecma_transform_rule_impl( ...@@ -48,7 +48,7 @@ pub async fn get_swc_ecma_transform_rule_impl(
SwcEcmaTransformPluginsTransformer, SwcPluginModule, SwcEcmaTransformPluginsTransformer, SwcPluginModule,
}; };
use crate::next_shared::transforms::get_ecma_transform_rule; use crate::next_shared::transforms::{EcmascriptTransformStage, get_ecma_transform_rule};
let plugins = plugin_configs let plugins = plugin_configs
.iter() .iter()
...@@ -116,6 +116,6 @@ pub async fn get_swc_ecma_transform_rule_impl( ...@@ -116,6 +116,6 @@ pub async fn get_swc_ecma_transform_rule_impl(
Ok(Some(get_ecma_transform_rule( Ok(Some(get_ecma_transform_rule(
Box::new(SwcEcmaTransformPluginsTransformer::new(plugins)), Box::new(SwcEcmaTransformPluginsTransformer::new(plugins)),
enable_mdx_rs, enable_mdx_rs,
true, EcmascriptTransformStage::Main,
))) )))
} }
...@@ -41,4 +41,13 @@ describe('styled-jsx', () => { ...@@ -41,4 +41,13 @@ describe('styled-jsx', () => {
const html = await next.render('/amp') const html = await next.render('/amp')
expect(html).toMatch(/color:.*?cyan/) expect(html).toMatch(/color:.*?cyan/)
}) })
it('should render styles inside TypeScript', async () => {
const browser = await next.browser('/typescript')
const color = await browser.eval(
`getComputedStyle(document.querySelector('button')).color`
)
expect(color).toMatch('255, 0, 0')
})
}) })
interface Props {
color: string
}
function Test(p: Props) {
return (
<div>
<button>test</button>
<style jsx>{`
button {
color: ${p.color};
}
`}</style>
</div>
)
}
export default function Page() {
return <Test color="red" />
}
...@@ -8,8 +8,8 @@ use turbopack::{ ...@@ -8,8 +8,8 @@ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
ecmascript::TreeShakingMode, ecmascript::TreeShakingMode,
module_options::{ module_options::{
EcmascriptOptionsContext, JsxTransformOptions, ModuleOptionsContext, ModuleRule, EcmascriptOptionsContext, JsxTransformOptions, ModuleOptionsContext,
ModuleRuleEffect, RuleCondition, TypescriptTransformOptions, TypescriptTransformOptions,
}, },
}; };
use turbopack_browser::react_refresh::assert_can_resolve_react_refresh; use turbopack_browser::react_refresh::assert_can_resolve_react_refresh;
...@@ -135,21 +135,6 @@ async fn get_client_module_options_context( ...@@ -135,21 +135,6 @@ async fn get_client_module_options_context(
.resolved_cell(), .resolved_cell(),
); );
let conditions = RuleCondition::any(vec![
RuleCondition::ResourcePathEndsWith(".js".to_string()),
RuleCondition::ResourcePathEndsWith(".jsx".to_string()),
RuleCondition::ResourcePathEndsWith(".ts".to_string()),
RuleCondition::ResourcePathEndsWith(".tsx".to_string()),
]);
let module_rules = ModuleRule::new(
conditions,
vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![]),
append: ResolvedVc::cell(vec![]),
}],
);
let module_options_context = ModuleOptionsContext { let module_options_context = ModuleOptionsContext {
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_jsx, enable_jsx,
...@@ -164,7 +149,6 @@ async fn get_client_module_options_context( ...@@ -164,7 +149,6 @@ async fn get_client_module_options_context(
foreign_code_context_condition(), foreign_code_context_condition(),
module_options_context.clone().resolved_cell(), module_options_context.clone().resolved_cell(),
)], )],
module_rules: vec![module_rules],
..module_options_context ..module_options_context
} }
.cell(); .cell();
......
...@@ -321,7 +321,8 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -321,7 +321,8 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
let module_rules = ModuleRule::new( let module_rules = ModuleRule::new(
conditions, conditions,
vec![ModuleRuleEffect::ExtendEcmascriptTransforms { vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
prepend: ResolvedVc::cell(vec![ preprocess: ResolvedVc::cell(vec![]),
main: ResolvedVc::cell(vec![
EcmascriptInputTransform::Plugin(ResolvedVc::cell(Box::new( EcmascriptInputTransform::Plugin(ResolvedVc::cell(Box::new(
EmotionTransformer::new(&EmotionTransformConfig::default()) EmotionTransformer::new(&EmotionTransformConfig::default())
.expect("Should be able to create emotion transformer"), .expect("Should be able to create emotion transformer"),
...@@ -330,7 +331,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -330,7 +331,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
StyledComponentsTransformer::new(&StyledComponentsTransformConfig::default()), StyledComponentsTransformer::new(&StyledComponentsTransformConfig::default()),
) as _)), ) as _)),
]), ]),
append: ResolvedVc::cell(vec![]), postprocess: ResolvedVc::cell(vec![]),
}], }],
); );
let asset_context: Vc<Box<dyn AssetContext>> = Vc::upcast(ModuleAssetContext::new( let asset_context: Vc<Box<dyn AssetContext>> = Vc::upcast(ModuleAssetContext::new(
......
...@@ -80,17 +80,23 @@ async fn apply_module_type( ...@@ -80,17 +80,23 @@ async fn apply_module_type(
let module_type = &*module_type.await?; let module_type = &*module_type.await?;
Ok(ProcessResult::Module(match module_type { Ok(ProcessResult::Module(match module_type {
ModuleType::Ecmascript { ModuleType::Ecmascript {
transforms, preprocess,
main,
postprocess,
options, options,
} }
| ModuleType::Typescript { | ModuleType::Typescript {
transforms, preprocess,
main,
postprocess,
tsx: _, tsx: _,
analyze_types: _, analyze_types: _,
options, options,
} }
| ModuleType::TypescriptDeclaration { | ModuleType::TypescriptDeclaration {
transforms, preprocess,
main,
postprocess,
options, options,
} => { } => {
let context_for_module = match module_type { let context_for_module = match module_type {
...@@ -107,7 +113,11 @@ async fn apply_module_type( ...@@ -107,7 +113,11 @@ async fn apply_module_type(
let mut builder = EcmascriptModuleAsset::builder( let mut builder = EcmascriptModuleAsset::builder(
source, source,
ResolvedVc::upcast(context_for_module), ResolvedVc::upcast(context_for_module),
*transforms, preprocess
.extend(**main)
.extend(**postprocess)
.to_resolved()
.await?,
*options, *options,
module_asset_context module_asset_context
.compile_time_info() .compile_time_info()
...@@ -555,28 +565,44 @@ async fn process_default_internal( ...@@ -555,28 +565,44 @@ async fn process_default_internal(
ModuleRuleEffect::ModuleType(module) => { ModuleRuleEffect::ModuleType(module) => {
current_module_type = Some(module.clone()); current_module_type = Some(module.clone());
} }
ModuleRuleEffect::ExtendEcmascriptTransforms { prepend, append } => { ModuleRuleEffect::ExtendEcmascriptTransforms {
preprocess: extend_preprocess,
main: extend_main,
postprocess: extend_postprocess,
} => {
current_module_type = match current_module_type { current_module_type = match current_module_type {
Some(ModuleType::Ecmascript { Some(ModuleType::Ecmascript {
transforms, preprocess,
main,
postprocess,
options, options,
}) => Some(ModuleType::Ecmascript { }) => Some(ModuleType::Ecmascript {
transforms: prepend preprocess: extend_preprocess
.extend(*transforms) .extend(*preprocess)
.extend(**append) .to_resolved()
.await?,
main: extend_main.extend(*main).to_resolved().await?,
postprocess: postprocess
.extend(**extend_postprocess)
.to_resolved() .to_resolved()
.await?, .await?,
options, options,
}), }),
Some(ModuleType::Typescript { Some(ModuleType::Typescript {
transforms, preprocess,
main,
postprocess,
tsx, tsx,
analyze_types, analyze_types,
options, options,
}) => Some(ModuleType::Typescript { }) => Some(ModuleType::Typescript {
transforms: prepend preprocess: extend_preprocess
.extend(*transforms) .extend(*preprocess)
.extend(**append) .to_resolved()
.await?,
main: extend_main.extend(*main).to_resolved().await?,
postprocess: postprocess
.extend(**extend_postprocess)
.to_resolved() .to_resolved()
.await?, .await?,
tsx, tsx,
......
...@@ -67,11 +67,14 @@ impl ModuleRule { ...@@ -67,11 +67,14 @@ impl ModuleRule {
pub enum ModuleRuleEffect { pub enum ModuleRuleEffect {
ModuleType(ModuleType), ModuleType(ModuleType),
/// Allow to extend an existing Ecmascript module rules for the additional /// Allow to extend an existing Ecmascript module rules for the additional
/// transforms. First argument will prepend the existing transforms, and /// transforms
/// the second argument will append the new transforms.
ExtendEcmascriptTransforms { ExtendEcmascriptTransforms {
prepend: ResolvedVc<EcmascriptInputTransforms>, /// Transforms to run first: transpile TypeScript, decorators, ...
append: ResolvedVc<EcmascriptInputTransforms>, preprocess: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to execute on standard EcmaScript (plus JSX): styled-jsx, swc plugins, ...
main: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to run last: JSX, preset-env, scan for imports, ...
postprocess: ResolvedVc<EcmascriptInputTransforms>,
}, },
SourceTransforms(ResolvedVc<SourceTransforms>), SourceTransforms(ResolvedVc<SourceTransforms>),
Ignore, Ignore,
...@@ -81,12 +84,22 @@ pub enum ModuleRuleEffect { ...@@ -81,12 +84,22 @@ pub enum ModuleRuleEffect {
#[derive(Hash, Debug, Clone)] #[derive(Hash, Debug, Clone)]
pub enum ModuleType { pub enum ModuleType {
Ecmascript { Ecmascript {
transforms: ResolvedVc<EcmascriptInputTransforms>, /// Transforms to run first: transpile TypeScript, decorators, ...
preprocess: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to execute on standard EcmaScript (plus JSX): styled-jsx, swc plugins, ...
main: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to run last: JSX, preset-env, scan for imports, ...
postprocess: ResolvedVc<EcmascriptInputTransforms>,
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
options: ResolvedVc<EcmascriptOptions>, options: ResolvedVc<EcmascriptOptions>,
}, },
Typescript { Typescript {
transforms: ResolvedVc<EcmascriptInputTransforms>, /// Transforms to run first: transpile TypeScript, decorators, ...
preprocess: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to execute on standard EcmaScript (plus JSX): styled-jsx, swc plugins, ...
main: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to run last: JSX, preset-env, scan for imports, ...
postprocess: ResolvedVc<EcmascriptInputTransforms>,
// parse JSX syntax. // parse JSX syntax.
tsx: bool, tsx: bool,
// follow references to imported types. // follow references to imported types.
...@@ -95,7 +108,12 @@ pub enum ModuleType { ...@@ -95,7 +108,12 @@ pub enum ModuleType {
options: ResolvedVc<EcmascriptOptions>, options: ResolvedVc<EcmascriptOptions>,
}, },
TypescriptDeclaration { TypescriptDeclaration {
transforms: ResolvedVc<EcmascriptInputTransforms>, /// Transforms to run first: transpile TypeScript, decorators, ...
preprocess: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to execute on standard EcmaScript (plus JSX): styled-jsx, swc plugins, ...
main: ResolvedVc<EcmascriptInputTransforms>,
/// Transforms to run last: JSX, preset-env, scan for imports, ...
postprocess: ResolvedVc<EcmascriptInputTransforms>,
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
options: ResolvedVc<EcmascriptOptions>, options: ResolvedVc<EcmascriptOptions>,
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment