Remove UnsupportedModule plugin and move ModuleFeatureReportResolvePl…

…ugin to BeforeResolvePlugin
vercel · Jun 11, 2024 · ec2a53b · ec2a53b
1 parent 8011d69
commit ec2a53b
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 155 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,11 +37,11 @@ swc_core = { version = "0.92.5", features = [
 testing = { version = "0.35.25" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "wbinnssmith/before-resolve-module" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "wbinnssmith/rm-unsupported-plugin" }
 # [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", branch = "wbinnssmith/before-resolve-module" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "wbinnssmith/rm-unsupported-plugin" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "wbinnssmith/before-resolve-module" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "wbinnssmith/rm-unsupported-plugin" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs
@@ -49,7 +49,7 @@ use crate::{
     next_shared::{
         resolve::{
             get_invalid_server_only_resolve_plugin, ModuleFeatureReportResolvePlugin,
-            NextSharedRuntimeResolvePlugin, UnsupportedModulesResolvePlugin,
+            NextSharedRuntimeResolvePlugin,
         },
         transforms::{
             emotion::get_emotion_transform_rule, relay::get_relay_transform_rule,
@@ -160,13 +160,12 @@ pub async fn get_client_resolve_options_context(
         module: true,
         before_resolve_plugins: vec![
             Vc::upcast(get_invalid_server_only_resolve_plugin(project_path)),
-            Vc::upcast(NextFontLocalResolvePlugin::new(project_path)),
-        ],
-        after_resolve_plugins: vec![
             Vc::upcast(ModuleFeatureReportResolvePlugin::new(project_path)),
-            Vc::upcast(UnsupportedModulesResolvePlugin::new(project_path)),
-            Vc::upcast(NextSharedRuntimeResolvePlugin::new(project_path)),
+            Vc::upcast(NextFontLocalResolvePlugin::new(project_path)),
         ],
+        after_resolve_plugins: vec![Vc::upcast(NextSharedRuntimeResolvePlugin::new(
+            project_path,
+        ))],
         ..Default::default()
     };
     Ok(ResolveOptionsContext {