umi 4.7.23 → 4.7.25

package/dist/cli/dev.js

@@ -34,17 +34,18 @@ __export(dev_exports, {
 module.exports = __toCommonJS(dev_exports);
 var import_fork = __toESM(require("./fork"));
 function dev() {
-  const child = (0, import_fork.default)({
+  const devProcess = (0, import_fork.default)({
     scriptPath: require.resolve("../../bin/forkedDev")
   });
-  process.on("SIGINT", () => {
-    child.kill("SIGINT");
-    process.exit(0);
-  });
-  process.on("SIGTERM", () => {
-    child.kill("SIGTERM");
-    process.exit(1);
-  });
+  let exiting = false;
+  const onSignal = (signal, exitCode) => {
+    if (exiting)
+      return;
+    exiting = true;
+    devProcess.stop(signal).then(() => process.exit(exitCode));
+  };
+  process.on("SIGINT", () => onSignal("SIGINT", 0));
+  process.on("SIGTERM", () => onSignal("SIGTERM", 1));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cli/fork.d.ts

@@ -1,5 +1,9 @@
+import type { ChildProcess } from 'child_process';
 interface IOpts {
     scriptPath: string;
 }
-export default function start({ scriptPath }: IOpts): import("child_process").ChildProcess;
+export default function start({ scriptPath }: IOpts): {
+    readonly child: ChildProcess;
+    stop(signal: NodeJS.Signals): Promise<void>;
+};
 export {};

package/dist/cli/fork.js

@@ -22,10 +22,63 @@ __export(fork_exports, {
   default: () => start
 });
 module.exports = __toCommonJS(fork_exports);
-var import_child_process = require("child_process");
 var import_utils = require("@umijs/utils");
+var import_child_process = require("child_process");
 var usedPorts = [];
 function start({ scriptPath }) {
+  let child;
+  let restarting = false;
+  let stopping = false;
+  function spawn() {
+    const worker = (0, import_child_process.fork)(scriptPath, process.argv.slice(2), {
+      execArgv: getExecArgv()
+    });
+    child = worker;
+    worker.on("message", (data) => {
+      var _a;
+      const { type, payload } = data || {};
+      if (type === "RESTART" && !restarting && !stopping) {
+        restarting = true;
+        terminate(worker).then(() => (payload == null ? void 0 : payload.port) && waitForPort(payload.port)).then(() => {
+          if (stopping)
+            return;
+          if (payload == null ? void 0 : payload.port)
+            process.env.PORT = payload.port;
+          restarting = false;
+          spawn();
+        }).catch((err) => {
+          import_utils.logger.error(err);
+          process.exit(1);
+        });
+      }
+      (_a = process.send) == null ? void 0 : _a.call(process, data);
+    });
+  }
+  spawn();
+  return {
+    get child() {
+      return child;
+    },
+    stop(signal) {
+      stopping = true;
+      return terminate(child, signal);
+    }
+  };
+}
+function terminate(child, signal = "SIGTERM") {
+  if (child.exitCode !== null || child.signalCode !== null) {
+    return Promise.resolve();
+  }
+  return new Promise((resolve) => {
+    const timer = setTimeout(() => child.kill("SIGKILL"), 5e3);
+    child.once("exit", () => {
+      clearTimeout(timer);
+      resolve();
+    });
+    child.kill(signal);
+  });
+}
+function getExecArgv() {
   const execArgv = process.execArgv.slice(0);
   const inspectArgvIndex = execArgv.findIndex(
     (argv) => argv.includes("--inspect-brk")
@@ -50,41 +103,14 @@ function start({ scriptPath }) {
       })
     );
   }
-  const child = (0, import_child_process.fork)(scriptPath, process.argv.slice(2), { execArgv });
-  child.on("message", (data) => {
-    var _a;
-    const { type, payload } = data || {};
-    if (type === "RESTART") {
-      child.kill();
-      if (payload == null ? void 0 : payload.port) {
-        utilPortValid(payload.port, 20, () => {
-          process.env.PORT = payload.port;
-          start({ scriptPath });
-        });
-      } else {
-        start({ scriptPath });
-      }
-    }
-    (_a = process.send) == null ? void 0 : _a.call(process, data);
-  });
-  return child;
+  return execArgv;
 }
-function utilPortValid(port, totalTry, callback) {
-  import_utils.portfinder.getPort({ startPort: port }, (err, findPort) => {
-    if (err)
-      callback(err);
-    else {
-      if (findPort === port) {
-        callback();
-      } else {
-        if (totalTry > 0) {
-          setTimeout(() => {
-            utilPortValid(port, totalTry - 1, callback);
-          }, 100);
-        } else {
-          callback(new Error(`Port ${port} is occupied`));
-        }
-      }
-    }
+function waitForPort(port, totalTry = 20) {
+  return new Promise((resolve) => {
+    import_utils.portfinder.getPort({ port }, (err, findPort) => {
+      if (err || findPort === port || totalTry <= 0)
+        return resolve();
+      setTimeout(() => waitForPort(port, totalTry - 1).then(resolve), 100);
+    });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.7.23",
+  "version": "4.7.25",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -35,17 +35,17 @@
     "@babel/runtime": "7.23.6",
     "prettier-plugin-organize-imports": "^3.2.2",
     "prettier-plugin-packagejson": "2.4.3",
-    "@umijs/bundler-webpack": "4.7.23",
-    "@umijs/core": "4.7.23",
-    "@umijs/bundler-utils": "4.7.23",
-    "@umijs/renderer-react": "4.7.23",
-    "@umijs/preset-umi": "4.7.23",
-    "@umijs/server": "4.7.23",
-    "@umijs/utils": "4.7.23",
-    "@umijs/test": "4.7.23"
+    "@umijs/bundler-utils": "4.7.25",
+    "@umijs/core": "4.7.25",
+    "@umijs/preset-umi": "4.7.25",
+    "@umijs/renderer-react": "4.7.25",
+    "@umijs/bundler-webpack": "4.7.25",
+    "@umijs/server": "4.7.25",
+    "@umijs/test": "4.7.25",
+    "@umijs/utils": "4.7.25"
   },
   "devDependencies": {
-    "@umijs/lint": "4.7.23"
+    "@umijs/lint": "4.7.25"
   },
   "engines": {
     "node": ">=14"