@modern-js/plugin-garfish 2.56.2 → 2.57.0

package/dist/cjs/cli/index.js

@@ -122,10 +122,7 @@ const garfishPlugin = () => ({
           },
           source: {
             alias: {
-              [`@${metaName}/runtime/garfish`]: `@${metaName}/plugin-garfish/runtime`,
-              "@meta/runtime/browser": "@modern-js/runtime/browser",
-              "@meta/runtime/react": "@modern-js/runtime/react",
-              "@meta/runtime": "@modern-js/runtime"
+              [`@${metaName}/runtime/garfish`]: `@${metaName}/plugin-garfish/runtime`
             }
           },
           tools: {

package/dist/cjs/cli/template.js

@@ -25,7 +25,7 @@ var import_utils = require("@modern-js/utils");
 const genRenderCode = ({ srcDirectory, internalSrcAlias, metaName, entry, customEntry, customBootstrap, mountId }) => customEntry ? `import '${entry.replace(srcDirectory, internalSrcAlias)}'
 export * from '${entry.replace(srcDirectory, internalSrcAlias)}'` : `import { createRoot } from '@${metaName}/runtime/react';
 import { render } from '@${metaName}/runtime/browser';
-import { isRenderGarfish, createProvider } from '@${metaName}/plugin-garfish/runtime';
+import { isRenderGarfish, createProvider } from '@${metaName}/plugin-garfish/tools';
 ${customBootstrap ? `import customBootstrap from '${(0, import_utils.formatImportPath)(customBootstrap.replace(srcDirectory, internalSrcAlias))}';` : "let customBootstrap;"}
 if (!isRenderGarfish()) {
   const ModernRoot = createRoot();

package/dist/cjs/runtime/index.js

@@ -29,11 +29,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var runtime_exports = {};
 __export(runtime_exports, {
   Garfish: () => import_garfish.default,
-  createProvider: () => import_provider.createProvider,
   default: () => import_plugin.default,
   garfish: () => import_garfish.default,
   garfishPlugin: () => import_plugin.garfishPlugin,
-  isRenderGarfish: () => import_utils.isRenderGarfish,
   useModuleApp: () => import_useModuleApps.useModuleApp,
   useModuleApps: () => import_useModuleApps.useModuleApps
 });
@@ -41,15 +39,11 @@ module.exports = __toCommonJS(runtime_exports);
 var import_plugin = __toESM(require("./plugin"));
 var import_useModuleApps = require("./useModuleApps");
 var import_garfish = __toESM(require("garfish"));
-var import_utils = require("./utils");
-var import_provider = require("./provider");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Garfish,
-  createProvider,
   garfish,
   garfishPlugin,
-  isRenderGarfish,
   useModuleApp,
   useModuleApps
 });

package/dist/cjs/runtime/plugin.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_garfish = __toESM(require("garfish"));
 var import_react = __toESM(require("react"));
+var import_merge = require("@modern-js/runtime-utils/merge");
 var import_util = require("../util");
 var import_Context = require("./utils/Context");
 var import_setExternal = __toESM(require("./utils/setExternal"));
@@ -66,15 +67,17 @@ async function initOptions(manifest = {}, options) {
     apps
   };
 }
-const garfishPlugin = (config) => ({
+const garfishPlugin = (userConfig = {}) => ({
   name: "@modern-js/garfish-plugin",
-  setup: () => {
+  setup: (api) => {
     (0, import_setExternal.default)();
-    const { manifest, ...options } = config;
-    (0, import_util.logger)("createPlugin", config);
-    const promise = initOptions(manifest, options);
     return {
-      hoc({ App, config: config2 }, next) {
+      wrapRoot(App) {
+        const pluginConfig = api.useRuntimeConfigContext();
+        const config = (0, import_merge.merge)(pluginConfig.garfish || {}, userConfig);
+        const { manifest, ...options } = config;
+        (0, import_util.logger)("createPlugin", config);
+        const promise = initOptions(manifest, options);
         class GetMicroFrontendApp extends import_react.default.Component {
           render() {
             (0, import_util.logger)("GarfishProvider state", this.state);
@@ -130,10 +133,7 @@ const garfishPlugin = (config) => ({
             load();
           }
         }
-        return next({
-          App: GetMicroFrontendApp,
-          config: config2
-        });
+        return GetMicroFrontendApp;
       }
     };
   }

package/dist/cjs/runtime/provider.js

@@ -30,11 +30,7 @@ function createProvider(id, { customBootstrap, beforeRender } = {}) {
     let root = null;
     return {
       async render({ basename: basename2, dom: dom2, props }) {
-        const ModernRoot = (0, import_react.createRoot)(null, {
-          router: {
-            basename: basename2
-          }
-        });
+        const ModernRoot = (0, import_react.createRoot)(null);
         if (customBootstrap) {
           root = await customBootstrap(ModernRoot, () => (0, import_browser.render)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModernRoot, {
             basename: basename2,
@@ -65,22 +61,14 @@ function createProvider(id, { customBootstrap, beforeRender } = {}) {
       },
       // 兼容旧版本
       SubModuleComponent: (props) => {
-        const ModernRoot = (0, import_react.createRoot)(null, {
-          router: {
-            basename
-          }
-        });
+        const ModernRoot = (0, import_react.createRoot)(null);
         return /* @__PURE__ */ (0, import_react_dom.createPortal)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModernRoot, {
           basename,
           ...props
         }), dom.querySelector(`#${id || "root"}`) || dom);
       },
       jupiter_submodule_app_key: (props) => {
-        const ModernRoot = (0, import_react.createRoot)(null, {
-          router: {
-            basename
-          }
-        });
+        const ModernRoot = (0, import_react.createRoot)(null);
         return /* @__PURE__ */ (0, import_react_dom.createPortal)(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModernRoot, {
           basename,
           ...props

package/dist/cjs/runtime/tools.js

@@ -0,0 +1,31 @@
+"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 tools_exports = {};
+__export(tools_exports, {
+  createProvider: () => import_provider.createProvider,
+  isRenderGarfish: () => import_utils.isRenderGarfish
+});
+module.exports = __toCommonJS(tools_exports);
+var import_utils = require("./utils");
+var import_provider = require("./provider");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createProvider,
+  isRenderGarfish
+});

package/dist/esm/cli/index.js

@@ -102,13 +102,12 @@ var garfishPlugin = function() {
               disableCssExtract = true;
             }
           }
-          var _obj;
           return {
             output: {
               disableCssExtract
             },
             source: {
-              alias: (_obj = {}, _define_property(_obj, "@".concat(metaName, "/runtime/garfish"), "@".concat(metaName, "/plugin-garfish/runtime")), _define_property(_obj, "@meta/runtime/browser", "@modern-js/runtime/browser"), _define_property(_obj, "@meta/runtime/react", "@modern-js/runtime/react"), _define_property(_obj, "@meta/runtime", "@modern-js/runtime"), _obj)
+              alias: _define_property({}, "@".concat(metaName, "/runtime/garfish"), "@".concat(metaName, "/plugin-garfish/runtime"))
             },
             tools: {
               devServer: {

package/dist/esm/cli/template.js

@@ -1,7 +1,7 @@
 import { formatImportPath } from "@modern-js/utils";
 var genRenderCode = function(param) {
   var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry, customBootstrap = param.customBootstrap, mountId = param.mountId;
-  return customEntry ? "import '".concat(entry.replace(srcDirectory, internalSrcAlias), "'\nexport * from '").concat(entry.replace(srcDirectory, internalSrcAlias), "'") : "import { createRoot } from '@".concat(metaName, "/runtime/react';\nimport { render } from '@").concat(metaName, "/runtime/browser';\nimport { isRenderGarfish, createProvider } from '@").concat(metaName, "/plugin-garfish/runtime';\n").concat(customBootstrap ? "import customBootstrap from '".concat(formatImportPath(customBootstrap.replace(srcDirectory, internalSrcAlias)), "';") : "let customBootstrap;", "\nif (!isRenderGarfish()) {\n  const ModernRoot = createRoot();\n  ").concat(customBootstrap ? "customBootstrap(ModernRoot, () => render(<ModernRoot />, '".concat(mountId || "root", "'));") : "render(<ModernRoot />, '".concat(mountId || "root", "');"), ";\n}\n\nexport const provider = createProvider('").concat(mountId || "root", "', { customBootstrap });\n");
+  return customEntry ? "import '".concat(entry.replace(srcDirectory, internalSrcAlias), "'\nexport * from '").concat(entry.replace(srcDirectory, internalSrcAlias), "'") : "import { createRoot } from '@".concat(metaName, "/runtime/react';\nimport { render } from '@").concat(metaName, "/runtime/browser';\nimport { isRenderGarfish, createProvider } from '@").concat(metaName, "/plugin-garfish/tools';\n").concat(customBootstrap ? "import customBootstrap from '".concat(formatImportPath(customBootstrap.replace(srcDirectory, internalSrcAlias)), "';") : "let customBootstrap;", "\nif (!isRenderGarfish()) {\n  const ModernRoot = createRoot();\n  ").concat(customBootstrap ? "customBootstrap(ModernRoot, () => render(<ModernRoot />, '".concat(mountId || "root", "'));") : "render(<ModernRoot />, '".concat(mountId || "root", "');"), ";\n}\n\nexport const provider = createProvider('").concat(mountId || "root", "', { customBootstrap });\n");
 };
 var index = function(param) {
   var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, entryName = param.entryName, customEntry = param.customEntry, customBootstrap = param.customBootstrap, mountId = param.mountId, _param_appendCode = param.appendCode, appendCode = _param_appendCode === void 0 ? [] : _param_appendCode;

package/dist/esm/runtime/index.js

@@ -1,15 +1,11 @@
 import { default as default2, garfishPlugin } from "./plugin";
 import { useModuleApps, useModuleApp } from "./useModuleApps";
 import { default as default3, default as default4 } from "garfish";
-import { isRenderGarfish } from "./utils";
-import { createProvider } from "./provider";
 export {
   default3 as Garfish,
-  createProvider,
   default2 as default,
   default4 as garfish,
   garfishPlugin,
-  isRenderGarfish,
   useModuleApp,
   useModuleApps
 };

package/dist/esm/runtime/plugin.js

@@ -11,6 +11,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx } from "react/jsx-runtime";
 import GarfishInstance from "garfish";
 import React from "react";
+import { merge } from "@modern-js/runtime-utils/merge";
 import { logger } from "../util";
 import { GarfishProvider } from "./utils/Context";
 import setExternal from "./utils/setExternal";
@@ -67,19 +68,21 @@ function _initOptions() {
   });
   return _initOptions.apply(this, arguments);
 }
-var garfishPlugin = function(config) {
+var garfishPlugin = function() {
+  var userConfig = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   return {
     name: "@modern-js/garfish-plugin",
-    setup: function() {
+    setup: function(api) {
       setExternal();
-      var manifest = config.manifest, options = _object_without_properties(config, [
-        "manifest"
-      ]);
-      logger("createPlugin", config);
-      var promise = initOptions(manifest, options);
       return {
-        hoc: function hoc(param, next) {
-          var App = param.App, _$config = param.config;
+        wrapRoot: function wrapRoot(App) {
+          var pluginConfig = api.useRuntimeConfigContext();
+          var config = merge(pluginConfig.garfish || {}, userConfig);
+          var manifest = config.manifest, options = _object_without_properties(config, [
+            "manifest"
+          ]);
+          logger("createPlugin", config);
+          var promise = initOptions(manifest, options);
           var GetMicroFrontendApp = /* @__PURE__ */ function(_React_Component) {
             "use strict";
             _inherits(GetMicroFrontendApp2, _React_Component);
@@ -161,10 +164,7 @@ var garfishPlugin = function(config) {
             };
             return GetMicroFrontendApp2;
           }(React.Component);
-          return next({
-            App: GetMicroFrontendApp,
-            config: _$config
-          });
+          return GetMicroFrontendApp;
         }
       };
     }

package/dist/esm/runtime/provider.js

@@ -18,11 +18,7 @@ function createProvider(id) {
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
-                ModernRoot = createRoot(null, {
-                  router: {
-                    basename: basename2
-                  }
-                });
+                ModernRoot = createRoot(null);
                 if (!customBootstrap)
                   return [
                     3,
@@ -88,21 +84,13 @@ function createProvider(id) {
       },
       // 兼容旧版本
       SubModuleComponent: function(props) {
-        var ModernRoot = createRoot(null, {
-          router: {
-            basename
-          }
-        });
+        var ModernRoot = createRoot(null);
         return /* @__PURE__ */ createPortal(/* @__PURE__ */ _jsx(ModernRoot, _object_spread({
           basename
         }, props)), dom.querySelector("#".concat(id || "root")) || dom);
       },
       jupiter_submodule_app_key: function(props) {
-        var ModernRoot = createRoot(null, {
-          router: {
-            basename
-          }
-        });
+        var ModernRoot = createRoot(null);
         return /* @__PURE__ */ createPortal(/* @__PURE__ */ _jsx(ModernRoot, _object_spread({
           basename
         }, props)), dom.querySelector("#".concat(id || "root")) || dom);

package/dist/esm/runtime/tools.js

@@ -0,0 +1,6 @@
+import { isRenderGarfish } from "./utils";
+import { createProvider } from "./provider";
+export {
+  createProvider,
+  isRenderGarfish
+};

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

@@ -96,10 +96,7 @@ const garfishPlugin = () => ({
           },
           source: {
             alias: {
-              [`@${metaName}/runtime/garfish`]: `@${metaName}/plugin-garfish/runtime`,
-              "@meta/runtime/browser": "@modern-js/runtime/browser",
-              "@meta/runtime/react": "@modern-js/runtime/react",
-              "@meta/runtime": "@modern-js/runtime"
+              [`@${metaName}/runtime/garfish`]: `@${metaName}/plugin-garfish/runtime`
             }
           },
           tools: {

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

@@ -2,7 +2,7 @@ import { formatImportPath } from "@modern-js/utils";
 const genRenderCode = ({ srcDirectory, internalSrcAlias, metaName, entry, customEntry, customBootstrap, mountId }) => customEntry ? `import '${entry.replace(srcDirectory, internalSrcAlias)}'
 export * from '${entry.replace(srcDirectory, internalSrcAlias)}'` : `import { createRoot } from '@${metaName}/runtime/react';
 import { render } from '@${metaName}/runtime/browser';
-import { isRenderGarfish, createProvider } from '@${metaName}/plugin-garfish/runtime';
+import { isRenderGarfish, createProvider } from '@${metaName}/plugin-garfish/tools';
 ${customBootstrap ? `import customBootstrap from '${formatImportPath(customBootstrap.replace(srcDirectory, internalSrcAlias))}';` : "let customBootstrap;"}
 if (!isRenderGarfish()) {
   const ModernRoot = createRoot();

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

@@ -1,15 +1,11 @@
 import { default as default2, garfishPlugin } from "./plugin";
 import { useModuleApps, useModuleApp } from "./useModuleApps";
 import { default as default3, default as default4 } from "garfish";
-import { isRenderGarfish } from "./utils";
-import { createProvider } from "./provider";
 export {
   default3 as Garfish,
-  createProvider,
   default2 as default,
   default4 as garfish,
   garfishPlugin,
-  isRenderGarfish,
   useModuleApp,
   useModuleApps
 };

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

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import GarfishInstance from "garfish";
 import React from "react";
+import { merge } from "@modern-js/runtime-utils/merge";
 import { logger } from "../util";
 import { GarfishProvider } from "./utils/Context";
 import setExternal from "./utils/setExternal";
@@ -32,15 +33,17 @@ async function initOptions(manifest = {}, options) {
     apps
   };
 }
-const garfishPlugin = (config) => ({
+const garfishPlugin = (userConfig = {}) => ({
   name: "@modern-js/garfish-plugin",
-  setup: () => {
+  setup: (api) => {
     setExternal();
-    const { manifest, ...options } = config;
-    logger("createPlugin", config);
-    const promise = initOptions(manifest, options);
     return {
-      hoc({ App, config: config2 }, next) {
+      wrapRoot(App) {
+        const pluginConfig = api.useRuntimeConfigContext();
+        const config = merge(pluginConfig.garfish || {}, userConfig);
+        const { manifest, ...options } = config;
+        logger("createPlugin", config);
+        const promise = initOptions(manifest, options);
         class GetMicroFrontendApp extends React.Component {
           render() {
             logger("GarfishProvider state", this.state);
@@ -96,10 +99,7 @@ const garfishPlugin = (config) => ({
             load();
           }
         }
-        return next({
-          App: GetMicroFrontendApp,
-          config: config2
-        });
+        return GetMicroFrontendApp;
       }
     };
   }

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

@@ -7,11 +7,7 @@ function createProvider(id, { customBootstrap, beforeRender } = {}) {
     let root = null;
     return {
       async render({ basename: basename2, dom: dom2, props }) {
-        const ModernRoot = createRoot(null, {
-          router: {
-            basename: basename2
-          }
-        });
+        const ModernRoot = createRoot(null);
         if (customBootstrap) {
           root = await customBootstrap(ModernRoot, () => render(/* @__PURE__ */ _jsx(ModernRoot, {
             basename: basename2,
@@ -42,22 +38,14 @@ function createProvider(id, { customBootstrap, beforeRender } = {}) {
       },
       // 兼容旧版本
       SubModuleComponent: (props) => {
-        const ModernRoot = createRoot(null, {
-          router: {
-            basename
-          }
-        });
+        const ModernRoot = createRoot(null);
         return /* @__PURE__ */ createPortal(/* @__PURE__ */ _jsx(ModernRoot, {
           basename,
           ...props
         }), dom.querySelector(`#${id || "root"}`) || dom);
       },
       jupiter_submodule_app_key: (props) => {
-        const ModernRoot = createRoot(null, {
-          router: {
-            basename
-          }
-        });
+        const ModernRoot = createRoot(null);
         return /* @__PURE__ */ createPortal(/* @__PURE__ */ _jsx(ModernRoot, {
           basename,
           ...props

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

@@ -0,0 +1,6 @@
+import { isRenderGarfish } from "./utils";
+import { createProvider } from "./provider";
+export {
+  createProvider,
+  isRenderGarfish
+};

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

@@ -2,5 +2,3 @@ export { default, garfishPlugin } from './plugin';
 export { useModuleApps, useModuleApp } from './useModuleApps';
 export type { Manifest, ModuleInfo, Config } from './useModuleApps';
 export { default as Garfish, default as garfish } from 'garfish';
-export { isRenderGarfish } from './utils';
-export { createProvider } from './provider';

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

@@ -1,4 +1,4 @@
 import type { Plugin } from '@modern-js/runtime';
 import { Config } from './useModuleApps';
-export declare const garfishPlugin: (config: Config) => Plugin;
+export declare const garfishPlugin: (userConfig?: Config) => Plugin;
 export default garfishPlugin;

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

@@ -0,0 +1,2 @@
+export { isRenderGarfish } from './utils';
+export { createProvider } from './provider';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.2",
+  "version": "2.57.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -29,6 +29,9 @@
       "runtime": [
         "./dist/types/runtime/index.d.ts"
       ],
+      "tools": [
+        "./dist/types/runtime/tools.d.ts"
+      ],
       "types": [
         "./type.d.ts"
       ]
@@ -52,6 +55,11 @@
       "types": "./dist/types/runtime/index.d.ts",
       "jsnext:source": "./src/runtime/index.ts",
       "default": "./dist/esm/runtime/index.js"
+    },
+    "./tools": {
+      "types": "./dist/types/runtime/tools.d.ts",
+      "jsnext:source": "./src/runtime/tools.ts",
+      "default": "./dist/esm/runtime/tools.js"
     }
   },
   "dependencies": {
@@ -61,11 +69,12 @@
     "garfish": "^1.8.1",
     "react-loadable": "^5.5.0",
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.56.2",
-    "@modern-js/plugin": "2.56.2"
+    "@modern-js/utils": "2.57.0",
+    "@modern-js/plugin": "2.57.0",
+    "@modern-js/runtime-utils": "2.57.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.56.2",
+    "@modern-js/runtime": "^2.57.0",
     "react": ">=17",
     "react-dom": ">=17"
   },
@@ -84,13 +93,13 @@
     "react-dom": "^18",
     "react-router-dom": "6.22.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.56.2",
-    "@modern-js/plugin-router-v5": "2.56.2",
-    "@modern-js/core": "2.56.2",
-    "@modern-js/runtime": "2.56.2",
-    "@modern-js/types": "2.56.2",
-    "@scripts/build": "2.56.2",
-    "@scripts/jest-config": "2.56.2"
+    "@modern-js/app-tools": "2.57.0",
+    "@modern-js/runtime": "2.57.0",
+    "@modern-js/plugin-router-v5": "2.57.0",
+    "@modern-js/core": "2.57.0",
+    "@modern-js/types": "2.57.0",
+    "@scripts/build": "2.57.0",
+    "@scripts/jest-config": "2.57.0"
   },
   "sideEffects": false,
   "publishConfig": {