@umijs/plugins 4.0.71 → 4.0.73

package/dist/layout.js

@@ -64,6 +64,8 @@ var layout_default = (api) => {
     antdVersion = require(`${pkgPath2}/package.json`).version;
   } catch (e) {
   }
+  const isAntd5 = antdVersion.startsWith("5");
+  const layoutFile = isAntd5 ? "Layout.css" : "Layout.less";
   api.describe({
     key: "layout",
     config: {
@@ -130,7 +132,7 @@ import React, { useMemo } from 'react';
 import {
   ProLayout,
 } from "${resolvedPkgPath}";
-import './Layout.less';
+import './${layoutFile}';
 import Logo from './Logo';
 import Exception from './Exception';
 import { getRightRenderContent } from './rightRender';
@@ -517,12 +519,12 @@ export function getRightRenderContent (opts: {
       })
     });
     api.writeTmpFile({
-      path: "Layout.less",
+      path: layoutFile,
       content: `
 ${// antd@5里面没有这个样式了
-      antdVersion.startsWith("5") ? "" : "@import '~antd/es/style/themes/default.less';"}
+      isAntd5 ? "" : "@import '~antd/es/style/themes/default.less';"}
 @media screen and (max-width: 480px) {
-  // 在小屏幕的时候可以有更好的体验
+  /* 在小屏幕的时候可以有更好的体验 */
   .umi-plugin-layout-container {
     width: 100% !important;
   }
@@ -530,13 +532,11 @@ ${// antd@5里面没有这个样式了
     border-radius: 0 !important;
   }
 }
-.umi-plugin-layout-menu {
-  .anticon {
-    margin-right: 8px;
-  }
-  .ant-dropdown-menu-item {
-    min-width: 160px;
-  }
+.umi-plugin-layout-menu .anticon {
+  margin-right: 8px;
+}
+.umi-plugin-layout-menu .ant-dropdown-menu-item {
+  min-width: 160px;
 }
 .umi-plugin-layout-right {
   display: flex !important;
@@ -544,30 +544,30 @@ ${// antd@5里面没有这个样式了
   height: 100%;
   margin-left: auto;
   overflow: hidden;
-  .umi-plugin-layout-action {
-    display: flex;
-    align-items: center;
-    height: 100%;
-    padding: 0 12px;
-    cursor: pointer;
-    transition: all 0.3s;
-    > i {
-      color: rgba(255, 255, 255, 0.85);
-      vertical-align: middle;
-    }
-    &:hover {
-      background: rgba(0, 0, 0, 0.025);
-    }
-    &:global(.opened) {
-      background: rgba(0, 0, 0, 0.025);
-    }
-  }
-  .umi-plugin-layout-search {
-    padding: 0 12px;
-    &:hover {
-      background: transparent;
-    }
-  }
+}
+.umi-plugin-layout-right .umi-plugin-layout-action {
+  display: flex;
+  align-items: center;
+  height: 100%;
+  padding: 0 12px;
+  cursor: pointer;
+  transition: all 0.3s;
+}
+.umi-plugin-layout-right .umi-plugin-layout-action > i {
+  color: rgba(255, 255, 255, 0.85);
+  vertical-align: middle;
+}
+.umi-plugin-layout-right .umi-plugin-layout-action:hover {
+  background: rgba(0, 0, 0, 0.025);
+}
+.umi-plugin-layout-right .umi-plugin-layout-action.opened {
+  background: rgba(0, 0, 0, 0.025);
+}
+.umi-plugin-layout-right .umi-plugin-layout-search {
+  padding: 0 12px;
+}
+.umi-plugin-layout-right .umi-plugin-layout-search:hover {
+  background: transparent;
 }
 .umi-plugin-layout-name {
   margin-left: 8px;

package/dist/tailwindcss.js

@@ -22,8 +22,11 @@ __export(tailwindcss_exports, {
   default: () => tailwindcss_default
 });
 module.exports = __toCommonJS(tailwindcss_exports);
+var import_fs = require("fs");
 var import_path = require("path");
 var import_plugin_utils = require("umi/plugin-utils");
+var CHECK_INTERVAL = 300;
+var CHECK_TIMEOUT_UNIT_SECOND = 5;
 var tailwindcss_default = (api) => {
   api.describe({
     key: "tailwindcss",
@@ -71,7 +74,21 @@ var tailwindcss_default = (api) => {
         });
       } else {
         api.logger.info("tailwindcss service started");
-        resolve();
+        const interval = setInterval(() => {
+          if ((0, import_fs.existsSync)(generatedPath)) {
+            clearInterval(interval);
+            resolve();
+          }
+        }, CHECK_INTERVAL);
+        const timer = setTimeout(() => {
+          if (!(0, import_fs.existsSync)(generatedPath)) {
+            clearInterval(timer);
+            api.logger.error(
+              `tailwindcss generate failed after ${CHECK_TIMEOUT_UNIT_SECOND} seconds, please check your tailwind.css and tailwind.config.js`
+            );
+            process.exit(1);
+          }
+        }, CHECK_TIMEOUT_UNIT_SECOND * 1e3);
       }
     });
   });

package/libs/qiankun/master/common.ts

@@ -5,8 +5,11 @@
  * @since 2019-06-20
  */
 
-import React, { ReactComponentElement } from 'react';
+import React from 'react';
 import { Navigate, type IRouteProps } from 'umi';
+import { defaultMicroAppRouteMode, MicroAppRouteMode } from './constants';
+import { getMicroAppRouteComponent } from './getMicroAppRouteComponent';
+import type { MicroAppRoute } from './types';
 
 export const defaultMountContainerId = 'root-subapp';
 
@@ -44,14 +47,7 @@ function testPathWithStaticPrefix(pathPrefix: string, realPath: string) {
 // }
 
 export function patchMicroAppRoute(
-  route: any,
-  getMicroAppRouteComponent: (opts: {
-    appName: string;
-    base: string;
-    routePath: string;
-    masterHistoryType: string;
-    routeProps?: any;
-  }) => string | ReactComponentElement<any>,
+  route: MicroAppRoute,
   masterOptions: {
     base: string;
     masterHistoryType: string;
@@ -75,8 +71,9 @@ export function patchMicroAppRoute(
       }
     }
 
-    // 自动追加通配符，匹配子应用的路由
-    if (!route.path.endsWith('/*')) {
+    const { mode = defaultMicroAppRouteMode } = route;
+    // 在前缀模式下，自动追加通配符，匹配子应用的路由
+    if (mode === MicroAppRouteMode.PREPEND && !route.path.endsWith('/*')) {
       route.path = route.path.replace(/\/?$/, '/*');
     }
 
@@ -90,6 +87,7 @@ export function patchMicroAppRoute(
       appName: microAppName,
       base,
       routePath: route.path,
+      routeMode: route.mode,
       masterHistoryType,
       routeProps,
     };

package/libs/qiankun/master/constants.ts

@@ -5,3 +5,15 @@ export const defaultMasterRootId = 'root-master';
 export const defaultHistoryType = 'browser';
 export const qiankunStateForSlaveModelNamespace = '@@qiankunStateForSlave';
 export const qiankunStateFromMasterModelNamespace = '@@qiankunStateFromMaster';
+export enum MicroAppRouteMode {
+  /**
+   * 既作为匹配规则，也作为子应用 router.basename
+   */
+  PREPEND = 'prepend',
+  /**
+   * 仅作为匹配规则
+   */
+  MATCH = 'match',
+}
+
+export const defaultMicroAppRouteMode = MicroAppRouteMode.PREPEND;

package/libs/qiankun/master/getMicroAppRouteComponent.tsx.tpl

@@ -1,23 +1,27 @@
 import React from 'react';
 import { useMatch } from 'umi';
 import { MicroApp } from './MicroApp';
+import { defaultMicroAppRouteMode, MicroAppRouteMode } from './constants';
 
 export function getMicroAppRouteComponent(opts: {
   appName: string;
   base: string;
   routePath: string;
+  routeMode: MicroAppRouteMode;
   masterHistoryType: string;
   routeProps?: any;
 }) {
-  const { base, masterHistoryType, appName, routeProps, routePath } = opts;
+  const { base, masterHistoryType, appName, routeProps, routePath, routeMode = defaultMicroAppRouteMode } = opts;
   const RouteComponent = () => {
     const match = useMatch(routePath);
     const url = match ? match.pathnameBase : '';
     // 默认取静态配置的 base
-    let umiConfigBase = base === '/' ? '' : base;
+    let umiConfigBase = base === '/' ? '' : trimEndSlash(base);
+    // 匹配模式下，routePath 不会作为 prefix
+    const prefix = routeMode === MicroAppRouteMode.MATCH ? '' : trimEndSlash(url);
 
     // 拼接子应用挂载路由
-    let runtimeMatchedBase = umiConfigBase + (url.endsWith('/') ? url.substr(0, url.length - 1) : url);
+    let runtimeMatchedBase = umiConfigBase + prefix;
 
     {{#dynamicRoot}}
     // @see https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/htmlUtils.ts#L102
@@ -35,3 +39,7 @@ export function getMicroAppRouteComponent(opts: {
 
   return RouteComponent;
 }
+
+function trimEndSlash(p: string) {
+  return p.endsWith('/') ? p.slice(0, -1) : p;
+}

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -5,10 +5,9 @@ import { getPluginManager } from '@@/core/plugin';
 import { prefetchApps } from 'qiankun';
 import { ApplyPluginsType } from 'umi';
 import { insertRoute, noop, patchMicroAppRoute } from './common';
-import { getMicroAppRouteComponent } from './getMicroAppRouteComponent';
 import { getMasterOptions, setMasterOptions } from './masterOptions';
-import { MasterOptions, MicroAppRoute } from './types';
 import { deepFilterLeafRoutes } from './routeUtils';
+import { MasterOptions, MicroAppRoute } from './types';
 
 let microAppRuntimeRoutes: MicroAppRoute[];
 
@@ -55,9 +54,8 @@ function patchMicroAppRouteComponent(routes: any[]) {
       getMasterOptions() as MasterOptions;
     microAppRuntimeRoutes.reverse().forEach((microAppRoute) => {
       const patchRoute = (route: any) => {
-        patchMicroAppRoute(route, getMicroAppRouteComponent, {
+        patchMicroAppRoute(route, {
           base,
-          routePath: route.path,
           masterHistoryType,
           routeBindingAlias,
         });

package/libs/qiankun/master/types.ts

@@ -1,6 +1,7 @@
 // @ts-nocheck
 /* eslint-disable */
 import { FrameworkConfiguration, FrameworkLifeCycles } from 'qiankun';
+import type { MicroAppRouteMode } from './constants';
 
 type BaseIConfig = any;
 
@@ -18,6 +19,7 @@ export type App = {
 export type MicroAppRoute = {
   path: string;
   microApp: string;
+  mode: `${MicroAppRouteMode}`;
 } & Record<string, any>;
 
 export type MasterOptions = {

package/libs/qiankun/slave/slaveRuntimePlugin.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
-import qiankunRender, { contextOptsStack } from './lifecycles';
 import { createHistory } from '@@/core/history';
+import qiankunRender, { contextOptsStack } from './lifecycles';
 
 export function render(oldRender: any) {
   return qiankunRender().then(oldRender);
@@ -11,7 +11,9 @@ export function modifyClientRenderOpts(memo: any) {
   const clientRenderOpts = contextOptsStack.shift();
   const { basename, historyType } = memo;
 
-  const newBasename = clientRenderOpts?.basename || basename;
+  // use ?? instead of ||, incase clientRenderOpts.basename is ''
+  // only break when microApp has a config.base and mount path is /*
+  const newBasename = clientRenderOpts?.basename ?? basename;
   const newHistoryType = clientRenderOpts?.historyType || historyType;
 
   if (newHistoryType !== historyType || newBasename !== basename) {

package/package.json

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