@umijs/plugins 4.0.21 → 4.0.22

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/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.21",
+  "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.21",
+    "@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.21"
+    "umi": "4.0.22"
   },
   "publishConfig": {
     "access": "public"