@module-federation/modern-js 0.0.0-next-20240716104220 → 0.0.0-next-20240716130450

package/dist/cjs/cli/configPlugin.js

@@ -43,8 +43,8 @@ function setEnv(enableSSR) {
   }
 }
 function modifyBundlerConfig(options) {
-  const { mfConfig, config, isServer, modernjsConfig, bundlerType } = options;
-  (0, import_utils.patchMFConfig)(mfConfig, isServer);
+  const { mfConfig, config, isServer, modernjsConfig, bundlerType, remoteIpStrategy = "ipv4" } = options;
+  (0, import_utils.patchMFConfig)(mfConfig, isServer, remoteIpStrategy);
   (0, import_utils.patchBundlerConfig)({
     bundlerConfig: config,
     isServer,
@@ -88,7 +88,8 @@ const moduleFederationConfigPlugin = (userConfig) => ({
                 mfConfig: isServer ? ssrConfig : csrConfig,
                 config,
                 isServer,
-                modernjsConfig
+                modernjsConfig,
+                remoteIpStrategy: userConfig.remoteIpStrategy
               });
               userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
             },
@@ -99,7 +100,8 @@ const moduleFederationConfigPlugin = (userConfig) => ({
                 mfConfig: isServer ? ssrConfig : csrConfig,
                 config,
                 isServer,
-                modernjsConfig
+                modernjsConfig,
+                remoteIpStrategy: userConfig.remoteIpStrategy
               });
               userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
             },

package/dist/cjs/cli/index.js

@@ -35,7 +35,8 @@ const moduleFederationPlugin = (userConfig = {}) => {
     browserPlugin: void 0,
     nodePlugin: void 0,
     distOutputDir: "",
-    originPluginOptions: userConfig
+    originPluginOptions: userConfig,
+    remoteIpStrategy: userConfig === null || userConfig === void 0 ? void 0 : userConfig.remoteIpStrategy
   };
   return {
     name: "@modern-js/plugin-module-federation",

package/dist/cjs/cli/utils.js

@@ -56,7 +56,10 @@ const injectRuntimePlugins = (runtimePlugin, runtimePlugins) => {
     runtimePlugins.push(runtimePlugin);
   }
 };
-const replaceRemoteUrl = (mfConfig) => {
+const replaceRemoteUrl = (mfConfig, remoteIpStrategy) => {
+  if (remoteIpStrategy && remoteIpStrategy === "inherit") {
+    return;
+  }
   if (!mfConfig.remotes) {
     return;
   }
@@ -118,8 +121,8 @@ const patchDTSConfig = (mfConfig, isServer) => {
     }
   }
 };
-const patchMFConfig = (mfConfig, isServer) => {
-  replaceRemoteUrl(mfConfig);
+const patchMFConfig = (mfConfig, isServer, remoteIpStrategy) => {
+  replaceRemoteUrl(mfConfig, remoteIpStrategy);
   if (mfConfig.remoteType === void 0) {
     mfConfig.remoteType = "script";
   }

package/dist/cjs/runtime/createRemoteSSRComponent.js

@@ -140,6 +140,7 @@ function collectSSRAssets(options) {
 }
 function createRemoteSSRComponent(info) {
   return (props) => {
+    const { key, ...rest } = props;
     const exportName = (info === null || info === void 0 ? void 0 : info.export) || "default";
     const LazyComponent = /* @__PURE__ */ import_react.default.lazy(async () => {
       try {
@@ -158,7 +159,7 @@ function createRemoteSSRComponent(info) {
               children: [
                 assets,
                 /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Com, {
-                  ...props
+                  ...rest
                 })
               ]
             })

package/dist/esm/cli/configPlugin.js

@@ -9,8 +9,8 @@ function setEnv(enableSSR) {
   }
 }
 function modifyBundlerConfig(options) {
-  var mfConfig = options.mfConfig, config = options.config, isServer = options.isServer, modernjsConfig = options.modernjsConfig, bundlerType = options.bundlerType;
-  patchMFConfig(mfConfig, isServer);
+  var mfConfig = options.mfConfig, config = options.config, isServer = options.isServer, modernjsConfig = options.modernjsConfig, bundlerType = options.bundlerType, _options_remoteIpStrategy = options.remoteIpStrategy, remoteIpStrategy = _options_remoteIpStrategy === void 0 ? "ipv4" : _options_remoteIpStrategy;
+  patchMFConfig(mfConfig, isServer, remoteIpStrategy);
   patchBundlerConfig({
     bundlerConfig: config,
     isServer,
@@ -72,7 +72,8 @@ var moduleFederationConfigPlugin = function(userConfig) {
                                 mfConfig: isServer ? ssrConfig : csrConfig,
                                 config,
                                 isServer,
-                                modernjsConfig
+                                modernjsConfig,
+                                remoteIpStrategy: userConfig.remoteIpStrategy
                               });
                               userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
                             },
@@ -84,7 +85,8 @@ var moduleFederationConfigPlugin = function(userConfig) {
                                 mfConfig: isServer ? ssrConfig : csrConfig,
                                 config,
                                 isServer,
-                                modernjsConfig
+                                modernjsConfig,
+                                remoteIpStrategy: userConfig.remoteIpStrategy
                               });
                               userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
                             },

package/dist/esm/cli/index.js

@@ -12,7 +12,8 @@ var moduleFederationPlugin = function() {
     browserPlugin: void 0,
     nodePlugin: void 0,
     distOutputDir: "",
-    originPluginOptions: userConfig
+    originPluginOptions: userConfig,
+    remoteIpStrategy: userConfig === null || userConfig === void 0 ? void 0 : userConfig.remoteIpStrategy
   };
   return {
     name: "@modern-js/plugin-module-federation",

package/dist/esm/cli/utils.js

@@ -52,7 +52,10 @@ var injectRuntimePlugins = function(runtimePlugin, runtimePlugins) {
     runtimePlugins.push(runtimePlugin);
   }
 };
-var replaceRemoteUrl = function(mfConfig) {
+var replaceRemoteUrl = function(mfConfig, remoteIpStrategy) {
+  if (remoteIpStrategy && remoteIpStrategy === "inherit") {
+    return;
+  }
   if (!mfConfig.remotes) {
     return;
   }
@@ -114,8 +117,8 @@ var patchDTSConfig = function(mfConfig, isServer) {
     }
   }
 };
-var patchMFConfig = function(mfConfig, isServer) {
-  replaceRemoteUrl(mfConfig);
+var patchMFConfig = function(mfConfig, isServer, remoteIpStrategy) {
+  replaceRemoteUrl(mfConfig, remoteIpStrategy);
   if (mfConfig.remoteType === void 0) {
     mfConfig.remoteType = "script";
   }

package/dist/esm/runtime/createRemoteSSRComponent.js

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -98,6 +99,9 @@ function collectSSRAssets(options) {
 }
 function createRemoteSSRComponent(info) {
   return function(props) {
+    var key = props.key, rest = _object_without_properties(props, [
+      "key"
+    ]);
     var exportName = (info === null || info === void 0 ? void 0 : info.export) || "default";
     var LazyComponent = /* @__PURE__ */ React.lazy(/* @__PURE__ */ _async_to_generator(function() {
       var m, moduleId, assets, Com, err, FallbackFunctionComponent, FallbackNode;
@@ -132,7 +136,7 @@ function createRemoteSSRComponent(info) {
                     return /* @__PURE__ */ _jsxs(_Fragment, {
                       children: [
                         assets,
-                        /* @__PURE__ */ _jsx(Com, _object_spread({}, props))
+                        /* @__PURE__ */ _jsx(Com, _object_spread({}, rest))
                       ]
                     });
                   }

package/dist/esm-node/cli/configPlugin.js

@@ -7,8 +7,8 @@ function setEnv(enableSSR) {
   }
 }
 function modifyBundlerConfig(options) {
-  const { mfConfig, config, isServer, modernjsConfig, bundlerType } = options;
-  patchMFConfig(mfConfig, isServer);
+  const { mfConfig, config, isServer, modernjsConfig, bundlerType, remoteIpStrategy = "ipv4" } = options;
+  patchMFConfig(mfConfig, isServer, remoteIpStrategy);
   patchBundlerConfig({
     bundlerConfig: config,
     isServer,
@@ -52,7 +52,8 @@ const moduleFederationConfigPlugin = (userConfig) => ({
                 mfConfig: isServer ? ssrConfig : csrConfig,
                 config,
                 isServer,
-                modernjsConfig
+                modernjsConfig,
+                remoteIpStrategy: userConfig.remoteIpStrategy
               });
               userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
             },
@@ -63,7 +64,8 @@ const moduleFederationConfigPlugin = (userConfig) => ({
                 mfConfig: isServer ? ssrConfig : csrConfig,
                 config,
                 isServer,
-                modernjsConfig
+                modernjsConfig,
+                remoteIpStrategy: userConfig.remoteIpStrategy
               });
               userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || path.resolve(process.cwd(), "dist");
             },

package/dist/esm-node/cli/index.js

@@ -9,7 +9,8 @@ const moduleFederationPlugin = (userConfig = {}) => {
     browserPlugin: void 0,
     nodePlugin: void 0,
     distOutputDir: "",
-    originPluginOptions: userConfig
+    originPluginOptions: userConfig,
+    remoteIpStrategy: userConfig === null || userConfig === void 0 ? void 0 : userConfig.remoteIpStrategy
   };
   return {
     name: "@modern-js/plugin-module-federation",

package/dist/esm-node/cli/utils.js

@@ -20,7 +20,10 @@ const injectRuntimePlugins = (runtimePlugin, runtimePlugins) => {
     runtimePlugins.push(runtimePlugin);
   }
 };
-const replaceRemoteUrl = (mfConfig) => {
+const replaceRemoteUrl = (mfConfig, remoteIpStrategy) => {
+  if (remoteIpStrategy && remoteIpStrategy === "inherit") {
+    return;
+  }
   if (!mfConfig.remotes) {
     return;
   }
@@ -82,8 +85,8 @@ const patchDTSConfig = (mfConfig, isServer) => {
     }
   }
 };
-const patchMFConfig = (mfConfig, isServer) => {
-  replaceRemoteUrl(mfConfig);
+const patchMFConfig = (mfConfig, isServer, remoteIpStrategy) => {
+  replaceRemoteUrl(mfConfig, remoteIpStrategy);
   if (mfConfig.remoteType === void 0) {
     mfConfig.remoteType = "script";
   }

package/dist/esm-node/runtime/createRemoteSSRComponent.js

@@ -106,6 +106,7 @@ function collectSSRAssets(options) {
 }
 function createRemoteSSRComponent(info) {
   return (props) => {
+    const { key, ...rest } = props;
     const exportName = (info === null || info === void 0 ? void 0 : info.export) || "default";
     const LazyComponent = /* @__PURE__ */ React.lazy(async () => {
       try {
@@ -124,7 +125,7 @@ function createRemoteSSRComponent(info) {
               children: [
                 assets,
                 /* @__PURE__ */ _jsx(Com, {
-                  ...props
+                  ...rest
                 })
               ]
             })

package/dist/types/cli/configPlugin.d.ts

@@ -9,6 +9,7 @@ export declare function modifyBundlerConfig<T extends Bundler>(options: {
     config: BundlerConfig<T>;
     isServer: boolean;
     modernjsConfig: UserConfig<AppTools>;
+    remoteIpStrategy?: 'ipv4' | 'inherit';
 }): void;
 export declare const moduleFederationConfigPlugin: (userConfig: InternalModernPluginOptions) => CliPlugin<AppTools>;
 export default moduleFederationConfigPlugin;

package/dist/types/cli/utils.d.ts

@@ -4,7 +4,7 @@ import { PluginOptions } from '../types';
 import { BundlerConfig } from '../interfaces/bundler';
 export type ConfigType<T> = T extends 'webpack' ? webpack.Configuration : T extends 'rspack' ? Rspack.Configuration : never;
 export declare const getMFConfig: (userConfig: PluginOptions) => Promise<moduleFederationPlugin.ModuleFederationPluginOptions>;
-export declare const patchMFConfig: (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions, isServer: boolean) => moduleFederationPlugin.ModuleFederationPluginOptions;
+export declare const patchMFConfig: (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions, isServer: boolean, remoteIpStrategy?: "ipv4" | "inherit") => moduleFederationPlugin.ModuleFederationPluginOptions;
 export declare function patchBundlerConfig<T extends Bundler>(options: {
     bundlerConfig: BundlerConfig<T>;
     isServer: boolean;

package/dist/types/runtime/createRemoteSSRComponent.d.ts

@@ -5,11 +5,14 @@ type IProps = {
     injectScript?: boolean;
     injectLink?: boolean;
 };
+type IKey = {
+    key?: React.Key | null;
+};
 export declare function collectSSRAssets(options: IProps): React.ReactNode[];
 export declare function createRemoteSSRComponent<T, E extends keyof T>(info: {
     loader: () => Promise<T>;
     loading: React.ReactNode;
     fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
     export?: E;
-}): (props: T[E] extends (...args: any) => any ? Parameters<T[E]>[0] extends undefined ? Record<string, never> : Parameters<T[E]>[0] : Record<string, never>) => React.JSX.Element;
+}): (props: T[E] extends (...args: any) => any ? Parameters<T[E]>[0] extends undefined ? IKey : Parameters<T[E]>[0] & IKey : IKey) => React.JSX.Element;
 export {};

package/dist/types/types/index.d.ts

@@ -4,6 +4,7 @@ import type { ModuleFederationPlugin as RspackModuleFederationPlugin } from '@mo
 export interface PluginOptions {
     config?: moduleFederationPlugin.ModuleFederationPluginOptions;
     configPath?: string;
+    remoteIpStrategy?: 'ipv4' | 'inherit';
 }
 export interface InternalModernPluginOptions {
     csrConfig?: moduleFederationPlugin.ModuleFederationPluginOptions;
@@ -12,5 +13,6 @@ export interface InternalModernPluginOptions {
     originPluginOptions: PluginOptions;
     browserPlugin?: BundlerPlugin;
     nodePlugin?: BundlerPlugin;
+    remoteIpStrategy?: 'ipv4' | 'inherit';
 }
 export type BundlerPlugin = WebpackModuleFederationPlugin | RspackModuleFederationPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20240716104220",
+  "version": "0.0.0-next-20240716130450",
   "files": [
     "dist/",
     "types.d.ts",
@@ -61,9 +61,9 @@
     "node-fetch": "~3.3.0",
     "react-error-boundary": "4.0.13",
     "hoist-non-react-statics": "3.3.2",
-    "@module-federation/sdk": "0.0.0-next-20240716104220",
-    "@module-federation/enhanced": "0.0.0-next-20240716104220",
-    "@module-federation/node": "0.0.0-next-20240716104220"
+    "@module-federation/sdk": "0.0.0-next-20240716130450",
+    "@module-federation/enhanced": "0.0.0-next-20240716130450",
+    "@module-federation/node": "0.0.0-next-20240716130450"
   },
   "devDependencies": {
     "@types/hoist-non-react-statics": "3.3.2",
@@ -72,7 +72,7 @@
     "@modern-js/runtime": "^2.55.0",
     "@modern-js/module-tools": "^2.55.0",
     "@modern-js/tsconfig": "^2.55.0",
-    "@module-federation/manifest": "0.0.0-next-20240716104220"
+    "@module-federation/manifest": "0.0.0-next-20240716130450"
   },
   "peerDependencies": {
     "react": ">=17",