kn-cli 1.0.83 → 1.0.85

package/build/dev.sh

@@ -1,3 +1,15 @@
 export build_type=dev
+
+
+if [ ! -n "$build_log_level" ]
+then
+  if [  $build_env != 'prod' ]
+  then
+    export build_log_level=all
+  else
+    export build_log_level=clear
+  fi
+fi
+
 # 如果 export dev_mode=watch 则启动webpack -w模式而非webpack-dev-server
 . ./start.sh

package/build/shellUtil.sh

@@ -5,31 +5,68 @@ checkResult(){
   ret=$?
   if [ $ret != 0 ]
   then
-    printf "[$1] \e[40;31m 执行失败 \e[0m\n"
+    printf "\e[40;31m [$1] 执行失败 \e[0m\n"
     exit 2
     return 0
   else
-    printf "[$1] \e[40;32m 执行成功\e[0m \n"
+    printf "\e[40;32m [$1] 执行成功\e[0m \n"
     return 0
   fi
 }
 
 
 
+checkKnCli(){
+  # 方案一：始终将kn-cli保持为最新版本
+  # npm i kn-cli -g
+  # return 0
+  
+  # 方案二：保持kn-cli为固定某个版本
+  # npm i kn-cli@1.0.26 -g
+  # return 0
+
+  # 方案三：检测未安装时或版本不为最新版本时更新
+  if ! [ -x "$(command -v kn-cli)" ]
+  then
+    echo "安装kn-cli"
+    npm i kn-cli -g
+    return 0
+  fi
+
+  for line in `npm view kn-cli version` 
+  do
+    for line2 in `kn-cli -v` 
+    do
+    if [ $line != $line2 ]
+    then
+      echo "升级kn-cli"
+      npm upgrade kn-cli -g
+      return 0
+    fi
+    done
+  done
+  return 0
+}
+
+
 showLog() {
   local text="$1"
   local color="$2"
   local color_code=""
   case "$color" in
+    "white") color_code="";;
     "red") color_code="\e[40;31m";;
     "green") color_code="\e[40;32m";;
     "blue") color_code="\e[40;34m";;
     "yellow") color_code="\e[40;33m";;
-    *) color_code="";; 
+    *) color_code="\e[40;30m";; 
   esac
   printf "%b\n" "${color_code}${text}\e[0m"
 }
 
+showNormal(){
+  showLog "$1" "white"
+}
 showSuccess() {
   showLog "$1" "green"
 }

package/package.json

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

package/readme.md

@@ -3,14 +3,13 @@
 
 # 快速开始
 0. node使用16.18.0  
-1. 安装: npm i kn-cli -g  
-2. 创建项目: kn-cli --create  
-3. 调试项目: kn-cli --dev  
+1. 安装: `npm i kn-cli -g`   
+2. 创建项目: `kn-cli --create`  
+3. 调试项目: `sh dev.sh`  
   * 当`export dev_mode=watch`时，将不会独立启动http服务，而是直接将编译后资源输出到文件夹内并监听源代码的变化后重新编译  
-4. 编译项目: kn-cli --build  
+4. 编译项目: `sh build.sh`或`sh frontend_build.sh`  
 5. 当项目中需要添加第三方npm包时，务必使用--save参数`npm i 包名  --save`    
-6. 包模块分析: kn-cli --report    
-
+6. 包模块分析:`sh report.sh`     
 
 > 项目创建后，记得执行sh init.sh 以激活git分支提交日志
 
@@ -24,7 +23,7 @@
 # cli 其它常用方法
 1. 查看版本号： `kn-cli -v`    
 2. 创建辅助工具：`kn-cli --tool`  
-  目前辅助工具有：图片压缩、word转html、iconfont、资源引用检查    
+  目前辅助工具有：图片压缩、word转html、iconfont、资源引用检查、docker容器内运行      
 
 
 # cli.config.js - 构建配置文件
