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

Turbopack: remove unused transforms (#83567)

- `next_shared/transforms/next_shake_exports.rs`: dead code
- `turbopack-ecmascript-plugins/src/transform/modularize_imports.rs`: dead code
- `next_shared/transforms/next_page_config.rs`: amp, unsupported anyway
- `next_shared/transforms/next_amp_attributes.rs`: amp, unsupported anyway

See also https://nextjs.org/blog/next-15-5#amp-support
parent 2d37f070
...@@ -9778,7 +9778,6 @@ dependencies = [ ...@@ -9778,7 +9778,6 @@ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"indexmap 2.9.0", "indexmap 2.9.0",
"modularize_imports",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"serde", "serde",
"serde_json", "serde_json",
......
...@@ -12,11 +12,9 @@ use crate::{ ...@@ -12,11 +12,9 @@ use crate::{
debug_fn_name::get_debug_fn_name_rule, get_next_dynamic_transform_rule, debug_fn_name::get_debug_fn_name_rule, get_next_dynamic_transform_rule,
get_next_font_transform_rule, get_next_image_rule, get_next_lint_transform_rule, get_next_font_transform_rule, get_next_image_rule, get_next_lint_transform_rule,
get_next_modularize_imports_rule, get_next_pages_transforms_rule, get_next_modularize_imports_rule, get_next_pages_transforms_rule,
get_server_actions_transform_rule, next_amp_attributes::get_next_amp_attr_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_page_config::get_next_page_config_rule, next_pure::get_next_pure_rule, next_pure::get_next_pure_rule, server_actions::ActionsTransform,
server_actions::ActionsTransform,
}, },
}; };
...@@ -68,11 +66,6 @@ pub async fn get_next_client_transforms_rules( ...@@ -68,11 +66,6 @@ pub async fn get_next_client_transforms_rules(
enable_mdx_rs, enable_mdx_rs,
pages_dir.clone(), pages_dir.clone(),
)); ));
rules.push(get_next_page_config_rule(
is_development,
enable_mdx_rs,
pages_dir.clone(),
));
} }
} }
ClientContextType::App { .. } => { ClientContextType::App { .. } => {
...@@ -93,7 +86,6 @@ pub async fn get_next_client_transforms_rules( ...@@ -93,7 +86,6 @@ pub async fn get_next_client_transforms_rules(
}; };
if !foreign_code { if !foreign_code {
rules.push(get_next_amp_attr_rule(enable_mdx_rs));
rules.push(get_next_cjs_optimizer_rule(enable_mdx_rs)); rules.push(get_next_cjs_optimizer_rule(enable_mdx_rs));
rules.push(get_next_pure_rule(enable_mdx_rs)); rules.push(get_next_pure_rule(enable_mdx_rs));
......
...@@ -13,8 +13,7 @@ use crate::{ ...@@ -13,8 +13,7 @@ use crate::{
get_next_dynamic_transform_rule, get_next_font_transform_rule, get_next_image_rule, get_next_dynamic_transform_rule, get_next_font_transform_rule, get_next_image_rule,
get_next_lint_transform_rule, get_next_modularize_imports_rule, get_next_lint_transform_rule, get_next_modularize_imports_rule,
get_next_pages_transforms_rule, get_next_track_dynamic_imports_transform_rule, get_next_pages_transforms_rule, get_next_track_dynamic_imports_transform_rule,
get_server_actions_transform_rule, next_amp_attributes::get_next_amp_attr_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,
...@@ -167,7 +166,6 @@ pub async fn get_next_server_transforms_rules( ...@@ -167,7 +166,6 @@ pub async fn get_next_server_transforms_rules(
.await?, .await?,
); );
rules.push(get_next_amp_attr_rule(mdx_rs));
rules.push(get_next_cjs_optimizer_rule(mdx_rs)); rules.push(get_next_cjs_optimizer_rule(mdx_rs));
rules.push(get_next_pure_rule(mdx_rs)); rules.push(get_next_pure_rule(mdx_rs));
......
pub(crate) mod debug_fn_name; pub(crate) mod debug_fn_name;
pub(crate) mod emotion; pub(crate) mod emotion;
pub(crate) mod modularize_imports; pub(crate) mod modularize_imports;
pub(crate) mod next_amp_attributes;
pub(crate) mod next_cjs_optimizer; pub(crate) mod next_cjs_optimizer;
pub(crate) mod next_disallow_re_export_all_in_page; pub(crate) mod next_disallow_re_export_all_in_page;
pub(crate) mod next_dynamic; pub(crate) mod next_dynamic;
...@@ -10,10 +9,8 @@ pub(crate) mod next_font; ...@@ -10,10 +9,8 @@ pub(crate) mod next_font;
pub(crate) mod next_lint; pub(crate) mod next_lint;
pub(crate) mod next_middleware_dynamic_assert; pub(crate) mod next_middleware_dynamic_assert;
pub(crate) mod next_optimize_server_react; pub(crate) mod next_optimize_server_react;
pub(crate) mod next_page_config;
pub(crate) mod next_pure; pub(crate) mod next_pure;
pub(crate) mod next_react_server_components; pub(crate) mod next_react_server_components;
pub(crate) mod next_shake_exports;
pub(crate) mod next_strip_page_exports; pub(crate) mod next_strip_page_exports;
pub(crate) mod next_track_dynamic_imports; pub(crate) mod next_track_dynamic_imports;
pub(crate) mod react_remove_properties; pub(crate) mod react_remove_properties;
......
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::amp_attributes::amp_attributes;
use swc_core::ecma::ast::*;
use turbo_tasks::ResolvedVc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
use super::module_rule_match_js_no_url;
pub fn get_next_amp_attr_rule(enable_mdx_rs: bool) -> ModuleRule {
let transformer =
EcmascriptInputTransform::Plugin(ResolvedVc::cell(Box::new(NextAmpAttributes {}) as _));
ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
preprocess: ResolvedVc::cell(vec![]),
main: ResolvedVc::cell(vec![transformer]),
postprocess: ResolvedVc::cell(vec![]),
}],
)
}
#[derive(Debug)]
struct NextAmpAttributes {}
#[async_trait]
impl CustomTransformer for NextAmpAttributes {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_amp", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
program.mutate(amp_attributes());
Ok(())
}
}
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::page_config::page_config;
use swc_core::ecma::ast::*;
use turbo_tasks::ResolvedVc;
use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
use super::module_rule_match_pages_page_file;
pub fn get_next_page_config_rule(
is_development: bool,
enable_mdx_rs: bool,
pages_dir: FileSystemPath,
) -> ModuleRule {
let transformer = EcmascriptInputTransform::Plugin(ResolvedVc::cell(Box::new(NextPageConfig {
is_development,
}) as _));
ModuleRule::new(
module_rule_match_pages_page_file(enable_mdx_rs, pages_dir),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
preprocess: ResolvedVc::cell(vec![]),
main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}],
)
}
#[derive(Debug)]
struct NextPageConfig {
is_development: bool,
}
#[async_trait]
impl CustomTransformer for NextPageConfig {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_page_config", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
program.mutate(page_config(self.is_development, true));
Ok(())
}
}
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::shake_exports::{Config, shake_exports};
use swc_core::ecma::ast::*;
use turbo_tasks::ResolvedVc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
use super::module_rule_match_js_no_url;
#[allow(dead_code)]
pub fn get_next_shake_exports_rule(enable_mdx_rs: bool, ignore: Vec<String>) -> ModuleRule {
let transformer = EcmascriptInputTransform::Plugin(ResolvedVc::cell(
Box::new(NextShakeExports { ignore }) as _,
));
ModuleRule::new(
module_rule_match_js_no_url(enable_mdx_rs),
vec![ModuleRuleEffect::ExtendEcmascriptTransforms {
preprocess: ResolvedVc::cell(vec![]),
main: ResolvedVc::cell(vec![]),
postprocess: ResolvedVc::cell(vec![transformer]),
}],
)
}
#[derive(Debug)]
struct NextShakeExports {
ignore: Vec<String>,
}
#[async_trait]
impl CustomTransformer for NextShakeExports {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_shake_exports", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
program.mutate(shake_exports(Config {
ignore: self.ignore.iter().map(|s| s.clone().into()).collect(),
}));
Ok(())
}
}
...@@ -32,7 +32,9 @@ describe('Page Config', () => { ...@@ -32,7 +32,9 @@ describe('Page Config', () => {
const { stderr } = await nextBuild(appDir, undefined, { const { stderr } = await nextBuild(appDir, undefined, {
stderr: true, stderr: true,
}) })
expect(stderr).toMatch(/\/invalid-page-config/) expect(stderr).toContain(
"Next.js can't recognize the exported `config`"
)
} finally { } finally {
await reset() await reset()
} }
...@@ -45,7 +47,9 @@ describe('Page Config', () => { ...@@ -45,7 +47,9 @@ describe('Page Config', () => {
const { stderr } = await nextBuild(appDir, undefined, { const { stderr } = await nextBuild(appDir, undefined, {
stderr: true, stderr: true,
}) })
expect(stderr).toMatch(/\/invalid-page-config/) expect(stderr).toContain(
"Next.js can't recognize the exported `config`"
)
} finally { } finally {
await reset() await reset()
} }
...@@ -58,7 +62,9 @@ describe('Page Config', () => { ...@@ -58,7 +62,9 @@ describe('Page Config', () => {
const { stderr } = await nextBuild(appDir, undefined, { const { stderr } = await nextBuild(appDir, undefined, {
stderr: true, stderr: true,
}) })
expect(stderr).toMatch(/\/invalid-page-config/) expect(stderr).toContain(
"Next.js can't recognize the exported `config`"
)
} finally { } finally {
await reset() await reset()
} }
...@@ -71,24 +77,33 @@ describe('Page Config', () => { ...@@ -71,24 +77,33 @@ describe('Page Config', () => {
const { stderr } = await nextBuild(appDir, undefined, { const { stderr } = await nextBuild(appDir, undefined, {
stderr: true, stderr: true,
}) })
expect(stderr).toMatch(/\/invalid-page-config/) expect(stderr).toContain(
"Next.js can't recognize the exported `config`"
)
} finally { } finally {
await reset() await reset()
} }
}) })
it('shows error when page config has invalid property value', async () => { // Turbopack ignores the config.amp property
const reset = await uncommentExport('invalid/invalid-value.js') ;(process.env.IS_TURBOPACK_TEST ? it.skip : it)(
'shows error when page config has invalid property value',
try { async () => {
const { stderr } = await nextBuild(appDir, undefined, { const reset = await uncommentExport('invalid/invalid-value.js')
stderr: true,
}) try {
expect(stderr).toMatch(/\/invalid-page-config/) const { stderr } = await nextBuild(appDir, undefined, {
} finally { stderr: true,
await reset() })
// eslint-disable-next-line jest/no-standalone-expect
expect(stderr).toContain(
"Next.js can't recognize the exported `config`"
)
} finally {
await reset()
}
} }
}) )
it('shows error when page config is export from', async () => { it('shows error when page config is export from', async () => {
const reset = await uncommentExport('invalid/export-from.js') const reset = await uncommentExport('invalid/export-from.js')
...@@ -97,7 +112,9 @@ describe('Page Config', () => { ...@@ -97,7 +112,9 @@ describe('Page Config', () => {
const { stderr } = await nextBuild(appDir, undefined, { const { stderr } = await nextBuild(appDir, undefined, {
stderr: true, stderr: true,
}) })
expect(stderr).toMatch(/\/invalid-page-config/) expect(stderr).toContain(
"Next.js can't recognize the exported `config`"
)
} finally { } finally {
await reset() await reset()
} }
...@@ -110,7 +127,9 @@ describe('Page Config', () => { ...@@ -110,7 +127,9 @@ describe('Page Config', () => {
const { stderr } = await nextBuild(appDir, undefined, { const { stderr } = await nextBuild(appDir, undefined, {
stderr: true, stderr: true,
}) })
expect(stderr).toMatch(/\/invalid-page-config/) expect(stderr).toContain(
"Next.js can't recognize the exported `config`"
)
} finally { } finally {
await reset() await reset()
} }
......
...@@ -37,7 +37,6 @@ turbo-tasks-fs = { workspace = true } ...@@ -37,7 +37,6 @@ turbo-tasks-fs = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-ecmascript = { workspace = true } turbopack-ecmascript = { workspace = true }
modularize_imports = { workspace = true }
styled_components = { workspace = true } styled_components = { workspace = true }
styled_jsx = { workspace = true } styled_jsx = { workspace = true }
swc_core = { workspace = true, features = ["ecma_ast", "ecma_visit", "common"] } swc_core = { workspace = true, features = ["ecma_ast", "ecma_visit", "common"] }
......
pub mod directives; pub mod directives;
pub mod emotion; pub mod emotion;
pub mod modularize_imports;
pub mod relay; pub mod relay;
pub mod styled_components; pub mod styled_components;
pub mod styled_jsx; pub mod styled_jsx;
......
use std::sync::Arc;
use anyhow::Result;
use async_trait::async_trait;
use modularize_imports::{Config, PackageConfig, modularize_imports};
use serde::{Deserialize, Serialize};
use swc_core::ecma::ast::Program;
use turbo_tasks::{FxIndexMap, NonLocalValue, trace::TraceRawVcs};
use turbopack_ecmascript::{CustomTransformer, TransformContext};
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
#[serde(rename_all = "camelCase")]
pub struct ModularizeImportPackageConfig {
pub transform: String,
#[serde(default)]
pub prevent_full_import: bool,
#[serde(default)]
pub skip_default_conversion: bool,
}
#[derive(Debug)]
pub struct ModularizeImportsTransformer {
config: Config,
}
impl ModularizeImportsTransformer {
pub fn new(packages: &FxIndexMap<String, ModularizeImportPackageConfig>) -> Self {
Self {
config: Config {
packages: packages
.iter()
.map(|(k, v)| {
(
k.clone(),
Arc::new(PackageConfig {
transform: modularize_imports::Transform::String(
v.transform.clone(),
),
prevent_full_import: v.prevent_full_import,
skip_default_conversion: v.skip_default_conversion,
handle_default_import: false,
handle_namespace_import: false,
style: None,
}),
)
})
.collect(),
},
}
}
}
#[async_trait]
impl CustomTransformer for ModularizeImportsTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "modularize_imports", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
program.mutate(modularize_imports(&self.config));
Ok(())
}
}
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