@module-federation/modern-js 0.0.0-next-20241016083243 → 0.0.0-next-20241017102355

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20241016083243",
+  "version": "0.0.0-next-20241017102355",
   "files": [
     "dist/",
     "types.d.ts",
@@ -23,22 +23,22 @@
       "types": "./dist/types/ssr-runtime/index.d.ts",
       "default": "./dist/esm/ssr-runtime/index.js"
     },
-    "./data-loader": {
-      "types": "./dist/types/runtime/dataLoader/plugin.d.ts",
-      "default": "./dist/esm/runtime/dataLoader/plugin.js"
+    "./routes": {
+      "types": "./dist/types/runtime/routes/plugin.d.ts",
+      "default": "./dist/esm/runtime/routes/plugin.js"
     },
-    "./data-loader-inject-assets": {
-      "types": "./dist/types/runtime/dataLoader/plugin-inject-assets.d.ts",
-      "default": "./dist/esm/runtime/dataLoader/plugin-inject-assets.js"
+    "./routes-inject-assets": {
+      "types": "./dist/types/runtime/routes/plugin-inject-assets.d.ts",
+      "default": "./dist/esm/runtime/routes/plugin-inject-assets.js"
     },
-    "./data-loader-server": {
-      "types": "./dist/types/cli/server/dataLoaderPlugin.d.ts",
-      "default": "./dist/cjs/cli/server/dataLoaderPlugin.js"
+    "./fetch-router-server-plugin": {
+      "types": "./dist/types/cli/server/fetchRoutePlugin.d.ts",
+      "default": "./dist/cjs/cli/server/fetchRoutePlugin.js"
     },
-    "./data-loader-plugin": {
-      "import": "./dist/esm/cli/dataLoader/plugin.js",
-      "require": "./dist/cjs/cli/dataLoader/plugin.js",
-      "types": "./dist/types/cli/dataLoader/plugin.d.ts"
+    "./routes-plugin": {
+      "import": "./dist/esm/cli/routes/plugin.js",
+      "require": "./dist/cjs/cli/routes/plugin.js",
+      "types": "./dist/types/cli/routes/plugin.d.ts"
     },
     "./config-plugin": {
       "import": "./dist/esm/cli/configPlugin.js",
@@ -65,17 +65,17 @@
       "ssr-plugin": [
         "./dist/types/cli/ssrPlugin.d.ts"
       ],
-      "data-loader-plugin": [
-        "./dist/types/cli/dataLoader/plugin.d.ts"
+      "routes-plugin": [
+        "./dist/types/cli/routes/plugin.d.ts"
       ],
-      "data-loader": [
+      "routes": [
         "./dist/types/runtime/dataLoader/plugin.d.ts"
       ],
-      "data-loader-inject-assets": [
+      "routes-inject-assets": [
         "./dist/types/runtime/dataLoader/plugin-inject-assets.d.ts"
       ],
-      "data-loader-server": [
-        "./dist/types/cli/server/dataLoaderPlugin.d.ts"
+      "fetch-router-server-plugin": [
+        "./dist/types/cli/server/fetchRoutePlugin.d.ts"
       ]
     }
   },
@@ -84,8 +84,8 @@
   "author": "hanric <hanric.zhang@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.60.3",
-    "@modern-js/utils": "2.60.3",
+    "@modern-js/node-bundle-require": "2.60.2",
+    "@modern-js/utils": "2.60.2",
     "@swc/helpers": "0.5.12",
     "hoist-non-react-statics": "3.3.2",
     "node-fetch": "~3.3.0",
@@ -94,21 +94,21 @@
     "@babel/parser": "7.25.3",
     "@babel/traverse": "7.25.3",
     "@babel/types": "7.25.2",
-    "@module-federation/enhanced": "0.0.0-next-20241016083243",
-    "@module-federation/node": "0.0.0-next-20241016083243",
-    "@module-federation/sdk": "0.0.0-next-20241016083243"
+    "@module-federation/enhanced": "0.0.0-next-20241017102355",
+    "@module-federation/node": "0.0.0-next-20241017102355",
+    "@module-federation/sdk": "0.0.0-next-20241017102355"
   },
   "devDependencies": {
-    "@modern-js/app-tools": "2.60.3",
-    "@modern-js/core": "2.60.3",
-    "@modern-js/module-tools": "2.60.3",
-    "@modern-js/runtime": "2.60.3",
-    "@modern-js/tsconfig": "2.60.3",
+    "@modern-js/app-tools": "2.60.2",
+    "@modern-js/core": "2.60.2",
+    "@modern-js/module-tools": "2.60.2",
+    "@modern-js/runtime": "2.60.2",
+    "@modern-js/tsconfig": "2.60.2",
     "@types/hoist-non-react-statics": "3.3.5",
     "@types/babel__traverse": "7.20.6",
     "@types/babel__generator": "7.6.8",
-    "@modern-js/server-core": "2.60.3",
-    "@module-federation/manifest": "0.0.0-next-20241016083243"
+    "@modern-js/server-core": "2.60.2",
+    "@module-federation/manifest": "0.0.0-next-20241017102355"
   },
   "peerDependencies": {
     "@modern-js/runtime": "^2.60.2",

package/dist/cjs/cli/dataLoader/plugin.js

@@ -1,219 +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 plugin_exports = {};
-__export(plugin_exports, {
-  default: () => plugin_default,
-  generateRoutes: () => import_ast.generateRoutes,
-  moduleFederationDataLoaderPlugin: () => moduleFederationDataLoaderPlugin
-});
-module.exports = __toCommonJS(plugin_exports);
-var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../../runtime/dataLoader/utils");
-var import_constant = require("../../constant");
-var import_constant2 = require("../../constant");
-var import_ast = require("./ast");
-var import_generateRouteFile = require("./generateRouteFile");
-var import_patchMFConfig = require("./patchMFConfig");
-var import_clearMFCache = require("./clearMFCache");
-var import_path = __toESM(require("path"));
-function _transformRuntimeOptions(buildOptions) {
-  const remotes = buildOptions.remotes || {};
-  const runtimeRemotes = Object.entries(remotes).map((remote) => {
-    const [alias, nameAndEntry] = remote;
-    const [name, entry] = nameAndEntry.split("@");
-    return {
-      name,
-      entry,
-      alias
-    };
-  });
-  return {
-    name: buildOptions.name,
-    remotes: runtimeRemotes
-  };
-}
-const moduleFederationDataLoaderPlugin = (enable, internalOptions, userConfig) => ({
-  name: "@modern-js/plugin-module-federation-data-loader",
-  pre: [
-    "@modern-js/plugin-module-federation-config"
-  ],
-  post: [
-    "@modern-js/plugin-router",
-    "@modern-js/plugin-module-federation"
-  ],
-  setup: async ({ useAppContext }) => {
-    if (!enable) {
-      return;
-    }
-    const { serverPlugin = "@module-federation/modern-js/data-loader-server", transformRuntimeOptions } = userConfig;
-    const appContext = useAppContext();
-    const name = internalOptions.csrConfig.name;
-    const { metaName = import_constant2.META_NAME } = internalOptions;
-    const internalDirectory = appContext.internalDirectory.replace(import_constant2.META_NAME, metaName || import_constant2.META_NAME);
-    const transformRuntimeFn = transformRuntimeOptions || _transformRuntimeOptions;
-    const entries = /* @__PURE__ */ new Set();
-    let remotePathMap = {};
-    const ssrByRouteIdsMap = {};
-    const csrConfig = internalOptions.csrConfig;
-    if (typeof csrConfig.remotes === "object" && Object.keys(csrConfig.remotes).length) {
-      const { entries: scanEntries, remotePathMap: scanRemotePathMap } = await (0, import_generateRouteFile.generateRouteFile)({
-        appDirectory: appContext.appDirectory
-      });
-      scanEntries.forEach((e) => entries.add(e));
-      remotePathMap = scanRemotePathMap;
-    } else {
-      entries.add(import_constant.DEFAULT_ENTRY);
-    }
-    const dataLoaderRemotes = [
-      ...new Set(Object.values(remotePathMap).map((i) => i.name))
-    ];
-    const serverPluginOptions = {
-      runtimeOptions: transformRuntimeFn(internalOptions.csrConfig),
-      dataLoaderRemotes,
-      ssrByRouteIdsMap
-    };
-    const hasDataLoaderRemotes = () => Boolean(serverPluginOptions.dataLoaderRemotes.length);
-    return {
-      _internalRuntimePlugins: ({ entrypoint, plugins }) => {
-        if (!hasDataLoaderRemotes()) {
-          return {
-            entrypoint,
-            plugins
-          };
-        }
-        plugins.push({
-          name: "ssrDataLoader",
-          path: "@module-federation/modern-js/data-loader",
-          config: {
-            metaName,
-            dataLoaderRemotes
-          }
-        });
-        plugins.push({
-          name: "ssrDataLoaderInjectAssets",
-          path: "@module-federation/modern-js/data-loader-inject-assets",
-          config: {
-            metaName,
-            dataLoaderRemotes
-          }
-        });
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      _internalServerPlugins({ plugins }) {
-        if (!hasDataLoaderRemotes()) {
-          return {
-            plugins
-          };
-        }
-        plugins.push({
-          name: serverPlugin,
-          options: serverPluginOptions
-        });
-        return {
-          plugins
-        };
-      },
-      async modifyFileSystemRoutes(options) {
-        const { routes, entrypoint } = options;
-        const { entryName } = entrypoint;
-        const prefix = (0, import_utils2.transformName2Prefix)(internalOptions.csrConfig.name);
-        const modifyRouteIds = async (route, pathName) => {
-          const currentPathName = route.path ? import_path.default.join("/", pathName, route.path) : pathName;
-          if (route.id) {
-            const originalId = route.id;
-            route.originalId = originalId;
-            const remoteInfo = remotePathMap[currentPathName];
-            if (remoteInfo) {
-              const { path: path2, name: name2 } = remoteInfo;
-              const remoteIdPrefix = (0, import_utils2.transformName2Prefix)(name2);
-              const isLayout = Boolean(route.children);
-              const newId = `${remoteIdPrefix}${isLayout ? "layout" : "page"}`;
-              ssrByRouteIdsMap[originalId] = newId;
-              const content = import_utils.fs.readFileSync(path2, "utf-8");
-              await import_utils.fs.writeFile(path2, content.replace(import_constant.ROUTE_ID, originalId));
-              route.id = newId;
-            } else {
-              route.id = `${prefix}${route.id}`;
-            }
-            route.children && await Promise.all(route.children.map(async (r) => {
-              return await modifyRouteIds(r, currentPathName);
-            }));
-          }
-        };
-        await Promise.all(routes.map(async (route) => {
-          await modifyRouteIds(route, entryName === import_constant.DEFAULT_ENTRY ? "" : entryName);
-        }));
-        return options;
-      },
-      config: async () => {
-        return {
-          tools: {
-            // bundlerChain can not keep target order
-            rspack(_config, { isServer }) {
-              (0, import_patchMFConfig.patchMFConfig)({
-                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
-                metaName,
-                isServer,
-                internalDirectory,
-                entries
-              });
-            },
-            // bundlerChain can not keep target order
-            webpack(_config, { isServer }) {
-              (0, import_patchMFConfig.patchMFConfig)({
-                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
-                metaName,
-                isServer,
-                internalDirectory,
-                entries
-              });
-            }
-          },
-          source: {
-            define: {
-              MODERN_ROUTER_ID_PREFIX: JSON.stringify((0, import_utils2.transformName2Prefix)(name))
-            }
-          }
-        };
-      },
-      async afterDev() {
-        (0, import_clearMFCache.clearMFCache)();
-      }
-    };
-  }
-});
-var plugin_default = moduleFederationDataLoaderPlugin;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  generateRoutes,
-  moduleFederationDataLoaderPlugin
-});

package/dist/esm-node/cli/dataLoader/plugin.js

@@ -1,184 +0,0 @@
-import { fs } from "@modern-js/utils";
-import { transformName2Prefix } from "../../runtime/dataLoader/utils";
-import { DEFAULT_ENTRY, ROUTE_ID } from "../../constant";
-import { META_NAME } from "../../constant";
-import { generateRoutes } from "./ast";
-import { generateRouteFile } from "./generateRouteFile";
-import { patchMFConfig } from "./patchMFConfig";
-import { clearMFCache } from "./clearMFCache";
-import path from "path";
-function _transformRuntimeOptions(buildOptions) {
-  const remotes = buildOptions.remotes || {};
-  const runtimeRemotes = Object.entries(remotes).map((remote) => {
-    const [alias, nameAndEntry] = remote;
-    const [name, entry] = nameAndEntry.split("@");
-    return {
-      name,
-      entry,
-      alias
-    };
-  });
-  return {
-    name: buildOptions.name,
-    remotes: runtimeRemotes
-  };
-}
-const moduleFederationDataLoaderPlugin = (enable, internalOptions, userConfig) => ({
-  name: "@modern-js/plugin-module-federation-data-loader",
-  pre: [
-    "@modern-js/plugin-module-federation-config"
-  ],
-  post: [
-    "@modern-js/plugin-router",
-    "@modern-js/plugin-module-federation"
-  ],
-  setup: async ({ useAppContext }) => {
-    if (!enable) {
-      return;
-    }
-    const { serverPlugin = "@module-federation/modern-js/data-loader-server", transformRuntimeOptions } = userConfig;
-    const appContext = useAppContext();
-    const name = internalOptions.csrConfig.name;
-    const { metaName = META_NAME } = internalOptions;
-    const internalDirectory = appContext.internalDirectory.replace(META_NAME, metaName || META_NAME);
-    const transformRuntimeFn = transformRuntimeOptions || _transformRuntimeOptions;
-    const entries = /* @__PURE__ */ new Set();
-    let remotePathMap = {};
-    const ssrByRouteIdsMap = {};
-    const csrConfig = internalOptions.csrConfig;
-    if (typeof csrConfig.remotes === "object" && Object.keys(csrConfig.remotes).length) {
-      const { entries: scanEntries, remotePathMap: scanRemotePathMap } = await generateRouteFile({
-        appDirectory: appContext.appDirectory
-      });
-      scanEntries.forEach((e) => entries.add(e));
-      remotePathMap = scanRemotePathMap;
-    } else {
-      entries.add(DEFAULT_ENTRY);
-    }
-    const dataLoaderRemotes = [
-      ...new Set(Object.values(remotePathMap).map((i) => i.name))
-    ];
-    const serverPluginOptions = {
-      runtimeOptions: transformRuntimeFn(internalOptions.csrConfig),
-      dataLoaderRemotes,
-      ssrByRouteIdsMap
-    };
-    const hasDataLoaderRemotes = () => Boolean(serverPluginOptions.dataLoaderRemotes.length);
-    return {
-      _internalRuntimePlugins: ({ entrypoint, plugins }) => {
-        if (!hasDataLoaderRemotes()) {
-          return {
-            entrypoint,
-            plugins
-          };
-        }
-        plugins.push({
-          name: "ssrDataLoader",
-          path: "@module-federation/modern-js/data-loader",
-          config: {
-            metaName,
-            dataLoaderRemotes
-          }
-        });
-        plugins.push({
-          name: "ssrDataLoaderInjectAssets",
-          path: "@module-federation/modern-js/data-loader-inject-assets",
-          config: {
-            metaName,
-            dataLoaderRemotes
-          }
-        });
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      _internalServerPlugins({ plugins }) {
-        if (!hasDataLoaderRemotes()) {
-          return {
-            plugins
-          };
-        }
-        plugins.push({
-          name: serverPlugin,
-          options: serverPluginOptions
-        });
-        return {
-          plugins
-        };
-      },
-      async modifyFileSystemRoutes(options) {
-        const { routes, entrypoint } = options;
-        const { entryName } = entrypoint;
-        const prefix = transformName2Prefix(internalOptions.csrConfig.name);
-        const modifyRouteIds = async (route, pathName) => {
-          const currentPathName = route.path ? path.join("/", pathName, route.path) : pathName;
-          if (route.id) {
-            const originalId = route.id;
-            route.originalId = originalId;
-            const remoteInfo = remotePathMap[currentPathName];
-            if (remoteInfo) {
-              const { path: path2, name: name2 } = remoteInfo;
-              const remoteIdPrefix = transformName2Prefix(name2);
-              const isLayout = Boolean(route.children);
-              const newId = `${remoteIdPrefix}${isLayout ? "layout" : "page"}`;
-              ssrByRouteIdsMap[originalId] = newId;
-              const content = fs.readFileSync(path2, "utf-8");
-              await fs.writeFile(path2, content.replace(ROUTE_ID, originalId));
-              route.id = newId;
-            } else {
-              route.id = `${prefix}${route.id}`;
-            }
-            route.children && await Promise.all(route.children.map(async (r) => {
-              return await modifyRouteIds(r, currentPathName);
-            }));
-          }
-        };
-        await Promise.all(routes.map(async (route) => {
-          await modifyRouteIds(route, entryName === DEFAULT_ENTRY ? "" : entryName);
-        }));
-        return options;
-      },
-      config: async () => {
-        return {
-          tools: {
-            // bundlerChain can not keep target order
-            rspack(_config, { isServer }) {
-              patchMFConfig({
-                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
-                metaName,
-                isServer,
-                internalDirectory,
-                entries
-              });
-            },
-            // bundlerChain can not keep target order
-            webpack(_config, { isServer }) {
-              patchMFConfig({
-                mfConfig: isServer ? internalOptions.ssrConfig : internalOptions.csrConfig,
-                metaName,
-                isServer,
-                internalDirectory,
-                entries
-              });
-            }
-          },
-          source: {
-            define: {
-              MODERN_ROUTER_ID_PREFIX: JSON.stringify(transformName2Prefix(name))
-            }
-          }
-        };
-      },
-      async afterDev() {
-        clearMFCache();
-      }
-    };
-  }
-});
-var plugin_default = moduleFederationDataLoaderPlugin;
-export {
-  plugin_default as default,
-  generateRoutes,
-  moduleFederationDataLoaderPlugin
-};

package/dist/types/cli/dataLoader/plugin.d.ts

@@ -1,6 +0,0 @@
-import type { CliPlugin, AppTools } from '@modern-js/app-tools';
-import type { DataLoaderOptions, InternalModernPluginOptions } from '../../types';
-import { generateRoutes } from './ast';
-export declare const moduleFederationDataLoaderPlugin: (enable: boolean, internalOptions: InternalModernPluginOptions, userConfig: DataLoaderOptions) => CliPlugin<AppTools>;
-export default moduleFederationDataLoaderPlugin;
-export { generateRoutes };