@modern-js/plugin-garfish 1.4.4-beta.3 → 1.4.4-beta.6

package/dist/js/modern/runtime/plugin.js

@@ -1,4 +1,3 @@
-import _merge from "lodash/merge";
 const _excluded = ["manifest"];
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -35,7 +34,7 @@ async function initOptions(manifest = {}, options) {
 
 
   if (manifest !== null && manifest !== void 0 && manifest.getAppList) {
-    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList());
+    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList(manifest));
 
     if (getAppList.length > 0) {
       apps = getAppList;
@@ -58,20 +57,17 @@ async function initOptions(manifest = {}, options) {
 } // export default GarfishPlugin;
 
 
-export default (defaultConfig => ({
+export default (config => ({
   name: '@modern-js/garfish-plugin',
-  setup: config => {
+  setup: () => {
     setExternal();
 
-    const _merge2 = _merge(defaultConfig, config),
-          {
+    const {
       manifest
-    } = _merge2,
-          options = _objectWithoutProperties(_merge2, _excluded);
+    } = config,
+          options = _objectWithoutProperties(config, _excluded);
 
-    logger('createPlugin', {
-      config
-    });
+    logger('createPlugin', config);
     const promise = initOptions(manifest, options);
     return {
       hoc({

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _merge3 = _interopRequireDefault(require("lodash/merge"));
-
 var _react = _interopRequireDefault(require("react"));
 
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
@@ -52,7 +50,7 @@ async function initOptions(manifest = {}, options) {
 
 
   if (manifest !== null && manifest !== void 0 && manifest.getAppList) {
-    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList());
+    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList(manifest));
 
     if (getAppList.length > 0) {
       apps = getAppList;
@@ -75,20 +73,17 @@ async function initOptions(manifest = {}, options) {
 } // export default GarfishPlugin;
 
 
-var _default = defaultConfig => ({
+var _default = config => ({
   name: '@modern-js/garfish-plugin',
-  setup: config => {
+  setup: () => {
     (0, _setExternal.default)();
 
-    const _merge2 = (0, _merge3.default)(defaultConfig, config),
-          {
+    const {
       manifest
-    } = _merge2,
-          options = _objectWithoutProperties(_merge2, _excluded);
+    } = config,
+          options = _objectWithoutProperties(config, _excluded);
 
-    (0, _util.logger)('createPlugin', {
-      config
-    });
+    (0, _util.logger)('createPlugin', config);
     const promise = initOptions(manifest, options);
     return {
       hoc({

package/dist/js/treeshaking/runtime/plugin.js

@@ -1,6 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-import _merge from "lodash/merge";
 var _excluded = ["manifest"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -88,7 +87,7 @@ function _initOptions() {
             }
 
             _context2.next = 7;
-            return manifest === null || manifest === void 0 ? void 0 : manifest.getAppList();
+            return manifest === null || manifest === void 0 ? void 0 : manifest.getAppList(manifest);
 
           case 7:
             getAppList = _context2.sent;
@@ -120,19 +119,16 @@ function _initOptions() {
   return _initOptions.apply(this, arguments);
 }
 
-export default (function (defaultConfig) {
+export default (function (config) {
   return {
     name: '@modern-js/garfish-plugin',
-    setup: function setup(config) {
+    setup: function setup() {
       setExternal();
 
-      var _merge2 = _merge(defaultConfig, config),
-          manifest = _merge2.manifest,
-          options = _objectWithoutProperties(_merge2, _excluded);
+      var manifest = config.manifest,
+          options = _objectWithoutProperties(config, _excluded);
 
-      logger('createPlugin', {
-        config: config
-      });
+      logger('createPlugin', config);
       var promise = initOptions(manifest, options);
       return {
         hoc: function hoc(_ref, next) {

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

@@ -1,6 +1,6 @@
 import type { Plugin } from '@modern-js/runtime-core';
 import { Config } from './useModuleApps';
 
-declare const _default: (defaultConfig: Partial<Config>) => Plugin;
+declare const _default: (config: Config) => Plugin;
 
 export default _default;

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

@@ -9,7 +9,7 @@ export declare type ModulesInfo = Array<ModuleInfo>;
 export declare type Manifest = {
   modules?: ModulesInfo;
   loadable?: LoadableConfig;
-  getAppList?: () => Promise<Array<GarfishInterfaces.AppInfo>>;
+  getAppList?: (info: any) => Promise<Array<GarfishInterfaces.AppInfo>>;
 };
 export declare type LoadingComponent = React.ComponentType<{
   isLoading: boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.4-beta.3",
+  "version": "1.4.4-beta.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -82,7 +82,9 @@
   },
   "peerDependencies": {
     "@modern-js/plugin-router": "^1.2.5",
-    "@modern-js/runtime-core": "^1.2.4"
+    "@modern-js/runtime-core": "^1.2.4",
+    "@modern-js/core": "^1.5.0",
+    "react": "^17"
   },
   "sideEffects": false,
   "modernConfig": {},