@module-federation/modern-js 0.0.0-next-20240912023912 → 0.0.0-next-20240912070754

package/dist/cjs/cli/configPlugin.js

@@ -55,6 +55,9 @@ function modifyBundlerConfig(options) {
 }
 const moduleFederationConfigPlugin = (userConfig) => ({
   name: "@modern-js/plugin-module-federation-config",
+  pre: [
+    "@modern-js/plugin-initialize"
+  ],
   post: [
     "@modern-js/plugin-module-federation"
   ],

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

@@ -69,14 +69,10 @@ const moduleFederationDataLoaderPlugin = (enable, internalOptions, userConfig) =
     if (!enable) {
       return;
     }
-    const {
-      // patchMFConfig,
-      metaName = import_constant2.META_NAME,
-      serverPlugin = "@module-federation/modern-js/data-loader-server",
-      transformRuntimeOptions
-    } = userConfig;
+    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 partialSSRRemotes = [];
@@ -103,12 +99,16 @@ const moduleFederationDataLoaderPlugin = (enable, internalOptions, userConfig) =
         plugins.push({
           name: "ssrDataLoader",
           path: "@module-federation/modern-js/data-loader",
-          config: {}
+          config: {
+            metaName
+          }
         });
         plugins.push({
           name: "ssrDataLoaderInjectAssets",
           path: "@module-federation/modern-js/data-loader-inject-assets",
-          config: {}
+          config: {
+            metaName
+          }
         });
         return {
           entrypoint,

package/dist/cjs/cli/ssrPlugin.js

@@ -53,6 +53,7 @@ const moduleFederationSSRPlugin = (userConfig) => ({
   setup: async ({ useConfigContext, useAppContext }) => {
     var _modernjsConfig_server;
     const modernjsConfig = useConfigContext();
+    const { metaName = import_constant.META_NAME } = userConfig;
     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 (!enableSSR) {
       return {};
@@ -69,7 +70,9 @@ const moduleFederationSSRPlugin = (userConfig) => ({
         plugins.push({
           name: "mfSSR",
           path: "@module-federation/modern-js/ssr-runtime",
-          config: {}
+          config: {
+            metaName
+          }
         });
         return {
           entrypoint,

package/dist/cjs/runtime/dataLoader/plugin-inject-assets.js

@@ -27,11 +27,11 @@ var import_runtime = require("@module-federation/enhanced/runtime");
 var import_createRemoteSSRComponent = require("../createRemoteSSRComponent");
 var import_runtime2 = require("@meta/runtime");
 var import_utils = require("./utils");
-const ssrDataLoaderInjectAssetsPlugin = () => {
+const ssrDataLoaderInjectAssetsPlugin = ({ metaName }) => {
   return {
     name: "@modern-js/plugin-mf-data-loader-inject-assets",
     pre: [
-      "@modern-js/plugin-router",
+      `@${metaName}/plugin-router`,
       "@modern-js/plugin-mf-data-loader"
     ],
     setup: () => {
@@ -41,6 +41,7 @@ const ssrDataLoaderInjectAssetsPlugin = () => {
             var _context_routerContext;
             const instance = (0, import_runtime.getInstance)();
             if (!instance || !instance.options.remotes.length) {
+              console.log("plugin-mf-data-loader-inject-assets no instance!");
               return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
                 children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
                   ...props
@@ -60,9 +61,11 @@ const ssrDataLoaderInjectAssetsPlugin = () => {
             const assets = [];
             remoteIds.forEach((remoteId) => {
               assets.push(...(0, import_createRemoteSSRComponent.collectSSRAssets)({
-                id: remoteId
+                id: remoteId,
+                injectScript: false
               }));
             });
+            console.log("plugin-mf-data-loader-inject-assets has assets: ", assets);
             return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
               children: [
                 assets,

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

@@ -24,15 +24,14 @@ module.exports = __toCommonJS(plugin_exports);
 var import_runtime = require("@module-federation/enhanced/runtime");
 var import_constant = require("../../constant");
 var import_utils = require("./utils");
-const ssrDataLoaderPlugin = () => {
+const ssrDataLoaderPlugin = ({ metaName }) => {
   return {
     name: "@modern-js/plugin-mf-data-loader",
     post: [
-      "@modern-js/plugin-router"
+      `@${metaName}/plugin-router`
     ],
     setup: () => {
       const remoteRoutesMap = {};
-      const pathRemoteMap = {};
       return {
         async beforeRender() {
           console.log("init");

package/dist/cjs/ssr-runtime/plugin.js

@@ -35,10 +35,10 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
 var import_SSRLiveReload = require("./SSRLiveReload");
 console.log("mfSSRPlugin trigger");
-const mfSSRPlugin = () => ({
+const mfSSRPlugin = ({ metaName }) => ({
   name: "@module-federation/modern-js",
   pre: [
-    "@modern-js/plugin-router"
+    `@${metaName}/plugin-router`
   ],
   setup: () => {
     return {

package/dist/esm/cli/configPlugin.js

@@ -22,6 +22,9 @@ function modifyBundlerConfig(options) {
 var moduleFederationConfigPlugin = function(userConfig) {
   return {
     name: "@modern-js/plugin-module-federation-config",
+    pre: [
+      "@modern-js/plugin-initialize"
+    ],
     post: [
       "@modern-js/plugin-module-federation"
     ],

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

@@ -37,7 +37,7 @@ var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userCon
     ],
     setup: function() {
       var _ref = _async_to_generator(function(param) {
-        var useAppContext, _userConfig_metaName, metaName, _userConfig_serverPlugin, serverPlugin, transformRuntimeOptions, appContext, name, internalDirectory, transformRuntimeFn, partialSSRRemotes, entries, remotePathMap, ssrByRouteIdsMap, serverPluginOptions, csrConfig, _ref2, scanEntries, scanRemotePathMap;
+        var useAppContext, _userConfig_serverPlugin, serverPlugin, transformRuntimeOptions, appContext, name, _internalOptions_metaName, metaName, internalDirectory, transformRuntimeFn, partialSSRRemotes, entries, remotePathMap, ssrByRouteIdsMap, serverPluginOptions, csrConfig, _ref2, scanEntries, scanRemotePathMap;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -47,9 +47,10 @@ var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userCon
                   2
                 ];
               }
-              _userConfig_metaName = userConfig.metaName, metaName = _userConfig_metaName === void 0 ? META_NAME : _userConfig_metaName, _userConfig_serverPlugin = userConfig.serverPlugin, serverPlugin = _userConfig_serverPlugin === void 0 ? "@module-federation/modern-js/data-loader-server" : _userConfig_serverPlugin, transformRuntimeOptions = userConfig.transformRuntimeOptions;
+              _userConfig_serverPlugin = userConfig.serverPlugin, serverPlugin = _userConfig_serverPlugin === void 0 ? "@module-federation/modern-js/data-loader-server" : _userConfig_serverPlugin, transformRuntimeOptions = userConfig.transformRuntimeOptions;
               appContext = useAppContext();
               name = internalOptions.csrConfig.name;
+              _internalOptions_metaName = internalOptions.metaName, metaName = _internalOptions_metaName === void 0 ? META_NAME : _internalOptions_metaName;
               internalDirectory = appContext.internalDirectory.replace(META_NAME, metaName || META_NAME);
               transformRuntimeFn = transformRuntimeOptions || _transformRuntimeOptions;
               partialSSRRemotes = [];
@@ -95,12 +96,16 @@ var moduleFederationDataLoaderPlugin = function(enable, internalOptions, userCon
                     plugins.push({
                       name: "ssrDataLoader",
                       path: "@module-federation/modern-js/data-loader",
-                      config: {}
+                      config: {
+                        metaName
+                      }
                     });
                     plugins.push({
                       name: "ssrDataLoaderInjectAssets",
                       path: "@module-federation/modern-js/data-loader-inject-assets",
-                      config: {}
+                      config: {
+                        metaName
+                      }
                     });
                     return {
                       entrypoint,

package/dist/esm/cli/ssrPlugin.js

@@ -6,7 +6,7 @@ import { ModuleFederationPlugin } from "@module-federation/enhanced/webpack";
 import { ModuleFederationPlugin as RspackModuleFederationPlugin } from "@module-federation/enhanced/rspack";
 import UniverseEntryChunkTrackerPlugin from "@module-federation/node/universe-entry-chunk-tracker-plugin";
 import { updateStatsAndManifest } from "./manifest";
-import { isDev } from "../constant";
+import { isDev, META_NAME } from "../constant";
 function setEnv() {
   process.env["MF_DISABLE_EMIT_STATS"] = "true";
   process.env["MF_SSR_PRJ"] = "true";
@@ -20,10 +20,11 @@ var moduleFederationSSRPlugin = function(userConfig) {
     ],
     setup: function() {
       var _ref = _async_to_generator(function(param) {
-        var useConfigContext, useAppContext, _modernjsConfig_server, modernjsConfig, enableSSR;
+        var useConfigContext, useAppContext, _modernjsConfig_server, modernjsConfig, _userConfig_metaName, metaName, enableSSR;
         return _ts_generator(this, function(_state) {
           useConfigContext = param.useConfigContext, useAppContext = param.useAppContext;
           modernjsConfig = useConfigContext();
+          _userConfig_metaName = userConfig.metaName, metaName = _userConfig_metaName === void 0 ? META_NAME : _userConfig_metaName;
           enableSSR = Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
           if (!enableSSR) {
             return [
@@ -46,7 +47,9 @@ var moduleFederationSSRPlugin = function(userConfig) {
                 plugins.push({
                   name: "mfSSR",
                   path: "@module-federation/modern-js/ssr-runtime",
-                  config: {}
+                  config: {
+                    metaName
+                  }
                 });
                 return {
                   entrypoint,

package/dist/esm/runtime/dataLoader/plugin-inject-assets.js

@@ -6,11 +6,12 @@ import { getInstance } from "@module-federation/enhanced/runtime";
 import { collectSSRAssets } from "../createRemoteSSRComponent";
 import { RuntimeReactContext } from "@meta/runtime";
 import { decodeId, getRemoteId } from "./utils";
-var ssrDataLoaderInjectAssetsPlugin = function() {
+var ssrDataLoaderInjectAssetsPlugin = function(param) {
+  var metaName = param.metaName;
   return {
     name: "@modern-js/plugin-mf-data-loader-inject-assets",
     pre: [
-      "@modern-js/plugin-router",
+      "@".concat(metaName, "/plugin-router"),
       "@modern-js/plugin-mf-data-loader"
     ],
     setup: function() {
@@ -20,6 +21,7 @@ var ssrDataLoaderInjectAssetsPlugin = function() {
             var _context_routerContext;
             var instance = getInstance();
             if (!instance || !instance.options.remotes.length) {
+              console.log("plugin-mf-data-loader-inject-assets no instance!");
               return /* @__PURE__ */ _jsx(_Fragment, {
                 children: /* @__PURE__ */ _jsx(App, _object_spread({}, props))
               });
@@ -42,9 +44,11 @@ var ssrDataLoaderInjectAssetsPlugin = function() {
             remoteIds.forEach(function(remoteId) {
               var _assets;
               (_assets = assets).push.apply(_assets, _to_consumable_array(collectSSRAssets({
-                id: remoteId
+                id: remoteId,
+                injectScript: false
               })));
             });
+            console.log("plugin-mf-data-loader-inject-assets has assets: ", assets);
             return /* @__PURE__ */ _jsxs(_Fragment, {
               children: [
                 assets,

package/dist/esm/runtime/dataLoader/plugin.js

@@ -3,15 +3,15 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { getInstance } from "@module-federation/enhanced/runtime";
 import { MF_ROUTES, DEFAULT_ENTRY } from "../../constant";
 import { injectRemoteRoutes } from "./utils";
-var ssrDataLoaderPlugin = function() {
+var ssrDataLoaderPlugin = function(param) {
+  var metaName = param.metaName;
   return {
     name: "@modern-js/plugin-mf-data-loader",
     post: [
-      "@modern-js/plugin-router"
+      "@".concat(metaName, "/plugin-router")
     ],
     setup: function() {
       var remoteRoutesMap = {};
-      var pathRemoteMap = {};
       return {
         beforeRender: function beforeRender() {
           return _async_to_generator(function() {

package/dist/esm/ssr-runtime/plugin.js

@@ -5,11 +5,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { SSRLiveReload } from "./SSRLiveReload";
 console.log("mfSSRPlugin trigger");
-var mfSSRPlugin = function() {
+var mfSSRPlugin = function(param) {
+  var metaName = param.metaName;
   return {
     name: "@module-federation/modern-js",
     pre: [
-      "@modern-js/plugin-router"
+      "@".concat(metaName, "/plugin-router")
     ],
     setup: function() {
       return {

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

@@ -19,6 +19,9 @@ function modifyBundlerConfig(options) {
 }
 const moduleFederationConfigPlugin = (userConfig) => ({
   name: "@modern-js/plugin-module-federation-config",
+  pre: [
+    "@modern-js/plugin-initialize"
+  ],
   post: [
     "@modern-js/plugin-module-federation"
   ],

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

@@ -34,14 +34,10 @@ const moduleFederationDataLoaderPlugin = (enable, internalOptions, userConfig) =
     if (!enable) {
       return;
     }
-    const {
-      // patchMFConfig,
-      metaName = META_NAME,
-      serverPlugin = "@module-federation/modern-js/data-loader-server",
-      transformRuntimeOptions
-    } = userConfig;
+    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 partialSSRRemotes = [];
@@ -68,12 +64,16 @@ const moduleFederationDataLoaderPlugin = (enable, internalOptions, userConfig) =
         plugins.push({
           name: "ssrDataLoader",
           path: "@module-federation/modern-js/data-loader",
-          config: {}
+          config: {
+            metaName
+          }
         });
         plugins.push({
           name: "ssrDataLoaderInjectAssets",
           path: "@module-federation/modern-js/data-loader-inject-assets",
-          config: {}
+          config: {
+            metaName
+          }
         });
         return {
           entrypoint,

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

@@ -4,7 +4,7 @@ import { ModuleFederationPlugin } from "@module-federation/enhanced/webpack";
 import { ModuleFederationPlugin as RspackModuleFederationPlugin } from "@module-federation/enhanced/rspack";
 import UniverseEntryChunkTrackerPlugin from "@module-federation/node/universe-entry-chunk-tracker-plugin";
 import { updateStatsAndManifest } from "./manifest";
-import { isDev } from "../constant";
+import { isDev, META_NAME } from "../constant";
 function setEnv() {
   process.env["MF_DISABLE_EMIT_STATS"] = "true";
   process.env["MF_SSR_PRJ"] = "true";
@@ -18,6 +18,7 @@ const moduleFederationSSRPlugin = (userConfig) => ({
   setup: async ({ useConfigContext, useAppContext }) => {
     var _modernjsConfig_server;
     const modernjsConfig = useConfigContext();
+    const { metaName = META_NAME } = userConfig;
     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 (!enableSSR) {
       return {};
@@ -34,7 +35,9 @@ const moduleFederationSSRPlugin = (userConfig) => ({
         plugins.push({
           name: "mfSSR",
           path: "@module-federation/modern-js/ssr-runtime",
-          config: {}
+          config: {
+            metaName
+          }
         });
         return {
           entrypoint,

package/dist/esm-node/runtime/dataLoader/plugin-inject-assets.js

@@ -4,11 +4,11 @@ import { getInstance } from "@module-federation/enhanced/runtime";
 import { collectSSRAssets } from "../createRemoteSSRComponent";
 import { RuntimeReactContext } from "@meta/runtime";
 import { decodeId, getRemoteId } from "./utils";
-const ssrDataLoaderInjectAssetsPlugin = () => {
+const ssrDataLoaderInjectAssetsPlugin = ({ metaName }) => {
   return {
     name: "@modern-js/plugin-mf-data-loader-inject-assets",
     pre: [
-      "@modern-js/plugin-router",
+      `@${metaName}/plugin-router`,
       "@modern-js/plugin-mf-data-loader"
     ],
     setup: () => {
@@ -18,6 +18,7 @@ const ssrDataLoaderInjectAssetsPlugin = () => {
             var _context_routerContext;
             const instance = getInstance();
             if (!instance || !instance.options.remotes.length) {
+              console.log("plugin-mf-data-loader-inject-assets no instance!");
               return /* @__PURE__ */ _jsx(_Fragment, {
                 children: /* @__PURE__ */ _jsx(App, {
                   ...props
@@ -37,9 +38,11 @@ const ssrDataLoaderInjectAssetsPlugin = () => {
             const assets = [];
             remoteIds.forEach((remoteId) => {
               assets.push(...collectSSRAssets({
-                id: remoteId
+                id: remoteId,
+                injectScript: false
               }));
             });
+            console.log("plugin-mf-data-loader-inject-assets has assets: ", assets);
             return /* @__PURE__ */ _jsxs(_Fragment, {
               children: [
                 assets,

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

@@ -1,15 +1,14 @@
 import { getInstance } from "@module-federation/enhanced/runtime";
 import { MF_ROUTES, DEFAULT_ENTRY } from "../../constant";
 import { injectRemoteRoutes } from "./utils";
-const ssrDataLoaderPlugin = () => {
+const ssrDataLoaderPlugin = ({ metaName }) => {
   return {
     name: "@modern-js/plugin-mf-data-loader",
     post: [
-      "@modern-js/plugin-router"
+      `@${metaName}/plugin-router`
     ],
     setup: () => {
       const remoteRoutesMap = {};
-      const pathRemoteMap = {};
       return {
         async beforeRender() {
           console.log("init");

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

@@ -2,10 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { SSRLiveReload } from "./SSRLiveReload";
 console.log("mfSSRPlugin trigger");
-const mfSSRPlugin = () => ({
+const mfSSRPlugin = ({ metaName }) => ({
   name: "@module-federation/modern-js",
   pre: [
-    "@modern-js/plugin-router"
+    `@${metaName}/plugin-router`
   ],
   setup: () => {
     return {

package/dist/types/runtime/dataLoader/plugin-inject-assets.d.ts

@@ -1,2 +1,4 @@
 import type { Plugin } from '@modern-js/runtime';
-export declare const ssrDataLoaderInjectAssetsPlugin: () => Plugin;
+export declare const ssrDataLoaderInjectAssetsPlugin: ({ metaName, }: {
+    metaName: string;
+}) => Plugin;

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

@@ -1,2 +1,4 @@
 import type { Plugin } from '@modern-js/runtime';
-export declare const ssrDataLoaderPlugin: () => Plugin;
+export declare const ssrDataLoaderPlugin: ({ metaName, }: {
+    metaName: string;
+}) => Plugin;

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

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

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

@@ -9,6 +9,7 @@ export interface PluginOptions {
     dataLoader?: boolean | DataLoaderOptions;
 }
 export interface InternalModernPluginOptions {
+    metaName?: string;
     csrConfig?: moduleFederationPlugin.ModuleFederationPluginOptions;
     ssrConfig?: moduleFederationPlugin.ModuleFederationPluginOptions;
     distOutputDir: string;
@@ -21,7 +22,6 @@ export type BundlerPlugin = WebpackModuleFederationPlugin | RspackModuleFederati
 export type TransformRuntimeOptions = (mfConfig: moduleFederationPlugin.ModuleFederationPluginOptions) => Parameters<typeof init>[0];
 export type DataLoaderOptions = {
     partialSSRRemotes?: string[];
-    metaName?: string;
     serverPlugin?: string;
     transformRuntimeOptions?: TransformRuntimeOptions;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20240912023912",
+  "version": "0.0.0-next-20240912070754",
   "files": [
     "dist/",
     "types.d.ts",
@@ -94,9 +94,9 @@
     "@babel/parser": "7.25.3",
     "@babel/traverse": "7.25.3",
     "@babel/types": "7.25.2",
-    "@module-federation/sdk": "0.0.0-next-20240912023912",
-    "@module-federation/enhanced": "0.0.0-next-20240912023912",
-    "@module-federation/node": "0.0.0-next-20240912023912"
+    "@module-federation/sdk": "0.0.0-next-20240912070754",
+    "@module-federation/enhanced": "0.0.0-next-20240912070754",
+    "@module-federation/node": "0.0.0-next-20240912070754"
   },
   "devDependencies": {
     "@types/babel__traverse": "7.20.6",
@@ -108,7 +108,7 @@
     "@modern-js/runtime": "^2.59.0",
     "@modern-js/module-tools": "^2.59.0",
     "@modern-js/tsconfig": "^2.59.0",
-    "@module-federation/manifest": "0.0.0-next-20240912023912"
+    "@module-federation/manifest": "0.0.0-next-20240912070754"
   },
   "peerDependencies": {
     "@modern-js/runtime": "^2.59.0",