@umijs/plugins 4.0.63 → 4.0.64

package/dist/unocss.js

@@ -22,7 +22,7 @@ __export(unocss_exports, {
   default: () => unocss_default
 });
 module.exports = __toCommonJS(unocss_exports);
-var import_child_process = require("child_process");
+var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_plugin_utils = require("umi/plugin-utils");
@@ -39,7 +39,7 @@ var unocss_default = (api) => {
     enableBy: api.EnableBy.config
   });
   const outputPath = "uno.css";
-  api.onBeforeCompiler(() => {
+  api.onBeforeCompiler(async () => {
     if (process.env.IS_UMI_BUILD_WORKER)
       return;
     if (!(0, import_fs.existsSync)((0, import_path.join)(api.paths.cwd, "unocss.config.ts")))
@@ -48,14 +48,21 @@ var unocss_default = (api) => {
       );
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);
     const binPath = (0, import_path.join)(api.cwd, "node_modules/.bin/unocss");
-    const watchDirs = api.config.unocss.watch;
-    const unocss = (0, import_child_process.exec)(
-      `${binPath} ${watchDirs.join(" ")} --out-file ${generatedPath} ${api.env === "development" ? "--watch" : ""}`,
-      { cwd: api.cwd }
-    );
-    unocss.on("error", (m) => {
-      api.logger.error("unocss service encounter an error: " + m);
+    const watchDirs = api.config.unocss.watch || [];
+    const isDev = api.env === "development";
+    const args = [
+      ...watchDirs,
+      "--out-file",
+      generatedPath,
+      isDev ? "--watch" : ""
+    ].filter(Boolean);
+    const execaRes = import_utils.execa.execa(binPath, args, {
+      cwd: api.cwd,
+      stdio: isDev ? "pipe" : "inherit"
     });
+    if (!isDev) {
+      await execaRes;
+    }
   });
   api.addEntryImports(() => {
     const generatedPath = (0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, outputPath));

package/libs/qiankun/master/MicroApp.tsx

@@ -58,9 +58,21 @@ export type Props = {
   className?: string;
 } & Record<string, any>;
 
-function unmountMicroApp(microApp?: MicroAppType) {
+function unmountMicroApp(microApp?: MicroAppType, updatingPromise?: Promise<void>) {
   if (microApp) {
-    microApp.mountPromise.then(() => microApp.unmount());
+    microApp.mountPromise.then(() => {
+      switch (microApp.getStatus()) {
+        case "MOUNTED":
+          microApp.unmount();
+          break;
+        case "UPDATING":
+          // UPDATING 阶段 updatingPromise 一定存在
+          updatingPromise!.then(() => microApp.unmount());
+          break;
+        default:
+          break;
+      }
+    });
   }
 }
 
@@ -213,7 +225,7 @@ export const MicroApp = forwardRef(
         },
       );
 
-      return () => unmountMicroApp(microAppRef.current);
+      return () => unmountMicroApp(microAppRef.current, updatingPromise.current);
     }, [name]);
 
     useEffect(() => {

package/package.json

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