@umijs/plugins 4.0.0-canary.20230724.1 → 4.0.0-canary.20230811.1

package/dist/qiankun/master.js

@@ -33,6 +33,7 @@ __export(master_exports, {
   isMasterEnable: () => isMasterEnable
 });
 module.exports = __toCommonJS(master_exports);
+var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
 var import_umi = require("umi");
@@ -47,6 +48,15 @@ function isMasterEnable(opts) {
   }
   return !!process.env.INITIAL_QIANKUN_MASTER_OPTIONS;
 }
+function getCustomLoader(api) {
+  var _a, _b, _c;
+  const loader = (_b = (_a = api.config.qiankun) == null ? void 0 : _a.master) == null ? void 0 : _b.loader;
+  (0, import_assert.default)(
+    !loader || ((_c = loader.startsWith) == null ? void 0 : _c.call(loader, "@/")),
+    "[@umijs/plugin-qiankun]: loader only support root path, eg: @/loading"
+  );
+  return loader;
+}
 var master_default = (api) => {
   api.describe({
     key: "qiankun-master",
@@ -134,8 +144,13 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
     });
     api.writeTmpFile({
       path: "MicroAppLoader.tsx",
-      // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
-      content: api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : `export default function Loader() { console.warn(\`[plugins/qiankun]: Seems like you'r not using @umijs/plugin-antd, you need to provide a custom loader or set autoSetLoading false to shut down this warning!\`); return null; }`
+      content: getCustomLoader(api) ? (
+        // 用户自定义的 loading 优先级最高
+        `export { default } from '${getCustomLoader(api)}';`
+      ) : api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : (
+        // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
+        `export default function Loader() { console.warn(\`[plugins/qiankun]: Seems like you'r not using @umijs/plugin-antd, you need to provide a custom loader or set autoSetLoading false to shut down this warning!\`); return null; }`
+      )
     });
     [
       "common.ts",

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/getMicroAppRouteComponent.tsx.tpl

@@ -16,9 +16,9 @@ export function getMicroAppRouteComponent(opts: {
     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 ? '' : (url.endsWith('/') ? url.substr(0, url.length - 1) : url);
+    const prefix = routeMode === MicroAppRouteMode.MATCH ? '' : trimEndSlash(url);
 
     // 拼接子应用挂载路由
     let runtimeMatchedBase = umiConfigBase + prefix;
@@ -39,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/types.ts

@@ -24,6 +24,7 @@ export type MicroAppRoute = {
 
 export type MasterOptions = {
   enable?: boolean;
+  loader?: string;
   apps?: App[];
   routes?: MicroAppRoute[];
   lifeCycles?: FrameworkLifeCycles<object>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230724.1",
+  "version": "4.0.0-canary.20230811.1",
   "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/bundler-utils": "4.0.0-canary.20230724.1",
-    "@umijs/valtio": "1.0.3"
+    "@umijs/valtio": "1.0.3",
+    "@umijs/bundler-utils": "4.0.0-canary.20230811.1"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20230724.1"
+    "umi": "4.0.0-canary.20230811.1"
   },
   "publishConfig": {
     "access": "public"