@module-federation/modern-js 0.0.0-next-20250526025159 → 0.0.0-next-20250526035905

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

@@ -0,0 +1,175 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import React from "react";
+import { getInstance } from "@module-federation/enhanced/runtime";
+import { ErrorBoundary } from "react-error-boundary";
+function getLoadedRemoteInfos(instance, id) {
+  const { name, expose } = instance.remoteHandler.idToRemoteMap[id] || {};
+  if (!name) {
+    return;
+  }
+  const module = instance.moduleCache.get(name);
+  if (!module) {
+    return;
+  }
+  const { remoteSnapshot } = instance.snapshotHandler.getGlobalRemoteInfo(module.remoteInfo);
+  return {
+    ...module.remoteInfo,
+    snapshot: remoteSnapshot,
+    expose
+  };
+}
+function getTargetModuleInfo(id) {
+  const instance = getInstance();
+  if (!instance) {
+    return;
+  }
+  const loadedRemoteInfo = getLoadedRemoteInfos(instance, id);
+  if (!loadedRemoteInfo) {
+    return;
+  }
+  const snapshot = loadedRemoteInfo.snapshot;
+  if (!snapshot) {
+    return;
+  }
+  const publicPath = "publicPath" in snapshot ? snapshot.publicPath : "getPublicPath" in snapshot ? new Function(snapshot.getPublicPath)() : "";
+  if (!publicPath) {
+    return;
+  }
+  const modules = "modules" in snapshot ? snapshot.modules : [];
+  const targetModule = modules.find((m) => m.modulePath === loadedRemoteInfo.expose);
+  if (!targetModule) {
+    return;
+  }
+  const remoteEntry = "remoteEntry" in snapshot ? snapshot.remoteEntry : "";
+  if (!remoteEntry) {
+    return;
+  }
+  return {
+    module: targetModule,
+    publicPath,
+    remoteEntry
+  };
+}
+async function collectSSRAssets(options) {
+  const { id, injectLink = true, injectScript = true, inlineCSS = false } = typeof options === "string" ? {
+    id: options
+  } : options;
+  const links = [];
+  const scripts = [];
+  const instance = getInstance();
+  if (!instance || !injectLink && !injectScript) {
+    return [
+      ...scripts,
+      ...links
+    ];
+  }
+  const moduleAndPublicPath = getTargetModuleInfo(id);
+  if (!moduleAndPublicPath) {
+    return [
+      ...scripts,
+      ...links
+    ];
+  }
+  const { module: targetModule, publicPath, remoteEntry } = moduleAndPublicPath;
+  if (injectLink) {
+    await Promise.all([
+      ...targetModule.assets.css.sync,
+      ...targetModule.assets.css.async
+    ].map(async (file, index) => {
+      const href = `${publicPath}${file}`;
+      const key = `${file.split(".")[0]}_${index}`;
+      if (inlineCSS) {
+        const content = await fetch(href).then((res) => res.text());
+        links.push(/* @__PURE__ */ _jsx("style", {
+          children: content
+        }, key));
+        return;
+      }
+      links.push(/* @__PURE__ */ _jsx("link", {
+        href: `${publicPath}${file}`,
+        rel: "stylesheet",
+        type: "text/css"
+      }, key));
+    }));
+  }
+  if (injectScript) {
+    scripts.push(/* @__PURE__ */ _jsx("script", {
+      async: true,
+      src: `${publicPath}${remoteEntry}`,
+      crossOrigin: "anonymous"
+    }, remoteEntry.split(".")[0]));
+    [
+      ...targetModule.assets.js.sync
+    ].forEach((file, index) => {
+      scripts.push(/* @__PURE__ */ _jsx("script", {
+        async: true,
+        src: `${publicPath}${file}`,
+        crossOrigin: "anonymous"
+      }, `${file.split(".")[0]}_${index}`));
+    });
+  }
+  return [
+    ...scripts,
+    ...links
+  ];
+}
+function createRemoteSSRComponent(info) {
+  const exportName = (info === null || info === void 0 ? void 0 : info.export) || "default";
+  const LazyComponent = /* @__PURE__ */ React.lazy(async () => {
+    try {
+      const m = await info.loader();
+      if (!m) {
+        throw new Error("load remote failed");
+      }
+      const moduleId = m && m[Symbol.for("mf_module_id")];
+      const assets = await collectSSRAssets({
+        id: moduleId
+      });
+      const Com = m[exportName];
+      if (exportName in m && typeof Com === "function") {
+        return {
+          default: (props) => /* @__PURE__ */ _jsxs(_Fragment, {
+            children: [
+              assets,
+              /* @__PURE__ */ _jsx(Com, {
+                ...props
+              })
+            ]
+          })
+        };
+      } else {
+        throw Error(`Make sure that ${moduleId} has the correct export when export is ${String(exportName)}`);
+      }
+    } catch (err) {
+      if (!info.fallback) {
+        throw err;
+      }
+      const FallbackFunctionComponent = info.fallback;
+      const FallbackNode = /* @__PURE__ */ _jsx(FallbackFunctionComponent, {
+        error: err,
+        resetErrorBoundary: () => {
+          console.log('SSR mode not support "resetErrorBoundary" !');
+        }
+      });
+      return {
+        default: () => FallbackNode
+      };
+    }
+  });
+  return (props) => {
+    const { key, ...args } = props;
+    return /* @__PURE__ */ _jsx(ErrorBoundary, {
+      FallbackComponent: info.fallback,
+      children: /* @__PURE__ */ _jsx(React.Suspense, {
+        fallback: info.loading,
+        children: /* @__PURE__ */ _jsx(LazyComponent, {
+          ...args
+        })
+      })
+    });
+  };
+}
+export {
+  collectSSRAssets,
+  createRemoteSSRComponent
+};

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

