@modern-js/plugin-garfish 2.56.3-alpha.0 → 2.57.1

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/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-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/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/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.3-alpha.0",
+  "version": "2.57.1",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -69,11 +69,12 @@
     "garfish": "^1.8.1",
     "react-loadable": "^5.5.0",
     "@swc/helpers": "0.5.3",
-    "@modern-js/plugin": "2.56.2",
-    "@modern-js/utils": "2.56.2"
+    "@modern-js/runtime-utils": "2.57.1",
+    "@modern-js/plugin": "2.57.1",
+    "@modern-js/utils": "2.57.1"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.56.2",
+    "@modern-js/runtime": "^2.57.1",
     "react": ">=17",
     "react-dom": ">=17"
   },
@@ -92,18 +93,19 @@
     "react-dom": "^18",
     "react-router-dom": "6.22.0",
     "typescript": "^5",
-    "@modern-js/types": "2.56.2",
-    "@modern-js/app-tools": "2.56.2",
-    "@modern-js/core": "2.56.2",
-    "@modern-js/plugin-router-v5": "2.56.3-alpha.0",
-    "@modern-js/runtime": "2.56.3-alpha.0",
-    "@scripts/build": "2.56.2",
-    "@scripts/jest-config": "2.56.2"
+    "@modern-js/app-tools": "2.57.1",
+    "@modern-js/runtime": "2.57.1",
+    "@modern-js/core": "2.57.1",
+    "@modern-js/plugin-router-v5": "2.57.1",
+    "@modern-js/types": "2.57.1",
+    "@scripts/build": "2.57.1",
+    "@scripts/jest-config": "2.57.1"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "new": "modern-lib new",