@umijs/plugins 4.0.0-rc.18 → 4.0.0-rc.20

package/dist/layout.js

@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const allIcons = __importStar(require("@ant-design/icons"));
+const fs_1 = require("fs");
 const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
-const resolveProjectDep_1 = require("./utils/resolveProjectDep");
 const withTmpPath_1 = require("./utils/withTmpPath");
 exports.default = (api) => {
     api.describe({
@@ -39,11 +39,28 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    const pkgPath = (0, resolveProjectDep_1.resolveProjectDep)({
-        pkg: api.pkg,
-        cwd: api.cwd,
-        dep: '@ant-design/pro-layout',
-    }) || (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
+    /**
+     * 优先去找 '@alipay/tech-ui'，保证稳定性
+     */
+    const depList = ['@alipay/tech-ui', '@ant-design/pro-layout'];
+    const pkgHasDep = depList.find((dep) => {
+        var _a, _b;
+        const { pkg } = api;
+        if (((_a = pkg.dependencies) === null || _a === void 0 ? void 0 : _a[dep]) || ((_b = pkg.devDependencies) === null || _b === void 0 ? void 0 : _b[dep])) {
+            return true;
+        }
+        return false;
+    });
+    const getPkgPath = () => {
+        // 如果  layout 和 techui至少有一个在，找到他们的地址
+        if (pkgHasDep &&
+            (0, fs_1.existsSync)((0, path_1.join)(api.cwd, 'node_modules', pkgHasDep, 'package.json'))) {
+            return (0, path_1.join)(api.cwd, 'node_modules', pkgHasDep);
+        }
+        // 如果项目中没有去找插件以来的
+        return (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
+    };
+    const pkgPath = getPkgPath();
     api.modifyAppData((memo) => {
         const version = require(`${pkgPath}/package.json`).version;
         memo.pluginLayout = {
@@ -53,8 +70,11 @@ exports.default = (api) => {
         return memo;
     });
     api.modifyConfig((memo) => {
-        // import from @ant-design/pro-layout
-        memo.alias['@ant-design/pro-layout'] = pkgPath;
+        // 只在没有自行依赖 @ant-design/pro-layout 或 @alipay/tech-ui 时
+        // 才使用插件中提供的 @ant-design/pro-layout
+        if (!pkgHasDep) {
+            memo.alias['@ant-design/pro-layout'] = pkgPath;
+        }
         return memo;
     });
     api.onGenerateFiles(() => {
@@ -65,9 +85,9 @@ exports.default = (api) => {
             content: `
 import { Link, useLocation, useNavigate, Outlet, useAppData, useRouteData, matchRoutes } from 'umi';
 import { useMemo } from 'react';
-import ProLayout, {
-  PageLoading,
-} from '@ant-design/pro-layout';
+import  {
+  ProLayout,
+} from "${pkgHasDep || '@ant-design/pro-layout'}";
 import './Layout.less';
 import Logo from './Logo';
 import Exception from './Exception';

package/dist/qiankun/master.js

@@ -34,16 +34,14 @@ exports.default = (api) => {
             },
         },
     }));
-    // TODO: modify routes
     api.modifyRoutes((memo) => {
         Object.keys(memo).forEach((id) => {
+            var _a;
             const route = memo[id];
             if (route.microApp) {
                 const appName = route.microApp;
-                // TODO: config base
-                const base = '/';
-                // TODO: config masterHistoryType
-                const masterHistoryType = 'browser';
+                const base = api.config.base || '/';
+                const masterHistoryType = ((_a = api.config.history) === null || _a === void 0 ? void 0 : _a.type) || 'browser';
                 const routeProps = route.microAppProps || {};
                 const normalizedRouteProps = JSON.stringify(routeProps).replace(/"/g, "'");
                 route.file = `(async () => {

package/dist/qiankun/slave.js

@@ -74,8 +74,8 @@ exports.default = (api) => {
         return config;
     });
     api.addHTMLHeadScripts(() => {
-        var _a;
-        const dontModify = (_a = api.config.qiankun) === null || _a === void 0 ? void 0 : _a.shouldNotModifyRuntimePublicPath;
+        var _a, _b;
+        const dontModify = (_b = (_a = api.config.qiankun) === null || _a === void 0 ? void 0 : _a.slave) === null || _b === void 0 ? void 0 : _b.shouldNotModifyRuntimePublicPath;
         return dontModify
             ? []
             : [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.18",
+  "version": "4.0.0-rc.20",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,7 +25,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.38.0",
-    "@umijs/bundler-utils": "4.0.0-rc.18",
+    "@umijs/bundler-utils": "4.0.0-rc.20",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.3",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.18"
+    "umi": "4.0.0-rc.20"
   },
   "publishConfig": {
     "access": "public"