fix(mf2): extra provide sharing data (#7408)

crates/node_binding/binding.d.ts

@@ -1402,6 +1402,9 @@ export interface RawProvideOptions {
   shareScope: string
   version?: string | false | undefined
   eager: boolean
+  singleton?: boolean
+  requiredVersion?: string | false | undefined
+  strictVersion?: boolean
 }
 
 export interface RawRegex {

crates/rspack_binding_options/src/options/raw_builtins/raw_mf.rs

@@ -105,6 +105,10 @@ pub struct RawProvideOptions {
   #[napi(ts_type = "string | false | undefined")]
   pub version: Option<RawVersion>,
   pub eager: bool,
+  pub singleton: Option<bool>,
+  #[napi(ts_type = "string | false | undefined")]
+  pub required_version: Option<RawVersion>,
+  pub strict_version: Option<bool>,
 }
 
 impl From<RawProvideOptions> for (String, ProvideOptions) {
@@ -116,6 +120,9 @@ impl From<RawProvideOptions> for (String, ProvideOptions) {
         share_scope: value.share_scope,
         version: value.version.map(|v| RawVersionWrapper(v).into()),
         eager: value.eager,
+        singleton: value.singleton,
+        required_version: value.required_version.map(|v| RawVersionWrapper(v).into()),
+        strict_version: value.strict_version,
       },
     )
   }

crates/rspack_plugin_mf/src/sharing/consume_shared_plugin.rs

@@ -34,7 +34,7 @@ pub struct ConsumeOptions {
   pub eager: bool,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ConsumeVersion {
   Version(String),
   False,

crates/rspack_plugin_mf/src/sharing/provide_shared_dependency.rs

@@ -4,6 +4,7 @@ use rspack_core::{
 };
 
 use super::provide_shared_plugin::ProvideVersion;
+use crate::ConsumeVersion;
 
 #[derive(Debug, Clone)]
 pub struct ProvideSharedDependency {
@@ -13,24 +14,31 @@ pub struct ProvideSharedDependency {
   pub name: String,
   pub version: ProvideVersion,
   pub eager: bool,
+  pub singleton: Option<bool>,
+  pub required_version: Option<ConsumeVersion>,
+  pub strict_version: Option<bool>,
   resource_identifier: String,
 }
 
 impl ProvideSharedDependency {
+  #[allow(clippy::too_many_arguments)]
   pub fn new(
     share_scope: String,
     name: String,
     version: ProvideVersion,
     request: String,
     eager: bool,
+    singleton: Option<bool>,
+    required_version: Option<ConsumeVersion>,
+    strict_version: Option<bool>,
   ) -> Self {
     let resource_identifier = format!(
       "provide module ({}) {} as {} @ {} {}",
       &share_scope,
       &request,
       &name,
       &version,
-      eager.then_some("eager").unwrap_or_default()
+      eager.then_some("eager").unwrap_or_default(),
     );
     Self {
       id: DependencyId::new(),
@@ -39,6 +47,9 @@ impl ProvideSharedDependency {
       name,
       version,
       eager,
+      singleton,
+      required_version,
+      strict_version,
       resource_identifier,
     }
   }

crates/rspack_plugin_mf/src/sharing/provide_shared_module.rs

@@ -20,6 +20,7 @@ use super::{
     CodeGenerationDataShareInit, DataInitInfo, ProvideSharedInfo, ShareInitData,
   },
 };
+use crate::ConsumeVersion;
 
 #[impl_source_map_config]
 #[derive(Debug)]
@@ -34,18 +35,25 @@ pub struct ProvideSharedModule {
   version: ProvideVersion,
   request: String,
   eager: bool,
+  singleton: Option<bool>,
+  required_version: Option<ConsumeVersion>,
+  strict_version: Option<bool>,
   factory_meta: Option<FactoryMeta>,
   build_info: Option<BuildInfo>,
   build_meta: Option<BuildMeta>,
 }
 
 impl ProvideSharedModule {
+  #[allow(clippy::too_many_arguments)]
   pub fn new(
     share_scope: String,
     name: String,
     version: ProvideVersion,
     request: String,
     eager: bool,
+    singleton: Option<bool>,
+    required_version: Option<ConsumeVersion>,
+    strict_version: Option<bool>,
   ) -> Self {
     let identifier = format!(
       "provide shared module ({}) {}@{} = {}",
@@ -62,6 +70,9 @@ impl ProvideSharedModule {
       version,
       request,
       eager,
+      singleton,
+      required_version,
+      strict_version,
       factory_meta: None,
       build_info: None,
       build_meta: None,
@@ -195,6 +206,9 @@ impl Module for ProvideSharedModule {
             version: self.version.clone(),
             factory,
             eager: self.eager,
+            singleton: self.singleton,
+            strict_version: self.strict_version,
+            required_version: self.required_version.clone(),
           }),
         }],
       });

crates/rspack_plugin_mf/src/sharing/provide_shared_module_factory.rs

@@ -27,6 +27,9 @@ impl ModuleFactory for ProvideSharedModuleFactory {
         dep.version.clone(),
         dep.request().to_owned(),
         dep.eager,
+        dep.singleton,
+        dep.required_version.clone(),
+        dep.strict_version,
       ),
     )))
   }

