@allahjs/umi-plugin-layout-lite 0.1.0 → 0.1.1

package/README.md

@@ -44,3 +44,5 @@ export const layout = ({ initialState }: any) => ({
 cd packages/umi-plugin-layout-lite
 npm publish --access public
 ```
+
+建议先发布 `0.1.1`（修复 CJS 产物在部分 MFSU 场景下的运行时兼容问题）。

package/dist/Layout.js

@@ -1,17 +1,15 @@
-'use strict';
-
-var jsxRuntime = require('react/jsx-runtime');
-var React = require('react');
-var max = require('@umijs/max');
-var proComponents = require('@ant-design/pro-components');
-var antd = require('antd');
+import { jsx } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import { useLocation, useNavigate, useAppData, useModel, matchRoutes, Outlet, Link, history } from '@umijs/max';
+import { ProLayout } from '@ant-design/pro-components';
+import { Result, Button, Spin } from 'antd';
 
 const Exception = props => {
     var _a, _b;
     return ((!props.route && (props.noFound || props.notFound)) ||
         (((_a = props.route) === null || _a === void 0 ? void 0 : _a.unaccessible) &&
             (props.unAccessible || props.noAccessible)) ||
-        ((!props.route || ((_b = props.route) === null || _b === void 0 ? void 0 : _b.unaccessible)) && (jsxRuntime.jsx(antd.Result, { status: props.route ? '403' : '404', title: props.route ? '403' : '404', subTitle: props.route ? '抱歉，你无权访问该页面' : '抱歉，你访问的页面不存在', extra: jsxRuntime.jsx(antd.Button, { type: "primary", onClick: () => max.history.push('/'), children: "\u8FD4\u56DE\u9996\u9875" }) }))) ||
+        ((!props.route || ((_b = props.route) === null || _b === void 0 ? void 0 : _b.unaccessible)) && (jsx(Result, { status: props.route ? '403' : '404', title: props.route ? '403' : '404', subTitle: props.route ? '抱歉，你无权访问该页面' : '抱歉，你访问的页面不存在', extra: jsx(Button, { type: "primary", onClick: () => history.push('/'), children: "\u8FD4\u56DE\u9996\u9875" }) }))) ||
         props.children);
 };
 function getRightRenderContent(opts) {
@@ -19,7 +17,7 @@ function getRightRenderContent(opts) {
         return opts.runtimeConfig.rightRender(opts.initialState, opts.setInitialState, opts.runtimeConfig);
     }
     if (opts.loading) {
-        return jsxRuntime.jsx(antd.Spin, { size: "small", style: { marginLeft: 8, marginRight: 8 } });
+        return jsx(Spin, { size: "small", style: { marginLeft: 8, marginRight: 8 } });
     }
     return null;
 }
@@ -62,10 +60,10 @@ const mapRoutes = (routes) => {
     });
 };
 function LayoutLite(props) {
-    const location = max.useLocation();
-    const navigate = max.useNavigate();
-    const { clientRoutes, pluginManager } = max.useAppData();
-    const initialInfo = max.useModel('@@initialState') || {
+    const location = useLocation();
+    const navigate = useNavigate();
+    const { clientRoutes, pluginManager } = useAppData();
+    const initialInfo = useModel('@@initialState') || {
         initialState: undefined,
         loading: false,
         setInitialState: null,
@@ -81,7 +79,7 @@ function LayoutLite(props) {
     const userConfig = {};
     const newRoutes = filterRoutes(clientRoutes.filter((route) => route.id === 'layout-lite'), route => (route.isLayout && route.id !== 'layout-lite') || !!route.isWrapper);
     const route = mapRoutes(newRoutes)[0];
-    const matchedRoute = React.useMemo(() => { var _a, _b, _c; return (_c = (_b = (_a = max.matchRoutes((route === null || route === void 0 ? void 0 : route.children) || [], location.pathname)) === null || _a === void 0 ? void 0 : _a.pop) === null || _b === void 0 ? void 0 : _b.call(_a)) === null || _c === void 0 ? void 0 : _c.route; }, [route, location.pathname]);
+    const matchedRoute = useMemo(() => { var _a, _b, _c; return (_c = (_b = (_a = matchRoutes((route === null || route === void 0 ? void 0 : route.children) || [], location.pathname)) === null || _a === void 0 ? void 0 : _a.pop) === null || _b === void 0 ? void 0 : _b.call(_a)) === null || _c === void 0 ? void 0 : _c.route; }, [route, location.pathname]);
     const renderRightActions = (layoutProps) => {
         const dom = getRightRenderContent({
             runtimeConfig,
@@ -100,7 +98,7 @@ function LayoutLite(props) {
         }
         return dom;
     };
-    return (jsxRuntime.jsx(proComponents.ProLayout, { route: route, location: location, title: runtimeConfig.title || 'layout-lite', menu: { locale: runtimeConfig.locale }, onMenuHeaderClick: event => {
+    return (jsx(ProLayout, { route: route, location: location, title: runtimeConfig.title || 'layout-lite', menu: { locale: runtimeConfig.locale }, onMenuHeaderClick: event => {
             event.stopPropagation();
             event.preventDefault();
             navigate('/');
@@ -109,19 +107,19 @@ function LayoutLite(props) {
                 return defaultDom;
             }
             if (menuItemProps.path && location.pathname !== menuItemProps.path) {
-                return (jsxRuntime.jsx(max.Link, { to: menuItemProps.path.replace('/*', ''), target: menuItemProps.target, children: defaultDom }));
+                return (jsx(Link, { to: menuItemProps.path.replace('/*', ''), target: menuItemProps.target, children: defaultDom }));
             }
             return defaultDom;
         }, itemRender: (currentRoute, _, routes) => {
             const label = currentRoute.title || currentRoute.breadcrumbName;
             const lastRoute = routes[routes.length - 1];
             if (lastRoute && (lastRoute.path === currentRoute.path || lastRoute.linkPath === currentRoute.path)) {
-                return jsxRuntime.jsx("span", { children: label });
+                return jsx("span", { children: label });
             }
-            return jsxRuntime.jsx(max.Link, { to: currentRoute.path || '/', children: label });
-        }, actionsRender: renderRightActions, ...runtimeConfig, children: jsxRuntime.jsx(Exception, { route: matchedRoute, noFound: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.noFound, notFound: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.notFound, unAccessible: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.unAccessible, noAccessible: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.noAccessible, children: runtimeConfig.childrenRender
-                ? runtimeConfig.childrenRender(jsxRuntime.jsx(max.Outlet, {}), props)
-                : jsxRuntime.jsx(max.Outlet, {}) }) }));
+            return jsx(Link, { to: currentRoute.path || '/', children: label });
+        }, actionsRender: renderRightActions, ...runtimeConfig, children: jsx(Exception, { route: matchedRoute, noFound: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.noFound, notFound: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.notFound, unAccessible: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.unAccessible, noAccessible: runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.noAccessible, children: runtimeConfig.childrenRender
+                ? runtimeConfig.childrenRender(jsx(Outlet, {}), props)
+                : jsx(Outlet, {}) }) }));
 }
 
-module.exports = LayoutLite;
+export { LayoutLite as default };

package/dist/runtime.js

@@ -1,26 +1,5 @@
-'use strict';
-
-var React = require('react');
-var Icons = require('@ant-design/icons');
-
-function _interopNamespaceDefault(e) {
-    var n = Object.create(null);
-    if (e) {
-        Object.keys(e).forEach(function (k) {
-            if (k !== 'default') {
-                var d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () { return e[k]; }
-                });
-            }
-        });
-    }
-    n.default = e;
-    return Object.freeze(n);
-}
-
-var Icons__namespace = /*#__PURE__*/_interopNamespaceDefault(Icons);
+import React from 'react';
+import * as Icons from '@ant-design/icons';
 
 function formatIcon(name) {
     return name
@@ -34,11 +13,11 @@ function patchRoutes({ routes }) {
         if (!icon || typeof icon !== 'string')
             return;
         const iconName = formatIcon(icon);
-        const IconComponent = Icons__namespace[iconName] || Icons__namespace[`${iconName}Outlined`];
+        const IconComponent = Icons[iconName] || Icons[`${iconName}Outlined`];
         if (IconComponent) {
             routes[key].icon = React.createElement(IconComponent);
         }
     });
 }
 
-exports.patchRoutes = patchRoutes;
+export { patchRoutes };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@allahjs/umi-plugin-layout-lite",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A lightweight Umi layout plugin with ProLayout and rightContentRender compatibility.",
   "repository": "https://github.com/allah-prime/umi-plugin-layout-lite",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
@@ -12,8 +12,8 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.js"
+      "import": "./dist/index.cjs",
+      "require": "./dist/index.cjs"
     }
   },
   "scripts": {