@umijs/plugins 4.0.0-canary.20220831.2 → 4.0.0-canary.20220920.1

package/dist/antd.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -98,15 +84,22 @@ var antd_default = (api) => {
     }
     if (antdVersion.startsWith("5")) {
       const theme = require("@ant-design/antd-theme-variable");
-      memo.theme = __spreadValues(__spreadValues({}, theme), memo.theme);
+      memo.theme = {
+        ...theme,
+        ...memo.theme
+      };
     }
     if (antd.dark || antd.compact) {
       const { getThemeVariables } = require("antd/dist/theme");
-      memo.theme = __spreadValues(__spreadValues({}, getThemeVariables(antd)), memo.theme);
+      memo.theme = {
+        ...getThemeVariables(antd),
+        ...memo.theme
+      };
     }
-    memo.theme = __spreadValues({
-      "root-entry-name": "default"
-    }, memo.theme);
+    memo.theme = {
+      "root-entry-name": "default",
+      ...memo.theme
+    };
     return memo;
   });
   api.addExtraBabelPlugins(() => {

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));
       }
     },
@@ -192,6 +193,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

@@ -53,7 +53,11 @@ var layout_default = (api) => {
     },
     enableBy: api.EnableBy.config
   });
-  const depList = ["@alipay/tech-ui", "@ant-design/pro-layout"];
+  const depList = [
+    "@alipay/tech-ui",
+    "@ant-design/pro-components",
+    "@ant-design/pro-layout"
+  ];
   const pkgHasDep = depList.find((dep) => {
     var _a, _b;
     const { pkg } = api;
@@ -70,7 +74,7 @@ var layout_default = (api) => {
     if (pkgHasDep && api.cwd !== cwd && (0, import_fs.existsSync)((0, import_path.join)(cwd, "node_modules", pkgHasDep, "package.json"))) {
       return (0, import_path.join)(cwd, "node_modules", pkgHasDep);
     }
-    return (0, import_path.dirname)(require.resolve("@ant-design/pro-layout/package.json"));
+    return (0, import_path.dirname)(require.resolve("@ant-design/pro-components/package.json"));
   };
   const pkgPath = (0, import_plugin_utils.winPath)(getPkgPath());
   api.modifyAppData((memo) => {
@@ -83,7 +87,8 @@ var layout_default = (api) => {
   });
   api.modifyConfig((memo) => {
     if (!pkgHasDep) {
-      memo.alias["@ant-design/pro-layout"] = pkgPath;
+      const name = require(`${pkgPath}/package.json`).name;
+      memo.alias[name] = pkgPath;
     }
     return memo;
   });
@@ -97,7 +102,7 @@ import type { IRoute } from 'umi';
 import React, { useMemo } from 'react';
 import {
   ProLayout,
-} from "${pkgPath || "@ant-design/pro-layout"}";
+} from "${pkgPath || "@ant-design/pro-components"}";
 import './Layout.less';
 import Logo from './Logo';
 import Exception from './Exception';
@@ -210,6 +215,7 @@ const { formatMessage } = useIntl();
         }
         return defaultDom;
       }}
+      itemRender={(route) => <Link to={route.path}>{route.breadcrumbName}</Link>}
       disableContentMargin
       fixSiderbar
       fixedHeader
