@umijs/plugins 4.0.0-canary.20230310.2 → 4.0.0-canary.20230315.1

package/dist/antd.js

@@ -50,6 +50,8 @@ var antd_default = (api) => {
     antdVersion = require(`${pkgPath}/package.json`).version;
   } catch (e) {
   }
+  const appComponentAvailable = import_plugin_utils.semver.gte(antdVersion, "5.1.0");
+  const appConfigAvailable = import_plugin_utils.semver.gte(antdVersion, "5.3.0");
   api.describe({
     config: {
       schema(Joi) {
@@ -63,7 +65,9 @@ var antd_default = (api) => {
             import: Joi.boolean(),
             // less or css, default less
             style: Joi.string().allow("less", "css"),
-            theme: Joi.object()
+            theme: Joi.object(),
+            // Only antd@5.1.0 is supported
+            appConfig: Joi.object()
           }),
           Joi.boolean().invalid(true)
         );
@@ -136,6 +140,18 @@ var antd_default = (api) => {
         antd.theme
       );
     }
+    if (antd.appConfig) {
+      if (!appComponentAvailable) {
+        delete antd.appConfig;
+        api.logger.warn(
+          `antd.appConfig is only available in version 5.1.0 and above, but you are using version ${antdVersion}`
+        );
+      } else if (!appConfigAvailable && Object.keys(antd.appConfig).length > 0) {
+        api.logger.warn(
+          `versions [5.1.0 ~ 5.3.0) only allows antd.appConfig to be set to \`{}\``
+        );
+      }
+    }
     return memo;
   });
   api.addExtraBabelPlugins(() => {
@@ -155,55 +171,44 @@ var antd_default = (api) => {
     ] : [];
   });
   api.onGenerateFiles(() => {
-    if (!api.config.antd.configProvider)
-      return;
+    const withConfigProvider = !!api.config.antd.configProvider;
+    const withAppConfig = appConfigAvailable && !!api.config.antd.appConfig;
     api.writeTmpFile({
       path: `runtime.tsx`,
+      context: {
+        configProvider: withConfigProvider && JSON.stringify(api.config.antd.configProvider),
+        appConfig: appComponentAvailable && JSON.stringify(api.config.antd.appConfig)
+      },
+      tplPath: (0, import_path.join)(__dirname, "../tpls/antd-runtime.ts.tpl")
+    });
+    api.writeTmpFile({
+      path: "types.d.ts",
       content: import_plugin_utils.Mustache.render(
         `
-import React from 'react';
-import { ConfigProvider, Modal, message, notification } from 'antd';
-import { ApplyPluginsType } from 'umi';
-import { getPluginManager } from '../core/plugin';
+{{#withConfigProvider}}
+import type { ConfigProviderProps } from 'antd/es/config-provider';
+{{/withConfigProvider}}
+{{#withAppConfig}}
+import type { AppConfig } from 'antd/es/app/context';
+{{/withAppConfig}}
 
-export function rootContainer(container) {
-  const finalConfig = getPluginManager().applyPlugins({
-    key: 'antd',
-    type: ApplyPluginsType.modify,
-    initialValue: {...{{{ config }}}},
-  });
-  if (finalConfig.prefixCls) {
-    Modal.config({
-      rootPrefixCls: finalConfig.prefixCls
-    });
-    message.config({
-      prefixCls: \`\${finalConfig.prefixCls}-message\`
-    });
-    notification.config({
-      prefixCls: \`\${finalConfig.prefixCls}-notification\`
-    });
-  }
-  if (finalConfig.iconPrefixCls) {
-    // Icons in message need to set iconPrefixCls via ConfigProvider.config()
-    ConfigProvider.config({
-      iconPrefixCls: finalConfig.iconPrefixCls,
-    });
-  }
-  return <ConfigProvider {...finalConfig}>{container}</ConfigProvider>;
-}
-      `.trim(),
+type Prettify<T> = {
+  [K in keyof T]: T[K];
+} & {};
+
+type AntdConfig = Prettify<{}
+{{#withConfigProvider}}  & ConfigProviderProps{{/withConfigProvider}}
+{{#withAppConfig}}  & { appConfig: AppConfig }{{/withAppConfig}}
+>;
+
+export type RuntimeAntdConfig = (memo: AntdConfig) => AntdConfig;
+`.trim(),
         {
-          config: JSON.stringify(api.config.antd.configProvider)
+          withConfigProvider,
+          withAppConfig
         }
       )
     });
-    api.writeTmpFile({
-      path: "types.d.ts",
-      content: `
-import type { ConfigProviderProps } from 'antd/es/config-provider';
-export type RuntimeAntdConfig = (memo: ConfigProviderProps) => ConfigProviderProps;
-`
-    });
     api.writeTmpFile({
       path: import_umi.RUNTIME_TYPE_FILE_NAME,
       content: `
@@ -215,7 +220,10 @@ export type IRuntimeConfig = {
     });
   });
   api.addRuntimePlugin(() => {
-    return api.config.antd.configProvider ? [(0, import_withTmpPath.withTmpPath)({ api, path: "runtime.tsx" })] : [];
+    if (api.config.antd.configProvider || appComponentAvailable && api.config.antd.appConfig) {
+      return [(0, import_withTmpPath.withTmpPath)({ api, path: "runtime.tsx" })];
+    }
+    return [];
   });
   api.addEntryImportsAhead(() => {
     const style = api.config.antd.style || "less";

package/libs/locale/SelectLang.tpl

@@ -43,6 +43,7 @@ interface SelectLangProps {
   className?: string;
   reload?: boolean;
   icon?: React.ReactNode;
+  style?: React.CSSProperties;
 }
 
 const transformArrayToObject = (allLangUIConfig:LocalData[])=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230310.2",
+  "version": "4.0.0-canary.20230315.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -42,12 +42,12 @@
     "styled-components": "6.0.0-beta.9",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.0-canary.20230310.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20230315.1",
     "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20230310.2"
+    "umi": "4.0.0-canary.20230315.1"
   },
   "publishConfig": {
     "access": "public"

package/tpls/antd-runtime.ts.tpl

@@ -0,0 +1,63 @@
+import React from 'react';
+import {
+  Modal,
+{{#configProvider}}
+  ConfigProvider,
+{{/configProvider}}
+{{#appConfig}}
+  App,
+{{/appConfig}}
+  message,
+  notification,
+} from 'antd';
+import { ApplyPluginsType } from 'umi';
+import { getPluginManager } from '../core/plugin';
+
+export function rootContainer(rawContainer) {
+  const {
+    appConfig: finalAppConfig = {},
+    ...finalConfigProvider
+  } = getPluginManager().applyPlugins({
+    key: 'antd',
+    type: ApplyPluginsType.modify,
+    initialValue: {
+{{#configProvider}}
+      ...{{{configProvider}}},
+{{/configProvider}}
+{{#appConfig}}
+      appConfig: {{{appConfig}}},
+{{/appConfig}}
+    },
+  });
+
+  let container = rawContainer;
+
+{{#appConfig}}
+  // The App component should be under ConfigProvider
+  container = <App {...finalAppConfig}>{container}</App>;
+{{/appConfig}}
+
+{{#configProvider}}
+  if (finalConfigProvider.prefixCls) {
+    Modal.config({
+      rootPrefixCls: finalConfigProvider.prefixCls
+    });
+    message.config({
+      prefixCls: `${finalConfigProvider.prefixCls}-message`
+    });
+    notification.config({
+      prefixCls: `${finalConfigProvider.prefixCls}-notification`
+    });
+  }
+
+  if (finalConfigProvider.iconPrefixCls) {
+    // Icons in message need to set iconPrefixCls via ConfigProvider.config()
+    ConfigProvider.config({
+      iconPrefixCls: finalConfigProvider.iconPrefixCls,
+    });
+  };
+  container = <ConfigProvider {...finalConfigProvider}>{container}</ConfigProvider>;
+{{/configProvider}}
+
+  return container;
+}