refactor(ecmascript): rename inputtransform custom enum

vercel · Apr 24, 2023 · d085b8a · d085b8a
1 parent 5c0a528
commit d085b8a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/crates/turbopack-cli/Cargo.toml b/crates/turbopack-cli/Cargo.toml
@@ -57,7 +57,7 @@ turbopack-cli-utils = { workspace = true }
 turbopack-core = { workspace = true }
 turbopack-dev = { workspace = true }
 turbopack-dev-server = { workspace = true }
-turbopack-ecmascript-plugins = { workspace = true, feature = [
+turbopack-ecmascript-plugins = { workspace = true, features = [
   "transform_emotion",
 ] }
 turbopack-env = { workspace = true }

diff --git a/crates/turbopack-ecmascript-plugins/src/transform/emotion.rs b/crates/turbopack-ecmascript-plugins/src/transform/emotion.rs
@@ -104,7 +104,7 @@ impl CustomTransformer for EmotionTransformer {
             };
             *program = p.fold_with(&mut swc_emotion::emotion(
                 self.config.clone(),
-                Path::new(ctx.file_name_str.clone()),
+                Path::new(ctx.file_name_str),
                 hash as u32,
                 ctx.source_map.clone(),
                 ctx.comments.clone(),

diff --git a/crates/turbopack-ecmascript/src/lib.rs b/crates/turbopack-ecmascript/src/lib.rs
@@ -42,8 +42,8 @@ use swc_core::{
     },
 };
 pub use transform::{
-    CustomTransform, CustomTransformVc, CustomTransformer, EcmascriptInputTransform,
-    EcmascriptInputTransformsVc, TransformContext,
+    CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransformsVc, TransformContext,
+    TransformPlugin, TransformPluginVc,
 };
 use turbo_tasks::{
     primitives::StringVc, trace::TraceRawVcs, RawVc, ReadRef, TryJoinIterExt, Value, ValueToString,

diff --git a/crates/turbopack-ecmascript/src/transform/mod.rs b/crates/turbopack-ecmascript/src/transform/mod.rs
@@ -37,7 +37,7 @@ pub enum EcmascriptInputTransform {
     ClientDirective(StringVc),
     ServerDirective(StringVc),
     CommonJs,
-    Custom(CustomTransformVc),
+    Plugin(TransformPluginVc),
     PresetEnv(EnvironmentVc),
     React {
         #[serde(default)]
@@ -81,7 +81,7 @@ pub trait CustomTransformer: Debug {
     fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Option<Program>;
 }
 
-/// A wrapper around a CustomTransformer instance, allowing it to operate with
+/// A wrapper around a TransformPlugin instance, allowing it to operate with
 /// the turbo_task caching requirements.
 #[turbo_tasks::value(
     transparent,
@@ -91,9 +91,9 @@ pub trait CustomTransformer: Debug {
     cell = "new"
 )]
 #[derive(Debug)]
-pub struct CustomTransform(#[turbo_tasks(trace_ignore)] Box<dyn CustomTransformer + Send + Sync>);
+pub struct TransformPlugin(#[turbo_tasks(trace_ignore)] Box<dyn CustomTransformer + Send + Sync>);
 
-impl CustomTransformer for CustomTransform {
+impl CustomTransformer for TransformPlugin {
     fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Option<Program> {
         self.0.transform(program, ctx)
     }
@@ -242,14 +242,14 @@ impl EcmascriptInputTransform {
                 }
 
                 let top_level_import_paths = &*top_level_import_paths.await?;
-                if top_level_import_paths.len() > 0 {
+                if !top_level_import_paths.is_empty() {
                     options.top_level_import_paths = top_level_import_paths
                         .iter()
                         .map(|s| JsWord::from(s.clone()))
                         .collect();
                 }
                 let meaningless_file_names = &*meaningless_file_names.await?;
-                if meaningless_file_names.len() > 0 {
+                if !meaningless_file_names.is_empty() {
                     options.meaningless_file_names = meaningless_file_names.clone();
                 }
 
@@ -320,7 +320,7 @@ impl EcmascriptInputTransform {
                         .emit();
                 }
             }
-            EcmascriptInputTransform::Custom(transform) => {
+            EcmascriptInputTransform::Plugin(transform) => {
                 if let Some(output) = transform.await?.transform(program, ctx) {
                     *program = output;
                 }

diff --git a/crates/turbopack-tests/Cargo.toml b/crates/turbopack-tests/Cargo.toml
@@ -26,6 +26,9 @@ turbo-tasks-fs = { workspace = true }
 turbo-tasks-memory = { workspace = true }
 turbopack-core = { workspace = true, features = ["issue_path"] }
 turbopack-dev = { workspace = true }
+turbopack-ecmascript-plugins = { workspace = true, features = [
+  "transform_emotion",
+] }
 turbopack-env = { workspace = true }
 turbopack-test-utils = { workspace = true }
 

diff --git a/crates/turbopack-tests/tests/snapshot.rs b/crates/turbopack-tests/tests/snapshot.rs
@@ -21,7 +21,7 @@ use turbopack::{
     condition::ContextCondition,
     ecmascript::EcmascriptModuleAssetVc,
     module_options::{
-        EmotionTransformConfig, JsxTransformOptions, JsxTransformOptionsVc, ModuleOptionsContext,
+        JsxTransformOptions, JsxTransformOptionsVc, ModuleOptionsContext,
         StyledComponentsTransformConfigVc,
     },
     resolve_options_context::ResolveOptionsContext,
@@ -43,12 +43,14 @@ use turbopack_core::{
     source_asset::SourceAssetVc,
 };
 use turbopack_dev::DevChunkingContextVc;
+use turbopack_ecmascript_plugins::transform::emotion::EmotionTransformConfig;
 use turbopack_env::ProcessEnvAssetVc;
 use turbopack_test_utils::snapshot::{diff, expected, matches_expected, snapshot_issues};
 
 fn register() {
     turbopack::register();
     turbopack_dev::register();
+    turbopack_ecmascript_plugins::register();
     include!(concat!(env!("OUT_DIR"), "/register_test_snapshot.rs"));
 }
 

diff --git a/crates/turbopack/src/module_options/mod.rs b/crates/turbopack/src/module_options/mod.rs
@@ -15,7 +15,7 @@ use turbopack_core::{
 };
 use turbopack_css::{CssInputTransform, CssInputTransformsVc};
 use turbopack_ecmascript::{
-    CustomTransformVc, EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptOptions,
+    EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptOptions, TransformPluginVc,
 };
 use turbopack_ecmascript_plugins::transform::emotion::build_emotion_transformer;
 use turbopack_mdx::MdxTransformOptions;
@@ -101,8 +101,8 @@ impl ModuleOptionsVc {
             transforms.push(EcmascriptInputTransform::StyledJsx);
         }
 
-        if let Some(transformer) = build_emotion_transformer(&*enable_emotion).await? {
-            transforms.push(EcmascriptInputTransform::Custom(CustomTransformVc::cell(
+        if let Some(transformer) = build_emotion_transformer(enable_emotion).await? {
+            transforms.push(EcmascriptInputTransform::Plugin(TransformPluginVc::cell(
                 transformer,
             )));
         }