kn-cli 1.0.69 → 1.0.71

package/build/webpack.config.js

@@ -14,6 +14,7 @@ const NowDateTime = Date.now();
 
 //////////// CONFIG ENV ///////////////
 const API_CONFIG = require('./webpack.api.js');
+const cliConfig = require('./cli.config.js');
 let CLI_CONFIG = {};
 let existsCli= fs.existsSync('./cli.config.js');
 if(existsCli){
@@ -42,6 +43,8 @@ const indexHtml = CLI_CONFIG?.indexHtml ?? true;
 const https= CLI_CONFIG?.https ?? false;
 const appVersion= CLI_CONFIG?.version ?? '';
 const devServer=CLI_CONFIG?.devServer??{};
+const prject_name = CLI_CONFIG?.name??'';
+const sourceMapLocal = CLI_CONFIG?.sourcemap?.local??false;//是否将soucemap改为本地
 
 let distFolder = 'dist';
 let distJsFolder='';
@@ -368,9 +371,16 @@ if(devMode){
     // publicPath: '..',//resource_path_relative,
     // fileContext: 'js',
   }))
+}else{
+  plugins.push(new webpack.SourceMapDevToolPlugin({
+    filename: 'sourcemap/[file].map',
+    publicPath: sourceMapLocal?'':`http://192.168.90.250:9970/${prject_name}/`,//resource_path_relative,
+    // fileContext: 'js',
+  }))
 }
 
 
+
 if(indexHtml){
   const shareJs = jsSplitMode?['react-bundle', 'modules-bundle', 'default-bundle', 'styles-bundle','kn-hooks']:[];
   if(jsSplitMode===true || jsSplitMode?.runtime !== false){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -32,12 +32,13 @@
     "execa": "~5.1.1",
     "inquirer": "~6.5.2",
     "jsonfile": "~6.1.0",
-    "listr2": "~5.0.6",
     "lodash": "~4.17.21",
     "ncp": "~2.0.0",
-    "shelljs": "~0.8.5"
+    "shelljs": "~0.8.5",
+    "listr2": "~6.6.0"
   },
   "engines": {
     "node": "16.18.0"
-  }
+  },
+  "devDependencies": {}
 }

package/readme.md

@@ -79,6 +79,9 @@ module.exports = {
   //   port:8080,
   //   useLocalIp:false,//是否使用本地IP地址代替localhost
   // }
+  // sourcemap:{
+  //   local:true //将生产环境的sourcemap部署到生产本地
+  // }
 };
 ```
 
@@ -92,6 +95,13 @@ module.exports = {
   
 
 # 更新日志
+
+* 1.0.71
+  增加运行日志中，每个任务的消耗时间  
+  
+* 1.0.70  
+  cli.config增加sourcemap{local:true}的可选配置，用来将sourcemap部署到生产本地
+
 * 1.0.69  
   默认生产环境不输出sourcemap  
   

package/src/build.js

@@ -2,7 +2,8 @@ const chalk= require("chalk");
 // 用于递归复制文件
 const path= require("path");
 const fs = require('fs');
-const {Listr} = require('listr2');
+const {Listr,PRESET_TIMER,color,delay} = require('listr2');
+
 const shelljs = require('shelljs');
 const jsonfile = require('jsonfile')
 const {copyDir,TaskNodeVersion,replaceFileData,cleanDir}= require( './utils');
@@ -93,7 +94,7 @@ module.exports= async (options={})=> {
         try{
           const exists = fs.existsSync(tempWebpackDir);
           if(exists==false){
-            task.title=`创建临时缓存文件夹成功${tempWebpackDir}`;
+            // task.title=`创建临时缓存文件夹成功${tempWebpackDir}`;
             shelljs.mkdir(tempDir);
             shelljs.mkdir(tempProjectDir);
             if(answer){
@@ -107,7 +108,7 @@ module.exports= async (options={})=> {
               answer.install='需要';
             }
           }
-          task.title='清理旧的缓存文件';
+          // task.title='清理旧的缓存文件';
           // 保留node_modules，以提高编译效率
           await cleanDir(tempWebpackDir+'/',{
             exclude:function(file){
@@ -121,9 +122,9 @@ module.exports= async (options={})=> {
             }
           });
           if(logCount){
-            task.output=`清除文件:${logCount}`;
+            // task.output=`清除文件:${logCount}`;
           }
-          task.title=`清理缓存完毕${tempWebpackDir}`;
+          // task.title=`清理缓存完毕${tempWebpackDir}`;
         }catch(err){
           task.output=err.message;          
         }
@@ -132,10 +133,11 @@ module.exports= async (options={})=> {
     },
     {
       title:"缓冲",
-      task:(ctx,task)=>{
-        return new Promise(resolve=>{
-          setTimeout(resolve,500);
-        })
+      task:async (ctx,task)=>{
+        await delay(500)
+        // return new Promise(resolve=>{
+        //   setTimeout(resolve,500);
+        // })
       }
     },
     {
@@ -148,15 +150,13 @@ module.exports= async (options={})=> {
     },
     {
       title:"缓冲",
-      task:(ctx,task)=>{
-        return new Promise(resolve=>{
-          setTimeout(resolve,500);
-        })
+      task:async (ctx,task)=>{
+        await delay(500)
       }
     },
     {
       title:"构造package",
-      task:(ctx,task)=>{
+      task:async (ctx,task)=>{
         return new Promise(resolve=>{
           try{
             task.title='开始构造package'
@@ -181,11 +181,11 @@ module.exports= async (options={})=> {
           }
         })
         
-      }
+      },options: { persistentOutput: true }
     },
     {
       title:"构造cli配置",
-      task:(ctx,task)=>{
+      task:async (ctx,task)=>{
         return new Promise(resolve=>{
           if(!existsCli){
             task.output='没有找到cli.config.js'
@@ -210,11 +210,11 @@ module.exports= async (options={})=> {
             `);
           }
         })
