kn-cli 1.0.13 → 1.0.15

package/build/start.sh

@@ -86,6 +86,18 @@ setNpmSetup(){
     echo "开始npm install"
     npm config delete registry -g
     npm config delete registry
+
+    echo "使用npm默认镜像源"
+    if [ -n "$registryType" ]
+    then
+      if [ $registryType = "taobao" ]
+      then
+        echo "切换到淘宝npm源"
+        npm config set registry https://registry.npm.taobao.org
+        npm config set registry https://registry.npm.taobao.org -g
+      fi
+    fi
+
     npm install
     checkResult "npm install"
   else

package/build/webpack.config.js

@@ -1,4 +1,6 @@
 const path = require('path');
+const fs = require('fs');
+
 const webpack = require('webpack');
 const API_CONFIG = require('./webpack.api.js');
 
@@ -8,9 +10,16 @@ const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
+
+let CLI_CONFIG = {};
 // const PrerenderSPAPlugin = require('prerender-spa-plugin');
 // const Renderer = PrerenderSPAPlugin.PuppeteerRenderer
 
+let existsCli= fs.existsSync('./cli.config.js');
+if(existsCli){
+  CLI_CONFIG = require('./cli.config.js');
+}
+
 let otherPlugins = [];
 if (process.env.npm_config_report) {
   otherPlugins.push(new BundleAnalyzerPlugin());
@@ -229,7 +238,12 @@ module.exports = {
             },
           },
           'postcss-loader',
-          'less-loader',
+          {
+            loader: 'less-loader',
+            options:{
+              javascriptEnabled: CLI_CONFIG?.less?.javascriptEnabled??false
+            }
+          }
         ],
       },
       // {

package/package.json

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

package/readme.md

@@ -17,6 +17,14 @@
 
 
 # 更新日志
+* 1.0.15  
+  1. 增加cli.config.js配置文件，主要配置npm的镜像源、less配置javascriptEnabled相关开关  
+
+* 1.0.14  
+  1. 对打包过程优化，判断node_modules是否存在及清理必要  
+  2. 在打包前输出cli版本号  
+
+
 * 1.0.13  
   1. 对打包时resolve.modules寻找node_modules的路径优先级进行调整  
 

package/src/build.js

@@ -26,17 +26,26 @@ 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');
+  const cliConfigJs = path.resolve(projectPath,'cli.config.js');
+  let existsCli= fs.existsSync(cliConfigJs);
+  let cliConfig;
+  if(existsCli){
+    cliConfig= require(cliConfigJs);
+  }
+
   let projectPackage,webpackPackage;
 
   let answer;
@@ -65,29 +74,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:"缓冲",
@@ -142,6 +173,35 @@ module.exports= async (options={})=> {
         
       }
     },
