umi 4.0.32 → 4.0.34

package/client/client/plugin.js

@@ -1,12 +1,12 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/regeneratorRuntime";
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _typeof from "@babel/runtime/helpers/typeof";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/createForOfIteratorHelper";
-import _toArray from "@babel/runtime/helpers/toArray";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _toArray from "@babel/runtime/helpers/esm/toArray";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { assert, compose, isPromiseLike } from "./utils";
 export var ApplyPluginsType;
 

package/client/client/utils.js

@@ -1,4 +1,4 @@
-import _typeof from "@babel/runtime/helpers/typeof";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 export function assert(value, message) {
   if (!value) throw new Error(message);
 }

package/dist/cli/fork.js

@@ -23,6 +23,7 @@ __export(fork_exports, {
 });
 module.exports = __toCommonJS(fork_exports);
 var import_child_process = require("child_process");
+var import_utils = require("@umijs/utils");
 var usedPorts = [];
 function start({ scriptPath }) {
   const execArgv = process.execArgv.slice(0);
@@ -50,13 +51,36 @@ function start({ scriptPath }) {
     if (type === "RESTART") {
       child.kill();
       if (payload == null ? void 0 : payload.port) {
-        process.env.PORT = payload.port;
+        utilPortValid(payload.port, 20, () => {
+          process.env.PORT = payload.port;
+          start({ scriptPath });
+        });
+      } else {
+        start({ scriptPath });
       }
-      start({ scriptPath });
     }
     (_a = process.send) == null ? void 0 : _a.call(process, data);
   });
   return child;
 }
+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`));
+        }
+      }
+    }
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.0.32",
+  "version": "4.0.34",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -38,15 +38,15 @@
   },
   "dependencies": {
     "@babel/runtime": "7.18.9",
-    "@umijs/bundler-utils": "4.0.32",
-    "@umijs/bundler-webpack": "4.0.32",
-    "@umijs/core": "4.0.32",
-    "@umijs/lint": "4.0.32",
-    "@umijs/preset-umi": "4.0.32",
-    "@umijs/renderer-react": "4.0.32",
-    "@umijs/server": "4.0.32",
-    "@umijs/test": "4.0.32",
-    "@umijs/utils": "4.0.32",
+    "@umijs/bundler-utils": "4.0.34",
+    "@umijs/bundler-webpack": "4.0.34",
+    "@umijs/core": "4.0.34",
+    "@umijs/lint": "4.0.34",
+    "@umijs/preset-umi": "4.0.34",
+    "@umijs/renderer-react": "4.0.34",
+    "@umijs/server": "4.0.34",
+    "@umijs/test": "4.0.34",
+    "@umijs/utils": "4.0.34",
     "prettier-plugin-organize-imports": "^2.3.4",
     "prettier-plugin-packagejson": "^2.2.17"
   },