Skip to content

Commit a407d22

Browse files
committed
chore: fix ut
1 parent c0a4f42 commit a407d22

File tree

30 files changed

+342
-469
lines changed

30 files changed

+342
-469
lines changed

crates/node_binding/napi-binding.d.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -540,12 +540,12 @@ export declare enum BuiltinPluginName {
540540
SplitChunksPlugin = 'SplitChunksPlugin',
541541
RemoveDuplicateModulesPlugin = 'RemoveDuplicateModulesPlugin',
542542
ShareRuntimePlugin = 'ShareRuntimePlugin',
543-
OptimizeDependencyReferencedExportsPlugin = 'OptimizeDependencyReferencedExportsPlugin',
543+
SharedUsedExportsOptimizerPlugin = 'SharedUsedExportsOptimizerPlugin',
544544
ContainerPlugin = 'ContainerPlugin',
545545
ContainerReferencePlugin = 'ContainerReferencePlugin',
546546
ProvideSharedPlugin = 'ProvideSharedPlugin',
547547
ConsumeSharedPlugin = 'ConsumeSharedPlugin',
548-
CollectShareEntryPlugin = 'CollectShareEntryPlugin',
548+
CollectSharedEntryPlugin = 'CollectSharedEntryPlugin',
549549
ShareContainerPlugin = 'ShareContainerPlugin',
550550
ModuleFederationRuntimePlugin = 'ModuleFederationRuntimePlugin',
551551
ModuleFederationManifestPlugin = 'ModuleFederationManifestPlugin',
@@ -2592,13 +2592,6 @@ export interface RawOptimizationOptions {
25922592
avoidEntryIife: boolean
25932593
}
25942594

2595-
export interface RawOptimizeDependencyReferencedExportsPluginOptions {
2596-
shared: Array<RawOptimizeSharedConfig>
2597-
injectUsedExports?: boolean
2598-
manifestFileName?: string
2599-
statsFileName?: string
2600-
}
2601-
26022595
export interface RawOptimizeSharedConfig {
26032596
shareKey: string
26042597
treeshake: boolean
@@ -2849,6 +2842,13 @@ export interface RawShareContainerPluginOptions {
28492842
library: JsLibraryOptions
28502843
}
28512844

2845+
export interface RawSharedUsedExportsOptimizerPluginOptions {
2846+
shared: Array<RawOptimizeSharedConfig>
2847+
injectUsedExports?: boolean
2848+
manifestFileName?: string
2849+
statsFileName?: string
2850+
}
2851+
28522852
export interface RawSizeLimitsPluginOptions {
28532853
assetFilter?: (assetFilename: string) => boolean
28542854
hints?: "error" | "warning"

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ use raw_ids::RawOccurrenceChunkIdsPluginOptions;
3434
use raw_lightning_css_minimizer::RawLightningCssMinimizerRspackPluginOptions;
3535
use raw_mf::{
3636
RawCollectShareEntryPluginOptions, RawModuleFederationManifestPluginOptions,
37-
RawModuleFederationRuntimePluginOptions, RawOptimizeDependencyReferencedExportsPluginOptions,
38-
RawProvideOptions,
37+
RawModuleFederationRuntimePluginOptions, RawProvideOptions,
38+
RawSharedUsedExportsOptimizerPluginOptions,
3939
};
4040
use raw_sri::RawSubresourceIntegrityPluginOptions;
4141
use rspack_core::{BoxPlugin, Plugin, PluginExt};
@@ -79,10 +79,9 @@ use rspack_plugin_lightning_css_minimizer::LightningCssMinimizerRspackPlugin;
7979
use rspack_plugin_limit_chunk_count::LimitChunkCountPlugin;
8080
use rspack_plugin_merge_duplicate_chunks::MergeDuplicateChunksPlugin;
8181
use rspack_plugin_mf::{
82-
CollectShareEntryPlugin, ConsumeSharedPlugin, ContainerPlugin, ContainerReferencePlugin,
83-
ModuleFederationManifestPlugin, ModuleFederationRuntimePlugin,
84-
OptimizeDependencyReferencedExportsPlugin, ProvideSharedPlugin, ShareContainerPlugin,
85-
ShareRuntimePlugin,
82+
CollectSharedEntryPlugin, ConsumeSharedPlugin, ContainerPlugin, ContainerReferencePlugin,
83+
ModuleFederationManifestPlugin, ModuleFederationRuntimePlugin, ProvideSharedPlugin,
84+
ShareContainerPlugin, ShareRuntimePlugin, SharedUsedExportsOptimizerPlugin,
8685
};
8786
use rspack_plugin_module_info_header::ModuleInfoHeaderPlugin;
8887
use rspack_plugin_module_replacement::{ContextReplacementPlugin, NormalModuleReplacementPlugin};
@@ -173,12 +172,12 @@ pub enum BuiltinPluginName {
173172
SplitChunksPlugin,
174173
RemoveDuplicateModulesPlugin,
175174
ShareRuntimePlugin,
176-
OptimizeDependencyReferencedExportsPlugin,
175+
SharedUsedExportsOptimizerPlugin,
177176
ContainerPlugin,
178177
ContainerReferencePlugin,
179178
ProvideSharedPlugin,
180179
ConsumeSharedPlugin,
181-
CollectShareEntryPlugin,
180+
CollectSharedEntryPlugin,
182181
ShareContainerPlugin,
183182
ModuleFederationRuntimePlugin,
184183
ModuleFederationManifestPlugin,
@@ -472,12 +471,11 @@ impl<'a> BuiltinPlugin<'a> {
472471
)
473472
.boxed(),
474473
),
475-
BuiltinPluginName::OptimizeDependencyReferencedExportsPlugin => {
476-
let options =
477-
downcast_into::<RawOptimizeDependencyReferencedExportsPluginOptions>(self.options)
478-
.map_err(|report| napi::Error::from_reason(report.to_string()))?
479-
.into();
480-
plugins.push(OptimizeDependencyReferencedExportsPlugin::new(options).boxed());
474+
BuiltinPluginName::SharedUsedExportsOptimizerPlugin => {
475+
let options = downcast_into::<RawSharedUsedExportsOptimizerPluginOptions>(self.options)
476+
.map_err(|report| napi::Error::from_reason(report.to_string()))?
477+
.into();
478+
plugins.push(SharedUsedExportsOptimizerPlugin::new(options).boxed());
481479
}
482480
BuiltinPluginName::ContainerPlugin => {
483481
plugins.push(
@@ -508,11 +506,11 @@ impl<'a> BuiltinPlugin<'a> {
508506
provides.sort_unstable_by_key(|(k, _)| k.to_string());
509507
plugins.push(ProvideSharedPlugin::new(provides).boxed())
510508
}
511-
BuiltinPluginName::CollectShareEntryPlugin => {
509+
BuiltinPluginName::CollectSharedEntryPlugin => {
512510
let options = downcast_into::<RawCollectShareEntryPluginOptions>(self.options)
513511
.map_err(|report| napi::Error::from_reason(report.to_string()))?
514512
.into();
515-
plugins.push(CollectShareEntryPlugin::new(options).boxed())
513+
plugins.push(CollectSharedEntryPlugin::new(options).boxed())
516514
}
517515
BuiltinPluginName::ShareContainerPlugin => {
518516
let options = downcast_into::<RawShareContainerPluginOptions>(self.options)

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ use std::{collections::HashMap, sync::Arc};
33
use napi::Either;
44
use napi_derive::napi;
55
use rspack_plugin_mf::{
6-
CollectShareEntryPluginOptions, ConsumeOptions, ConsumeSharedPluginOptions, ConsumeVersion,
6+
CollectSharedEntryPluginOptions, ConsumeOptions, ConsumeSharedPluginOptions, ConsumeVersion,
77
ContainerPluginOptions, ContainerReferencePluginOptions, ExposeOptions, ManifestExposeOption,
88
ManifestSharedOption, ModuleFederationManifestPluginOptions,
9-
ModuleFederationRuntimePluginOptions, OptimizeDependencyReferencedExportsPluginOptions,
10-
OptimizeSharedConfig, ProvideOptions, ProvideVersion, RemoteAliasTarget, RemoteOptions,
11-
ShareContainerEntryOptions, ShareContainerPluginOptions, StatsBuildInfo,
9+
ModuleFederationRuntimePluginOptions, OptimizeSharedConfig, ProvideOptions, ProvideVersion,
10+
RemoteAliasTarget, RemoteOptions, ShareContainerEntryOptions, ShareContainerPluginOptions,
11+
SharedUsedExportsOptimizerPluginOptions, StatsBuildInfo,
1212
};
1313

1414
use crate::options::{
@@ -142,7 +142,7 @@ pub struct RawCollectShareEntryPluginOptions {
142142
pub filename: Option<String>,
143143
}
144144

145-
impl From<RawCollectShareEntryPluginOptions> for CollectShareEntryPluginOptions {
145+
impl From<RawCollectShareEntryPluginOptions> for CollectSharedEntryPluginOptions {
146146
fn from(value: RawCollectShareEntryPluginOptions) -> Self {
147147
Self {
148148
consumes: value
@@ -221,17 +221,15 @@ impl From<RawOptimizeSharedConfig> for OptimizeSharedConfig {
221221

222222
#[derive(Debug)]
223223
#[napi(object)]
224-
pub struct RawOptimizeDependencyReferencedExportsPluginOptions {
224+
pub struct RawSharedUsedExportsOptimizerPluginOptions {
225225
pub shared: Vec<RawOptimizeSharedConfig>,
226226
pub inject_used_exports: Option<bool>,
227227
pub manifest_file_name: Option<String>,
228228
pub stats_file_name: Option<String>,
229229
}
230230

231-
impl From<RawOptimizeDependencyReferencedExportsPluginOptions>
232-
for OptimizeDependencyReferencedExportsPluginOptions
233-
{
234-
fn from(value: RawOptimizeDependencyReferencedExportsPluginOptions) -> Self {
231+
impl From<RawSharedUsedExportsOptimizerPluginOptions> for SharedUsedExportsOptimizerPluginOptions {
232+
fn from(value: RawSharedUsedExportsOptimizerPluginOptions) -> Self {
235233
Self {
236234
shared: value
237235
.shared

crates/rspack_plugin_mf/src/lib.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@ pub use manifest::{
1616
ModuleFederationManifestPluginOptions, RemoteAliasTarget, StatsBuildInfo,
1717
};
1818
pub use sharing::{
19-
collect_share_entry_plugin::{CollectShareEntryPlugin, CollectShareEntryPluginOptions},
19+
collect_shared_entry_plugin::{CollectSharedEntryPlugin, CollectSharedEntryPluginOptions},
2020
consume_shared_module::ConsumeSharedModule,
2121
consume_shared_plugin::{
2222
ConsumeOptions, ConsumeSharedPlugin, ConsumeSharedPluginOptions, ConsumeVersion,
2323
},
24-
optimize_dependency_referenced_exports_plugin::{
25-
OptimizeDependencyReferencedExportsPlugin, OptimizeDependencyReferencedExportsPluginOptions,
26-
OptimizeSharedConfig,
27-
},
2824
provide_shared_module::ProvideSharedModule,
2925
provide_shared_plugin::{ProvideOptions, ProvideSharedPlugin, ProvideVersion},
3026
share_container_entry_dependency::ShareContainerEntryOptions,
@@ -33,6 +29,9 @@ pub use sharing::{
3329
CodeGenerationDataShareInit, DataInitStage, ShareInitData, ShareRuntimeModule,
3430
},
3531
share_runtime_plugin::ShareRuntimePlugin,
32+
shared_used_exports_optimizer_plugin::{
33+
OptimizeSharedConfig, SharedUsedExportsOptimizerPlugin, SharedUsedExportsOptimizerPluginOptions,
34+
},
3635
};
3736

3837
mod utils {

crates/rspack_plugin_mf/src/manifest/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fn get_remote_entry_name(compilation: &Compilation, container_name: &str) -> Opt
8484
}
8585
None
8686
}
87-
#[plugin_hook(CompilationProcessAssets for ModuleFederationManifestPlugin)]
87+
#[plugin_hook(CompilationProcessAssets for ModuleFederationManifestPlugin, stage = 0)]
8888
async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
8989
// Prepare entrypoint names
9090
let entry_point_names: HashSet<String> = compilation

0 commit comments

Comments
 (0)