easy-soft-develop 2.0.151 → 2.0.153

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.0.151",
+  "version": "2.0.153",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {
@@ -59,7 +59,6 @@
     "fs-extra": "^11.1.0",
     "hpagent": "^1.2.0",
     "ping": "^0.4.2",
-    "rimraf": "^4.1.2",
     "shelljs": "^0.8.5",
     "terminal-kit": "^3.0.0"
   },

package/src/tools/clean.js

@@ -8,23 +8,57 @@ const {
 const { loopPackage } = require('./package.tools');
 
 function adjustMainPackageJson(command) {
+  promptInfo(`clean main: ${command}`);
+
   exec(command);
 }
 
+function tryCleanChildrenPackage(cmd, tryTimes) {
+  if (tryTimes > 5) {
+    promptInfo(`clean package fail, ignore`);
+
+    return;
+  }
+
+  if (tryTimes > 1) {
+    promptInfo(`retry time ${tryTimes}`);
+  }
+
+  try {
+    exec(cmd);
+  } catch (error) {
+    tryTimes = tryTimes + 1;
+
+    tryCleanChildrenPackage(cmd, tryTimes);
+  }
+}
+
 function adjustChildrenPackageJson(command) {
-  loopPackage(({ name }) => {
-    exec(`cd ./packages/${name} && ${command}`);
+  loopPackage(({ name, relativePath }) => {
+    const cmd = `cd ${relativePath} && ${command}`;
+
+    promptInfo(`clean package ${name}: ${cmd}`);
+
+    let tryTimes = 1;
+
+    tryCleanChildrenPackage(cmd, tryTimes);
   });
 }
 
 function clean(preCmd, ...targets) {
+  promptInfo(
+    'clean use rimraf, ensure rimraf is installed, install it use "npm install -g rimraf"',
+  );
+
   try {
-    const list = targets.push('node_modules');
+    const list = [...targets];
+
+    list.push('node_modules');
 
     const command = list
       .map((o) => {
         if (o) {
-          return `npx rimraf ./${o}`;
+          return `rimraf ./${o}`;
         }
         return '';
       })
@@ -34,6 +68,8 @@ function clean(preCmd, ...targets) {
     promptEmptyLine();
 
     if (preCmd) {
+      promptInfo(`clean by command: ${preCmd}`);
+
       exec(preCmd);
     }