jjb-cmd 1.0.17 → 2.0.0

package/src/{cli.init → old/cli.init}/jjb.script/config.js

@@ -13,7 +13,7 @@ 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 windowInject = Object.assign((config.windowInject || {}), environment);
 const contextInject = (config.contextInject || {});
 const contextData = {
   ...environment,
@@ -31,6 +31,7 @@ module.exports = mode => {
       entry: './src/index.js',
       // 输出
       output: {
+        libraryTarget: 'umd',
         // 指定输出目录文件名
         path: path.resolve(__dirname, '../dist'),
         // 定义全局变量,暴露到‘window’对象中
@@ -38,9 +39,7 @@ module.exports = mode => {
         // 指定编译的‘js’存放目录文件名称
         filename: 'static/js/[id].js',
         // 输出公共路径
-        publicPath: '/',
-        // 默认暴露‘window’此处修改为暴露到‘exports’中
-        libraryTarget: 'umd'
+        publicPath: '/'
       },
       // ‘node.module’
       module: {
@@ -87,10 +86,10 @@ module.exports = mode => {
             include: [
               // 整个‘src’目录
               path.resolve(__dirname, '../src'),
-              // ‘jjb-common’库
-              path.resolve(__dirname, '../node_modules/jjb-common'),
-              // ‘jjb-react-admin-component’库
-              path.resolve(__dirname, '../node_modules/jjb-react-admin-component')
+              // ‘jjb-dva-runtime’库
+              path.resolve(__dirname, '../node_modules/jjb-dva-runtime'),
+              // ‘jjb-common-decorator’库
+              path.resolve(__dirname, '../node_modules/jjb-common-decorator')
             ],
             // 配置‘babel-loader’
             options: {
@@ -154,9 +153,7 @@ module.exports = mode => {
       resolve: {
         // 为‘import’或‘require’定义别名路径
         alias: {
-          '~': requireResolve('src'),
-          'common': requireResolve('src/common'),
-          'components': requireResolve('src/components')
+          '~': requireResolve('src')
         }
       },
       // 插件
@@ -182,6 +179,10 @@ module.exports = mode => {
         // 每次打包前删除‘dist’目录
         new CleanWebpackPlugin()
       ],
+      // 外部扩展
+      externals: {
+        'window:jjb-common-lib': 'jjbCommonLib'
+      },
       // 打包优化
       optimization: isProduction
         ? {

package/src/old/cli.init/jjb.script/proxy.js

@@ -0,0 +1,19 @@
+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/old/cli.init/jjb.script/server.js

@@ -0,0 +1,29 @@
+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/old/cli.init/jjb.script/utils.js

@@ -0,0 +1,13 @@
+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/old/cli.init/package.json

@@ -0,0 +1,65 @@
+{
+  "name": "jjbMicroApp",
+  "version": "1.0.0",
+  "description": "jjb-micro-app",
+  "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": "XiWell",
+  "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",
+    "qiankun": "^2.8.3",
+    "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",
+    "jjb-dva-runtime": "1.0.0",
+    "jjb-common-decorator": "1.0.0"
+  }
+}

package/src/{cli.init → old/cli.init}/public/index.html

@@ -7,9 +7,15 @@
     <title>
       <%= htmlWebpackPlugin.options.title %>
     </title>
+    <script>
+      window.__JJB_environment = {
+        API_HOST: '<%= htmlWebpackPlugin.options.API_HOST %>'
+      };
+    </script>
+    <script src="<%= htmlWebpackPlugin.options.jjbCommonLibUrl %>"></script>
   </head>
   <body>
     <noscript>此网页需要开启JavaScript功能。</noscript>
-    <div id="root"></div>
+    <div id="root" style="width: 100%; height: 100%; position: relative"></div>
   </body>
 </html>

package/src/old/cli.init/src/enumerate/namespace/index.js

@@ -0,0 +1,3 @@
+import { defineNamespace } from 'jjb-dva-runtime';
+
+export const NS_MAIN = defineNamespace('main');

package/src/{cli.init → old/cli.init}/src/index.js

@@ -1,4 +1,4 @@
-import { registerApplication } from 'jjb-common/dva/automatic/register';
+import { registerApplication } from 'jjb-dva-runtime/automatic/register';
 
 const app = registerApplication();
 

package/src/old/cli.init/src/models/main/index.js

@@ -0,0 +1,31 @@
+import { NS_MAIN } from '~/enumerate/namespace';
+import { registerModelNew } from 'jjb-dva-runtime';
+import { GetBaseApplicationConfig } from '~/api/main';
+
+export default registerModelNew(NS_MAIN, {
+  state: {
+    loading: false
+  },
+  effects: {
+    /**
+     * @return {Promise<{IResponse}>}
+     */
+    getBaseApplicationConfigAction: () => [
+      'loading',
+      GetBaseApplicationConfig,
+      ({
+        tabs = {},
+        aside = {},
+        header = {},
+        content = {}
+      }) => ({
+        baseApplicationConfig: {
+          tabs,
+          aside,
+          header,
+          content
+        }
+      })
+    ]
+  }
+});

package/src/old/cli.init/src/pages/index.js

@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default class App extends React.Component {
+  render () {
+    return (
+      <h1>Hello World</h1>
+    );
+  }
+}

package/src/old/cli.init/webstorm.config.js

@@ -0,0 +1,18 @@
+'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/'),
+      'common': resolve('src/common'),
+      'components': resolve('src/components')
+    }
+  }
+};

package/src/{cli.init.js → old/cli.init.js}

@@ -2,10 +2,7 @@ const path = require('path');
 const readline = require('readline');
 const { f_file_copy } = require('./cli.install/tools');
 const fs = require('fs');
-const A = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
+
 module.exports = () => {
   /**
    * 下发数据根路径

package/src/{cli.install → old/cli.install}/config.js

@@ -11,6 +11,18 @@ exports.CLOUD_PROJECT = {
     token: 'FT3pKzxpRynFkmddJ9Bs',
     projectId: 340
   },
+  'jjb-dva-runtime': {
+    token: 'hLqARY89CN6fUD3yg4NL',
+    projectId: 571
+  },
+  'jjb-common-lib': {
+    token: 'e9njpBd1nS_LREN8GFpR',
+    projectId: 572
+  },
+  'jjb-common-decorator': {
+    token: 'gPSit8aJsLVmNzuQ5Cy4',
+    projectId: 574
+  },
   'vue-unisass-component': {
     token: 'd4wQ7dzEjYPsgVbKnYei',
     projectId: 339

package/src/{cli.install → old/cli.install}/index.js

@@ -206,7 +206,7 @@ module.exports = () => {
               fs.writeFileSync(`${item.path}\\index.js`, codeList.join('\n'));
             }
           }
-          if (folder_name === 'common') {
+          if (folder_name === 'jjb-common') {
             /**
              * 组装dva/automatic路径
              */
@@ -267,7 +267,7 @@ module.exports = () => {
             /**
              * 特殊处理:为了避免与node_modules其他依赖重名,添加一个标识符"jjb-"
              */
-            const package_name = `jjb-${folder_name}`;
+            const package_name = folder_name;
             /**
              * 文件操作:判断node_modules目录下是否已存在
              */
@@ -298,9 +298,7 @@ module.exports = () => {
             /**
              * 特殊处理:由于老项目问题，此处要将react-admin-component转换为components(仅限src模式)
              */
-            const t_name = folder_name === 'react-admin-component'
-              ? 'components'
-              : folder_name;
+            const t_name = 'react-admin-component';
             /**
              * 文件操作:判断src目录下是否已存在
              */

package/src/old/cli.install/tools.js

@@ -0,0 +1,230 @@
+const fs = require('fs');
+const os = require('os');
+const {
+  GIT_HOST,
+  GIT_TEMP_DIR,
+  CLOUD_PROJECT
+} = require('./config');
+
+/**
+ * @description 删除全部
+ * @param path {string} 路径
+ */
+exports.f_rm_rf = function (path) {
+  if (fs.existsSync(path)) {
+    const list = fs.readdirSync(path);
+    for (let i = 0; i < list.length; i++) {
+      const item = list[ i ];
+      const vPath = `${path}/${item}`;
+      if (fs.statSync(vPath).isDirectory()) {
+        exports.f_rm_rf(vPath);
+        fs.rmdirSync(vPath);
+      } else {
+        fs.unlinkSync(vPath);
+      }
+    }
+  }
+};
+
+/**
+ * @typedef {object} GitResource
+ * @property {string} path
+ * @property {string} compress
+ * @property {string} repository
+ */
+
+/**
+ * @description 拉取git资源
+ * @param installResources {Resource[]} 资源名称
+ * @return {GitResource[]}
+ */
+exports.f_pull_git_repository = function (installResources = []) {
+  return installResources.map(item => {
+    const resource = CLOUD_PROJECT[ item.name ] || undefined;
+    const template = os.tmpdir();
+    return {
+      path: `${template}\\${GIT_TEMP_DIR}\\${item.name}.zip`,
+      compress: `${template}\\${GIT_TEMP_DIR}\\${item.name}_zip`,
+      repository: `${GIT_HOST}/api/v4/projects/${resource.projectId}/repository/archive.zip?private_token=${resource.token}&ref=master`
+    };
+  });
+};
+
+/**
+ * @description 扫描是否存在jjb.config.json
+ * @param root 路径
+ * @returns {boolean}
+ */
+exports.f_scan_jjb_config_json = function (root) {
+  return fs.existsSync(`${root}\\jjb.config.json`);
+};
+
+/**
+ * @typedef {object} JJB_CONFIG_JSON
+ * @property {string} projectType
+ * @property {string} installTarget
+ * @property {Resource[]} installResources
+ */
+
+/**
+ * @description 验证规则
+ * @param root {string} 路径
+ * @return {JJB_CONFIG_JSON}
+ */
+exports.f_scan_jjb_config_json_rules = function (root) {
+  let jjb_config_json = {};
+  try {
+    jjb_config_json = JSON.parse(fs.readFileSync(`${root}\\jjb.config.json`).toString());
+  } catch (e) {
+    console.log('【Error】：[jjb.config.json]文件解析失败，请确认是否配置正确。');
+    process.exit(0);
+  }
+  if (!('projectType' in jjb_config_json)) {
+    console.log('【Error】：[jjb.config.json]文件配置无效，需要projectType属性。');
+    process.exit(0);
+  }
+  if (!('installTarget' in jjb_config_json)) {
+    console.log('【Error】：[jjb.config.json]文件配置无效，需要installTarget属性。');
+    process.exit(0);
+  }
+  if (!('installResources' in jjb_config_json)) {
+    console.log('【Error】：[jjb.config.json]文件配置无效，需要installResources属性。');
+    process.exit(0);
+  }
+  if (typeof jjb_config_json.projectType !== 'string') {
+    console.log('【Error】：[jjb.config.json.projectType]类型是一个string。');
+    process.exit(0);
+  }
+  if (![
+    'multi',
+    'spa',
+    'uniapp',
+    'micro-spa'
+  ].includes(jjb_config_json.projectType)) {
+    console.log('【Error】：[jjb.config.json.projectType]配置无效，有效值<multi | spa | micro-spa | uniapp>。');
+    process.exit(0);
+  }
+  if (typeof jjb_config_json.installTarget !== 'string') {
+    console.log('【Error】：[jjb.config.json.installTarget]类型是一个string。');
+    process.exit(0);
+  }
+  if (![
+    'node_modules',
+    'src'
+  ].includes(jjb_config_json.installTarget)) {
+    console.log('【Error】：[jjb.config.json.node_modules]配置无效，有效值<node_modules | src>。');
+    process.exit(0);
+  }
+  if (!Array.isArray(jjb_config_json.installResources)) {
+    console.log('【Error】：[jjb.config.json.installResources]类型是一个Array<string>。');
+    process.exit(0);
+  }
+  if (jjb_config_json.installResources.length === 0) {
+    console.log('【Error】：[jjb.config.json.installResources]无资源。');
+    process.exit(0);
+  }
+  const resources = exports.f_resolve_install_resources(jjb_config_json.installResources);
+  if (resources.map(item => item.name).filter(v => ![
+    'jjb-common',
+    'jjb-dva-runtime',
+    'jjb-common-lib',
+    'jjb-common-decorator',
+    'react-admin-component',
+    'vue-unisass-component'
+  ].includes(v)).length !== 0) {
+    console.log('【Error】：[jjb.config.json.installResources]配置无效，有效值<common | react-admin-component | vue-unisass-component | jjb-common-decorator | jjb-dva-runtime | jjb-common-lib>。');
+    process.exit(0);
+  }
+  jjb_config_json.installResources = resources;
+  return jjb_config_json;
+};
+
+/**
+ * @description 创建package.json
+ * @param path {string} 路径
+ * @param name {string} 包名
+ * @param version {string} 版本
+ */
+exports.f_create_package_json = function (path, name, version) {
+  fs.writeFileSync(`${path}\\package.json`, `{"name":"${name}","version":"${version}","main": "index.js"}`);
+};
+
+/**
+ * @typedef {object} Resource
+ * @property {string} name
+ * @property {string[]} importList
+ */
+
+/**
+ * @description 分析resources
+ * @param installResources
+ * @return {Resource[]}
+ */
+exports.f_resolve_install_resources = function (installResources = []) {
+  const resources = [];
+  if (Array.isArray(installResources)) {
+    installResources.forEach(resource => {
+      if (Array.isArray(resource)) {
+        const [ name, importList = [] ] = resource;
+        resources.push({
+          name,
+          importList
+        });
+      } else {
+        resources.push({
+          name: resource,
+          importList: []
+        });
+      }
+    });
+  }
+  return resources;
+};
+
+/**
+ * @description 更新项目package.json文件
+ * @param path {string} 路径
+ * @param name {string} 包名
+ * @param version {string} 版本
+ */
+exports.f_update_project_package_json = function (path, name, version) {
+  const packageJSONFile = JSON.parse(fs.readFileSync(path).toString());
+  packageJSONFile.dependencies[ name ] = version;
+  fs.writeFileSync(path, JSON.stringify(packageJSONFile, null, 2));
+};
+
+/**
+ * @description 复制文件
+ * @param originSrc
+ * @param targetSrc
+ */
+exports.f_file_copy = function (originSrc, targetSrc) {
+  fs.readdirSync(originSrc).forEach(dir => {
+    const oPath = `${originSrc}\\${dir}`;
+    const tPath = `${targetSrc}\\${dir}`;
+    if (fs.statSync(oPath).isDirectory()) {
+      fs.mkdirSync(tPath);
+      exports.f_file_copy(oPath, tPath);
+    } else {
+      fs.writeFileSync(tPath, fs.readFileSync(oPath).toString());
+    }
+  });
+};
+
+/**
+ * @description 替换文件操作
+ * @param source {[]} 替换源
+ * @param root {string} 路径
+ */
+exports.f_content_replace = function (source = [], root) {
+  source.forEach(item => {
+    const path = root + item.path;
+    if (fs.existsSync(path)) {
+      let content = fs.readFileSync(path).toString();
+      item.replace.forEach(rep => {
+        content = content.replace(rep[ 0 ], rep[ 1 ]);
+      });
+      fs.writeFileSync(path, content);
+    }
+  });
+};

package/src/{cli.pull2.js → old/cli.pull2.js}

@@ -16,14 +16,12 @@ const CLOUD_PROJECT = {
   'common': {
     token: 'G4HJRsHr9D7Ssmixegw2',
     projectId: 279,
-    localName: 'common',
-    sha: '20e00c48'
+    localName: 'common'
   },
   'react-admin-component': {
     token: 'FT3pKzxpRynFkmddJ9Bs',
     projectId: 340,
-    localName: 'components',
-    sha: 'a79d730b'
+    localName: 'components'
   }
 };
 // common 需要替换的文本(常规应用)
@@ -219,7 +217,7 @@ module.exports = input => {
         utils.DeleteDirAllFile(`${tmpDir}/${GIT_TEMP_DIR}`, () => {
           fs.mkdirSync(`${tmpDir}/${GIT_TEMP_DIR}`);
           const stream = fs.createWriteStream(zipPath);
-          request(`${GIT_HOST}/api/v4/projects/${cloudObj.projectId}/repository/archive.zip?private_token=${cloudObj.token}&sha=${cloudObj.sha}`)
+          request(`${GIT_HOST}/api/v4/projects/${cloudObj.projectId}/repository/archive.zip?private_token=${cloudObj.token}&ref=master`)
             .pipe(stream)
             .on('close', () => {
               fs.mkdirSync(zipFolder);
@@ -227,7 +225,7 @@ module.exports = input => {
                 .then(() => {
                   setTimeout(() => {
                     fs.readdirSync(zipFolder).forEach(dirName => {
-                      if (dirName.indexOf(`-${cloudObj.sha}`) !== -1) {
+                      if (dirName.indexOf('-master-') !== -1) {
                         /* 删除下载的文件 */
                         utils.DeleteDirAllFile(`${srcFolderPath}\\${cloudObj.localName}`, () => {
                           /* 创建临时文件夹 */

package/src/{cli.rm-rf.js → old/cli.rm-rf.js}

@@ -18,8 +18,8 @@ module.exports = function () {
     if (answer.trim() === 'y') {
       console.log('正在计算项目数，请稍等...');
       setTimeout(() => {
-        scanner(root_path);
-        console.log(`计算完成共计[${f_total}]项目。`);
+        // scanner(root_path);
+        // console.log(`计算完成共计[${f_total}]项目。`);
         setTimeout(() => {
           console.clear();
           exec(root_path);
@@ -50,19 +50,19 @@ function exec (path) {
         if (fs.statSync(vPath).isDirectory()) {
           exec(vPath);
           fs.rmdirSync(vPath, { recursive: true });
-          f_number = f_number + 1;
-          // console.log('删除文件夹:' + vPath);
+          // f_number = f_number + 1;
+          console.log('删除文件夹:' + vPath);
         } else {
           fs.unlinkSync(vPath);
-          f_number = f_number + 1;
-          // console.log('删除文件:' + vPath);
+          // f_number = f_number + 1;
+          console.log('删除文件:' + vPath);
         }
-        progress.render({
-          completed: f_number,
-          total: f_total
-        });
+        // progress.render({
+        //   completed: f_number,
+        //   total: f_total
+        // });
       } catch (e) {
-        // console.log('删除异常:' + vPath);
+        console.log('删除异常:' + vPath);
       }
     }
   }

package/src/cli.init/src/enumerate/namespace/index.js

@@ -1,3 +0,0 @@
-import { defineNamespace } from 'jjb-common/dva';
-
-export const NS_DEMO = defineNamespace('demo');