@@ -259,7 +265,7 @@ const { formatMessage } = useIntl();
     api.writeTmpFile({
       path: "types.d.ts",
       content: `
-    import type { ProLayoutProps, HeaderProps } from "${pkgPath || "@ant-design/pro-layout"}";
+    import type { ProLayoutProps, HeaderProps } from "${pkgPath || "@ant-design/pro-components"}";
     ${hasInitialStatePlugin ? `import type InitialStateType from '@@/plugin-initialState/@@initialState';
            type InitDataType = ReturnType<typeof InitialStateType>;
         ` : "type InitDataType = any;"}
@@ -439,8 +445,7 @@ export function getRightRenderContent (opts: {
       path: "Layout.less",
       content: `
 ${antdVersion.startsWith("5") ? "" : "@import '~antd/es/style/themes/default.less';"}
-@pro-header-hover-bg: rgba(0, 0, 0, 0.025);
-@media screen and (max-width: @screen-xs) {
+@media screen and (max-width: 480px) {
   // \u5728\u5C0F\u5C4F\u5E55\u7684\u65F6\u5019\u53EF\u4EE5\u6709\u66F4\u597D\u7684\u4F53\u9A8C
   .umi-plugin-layout-container {
     width: 100% !important;
@@ -471,14 +476,14 @@ ${antdVersion.startsWith("5") ? "" : "@import '~antd/es/style/themes/default.les
     cursor: pointer;
     transition: all 0.3s;
     > i {
-      color: @text-color;
+      color: rgba(255, 255, 255, 0.85);
       vertical-align: middle;
     }
     &:hover {
-      background: @pro-header-hover-bg;
+      background: rgba(0, 0, 0, 0.025);
     }
     &:global(.opened) {
-      background: @pro-header-hover-bg;
+      background: rgba(0, 0, 0, 0.025);
     }
   }
   .umi-plugin-layout-search {

package/dist/locale.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -113,7 +96,10 @@ var locale_default = (api) => {
     const resolveKey = api.config.moment2dayjs ? "dayjs" : "moment";
     const momentPkgPath = (0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve(`${resolveKey}/package.json`)));
     const EventEmitterPkg = (0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve("event-emitter/package")));
-    const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = __spreadValues(__spreadValues({}, defaultConfig), api.config.locale);
+    const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = {
+      ...defaultConfig,
+      ...api.config.locale
+    };
     const defaultLocale = ((_a = api.config.locale) == null ? void 0 : _a.default) || `zh${baseSeparator}CN`;
     const localeList = await getList(resolveKey);
     const momentLocales = localeList.map(({ momentLocale }) => momentLocale).filter((locale) => locale);
@@ -166,7 +152,8 @@ var locale_default = (api) => {
         UseLocalStorage: !!useLocalStorage,
         LocaleDir: localeDirName,
         ExistLocaleDir: (0, import_fs.existsSync)(localeDirPath),
-        LocaleList: localeList.map((locale) => __spreadProps(__spreadValues({}, locale), {
+        LocaleList: localeList.map((locale) => ({
+          ...locale,
           antdLocale: locale.antdLocale.map((antdLocale, index) => ({
             locale: antdLocale,
             index

package/dist/qiankun/master.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -65,11 +48,16 @@ var master_default = (api) => {
   api.addRuntimePlugin(() => {
     return [(0, import_withTmpPath.withTmpPath)({ api, path: "masterRuntimePlugin.tsx" })];
   });
-  api.modifyDefaultConfig((config) => __spreadProps(__spreadValues({}, config), {
+  api.modifyDefaultConfig((config) => ({
+    ...config,
     mountElementId: import_constants.defaultMasterRootId,
-    qiankun: __spreadProps(__spreadValues({}, config.qiankun), {
-      master: __spreadValues(__spreadValues({}, JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || "{}")), (config.qiankun || {}).master)
-    })
+    qiankun: {
+      ...config.qiankun,
+      master: {
+        ...JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || "{}"),
+        ...(config.qiankun || {}).master
+      }
+    }
   }));
   api.modifyRoutes((memo) => {
     Object.keys(memo).forEach((id) => {
@@ -122,10 +110,11 @@ export interface IRuntimeConfig {
     api.writeTmpFile({
       path: "masterOptions.ts",
       content: `
-let options = ${JSON.stringify(__spreadValues({
+let options = ${JSON.stringify({
         masterHistoryType: ((_a = api.config.history) == null ? void 0 : _a.type) || import_constants.defaultHistoryType,
-        base: api.config.base || "/"
-      }, api.config.qiankun.master))};
+        base: api.config.base || "/",
+        ...api.config.qiankun.master
+      })};
 export const getMasterOptions = () => options;
 export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts });
       `

package/dist/qiankun/slave.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -42,7 +25,7 @@ __export(slave_exports, {
   default: () => slave_default
 });
 module.exports = __toCommonJS(slave_exports);
-var import_http_proxy_middleware = require("@umijs/bundler-webpack/compiled/http-proxy-middleware");
+var import_http_proxy_middleware = require("@umijs/bundler-utils/compiled/http-proxy-middleware");
 var import_utils = require("@umijs/utils");
 var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
@@ -139,31 +122,32 @@ export interface IRuntimeConfig {
     });
   });
   api.modifyDefaultConfig((memo) => {
-    var _a, _b, _c;
-    const initialSlaveOptions = __spreadValues(__spreadValues({
-      devSourceMap: true
-    }, JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}")), (memo.qiankun || {}).slave);
-    const modifiedDefaultConfig = __spreadProps(__spreadValues({}, memo), {
+    var _a, _b, _c, _d, _e;
+    const initialSlaveOptions = {
+      devSourceMap: true,
+      ...JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}"),
+      ...(memo.qiankun || {}).slave
+    };
+    const modifiedDefaultConfig = {
+      ...memo,
       runtimePublicPath: true,
-      qiankun: __spreadProps(__spreadValues({}, memo.qiankun), {
+      qiankun: {
+        ...memo.qiankun,
         slave: initialSlaveOptions
-      })
-    });
+      }
+    };
     const shouldNotModifyDefaultBase = ((_b = (_a = api.userConfig.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.shouldNotModifyDefaultBase) ?? initialSlaveOptions.shouldNotModifyDefaultBase;
     const historyType = ((_c = api.userConfig.history) == null ? void 0 : _c.type) || "browser";
     if (!shouldNotModifyDefaultBase && historyType !== "hash") {
       modifiedDefaultConfig.base = `/${api.pkg.name}`;
     }
-    return modifiedDefaultConfig;
-  });
-  api.modifyConfig((config) => {
-    var _a, _b;
-    if (config.mfsu !== false) {
-      config.mfsu = __spreadProps(__spreadValues({}, 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;
@@ -234,10 +218,10 @@ export { connectMaster } from './connectMaster';
   });
   api.addMiddlewares(async () => {
     return async (req, res, next) => {
-      var _a;
+      var _a, _b;
       const qiankunConfig = api.config.qiankun || {};
       const masterEntry = (_a = qiankunConfig.slave) == null ? void 0 : _a.masterEntry;
-      const isMasterApp = qiankunConfig.master.enable;
+      const isMasterApp = (_b = qiankunConfig.master) == null ? void 0 : _b.enable;
       const { proxyToMasterEnabled } = await api.applyPlugins({
         key: "shouldProxyToMaster",
         type: api.ApplyPluginsType.modify,

package/dist/tailwindcss.js

@@ -39,7 +39,7 @@ var tailwindcss_default = (api) => {
   api.onBeforeCompiler(() => {
     const inputPath = (0, import_path.join)(api.cwd, "tailwind.css");
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);
-    const binPath = (0, import_path.join)(api.cwd, "node_modules/.bin/tailwind");
+    const binPath = getTailwindBinPath({ cwd: api.cwd });
     const configPath = (0, import_path.join)(process.env.APP_ROOT || api.cwd, "tailwind.config.js");
     return new Promise((resolve) => {
       tailwind = (0, import_plugin_utils.crossSpawn)(`${binPath}`, [
@@ -73,5 +73,12 @@ var tailwindcss_default = (api) => {
     return [{ source: generatedPath }];
   });
 };
+function getTailwindBinPath(opts) {
+  const pkgPath = require.resolve("tailwindcss/package.json", {
+    paths: [opts.cwd]
+  });
+  const tailwindPath = require(pkgPath).bin["tailwind"];
+  return (0, import_path.join)((0, import_path.dirname)(pkgPath), tailwindPath);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220831.2",
+  "version": "4.0.0-canary.20220920.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -26,8 +26,8 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^7.0.1-beta.28",
-    "@umijs/bundler-utils": "4.0.0-canary.20220831.2",
+    "@ant-design/pro-components": "^2.0.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220920.1",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -46,7 +46,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220831.2"
+    "umi": "4.0.0-canary.20220920.1"
   },
   "publishConfig": {
     "access": "public"