crabatool 1.0.42 → 1.0.48

package/index.js

@@ -23,6 +23,8 @@ module.exports.run = function(options) {
       return start();
     } else if (arr.includes('-mergeinitjs')) {
       return mergeInit();
+    } else if (arr.includes('-update')) {
+      return upgrade.updateCraba();
     }
   }
 
@@ -66,6 +68,11 @@ function checkConfig() {
     throw new Error('请检查craba.js，必须告诉工具当前项目前端服务器端口地址哦');
   }
 
+  // 支持相对路径
+  if (!path.isAbsolute(config.webPath)) {
+    config.webPath = path.join(process.cwd(), config.webPath);
+  }
+
   if (!fs.existsSync(config.webPath)) {
     throw new Error(`请检查craba.js，配置的webPath路径不存在，请检查拼写是否正确:${config.webPath}`);;
   }
@@ -81,16 +88,16 @@ function checkConfig() {
 }
 
 
-async function waitFolder() {
+async function waitFolder(question) {
   const projectPath = await question('请输入项目生成路径（必须为空路径）：');
   if (!path.isAbsolute(projectPath)) {
     console.log('路径不合法，请输入绝对路径，如:f:\\craba_web');
-    return waitFolder();
+    return waitFolder(question);
   }
   if (fs.existsSync(projectPath)) {
     if (fs.readdirSync(projectPath).length > 0) {
       console.log(':::输入的项目路径不为空，避免文件覆盖或冲突，请重新输入一个空路径或不存在的路径:::');
-      return waitFolder();
+      return waitFolder(question);
     }
   }
   return projectPath;
@@ -148,7 +155,7 @@ function waitInput() {
       installvscode();
     } else if (num == 8) {
       var options = {};
-      options.projectPath = await waitFolder();
+      options.projectPath = await waitFolder(question);
       options.type = await question('选择项目类型：1. 普通craba项目;  2. ngp微前端项目; 输入编号：');
       if (options.type != 1 && options.type != 2) options.type = 1;
       if (options.type == 2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.42",
+  "version": "1.0.48",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {

package/test/test.js

@@ -9,7 +9,7 @@ var crabaTool = require('../index.js'); // 引入craba脚手架工具包
 var config = {
   //【必填】
   // 告诉工具当前项目的端路径地址，填绝对路径哦
-  webPath: "F:/shell_master/web/src/main/resources/static/shell",
+  webPath: "../web/src/main/resources/static/shell",
 
   //【必填】
   // 告诉工具当前项目前端服务器端口地址