kn-cli 1.0.78 → 1.0.80

package/build/build.sh

@@ -1,12 +1,14 @@
+. ./shellUtil.sh
+
 if [ ! -n "$build_env" ]
 then
-  echo "没有发现build_env，默认设置为prod"
+  showWarn "没有发现build_env，默认设置为prod"
   export build_env="prod"
 fi
 
 if [ $build_env =  "prod" ]
 then
-  echo "cli build模式强制设定 noSkipNpmInstall=1"
+  showWarn "cli build模式强制设定 noSkipNpmInstall=1"
   export noSkipNpmInstall=1
 fi
 export mock=0

package/build/report.sh

@@ -3,41 +3,11 @@ then
   . ${HOME}/.nvm/nvm.sh
 fi
 
-node_version="v16.18.0"
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
+. ./shellUtil.sh
 
 
-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
-}
+node_version="v16.18.0"
+checkNode $node_version
 
 export build_env=prod
 export mock=0

package/build/shellUtil.sh

@@ -0,0 +1,73 @@
+
+
+
+checkResult(){
+  ret=$?
+  if [ $ret != 0 ]
+  then
+    printf "[$1] \e[40;31m 执行失败 \e[0m\n"
+    exit 2
+    return 0
+  else
+    printf "[$1] \e[40;32m 执行成功\e[0m \n"
+    return 0
+  fi
+}
+
+
+
+showLog() {
+  local text="$1"
+  local color="$2"
+  local color_code=""
+  case "$color" in
+    "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="";; 
+  esac
+  printf "%b\n" "${color_code}${text}\e[0m"
+}
+
+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/build/start.sh

@@ -2,49 +2,17 @@ if [ -d "${HOME}/.nvm/" ]
 then
   . ${HOME}/.nvm/nvm.sh
 fi
+. ./shellUtil.sh
 
-node_version="v16.18.0"
 
-checkResult(){
-  ret=$?
-  if [ $ret != 0 ]
-  then
-    echo "[$1]执行失败"
-    exit 2
-    return 0
-  else
-    echo "[$1]执行成功"
-    return 0
-  fi
-}
-
-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
-}
 
 setEnv(){
-  echo "检查build_env:$build_env"
+  showLog "检查build_env:${build_env}"
 
   if [ ! -n "$build_env" ]
   then
-    read -p "选择环境 [1:本地调试] [2:测试] [3:生产] " apiEnv
+    showInput "选择环境 [1:本地调试] [2:测试] [3:生产]: "
+    read apiEnv
     if [ ! -n "$apiEnv" ]
     then
       export build_env="localdebug"
@@ -59,56 +27,58 @@ setEnv(){
     fi
   fi
 
-  echo "编译环境:$build_env"
+  showWarn "编译环境:${build_env}"
 }
 
 setMock(){
-  echo "检查mock:$mock"
+  showLog "检查mock:${mock}"
   if [ ! -n "$mock" ]
   then
-    read -p "是否打开mock [1:打开] [2:不打开] " mockOpen
+    showInput "是否打开mock [1:打开] [2:不打开]: "
+    read mockOpen
     export mock=0
     if [ -n "$mockOpen" ] && [ $mockOpen = "1" ]
     then
       export mock=1
     fi
   fi
-  echo "mock开关:$mock"
+  showWarn "mock开关:${mock}"
 }
 
 setNpmSetup(){
-  echo "检查noSkipNpmInstall:$noSkipNpmInstall"
+  showLog "检查noSkipNpmInstall:${noSkipNpmInstall}"
   if [  ! -n "$noSkipNpmInstall" ]
   then
-    read -p "跳过环境初始化?[1]:不跳过,[其它]:跳过 " noSkipNpmInstall
+    showInput "跳过环境初始化?[1]:不跳过,[其它]:跳过 "
+    read noSkipNpmInstall
   fi
   
   if [ -n "$noSkipNpmInstall" ] && [ $noSkipNpmInstall =  "1" ]
   then
-    echo "开始npm install"
+    showLog "开始npm install"
     npm config delete registry -g
     npm config delete registry
 
-    echo "使用npm默认镜像源"
+    showLog "使用npm默认镜像源"
     if [ -n "$registryType" ]
     then
       if [ $registryType = "taobao" ]
       then
-        echo "切换到淘宝npm源"
+        showLog "切换到淘宝npm源"
         npm config set registry https://registry.npm.taobao.org
         npm config set registry https://registry.npm.taobao.org -g        
       fi
 
       if [ $registryType = "zheda" ]
       then
-        echo "切换到浙大源"
+        showLog "切换到浙大源"
         npm config set registry https://mirrors.zju.edu.cn/npm
         npm config set registry https://mirrors.zju.edu.cn/npm -g
       fi
 
       if [ $registryType = "huawei" ]
       then
-        echo "切换到华为源"
+        showLog "切换到华为源"
         npm config set registry https://repo.huaweicloud.com/repository/npm/
         npm config set registry https://repo.huaweicloud.com/repository/npm/ -g
       fi
@@ -116,7 +86,7 @@ setNpmSetup(){
     npm install
     checkResult "npm install"
   else
-    echo "跳过 npm install"
+    showWarn "跳过 npm install"
   fi
 }
 
@@ -127,11 +97,10 @@ build(){
   rm -rf __dirname/dist
   checkResult "清理dist"
 
-  
 
   if [ -n "$build_type" ] && [ $build_type =  "dev" ]
   then
-    echo "开始npm run dev"
+    showLog "开始npm run dev"
     if [ "${dev_mode}" = "watch" ]
     then
       npm run dev:watch
@@ -141,7 +110,7 @@ build(){
       checkResult "npm run dev"
     fi
   else
-    echo "开始npm run build"
+    showLog "开始npm run build"
     npm run build
     checkResult "npm run build"
   fi

package/build/webpack.config.js

@@ -23,14 +23,19 @@ if(existsCli){
 
 const dirname = __dirname;
 const webpackPath=__webpackPath;
-console.log(`=====================env=========================`);
-console.log(`dirname:${dirname}`);
-console.log(`webpackPath:${webpackPath}`);
-console.log(`build_env:${process.env.build_env}`);
-console.log(`mock:${process.env.mock}`);
-console.log(`noSkipNpmInstall:${process.env.noSkipNpmInstall}`);
-console.log(path.resolve(dirname,'node_modules'));
-console.log(`=====================env end=========================`);
+
+
+function warn(txt){
+  console.log(`\x1b[40;32m %s \x1b[0m`,txt);
+}
+warn(`=====================env=========================`);
+warn(`dirname:${dirname}`);
+warn(`webpackPath:${webpackPath}`);
+warn(`build_env:${process.env.build_env}`);
+warn(`mock:${process.env.mock}`);
+warn(`noSkipNpmInstall:${process.env.noSkipNpmInstall}`);
+warn(path.resolve(dirname,'node_modules'));
+warn(`=====================env end=========================`);
 
 const devMode = process.env.build_env !== 'prod';
 const hashMode = CLI_CONFIG?.hashMode ?? process.env.build_env != 'localdebug';

package/package.json

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

package/readme.md

@@ -97,6 +97,9 @@ module.exports = {
   
 
 # 更新日志
+* 1.0.77  
+  构建shell优化  
+  
 * 1.0.76  
   cli工具内增加资源引用检查工具，用来检查是否有大小写不匹配的资源引用