@umijs/plugins 4.0.16 → 4.0.17

package/dist/qiankun/slave.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -140,15 +123,19 @@ export interface IRuntimeConfig {
   });
   api.modifyDefaultConfig((memo) => {
     var _a, _b, _c;
-    const initialSlaveOptions = __spreadValues(__spreadValues({
-      devSourceMap: true
-    }, JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}")), (memo.qiankun || {}).slave);
-    const modifiedDefaultConfig = __spreadProps(__spreadValues({}, memo), {
+    const initialSlaveOptions = {
+      devSourceMap: true,
+      ...JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}"),
+      ...(memo.qiankun || {}).slave
+    };
+    const modifiedDefaultConfig = {
+      ...memo,
       runtimePublicPath: true,
-      qiankun: __spreadProps(__spreadValues({}, memo.qiankun), {
+      qiankun: {
+        ...memo.qiankun,
         slave: initialSlaveOptions
-      })
-    });
+      }
+    };
     const shouldNotModifyDefaultBase = ((_b = (_a = api.userConfig.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.shouldNotModifyDefaultBase) ?? initialSlaveOptions.shouldNotModifyDefaultBase;
     const historyType = ((_c = api.userConfig.history) == null ? void 0 : _c.type) || "browser";
     if (!shouldNotModifyDefaultBase && historyType !== "hash") {
@@ -159,9 +146,10 @@ export interface IRuntimeConfig {
   api.modifyConfig((config) => {
     var _a, _b;
     if (config.mfsu !== false) {
-      config.mfsu = __spreadProps(__spreadValues({}, config.mfsu), {
+      config.mfsu = {
+        ...config.mfsu,
         mfName: ((_a = config.mfsu) == null ? void 0 : _a.mfName) || `mf_${(_b = api.pkg.name) == null ? void 0 : _b.replace(/^@/, "").replace(/\W/g, "_")}`
-      });
+      };
     }
     return config;
   });
@@ -234,10 +222,10 @@ export { connectMaster } from './connectMaster';
   });
   api.addMiddlewares(async () => {
     return async (req, res, next) => {
-      var _a;
+      var _a, _b;
       const qiankunConfig = api.config.qiankun || {};
       const masterEntry = (_a = qiankunConfig.slave) == null ? void 0 : _a.masterEntry;
-      const isMasterApp = qiankunConfig.master.enable;
+      const isMasterApp = (_b = qiankunConfig.master) == null ? void 0 : _b.enable;
       const { proxyToMasterEnabled } = await api.applyPlugins({
         key: "shouldProxyToMaster",
         type: api.ApplyPluginsType.modify,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.16",
+  "version": "4.0.17",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^7.0.1-beta.28",
-    "@umijs/bundler-utils": "4.0.16",
+    "@umijs/bundler-utils": "4.0.17",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -46,7 +46,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.16"
+    "umi": "4.0.17"
   },
   "publishConfig": {
     "access": "public"