@umijs/plugins 4.0.20 → 4.0.22

package/dist/antd.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -98,15 +84,22 @@ var antd_default = (api) => {
     }
     if (antdVersion.startsWith("5")) {
       const theme = require("@ant-design/antd-theme-variable");
-      memo.theme = __spreadValues(__spreadValues({}, theme), memo.theme);
+      memo.theme = {
+        ...theme,
+        ...memo.theme
+      };
     }
     if (antd.dark || antd.compact) {
       const { getThemeVariables } = require("antd/dist/theme");
-      memo.theme = __spreadValues(__spreadValues({}, getThemeVariables(antd)), memo.theme);
+      memo.theme = {
+        ...getThemeVariables(antd),
+        ...memo.theme
+      };
     }
-    memo.theme = __spreadValues({
-      "root-entry-name": "default"
-    }, memo.theme);
+    memo.theme = {
+      "root-entry-name": "default",
+      ...memo.theme
+    };
     return memo;
   });
   api.addExtraBabelPlugins(() => {

package/dist/dva.js

@@ -41,7 +41,8 @@ var dva_default = (api) => {
       schema(Joi) {
         return Joi.alternatives().try(Joi.object({
           extraModels: Joi.array().items(Joi.string()),
-          immer: Joi.object()
+          immer: Joi.object(),
+          skipModelValidate: Joi.boolean()
         }), Joi.boolean().invalid(true));
       }
     },
@@ -192,6 +193,8 @@ export { getDvaApp } from './dva';
 function getModelUtil(api) {
   return new import_modelUtils.ModelUtils(api, {
     contentTest(content) {
+      if (api == null ? void 0 : api.config.dva.skipModelValidate)
+        return true;
       return content.startsWith("// @dva-model");
     },
     astTest({ node, content }) {

package/dist/locale.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 });
@@ -113,7 +96,10 @@ var locale_default = (api) => {
     const resolveKey = api.config.moment2dayjs ? "dayjs" : "moment";
     const momentPkgPath = (0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve(`${resolveKey}/package.json`)));
     const EventEmitterPkg = (0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve("event-emitter/package")));
-    const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = __spreadValues(__spreadValues({}, defaultConfig), api.config.locale);
+    const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = {
+      ...defaultConfig,
+      ...api.config.locale
+    };
     const defaultLocale = ((_a = api.config.locale) == null ? void 0 : _a.default) || `zh${baseSeparator}CN`;
     const localeList = await getList(resolveKey);
     const momentLocales = localeList.map(({ momentLocale }) => momentLocale).filter((locale) => locale);
@@ -166,7 +152,8 @@ var locale_default = (api) => {
         UseLocalStorage: !!useLocalStorage,
         LocaleDir: localeDirName,
         ExistLocaleDir: (0, import_fs.existsSync)(localeDirPath),
-        LocaleList: localeList.map((locale) => __spreadProps(__spreadValues({}, locale), {
+        LocaleList: localeList.map((locale) => ({
+          ...locale,
           antdLocale: locale.antdLocale.map((antdLocale, index) => ({
             locale: antdLocale,
             index

package/dist/qiankun/master.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 });
@@ -65,11 +48,16 @@ var master_default = (api) => {
   api.addRuntimePlugin(() => {
     return [(0, import_withTmpPath.withTmpPath)({ api, path: "masterRuntimePlugin.tsx" })];
   });
-  api.modifyDefaultConfig((config) => __spreadProps(__spreadValues({}, config), {
+  api.modifyDefaultConfig((config) => ({
+    ...config,
     mountElementId: import_constants.defaultMasterRootId,
-    qiankun: __spreadProps(__spreadValues({}, config.qiankun), {
-      master: __spreadValues(__spreadValues({}, JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || "{}")), (config.qiankun || {}).master)
-    })
+    qiankun: {
+      ...config.qiankun,
+      master: {
+        ...JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || "{}"),
+        ...(config.qiankun || {}).master
+      }
+    }
   }));
   api.modifyRoutes((memo) => {
     Object.keys(memo).forEach((id) => {
@@ -122,10 +110,11 @@ export interface IRuntimeConfig {
     api.writeTmpFile({
       path: "masterOptions.ts",
       content: `
-let options = ${JSON.stringify(__spreadValues({
+let options = ${JSON.stringify({
         masterHistoryType: ((_a = api.config.history) == null ? void 0 : _a.type) || import_constants.defaultHistoryType,
-        base: api.config.base || "/"
-      }, api.config.qiankun.master))};
+        base: api.config.base || "/",
+        ...api.config.qiankun.master
+      })};
 export const getMasterOptions = () => options;
 export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts });
       `

package/dist/qiankun/slave.js

@@ -122,7 +122,7 @@ export interface IRuntimeConfig {
     });
   });
   api.modifyDefaultConfig((memo) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const initialSlaveOptions = {
       devSourceMap: true,
       ...JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}"),
@@ -141,17 +141,13 @@ export interface IRuntimeConfig {
     if (!shouldNotModifyDefaultBase && historyType !== "hash") {
       modifiedDefaultConfig.base = `/${api.pkg.name}`;
     }
-    return modifiedDefaultConfig;
-  });
-  api.modifyConfig((config) => {
-    var _a, _b;
-    if (config.mfsu !== false) {
-      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, "_")}`
+    if (modifiedDefaultConfig.mfsu !== false) {
+      modifiedDefaultConfig.mfsu = {
+        ...modifiedDefaultConfig.mfsu,
+        mfName: ((_d = modifiedDefaultConfig.mfsu) == null ? void 0 : _d.mfName) || `mf_${(_e = api.pkg.name) == null ? void 0 : _e.replace(/^@/, "").replace(/\W/g, "_")}`
       };
     }
-    return config;
+    return modifiedDefaultConfig;
   });
   api.addHTMLHeadScripts(() => {
     var _a, _b;

package/libs/qiankun/slave/lifecycles.ts

@@ -93,7 +93,7 @@ export function genMount(mountElementId: string) {
         // 避免多个子应用出现在同一主应用时出现 mount 冲突
         rootElement:
           props.container?.querySelector(`#${mountElementId}`) ||
-          mountElementId,
+          document.getElementById(mountElementId),
 
         basename: props.base,
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.20",
+  "version": "4.0.22",
   "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-components": "^2.0.1",
-    "@umijs/bundler-utils": "4.0.20",
+    "@umijs/bundler-utils": "4.0.22",
     "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.20"
+    "umi": "4.0.22"
   },
   "publishConfig": {
     "access": "public"