+    {
+      title:"构造cli配置",
+      task:(ctx,task)=>{
+        return new Promise(resolve=>{
+          if(!existsCli){
+            task.output='没有找到cli.config.js'
+            resolve();
+            return;
+          }
+          // 将项目目录下的 cli.config.js替换到临时构造文件夹下
+          try{
+            const apiConfig = cliConfigJs;
+            const tempApiConfig = path.resolve(tempWebpackDir,'cli.config.js');
+            fs.copyFile(apiConfig,tempApiConfig,function(err,data){
+              if(err){
+                throw new Error(err);
+              }
+              resolve();
+            })
+          }catch(ex){
+            throw new Error(`
+              ==============构造cli配置 异常=============
+              ${ex.message}
+              ==============构造cli配置 异常END=============
+            `);
+          }
+        })
+      }
+    },
     {
       title:"构造api配置",
       task:()=>{
@@ -197,33 +257,46 @@ module.exports= async (options={})=> {
       title:"执行build",
       task:(ctx,task)=>{
         return new Promise(resolve=>{
-          let cmd='sh build.sh'
+          let cmd='sh build.sh';
           shelljs.cd(tempWebpackDir);
+          let cmdParams = [];
           if(type=='dev'){
-            task.title='执行dev';
             cmd='sh dev.sh';
             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;
             }
-            cmd = `export build_env=${build_env} mock=${mock} noSkipNpmInstall=${noSkipNpmInstall}\nsh dev.sh`;
-            task.title=`调试环境:env=${answer.type},mock=${answer.mock},install=${answer.install}`
+            if(build_env){
+              cmdParams.push(`build_env=${build_env}`)
+            }
+            if(mock){
+              cmdParams.push(`mock=${mock}`)
+            }
+            if(noSkipNpmInstall){
+              cmdParams.push(`noSkipNpmInstall=${noSkipNpmInstall}`)
+            }
           }else if( type =='report'){
-            task.title='执行report';
             cmd='sh report.sh';
           }
+          if(cliConfig?.registryType){
+            cmdParams.push(`registryType=${cliConfig.registryType}`)
+          }
+          if(cmdParams.length>0){
+            cmd = `export ${cmdParams.join(' ')}\n ${cmd}`;
+          }
+          task.title=`执行:${cmd}`;
           let req = shelljs.exec(cmd)
           if(req.code==0){
             resolve();

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);
       }
     })
   },

package/templates/dev/template_admin/tools/iconfont/node_modules/@npmcli/fs/node_modules/lru-cache/LICENSE

@@ -0,0 +1,15 @@
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/templates/dev/template_admin/tools/iconfont/node_modules/@npmcli/fs/node_modules/lru-cache/README.md

@@ -0,0 +1,166 @@
+# lru cache
+
+A cache object that deletes the least-recently-used items.
+
+[![Build Status](https://travis-ci.org/isaacs/node-lru-cache.svg?branch=master)](https://travis-ci.org/isaacs/node-lru-cache) [![Coverage Status](https://coveralls.io/repos/isaacs/node-lru-cache/badge.svg?service=github)](https://coveralls.io/github/isaacs/node-lru-cache)
+
+## Installation:
+
+```javascript
+npm install lru-cache --save
+```
+
+## Usage:
+
+```javascript
+var LRU = require("lru-cache")
+  , options = { max: 500
+              , length: function (n, key) { return n * 2 + key.length }
+              , dispose: function (key, n) { n.close() }
+              , maxAge: 1000 * 60 * 60 }
+  , cache = new LRU(options)
+  , otherCache = new LRU(50) // sets just the max size
+
+cache.set("key", "value")
+cache.get("key") // "value"
+
+// non-string keys ARE fully supported
+// but note that it must be THE SAME object, not
+// just a JSON-equivalent object.
+var someObject = { a: 1 }
+cache.set(someObject, 'a value')
+// Object keys are not toString()-ed
+cache.set('[object Object]', 'a different value')
+assert.equal(cache.get(someObject), 'a value')
+// A similar object with same keys/values won't work,
+// because it's a different object identity
+assert.equal(cache.get({ a: 1 }), undefined)
+
+cache.reset()    // empty the cache
+```
+
+If you put more stuff in it, then items will fall out.
+
+If you try to put an oversized thing in it, then it'll fall out right
+away.
+
+## Options
+
+* `max` The maximum size of the cache, checked by applying the length
+  function to all values in the cache.  Not setting this is kind of
+  silly, since that's the whole purpose of this lib, but it defaults
+  to `Infinity`.  Setting it to a non-number or negative number will
+  throw a `TypeError`.  Setting it to 0 makes it be `Infinity`.
+* `maxAge` Maximum age in ms.  Items are not pro-actively pruned out
+  as they age, but if you try to get an item that is too old, it'll
+  drop it and return undefined instead of giving it to you.
+  Setting this to a negative value will make everything seem old!
+  Setting it to a non-number will throw a `TypeError`.
+* `length` Function that is used to calculate the length of stored
+  items.  If you're storing strings or buffers, then you probably want
+  to do something like `function(n, key){return n.length}`.  The default is
+  `function(){return 1}`, which is fine if you want to store `max`
+  like-sized things.  The item is passed as the first argument, and
+  the key is passed as the second argumnet.
+* `dispose` Function that is called on items when they are dropped
+  from the cache.  This can be handy if you want to close file
+  descriptors or do other cleanup tasks when items are no longer
+  accessible.  Called with `key, value`.  It's called *before*
+  actually removing the item from the internal cache, so if you want
+  to immediately put it back in, you'll have to do that in a
+  `nextTick` or `setTimeout` callback or it won't do anything.
+* `stale` By default, if you set a `maxAge`, it'll only actually pull
+  stale items out of the cache when you `get(key)`.  (That is, it's
+  not pre-emptively doing a `setTimeout` or anything.)  If you set
+  `stale:true`, it'll return the stale value before deleting it.  If
+  you don't set this, then it'll return `undefined` when you try to
+  get a stale entry, as if it had already been deleted.
+* `noDisposeOnSet` By default, if you set a `dispose()` method, then
+  it'll be called whenever a `set()` operation overwrites an existing
+  key.  If you set this option, `dispose()` will only be called when a
+  key falls out of the cache, not when it is overwritten.
+* `updateAgeOnGet` When using time-expiring entries with `maxAge`,
+  setting this to `true` will make each item's effective time update
+  to the current time whenever it is retrieved from cache, causing it
+  to not expire.  (It can still fall out of cache based on recency of
+  use, of course.)
+
+## API
+
+* `set(key, value, maxAge)`
+* `get(key) => value`
+
+    Both of these will update the "recently used"-ness of the key.
+    They do what you think. `maxAge` is optional and overrides the
+    cache `maxAge` option if provided.
+
+    If the key is not found, `get()` will return `undefined`.
+
+    The key and val can be any value.
+
+* `peek(key)`
+
+    Returns the key value (or `undefined` if not found) without
+    updating the "recently used"-ness of the key.
+
+    (If you find yourself using this a lot, you *might* be using the
+    wrong sort of data structure, but there are some use cases where
+    it's handy.)
+
+* `del(key)`
+
+    Deletes a key out of the cache.
+
+* `reset()`
+
+    Clear the cache entirely, throwing away all values.
+
+* `has(key)`
+
+    Check if a key is in the cache, without updating the recent-ness
+    or deleting it for being stale.
+
+* `forEach(function(value,key,cache), [thisp])`
+
+    Just like `Array.prototype.forEach`.  Iterates over all the keys
+    in the cache, in order of recent-ness.  (Ie, more recently used
+    items are iterated over first.)
+
+* `rforEach(function(value,key,cache), [thisp])`
+
+    The same as `cache.forEach(...)` but items are iterated over in
+    reverse order.  (ie, less recently used items are iterated over
+    first.)
+
+* `keys()`
+
+    Return an array of the keys in the cache.
+
+* `values()`
+
+    Return an array of the values in the cache.
+
+* `length`
+
+    Return total length of objects in cache taking into account
+    `length` options function.
+
+* `itemCount`
+
+    Return total quantity of objects currently in cache. Note, that
+    `stale` (see options) items are returned as part of this item
+    count.
+
+* `dump()`
+
+    Return an array of the cache entries ready for serialization and usage
+    with 'destinationCache.load(arr)`.
+
+* `load(cacheEntriesArray)`
+
+    Loads another cache entries array, obtained with `sourceCache.dump()`,
+    into the cache. The destination cache is reset before loading new entries
+
+* `prune()`
+
+    Manually iterates over the entire cache proactively pruning old entries