jjb-cmd 1.0.16 → 2.0.0

package/src/{cli.dva.router.saas.txt → old/cli.dva.router.saas.txt}

@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { ConfigProvider } from 'antd';
-import { Route, Router, Switch } from 'dva/router';
+import { BrowserRouter, Route, Switch } from 'dva/router';
 
 /**
  * @description 是否匹配页面
@@ -153,27 +153,26 @@ function treeRoutes (routes = []) {
   return optimizationTree(result);
 }
 
-function RenderRouter (routes = [], inProps = {}) {
+function RenderRoute (routes = [], inProps = {}) {
   return (
-    <Router history={inProps.history}>
-      <Switch>
-        {routes.map(({
-          path,
-          children,
-          Component
-        }, index) => (
-          <Route
-            key={index}
-            path={`${(process.env.app || {}).basename || ''}${path}`}
-            render={props => (
-              <Component {...props}>
-                {RenderRouter(children, inProps)}
-              </Component>
-            )}
-          />
-        ))}
-      </Switch>
-    </Router>
+    <Switch>
+      {routes.map(({
+        path,
+        children,
+        Component
+      }, index) => (
+        <Route
+          exact={path === '/'}
+          key={index}
+          path={path}
+          render={props => (
+            <Component {...props}>
+              {RenderRoute(children, inProps)}
+            </Component>
+          )}
+        />
+      ))}
+    </Switch>
   );
 }
 
@@ -189,10 +188,23 @@ export const AutomaticRouter = ({
 }) => {
   return (
     <ConfigProvider locale={require('antd/lib/locale/zh_CN').default}>
-      {RenderRouter(treeRoutes(getRoutes()), {
-        app,
-        history
-      })}
+      <BrowserRouter basename={(process.env.app || {}).basename || ''}>
+        <Switch>
+          {(process.env.app || {}).notRouter
+            ? (
+              <Route
+                path="*"
+                component={require('~/pages').default}
+              />
+            )
+            : (
+              RenderRoute(treeRoutes(getRoutes()), {
+                app,
+                history
+              })
+            )}
+        </Switch>
+      </BrowserRouter>
     </ConfigProvider>
   );
 };

package/src/old/cli.init/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": "JJB Micro App",
+    "jjbCommonLibUrl": ""
+  },
+  "server": {
+    "port": "8080",
+    "host": "127.0.0.1"
+  },
+  "framework": {
+    "antd": {
+      "link-color": "#021e43",
+      "primary-color": "#021e43",
+      "border-radius-base": "2px"
+    }
+  }
+}

package/src/old/cli.init/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('项目打包完成！');
+  }
+});

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’对象中
@@ -85,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: {
@@ -152,9 +153,7 @@ module.exports = mode => {
       resolve: {
         // 为‘import’或‘require’定义别名路径
         alias: {
-          '~': requireResolve('src'),
-          'common': requireResolve('src/common'),
-          'components': requireResolve('src/components')
+          '~': requireResolve('src')
         }
       },
       // 插件
@@ -180,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目录下是否已存在
              */