@umijs/plugins 4.0.69 → 4.0.71

package/dist/antd.js

@@ -53,6 +53,7 @@ var antd_default = (api) => {
     antdVersion = require(`${pkgPath}/package.json`).version;
   } catch (e) {
   }
+  const isV5 = antdVersion.startsWith("5");
   const appComponentAvailable = import_plugin_utils.semver.gte(antdVersion, "5.1.0");
   const appConfigAvailable = import_plugin_utils.semver.gte(antdVersion, "5.3.0");
   const day2MomentAvailable = import_plugin_utils.semver.gte(antdVersion, "5.0.0");
@@ -72,7 +73,8 @@ var antd_default = (api) => {
           // 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")
+          momentPicker: zod.boolean().describe("Only antd@5.x is supported"),
+          styleProvider: zod.record(zod.any())
         }).deepPartial();
       }
     },
@@ -167,7 +169,7 @@ var antd_default = (api) => {
     return memo;
   });
   api.addExtraBabelPlugins(() => {
-    const style = antdVersion.startsWith("5") ? false : api.config.antd.style || "less";
+    const style = isV5 ? false : api.config.antd.style || "less";
     return api.config.antd.import && !api.appData.vite ? [
       [
         require.resolve("babel-plugin-import"),
@@ -183,13 +185,38 @@ var antd_default = (api) => {
     ] : [];
   });
   api.onGenerateFiles(() => {
+    var _a;
     const withConfigProvider = !!api.config.antd.configProvider;
     const withAppConfig = appConfigAvailable && !!api.config.antd.appConfig;
+    const styleProvider = api.config.antd.styleProvider;
+    const ieTarget = !!((_a = api.config.targets) == null ? void 0 : _a.ie) || !!api.config.legacy;
+    let styleProviderConfig = false;
+    if (isV5 && (ieTarget || styleProvider)) {
+      const cssinjs = (0, import_resolveProjectDep.resolveProjectDep)({
+        pkg: api.pkg,
+        cwd: api.cwd,
+        dep: "@ant-design/cssinjs"
+      }) || (0, import_path.dirname)(require.resolve("@ant-design/cssinjs/package.json"));
+      if (cssinjs) {
+        styleProviderConfig = {
+          cssinjs
+        };
+        if (ieTarget) {
+          styleProviderConfig.hashPriority = "high";
+          styleProviderConfig.legacyTransformer = true;
+        }
+        styleProviderConfig = {
+          ...styleProviderConfig,
+          ...styleProvider
+        };
+      }
+    }
     api.writeTmpFile({
       path: `runtime.tsx`,
       context: {
         configProvider: withConfigProvider && JSON.stringify(api.config.antd.configProvider),
-        appConfig: appComponentAvailable && JSON.stringify(api.config.antd.appConfig)
+        appConfig: appComponentAvailable && JSON.stringify(api.config.antd.appConfig),
+        styleProvider: styleProviderConfig
       },
       tplPath: (0, import_plugin_utils.winPath)((0, import_path.join)(ANTD_TEMPLATES_DIR, "runtime.ts.tpl"))
     });

package/dist/dva.js

@@ -42,7 +42,7 @@ var import_plugin_utils = require("umi/plugin-utils");
 var import_modelUtils = require("./utils/modelUtils");
 var import_withTmpPath = require("./utils/withTmpPath");
 var dva_default = (api) => {
-  const pkgPath = (0, import_path.join)(__dirname, "../libs/dva.ts");
+  const pkgPath = (0, import_path.join)(__dirname, "../libs/dva.tsx");
   api.describe({
     config: {
       schema({ zod }) {
@@ -68,7 +68,7 @@ var dva_default = (api) => {
     return memo;
   });
   api.onGenerateFiles((args) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const models = args.isFirstTime ? api.appData.pluginDva.models : getAllModels(api);
     api.writeTmpFile({
       path: "models.ts",
@@ -214,7 +214,7 @@ interface EffectsCommandMap {
 interface Action<T = any> {
       type: T
 }
-export type Reducer<S = any, A extends Action = AnyAction> = (prevState: S, action: A) => S;
+export type Reducer<S = any, A extends Action = AnyAction> = (prevState: S, action: A) => ${((_g = api.config.dva) == null ? void 0 : _g.immer) ? "S | void" : "S"};
 export type Effect = (action: AnyAction, effects: EffectsCommandMap) => void;
 type EffectType = 'takeEvery' | 'takeLatest' | 'watcher' | 'throttle';
 type EffectWithType = [Effect, { type: EffectType }];

package/dist/layout.js

@@ -251,7 +251,17 @@ const { formatMessage } = useIntl();
         }
         return defaultDom;
       }}
-      itemRender={(route) => <Link to={route.path}>{route.breadcrumbName}</Link>}
+      itemRender={(route, _, routes) => {
+        const { breadcrumbName, title, path } = route;
+        const label = title || breadcrumbName
+        const last = routes[routes.length - 1]
+        if (last) {
+          if (last.path === path || last.linkPath === path) {
+            return <span>{label}</span>;
+          }
+        }
+        return <Link to={path}>{label}</Link>;
+      }}
       disableContentMargin
       fixSiderbar
       fixedHeader

package/dist/locale.js

@@ -108,7 +108,7 @@ var locale_default = (api) => {
     });
   };
   api.onGenerateFiles(async () => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const localeTpl = (0, import_fs.readFileSync)(
       (0, import_path.join)(LOCALE_TEMPLATES_DIR, "locale.tpl"),
       "utf-8"
@@ -139,7 +139,7 @@ var locale_default = (api) => {
       }
     }
     let DefaultAntdLocales = [];
-    if (!antdLocales.length && ((_c = api.config.locale) == null ? void 0 : _c.antd)) {
+    if (!antdLocales.length && antd) {
       const [lang, country = ""] = defaultLocale.split(baseSeparator);
       DefaultAntdLocales = import_plugin_utils.lodash.uniq(
         await addAntdLocales({
@@ -218,7 +218,7 @@ var locale_default = (api) => {
         Antd: !!antd,
         LocaleList: localeList,
         ShowSelectLang: localeList.length > 1 && !!antd,
-        antdFiles: ((_d = api.config) == null ? void 0 : _d.ssr) ? "lib" : "es"
+        antdFiles: ((_c = api.config) == null ? void 0 : _c.ssr) ? "lib" : "es"
       })
     });
     api.writeTmpFile({

package/libs/dva.tsx

@@ -0,0 +1,45 @@
+import React from 'react';
+// @ts-ignore
+import { create, saga, utils } from 'dva-core';
+import {
+  connect,
+  Provider,
+  useDispatch,
+  useSelector,
+  useStore,
+} from 'react-redux';
+export { bindActionCreators } from 'redux';
+export { create, saga, utils };
+export { connect, Provider, useDispatch, useSelector, useStore };
+
+export default function dva(opts: any) {
+  const app = create(opts, {
+    initialReducer: {},
+    setupApp() {},
+  });
+  const oldAppStart = app.start;
+  app.router = router;
+  app.start = start;
+  return app;
+
+  function router(router: any) {
+    app._router = router;
+  }
+
+  function start(elem: any) {
+    // old dva.start() supports passing arguments
+    if (typeof elem !== 'undefined') {
+      throw new Error('dva.start() should not be called with any arguments.');
+    }
+    if (!app._store) {
+      oldAppStart.call(app);
+    }
+    const store = app._store;
+    const router = app._router;
+    return (extraProps: any) => {
+      return (
+        <Provider store={store}>{router({ app, ...extraProps })}</Provider>
+      );
+    };
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.69",
+  "version": "4.0.71",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -19,6 +19,7 @@
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/antd-theme-variable": "^1.0.0",
+    "@ant-design/cssinjs": "^1.9.1",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/moment-webpack-plugin": "^0.0.3",
     "@ant-design/pro-components": "^2.0.1",
@@ -43,12 +44,12 @@
     "styled-components": "6.0.0-rc.0",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.69",
-    "@umijs/valtio": "1.0.3"
+    "@umijs/valtio": "1.0.3",
+    "@umijs/bundler-utils": "4.0.71"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.69"
+    "umi": "4.0.71"
   },
   "publishConfig": {
     "access": "public"

package/templates/antd/runtime.ts.tpl

@@ -11,6 +11,14 @@ import {
   notification,
 } from 'antd';
 import { ApplyPluginsType } from 'umi';
+{{#styleProvider}}
+import {
+  StyleProvider,
+  {{#styleProvider.legacyTransformer}}
+  legacyLogicalPropertiesTransformer
+  {{/styleProvider.legacyTransformer}}
+} from '{{{styleProvider.cssinjs}}}';
+{{/styleProvider}}
 import { getPluginManager } from '../core/plugin';
 
 let cacheAntdConfig = null;
@@ -58,9 +66,32 @@ export function rootContainer(rawContainer) {
       iconPrefixCls: finalConfigProvider.iconPrefixCls,
     });
   };
+
+  if (finalConfigProvider.theme) {
+    // Pass config theme to static method
+    ConfigProvider.config({
+      theme: finalConfigProvider.theme,
+    });
+  }
+
   container = <ConfigProvider {...finalConfigProvider}>{container}</ConfigProvider>;
 {{/configProvider}}
 
+{{#styleProvider}}
+  container = (
+    <StyleProvider
+      {{#styleProvider.hashPriority}}
+      hashPriority="{{{styleProviderConfig.hashPriority}}}"
+      {{/styleProvider.hashPriority}}
+      {{#styleProvider.legacyTransformer}}
+      transformers={[legacyLogicalPropertiesTransformer]}
+      {{/styleProvider.legacyTransformer}}
+    >
+      {container}
+    </StyleProvider>
+  );
+{{/styleProvider}}
+
   return container;
 }
 

package/templates/locale/localeExports.tpl

@@ -90,8 +90,8 @@ export const addLocale = (
     ? Object.assign({}, localeInfo[name].messages, messages)
     : messages;
 
-
-  const { momentLocale, antd } = extraLocales || {};
+  // 用户只是追加 messages 时，extraLocales 可选
+  const { momentLocale = localeInfo[name]?.momentLocale, antd = localeInfo[name]?.antd } = extraLocales || {};
   const locale = name.split('{{BaseSeparator}}')?.join('-')
   localeInfo[name] = {
     messages: mergeMessages,

package/libs/dva.ts

@@ -1,10 +0,0 @@
-// @ts-ignore
-export { create, saga, utils } from 'dva-core';
-export {
-  connect,
-  Provider,
-  useDispatch,
-  useSelector,
-  useStore,
-} from 'react-redux';
-export { bindActionCreators } from 'redux';