kn-cli 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "",
   "main": "index.js",
   "scripts": {

package/readme.md

@@ -17,6 +17,11 @@
 
 
 # 更新日志
+* 1.0.14  
+  1. 对打包过程优化，判断node_modules是否存在及清理必要  
+  2. 在打包前输出cli版本号  
+  
+
 * 1.0.13  
   1. 对打包时resolve.modules寻找node_modules的路径优先级进行调整  
 

package/src/build.js

@@ -26,14 +26,16 @@ const ROOT=path.resolve(__dirname,"../");
 module.exports= async (options={})=> {
   const {type='dev'} = options;
   const projectPath = process.cwd();
+  const projectName = path.parse(projectPath).base;
 
   // 用户项目文件夹下的public目录
   const sourceDir = path.resolve(projectPath,'public');
   // 用户项目文件夹下的package.json
   const projectPackagePath = path.resolve(projectPath,'package.json');
-
+  const tempDir = path.resolve(ROOT,'temp');
+  const tempProjectDir = path.resolve(tempDir,projectName);
   // 构建模板
-  const tempWebpackDir = path.resolve(ROOT,"temp/_webpack/");
+  const tempWebpackDir = path.resolve(tempProjectDir,"_webpack");
   const tempWebpackPackagePath = path.resolve(tempWebpackDir,'package.json');
   const tempWebpackConfigPath = path.resolve(tempWebpackDir,'webpack.config.js');
   const tempStartShell = path.resolve(tempWebpackDir,'start.sh');
@@ -65,29 +67,51 @@ module.exports= async (options={})=> {
       },
     ]);
   }
+  let logCount='';
   const tasks = new Listr([
     {...TaskNodeVersion},
     {
       title:"创建临时缓存文件夹",
       task:async (ctx,task)=>{
-        const tempDir = path.resolve(ROOT,"temp");
         try{
-          fs.statSync(tempDir);
+          const exists = fs.existsSync(tempWebpackDir);
+          if(exists==false){
+            task.title=`创建临时缓存文件夹成功${tempWebpackDir}`;
+            shelljs.mkdir(tempDir);
+            shelljs.mkdir(tempProjectDir);
+            if(answer){
+              answer.install='需要';
+            }
+            return;
+          }
+          const hasNodeModules = fs.existsSync(path.resolve(tempWebpackDir,'node_modules'));
+          if(!hasNodeModules){
+            if(answer){
+              answer.install='需要';
+            }
+          }
           task.title='清理旧的缓存文件';
           // 保留node_modules，以提高编译效率
-          await cleanDir(tempDir,function(file){
-            task.out=`${tempDir}`;
-            if(type=='dev'&&/node_modules/.test(file)){
-              return true;
+          await cleanDir(tempWebpackDir+'/',{
+            exclude:function(file){
+              if(type=='dev'&&/node_modules/.test(file)){
+                if(answer?.install=='不需要'){
+                  return true;
+                }
+              }
+              logCount+=`清除:${file}\n`
+              return false;
             }
-            return false;
           });
-          task.title='清理缓存完毕';
+          if(logCount){
+            task.output=`清除文件:${logCount}`;
+          }
+          task.title=`清理缓存完毕${tempWebpackDir}`;
         }catch(err){
-          task.title=`创建临时缓存文件夹成功`;
-          shelljs.mkdir(tempDir);
+          task.output=err.message;          
         }
-      }
+      },
+      options: { persistentOutput: true }
     },
     {
       title:"缓冲",
@@ -205,16 +229,16 @@ module.exports= async (options={})=> {
             let build_env='';
             let mock='';
             let noSkipNpmInstall='';
-            switch(answer.type){
+            switch(answer?.type){
               case '本地调试':{build_env='localdebug'}break;
               case '测试环境':{build_env='dev'}break;
               case '生产环境':{build_env='prod'}break;
             }
-            switch(answer.mock){
+            switch(answer?.mock){
               case '打开':{mock='1'}break;
               case '不打开':{mock='0'}break;
             }
-            switch(answer.install){
+            switch(answer?.install){
               case '需要':{noSkipNpmInstall='1'}break;
               case '不需要':{noSkipNpmInstall='0'}break;
             }

package/src/cli.js

@@ -14,11 +14,13 @@ const build = require('./build');
 
 module.exports=async (args)=> {
   let options = parseArgumentsIntoOptions(args);
+  let logVersion = chalk.green(`当前cli版本为 : ${pjson.version}`)
+
   // 打印版本信息
   if (get(options, "version")) {
-    let log = chalk.green(`当前cli版本为 : ${pjson.version}`)
-    return console.log(log);
+    return console.log(logVersion);
   }
+  console.log(logVersion);
   console.log(options);
   if(get(options,"install")){
     const req = await createProject(options);

package/src/utils/index.js

@@ -19,16 +19,23 @@ module.exports = {
   cleanDir:function(dir,option){
     const {exclude} = option;
     return new Promise(resolve=>{
+      let filename='';
       try{
         var files = fs.readdirSync(dir);
         files.forEach(file=>{
           if(exclude(file) == false){
-            fs.rmdirSync(path.resolve(dir,file));
+            filename = path.resolve(dir,file);
+            const fileStat = fs.statSync(filename);
+            if(fileStat.isDirectory()){
+              fs.rmdirSync(filename,{recursive:true,force:true});
+            }else{
+              fs.rmSync(filename,{force:true});
+            }
           }
         })
         resolve();
       }catch(err){
-        throw new Error(err.message);
+        throw new Error(err);
       }
     })
   },