@@ -90,32 +89,32 @@ module.exports = {
 
 
 # 环境变量  
-build_env  
+**build_env**  
 可选值:localdebug|dev|prod  
 控制构建模式，localdebug本地调试、dev测试环境、prod生产  
 
-
-build_log_level  
-可选值：clear|all  
+**build_log_level** 
+可选值：clear|all
 控制输出的日志类型，如果不手动接入的话，prod模式下为简洁模式，开发模式下为全量输出  
 
-
-noSkipNpmInstall  
+**noSkipNpmInstall**  
 可选值:1|0  
+默认值：1   
 是否跳过npm install以增加启动速度，prod模式下必然为1，其它模式下根据用户选择  
 
-mock
+**mock**
 可选值:1|0  
+默认值：0   
 是否打开mock  
 
-
-registryType  
+**registryType**   
 可选值：taobao|zheda|huawei|空值  
+默认值：空值    
 npm镜像源   
 
-
-dev_mode  
+**dev_mode**  
 可选值：watch|空值  
+默认值：空值  
 调试模式是用的watch文件监听，还是webpack-dev-server监听模式  
 
 report  
@@ -133,6 +132,9 @@ report
   
 
 # 更新日志
+* 1.0.85  
+cli工具内增加docker环境工具，用于将当前项目直接在docker内运行  
+
 * 1.0.82  
 增加环境变量：build_log_level ，用于控制输出的日志类型
 

package/src/build.js

@@ -363,6 +363,9 @@ module.exports= async (options={})=> {
   try{
     await tasks.run();
   }catch(err){
+    if(err.message.indexOf('执行build异常')>=0){
+      return 0;
+    }
     console.log(chalk.red.bold(err.message));
     return 0;
   }

package/src/getTools.js

@@ -5,6 +5,9 @@ const {Listr} = require('listr2');
 const {TaskNodeVersion,copyDir}= require('./utils');
 const inquirer = require('inquirer');
 const ROOT=path.resolve(__dirname,"../");
+const fs = require('fs');
+const shelljs = require('shelljs');
+
 
 /**
  * 创建工具
@@ -24,7 +27,8 @@ module.exports=async ()=> {
         '图片压缩',
         'word转html',
         'iconFont图标字体',
-        '资源引用检查'
+        '资源引用检查',
+        'docker'
       ],
       default:''
     },
@@ -35,7 +39,7 @@ module.exports=async ()=> {
       case 'iconFont图标字体':{templateName='iconfont'}break;
       case 'word转html':{templateName='word2html'}break;
       case '资源引用检查':{templateName='fileCase'}break;
-
+      case 'docker':{templateName='docker'}break;
     }
   }
 
@@ -45,7 +49,14 @@ module.exports=async ()=> {
     },
     {
       title: "工具创建中",
-      task: () => copyDir(path.resolve(templatesDir,templateName),path.resolve(sourceDir,templateName))
+      task: () => {
+        let toolsDir= path.resolve(sourceDir,'tools')
+        const exists = fs.existsSync(toolsDir);
+        if(exists==false){
+          shelljs.mkdir(toolsDir);
+        }
+        copyDir(path.resolve(templatesDir,templateName),path.resolve(toolsDir,templateName))
+      }
     },
   ]);
   try{

package/templates/template_admin/cli.config.js

@@ -16,6 +16,10 @@ module.exports = {
     }
     return "local";
   },
+  devServer:{
+    host:'0.0.0.0',//指定调试地址IP
+    port:8080,
+  }
   // 自定义多入口
   // entry:{
   //   'home/index': 'src/jsx/home/index.jsx',

package/templates/template_admin/dev.sh

@@ -3,69 +3,9 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
-
-
-
-# 智能检测并安装/升级CLI的版本
-checkKnCli(){
-  # dev只需要保持安装了就行，版本通过开发自己控制
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    echo "安装kn-cli"
-    npm i kn-cli -g
-    return 0
-  fi
-  # for line in `npm view kn-cli version` 
-  # do
-  #   for line2 in `kn-cli -v` 
-  #   do
-  #   if [ $line != $line2 ]
-  #   then
-  #     echo "升级kn-cli"
-  #     npm upgrade kn-cli -g
-  #     return 0
-  #   fi
-  #   done
-  # done
-  # return 0
-}
+. ./shellUtil.sh
 
+node_version="v16.18.0"
 
 
 build(){
@@ -82,7 +22,7 @@ build(){
   checkResult "kn-cli --dev"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 build

package/templates/template_admin/frontend_build.sh

@@ -2,55 +2,13 @@ if [ -d "${HOME}/.nvm/" ]
 then
   . ${HOME}/.nvm/nvm.sh
 fi
+. ./shellUtil.sh
 
 export mock=0
 export noSkipNpmInstall=1
 node_version="v16.18.0"
 
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-
-checkKnCli(){
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    npm i kn-cli -g
-    return 0
-  fi
-  return 0
-}
-
 
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
 
 build(){
   npm config delete registry -g
@@ -76,7 +34,7 @@ build(){
   checkResult "复制favicon"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 

package/templates/template_admin/init.sh

@@ -1,15 +1,6 @@
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
+
+. ./shellUtil.sh
+
 
 echo "安装git提交钩子脚本 cp prepare-commit-msg ./.git/hooks/prepare-commit-msg"  
 ls -A ./.git/

package/templates/template_admin/report.sh

@@ -3,52 +3,9 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
-
-checkKnCli(){
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    npm i kn-cli -g
-    return 0
-  fi
-  return 0
-}
+. ./shellUtil.sh
 
+node_version="v16.18.0"
 
 build(){
   npm config delete registry -g
@@ -61,7 +18,7 @@ build(){
   checkResult "kn-cli --report"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 build

package/templates/template_admin/shellUtil.sh

@@ -0,0 +1,110 @@
+
+
+
+checkResult(){
+  ret=$?
+  if [ $ret != 0 ]
+  then
+    printf "\e[40;31m [$1] 执行失败 \e[0m\n"
+    exit 2
+    return 0
+  else
+    printf "\e[40;32m [$1] 执行成功\e[0m \n"
+    return 0
+  fi
+}
+
+
+
+checkKnCli(){
+  # 方案一：始终将kn-cli保持为最新版本
+  # npm i kn-cli -g
+  # return 0
+  
+  # 方案二：保持kn-cli为固定某个版本
+  # npm i kn-cli@1.0.26 -g
+  # return 0
+
+  # 方案三：检测未安装时或版本不为最新版本时更新
+  if ! [ -x "$(command -v kn-cli)" ]
+  then
+    echo "安装kn-cli"
+    npm i kn-cli -g
+    return 0
+  fi
+
+  for line in `npm view kn-cli version` 
+  do
+    for line2 in `kn-cli -v` 
+    do
+    if [ $line != $line2 ]
+    then
+      echo "升级kn-cli"
+      npm upgrade kn-cli -g
+      return 0
+    fi
+    done
+  done
+  return 0
+}
+
+
+showLog() {
+  local text="$1"
+  local color="$2"
+  local color_code=""
+  case "$color" in
+    "white") color_code="";;
+    "red") color_code="\e[40;31m";;
+    "green") color_code="\e[40;32m";;
+    "blue") color_code="\e[40;34m";;
+    "yellow") color_code="\e[40;33m";;
+    *) color_code="\e[40;30m";; 
+  esac
+  printf "%b\n" "${color_code}${text}\e[0m"
+}
+
+showNormal(){
+  showLog "$1" "white"
+}
+showSuccess() {
+  showLog "$1" "green"
+}
+
+showError() {
+  showLog "$1" "red"
+}
+showWarn() {
+  showLog "$1" "yellow"
+}
+
+showInput(){
+  local text="$1"
+  printf "%b" "\e[40;35m${text}\e[0m" >&2
+}
+
+
+
+
+checkNode(){
+  local node_version="$1"
+  
+  for line in `node -v` 
+  do
+  if [ $line != $node_version ]
+  then
+    showWarn "change Node from ${line} to ${node_version}"
+    nvm use $node_version
+    ret=$?
+    if [ $ret != 0 ]
+    then
+      showError "Please run nvm install ${node_version}"
+      exit 3
+    else
+      return 0
+    fi
+  else
+    return 0
+  fi
+  done
+}

package/templates/template_admin/versionPublish.sh

@@ -1,16 +1,5 @@
 
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
+. ./shellUtil.sh
 
 # version=$(grep -m1 '"version":' package.json | awk -F'"' '{print $4}')
 # checkResult "获取当前版本号"

package/templates/template_app/cli.config.js

@@ -9,6 +9,10 @@ module.exports = {
   rules:{
     compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
   },
+  devServer:{
+    host:'0.0.0.0',//指定调试地址IP
+    port:8080,
+  }
   // 自定义多入口
   // entry:{
   //   'home/index': 'src/jsx/home/index.jsx',

package/templates/template_app/dev.sh

@@ -3,69 +3,9 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-
-checkNode(){
-  for line in `node -v` 
-  do
-  if [ $line != $node_version ]
-  then
-    echo "change Node from $line to $node_version"
-    nvm use $node_version
-    ret=$?
-    if [ $ret != 0 ]
-    then
-      echo "Please run nvm install $node_version"
-      exit 3
-    else
-      return 0
-    fi
-  else
-    return 0
-  fi
-  done
-}
-
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
-
-
-
-# 智能检测并安装/升级CLI的版本
-checkKnCli(){
-  # dev只需要保持安装了就行，版本通过开发自己控制
-  if ! [ -x "$(command -v kn-cli)" ]
-  then
-    echo "安装kn-cli"
-    npm i kn-cli -g
-    return 0
-  fi
-  # for line in `npm view kn-cli version` 
-  # do
-  #   for line2 in `kn-cli -v` 
-  #   do
-  #   if [ $line != $line2 ]
-  #   then
-  #     echo "升级kn-cli"
-  #     npm upgrade kn-cli -g
-  #     return 0
-  #   fi
-  #   done
-  # done
-  # return 0
-}
+. ./shellUtil.sh
 
+node_version="v16.18.0"
 
 
 build(){
@@ -82,7 +22,7 @@ build(){
   checkResult "kn-cli --dev"
 }
 
-checkNode
+checkNode "${node_version}"
 checkResult "检查node"
 
 build