crates/rspack_plugin_mf/src/sharing/provide_shared_plugin.rs

@@ -18,6 +18,7 @@ use super::{
   provide_shared_dependency::ProvideSharedDependency,
   provide_shared_module_factory::ProvideSharedModuleFactory,
 };
+use crate::ConsumeVersion;
 
 static RELATIVE_REQUEST: LazyLock<Regex> =
   LazyLock::new(|| Regex::new(r"^(\/|[A-Za-z]:\\|\\\\|\.\.?(\/|$))").expect("Invalid regex"));
@@ -30,6 +31,9 @@ pub struct ProvideOptions {
   pub share_scope: String,
   pub version: Option<ProvideVersion>,
   pub eager: bool,
+  pub singleton: Option<bool>,
+  pub required_version: Option<ConsumeVersion>,
+  pub strict_version: Option<bool>,
 }
 
 #[derive(Debug, Clone)]
@@ -38,6 +42,9 @@ pub struct VersionedProvideOptions {
   pub share_scope: String,
   pub version: ProvideVersion,
   pub eager: bool,
+  pub singleton: Option<bool>,
+  pub required_version: Option<ConsumeVersion>,
+  pub strict_version: Option<bool>,
 }
 
 impl ProvideOptions {
@@ -47,6 +54,9 @@ impl ProvideOptions {
       share_scope: self.share_scope.clone(),
       version: self.version.clone().unwrap_or_default(),
       eager: self.eager,
+      singleton: self.singleton,
+      required_version: self.required_version.clone(),
+      strict_version: self.strict_version,
     }
   }
 }
