Update crates/rspack_plugin_esm_library/src/split_chunks.rs

Co-authored-by: Copilot <[email protected]>

Author: JSerFeng

Cargo.lock

@@ -2,23 +2,16 @@ use std::sync::Arc;
 
 use napi::bindgen_prelude::Either3;
 use rayon::iter::Either;
-use rspack_core::CompilerId;
-use rspack_error::ToStringResultToRspackResultExt;
 use rspack_napi::threadsafe_function::ThreadsafeFunction;
 use rspack_plugin_esm_library::EsmLibraryPlugin;
-use rspack_plugin_split_chunks::{CacheGroup, SplitChunksPlugin};
+use rspack_plugin_split_chunks::CacheGroup;
 use rspack_regex::RspackRegex;
 
 use crate::{
   module::ModuleObject,
   raw_options::{self, RawSplitChunksOptions},
 };
 
-pub type RawNameGetter = Either<String, ThreadsafeFunction<ModuleObject, Option<String>>>;
-
-pub type RawCacheGroupTest =
-  Either3<String, RspackRegex, ThreadsafeFunction<ModuleObject, Option<bool>>>;
-
 #[napi(object, object_to_js = false)]
 pub struct RawEsmLibraryPlugin<'a> {
   pub preserve_modules: Option<String>,

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

@@ -26,7 +26,6 @@ rspack_util                = { workspace = true }
 
 async-trait    = { workspace = true }
 atomic_refcell = { workspace = true }
-derive_more    = { workspace = true }
 futures        = { workspace = true }
 rayon          = { workspace = true }
 regex          = { workspace = true }

crates/rspack_plugin_esm_library/Cargo.toml

@@ -266,7 +266,7 @@ pub(crate) async fn split(groups: &[CacheGroup], compilation: &mut Compilation)
     for m in match_group.modules.clone() {
       // merge dependencies
 
-      let mut stack = get_module_deps(m, &module_graph);
+      let mut stack = get_module_deps(m, module_graph);
       while let Some(m) = stack.pop() {
         // if module is already in any group, skip
         if modules_in_group.contains(&m) {
@@ -278,7 +278,7 @@ pub(crate) async fn split(groups: &[CacheGroup], compilation: &mut Compilation)
           continue;
         }
 
-        stack.extend(get_module_deps(m, &module_graph));
+        stack.extend(get_module_deps(m, module_graph));
       }
     }
   });
@@ -384,8 +384,6 @@ pub(crate) async fn split(groups: &[CacheGroup], compilation: &mut Compilation)
         unreachable!()
       };
 
-      // chunk.set_filename_template();
-
       orig_chunk.split(chunk, &mut compilation.chunk_group_by_ukey);
     }
 

crates/rspack_plugin_esm_library/src/split_chunks.rs

