@modern-js/plugin-garfish 2.59.0 → 2.60.0

package/dist/cjs/cli/template.js

@@ -22,8 +22,8 @@ __export(template_exports, {
 });
 module.exports = __toCommonJS(template_exports);
 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';
+const genRenderCode = ({ srcDirectory, internalSrcAlias, metaName, entry, customEntry, customBootstrap, mountId }) => customEntry ? `import '${(0, import_utils.formatImportPath)(entry.replace(srcDirectory, internalSrcAlias))}'
+export * from '${(0, import_utils.formatImportPath)(entry.replace(srcDirectory, internalSrcAlias))}'` : `import { createRoot } from '@${metaName}/runtime/react';
 import { render } from '@${metaName}/runtime/browser';
 import { isRenderGarfish, createProvider } from '@${metaName}/plugin-garfish/tools';
 ${customBootstrap ? `import customBootstrap from '${(0, import_utils.formatImportPath)(customBootstrap.replace(srcDirectory, internalSrcAlias))}';` : "let customBootstrap;"}

package/dist/cjs/runtime/plugin.js

@@ -89,8 +89,7 @@ const garfishPlugin = (userConfig = {}) => ({
             });
           }
           constructor(props) {
-            super(props);
-            this.state = {
+            super(props), this.state = {
               MApp: () => {
                 (0, import_util.logger)("MApp init Component Render");
                 return /* @__PURE__ */ import_react.default.createElement("div");

package/dist/cjs/runtime/utils/MApp.js

@@ -164,8 +164,7 @@ function generateMApp(options, manifest) {
       });
     }
     constructor(...args) {
-      super(...args);
-      this.state = {
+      super(...args), this.state = {
         domId: (0, import_util.generateSubAppContainerKey)()
       };
     }

package/dist/esm/cli/index.js

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createAsyncWorkflow } from "@modern-js/plugin";
 import { createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
@@ -69,7 +70,7 @@ var garfishPlugin = function() {
                 if (Array.isArray(baseUrl)) {
                   throw new Error("Now Micro-Front-End mode dose not support multiple baseUrl, you can set it as a string");
                 }
-                setRuntimeConfig(nConfig.resolved, "masterApp", Object.assign(typeof masterApp === "object" ? _object_spread({}, masterApp) : {}, {
+                setRuntimeConfig(nConfig.resolved, "masterApp", Object.assign((typeof masterApp === "undefined" ? "undefined" : _type_of(masterApp)) === "object" ? _object_spread({}, masterApp) : {}, {
                   basename: baseUrl || (router === null || router === void 0 ? void 0 : (_router_historyOptions = router.historyOptions) === null || _router_historyOptions === void 0 ? void 0 : _router_historyOptions.basename) || (router === null || router === void 0 ? void 0 : router.basename) || "/"
                 }));
               }

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/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");
+  return customEntry ? "import '".concat(formatImportPath(entry.replace(srcDirectory, internalSrcAlias)), "'\nexport * from '").concat(formatImportPath(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/plugin.js

@@ -1,12 +1,11 @@
-import { _ as _assert_this_initialized } from "@swc/helpers/_/_assert_this_initialized";
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _call_super } from "@swc/helpers/_/_call_super";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _inherits } from "@swc/helpers/_/_inherits";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _create_super } from "@swc/helpers/_/_create_super";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
@@ -86,12 +85,13 @@ var garfishPlugin = function() {
           var GetMicroFrontendApp = /* @__PURE__ */ function(_React_Component) {
             "use strict";
             _inherits(GetMicroFrontendApp2, _React_Component);
-            var _super = _create_super(GetMicroFrontendApp2);
             function GetMicroFrontendApp2(props) {
               _class_call_check(this, GetMicroFrontendApp2);
               var _this;
-              _this = _super.call(this, props);
-              _this.state = {
+              var _this1;
+              _this = _call_super(this, GetMicroFrontendApp2, [
+                props
+              ]), _this1 = _this, _this.state = {
                 MApp: function() {
                   logger("MApp init Component Render");
                   return /* @__PURE__ */ React.createElement("div");
@@ -105,7 +105,6 @@ var garfishPlugin = function() {
                 }),
                 appInfoList: []
               };
-              var _this1 = _assert_this_initialized(_this);
               var load = function() {
                 var _ref = _async_to_generator(function() {
                   var GarfishConfig, _generateApps, appInfoList, apps, MApp;

package/dist/esm/runtime/utils/MApp.js

@@ -1,9 +1,9 @@
+import { _ as _call_super } from "@swc/helpers/_/_call_super";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _inherits } from "@swc/helpers/_/_inherits";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _create_super } from "@swc/helpers/_/_create_super";
 import { jsx as _jsx } from "react/jsx-runtime";
 import Garfish from "garfish";
 import React from "react";
@@ -13,12 +13,10 @@ function generateMApp(options, manifest) {
   var MApp = /* @__PURE__ */ function(_React_Component) {
     "use strict";
     _inherits(MApp2, _React_Component);
-    var _super = _create_super(MApp2);
     function MApp2() {
       _class_call_check(this, MApp2);
       var _this;
-      _this = _super.apply(this, arguments);
-      _this.state = {
+      _this = _call_super(this, MApp2, arguments), _this.state = {
         domId: generateSubAppContainerKey()
       };
       return _this;

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

@@ -1,6 +1,6 @@
 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';
+const genRenderCode = ({ srcDirectory, internalSrcAlias, metaName, entry, customEntry, customBootstrap, mountId }) => customEntry ? `import '${formatImportPath(entry.replace(srcDirectory, internalSrcAlias))}'
+export * from '${formatImportPath(entry.replace(srcDirectory, internalSrcAlias))}'` : `import { createRoot } from '@${metaName}/runtime/react';
 import { render } from '@${metaName}/runtime/browser';
 import { isRenderGarfish, createProvider } from '@${metaName}/plugin-garfish/tools';
 ${customBootstrap ? `import customBootstrap from '${formatImportPath(customBootstrap.replace(srcDirectory, internalSrcAlias))}';` : "let customBootstrap;"}

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

