chore: use visitor from rsc plugin

web-infra-dev · Jun 5, 2024 · 6e44e4b · 6e44e4b
1 parent 2be8b0f
commit 6e44e4b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rspack_plugin_javascript/Cargo.toml b/crates/rspack_plugin_javascript/Cargo.toml
@@ -25,6 +25,7 @@ rspack_hash = { path = "../rspack_hash" }
 rspack_hook = { path = "../rspack_hook" }
 rspack_identifier = { path = "../rspack_identifier" }
 rspack_ids = { path = "../rspack_ids/" }
+rspack_plugin_rsc = { path = "../rspack_plugin_rsc" }
 rspack_regex = { path = "../rspack_regex" }
 rspack_util = { path = "../rspack_util" }
 rustc-hash = { workspace = true }

diff --git a/crates/rspack_plugin_javascript/src/parser_and_generator/mod.rs b/crates/rspack_plugin_javascript/src/parser_and_generator/mod.rs
@@ -13,6 +13,7 @@ use rspack_core::{
 };
 use rspack_error::miette::Diagnostic;
 use rspack_error::{DiagnosticExt, IntoTWithDiagnosticArray, Result, TWithDiagnosticArray};
+use rspack_plugin_rsc::rsc_visitor::ReactServerComponentsVisitor;
 use swc_core::common::input::SourceFileInput;
 use swc_core::common::{FileName, Span, SyntaxContext};
 use swc_core::ecma::ast;
@@ -23,7 +24,6 @@ use crate::dependency::HarmonyCompatibilityDependency;
 use crate::inner_graph_plugin::InnerGraphPlugin;
 use crate::visitors::{scan_dependencies, swc_visitor::resolver};
 use crate::visitors::{semicolon, PathIgnoredSpans, ScanDependenciesResult};
-use crate::ReactServerComponentsVisitor;
 use crate::{SideEffectsFlagPluginVisitor, SyntaxContextInfo};
 
 #[derive(Debug)]

diff --git a/crates/rspack_plugin_javascript/src/plugin/mod.rs b/crates/rspack_plugin_javascript/src/plugin/mod.rs
@@ -11,7 +11,6 @@ mod side_effects_flag_plugin;
 
 use std::borrow::Cow;
 use std::hash::Hash;
-mod react_server_components_plugin;
 
 pub use drive::*;
 pub use flag_dependency_exports_plugin::*;
@@ -20,7 +19,6 @@ use indoc::indoc;
 pub use mangle_exports_plugin::*;
 pub use module_concatenation_plugin::*;
 use once_cell::sync::Lazy;
-pub use react_server_components_plugin::*;
 use rspack_core::rspack_sources::{BoxSource, ConcatSource, RawSource, SourceExt};
 use rspack_core::{
   basic_function, render_init_fragments, ChunkInitFragments, ChunkRenderContext, ChunkUkey,

diff --git a/crates/rspack_plugin_javascript/src/plugin/react_server_components_plugin.rs b/crates/rspack_plugin_javascript/src/plugin/react_server_components_plugin.rs