@@ -203,7 +203,7 @@ pub fn get_module_sizes<T: ParallelIterator<Item = ModuleIdentifier>>(
         .module_by_identifier(&module)
         .expect("should have module");
       let sizes = module
-        .source_types(&module_graph)
+        .source_types(module_graph)
         .iter()
         .map(|ty| (*ty, module.size(Some(ty), Some(compilation))))
         .collect::<FxHashMap<_, _>>();

crates/rspack_plugin_split_chunks/src/common.rs

@@ -598,7 +598,7 @@ impl SplitChunksPlugin {
           compilation_ref,
           &compilation
             .chunk_graph
-            .get_chunk_modules(chunk, &module_graph),
+            .get_chunk_modules(chunk, module_graph),
           allow_max_size,
           min_size,
           automatic_name_delimiter,

crates/rspack_plugin_split_chunks/src/plugin/max_size.rs

@@ -2303,6 +2303,7 @@ class EsmLibraryPlugin {
     // (undocumented)
     options?: {
         preserveModules?: string;
+        splitChunks?: OptimizationSplitChunksOptions;
     };
     // (undocumented)
     static PLUGIN_NAME: string;

packages/rspack/etc/core.api.md

@@ -1,12 +1,22 @@
 import { BuiltinPluginName } from '@rspack/binding';
 import rspack from '..';
 import type { Compiler } from '../Compiler';
-import type { OptimizationSplitChunksOptions, RspackOptionsNormalized } from '../config';
+import type {
+  OptimizationSplitChunksOptions,
+  RspackOptionsNormalized,
+} from '../config';
 import type { Logger } from '../logging/Logger';
 import { RemoveDuplicateModulesPlugin } from './RemoveDuplicateModulesPlugin';
-import { toRawSplitChunksOptions } from "./SplitChunksPlugin";
+import { toRawSplitChunksOptions } from './SplitChunksPlugin';
 
-const NOT_SUPPORTED_CONFIG = ['maxSize', 'minSizeReduction', 'maxAsyncSize', 'maxInitialSize', 'maxAsyncRequests', 'maxInitialRequests'] as const;
+const NOT_SUPPORTED_CONFIG = [
+  'maxSize',
+  'minSizeReduction',
+  'maxAsyncSize',
+  'maxInitialSize',
+  'maxAsyncRequests',
+  'maxInitialRequests',
+] as const;
 
 function applyLimits(options: RspackOptionsNormalized, logger: Logger) {
   // concatenateModules is not supported in ESM library mode, it has its own scope hoist algorithm
@@ -38,11 +48,18 @@ function applyLimits(options: RspackOptionsNormalized, logger: Logger) {
 
   let { splitChunks } = options.optimization;
   if (splitChunks === undefined) {
-    splitChunks = false;
+    splitChunks = options.optimization.splitChunks = false;
   }
 
   if (splitChunks !== false) {
-    const notSupportedConfig = ['maxSize', 'minSizeReduction', 'maxAsyncSize', 'maxInitialSize', 'maxAsyncRequests', 'maxInitialRequests'] as const;
+    const notSupportedConfig = [
+      'maxSize',
+      'minSizeReduction',
+      'maxAsyncSize',
+      'maxInitialSize',
+      'maxAsyncRequests',
+      'maxInitialRequests',
+    ] as const;
     const invalidConfig = [];
 
     for (const field of notSupportedConfig) {
@@ -52,7 +69,9 @@ function applyLimits(options: RspackOptionsNormalized, logger: Logger) {
     }
 
     if (invalidConfig.length > 0) {
-      logger.warn(`Currently \`${invalidConfig.join(', ')}\` are not supported in esm library mode`);
+      logger.warn(
+        `Currently \`${invalidConfig.join(', ')}\` are not supported in esm library mode`,
+      );
     }
 
     splitChunks.cacheGroups ??= {};
@@ -61,10 +80,13 @@ function applyLimits(options: RspackOptionsNormalized, logger: Logger) {
   }
 }
 
-function fieldUsed(field: (typeof NOT_SUPPORTED_CONFIG)[number], splitChunks: OptimizationSplitChunksOptions): boolean {
+function fieldUsed(
+  field: (typeof NOT_SUPPORTED_CONFIG)[number],
+  splitChunks: OptimizationSplitChunksOptions,
+): boolean {
   if (splitChunks[field] !== undefined) {
     return true;
-  };
+  }
 
   const cacheGroups = splitChunks.cacheGroups;
   if (cacheGroups === undefined) {
@@ -87,9 +109,12 @@ function fieldUsed(field: (typeof NOT_SUPPORTED_CONFIG)[number], splitChunks: Op
 
 export class EsmLibraryPlugin {
   static PLUGIN_NAME = 'EsmLibraryPlugin';
-  options?: { preserveModules?: string, splitChunks?: OptimizationSplitChunksOptions };
+  options?: {
+    preserveModules?: string;
+    splitChunks?: OptimizationSplitChunksOptions;
+  };
 
-  constructor(options?: { preserveModules?: string }) {
+  constructor(options: { preserveModules?: string } = {}) {
     this.options = options;
   }
 
@@ -118,8 +143,10 @@ export class EsmLibraryPlugin {
       name: BuiltinPluginName.EsmLibraryPlugin,
       options: {
         preserveModules: this.options?.preserveModules,
-        splitChunks: this.options?.splitChunks && toRawSplitChunksOptions(this.options?.splitChunks, compiler)
-      }
+        splitChunks:
+          this.options?.splitChunks &&
+          toRawSplitChunksOptions(this.options?.splitChunks, compiler),
+      },
     });
   }
 }