jjb-cmd 2.0.6 → 2.0.8

package/README.md

@@ -1 +1,8 @@
 <h1>重庆市建教帮科技有限公司-前端脚手架</h1>
+<h3>更新日志：</h3>
+<ul>
+    <li>
+        <p>2.0.8</p>
+        <div>修改init指令初始化项目，从gitlab获取</div>
+    </li>
+</ul>

package/bin/command.js

@@ -1,6 +1,10 @@
 #! /usr/bin/env node
 
 const commander = require('commander');
+const readline = require('readline');
+const path = require('path');
+const fs = require('fs');
+const child_process = require('child_process');
 
 commander.command('v').description('-- 查看版本').action(() => {
   console.log('当前版本 v2.0.0');
@@ -11,6 +15,49 @@ commander.command('view res').description('-- 预览资源').action(() => {
   console.log('[common, react-admin-component]');
 });
 
+commander.command('link').option('-A').description('-- 创建符号链接').action(args => {
+  let dirList = [];
+  const hasFlag = args.A;
+  const root_path = path.resolve('./');
+  let r1 = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  r1.question('Target Path:', function (answer) {
+    const arr = answer.split('\\');
+    const name = arr.length
+      ? arr[ arr.length - 1 ]
+      : '';
+    if (hasFlag) {
+      dirList = dirList.concat(fs.readdirSync(root_path).map(dir => {
+        return `${root_path}\\${dir}`;
+      }).filter(dir => fs.statSync(dir).isDirectory()).map(dir => {
+        return {
+          dir: dir + '\\' + name,
+          link: answer
+        };
+      }));
+    } else {
+      dirList = dirList.concat(root_path).map(dir => {
+        return {
+          dir: dir + '\\' + name,
+          link: answer
+        };
+      });
+    }
+    dirList.forEach(item => {
+      child_process.execSync(`mklink /D ${item.dir} ${item.link}`, (error, stdout) => {
+        if (!error) {
+          console.log(stdout);
+        }
+      });
+    });
+    console.log('执行完成。');
+    process.exit(0);
+  });
+  r1.on('close', () => process.exit(0));
+});
+
 // publish 命令
 commander.command('push [args]').description('-- 发布包').action(args => {
   if (args) {

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "jjb-cmd",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "jjb脚手架工具",
   "main": "index.js",
   "scripts": {
     "test": "node bin/command.js help",
-    "publish": "npm publish",
     "install:package": "npm i"
   },
   "bin": {

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

@@ -1,66 +1,102 @@
 const path = require('path');
 const { f_file_copy } = require('../cmd.install/tools');
+const { CLOUD_PROJECT, GIT_TEMP_DIR, GIT_HOST } = require('../cmd.install/config');
 const fs = require('fs');
+const os = require("os");
+const utils = require("../../old/util");
+const request = require("request");
+const compressing = require("compressing");
 
 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(stdin === 'micro-app-ts') {
-    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}\\tsconfig.json`) &&
-      !fs.existsSync(`${root_path}\\package.json`) &&
-      !fs.existsSync(`${root_path}\\webstorm.config.js`)
-    ) {
-      f_file_copy(`${__dirname}\\..\\cmd.init.copy\\micro-app-ts`, 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);
-    }
+  const root_path = path.resolve('./temp');
+
+  const cloudObj = CLOUD_PROJECT[ stdin ] || undefined;
+  if (cloudObj) {
+    const tmpDir = os.tmpdir();
+    const zipPath = `${tmpDir}/${GIT_TEMP_DIR}/${stdin}.zip`;
+    const zipFolder = `${tmpDir}/${GIT_TEMP_DIR}/unzip/`;
+    utils.DeleteDirAllFile(`${tmpDir}/${GIT_TEMP_DIR}`, () => {
+      fs.mkdirSync(`${tmpDir}/${GIT_TEMP_DIR}`);
+      let stream = fs.createWriteStream(zipPath);
+      request(`${GIT_HOST}/api/v4/projects/${cloudObj.projectId}/repository/archive.zip?private_token=${cloudObj.token}&ref=master`).pipe(stream)
+        .on('close', () => {
+          fs.mkdirSync(zipFolder);
+          compressing.zip.uncompress(zipPath, zipFolder)
+            .then(() => {
+              setTimeout(() => {
+                fs.readdirSync(zipFolder).forEach(dirName => {
+                  if (dirName.indexOf('-master-') !== -1) {
+                    utils.CopyFolder(zipFolder + dirName, root_path, () => {
+                      console.log('初始化完成！');
+                      process.exit(0);
+                    });
+                  }
+                })
+              }, 2000);
+            })
+        });
+    });
+  } else {
+    console.log('【Error】：初始化失败，'+ stdin +'不存在。');
   }
+
+  // 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(stdin === 'micro-app-ts') {
+  //   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}\\tsconfig.json`) &&
+  //     !fs.existsSync(`${root_path}\\package.json`) &&
+  //     !fs.existsSync(`${root_path}\\webstorm.config.js`)
+  //   ) {
+  //     f_file_copy(`${__dirname}\\..\\cmd.init.copy\\micro-app-ts`, 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/new/cmd.install/config.js

@@ -27,5 +27,21 @@ exports.CLOUD_PROJECT = {
     token: 'd4wQ7dzEjYPsgVbKnYei',
     projectId: 339
   },
+  'react-component': {
+    token: 'snBxJ2i5kYarGGcsojhY',
+    projectId: 831
+  },
+  'micro-app-ts': {
+    token: '7V-YUxhmh51Mdhgx4rq4',
+    projectId: 830
+  },
+  'micro-app': {
+    token: 'FqNrmFAgrxasMrbbjvq9',
+    projectId: 829
+  },
+  'lib': {
+    token: 'ywPtT3xCG6b_vAxp6sTj',
+    projectId: 828
+  }
 };
 exports.TEMPLATE_FOLDER = `${os.tmpdir()}\\${exports.GIT_TEMP_DIR}`;

package/src/new/cmd.init.copy/lib/jjb.config.json

@@ -1,32 +0,0 @@
-{
-  "projectType": "micro-spa",
-  "installTarget": "node_modules",
-  "installResources": [],
-  "environment": {
-    "development": {
-      "API_HOST": ""
-    },
-    "test": {
-      "API_HOST": ""
-    },
-    "release": {
-      "API_HOST": ""
-    },
-    "production": {
-      "API_HOST": ""
-    }
-  },
-  "contextInject": {},
-  "windowInject": {},
-  "server": {
-    "port": "8066",
-    "host": "127.0.0.1"
-  },
-  "framework": {
-    "antd": {
-      "link-color": "red",
-      "primary-color": "red",
-      "border-radius-base": "2px"
-    }
-  }
-}

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

@@ -1,14 +0,0 @@
-const { hasEnvironment } = require('./utils');
-
-if ( !hasEnvironment()) {
-  throw Error('jjb.script[build]: 启动build需要提供NODE_ENV变量，请确认你所运行的脚本是否正确？');
-}
-
-require('webpack')(require('./config')('production').webpack).run(function (stat, compiler) {
-  if ( !compiler.compilation.errors.length) {
-    console.log('库文件Build完成!');
-  } else {
-    console.log('库文件Build失败，发现以下问题，请解决后重试!');
-    console.log(compiler.compilation.errors);
-  }
-});

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

@@ -1,149 +0,0 @@
-// 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/new/cmd.init.copy/lib/jjb.script/proxy.js

@@ -1,19 +0,0 @@
-const express = require('express');
-const history = require('connect-history-api-fallback');
-const app = express();
-const port = '8766';
-
-/**
- * 单页面应用需要的历史记录模块
- */
-app.use(history());
-
-/**
- * 输出静态资源
- */
-app.use(express.static('../dist'));
-
-/**
- * 监听端口
- */
-app.listen(port, () => console.log(`Your application is running here: http://localhost:${port}`));

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

@@ -1,29 +0,0 @@
-const Server = require('webpack-dev-server');
-const webpack = require('webpack');
-const { hasEnvironment } = require('./utils');
-
-if (!hasEnvironment()) {
-  throw Error('jjb.script[server]: 启动server需要提供NODE_ENV变量，请确认你所运行的脚本是否正确？');
-}
-
-const config = require('./config')('development');
-
-new Server({
-  host: config.server.host || '127.0.0.1',
-  port: config.server.port || '8080',
-  headers: {
-    'Access-Control-Allow-Origin': '*',
-    'Access-Control-Allow-Methods': '*',
-    'Access-Control-Allow-Headers': '*'
-  },
-  compress: true,
-  client: {
-    overlay: {
-      errors: true,
-      warnings: true
-    }
-  },
-  historyApiFallback: {
-    disableDotRule: true
-  }
-}, webpack(config.webpack)).startCallback(() => console.log('jjb.server 服务已启动，正在编译。'));

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

@@ -1,13 +0,0 @@
-const path = require('path');
-/**
- * @description 是否有环境变量‘NODE_ENV’
- * @return {boolean}
- */
-exports.hasEnvironment = () => process.env.NODE_ENV !== undefined;
-
-/**
- * @description 文件解析
- * @param name {string}
- * @return {`${string}\\${string}`}
- */
-exports.requireResolve = name => `${path.resolve(__dirname, '..')}\\${name}`;

package/src/new/cmd.init.copy/lib/package.json

@@ -1,62 +0,0 @@
-{
-  "name": "lib",
-  "version": "1.0.0",
-  "description": "工具库模板",
-  "main": "index.js",
-  "scripts": {
-    "serve": "node jjb.script/server.js",
-    "build": "node jjb.script/build.js",
-    "serve:development": "cross-env NODE_ENV=development npm run serve",
-    "serve:test": "cross-env NODE_ENV=test npm run serve",
-    "serve:release": "cross-env NODE_ENV=release npm run serve",
-    "serve:production": "cross-env NODE_ENV=production npm run serve",
-    "build:development": "cross-env NODE_ENV=development npm run build",
-    "build:test": "cross-env NODE_ENV=test npm run build",
-    "build:release": "cross-env NODE_ENV=release npm run build",
-    "build:production": "cross-env NODE_ENV=production npm run build",
-    "jjb-cmd:install": "jjb-cmd install"
-  },
-  "author": "JJB",
-  "license": "MIT",
-  "devDependencies": {
-    "@babel/core": "^7.19.3",
-    "@babel/plugin-proposal-decorators": "^7.19.3",
-    "@babel/preset-react": "^7.18.6",
-    "babel-loader": "^8.2.5",
-    "babel-plugin-import": "^1.13.5",
-    "clean-webpack-plugin": "^4.0.0",
-    "connect-history-api-fallback": "^2.0.0",
-    "cross-env": "^7.0.3",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^4.2.1",
-    "express": "^4.18.2",
-    "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.5.0",
-    "less": "^4.1.3",
-    "less-loader": "^11.1.0",
-    "mini-css-extract-plugin": "^2.6.1",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.3.6",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.74.0",
-    "webpack-bundle-analyzer": "^4.6.1",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.11.1"
-  },
-  "dependencies": {
-    "@ant-design/icons": "^4.7.0",
-    "antd": "^4.23.5",
-    "axios": "^1.1.2",
-    "crypto-js": "^4.1.1",
-    "dva": "^2.6.0-beta.22",
-    "history": "^5.3.0",
-    "moment": "^2.29.4",
-    "prop-types": "^15.8.1",
-    "react": "^17.0.2",
-    "react-cropper": "^2.1.8",
-    "react-dom": "^17.0.2",
-    "react-router-dom": "^5.2.0",
-    "watch-props": "^0.0.3"
-  }
-}

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

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

package/src/new/cmd.init.copy/lib/webstorm.config.js

@@ -1,16 +0,0 @@
-'use strict';
-const path = require('path');
-
-function resolve (dir) {
-  return path.join(__dirname, '.', dir);
-}
-
-module.exports = {
-  context: path.resolve(__dirname, './'),
-  resolve: {
-    extensions: [ '.js' ],
-    alias: {
-      '~': resolve('src/')
-    }
-  }
-};

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

@@ -1,42 +0,0 @@
-{
-  "projectType": "micro-spa",
-  "installTarget": "node_modules",
-  "installResources": [
-    "jjb-dva-runtime",
-    "jjb-common-lib",
-    "jjb-common-decorator",
-    "react-admin-component"
-  ],
-  "environment": {
-    "development": {
-      "API_HOST": ""
-    },
-    "test": {
-      "API_HOST": ""
-    },
-    "release": {
-      "API_HOST": ""
-    },
-    "production": {
-      "API_HOST": ""
-    }
-  },
-  "contextInject": {
-    "basename": "/"
-  },
-  "windowInject": {
-    "title": "微应用",
-    "jjbCommonLibUrl": "https://cdn.cqjjb.cn/jjb-common-lib/latest/index.js"
-  },
-  "server": {
-    "port": "8080",
-    "host": "127.0.0.1"
-  },
-  "framework": {
-    "antd": {
-      "link-color": "#007AFF",
-      "primary-color": "#007AFF",
-      "border-radius-base": "2px"
-    }
-  }
-}

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

@@ -1,14 +0,0 @@
-const { hasEnvironment } = require('./utils');
-
-if ( !hasEnvironment()) {
-  throw Error('jjb.script[build]: 启动build需要提供NODE_ENV变量，请确认你所运行的脚本是否正确？');
-}
-
-require('webpack')(require('./config')('production').webpack).run(function (stat, compiler) {
-  if ( !compiler.compilation.errors.length) {
-    console.log('项目Build完成!');
-  } else {
-    console.log('项目Build失败，发现以下问题，请解决后重试!');
-    console.log(compiler.compilation.errors);
-  }
-});