-      }
+      },options: { persistentOutput: true }
     },
     {
       title:"构造api配置",
-      task:()=>{
+      task:async ()=>{
         return new Promise(resolve=>{
           // 将项目目录下的webpack.api.js替换到临时构造文件夹下
           try{
@@ -234,11 +234,11 @@ module.exports= async (options={})=> {
             `);
           }
         })
-      }
+      },options: { persistentOutput: true }
     },
     {
       title:"构造config",
-      task:(ctx,task)=>{
+      task:async (ctx,task)=>{
         return new Promise(async resolve=>{
           let sourceFolder=sourceDir;
           // 开始改写 _webpack/webpack.config.js 和 build.sh
@@ -267,11 +267,11 @@ module.exports= async (options={})=> {
           }
 
         })
-      }
+      },options: { persistentOutput: true }
     },
     {
       title:"执行build",
-      task:(ctx,task)=>{
+      task:async (ctx,task)=>{
         return new Promise(resolve=>{
           shelljs.cd(tempWebpackDir);
           let cmdParams = [];
@@ -324,6 +324,7 @@ module.exports= async (options={})=> {
           shelljs.exec(`echo ${cmd}>>env.sh`);
           cmd='sh ./env.sh'
           task.title=`执行:${cmd}`;
+          task.output=`执行:${cmd}`;
           let req = shelljs.exec(cmd)
           if(req.code==0){
             resolve();
@@ -339,9 +340,25 @@ module.exports= async (options={})=> {
             `);
           }
         })
+      },options: { persistentOutput: true }
+    }
+  ],
+  {
+    concurrent: false,
+    rendererOptions: {
+      timer: {
+        ...PRESET_TIMER,
+        // condition: (duration)=>duration > 5000,
+        format: (duration)=> {
+          if (duration > 10000) {
+            return color.red
+          }
+          return color.green
+        }
       }
     }
-  ]);
+  }
+  );
 
   try{
     await tasks.run();

package/templates/template_admin/.gitignore

@@ -1,6 +0,0 @@
-**/node_modules
-**/package-lock.json
-**/.DS_Store
-**/dist
-**/release
-

package/templates/template_app/.gitignore

@@ -1,6 +0,0 @@
-**/node_modules
-**/package-lock.json
-**/.DS_Store
-**/dist
-**/release
-

package/templates/template_oa/.gitignore

@@ -1,6 +0,0 @@
-**/node_modules
-**/package-lock.json
-**/.DS_Store
-**/dist
-**/release
-

package/templates/template_oa_jwt/.gitignore

@@ -1,6 +0,0 @@
-**/node_modules
-**/package-lock.json
-**/.DS_Store
-**/dist
-**/release
-

package/templates/template_offcial/.gitignore

@@ -1,6 +0,0 @@
-**/node_modules
-**/package-lock.json
-**/.DS_Store
-**/dist
-**/release
-