@modern-js/plugin-garfish 2.19.1 → 2.20.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/plugin-garfish
 
+## 2.20.0
+
+### Patch Changes
+
+- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config.
+  chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置
+- Updated dependencies [3c4e0a5]
+- Updated dependencies [6b9d90a]
+  - @modern-js/utils@2.20.0
+  - @modern-js/runtime@2.20.0
+
 ## 2.19.1
 
 ### Patch Changes

package/dist/cjs/deps/index.js

@@ -6,9 +6,5 @@ Object.defineProperty(exports, "hoistNonReactStatics", {
   enumerable: true,
   get: () => _hoistnonreactstatics.default
 });
-const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));

package/dist/cjs/index.js

@@ -6,22 +6,6 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _runtime.default
 });
-const _runtime = /* @__PURE__ */ _interop_require_default(_export_star(require("./runtime"), exports));
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _runtime = /* @__PURE__ */ _interop_require_default._(_export_star._(require("./runtime"), exports));

package/dist/cjs/runtime/index.js

@@ -16,11 +16,7 @@ _export(exports, {
   Garfish: () => _garfish.default,
   garfish: () => _garfish.default
 });
-const _plugin = /* @__PURE__ */ _interop_require_default(require("./plugin"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _plugin = /* @__PURE__ */ _interop_require_default._(require("./plugin"));
 const _useModuleApps = require("./useModuleApps");
-const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _garfish = /* @__PURE__ */ _interop_require_default._(require("garfish"));

package/dist/cjs/runtime/plugin.js

@@ -11,33 +11,17 @@ Object.defineProperty(
     get: () => _default
   }
 );
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");
-const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
-const _react = /* @__PURE__ */ _interop_require_default(require("react"));
-const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
+const _garfish = /* @__PURE__ */ _interop_require_default._(require("garfish"));
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default._(require("hoist-non-react-statics"));
 const _util = require("../util");
 const _Context = require("./utils/Context");
-const _setExternal = /* @__PURE__ */ _interop_require_default(require("./utils/setExternal"));
+const _setExternal = /* @__PURE__ */ _interop_require_default._(require("./utils/setExternal"));
 const _MApp = require("./utils/MApp");
 const _apps = require("./utils/apps");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 async function initOptions(manifest = {}, options) {
   var _window_modern_manifest, _window_modern_manifest1;
   let apps = options.apps || [];
@@ -85,7 +69,7 @@ const _default = (config) => ({
           }
           constructor(props) {
             super(props);
-            _define_property(this, "state", {
+            _define_property._(this, "state", {
               MApp: () => {
                 (0, _util.logger)("MApp init Component Render");
                 return /* @__PURE__ */ _react.default.createElement("div");

package/dist/cjs/runtime/useModuleApps.js

@@ -13,49 +13,10 @@ _export(exports, {
   useModuleApps: () => useModuleApps,
   useModuleApp: () => useModuleApp
 });
-const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
 const _util = require("../util");
 const _Context = require("./utils/Context");
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 function useModuleApps() {
   const { apps, MApp, appInfoList } = (0, _react.useContext)(_Context.GarfishContext);
   (0, _util.logger)("call useModuleApps", {

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

@@ -13,11 +13,7 @@ _export(exports, {
   GarfishContext: () => GarfishContext,
   GarfishProvider: () => GarfishProvider
 });
-const _react = /* @__PURE__ */ _interop_require_default(require("react"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
 const GarfishContext = /* @__PURE__ */ _react.default.createContext(null);
 const GarfishProvider = GarfishContext.Provider;

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

@@ -6,29 +6,13 @@ Object.defineProperty(exports, "generateMApp", {
   enumerable: true,
   get: () => generateMApp
 });
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");
-const _react = /* @__PURE__ */ _interop_require_default(require("react"));
-const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
+const _garfish = /* @__PURE__ */ _interop_require_default._(require("garfish"));
 const _util = require("../../util");
 const _loadable = require("../loadable");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 function generateMApp(options, manifest) {
   class MApp extends _react.default.Component {
     componentDidMount() {
@@ -158,7 +142,7 @@ function generateMApp(options, manifest) {
     }
     constructor(...args) {
       super(...args);
-      _define_property(this, "state", {
+      _define_property._(this, "state", {
         domId: (0, _util.generateSubAppContainerKey)()
       });
     }

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

@@ -13,57 +13,14 @@ _export(exports, {
   pathJoin: () => pathJoin,
   generateApps: () => generateApps
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _jsxruntime = require("react/jsx-runtime");
-const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
+const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
 const _runtime = require("@modern-js/runtime");
-const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
+const _garfish = /* @__PURE__ */ _interop_require_default._(require("garfish"));
 const _util = require("../../util");
 const _loadable = require("../loadable");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 function pathJoin(...args) {
   const res = args.reduce((res2, path) => {
     let nPath = path;

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

@@ -6,15 +6,11 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _default
 });
-const _react = /* @__PURE__ */ _interop_require_default(require("react"));
-const _reactdom = /* @__PURE__ */ _interop_require_default(require("react-dom"));
-const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _react = /* @__PURE__ */ _interop_require_default._(require("react"));
+const _reactdom = /* @__PURE__ */ _interop_require_default._(require("react-dom"));
+const _garfish = /* @__PURE__ */ _interop_require_default._(require("garfish"));
 const _util = require("../../util");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const _default = () => {
   (0, _util.logger)("setExternal ", {
     react: _react.default,

package/dist/cjs/util.js

@@ -14,12 +14,8 @@ _export(exports, {
   SUBMODULE_APP_COMPONENT_KEY: () => SUBMODULE_APP_COMPONENT_KEY,
   generateSubAppContainerKey: () => generateSubAppContainerKey
 });
-const _debug = /* @__PURE__ */ _interop_require_default(require("debug"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _debug = /* @__PURE__ */ _interop_require_default._(require("debug"));
 const logger = (0, _debug.default)("modern-js:plugin-garfish");
 const SUBMODULE_APP_COMPONENT_KEY = "SubModuleComponent";
 function generateSubAppContainerKey(moduleInfo) {

package/dist/esm/cli/index.js

@@ -1,196 +1,7 @@
-function _array_like_to_array(arr, len) {
-  if (len == null || len > arr.length)
-    len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++)
-    arr2[i] = arr[i];
-  return arr2;
-}
-function _array_without_holes(arr) {
-  if (Array.isArray(arr))
-    return _array_like_to_array(arr);
-}
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-function _async_to_generator(fn) {
-  return function() {
-    var self = this, args = arguments;
-    return new Promise(function(resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(void 0);
-    });
-  };
-}
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _iterable_to_array(iter) {
-  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
-    return Array.from(iter);
-}
-function _non_iterable_spread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _object_spread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-    if (typeof Object.getOwnPropertySymbols === "function") {
-      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-      }));
-    }
-    ownKeys.forEach(function(key) {
-      _define_property(target, key, source[key]);
-    });
-  }
-  return target;
-}
-function _to_consumable_array(arr) {
-  return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-  if (!o)
-    return;
-  if (typeof o === "string")
-    return _array_like_to_array(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor)
-    n = o.constructor.name;
-  if (n === "Map" || n === "Set")
-    return Array.from(n);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
-    return _array_like_to_array(o, minLen);
-}
-var __generator = function(thisArg, body) {
-  var f, y, t, g, _ = {
-    label: 0,
-    sent: function() {
-      if (t[0] & 1)
-        throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  };
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-    return this;
-  }), g;
-  function verb(n) {
-    return function(v) {
-      return step([
-        n,
-        v
-      ]);
-    };
-  }
-  function step(op) {
-    if (f)
-      throw new TypeError("Generator is already executing.");
-    while (_)
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-          return t;
-        if (y = 0, t)
-          op = [
-            op[0] & 2,
-            t.value
-          ];
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [
-              0
-            ];
-            continue;
-          case 7:
-            op = _.ops.pop();
-            _.trys.pop();
-            continue;
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-              _.ops.push(op);
-              break;
-            }
-            if (t[2])
-              _.ops.pop();
-            _.trys.pop();
-            continue;
-        }
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [
-          6,
-          e
-        ];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    if (op[0] & 5)
-      throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
 import { logger } from "../util";
 import { getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig, generateAsyncEntry } from "./utils";
@@ -225,7 +36,7 @@ export default function() {
         resolvedConfig: function() {
           var _ref2 = _async_to_generator(function(config) {
             var resolved, _getRuntimeConfig, masterApp, router, nConfig, _useConfig_server, _router_historyOptions, useConfig, baseUrl;
-            return __generator(this, function(_state) {
+            return _ts_generator(this, function(_state) {
               resolved = config.resolved;
               _getRuntimeConfig = getRuntimeConfig(resolved), masterApp = _getRuntimeConfig.masterApp, router = _getRuntimeConfig.router;
               nConfig = {