@@ -55,8 +55,7 @@ const garfishPlugin = (userConfig = {}) => ({
             });
           }
           constructor(props) {
-            super(props);
-            this.state = {
+            super(props), this.state = {
               MApp: () => {
                 logger("MApp init Component Render");
                 return /* @__PURE__ */ React.createElement("div");

package/dist/esm-node/runtime/utils/MApp.js

@@ -131,8 +131,7 @@ function generateMApp(options, manifest) {
       });
     }
     constructor(...args) {
-      super(...args);
-      this.state = {
+      super(...args), this.state = {
         domId: generateSubAppContainerKey()
       };
     }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.59.0",
+  "version": "2.60.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -63,18 +63,18 @@
     }
   },
   "dependencies": {
-    "@swc/helpers": "0.5.3",
+    "@swc/helpers": "0.5.13",
     "@types/debug": "4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "4.3.4",
     "garfish": "^1.8.1",
     "react-loadable": "^5.5.0",
-    "@modern-js/plugin": "2.59.0",
-    "@modern-js/runtime-utils": "2.59.0",
-    "@modern-js/utils": "2.59.0"
+    "@modern-js/plugin": "2.60.0",
+    "@modern-js/runtime-utils": "2.60.0",
+    "@modern-js/utils": "2.60.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.59.0",
+    "@modern-js/runtime": "^2.60.0",
     "react": ">=17",
     "react-dom": ">=17"
   },
@@ -93,13 +93,13 @@
     "react-dom": "^18",
     "react-router-dom": "6.22.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.59.0",
-    "@modern-js/core": "2.59.0",
-    "@modern-js/plugin-router-v5": "2.59.0",
-    "@modern-js/types": "2.59.0",
-    "@modern-js/runtime": "2.59.0",
-    "@scripts/build": "2.59.0",
-    "@scripts/jest-config": "2.59.0"
+    "@modern-js/app-tools": "2.60.0",
+    "@modern-js/runtime": "2.60.0",
+    "@modern-js/core": "2.60.0",
+    "@modern-js/plugin-router-v5": "2.60.0",
+    "@modern-js/types": "2.60.0",
+    "@scripts/build": "2.60.0",
+    "@scripts/jest-config": "2.60.0"
   },
   "sideEffects": false,
   "publishConfig": {