@@ -94,6 +104,9 @@ impl ProvideSharedPlugin {
     share_scope: &str,
     version: Option<&ProvideVersion>,
     eager: bool,
+    singleton: Option<bool>,
+    required_version: Option<ConsumeVersion>,
+    strict_version: Option<bool>,
     resource: &str,
     resource_data: &ResourceData,
     mut add_diagnostic: impl FnMut(Diagnostic),
@@ -108,6 +121,9 @@ impl ProvideSharedPlugin {
           share_scope: share_scope.to_string(),
           version: version.to_owned(),
           eager,
+          singleton,
+          strict_version,
+          required_version,
         },
       );
     } else if let Some(description) = &resource_data.resource_description {
@@ -122,6 +138,9 @@ impl ProvideSharedPlugin {
             share_scope: share_scope.to_string(),
             version: ProvideVersion::Version(version.to_string()),
             eager,
+            singleton,
+            strict_version,
+            required_version,
           },
         );
       } else {
@@ -174,6 +193,9 @@ async fn finish_make(&self, compilation: &mut Compilation) -> Result<()> {
           config.version.clone(),
           resource.to_string(),
           config.eager,
+          config.singleton,
+          config.required_version.clone(),
+          config.strict_version,
         )),
         EntryOptions {
           name: None,
@@ -213,6 +235,9 @@ async fn normal_module_factory_module(
           &config.share_scope,
           config.version.as_ref(),
           config.eager,
+          config.singleton,
+          config.required_version.clone(),
+          config.strict_version,
           resource,
           resource_data,
           |d| data.diagnostics.push(d),
@@ -230,6 +255,9 @@ async fn normal_module_factory_module(
           &config.share_scope,
           config.version.as_ref(),
           config.eager,
+          config.singleton,
+          config.required_version.clone(),
+          config.strict_version,
           resource,
           resource_data,
           |d| data.diagnostics.push(d),

crates/rspack_plugin_mf/src/sharing/share_runtime_module.rs

@@ -9,7 +9,7 @@ use rspack_core::{
 use rustc_hash::FxHashMap;
 
 use super::provide_shared_plugin::ProvideVersion;
-use crate::utils::json_stringify;
+use crate::{utils::json_stringify, ConsumeVersion};
 
 #[impl_runtime_module]
 #[derive(Debug)]
@@ -76,13 +76,29 @@ impl RuntimeModule for ShareRuntimeModule {
           .map(|info| match info {
             DataInitInfo::ExternalModuleId(Some(id)) => json_stringify(&id),
             DataInitInfo::ProvideSharedInfo(info) => {
-              format!(
-                "{{ name: {}, version: {}, factory: {}, eager: {} }}",
+              let mut stage = format!(
+                "{{ name: {}, version: {}, factory: {}, eager: {}",
                 json_stringify(&info.name),
                 json_stringify(&info.version.to_string()),
                 info.factory,
-                if info.eager { "1" } else { "0" }
-              )
+                if info.eager { "1" } else { "0" },
+              );
+              if self.enhanced {
+                if let Some(singleton) = info.singleton {
+                  stage += ", singleton: ";
+                  stage += if singleton { "1" } else { "0" };
+                }
+                if let Some(required_version) = info.required_version {
+                  stage += ", requiredVersion: ";
+                  stage += &json_stringify(&required_version.to_string());
+                }
+                if let Some(strict_version) = info.strict_version {
+                  stage += ", strictVersion: ";
+                  stage += if strict_version { "1" } else { "0" };
+                }
+              }
+              stage += " }";
+              stage
             }
             _ => "".to_string(),
           })
@@ -141,4 +157,7 @@ pub struct ProvideSharedInfo {
   pub version: ProvideVersion,
   pub factory: String,
   pub eager: bool,
+  pub singleton: Option<bool>,
+  pub required_version: Option<ConsumeVersion>,
+  pub strict_version: Option<bool>,
 }

packages/rspack-test-tools/tests/configCases/container-1-5/provide-sharing-extra-data/App.js

@@ -0,0 +1,5 @@
+import React from "react";
+
+export default () => {
+	return `App rendered with [${React()}]`;
+};

packages/rspack-test-tools/tests/configCases/container-1-5/provide-sharing-extra-data/index.js

@@ -0,0 +1,19 @@
+it("should load the component from container", () => {
+	return import("./App").then(({ default: App }) => {
+		expect(App()).toBe("App rendered with [This is react 0.1.2]");
+		const sharingReact = __webpack_require__.initializeSharingData.scopeToSharingDataMapping.default[0];
+		// name: "react", version: "0", eager: 0, singleton: 1, requiredVersion: "*", strictVersion: 0
+		expect(sharingReact.name).toBe("react");
+		expect(sharingReact.version).toBe("0");
+		expect(sharingReact.eager).toBe(0);
+		expect(sharingReact.singleton).toBe(1);
+		expect(sharingReact.requiredVersion).toBe("*");
+		expect(sharingReact.strictVersion).toBe(0);
+		const initOptionsReact = __webpack_require__.federation.initOptions.shared.react[0];
+		expect(initOptionsReact.version).toBe("0");
+		expect(initOptionsReact.eager).toBe(0);
+		expect(initOptionsReact.singleton).toBe(1);
+		expect(initOptionsReact.requiredVersion).toBe("*");
+		expect(initOptionsReact.strictVersion).toBe(0);
+	});
+});

packages/rspack-test-tools/tests/configCases/container-1-5/provide-sharing-extra-data/rspack.config.js

@@ -0,0 +1,22 @@
+const { ModuleFederationPlugin } = require("@rspack/core").container;
+
+/** @type {import("@rspack/core").Configuration[]} */
+module.exports = {
+	output: {
+		filename: "[name].js",
+		uniqueName: "provide-sharing-extra-data"
+	},
+	plugins: [
+		new ModuleFederationPlugin({
+			name: "container-provide-sharing-extra-data",
+			shared: {
+				react: {
+					version: false,
+					requiredVersion: false,
+					singleton: true,
+					strictVersion: false,
+				}
+			}
+		})
+	]
+};

packages/rspack-test-tools/tests/configCases/container-1-5/provide-sharing-extra-data/test.config.js

@@ -0,0 +1,6 @@
+/** @type {import("../../../..").TConfigCaseConfig} */
+module.exports = {
+	findBundle: function (i, options) {
+		return "./main.js";
+	}
+};