@@ -1,20 +1,12 @@
 export * from "@module-federation/enhanced/runtime";
-import { ERROR_TYPE } from "../constant";
 const kit = {
   get createRemoteSSRComponent() {
-    return require("./createRemoteComponent").createRemoteSSRComponent;
-  },
-  get createRemoteComponent() {
-    return require("./createRemoteComponent").createRemoteComponent;
+    return require("./createRemoteSSRComponent").createRemoteSSRComponent;
   },
   get collectSSRAssets() {
-    return require("./createRemoteComponent").collectSSRAssets;
-  },
-  get wrapNoSSR() {
-    return require("./wrapNoSSR").wrapNoSSR;
+    return require("./createRemoteSSRComponent").collectSSRAssets;
   }
 };
 export {
-  ERROR_TYPE,
   kit
 };

package/dist/esm-node/ssr-runtime/index.js

@@ -0,0 +1 @@
+export * from "./plugin";

package/dist/esm-node/ssr-runtime/{devPlugin.js → plugin.js}

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SSRLiveReload } from "./SSRLiveReload";
-import { flushDataFetch } from "../utils";
-const mfSSRDevPlugin = () => ({
+const mfSSRPlugin = () => ({
   name: "@module-federation/modern-js",
   setup: (api) => {
     api.onBeforeRender(async () => {
@@ -11,11 +10,9 @@ const mfSSRDevPlugin = () => ({
       globalThis.shouldUpdate = false;
       const nodeUtils = await import("@module-federation/node/utils");
       const shouldUpdate = await nodeUtils.revalidate();
-      console.log("shouldUpdate: ", shouldUpdate);
       if (shouldUpdate) {
         console.log("should RELOAD", shouldUpdate);
         await nodeUtils.flushChunks();
-        flushDataFetch();
         globalThis.shouldUpdate = true;
       }
     });
@@ -33,5 +30,5 @@ const mfSSRDevPlugin = () => ({
   }
 });
 export {
-  mfSSRDevPlugin
+  mfSSRPlugin
 };

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

@@ -0,0 +1 @@
+export declare const isDev: boolean;

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

@@ -3,4 +3,3 @@ import type { PluginOptions } from '../types';
 export declare const moduleFederationPlugin: (userConfig?: PluginOptions) => CliPluginFuture<AppTools>;
 export default moduleFederationPlugin;
 export { createModuleFederationConfig } from '@module-federation/enhanced';
-export type { FederationRuntimePlugin } from '@module-federation/enhanced/runtime';

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

@@ -3,4 +3,3 @@ export type ConfigType<T> = T extends 'webpack' ? webpack.Configuration : T exte
 export declare const getIPV4: () => string;
 export declare const isWebTarget: (target: string[] | string) => boolean;
 export declare const skipByTarget: (target: string[] | string) => boolean;
-export declare function isDev(): boolean;

package/dist/types/constant.d.ts

@@ -1,25 +1,2 @@
 export declare const LOCALHOST = "localhost";
 export declare const PLUGIN_IDENTIFIER = "[ Modern.js Module Federation ]";
-export declare const DATA_FETCH_QUERY = "x-mf-data-fetch";
-export declare const DATA_FETCH_ERROR_PREFIX = "caught the following error during dataFetch: ";
-export declare const LOAD_REMOTE_ERROR_PREFIX = "caught the following error during loadRemote: ";
-export declare const DOWNGRADE_KEY = "_mfSSRDowngrade";
-export declare const DATA_FETCH_MAP_KEY = "__MF_DATA_FETCH_MAP__";
-export declare const DATA_FETCH_FUNCTION = "_mfDataFetch";
-export declare const FS_HREF = "_mfFSHref";
-export declare const ERROR_TYPE: {
-    DATA_FETCH: number;
-    LOAD_REMOTE: number;
-    UNKNOWN: number;
-};
-export declare const WRAP_DATA_FETCH_ID_IDENTIFIER = "wrap_dfip_identifier";
-export declare const enum MF_DATA_FETCH_TYPE {
-    FETCH_SERVER = 1,
-    FETCH_CLIENT = 2
-}
-export declare const enum MF_DATA_FETCH_STATUS {
-    LOADED = 1,
-    LOADING = 2,
-    AWAIT = 0,
-    ERROR = 3
-}

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

@@ -0,0 +1,19 @@
+import React from 'react';
+import { ErrorBoundaryPropsWithComponent } from 'react-error-boundary';
+type IProps = {
+    id: string;
+    injectScript?: boolean;
+    injectLink?: boolean;
+    inlineCSS?: boolean;
+};
+type ReactKey = {
+    key?: React.Key | null;
+};
+export declare function collectSSRAssets(options: IProps): Promise<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 ? ReactKey : Parameters<T[E]>[0] & ReactKey : ReactKey) => React.JSX.Element;
+export {};

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

@@ -1,9 +1,5 @@
 export * from '@module-federation/enhanced/runtime';
-export type { DataFetchParams } from '../interfaces/global';
-export { ERROR_TYPE } from '../constant';
 export declare const kit: {
-    readonly createRemoteSSRComponent: typeof import("./createRemoteComponent").createRemoteSSRComponent;
-    readonly createRemoteComponent: typeof import("./createRemoteComponent").createRemoteComponent;
-    readonly collectSSRAssets: typeof import("./createRemoteComponent").collectSSRAssets;
-    readonly wrapNoSSR: typeof import("./wrapNoSSR").wrapNoSSR;
+    readonly createRemoteSSRComponent: any;
+    readonly collectSSRAssets: any;
 };

package/dist/types/ssr-runtime/index.d.ts

@@ -0,0 +1 @@
+export * from './plugin';

package/dist/types/ssr-runtime/plugin.d.ts

@@ -0,0 +1,2 @@
+import type { RuntimePluginFuture } from '@modern-js/runtime';
+export declare const mfSSRPlugin: () => RuntimePluginFuture;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20250526025159",
+  "version": "0.0.0-next-20250526035905",
   "files": [
     "dist/",
     "types.d.ts",
@@ -24,13 +24,9 @@
       "types": "./dist/types/runtime/index.d.ts",
       "default": "./dist/esm/runtime/index.js"
     },
-    "./ssr-dev-plugin": {
-      "types": "./dist/types/ssr-runtime/devPlugin.d.ts",
-      "default": "./dist/esm/ssr-runtime/devPlugin.js"
-    },
-    "./ssr-inject-data-fetch-function-plugin": {
-      "types": "./dist/types/ssr-runtime/injectDataFetchFunctionPlugin.d.ts",
-      "default": "./dist/esm/ssr-runtime/injectDataFetchFunctionPlugin.js"
+    "./ssr-runtime": {
+      "types": "./dist/types/ssr-runtime/index.d.ts",
+      "default": "./dist/esm/ssr-runtime/index.js"
     },
     "./config-plugin": {
       "types": "./dist/types/cli/configPlugin.d.ts",
@@ -52,19 +48,10 @@
       "import": "./dist/esm/cli/mfRuntimePlugins/resolve-entry-ipv4.js",
       "require": "./dist/esm/cli/mfRuntimePlugins/resolve-entry-ipv4.js"
     },
-    "./auto-fetch-data": {
-      "types": "./dist/types/cli/mfRuntimePlugins/auto-fetch-data.d.ts",
-      "import": "./dist/esm/cli/mfRuntimePlugins/auto-fetch-data.js",
-      "require": "./dist/esm/cli/mfRuntimePlugins/auto-fetch-data.js"
-    },
     "./inject-node-fetch": {
       "types": "./dist/types/cli/mfRuntimePlugins/inject-node-fetch.d.ts",
       "import": "./dist/esm/cli/mfRuntimePlugins/inject-node-fetch.js",
       "require": "./dist/esm/cli/mfRuntimePlugins/inject-node-fetch.js"
-    },
-    "./data-fetch-server-plugin": {
-      "types": "./dist/types/cli/server/data-fetch-server-plugin.d.ts",
-      "default": "./dist/cjs/cli/server/data-fetch-server-plugin.js"
     }
   },
   "typesVersions": {
@@ -87,17 +74,8 @@
       "resolve-entry-ipv4": [
         "./dist/types/cli/mfRuntimePlugins/resolve-entry-ipv4.d.ts"
       ],
-      "auto-fetch-data": [
-        "./dist/types/cli/mfRuntimePlugins/auto-fetch-data.d.ts"
-      ],
       "inject-node-fetch": [
         "./dist/types/cli/mfRuntimePlugins/inject-node-fetch.d.ts"
-      ],
-      "data-fetch-server-plugin": [
-        "./dist/types/cli/server/data-fetch-server-plugin.d.ts"
-      ],
-      "ssr-inject-data-fetch-function-plugin": [
-        "./dist/types/cli/server/data-fetch-server-plugin.d.ts"
       ]
     }
   },
@@ -106,27 +84,25 @@
   "author": "hanric <hanric.zhang@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.67.5",
-    "@modern-js/utils": "2.67.5",
+    "@modern-js/node-bundle-require": "2.65.1",
+    "@modern-js/utils": "2.65.1",
     "@swc/helpers": "0.5.13",
     "node-fetch": "~3.3.0",
     "react-error-boundary": "4.1.2",
-    "@module-federation/rsbuild-plugin": "0.0.0-next-20250526025159",
-    "@module-federation/enhanced": "0.0.0-next-20250526025159",
-    "@module-federation/runtime": "0.0.0-next-20250526025159",
-    "@module-federation/node": "0.0.0-next-20250526025159",
-    "@module-federation/sdk": "0.0.0-next-20250526025159",
-    "@module-federation/cli": "0.0.0-next-20250526025159"
+    "@module-federation/rsbuild-plugin": "0.0.0-next-20250526035905",
+    "@module-federation/enhanced": "0.0.0-next-20250526035905",
+    "@module-federation/node": "0.0.0-next-20250526035905",
+    "@module-federation/sdk": "0.0.0-next-20250526035905",
+    "@module-federation/cli": "0.0.0-next-20250526035905"
   },
   "devDependencies": {
     "@rsbuild/core": "1.2.8",
-    "@modern-js/app-tools": "2.67.5",
-    "@modern-js/core": "2.67.5",
-    "@modern-js/module-tools": "2.67.5",
-    "@modern-js/runtime": "2.67.5",
-    "@modern-js/tsconfig": "2.67.5",
-    "@modern-js/server-runtime": "2.67.5",
-    "@module-federation/manifest": "0.0.0-next-20250526025159"
+    "@modern-js/app-tools": "2.65.1",
+    "@modern-js/core": "2.65.1",
+    "@modern-js/module-tools": "2.65.1",
+    "@modern-js/runtime": "2.65.1",
+    "@modern-js/tsconfig": "2.65.1",
+    "@module-federation/manifest": "0.0.0-next-20250526035905"
   },
   "peerDependencies": {
     "react": ">=17",

package/dist/cjs/cli/mfRuntimePlugins/auto-fetch-data.js

@@ -1,98 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var auto_fetch_data_exports = {};
-__export(auto_fetch_data_exports, {
-  default: () => auto_fetch_data_default
-});
-module.exports = __toCommonJS(auto_fetch_data_exports);
-var import_utils = require("../../utils");
-var import_logger = __toESM(require("../../logger"));
-var import_dataFetch = require("../../utils/dataFetch");
-var import_constant = require("../../constant");
-var import_constant2 = require("@module-federation/rsbuild-plugin/constant");
-const autoFetchData = () => ({
-  name: "auto-fetch-data-plugin",
-  beforeInit(args) {
-    (0, import_utils.initDataFetchMap)();
-    return args;
-  },
-  afterLoadSnapshot(args) {
-    const { id, moduleInfo, remoteSnapshot, host } = args;
-    if (typeof id === "string" && (0, import_dataFetch.isDataLoaderExpose)(id)) {
-      return args;
-    }
-    if (!remoteSnapshot || !id || !("modules" in remoteSnapshot)) {
-      return args;
-    }
-    const { name, alias } = moduleInfo;
-    const dataFetchInfo = (0, import_utils.getDataFetchInfo)({
-      name,
-      alias,
-      id,
-      remoteSnapshot
-    });
-    if (!dataFetchInfo) {
-      return args;
-    }
-    const { dataFetchId, dataFetchName } = dataFetchInfo;
-    const dataFetchMapKey = (0, import_dataFetch.getDataFetchMapKey)(dataFetchInfo, {
-      name: host.name,
-      version: host.options.version
-    });
-    import_logger.default.debug("======= auto fetch plugin dataFetchMapKey: ", dataFetchMapKey);
-    if (!dataFetchMapKey) {
-      return args;
-    }
-    const dataFetchItem = (0, import_utils.getDataFetchItem)(dataFetchMapKey);
-    if (dataFetchItem) {
-      return args;
-    }
-    const dataFetchMap = (0, import_utils.getDataFetchMap)();
-    const downgradeType = remoteSnapshot.modules.find((module2) => module2.moduleName === `${dataFetchName}${import_constant2.DATA_FETCH_CLIENT_SUFFIX}`) ? import_constant.MF_DATA_FETCH_TYPE.FETCH_CLIENT : import_constant.MF_DATA_FETCH_TYPE.FETCH_SERVER;
-    let finalDataFetchId = dataFetchId;
-    if (typeof window !== "undefined") {
-      finalDataFetchId = downgradeType === import_constant.MF_DATA_FETCH_TYPE.FETCH_CLIENT ? `${dataFetchId}${import_constant2.DATA_FETCH_CLIENT_SUFFIX}` : dataFetchId;
-    }
-    const getDataFetchGetter = () => (0, import_dataFetch.loadDataFetchModule)(host, finalDataFetchId);
-    const dataFetchFnItem = [
-      getDataFetchGetter,
-      downgradeType
-    ];
-    if (typeof window === "undefined" || (0, import_utils.isCSROnly)()) {
-      dataFetchFnItem.push(getDataFetchGetter());
-    }
-    dataFetchMap[dataFetchMapKey] = [
-      dataFetchFnItem,
-      void 0,
-      import_constant.MF_DATA_FETCH_STATUS.AWAIT
-    ];
-    return args;
-  }
-});
-var auto_fetch_data_default = autoFetchData;