jjb-cmd 1.0.16 → 2.0.0

package/bin/command-old.js

@@ -0,0 +1,65 @@
+#! /usr/bin/env node
+
+const commander = require('commander');
+const cliScripts = require('../src/old/cli.pull.js');
+const cliScripts2 = require('../src/old/cli.pull2.js');
+const cliScripts3 = require('../src/old/cli.install/index.js');
+const cliScripts4 = require('../src/old/cli.rm-rf.js');
+const cliScripts6 = require('../src/old/cli.init');
+const MergeScripts = require('../src/old/cli.merge.js');
+
+commander.command('v').description('-- 查看版本').action(() => {
+  console.log('当前版本 v1.0.12');
+});
+
+commander.command('help').description('-- 帮助').action(() => {
+  console.log('使用方法：');
+  console.log('1.jjb-cmd v -- 查看版本。');
+  console.log('2.jjb-cmd help -- 帮助。');
+  console.log('3.jjb-cmd view res -- 预览资源。');
+  console.log('4.jjb-cmd [actionName (有效值 pull | pull2 | install | rm-rf)] [...args] -- 基础功能。');
+});
+
+commander.command('view res').description('-- 预览资源').action(() => {
+  console.log('当前可资源：');
+  console.log('[common, react-admin-component]');
+});
+
+// pull 命令
+commander.command('pull -- <文件夹名称必填。>').description('-- 文件名称').action(res => {
+  console.log('pull命令已过时，新项目请使用pull2.');
+  cliScripts(res);
+});
+
+// pull 命令
+commander.command('pull2 -- <文件夹名称必填。>').description('-- 文件名称').action(res => {
+  cliScripts2(res);
+});
+
+// pull 命令
+commander.command('init').description('-- 初始化项目').action(res => {
+  cliScripts6(res);
+});
+
+// rm-rf 命令
+commander.command('rm-rf').description('-- 删除全部').action(res => {
+  cliScripts4(res);
+});
+
+// install 安装
+commander.command('install').description('-- 安装').action(res => {
+  cliScripts3(res);
+});
+
+//多省多应用命令
+commander.command('mp -- <multi prov多省多应用启动dev>').description('-- multi prov多省多应用合并').action(res => {
+  MergeScripts(res, 'mp');
+  console.log('start test');
+});
+
+//多省单应用
+commander.command('sp -- <single prov多省单应用>').description('-- single prov多省单应用').action(res => {
+
+});
+
+commander.parse(process.argv);

package/bin/command.js

@@ -1,23 +1,9 @@
 #! /usr/bin/env node
 
 const commander = require('commander');
