@umijs/plugins 4.0.63 → 4.0.65

package/dist/qiankun/slave.js

@@ -48,7 +48,8 @@ function getCurrentLocalDevServerEntry(api, req) {
   return `${protocol}://${hostname}${port ? ":" : ""}${port}/local-dev-server`;
 }
 function handleOriginalHtml(api, microAppEntry, originalHtml) {
-  const appName = api.pkg.name;
+  var _a, _b;
+  const appName = ((_b = (_a = api.config.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.appName) || api.pkg.name;
   (0, import_assert.default)(
     appName,
     "[@umijs/plugin-qiankun]: You should have name in package.json"

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/dist/utils/modelUtils.js

@@ -34,6 +34,7 @@ __export(modelUtils_exports, {
   getNamespace: () => getNamespace
 });
 module.exports = __toCommonJS(modelUtils_exports);
+var import_bundler_utils = require("@umijs/bundler-utils");
 var parser = __toESM(require("@umijs/bundler-utils/compiled/babel/parser"));
 var import_traverse = __toESM(require("@umijs/bundler-utils/compiled/babel/traverse"));
 var t = __toESM(require("@umijs/bundler-utils/compiled/babel/types"));
@@ -157,16 +158,28 @@ var _ModelUtils = class {
     });
   }
   isModelValid(opts) {
+    var _a;
     const { file, content } = opts;
     if (this.opts.contentTest && this.opts.contentTest(content)) {
       return true;
     }
-    const loader = (0, import_path.extname)(file).slice(1);
-    const result = (0, import_esbuild.transformSync)(content, {
-      loader,
-      sourcemap: false,
-      minify: false
-    });
+    let result = null;
+    try {
+      const ext = (0, import_path.extname)(file).slice(1);
+      const loader = ext === "js" ? "jsx" : ext;
+      result = (0, import_esbuild.transformSync)(content, {
+        loader,
+        sourcemap: false,
+        minify: false,
+        sourcefile: file
+      });
+    } catch (e) {
+      if ((_a = e.errors) == null ? void 0 : _a.length) {
+        (0, import_bundler_utils.prettyPrintEsBuildErrors)(e.errors, { path: file, content });
+        delete e.errors;
+      }
+      throw e;
+    }
     let ret = false;
     const ast = parser.parse(result.code, {
       sourceType: "module",

package/libs/qiankun/master/MicroApp.tsx

@@ -58,9 +58,24 @@ 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;
+      }
+    });
   }
 }
 
@@ -144,7 +159,10 @@ export const MicroApp = forwardRef(
     const stateForSlave = (useModel || noop)(
       qiankunStateForSlaveModelNamespace,
     );
-    const { entry, props: { settings: settingsFromConfig = {}, ...propsFromConfig } = {} } = appConfig || {};
+    const {
+      entry,
+      props: { settings: settingsFromConfig = {}, ...propsFromConfig } = {},
+    } = appConfig || {};
 
     useEffect(() => {
       setComponentError(null);
@@ -213,7 +231,8 @@ 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.65",
   "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.65",
     "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.63"
+    "umi": "4.0.65"
   },
   "publishConfig": {
     "access": "public"