jjb-cmd 2.0.2 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jjb-cmd",
-  "version": "2.0.2",
+  "version": "2.0.5",
   "description": "jjb脚手架工具",
   "main": "index.js",
   "scripts": {

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

@@ -4,16 +4,16 @@
   "installResources": [],
   "environment": {
     "development": {
-      "API_HOSE": ""
+      "API_HOST": ""
     },
     "test": {
-      "API_HOSE": ""
+      "API_HOST": ""
     },
     "release": {
-      "API_HOSE": ""
+      "API_HOST": ""
     },
     "production": {
-      "API_HOSE": ""
+      "API_HOST": ""
     }
   },
   "contextInject": {},

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

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

@@ -3,36 +3,40 @@
   "installTarget": "node_modules",
   "installResources": [
     "jjb-dva-runtime",
-    "jjb-common-decorator"
+    "jjb-common-lib",
+    "jjb-common-decorator",
+    "react-admin-component"
   ],
   "environment": {
     "development": {
-      "API_HOSE": ""
+      "API_HOST": "http://10.43.25.208:8888"
     },
     "test": {
-      "API_HOSE": ""
+
     },
     "release": {
-      "API_HOSE": ""
+
     },
     "production": {
-      "API_HOSE": ""
+      "API_HOST": "https://zfdapi.ynjspx.cn"
     }
   },
   "contextInject": {
+    "basename": "/"
   },
   "windowInject": {
-    "title": "微应用",
-    "jjbCommonLibUrl": "http://120.26.210.58:8089/jjb-common-lib/latest/index.js"
+    "title": "桌面",
+    "tenantCode": "YN",
+    "jjbCommonLibUrl": "https://cdn.cqjjb.cn/jjb-common-lib/latest/index.js"
   },
   "server": {
-    "port": "8080",
+    "port": "8888",
     "host": "127.0.0.1"
   },
   "framework": {
     "antd": {
-      "link-color": "#021e43",
-      "primary-color": "#021e43",
+      "link-color": "#007AFF",
+      "primary-color": "#007AFF",
       "border-radius-base": "2px"
     }
   }

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

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

@@ -94,7 +94,9 @@ module.exports = mode => {
               // ‘jjb-dva-runtime’库
               path.resolve(__dirname, '../node_modules/jjb-dva-runtime'),
               // ‘jjb-common-decorator’库
-              path.resolve(__dirname, '../node_modules/jjb-common-decorator')
+              path.resolve(__dirname, '../node_modules/jjb-common-decorator'),
+              // ‘react-admin-component’库
+              path.resolve(__dirname, '../node_modules/jjb-react-admin-component')
             ],
             // 配置‘babel-loader’
             options: {
@@ -129,11 +131,11 @@ module.exports = mode => {
             // 处理‘svg’文件
             test: /\.svg/,
             // 使用‘file-loader’
-            loader: 'file-loader',
+            loader: 'url-loader',
             // 配置‘file-loader’
             options: {
-              // 指定存储目录
-              outputPath: 'media/svg'
+              // 转base64
+              limit: false
             }
           },
           {
@@ -143,13 +145,8 @@ module.exports = mode => {
             loader: 'url-loader',
             // 配置‘url-loader’
             options: {
-              // 当文件大小处于(?)byte,输出‘base64’,反之为‘url’.
-              // 这里设为‘false’,表示无论多大多小,都为‘url’.
-              limit: false,
-              // 处理引入地址‘code’编码为‘utf-8’
-              encoding: true,
-              // 若输出为‘url’,需要指定存储目录
-              outputPath: 'media/image'
+              // 转base64
+              limit: false
             }
           }
         ]
@@ -186,7 +183,7 @@ module.exports = mode => {
       ],
       // 外部扩展
       externals: {
-        'jjb-common-lib': 'jjbCommonLib'
+        'jjb-common-lib-types': 'jjbCommonLib'
       },
       // 打包优化
       optimization: isProduction

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

@@ -10,4 +10,4 @@ exports.hasEnvironment = () => process.env.NODE_ENV !== undefined;
  * @param name {string}
  * @return {`${string}\\${string}`}
  */
-exports.requireResolve = name => `${path.resolve(__dirname, '..')}\\${name}`;
+exports.requireResolve = name => `${path.resolve(__dirname, '..')}//${name}`;

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

@@ -13,8 +13,7 @@
     "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"
+    "build:production": "cross-env NODE_ENV=production npm run build"
   },
   "author": "JJB",
   "license": "MIT",
@@ -46,12 +45,19 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
+    "@xiwell/ant-form-validate-tools": "^1.1.8",
     "antd": "^4.23.5",
     "axios": "^1.1.2",
     "crypto-js": "^4.1.1",
     "dva": "^2.6.0-beta.22",
+    "echarts": "^5.4.0",
     "history": "^5.3.0",
+    "jjb-common-decorator": "^1.0.0",
+    "jjb-common-lib-types": "^1.0.0",
+    "jjb-dva-runtime": "^1.0.1",
+    "jjb-react-admin-component": "^1.0.3",
     "moment": "^2.29.4",
+    "object-field-resolve": "^1.0.5",
     "prop-types": "^15.8.1",
     "qiankun": "^2.8.3",
     "react": "^17.0.2",

package/src/new/cmd.init.copy/micro-app/public/index.html

@@ -1,22 +1,33 @@
 <!DOCTYPE html>
 <html lang="zh">
-  <head>
-    <meta charset="UTF-8">
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1">
-    <title>
-      <%= htmlWebpackPlugin.options.title %>
-    </title>
-    <script>
-      window.__JJB_ENVIRONMENT = {
-        API_HOST: '<%= htmlWebpackPlugin.options.API_HOST %>',
-        FRAMEWORK: JSON.parse('<%= JSON.stringify(htmlWebpackPlugin.options.framework.antd) %>')
-      };
-    </script>
-    <script src="<%= htmlWebpackPlugin.options.jjbCommonLibUrl %>"></script>
-  </head>
-  <body>
-    <noscript>此网页需要开启JavaScript功能。</noscript>
-    <div id="root" style="width: 100%; height: 100%; position: relative"></div>
-  </body>
+<head>
+  <meta charset="UTF-8">
+  <meta
+    name="renderer"
+    content="webkit"
+  >
+  <meta
+    http-equiv="X-UA-Compatible"
+    content="IE=edge,Chrome=1"
+  >
+  <title>
+    <%= htmlWebpackPlugin.options.title %>
+  </title>
+  <script>
+    window.__JJB_ENVIRONMENT__ = {
+      API_HOST: '<%= htmlWebpackPlugin.options.API_HOST %>',
+      tenantCode: '<%= htmlWebpackPlugin.options.tenantCode %>',
+      FRAMEWORK: JSON.parse('<%= JSON.stringify(htmlWebpackPlugin.options.framework.antd) %>')
+    };
+    sessionStorage.setItem('tenantCode', window.__JJB_ENVIRONMENT__.tenantCode);
+  </script>
+  <script src="<%= htmlWebpackPlugin.options.jjbCommonLibUrl %>"></script>
+</head>
+<body>
+<noscript>此网页需要开启JavaScript功能。</noscript>
+<div
+  id="root"
+  style="width: 100%; height: 100%; position: relative"
+></div>
+</body>
 </html>

package/src/new/cmd.init.copy/micro-app/src/enumerate/namespace/index.js

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

package/src/new/cmd.init.copy/micro-app/src/index.js

@@ -7,7 +7,7 @@ const app = setup();
  * @param props {object}
  * @returns {Promise<*>}
  */
-export const mount = async props => app.mount(props);
+export const mount = async props => app.mount(props)
 
 /**
  * @description 卸载

package/src/new/cmd.init.copy/micro-app/src/pages/index.js

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

package/src/new/cmd.init.copy/react-component/jjb.config.json

@@ -1,22 +1,23 @@
 {
   "projectType": "micro-spa",
   "installTarget": "node_modules",
-  "installResources": [],
+  "installResources": [
+    "jjb-common-lib"
+  ],
   "environment": {
     "development": {
-      "API_HOSE": ""
+      "API_HOST": ""
     },
     "test": {
-      "API_HOSE": ""
+      "API_HOST": ""
     },
     "release": {
-      "API_HOSE": ""
+      "API_HOST": ""
     },
     "production": {
-      "API_HOSE": ""
+      "API_HOST": ""
     }
   },
-  "contextInject": {},
   "windowInject": {},
   "server": {
     "port": "8066",
@@ -24,7 +25,6 @@
   },
   "framework": {
     "antd": {
-      "ant-prefix": "test",
       "link-color": "red",
       "primary-color": "red",
       "border-radius-base": "2px"

package/src/new/cmd.init.copy/react-component/jjb.script/build.js

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

@@ -1,6 +1,7 @@
 // noinspection JSUnresolvedVariable
 
 const path = require('path');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const { requireResolve } = require('./utils');
 const webpack = require('webpack');
@@ -8,7 +9,13 @@ const webpack = require('webpack');
 const config = require(requireResolve('jjb.config.json'));
 const packageJSON = require(requireResolve('package.json'));
 const server = (config.server || {});
+const framework = (config.framework || {});
 const environment = (config.environment || {})[ process.env.NODE_ENV ];
+const windowInject = {
+  ...(config.windowInject || {}),
+  ...environment,
+  framework
+};
 const contextInject = (config.contextInject || {});
 const contextData = {
   ...environment,
@@ -16,6 +23,7 @@ const contextData = {
 };
 
 module.exports = mode => {
+  const isProduction = mode === 'production';
   return {
     server,
     webpack: {
@@ -25,6 +33,7 @@ module.exports = mode => {
       entry: './src/index.js',
       // 输出
       output: {
+        libraryTarget: 'umd',
         // 指定输出目录文件名
         path: path.resolve(__dirname, '../dist'),
         // 定义全局变量,暴露到‘window’对象中
@@ -32,9 +41,7 @@ module.exports = mode => {
         // 指定编译的‘js’存放目录文件名称
         filename: 'index.js',
         // 输出公共路径
-        publicPath: '/',
-        // 默认暴露‘window’此处修改为暴露到‘exports’中
-        libraryTarget: 'umd'
+        publicPath: '/'
       },
       // ‘node.module’
       module: {
@@ -45,9 +52,14 @@ module.exports = mode => {
             test: /\.(less|css)$/,
             // 以此从下到上处理‘css’
             use: [
+              // 3:由‘webpack.MiniCssExtractPlugin.loader’做收尾工作
+              // 主要分离css文件
               {
                 loader: 'style-loader'
               },
+              // {
+              //   loader: MiniCssExtractPlugin.loader
+              // },
               // 2:将被‘less-loader’处理的‘css’
               // 由‘css-loader’再次处理
               {
@@ -62,7 +74,7 @@ module.exports = mode => {
                   // ‘less-loader’特殊配置
                   lessOptions: {
                     // 定义‘less’全局变量,从jjb.config.antd获取
-                    modifyVars: (config.framework || {}).antd || {},
+                    modifyVars: (framework || {}).antd || {},
                     // 启用‘less-javascript’功能
                     javascriptEnabled: true
                   }
@@ -78,11 +90,7 @@ module.exports = mode => {
             // 允许‘babel-loader’操作目录
             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')
+              path.resolve(__dirname, '../src')
             ],
             // 配置‘babel-loader’
             options: {
@@ -95,10 +103,10 @@ module.exports = mode => {
                     libraryName: 'antd',
                     // 按需将‘es’文件夹中组件导出,绑定到‘antd’变量
                     // 除了‘es’,也可以修改为‘lib’
-                    libraryDirectory: 'es'
+                    libraryDirectory: 'es',
                     // 这里设为‘true’,表示自动导入‘antd/dist/less’
                     // 或修改为‘css’ | ‘less’
-                    // style: true
+                    style: true
                   }
                 ],
                 [
@@ -113,6 +121,16 @@ module.exports = mode => {
               presets: [ '@babel/preset-react' ]
             }
           },
+          {
+            // 处理‘svg’文件
+            test: /\.svg/,
+            // 使用‘file-loader’
+            loader: 'url-loader',
+            // 配置‘file-loader’
+            options: {
+              limit: true
+            }
+          },
           {
             // 处理图片文件
             test: /\.(png|jpg|jpeg|gif|ico|bmp)/,
@@ -120,8 +138,6 @@ module.exports = mode => {
             loader: 'url-loader',
             // 配置‘url-loader’
             options: {
-              // 当文件大小处于(?)byte,输出‘base64’,反之为‘url’.
-              // 这里设为‘false’,表示无论多大多小,都为‘url’.
               limit: true
             }
           }
@@ -134,13 +150,20 @@ module.exports = mode => {
           '~': requireResolve('src')
         }
       },
-      externals: {
-        'jjb-common-lib': 'jjbCommonLib',
-        'react': 'React',
-        'react-dom': 'ReactDOM',
-      },
       // 插件
       plugins: [
+        // 定义输出‘html’模板
+        // 并向‘window’全局注入变量
+        !isProduction
+          ? new HtmlWebpackPlugin(Object.assign({ template: requireResolve('public/index.html') }, windowInject))
+          : null,
+        // 对分离的‘css’区块定义同步导入名称,和异步导入名称
+        // new MiniCssExtractPlugin({
+        //   // 同步导入‘import | require’
+        //   filename: 'static/css/[id].css',
+        //   // 异步导入‘import | require’
+        //   chunkFilename: 'static/css/[id].css'
+        // }),
         // 注入全局变量到项目中,从‘jjb.config.contextData’读取
         new webpack.DefinePlugin({ 'process.env.app': JSON.stringify(contextData) }),
         // 解决‘moment.js’本地化文件过多问题
@@ -151,7 +174,17 @@ module.exports = mode => {
         }),
         // 每次打包前删除‘dist’目录
         new CleanWebpackPlugin()
-      ]
+      ].filter(value => !!value),
+      // 外部扩展
+      externals: {
+        'jjb-common-lib': 'jjbCommonLib',
+        ...(isProduction
+          ? {
+            'react': 'React',
+            'react-dom': 'ReactDOM'
+          }
+          : {})
+      }
     }
   };
 };

package/src/new/cmd.init.copy/react-component/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "react-component",
+  "name": "test-react-component",
   "version": "1.0.7",
   "description": "react组件模板",
   "main": "index.js",
@@ -28,14 +28,18 @@
     "connect-history-api-fallback": "^2.0.0",
     "cross-env": "^7.0.3",
     "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^4.2.2",
     "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.7.0",
     "style-loader": "^3.3.1",
     "url-loader": "^4.1.1",
     "webpack": "^5.74.0",
-    "webpack-cli": "^4.10.0"
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",

package/src/new/cmd.init.copy/react-component/public/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+  <script src="https://cdn.cqjjb.cn/jjb-common-lib/latest/index.js"></script>
+</head>
+<body>
+<div id="root"></div>
+</body>
+</html>

package/src/new/cmd.init.copy/react-component/src/index.js

@@ -1,11 +1,15 @@
 import React from 'react';
+import ReactDOM from 'react-dom';
 
-export class Test extends React.Component {
+export default class Test extends React.Component {
   render () {
     return (
       <div>
-        <h1>hello</h1>
+        Hello World
       </div>
     );
   }
 }
+
+// TODO 打包发布请删除此段代码，此处仅在开发模式用做预览。
+ReactDOM.render(<Test />, document.getElementById('root'));

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

@@ -201,14 +201,21 @@ module.exports = () => {
                */
               fs.mkdirSync(`${target_node_modules}\\${package_name}`);
             }
-            /**
-             * 文件操作:复制文件到node_modules中
-             */
-            f_file_copy(item.path, `${target_node_modules}\\${package_name}`);
-            /**
-             * 文件操作:创建package.json
-             */
-            f_create_package_json(`${target_node_modules}\\${package_name}`, package_name, '1.0.0');
+            if (package_name !== 'jjb-common-lib') {
+              /**
+               * 文件操作:复制文件到node_modules中
+               */
+              f_file_copy(item.path, `${target_node_modules}\\${package_name}`);
+              /**
+               * 文件操作:创建package.json
+               */
+              f_create_package_json(`${target_node_modules}\\${package_name}`, package_name, '1.0.0');
+            } else {
+              /**
+               * 文件操作:复制文件到node_modules中
+               */
+              f_file_copy(`${item.path}\\types`, `${target_node_modules}\\${package_name}`);
+            }
             /**
              * 文件操作:在src/package.json中定义一个组件依赖
              */