crabatool 1.0.52 → 1.0.55

package/index.js

@@ -74,7 +74,7 @@ function checkConfig() {
 
   // 支持相对路径
   if (!path.isAbsolute(config.webPath)) {
-    config.webPath = path.join(process.cwd(), config.webPath);
+    config.webPath = utils.join(process.cwd(), config.webPath);
     console.log('webPath转换为绝对路径:', config.webPath);
   }
 
@@ -82,7 +82,7 @@ function checkConfig() {
     throw new Error(`请检查craba.js，配置的webPath路径不存在，请检查拼写是否正确:${config.webPath}`);;
   }
 
-  var crabaJs = path.join(config.webPath, 'js/craba.min.js');
+  var crabaJs = utils.join(config.webPath, 'js/craba.min.js');
   if (!fs.existsSync(crabaJs)) {
     throw new Error('请检查craba.js，平台前端组件不存在，请检查指定的webPath路径是否为craba前端框架的根目录。' + crabaJs);
   }

package/lib/utils.js

@@ -242,7 +242,7 @@ class Utils {
         if (!fs.existsSync(dirname)) return;
 
         fs.readdirSync(dirname).forEach(function(file) {
-            var filePath = path.join(dirname, file);
+            var filePath = utils.join(dirname, file);
             if (fs.statSync(filePath).isDirectory()) {
                 //递归读取文件
                 utils.cleardirsSync(filePath);
@@ -340,12 +340,12 @@ class Utils {
             return next();
         }
 
-        var crabaJs = path.join(config.webPath, 'js/craba.min.js');
+        var crabaJs = utils.join(config.webPath, 'js/craba.min.js');
         if (!fs.existsSync(crabaJs)) {
             throw new Error('平台前端组件不存在，请检查:' + crabaJs);
         }
 
-        var clientSocketJs = path.join(__dirname, '../tool/client.js');
+        var clientSocketJs = utils.join(__dirname, '../tool/client.js');
         var content = fs.readFileSync(crabaJs).toString();
 
         var clientContent = fs.readFileSync(clientSocketJs).toString();
@@ -363,15 +363,14 @@ class Utils {
         var source = options.source;
         if (options.ignores && !fileList) {
             options.ignores = options.ignores.map((item) => {
-                item = item.replace(/\\/g, path.sep).replace(/\//g, path.sep);
-                return path.join(source, item);
+                return utils.join(source, item);
             });
         }
 
         if (!fileList) fileList = [];
         var files = fs.readdirSync(source);
         files.forEach(function(fileName) {
-            var filePath = path.join(source, fileName);
+            var filePath = utils.join(source, fileName);
             if (options.ignores && options.ignores.includes(filePath)) {
                 return;
             }
@@ -393,11 +392,9 @@ class Utils {
 
     copyFiles(source, dest, ignores, cb) {
         var files = utils.getFiles({ source: source, ignores: ignores });
-        files.forEach(function(fileName) {
-            fileName = fileName.replace(source, ''); // 去掉根路径
-
-            var filePath = path.join(source, fileName);
-            var destPath = path.join(dest, fileName);
+        files.forEach(function(filePath) {
+            var fileName = filePath.replace(source.source, ''); // 去掉根路径
+            var destPath = utils.join(dest, fileName);
 
             utils.mkdirsSync(destPath);
 
@@ -425,6 +422,12 @@ class Utils {
             require('child_process').exec(cmd);
         }
     }
+
+    join() {
+        var p = path.join.apply(path, arguments);
+        p = p.replace(/\\/g, path.sep).replace(/\//g, path.sep); // 兼容windows和linux，当前操作系统
+        return p;
+    }
 }
 var utils = new Utils();
 module = module.exports = utils;

package/package.json

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

package/test/test.js

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

package/tool/merge.js

@@ -38,7 +38,7 @@ function readFileList(folder, filesList) {
 
   var files = fs.readdirSync(folder);
   files.forEach(function(itm, index) {
-    var file = path.join(folder, itm);
+    var file = utils.join(folder, itm);
     var stat = fs.statSync(file);
     if (stat.isDirectory()) {
       //递归读取文件
@@ -91,7 +91,7 @@ function getAbsPath(filePath) {
   if (npath.isAbsolute(filePath)) return filePath;
 
   filePath = npath.relative(__dirname, filePath);
-  return npath.join(__dirname, filePath);
+  return nutils.join(__dirname, filePath);
 }
 
 function replaceBlackFunction(content) {

package/tool/ngptool.js

@@ -5,12 +5,12 @@ var fs = require('fs');
 var fork = require('child_process').fork;
 var utils = require('../lib/utils.js');
 
-var mergeJs = path.join(__dirname, 'merge.js');
+var mergeJs = utils.join(__dirname, 'merge.js');
 var compressArgs = config.ignoreCompress ? ['-ignorecompress'] : []; // 是否压缩
 
 // 打包biz.js
 function mergeBiz() {
-  var bizPath = path.join(config.webPath, '/js/biz');
+  var bizPath = utils.join(config.webPath, '/js/biz');
   if (!fs.existsSync(bizPath)) {
     return utils.error('error biz.js关联打包的路径不存在，已经取消打包功能。如需打包请先创建目录：' + bizPath);
   }
@@ -23,7 +23,7 @@ function mergeBiz() {
   var watchAction = function() {
     utils.debug('打包中');
     // 这里进行文件更改后的操作
-    var p = fork(mergeJs, [`${[bizPath]}`, `${[path.join(config.webPath, '/js/biz.js')]}`, compressArgs])
+    var p = fork(mergeJs, [`${[bizPath]}`, `${[utils.join(config.webPath, '/js/biz.js')]}`, compressArgs])
     p.on('exit', code => {
       utils.debug('打包完成');
     });
@@ -42,7 +42,7 @@ function mergeBiz() {
 
 // 打包生成jxc/js/init.js
 function mergeInit() {
-  var modJs = path.join(config.webPath, '/js/' + config.modName + '.js'); // jxc/js/jxc.js
+  var modJs = utils.join(config.webPath, '/js/' + config.modName + '.js'); // jxc/js/jxc.js
   if (!fs.existsSync(modJs)) {
     return utils.error(`error 模块对应的资源不存在:${modJs}，已经取消打包功能。如需打包，请先将${config.modName}/js/init.js修改为：${config.modName}/js/${config.modName}.js`);
   }
@@ -53,7 +53,7 @@ function mergeInit() {
   var watchAction = function() {
     utils.debug('打包中');
     // 这里进行文件更改后的操作
-    var p = fork(mergeJs, [`${[inits]}`, `${[path.join(config.webPath, '/js/init.js')]}`, compressArgs])
+    var p = fork(mergeJs, [`${[inits]}`, `${[utils.join(config.webPath, '/js/init.js')]}`, compressArgs])
     p.on('exit', code => {
       utils.debug('打包完成');
     });
@@ -78,7 +78,7 @@ function mergeInit() {
   watchJs(modJs);
 
   config.childModList.forEach(childName => {
-    var childInitPath = path.join(config.webPath, childName, 'js/init.js');
+    var childInitPath = utils.join(config.webPath, childName, 'js/init.js');
     inits.push(childInitPath);
     //utils.mkdirsSync(childInitPath);
     if (!fs.existsSync(childInitPath)) {

package/tool/upgrade.js

@@ -28,7 +28,7 @@ class Upgrade {
 
   getLocalVersion() {
     // 获取本地craba平台版本
-    var crabaJs = path.join(config.webPath, 'js/craba.min.js');
+    var crabaJs = utils.join(config.webPath, 'js/craba.min.js');
     var content = fs.readFileSync(crabaJs).toString();
 
     var m = content.match(new RegExp("crabaVersion = \\S*;"));
@@ -83,10 +83,10 @@ class Upgrade {
 
     var projectPath = "";
     if (options.type == 1) {
-      projectPath = path.join(options.projectPath, 'www');
+      projectPath = utils.join(options.projectPath, 'www');
     } else if (options.type == 2) {
       projectPath = `${options.modName}/web/src/main/resources/static/${options.modName}`;
-      projectPath = path.join(options.projectPath, projectPath);
+      projectPath = utils.join(options.projectPath, projectPath);
       projectPath = projectPath;
     }
 
@@ -113,7 +113,7 @@ class Upgrade {
 
   _createDone() {
     // 拷贝server文件
-    utils.copyFiles(config.ServerPath, path.join(this.options.projectPath, this.serverFolder), null, utils.createDelegate(this, function(fileName) {
+    utils.copyFiles(config.ServerPath, utils.join(this.options.projectPath, this.serverFolder), null, utils.createDelegate(this, function(fileName) {
       this.pb.render({ value: ++this.pb.value, text: fileName });
     }));
 
@@ -124,7 +124,7 @@ class Upgrade {
       }));
     } else {
       var that = this;
-      utils.copyFiles(path.join(config.WebPath, 'ngp'), this.projectPath, null, utils.createDelegate(this, function(fileName, bytes) {
+      utils.copyFiles(utils.join(config.WebPath, 'ngp'), this.projectPath, null, utils.createDelegate(this, function(fileName, bytes) {
         this.pb.render({ value: ++this.pb.value, text: fileName });
         return bytes.toString().replaceAll('${modName}', that.options.modName);
       }));
@@ -135,11 +135,11 @@ class Upgrade {
 
     this._updateDone();
 
-    console.log('项目创建完成，请切换到新项目下继续操作。' + path.join(this.options.projectPath, this.serverFolder));
+    console.log('项目创建完成，请切换到新项目下继续操作。' + utils.join(this.options.projectPath, this.serverFolder));
   }
 
   _rewriteNode() {
-    var nodeJs = path.join(path.join(this.options.projectPath, this.serverFolder), 'craba.js');
+    var nodeJs = utils.join(utils.join(this.options.projectPath, this.serverFolder), 'craba.js');
     var content = fs.readFileSync(nodeJs).toString();
     content = content.replace('${webPath}', this.projectPath.replaceAll('\\', '/'));
     content = content.replace('${port}', (10000 + parseInt(Math.random() * 1000)));