Unverified Commit 0ed1edd8 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: refactor extend transforms (#89116)

### What?

Stop rules when module type is set.
Apply ecmascript transforms before module type is set. (no more errors when trying to apply a transform on non-ecmascript type)
Fix ordering of transform apply.
Reorder module rules to match previous order. They are applied in order now.
parent 91bf0493
...@@ -327,6 +327,7 @@ pub async fn get_client_module_options_context( ...@@ -327,6 +327,7 @@ pub async fn get_client_module_options_context(
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
esm_url_rewrite_behavior: Some(UrlRewriteBehavior::Relative), esm_url_rewrite_behavior: Some(UrlRewriteBehavior::Relative),
enable_typeof_window_inlining: Some(TypeofWindow::Object), enable_typeof_window_inlining: Some(TypeofWindow::Object),
enable_import_as_bytes: *next_config.turbopack_import_type_bytes().await?,
source_maps, source_maps,
infer_module_side_effects: *next_config.turbopack_infer_module_side_effects().await?, infer_module_side_effects: *next_config.turbopack_infer_module_side_effects().await?,
..Default::default() ..Default::default()
......
...@@ -9,11 +9,10 @@ use crate::{ ...@@ -9,11 +9,10 @@ use crate::{
next_client::context::ClientContextType, next_client::context::ClientContextType,
next_config::NextConfig, next_config::NextConfig,
next_shared::transforms::{ next_shared::transforms::{
debug_fn_name::get_debug_fn_name_rule, get_import_type_bytes_rule, debug_fn_name::get_debug_fn_name_rule, get_next_dynamic_transform_rule,
get_import_type_json_rule, get_next_dynamic_transform_rule, get_next_font_transform_rule, get_next_font_transform_rule, get_next_image_rule, get_next_lint_transform_rule,
get_next_image_rule, get_next_lint_transform_rule, get_next_modularize_imports_rule, get_next_modularize_imports_rule, get_next_pages_transforms_rule,
get_next_pages_transforms_rule, get_server_actions_transform_rule, get_server_actions_transform_rule, next_cjs_optimizer::get_next_cjs_optimizer_rule,
next_cjs_optimizer::get_next_cjs_optimizer_rule,
next_disallow_re_export_all_in_page::get_next_disallow_export_all_in_page_rule, next_disallow_re_export_all_in_page::get_next_disallow_export_all_in_page_rule,
next_pure::get_next_pure_rule, server_actions::ActionsTransform, next_pure::get_next_pure_rule, server_actions::ActionsTransform,
}, },
...@@ -113,11 +112,5 @@ pub async fn get_next_client_transforms_rules( ...@@ -113,11 +112,5 @@ pub async fn get_next_client_transforms_rules(
rules.push(get_next_image_rule().await?); rules.push(get_next_image_rule().await?);
} }
if *next_config.turbopack_import_type_bytes().await? {
rules.push(get_import_type_bytes_rule());
}
rules.push(get_import_type_json_rule());
Ok(rules) Ok(rules)
} }
...@@ -553,11 +553,11 @@ pub async fn get_server_module_options_context( ...@@ -553,11 +553,11 @@ pub async fn get_server_module_options_context(
// A set of custom ecma transform rules being applied to server context. // A set of custom ecma transform rules being applied to server context.
let source_transform_rules: Vec<ModuleRule> = vec![ let source_transform_rules: Vec<ModuleRule> = vec![
get_swc_ecma_transform_plugin_rule(next_config, project_path.clone()).await?,
get_relay_transform_rule(next_config, project_path.clone()).await?,
get_emotion_transform_rule(next_config).await?,
get_react_remove_properties_transform_rule(next_config).await?,
get_remove_console_transform_rule(next_config).await?, get_remove_console_transform_rule(next_config).await?,
get_react_remove_properties_transform_rule(next_config).await?,
get_emotion_transform_rule(next_config).await?,
get_relay_transform_rule(next_config, project_path.clone()).await?,
get_swc_ecma_transform_plugin_rule(next_config, project_path.clone()).await?,
] ]
.into_iter() .into_iter()
.flatten() .flatten()
...@@ -578,6 +578,7 @@ pub async fn get_server_module_options_context( ...@@ -578,6 +578,7 @@ pub async fn get_server_module_options_context(
let module_options_context = ModuleOptionsContext { let module_options_context = ModuleOptionsContext {
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_typeof_window_inlining: Some(TypeofWindow::Undefined), enable_typeof_window_inlining: Some(TypeofWindow::Undefined),
enable_import_as_bytes: *next_config.turbopack_import_type_bytes().await?,
import_externals: *next_config.import_externals().await?, import_externals: *next_config.import_externals().await?,
ignore_dynamic_requests: true, ignore_dynamic_requests: true,
source_maps, source_maps,
...@@ -620,15 +621,14 @@ pub async fn get_server_module_options_context( ...@@ -620,15 +621,14 @@ pub async fn get_server_module_options_context(
let module_options_context = match ty { let module_options_context = match ty {
ServerContextType::Pages { .. } | ServerContextType::PagesApi { .. } => { ServerContextType::Pages { .. } | ServerContextType::PagesApi { .. } => {
next_server_rules.extend(page_transform_rules); next_server_rules.extend(source_transform_rules);
if let ServerContextType::Pages { .. } = ty { if let ServerContextType::Pages { .. } = ty {
next_server_rules.push( next_server_rules.push(
get_next_react_server_components_transform_rule(next_config, false, None) get_next_react_server_components_transform_rule(next_config, false, None)
.await?, .await?,
); );
} }
next_server_rules.extend(page_transform_rules);
next_server_rules.extend(source_transform_rules);
foreign_next_server_rules.extend(internal_custom_rules); foreign_next_server_rules.extend(internal_custom_rules);
...@@ -698,12 +698,12 @@ pub async fn get_server_module_options_context( ...@@ -698,12 +698,12 @@ pub async fn get_server_module_options_context(
ServerContextType::AppSSR { app_dir, .. } => { ServerContextType::AppSSR { app_dir, .. } => {
foreign_next_server_rules.extend(internal_custom_rules); foreign_next_server_rules.extend(internal_custom_rules);
next_server_rules.extend(page_transform_rules.clone()); next_server_rules.extend(source_transform_rules);
next_server_rules.push( next_server_rules.push(
get_next_react_server_components_transform_rule(next_config, false, Some(app_dir)) get_next_react_server_components_transform_rule(next_config, false, Some(app_dir))
.await?, .await?,
); );
next_server_rules.extend(source_transform_rules); next_server_rules.extend(page_transform_rules.clone());
let module_options_context = ModuleOptionsContext { let module_options_context = ModuleOptionsContext {
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
...@@ -762,8 +762,6 @@ pub async fn get_server_module_options_context( ...@@ -762,8 +762,6 @@ pub async fn get_server_module_options_context(
ecmascript_client_reference_transition_name, ecmascript_client_reference_transition_name,
.. ..
} => { } => {
next_server_rules.extend(page_transform_rules);
let client_directive_transformer = ecmascript_client_reference_transition_name.map( let client_directive_transformer = ecmascript_client_reference_transition_name.map(
|ecmascript_client_reference_transition_name| { |ecmascript_client_reference_transition_name| {
get_ecma_transform_rule( get_ecma_transform_rule(
...@@ -776,16 +774,16 @@ pub async fn get_server_module_options_context( ...@@ -776,16 +774,16 @@ pub async fn get_server_module_options_context(
}, },
); );
foreign_next_server_rules.extend(client_directive_transformer.clone());
foreign_next_server_rules.extend(internal_custom_rules); foreign_next_server_rules.extend(internal_custom_rules);
foreign_next_server_rules.extend(client_directive_transformer.clone());
next_server_rules.extend(client_directive_transformer.clone()); next_server_rules.extend(source_transform_rules);
next_server_rules.push( next_server_rules.push(
get_next_react_server_components_transform_rule(next_config, true, Some(app_dir)) get_next_react_server_components_transform_rule(next_config, true, Some(app_dir))
.await?, .await?,
); );
next_server_rules.extend(client_directive_transformer.clone());
next_server_rules.extend(source_transform_rules); next_server_rules.extend(page_transform_rules);
let module_options_context = ModuleOptionsContext { let module_options_context = ModuleOptionsContext {
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
...@@ -842,8 +840,6 @@ pub async fn get_server_module_options_context( ...@@ -842,8 +840,6 @@ pub async fn get_server_module_options_context(
app_dir, app_dir,
ecmascript_client_reference_transition_name, ecmascript_client_reference_transition_name,
} => { } => {
next_server_rules.extend(source_transform_rules);
let mut common_next_server_rules = vec![ let mut common_next_server_rules = vec![
get_next_react_server_components_transform_rule(next_config, true, Some(app_dir)) get_next_react_server_components_transform_rule(next_config, true, Some(app_dir))
.await?, .await?,
...@@ -864,6 +860,8 @@ pub async fn get_server_module_options_context( ...@@ -864,6 +860,8 @@ pub async fn get_server_module_options_context(
next_server_rules.extend(common_next_server_rules.iter().cloned()); next_server_rules.extend(common_next_server_rules.iter().cloned());
internal_custom_rules.extend(common_next_server_rules); internal_custom_rules.extend(common_next_server_rules);
next_server_rules.extend(source_transform_rules);
let module_options_context = ModuleOptionsContext { let module_options_context = ModuleOptionsContext {
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
esm_url_rewrite_behavior: Some(UrlRewriteBehavior::Full), esm_url_rewrite_behavior: Some(UrlRewriteBehavior::Full),
......
...@@ -12,11 +12,10 @@ use crate::{ ...@@ -12,11 +12,10 @@ use crate::{
next_config::NextConfig, next_config::NextConfig,
next_server::context::ServerContextType, next_server::context::ServerContextType,
next_shared::transforms::{ next_shared::transforms::{
get_import_type_bytes_rule, get_import_type_json_rule, get_next_dynamic_transform_rule, get_next_dynamic_transform_rule, get_next_font_transform_rule, get_next_image_rule,
get_next_font_transform_rule, get_next_image_rule, get_next_lint_transform_rule, get_next_lint_transform_rule, get_next_modularize_imports_rule,
get_next_modularize_imports_rule, get_next_pages_transforms_rule, get_next_pages_transforms_rule, get_next_track_dynamic_imports_transform_rule,
get_next_track_dynamic_imports_transform_rule, get_server_actions_transform_rule, get_server_actions_transform_rule, next_cjs_optimizer::get_next_cjs_optimizer_rule,
next_cjs_optimizer::get_next_cjs_optimizer_rule,
next_disallow_re_export_all_in_page::get_next_disallow_export_all_in_page_rule, next_disallow_re_export_all_in_page::get_next_disallow_export_all_in_page_rule,
next_edge_node_api_assert::next_edge_node_api_assert, next_edge_node_api_assert::next_edge_node_api_assert,
next_middleware_dynamic_assert::get_middleware_dynamic_assert_rule, next_middleware_dynamic_assert::get_middleware_dynamic_assert_rule,
...@@ -216,12 +215,6 @@ pub async fn get_next_server_transforms_rules( ...@@ -216,12 +215,6 @@ pub async fn get_next_server_transforms_rules(
} }
} }
if *next_config.turbopack_import_type_bytes().await? {
rules.push(get_import_type_bytes_rule());
}
rules.push(get_import_type_json_rule());
Ok(rules) Ok(rules)
} }
......
...@@ -32,9 +32,7 @@ pub use server_actions::get_server_actions_transform_rule; ...@@ -32,9 +32,7 @@ pub use server_actions::get_server_actions_transform_rule;
use turbo_tasks::ResolvedVc; use turbo_tasks::ResolvedVc;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect, ModuleType, RuleCondition}; use turbopack::module_options::{ModuleRule, ModuleRuleEffect, ModuleType, RuleCondition};
use turbopack_core::reference_type::{ use turbopack_core::reference_type::{ReferenceType, UrlReferenceSubType};
EcmaScriptModulesReferenceSubType, ReferenceType, UrlReferenceSubType,
};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform}; use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform};
use crate::next_image::{StructuredImageModuleType, module::BlurPlaceholderMode}; use crate::next_image::{StructuredImageModuleType, module::BlurPlaceholderMode};
...@@ -125,25 +123,6 @@ pub(crate) fn module_rule_match_pages_page_file( ...@@ -125,25 +123,6 @@ pub(crate) fn module_rule_match_pages_page_file(
]) ])
} }
pub(crate) fn get_import_type_bytes_rule() -> ModuleRule {
// Move this into turbopack once the feature is standardized
ModuleRule::new(
RuleCondition::ReferenceType(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::ImportWithType("bytes".into()),
)),
vec![ModuleRuleEffect::ModuleType(ModuleType::InlinedBytesJs)],
)
}
pub(crate) fn get_import_type_json_rule() -> ModuleRule {
ModuleRule::new(
RuleCondition::ReferenceType(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::ImportWithType("json".into()),
)),
vec![ModuleRuleEffect::ModuleType(ModuleType::Json)],
)
}
pub(crate) enum EcmascriptTransformStage { pub(crate) enum EcmascriptTransformStage {
Preprocess, Preprocess,
Main, Main,
......
...@@ -28,9 +28,9 @@ This module doesn't have an associated type`) ...@@ -28,9 +28,9 @@ This module doesn't have an associated type`)
expect( expect(
next.cliOutput.match(/Unknown module type/g).length next.cliOutput.match(/Unknown module type/g).length
).toBeLessThanOrEqual(1) ).toBeLessThanOrEqual(1)
expect( expect(next.cliOutput.match(/Missing module type/g)?.length ?? 0).toBe(
next.cliOutput.match(/Missing module type/g).length 0
).toBeLessThanOrEqual(1) )
} else { } else {
expect(next.cliOutput).toContain(`pkg/index.ts expect(next.cliOutput).toContain(`pkg/index.ts
Module parse failed: Unexpected token`) Module parse failed: Unexpected token`)
......
...@@ -361,7 +361,10 @@ impl SingleModuleGraph { ...@@ -361,7 +361,10 @@ impl SingleModuleGraph {
} }
} }
if !duplicates.is_empty() { if !duplicates.is_empty() {
panic!("Duplicate module idents in graph: {duplicates:#?}"); panic!(
"Duplicate module idents in graph: {duplicates:#?}\n{:#?}",
modules
);
} }
} }
} }
......
...@@ -416,6 +416,7 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V ...@@ -416,6 +416,7 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V
enable_typescript_transform: Some( enable_typescript_transform: Some(
TypescriptTransformOptions::default().resolved_cell(), TypescriptTransformOptions::default().resolved_cell(),
), ),
enable_import_as_bytes: true,
import_externals: true, import_externals: true,
enable_exports_info_inlining: true, enable_exports_info_inlining: true,
infer_module_side_effects: true, infer_module_side_effects: true,
......
...@@ -361,6 +361,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -361,6 +361,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
enable_typescript_transform: Some( enable_typescript_transform: Some(
TypescriptTransformOptions::default().resolved_cell(), TypescriptTransformOptions::default().resolved_cell(),
), ),
enable_import_as_bytes: true,
enable_jsx: Some(JsxTransformOptions::resolved_cell(JsxTransformOptions { enable_jsx: Some(JsxTransformOptions::resolved_cell(JsxTransformOptions {
development: true, development: true,
..Default::default() ..Default::default()
......
This diff is collapsed.
...@@ -260,6 +260,9 @@ pub struct EcmascriptOptionsContext { ...@@ -260,6 +260,9 @@ pub struct EcmascriptOptionsContext {
/// Whether to allow accessing exports info via `__webpack_exports_info__`. /// Whether to allow accessing exports info via `__webpack_exports_info__`.
pub enable_exports_info_inlining: bool, pub enable_exports_info_inlining: bool,
/// Whether to enable `import bytes from 'module' as { type: "bytes }` syntax.
pub enable_import_as_bytes: bool,
// TODO should this be a part of Environment instead? // TODO should this be a part of Environment instead?
pub inline_helpers: bool, pub inline_helpers: bool,
......
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