-const cliScripts = require('../src/cli.pull.js');
-const cliScripts2 = require('../src/cli.pull2.js');
-const cliScripts3 = require('../src/cli.install/index.js');
-const cliScripts4 = require('../src/cli.rm-rf.js');
-const cliScripts6 = require('../src/cli.init');
-const MergeScripts = require('../src/cli.merge.js');
 
 commander.command('v').description('-- 查看版本').action(() => {
-  console.log('当前版本 v1.0.12');
-});
-
-commander.command('help').description('-- 帮助').action(() => {
-  console.log('使用方法：');
-  console.log('1.jjb-cmd v -- 查看版本。');
-  console.log('2.jjb-cmd help -- 帮助。');
-  console.log('3.jjb-cmd view res -- 预览资源。');
-  console.log('4.jjb-cmd [actionName (有效值 pull | pull2 | install | rm-rf)] [...args] -- 基础功能。');
+  console.log('当前版本 v2.0.0');
 });
 
 commander.command('view res').description('-- 预览资源').action(() => {
@@ -25,41 +11,67 @@ commander.command('view res').description('-- 预览资源').action(() => {
   console.log('[common, react-admin-component]');
 });
 
-// pull 命令
-commander.command('pull -- <文件夹名称必填。>').description('-- 文件名称').action(res => {
-  console.log('pull命令已过时，新项目请使用pull2.');
-  cliScripts(res);
+// publish 命令
+commander.command('push [args]').description('-- 发布包').action(args => {
+  if (args) {
+    if ([
+      'server',
+      'version',
+      'v',
+      'latest',
+      'components'
+    ].includes(args)) {
+      if ([
+        'v',
+        'version'
+      ].includes(args)) {
+        require('../src/new/cmd.version/index.js')();
+      }
+      if ([
+        'server',
+        'components'
+      ].includes(args)) {
+        require('../src/new/cmd.reglist/index.js')(args);
+      }
+      if ([ 'latest' ].includes(args)) {
+        require('../src/new/cmd.push/index.js')('latest');
+      }
+    } else {
+      console.log(`无效的选项‘${args}’。`);
+      process.exit(0);
+    }
+  } else {
+    require('../src/new/cmd.push/index.js')(null);
+  }
 });
 
-// pull 命令
-commander.command('pull2 -- <文件夹名称必填。>').description('-- 文件名称').action(res => {
-  cliScripts2(res);
+// reglist 命令
+commander.command('reg [args]').description('-- 查询注册表').action(a => {
+  // require('../src/new/cmd.reglist/index.js')();
 });
 
-// pull 命令
-commander.command('init').description('-- 初始化项目').action(res => {
-  cliScripts6(res);
+// init 命令
+commander.command('init -- <templateName>').description('-- 初始化模板').action(stdin => {
+  if ([
+    'lib',
+    'react-component',
+    'micro-app'
+  ].includes(stdin)) {
+    require('../src/new/cmd.init/index.js')(stdin);
+  } else {
+    console.log(`初始化失败，未能正确输入模板类型，仅支持（lib，react-component，micro-app）模板。`);
+    process.exit(0);
+  }
 });
 
 // rm-rf 命令
-commander.command('rm-rf').description('-- 删除全部').action(res => {
-  cliScripts4(res);
+commander.command('rm-rf').description('-- 删除全部').action(() => {
+  require('../src/new/cmd.rm-rf/index.js')();
 });
 
 // install 安装
-commander.command('install').description('-- 安装').action(res => {
-  cliScripts3(res);
-});
-
-//多省多应用命令
-commander.command('mp -- <multi prov多省多应用启动dev>').description('-- multi prov多省多应用合并').action(res => {
-  MergeScripts(res, 'mp');
-  console.log('start test');
-});
-
-//多省单应用
-commander.command('sp -- <single prov多省单应用>').description('-- single prov多省单应用').action(res => {
-
+commander.command('install').description('-- 安装').action(() => {
+  require('../src/new/cmd.install/index.js')();
 });
 
 commander.parse(process.argv);

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "jjb-cmd",
-  "version": "1.0.16",
+  "version": "2.0.0",
   "description": "jjb脚手架工具",
   "main": "index.js",
   "scripts": {
-    "test": "node bin/command.js help"
+    "test": "node bin/command.js help",
+    "publish": "npm publish",
+    "install:package": "npm i"
   },
   "bin": {
     "jjb-cmd": "bin/command.js"
   },
   "author": "jjb-front-team",
   "license": "MIT",
-  "dependencies": {
-    "commander": "1.3.2",
+  "devDependencies": {
+    "axios": "^1.1.3",
+    "commander": "^1.3.2",
     "compressing": "^1.5.1",
     "request": "2.88.2",
     "single-line-log": "1.1.2"

package/src/new/cmd.init/index.js

@@ -0,0 +1,48 @@
+const path = require('path');
+const { f_file_copy } = require('../cmd.install/tools');
+const fs = require('fs');
+
+module.exports = stdin => {
+  /**
+   * 下发数据根路径
+   * @type {string}
+   */
+  const root_path = path.resolve('./');
+  if (stdin === 'micro-app') {
+    if (
+      !fs.existsSync(`${root_path}\\jjb.script`) &&
+      !fs.existsSync(`${root_path}\\public`) &&
+      !fs.existsSync(`${root_path}\\src`) &&
+      !fs.existsSync(`${root_path}\\.gitignore`) &&
+      !fs.existsSync(`${root_path}\\jjb.config.json`) &&
+      !fs.existsSync(`${root_path}\\package.json`) &&
+      !fs.existsSync(`${root_path}\\webstorm.config.js`)
+    ) {
+      f_file_copy(`${__dirname}\\..\\cmd.init.copy\\micro-app`, root_path);
+      console.log('初始化完成！');
+      process.exit(0);
+    } else {
+      console.log('初始化失败，文件已存在！');
+      process.exit(0);
+    }
+  } else if ([
+    'lib',
+    'react-component'
+  ].includes(stdin)) {
+    if (
+      !fs.existsSync(`${root_path}\\jjb.script`) &&
+      !fs.existsSync(`${root_path}\\src`) &&
+      !fs.existsSync(`${root_path}\\.gitignore`) &&
+      !fs.existsSync(`${root_path}\\jjb.config.json`) &&
+      !fs.existsSync(`${root_path}\\package.json`) &&
+      !fs.existsSync(`${root_path}\\webstorm.config.js`)
+    ) {
+      f_file_copy(`${__dirname}\\..\\cmd.init.copy\\${stdin}`, root_path);
+      console.log('初始化完成！');
+      process.exit(0);
+    } else {
+      console.log('初始化失败，文件已存在！');
+      process.exit(0);
+    }
+  }
+};

package/src/{cli.init → new/cmd.init.copy/lib}/jjb.config.json

@@ -1,10 +1,7 @@
 {
   "projectType": "micro-spa",
   "installTarget": "node_modules",
-  "installResources": [
-    "common",
-    "react-admin-component"
-  ],
+  "installResources": [],
   "environment": {
     "development": {
       "API_HOSE": ""
@@ -20,11 +17,9 @@
     }
   },
   "contextInject": {},
-  "windowInject": {
-    "title": "JJB Micro APP"
-  },
+  "windowInject": {},
   "server": {
-    "port": "8088",
+    "port": "8066",
     "host": "127.0.0.1"
   },
   "framework": {

package/src/new/cmd.init.copy/lib/jjb.script/config.js

@@ -0,0 +1,149 @@
+// noinspection JSUnresolvedVariable
+
+const path = require('path');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const { requireResolve } = require('./utils');
+const webpack = require('webpack');
+
+const config = require(requireResolve('jjb.config.json'));
+const packageJSON = require(requireResolve('package.json'));
+const server = (config.server || {});
+const environment = (config.environment || {})[ process.env.NODE_ENV ];
+const windowInject = (config.windowInject || {});
+const contextInject = (config.contextInject || {});
+const contextData = {
+  ...environment,
+  ...contextInject
+};
+
+module.exports = mode => {
+  return {
+    server,
+    webpack: {
+      // 模式 ‘development’ | ‘production’
+      mode,
+      // 入口
+      entry: './src/index.js',
+      // 输出
+      output: {
+        // 指定输出目录文件名
+        path: path.resolve(__dirname, '../dist'),
+        // 定义全局变量,暴露到‘window’对象中
+        library: 'libName',
+        // 指定编译的‘js’存放目录文件名称
+        filename: 'index.js',
+        // 输出公共路径
+        publicPath: '/',
+        // 默认暴露‘window’此处修改为暴露到‘exports’中 window | umd
+        libraryTarget: 'window'
+      },
+      // ‘node.module’
+      module: {
+        // 文件处理
+        rules: [
+          {
+            // 处理‘less’和‘css’文件
+            test: /\.(less|css)$/,
+            // 以此从下到上处理‘css’
+            use: [
+              {
+                loader: 'style-loader'
+              },
+              // 2:将被‘less-loader’处理的‘css’
+              // 由‘css-loader’再次处理
+              {
+                loader: 'css-loader'
+              },
+              // 1:处理‘less’文件
+              {
+                // 使用‘less-loader’
+                loader: 'less-loader',
+                // 配置‘less-loader’
+                options: {
+                  // ‘less-loader’特殊配置
+                  lessOptions: {
+                    // 定义‘less’全局变量,从jjb.config.antd获取
+                    modifyVars: (config.framework || {}).antd || {},
+                    // 启用‘less-javascript’功能
+                    javascriptEnabled: true
+                  }
+                }
+              }
+            ]
+          },
+          {
+            // 处理‘js’文件
+            test: /\.js$/,
+            // 使用‘babel-loader’
+            loader: 'babel-loader',
+            // 允许‘babel-loader’操作目录
+            include: [
+              // 整个‘src’目录
+              path.resolve(__dirname, '../src')
+            ],
+            // 配置‘babel-loader’
+            options: {
+              // 加入一个‘babel-plugin-import’插件,特殊处理‘antd’文件过大问题
+              plugins: [
+                [
+                  'import',
+                  {
+                    // ‘webpack’定义全局变量‘antd’
+                    libraryName: 'antd',
+                    // 按需将‘es’文件夹中组件导出,绑定到‘antd’变量
+                    // 除了‘es’,也可以修改为‘lib’
+                    libraryDirectory: 'es'
+                    // 这里设为‘true’,表示自动导入‘antd/dist/less’
+                    // 或修改为‘css’ | ‘less’
+                    // style: true
+                  }
+                ],
+                [
+                  '@babel/plugin-proposal-decorators',
+                  {
+                    'legacy': true
+                  }
+                ]
+              ],
+              // 考虑到使用‘React JSX’语法‘babel-loader’的编译预设要改为‘preset-react’
+              // 可选值‘preset-env’
+              presets: [ '@babel/preset-react' ]
+            }
+          },
+          {
+            // 处理图片文件
+            test: /\.(png|jpg|jpeg|gif|ico|bmp)/,
+            // 使用‘url-loader’或‘raw-loader’
+            loader: 'url-loader',
+            // 配置‘url-loader’
+            options: {
+              // 当文件大小处于(?)byte,输出‘base64’,反之为‘url’.
+              // 这里设为‘false’,表示无论多大多小,都为‘url’.
+              limit: true
+            }
+          }
+        ]
+      },
+      // 解析
+      resolve: {
+        // 为‘import’或‘require’定义别名路径
+        alias: {
+          '~': requireResolve('src')
+        }
+      },
+      // 插件
+      plugins: [
+        // 注入全局变量到项目中,从‘jjb.config.contextData’读取
+        new webpack.DefinePlugin({ 'process.env.app': JSON.stringify(contextData) }),
+        // 解决‘moment.js’本地化文件过多问题
+        // 按需加载本地化文件当前项目只需要‘zh_CN.js’
+        new webpack.IgnorePlugin({
+          contextRegExp: /moment$/,
+          resourceRegExp: /^\.\/locale$/
+        }),
+        // 每次打包前删除‘dist’目录
+        new CleanWebpackPlugin()
+      ]
+    }
+  };
+};

package/src/{cli.init → new/cmd.init.copy/lib}/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "jjbMicroApp",
+  "name": "lib",
   "version": "1.0.0",
-  "description": "jjb-micro-app",
+  "description": "工具库模板",
   "main": "index.js",
   "scripts": {
     "serve": "node jjb.script/server.js",

package/src/new/cmd.init.copy/lib/src/index.js

@@ -0,0 +1 @@
+export {};

package/src/new/cmd.init.copy/micro-app/jjb.config.json

@@ -0,0 +1,40 @@
+{
+  "projectType": "micro-spa",
+  "installTarget": "node_modules",
+  "installResources": [
+    "jjb-dva-runtime",
+    "jjb-common-decorator"
+  ],
+  "environment": {
+    "development": {
+      "API_HOSE": ""
+    },
+    "test": {
+      "API_HOSE": ""
+    },
+    "release": {
+      "API_HOSE": ""
+    },
+    "production": {
+      "API_HOSE": ""
+    }
+  },
+  "contextInject": {
+    "notRouter": true
+  },
+  "windowInject": {
+    "title": "application",
+    "jjbCommonLibUrl": ""
+  },
+  "server": {
+    "port": "8080",
+    "host": "127.0.0.1"
+  },
+  "framework": {
+    "antd": {
+      "link-color": "#021e43",
+      "primary-color": "#021e43",
+      "border-radius-base": "2px"
+    }
+  }
+}

package/src/new/cmd.init.copy/micro-app/jjb.script/build.js

@@ -0,0 +1,11 @@
+const { hasEnvironment } = require('./utils');
+
+if (!hasEnvironment()) {
+  throw Error('jjb.script[build]: 启动build需要提供NODE_ENV变量，请确认你所运行的脚本是否正确？');
+}
+
+require('webpack')(require('./config')('production').webpack).run(err => {
+  if (!err) {
+    console.log('项目打包完成！');
+  }
+});