@umijs/plugins 4.0.89 → 4.1.0

package/dist/antd.js

@@ -61,22 +61,61 @@ var antd_default = (api) => {
   api.describe({
     config: {
       schema({ zod }) {
-        return zod.object({
-          configProvider: zod.record(zod.any()),
-          // themes
+        const commonSchema = {
           dark: zod.boolean(),
           compact: zod.boolean(),
           // babel-plugin-import
           import: zod.boolean(),
           // less or css, default less
-          style: zod.enum(["less", "css"]).describe("less or css, default less"),
-          theme: zod.record(zod.any()),
-          // Only antd@5.1.0 is supported
-          appConfig: zod.record(zod.any()).describe("Only antd@5.1.0 is supported"),
-          // DatePicker & Calendar use moment version
-          momentPicker: zod.boolean().describe("Only antd@5.x is supported"),
-          styleProvider: zod.record(zod.any())
-        }).deepPartial();
+          style: zod.enum(["less", "css"]).describe("less or css, default less")
+        };
+        const createZodRecordWithSpecifiedPartial = (partial) => {
+          const keys = Object.keys(partial);
+          return zod.union([
+            zod.object(partial),
+            zod.record(zod.any()).refine((obj) => {
+              return !keys.some((key) => key in obj);
+            })
+          ]);
+        };
+        const createV5Schema = () => {
+          const componentNameSchema = zod.string().refine(
+            (value) => {
+              const firstLetter = value.slice(0, 1);
+              return firstLetter === firstLetter.toUpperCase();
+            },
+            {
+              message: "theme.components.[componentName] needs to be in PascalCase, e.g. theme.components.Button"
+            }
+          );
+          const themeSchema = createZodRecordWithSpecifiedPartial({
+            components: zod.record(componentNameSchema, zod.record(zod.any()))
+          });
+          const configProvider = createZodRecordWithSpecifiedPartial({
+            theme: themeSchema
+          });
+          return zod.object({
+            ...commonSchema,
+            theme: themeSchema.describe("Shortcut of `configProvider.theme`"),
+            appConfig: zod.record(zod.any()).describe("Only >= antd@5.1.0 is supported"),
+            momentPicker: zod.boolean().describe("DatePicker & Calendar use moment version"),
+            styleProvider: zod.record(zod.any()),
+            configProvider
+          }).deepPartial();
+        };
+        const createV4Schema = () => {
+          return zod.object({
+            ...commonSchema,
+            configProvider: zod.record(zod.any())
+          }).deepPartial();
+        };
+        if (isV5) {
+          return createV5Schema();
+        }
+        if (isV4) {
+          return createV4Schema();
+        }
+        return zod.object({});
       }
     },
     enableBy({ userConfig }) {

package/dist/layout.js

@@ -64,6 +64,7 @@ var layout_default = (api) => {
     antdVersion = require(`${pkgPath2}/package.json`).version;
   } catch (e) {
   }
+  const packageName = api.pkg.name || "plugin-layout";
   const isAntd5 = antdVersion.startsWith("5");
   const layoutFile = isAntd5 ? "Layout.css" : "Layout.less";
   api.describe({
@@ -231,7 +232,7 @@ const { formatMessage } = useIntl();
     <ProLayout
       route={route}
       location={location}
-      title={userConfig.title || 'plugin-layout'}
+      title={userConfig.title || '${packageName}'}
       navTheme="dark"
       siderWidth={256}
       onMenuHeaderClick={(e) => {
@@ -435,21 +436,28 @@ export function getRightRenderContent (opts: {
     );
   }
 
-
-  const avatar = (
-    <span className="umi-plugin-layout-action">
-        <Avatar
-          size="small"
-          className="umi-plugin-layout-avatar"
-          src={
-            opts.initialState?.avatar ||
-            'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png'
-          }
-          alt="avatar"
-        />
-        <span className="umi-plugin-layout-name">{opts.initialState?.name}</span>
+  const showAvatar = opts.initialState?.avatar || opts.initialState?.name || opts.runtimeConfig.logout;
+  const disableAvatarImg = opts.initialState?.avatar === false;
+  const nameClassName = disableAvatarImg ? 'umi-plugin-layout-name umi-plugin-layout-hide-avatar-img' : 'umi-plugin-layout-name';
+  const avatar =
+    showAvatar ? (
+      <span className="umi-plugin-layout-action">
+        {!disableAvatarImg ?
+          (
+            <Avatar
+              size="small"
+              className="umi-plugin-layout-avatar"
+              src={
+                opts.initialState?.avatar ||
+                "https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png"
+              }
+              alt="avatar"
+            />
+          ) : null}
+        <span className={nameClassName}>{opts.initialState?.name}</span>
       </span>
-  );
+    ) : null;
+
 
   if (opts.loading) {
     return (
@@ -459,6 +467,11 @@ export function getRightRenderContent (opts: {
     );
   }
 
+  // 如果没有打开Locale，并且头像为空就取消掉这个返回的内容
+  {{^Locale}}
+    if(!avatar) return null;
+  {{/Locale}}
+
   const langMenu = {
     className: "umi-plugin-layout-menu",
     selectedKeys: [],
@@ -498,6 +511,7 @@ export function getRightRenderContent (opts: {
   }
 
 
+
   return (
     <div className="umi-plugin-layout-right anticon">
       {opts.runtimeConfig.logout ? (
@@ -575,6 +589,9 @@ ${// antd@5里面没有这个样式了
 .umi-plugin-layout-name {
   margin-left: 8px;
 }
+.umi-plugin-layout-name.umi-plugin-layout-hide-avatar-img {
+  margin-left: 0;
+}
 `
     });
     api.writeTmpFile({

package/dist/react-query.js

@@ -87,6 +87,7 @@ var react_query_default = (api) => {
     api.writeTmpFile({
       path: "runtime.tsx",
       content: enableQueryClient ? `
+import React from 'react';
 import { defaultContext, QueryClient, QueryClientProvider } from '${pkgPath}';
 import { ReactQueryDevtools } from '${devtoolPkgPath}';
 ${reactQueryRuntimeCode}

package/dist/styled-components.js

@@ -120,6 +120,7 @@ export { styled, ThemeProvider, createGlobalStyle, css, keyframes, StyleSheetMan
     api.writeTmpFile({
       path: "runtime.tsx",
       content: `
+import React from 'react';
 ${hasProvider ? `import { StyleSheetManager } from '${(0, import_utils.winPath)(libPath)}';` : ``}
 
 ${styledComponentsRuntimeCode}

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -109,7 +109,7 @@ export async function render(oldRender: typeof noop) {
   microAppRuntimeRoutes = routes;
 
   // 主应用相关的配置注册完毕后即可开启渲染
-  oldRender();
+  const renderData = oldRender();
 
   // 未使用 base 配置的可以认为是路由关联或者使用标签装载的应用
   const loadableApps = apps.filter((app) => !app.base);
@@ -133,6 +133,8 @@ export async function render(oldRender: typeof noop) {
       '[plugins/qiankun] 检测到还在使用旧版配置，该配置已移除，请尽快升级到最新配置方式以获得更好的开发体验，详见 https://umijs.org/plugins/plugin-qiankun#%E5%8D%87%E7%BA%A7%E6%8C%87%E5%8D%97',
     );
   }
+
+  return renderData;
 }
 
 export function patchClientRoutes({ routes }: { routes: any[] }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.89",
+  "version": "4.1.0",
   "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 @@
     "@tanstack/react-query-devtools": "^4.24.10",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.6",
+    "babel-plugin-import": "^1.13.8",
     "babel-plugin-styled-components": "2.1.4",
     "dayjs": "^1.11.7",
     "dva-core": "^2.0.4",
@@ -45,12 +45,12 @@
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.89",
+    "@umijs/bundler-utils": "4.1.0",
     "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.89"
+    "umi": "4.1.0"
   },
   "publishConfig": {
     "access": "public"