@module-federation/modern-js 0.0.0-next-20240725061440 → 0.0.0-next-20240726075341

package/dist/cjs/cli/configPlugin.js

@@ -43,7 +43,7 @@ function setEnv(enableSSR) {
   }
 }
 function modifyBundlerConfig(options) {
-  const { mfConfig, config, isServer, modernjsConfig, bundlerType, remoteIpStrategy = "ipv4" } = options;
+  const { mfConfig, config, isServer, modernjsConfig, remoteIpStrategy = "ipv4" } = options;
   (0, import_utils.patchMFConfig)(mfConfig, isServer, remoteIpStrategy);
   (0, import_utils.patchBundlerConfig)({
     bundlerConfig: config,
@@ -66,9 +66,17 @@ const moduleFederationConfigPlugin = (userConfig) => ({
     userConfig.csrConfig = csrConfig;
     return {
       config: async () => {
-        var _modernjsConfig_dev;
+        var _modernjsConfig_server, _modernjsConfig_dev;
         const bundlerType = useAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
         const ipv4 = (0, import_utils.getIPV4)();
+        const enableSSR = Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
+        if (userConfig.remoteIpStrategy === void 0) {
+          if (!enableSSR) {
+            userConfig.remoteIpStrategy = "inherit";
+          } else {
+            userConfig.remoteIpStrategy = "ipv4";
+          }
+        }
         return {
           tools: {
             rspack(config, { isServer }) {

package/dist/cjs/cli/mfRuntimePlugins/resolve-entry-ipv4.js

@@ -23,7 +23,7 @@ __export(resolve_entry_ipv4_exports, {
 module.exports = __toCommonJS(resolve_entry_ipv4_exports);
 var import_constant = require("../../constant");
 const ipv4 = typeof FEDERATION_IPV4 !== "undefined" ? FEDERATION_IPV4 : "127.0.0.1";
-const remoteIpStrategy = typeof REMOTE_IP_STRATEGY !== "undefined" ? REMOTE_IP_STRATEGY : "127.0.0.1";
+const remoteIpStrategy = typeof REMOTE_IP_STRATEGY !== "undefined" ? REMOTE_IP_STRATEGY : "inherit";
 function replaceObjectLocalhost(key, obj) {
   if (remoteIpStrategy !== "ipv4") {
     return;

package/dist/esm/cli/configPlugin.js

@@ -9,7 +9,7 @@ function setEnv(enableSSR) {
   }
 }
 function modifyBundlerConfig(options) {
-  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;
+  var mfConfig = options.mfConfig, config = options.config, isServer = options.isServer, modernjsConfig = options.modernjsConfig, _options_remoteIpStrategy = options.remoteIpStrategy, remoteIpStrategy = _options_remoteIpStrategy === void 0 ? "ipv4" : _options_remoteIpStrategy;
   patchMFConfig(mfConfig, isServer, remoteIpStrategy);
   patchBundlerConfig({
     bundlerConfig: config,
@@ -46,10 +46,18 @@ var moduleFederationConfigPlugin = function(userConfig) {
                 2,
                 {
                   config: /* @__PURE__ */ _async_to_generator(function() {
-                    var _modernjsConfig_dev, bundlerType, ipv4;
+                    var _modernjsConfig_server, _modernjsConfig_dev, bundlerType, ipv4, enableSSR;
                     return _ts_generator(this, function(_state2) {
                       bundlerType = useAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
                       ipv4 = getIPV4();
+                      enableSSR = Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
+                      if (userConfig.remoteIpStrategy === void 0) {
+                        if (!enableSSR) {
+                          userConfig.remoteIpStrategy = "inherit";
+                        } else {
+                          userConfig.remoteIpStrategy = "ipv4";
+                        }
+                      }
                       return [
                         2,
                         {

package/dist/esm/cli/mfRuntimePlugins/resolve-entry-ipv4.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { LOCALHOST } from "../../constant";
 var ipv4 = typeof FEDERATION_IPV4 !== "undefined" ? FEDERATION_IPV4 : "127.0.0.1";
-var remoteIpStrategy = typeof REMOTE_IP_STRATEGY !== "undefined" ? REMOTE_IP_STRATEGY : "127.0.0.1";
+var remoteIpStrategy = typeof REMOTE_IP_STRATEGY !== "undefined" ? REMOTE_IP_STRATEGY : "inherit";
 function replaceObjectLocalhost(key, obj) {
   if (remoteIpStrategy !== "ipv4") {
     return;

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

@@ -7,7 +7,7 @@ function setEnv(enableSSR) {
   }
 }
 function modifyBundlerConfig(options) {
-  const { mfConfig, config, isServer, modernjsConfig, bundlerType, remoteIpStrategy = "ipv4" } = options;
+  const { mfConfig, config, isServer, modernjsConfig, remoteIpStrategy = "ipv4" } = options;
   patchMFConfig(mfConfig, isServer, remoteIpStrategy);
   patchBundlerConfig({
     bundlerConfig: config,
@@ -30,9 +30,17 @@ const moduleFederationConfigPlugin = (userConfig) => ({
     userConfig.csrConfig = csrConfig;
     return {
       config: async () => {
-        var _modernjsConfig_dev;
+        var _modernjsConfig_server, _modernjsConfig_dev;
         const bundlerType = useAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
         const ipv4 = getIPV4();
+        const enableSSR = Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
+        if (userConfig.remoteIpStrategy === void 0) {
+          if (!enableSSR) {
+            userConfig.remoteIpStrategy = "inherit";
+          } else {
+            userConfig.remoteIpStrategy = "ipv4";
+          }
+        }
         return {
           tools: {
             rspack(config, { isServer }) {

package/dist/esm-node/cli/mfRuntimePlugins/resolve-entry-ipv4.js

@@ -1,6 +1,6 @@
 import { LOCALHOST } from "../../constant";
 const ipv4 = typeof FEDERATION_IPV4 !== "undefined" ? FEDERATION_IPV4 : "127.0.0.1";
-const remoteIpStrategy = typeof REMOTE_IP_STRATEGY !== "undefined" ? REMOTE_IP_STRATEGY : "127.0.0.1";
+const remoteIpStrategy = typeof REMOTE_IP_STRATEGY !== "undefined" ? REMOTE_IP_STRATEGY : "inherit";
 function replaceObjectLocalhost(key, obj) {
   if (remoteIpStrategy !== "ipv4") {
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20240725061440",
+  "version": "0.0.0-next-20240726075341",
   "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-20240725061440",
-    "@module-federation/enhanced": "0.0.0-next-20240725061440",
-    "@module-federation/node": "0.0.0-next-20240725061440"
+    "@module-federation/sdk": "0.0.0-next-20240726075341",
+    "@module-federation/enhanced": "0.0.0-next-20240726075341",
+    "@module-federation/node": "0.0.0-next-20240726075341"
   },
   "devDependencies": {
     "@types/hoist-non-react-statics": "3.3.2",
@@ -72,7 +72,7 @@
     "@modern-js/runtime": "2.56.2",
     "@modern-js/module-tools": "2.56.2",
     "@modern-js/tsconfig": "2.56.2",
-    "@module-federation/manifest": "0.0.0-next-20240725061440"
+    "@module-federation/manifest": "0.0.0-next-20240726075341"
   },
   "peerDependencies": {
     "react": ">=17",

package/dist/cjs/cli/RspackNodePlugin.js

@@ -1,46 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var RspackNodePlugin_exports = {};
-__export(RspackNodePlugin_exports, {
-  default: () => RspackNodePlugin
-});
-module.exports = __toCommonJS(RspackNodePlugin_exports);
-class RspackNodePlugin {
-  apply(compiler) {
-    const { webpack } = compiler;
-    compiler.options.output.chunkFormat = "commonjs";
-    if (compiler.options.output.enabledLibraryTypes === void 0) {
-      compiler.options.output.enabledLibraryTypes = [
-        "commonjs-module"
-      ];
-    } else {
-      compiler.options.output.enabledLibraryTypes.push("commonjs-module");
-    }
-    compiler.options.output.chunkLoading = "async-node";
-    compiler.options.output.enabledChunkLoadingTypes = [];
-    compiler.options.output.environment = {
-      ...compiler.options.output.environment,
-      dynamicImport: true
-    };
-    new webpack.node.NodeEnvironmentPlugin.apply(compiler);
-    new webpack.node.NodeTargetPlugin().apply(compiler);
-  }
-  constructor() {
-  }
-}

package/dist/esm/cli/RspackNodePlugin.js

@@ -1,32 +0,0 @@
-import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-var RspackNodePlugin = /* @__PURE__ */ function() {
-  "use strict";
-  function RspackNodePlugin2() {
-    _class_call_check(this, RspackNodePlugin2);
-  }
-  var _proto = RspackNodePlugin2.prototype;
-  _proto.apply = function apply(compiler) {
-    var webpack = compiler.webpack;
-    compiler.options.output.chunkFormat = "commonjs";
-    if (compiler.options.output.enabledLibraryTypes === void 0) {
-      compiler.options.output.enabledLibraryTypes = [
-        "commonjs-module"
-      ];
-    } else {
-      compiler.options.output.enabledLibraryTypes.push("commonjs-module");
-    }
-    compiler.options.output.chunkLoading = "async-node";
-    compiler.options.output.enabledChunkLoadingTypes = [];
-    compiler.options.output.environment = _object_spread_props(_object_spread({}, compiler.options.output.environment), {
-      dynamicImport: true
-    });
-    new webpack.node.NodeEnvironmentPlugin.apply(compiler);
-    new webpack.node.NodeTargetPlugin().apply(compiler);
-  };
-  return RspackNodePlugin2;
-}();
-export {
-  RspackNodePlugin as default
-};

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

@@ -1,26 +0,0 @@
-class RspackNodePlugin {
-  apply(compiler) {
-    const { webpack } = compiler;
-    compiler.options.output.chunkFormat = "commonjs";
-    if (compiler.options.output.enabledLibraryTypes === void 0) {
-      compiler.options.output.enabledLibraryTypes = [
-        "commonjs-module"
-      ];
-    } else {
-      compiler.options.output.enabledLibraryTypes.push("commonjs-module");
-    }
-    compiler.options.output.chunkLoading = "async-node";
-    compiler.options.output.enabledChunkLoadingTypes = [];
-    compiler.options.output.environment = {
-      ...compiler.options.output.environment,
-      dynamicImport: true
-    };
-    new webpack.node.NodeEnvironmentPlugin.apply(compiler);
-    new webpack.node.NodeTargetPlugin().apply(compiler);
-  }
-  constructor() {
-  }
-}
-export {
-  RspackNodePlugin as default
-};

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

@@ -1,5 +0,0 @@
-import type { Rspack } from '@modern-js/app-tools';
-export default class RspackNodePlugin implements Rspack.RspackPluginInstance {
-    constructor();
-    apply(compiler: Rspack.Compiler): void;
-}