Revert "refactor(next-swc): turbopack_ecmascript_plugins (vercel#48671)"

This reverts commit f3d5c2f.
huozhi · Apr 26, 2023 · 5ce2073 · 5ce2073
1 parent f7baa56
commit 5ce2073
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 67 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,11 +42,11 @@ swc_relay = { version = "0.2.5" }
 testing = { version = "0.33.4" }
 
 # Turbo crates
-turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230425.4" }
+turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230425.3" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230425.4" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230425.3" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230425.4" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230425.3" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/next-core/Cargo.toml b/packages/next-swc/crates/next-core/Cargo.toml
@@ -35,7 +35,6 @@ turbo-binding = { workspace = true, features = [
   "__turbopack_dev",
   "__turbopack_dev_server",
   "__turbopack_ecmascript",
-  "__turbopack_ecmascript_plugin",
   "__turbopack_env",
   "__turbopack_static",
   "__turbopack_image",

diff --git a/packages/next-swc/crates/next-core/src/lib.rs b/packages/next-swc/crates/next-core/src/lib.rs
@@ -47,7 +47,5 @@ pub fn register() {
     turbopack::node::register();
     turbopack::turbopack::register();
     turbopack::image::register();
-    turbopack::ecmascript::register();
-    turbopack::ecmascript_plugin::register();
     include!(concat!(env!("OUT_DIR"), "/register.rs"));
 }
diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs
@@ -23,15 +23,14 @@ use turbo_binding::{
         ecmascript::{
             EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
         },
-        ecmascript_plugin::transform::emotion::EmotionTransformConfig,
         node::{
             evaluate::evaluate,
             execution_context::{ExecutionContext, ExecutionContextVc},
             transforms::webpack::{WebpackLoaderConfigItems, WebpackLoaderConfigItemsVc},
         },
         turbopack::{
             evaluate_context::node_evaluate_asset_context,
-            module_options::StyledComponentsTransformConfig,
+            module_options::{EmotionTransformConfig, StyledComponentsTransformConfig},
         },
     },
 };