@umijs/plugins 4.0.21 → 4.0.23

package/dist/access.js

@@ -50,7 +50,7 @@ import { AccessContext } from './context';
 
 function Provider(props) {${hasAccessFile ? `
   const { initialState } = useModel('@@initialState');
-  const access = React.useMemo(() => accessFactory(initialState), [initialState]);
+  const access = accessFactory(initialState);
 ` : `
   const access = {};
 `}
@@ -91,48 +91,59 @@ export const Access: React.FC<PropsWithChildren<AccessProps>> = (props) => {
 
 export const useAccessMarkedRoutes = (routes: IRoute[]) => {
   const access = useAccess();
-  const markdedRoutes: IRoute[] = React.useMemo(() => {
-    const process = (route, parentAccessCode) => {
-      const accessCode = route.access || parentAccessCode;
-
-      // set default status
-      route.unaccessible = ${api.config.access.strictMode ? "true" : "false"};
-
-      // check access code
-      if (typeof accessCode === 'string') {
-        const detector = access[accessCode];
-
-        if (typeof detector === 'function') {
-          route.unaccessible = !detector(route);
-        } else if (typeof detector === 'boolean') {
-          route.unaccessible = !detector;
-        } else if (typeof detector === 'undefined') {
-          route.unaccessible = true;
-        }
+  const process = (route, parentAccessCode, parentRoute) => {
+      let accessCode = route.access;
+      // \u7528\u7236\u7EA7\u7684\u8DEF\u7531\u68C0\u6D4B\u7236\u7EA7\u7684 accessCode
+      let detectorRoute = route;
+      if (!accessCode && parentAccessCode) {
+        accessCode = parentAccessCode;
+        detectorRoute = parentRoute;
       }
 
-      // check children access code
-      if (route.children?.length) {
-        const isNoAccessibleChild = !route.children.reduce((hasAccessibleChild, child) => {
-          process(child, accessCode);
+    // set default status
+    route.unaccessible = ${api.config.access.strictMode ? "true" : "false"};
 
-          return hasAccessibleChild || !child.unaccessible;
-        }, false);
+    // check access code
+    if (typeof accessCode === "string") {
+      const detector = access[accessCode];
 
-        // make sure parent route is unaccessible if all children are unaccessible
-        if (isNoAccessibleChild) {
-          route.unaccessible = true;
-        }
+      if (typeof detector === "function") {
+        route.unaccessible = !detector(detectorRoute);
+      } else if (typeof detector === "boolean") {
+        route.unaccessible = !detector;
+      } else if (typeof detector === "undefined") {
+        route.unaccessible = true;
       }
+    }
+
+    // check children access code
+    if (route.children?.length) {
+      const isNoAccessibleChild = !route.children.reduce(
+        (hasAccessibleChild, child) => {
+          process(child, accessCode, route);
+
+          return hasAccessibleChild || !child.unaccessible;
+        },
+        false
+      );
 
-      return route;
+      // make sure parent route is unaccessible if all children are unaccessible
+      if (isNoAccessibleChild) {
+        route.unaccessible = true;
+      }
     }
 
-    return routes.map(route => process(route));
-  }, [routes.length, access]);
+    // \u4E3A\u4E86\u517C\u5BB9\u65E7\u7248\u672C\u7684layout\uFF0C<= 7.1.0
+    // \u5982\u679C\u662F 7.1.0 \u4EE5\u4E0B\u7684layout\u53EF\u80FD\u4F1A\u51FA\u73B0\u6570\u636E\u5F02\u5E38\u3002
+    delete route.routes;
+    route.routes = route.children;
+
+    return route;
+  };
+
+  return routes.map((route) => process(route));
+};
 
-  return markdedRoutes;
-}
       `
     });
     api.writeTmpFile({

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));
       }
     },
@@ -171,6 +172,68 @@ export { connect, useDispatch, useStore, useSelector } from 'dva';
 export { getDvaApp } from './dva';
 `
     });
+    api.writeTmpFile({
+      path: "types.d.ts",
+      tpl: `
+import type { History } from 'umi';
+
+export interface ConnectProps {
+      dispatch?: Dispatch;
+}
+type RequiredConnectProps = Required<ConnectProps>
+export type ConnectRC<
+      T = {},
+      > = React.ForwardRefRenderFunction<any, T & RequiredConnectProps>;
+interface Action<T = any> {
+      type: T
+}
+interface AnyAction extends Action {
+      // Allows any extra properties to be defined in an action.
+      [extraProps: string]: any
+}
+interface Dispatch<A extends Action = AnyAction> {
+      <T extends A>(action: T): T
+}
+interface EffectsCommandMap {
+      put: <A extends AnyAction>(action: A) => any,
+      call: Function,
+      select: Function,
+      take: Function,
+      cancel: Function,
+      [key: string]: any,
+}
+interface Action<T = any> {
+      type: T
+}
+export type Reducer<S = any, A extends Action = AnyAction> = (prevState: S, action: A) => S;
+export type Effect = (action: AnyAction, effects: EffectsCommandMap) => void;
+type EffectType = 'takeEvery' | 'takeLatest' | 'watcher' | 'throttle';
+type EffectWithType = [Effect, { type: EffectType }];
+export type Subscription = (api: SubscriptionAPI, done: Function) => void;
+
+export interface ReducersMapObject<T> {
+      [key: string]: Reducer<T>,
+}
+export interface EffectsMapObject {
+      [key: string]: Effect | EffectWithType,
+}
+export interface SubscriptionAPI {
+      dispatch: Dispatch<any>,
+      history: History,
+}
+export interface SubscriptionsMapObject {
+      [key: string]: Subscription,
+}
+export interface DvaModel<T, E = EffectsMapObject, R = ReducersMapObject<T>> {
+      namespace: string,
+      state?: T,
+      reducers?: R,
+      effects?: E,
+      subscriptions?: SubscriptionsMapObject,
+}
+      `,
+      context: {}
+    });
   });
   api.addTmpGenerateWatcherPaths(() => {
     return [(0, import_path.join)(api.paths.absSrcPath, "models")];
@@ -192,6 +255,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/layout.js

@@ -124,13 +124,13 @@ const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) =>
   let newRoutes = []
   for (const route of routes) {
     if (filterFn(route)) {
-      if (Array.isArray(route.routes)) {
-        newRoutes.push(...filterRoutes(route.routes, filterFn))
+      if (Array.isArray(route.children)) {
+        newRoutes.push(...filterRoutes(route.children, filterFn))
       }
     } else {
       newRoutes.push(route);
-      if (Array.isArray(route.routes)) {
-        route.routes = filterRoutes(route.routes, filterFn);
+      if (Array.isArray(route.children)) {
+        route.children = filterRoutes(route.children, filterFn);
       }
     }
   }
@@ -150,11 +150,11 @@ const mapRoutes = (routes: IRoute[]) => {
       newRoute.path = route.originPath
     }
 
-    if (Array.isArray(route.routes)) {
-      newRoute.routes = mapRoutes(route.routes);
+    if (Array.isArray(route.children)) {
+      newRoute.children = mapRoutes(route.children);
     }
 
-    return newRoute
+    return newRoute;
   })
 }
 
@@ -180,12 +180,13 @@ const { formatMessage } = useIntl();
     },
   });
 
