kn-cli 1.0.56 → 1.0.58

package/build/cli.config.js

@@ -38,4 +38,9 @@ module.exports = {
   //   output:'../index.html',//将index.html输出到 dist目录外的index.html
   // },
   // projectSourceFolder:'./',//项目源代码文件夹所在位置，默认是'src'
+  // devServer:{
+  //   host:'0.0.0.0',//指定调试地址IP
+  //   port:8080,
+  //   useLocalIp:false,//是否使用本地IP地址代替localhost
+  // }
 };

package/build/webpack.config.js

@@ -41,6 +41,7 @@ const jsSplitMode = CLI_CONFIG?.jsSplitMode??true;
 const indexHtml = CLI_CONFIG?.indexHtml ?? true;
 const https= CLI_CONFIG?.https ?? false;
 const appVersion= CLI_CONFIG?.version ?? '';
+const devServer=CLI_CONFIG?.devServer??{};
 
 let distFolder = 'dist';
 let distJsFolder='';
@@ -460,7 +461,7 @@ module.exports = {
   devServer: {
     disableHostCheck: true,
     contentBase: distFolder,
-    host: '0.0.0.0',
+    host: devServer?.host??'localhost',
     open: true,
     overlay:true,
     stats:{
@@ -470,8 +471,8 @@ module.exports = {
       errorDetails:true,
       warnings:true
     },
-    // port: 8080,
-    // useLocalIp:true,
+    port: devServer?.port??8080,
+    useLocalIp:devServer?.useLocalIp??false,
     https:https,//true,//注意开了https就不能使用本地ip访问，只能使用0.0.0.0
     proxy: API_CONFIG.API_PROXY
     // hot: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,6 +11,8 @@
     "src/",
     "templates/template_app/",
     "templates/template_admin/",
+    "templates/template_oa/",
+    "templates/template_offcial/",
     "build"
   ],
   "bin": {

package/readme.md

@@ -65,10 +65,18 @@ module.exports = {
   // rules:{
   //   compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
   // },
+  // devServer:{
+  //   host:'0.0.0.0',//指定调试地址IP
+  //   port:8080,
+  //   useLocalIp:false,//是否使用本地IP地址代替localhost
+  // }
 };
 ```
 
 # 更新日志
+* 1.0.57  
+  增加cli.config.js内devServer配置  
+  
 * 1.0.56  
   OA模板更新  
     

package/src/build.js

@@ -315,6 +315,7 @@ module.exports= async (options={})=> {
             throw new Error(`
               ==============执行build异常=============
               ${req.stdout}
+              ${req.stderr}
               ==============执行build异常END=============
             `);
           }

package/templates/template_oa/build.sh

@@ -0,0 +1,2 @@
+export build_env=dev
+sh frontend_build.sh

package/templates/template_oa/cli.config.js

@@ -0,0 +1,24 @@
+
+module.exports = {
+  name:'template-oa',
+  registryType:'npm',//npm镜像源,taobao|npm
+  less:{
+    javascriptEnabled:true,//是否开启less js
+  },
+  rules:{
+    compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
+  },
+  cssModule: (resourcePath) => {
+    console.log(resourcePath)
+    // antd.less编译的时候使用global模式
+    if (/antd.less$/i.test(resourcePath)) {
+      return 'global'
+    }
+    return "local";
+  },
+  // 自定义多入口
+  // entry:{
+  //   'home/index': 'src/jsx/home/index.jsx',
+  // },
+  // copyFolder:['images','plugins'],//完整复制的文件夹
+};

package/templates/template_oa/dev.sh

@@ -0,0 +1,89 @@
+if [ -d "${HOME}/.nvm/" ]
+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
+}
+
+
+
+build(){
+  npm config delete registry -g
+  npm config delete registry
+
+  checkKnCli
+  checkResult "检查kn-cli"
+  # dev_mode=watch 代表使用 webpack -w模式将文件编译后生成到磁盘上进行监听更新
+  # 默认情况下为 webpack-dev-server模式，将资源编译后放入内存监听
+  # export dev_mode=watch
+
+  kn-cli --dev
+  checkResult "kn-cli --dev"
+}
+
+checkNode
+checkResult "检查node"
+
+build
+checkResult "build"

package/templates/template_oa/frontend_build.sh

@@ -0,0 +1,83 @@
+if [ -d "${HOME}/.nvm/" ]
+then
+  . ${HOME}/.nvm/nvm.sh
+fi
+
+export mock=0
+export oSkipNpmInstall=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
+  npm config delete registry
+
+  rm -rf release
+  checkResult "清理release"
+
+  checkKnCli
+  checkResult "检查kn-cli"
+
+  # npm i kn-cli@1.0.2 -g
+  # checkResult "npm kn-cli"
+
+  kn-cli --build
+  checkResult "kn-cli --build"
+
+  mv public/dist release/
+  checkResult "打包结果同步至release"
+}
+
+checkNode
+checkResult "检查node"
+
+
+build
+checkResult "build"
+
+
+

package/templates/template_oa/init/prepare-commit-msg

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# 查询当前分支
+NAME=[$(git branch | grep '*' | grep -Eo "\S+$")]
+echo "$NAME"': '$(cat "$1") > "$1"

package/templates/template_oa/init.sh

@@ -0,0 +1,33 @@
+checkResult(){
+  ret=$?
+  if [ $ret != 0 ]
+  then
+    echo "[$1]执行失败"
+    exit 2
+    return 0
+  else
+    echo "[$1]执行成功"
+    return 0
+  fi
+}
+
+echo "安装git提交钩子脚本 cp prepare-commit-msg ./.git/hooks/prepare-commit-msg"  
+ls -A ./.git/
+ret=$?
+if [ $ret != 0 ]
+then
+  echo "缺少.git文件夹"
+  exit 2
+fi
+
+ls -A ./.git/hooks/
+ret=$?
+if [ $ret != 0 ]
+then
+  mkdir ./.git/hooks
+  checkResult '创建hooks文件夹'
+fi
+cp ./init/prepare-commit-msg ./.git/hooks/prepare-commit-msg
+checkResult '复制prepare-commit-msg'
+chmod u+x ./.git/hooks/prepare-commit-msg
+checkResult '权限变更prepare-commit-msg'

package/templates/template_oa/jsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "paths": {
+      "@/*": ["./public/src/*"]
+    }
+  },
+}