@zeppos/zeus-cli 1.5.17 → 1.5.19

package/modules/create.js

@@ -143,6 +143,8 @@ var inquirerFunc = function (args, _a) {
                                 type: 'list',
                                 when: function (args) {
                                     var isWorkoutExtension = args.appType.toLowerCase() === AppType.WORKOUT_EXTENSION;
+                                    if (!isWorkoutExtension)
+                                        return isWorkoutExtension;
                                     var objMap = workoutExtTemplateChoices[args.OSVersion].find(function (val) {
                                         var name = val.name === 'Hello World' ? 'Hello_World' : val.name;
                                         return name === promptTemplate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.5.17",
+  "version": "1.5.19",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",
@@ -21,7 +21,7 @@
     "qrcode-terminal": "^0.12.0",
     "vorpal": "^1.12.0",
     "yargs": "^17.5.1",
-    "@zeppos/zpm": "^3.0.27",
+    "@zeppos/zpm": "^3.0.28",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -57,7 +57,8 @@
     "@types/stoppable": "^1.1.1",
     "@types/update-notifier": "5.0.0",
     "@types/yargs-parser": "^21.0.0",
-    "@types/yeoman-environment": "^2.10.7"
+    "@types/yeoman-environment": "^2.10.7",
+    "rimraf": "^3.0.2"
   },
   "_moduleAliases": {
     "zeppos-app-utils": "private-modules/zeppos-app-utils"

package/private-modules/zeppos-app-utils/dist/modules/create/index.js

@@ -88,13 +88,17 @@ var AppType = index_1.config.AppType, AppSourceType = index_1.config.AppSourceTy
 var child_process_1 = require("child_process");
 var projectPreInstall = function (dir) {
     return new Promise(function (resolve) {
-        var execInstall = (0, child_process_1.spawn)(process.platform === 'win32' ? 'npm.cmd' : 'npm', ['install'], {
-            stdio: 'pipe',
-            cwd: dir
-        });
-        execInstall.stdout.pipe(process.stdout);
-        execInstall.on('close', function (code) {
-            resolve(code);
+        if (!fs_extra_1["default"].existsSync((0, path_1.join)(dir, 'package.json'))) {
+            resolve(true);
+            return;
+        }
+        (0, child_process_1.exec)("cd ".concat(dir, " && npm install"), function (error, stdout, stderr) {
+            if (error) {
+                console.error("npm install error: ".concat(error));
+                process.exit(1);
+            }
+            console.log(stderr);
+            resolve(stdout);
         });
     });
 };

package/private-modules/zeppos-app-utils/package.json

@@ -10,10 +10,10 @@
     "build": "rm -rf dist && tsc && pnpm run add",
     "add": "ts-node build.ts && pnpm -F @zeppos/zeus-cli add zeppos-app-utils && pnpm -F zeppos-dev-tools add zeppos-app-utils",
     "clean": "rm -rf node_modules && rm -rf dist",
-    "dev": "nodemon -e ts,tsx --exec \"rm -rf dist && tsc && ts-node build.ts\" --ignore types/ --ignore dist/"
+    "dev": "nodemon -e ts,tsx --exec \"rimraf dist && tsc && ts-node build.ts\" --ignore types/ --ignore dist/"
   },
   "dependencies": {
-    "@zeppos/zpm": "^3.0.27",
+    "@zeppos/zpm": "^3.0.28",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -39,7 +39,9 @@
     "yargs-parser": "^20.2.0",
     "yeoman-environment": "^3.9.1"
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "devDependencies": {
     "@types/findup-sync": "^4.0.2",
     "@types/fs-extra": "^9.0.13",
@@ -47,6 +49,7 @@
     "@types/stoppable": "^1.1.1",
     "@types/update-notifier": "5.0.0",
     "@types/yargs-parser": "^21.0.0",
-    "@types/yeoman-environment": "^2.10.7"
+    "@types/yeoman-environment": "^2.10.7",
+    "rimraf": "^3.0.2"
   }
 }