Skip to content

Commit cedca6d

Browse files
committed
refactor: rename to ReactServerPlugin
1 parent 68ff4c2 commit cedca6d

File tree

7 files changed

+20
-23
lines changed

7 files changed

+20
-23
lines changed

crates/node_binding/napi-binding.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ export declare enum BuiltinPluginName {
604604
ModuleInfoHeaderPlugin = 'ModuleInfoHeaderPlugin',
605605
HttpUriPlugin = 'HttpUriPlugin',
606606
CssChunkingPlugin = 'CssChunkingPlugin',
607-
ReactServerComponentsPlugin = 'ReactServerComponentsPlugin',
607+
ReactServerPlugin = 'ReactServerPlugin',
608608
ReactClientPlugin = 'ReactClientPlugin'
609609
}
610610

crates/rspack_binding_api/src/raw_options/raw_builtins/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ use rspack_plugin_no_emit_on_errors::NoEmitOnErrorsPlugin;
8484
use rspack_plugin_real_content_hash::RealContentHashPlugin;
8585
use rspack_plugin_remove_duplicate_modules::RemoveDuplicateModulesPlugin;
8686
use rspack_plugin_remove_empty_chunks::RemoveEmptyChunksPlugin;
87-
use rspack_plugin_rsc::{ReactClientPlugin, ReactServerComponentsPlugin};
87+
use rspack_plugin_rsc::{ReactClientPlugin, ReactServerPlugin};
8888
use rspack_plugin_rslib::RslibPlugin;
8989
use rspack_plugin_runtime::{
9090
ArrayPushCallbackChunkFormatPlugin, BundlerInfoPlugin, ChunkPrefetchPreloadPlugin,
@@ -241,7 +241,7 @@ pub enum BuiltinPluginName {
241241
CssChunkingPlugin,
242242

243243
// react server components
244-
ReactServerComponentsPlugin,
244+
ReactServerPlugin,
245245
ReactClientPlugin,
246246
}
247247

@@ -837,10 +837,10 @@ impl<'a> BuiltinPlugin<'a> {
837837
.map_err(|report| napi::Error::from_reason(report.to_string()))?;
838838
plugins.push(CssChunkingPlugin::new(options.into()).boxed());
839839
}
840-
BuiltinPluginName::ReactServerComponentsPlugin => {
840+
BuiltinPluginName::ReactServerPlugin => {
841841
let options = downcast_into::<JsClientCompilerHandle>(self.options)
842842
.map_err(|report| napi::Error::from_reason(report.to_string()))?;
843-
plugins.push(ReactServerComponentsPlugin::new(options.into()).boxed());
843+
plugins.push(ReactServerPlugin::new(options.into()).boxed());
844844
}
845845
BuiltinPluginName::ReactClientPlugin => {
846846
let options = downcast_into::<JsReactClientPluginOptions>(self.options)

crates/rspack_plugin_rsc/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ mod client_reference_manifest;
44
mod client_reference_manifest_plugin;
55
mod constants;
66
mod loaders;
7-
mod plugin;
87
mod plugin_state;
98
mod react_client_plugin;
9+
mod react_server_plugin;
1010
mod utils;
1111

1212
pub use client_compiler_handle::ClientCompilerHandle;
1313
pub use client_reference_manifest_plugin::ClientReferenceManifestPlugin;
1414
pub use loaders::client_entry_loader_plugin::ClientEntryLoaderPlugin;
15-
pub use plugin::ReactServerComponentsPlugin;
1615
pub use react_client_plugin::{ReactClientPlugin, ReactClientPluginOptions};
16+
pub use react_server_plugin::ReactServerPlugin;

crates/rspack_plugin_rsc/src/plugin.rs renamed to crates/rspack_plugin_rsc/src/react_server_plugin.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,22 @@ struct InjectedClientEntry {
6161
ssr_dependency_id: DependencyId,
6262
}
6363

64-
// 该插件只在 server 上执行
6564
#[plugin]
6665
#[derive(Debug)]
67-
pub struct ReactServerComponentsPlugin {
66+
pub struct ReactServerPlugin {
6867
#[debug(skip)]
6968
client_compiler_handle: ClientCompilerHandle,
7069
}
7170

72-
impl ReactServerComponentsPlugin {
71+
impl ReactServerPlugin {
7372
pub fn new(client_compiler_handle: ClientCompilerHandle) -> Self {
7473
Self::new_inner(client_compiler_handle)
7574
}
7675
}
7776

78-
#[plugin_hook(CompilerFinishMake for ReactServerComponentsPlugin)]
77+
#[plugin_hook(CompilerFinishMake for ReactServerPlugin)]
7978
async fn finish_make(&self, compilation: &mut Compilation) -> Result<()> {
80-
let logger = compilation.get_logger("rspack.ReactServerComponentsPlugin");
79+
let logger = compilation.get_logger("rspack.ReactServerPlugin");
8180

8281
let start = logger.time("create client entries");
8382
self.create_client_entries(compilation).await?;
@@ -86,9 +85,9 @@ async fn finish_make(&self, compilation: &mut Compilation) -> Result<()> {
8685
Ok(())
8786
}
8887

89-
#[plugin_hook(CompilationProcessAssets for ReactServerComponentsPlugin)]
88+
#[plugin_hook(CompilationProcessAssets for ReactServerPlugin)]
9089
async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
91-
let logger = compilation.get_logger("rspack.ReactServerComponentsPlugin");
90+
let logger = compilation.get_logger("rspack.ReactServerPlugin");
9291

9392
let mut guard = PLUGIN_STATE_BY_COMPILER_ID.lock().await;
9493
let plugin_state = guard
@@ -102,9 +101,9 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
102101
Ok(())
103102
}
104103

105-
impl Plugin for ReactServerComponentsPlugin {
104+
impl Plugin for ReactServerPlugin {
106105
fn name(&self) -> &'static str {
107-
"rspack.ReactServerComponentsPlugin"
106+
"rspack.ReactServerPlugin"
108107
}
109108

110109
fn apply(&self, ctx: &mut rspack_core::ApplyContext) -> Result<()> {
@@ -278,7 +277,7 @@ pub fn is_client_component_entry_module(module: &dyn Module) -> bool {
278277

279278
type InjectedActionEntry = (BoxDependency, EntryOptions);
280279

281-
impl ReactServerComponentsPlugin {
280+
impl ReactServerPlugin {
282281
async fn create_client_entries(&self, compilation: &mut Compilation) -> Result<()> {
283282
let mut add_client_entry_and_ssr_modules_list: Vec<InjectedClientEntry> = Default::default();
284283

@@ -842,8 +841,6 @@ impl ReactServerComponentsPlugin {
842841
r#async: Some(ModuleGraph::is_async(&compilaiton, &module_idenfitifier)),
843842
};
844843
plugin_state.ssr_modules.insert(resource, manifest_export);
845-
846-
println!("Recorded SSR module: {:#?}", plugin_state.ssr_modules);
847844
}
848845

849846
fn traverse_modules(&self, compilation: &Compilation, plugin_state: &mut PluginState) {

packages/rspack/src/builtin-plugin/ReactServerComponentsPlugin.ts renamed to packages/rspack/src/builtin-plugin/ReactServerPlugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { createCompiler } from "../rspack";
55
import { Compiler, ReactClientPlugin, RspackOptions } from "..";
66
import path from "path";
77

8-
export const ReactServerComponentsPlugin = create(
9-
BuiltinPluginName.ReactServerComponentsPlugin,
8+
export const ReactServerPlugin = create(
9+
BuiltinPluginName.ReactServerPlugin,
1010
function (this: Compiler, clientCompilerOptions: RspackOptions = {}) {
1111
if (!clientCompilerOptions.output) {
1212
clientCompilerOptions.output = {};

packages/rspack/src/builtin-plugin/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,5 @@ export * from "./URLPlugin";
8282
export * from "./WarnCaseSensitiveModulesPlugin";
8383
export * from "./WebWorkerTemplatePlugin";
8484
export * from "./WorkerPlugin";
85-
export * from "./ReactServerComponentsPlugin";
85+
export * from "./ReactServerPlugin";
8686
export * from "./ReactClientPlugin";

packages/rspack/src/exports.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ export {
340340
NormalModuleReplacementPlugin,
341341
SourceMapDevToolPlugin,
342342
SwcJsMinimizerRspackPlugin,
343-
ReactServerComponentsPlugin,
343+
ReactServerPlugin,
344344
ReactClientPlugin
345345
} from "./builtin-plugin";
346346

0 commit comments

Comments
 (0)