-  const matchedRoute = useMemo(() => matchRoutes(clientRoutes, location.pathname).pop()?.route, [location.pathname]);
+  const matchedRouteNoAccess = useMemo(() => matchRoutes(clientRoutes, location.pathname)?.pop()?.route||[], [location.pathname]);
+  // \u73B0\u5728\u7684 layout \u53CA wrapper \u5B9E\u73B0\u662F\u901A\u8FC7\u7236\u8DEF\u7531\u7684\u5F62\u5F0F\u5B9E\u73B0\u7684, \u4F1A\u5BFC\u81F4\u8DEF\u7531\u6570\u636E\u591A\u4E86\u5197\u4F59\u5C42\u7EA7, proLayout \u6D88\u8D39\u65F6, \u65E0\u6CD5\u6B63\u786E\u5C55\u793A\u83DC\u5355, \u8FD9\u91CC\u5BF9\u5197\u4F59\u6570\u636E\u8FDB\u884C\u8FC7\u6EE4\u64CD\u4F5C
   const newRoutes = filterRoutes(clientRoutes.filter(route => route.id === 'ant-design-pro-layout'), (route) => {
     return (!!route.isLayout && route.id !== 'ant-design-pro-layout') || !!route.isWrapper;
   })
   const [route] = useAccessMarkedRoutes(mapRoutes(newRoutes));
-
+  const [matchedRoute] = useAccessMarkedRoutes([matchedRouteNoAccess]);
   return (
     <ProLayout
       route={route}

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/dist/valtio.d.ts

@@ -0,0 +1,3 @@
+import { IApi } from 'umi';
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/valtio.js

@@ -0,0 +1,64 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/valtio.ts
+var valtio_exports = {};
+__export(valtio_exports, {
+  default: () => valtio_default
+});
+module.exports = __toCommonJS(valtio_exports);
+var import_path = require("path");
+var import_utils = require("@umijs/utils");
+var valtio_default = (api) => {
+  api.describe({
+    key: "valtio",
+    config: {
+      schema(joi) {
+        return joi.object();
+      }
+    }
+  });
+  const libPath = (0, import_utils.winPath)((0, import_path.dirname)(require.resolve("@umijs/valtio/package.json")));
+  api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      path: "index.ts",
+      content: `
+export {
+  proxy, useSnapshot, snapshot, subscribe,
+  proxyWithComputed,
+  proxyWithHistory,
+  proxyWithDevtools,
+  proxyMap,
+  proxySet,
+} from '${libPath}';
+      `
+    });
+  });
+  api.modifyConfig((memo) => {
+    memo.alias = {
+      ...memo.alias,
+      "@umijs/valtio": libPath
+    };
+    return memo;
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/libs/locale/runtime.tpl

@@ -16,15 +16,13 @@ export function patchRoutes({ routes }) {
     Object.keys(routes).forEach((key) => {
       const route = routes[key];
       if (route.title) {
+        route.locale = route.title;
         const newTitle = intl.messages[route.title] ? intl.formatMessage({ id: route.title }, {}) : route.title;
         route.name = intl.messages[route.title] ? intl.formatMessage({ id: route.title }, {}) : route.name;
         route.title = newTitle;
       }
-      if (route.routes) {
-        traverseRoute(route.routes);
-      }
-      if (route.routes) {
-        traverseRoute(route.routes);
+      if (route.children) {
+        traverseRoute(route.children);
       }
     })
   }

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.23",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,8 @@
     "@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.23",
+    "@umijs/valtio": "^1.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -46,7 +47,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.21"
+    "umi": "4.0.23"
   },
   "publishConfig": {
     "access": "public"