no message

fanwh
bin/bundle-dll.js
bin/bundle.js
bin/workai
package-lock.json
package.json
templates/hro_template/.babelrc
templates/hro_template/configs/webpack.develop.config.js
templates/hro_template/configs/webpack.dll.config.js
templates/hro_template/configs/webpack.production.config.js
templates/hro_template/package.json
templates/hro_template/server/production.js
yarn.lock
--- a/bin/bundle-dll.js 0 → 100644
查看文件 @eb40821
+++ b/bin/bundle-dll.js 0 → 100644
查看文件 @eb40821
+var resolveCwd = require('import-cwd');
+var webpack = resolveCwd('webpack');
+/**
+ * 根据传入dll配置打包库文件
+ * webpack.dll.config
+ */
+function bundle(webpackConfig) {
+    return new Promise((resolve, reject) => {
+        const bundler = webpack(webpackConfig);
+        let bundlerRunCount = 0;
+
+        function onComplete(err, stats) {
+            if (err) {
+                return reject(err);
+            }
+
+            console.log(stats.toString(webpackConfig.stats));
+
+            if (++bundlerRunCount === (global.WATCH ? webpackConfig.length : 1)) {
+                return resolve();
+            }
+        }
+        if (global.WATCH) {
+            bundler.watch(200, onComplete);
+        } else {
+            bundler.run(onComplete);
+        }
+    });
+}
+
+module.exports = bundle;
--- a/bin/bundle.js 0 → 100644
查看文件 @eb40821
+++ b/bin/bundle.js 0 → 100644
查看文件 @eb40821
+var resolveCwd = require('import-cwd');
+var webpack = resolveCwd('webpack');
+/**
+ * 根据传入dll配置打包库文件
+ * webpack.config.production
+ */
+function bundle(webpackConfig) {
+    return new Promise((resolve, reject) => {
+        const bundler = webpack(webpackConfig);
+        let bundlerRunCount = 0;
+
+        function onComplete(err, stats) {
+            if (err) {
+                return reject(err);
+            }
+
+            console.log(stats.toString(webpackConfig.stats));
+
+            if (++bundlerRunCount === (global.WATCH ? webpackConfig.length : 1)) {
+                return resolve();
+            }
+        }
+
+        if (global.WATCH) {
+            bundler.watch(200, onComplete);
+        } else {
+            bundler.run(onComplete);
+        }
+    });
+}
+
+module.exports = bundle;
--- a/bin/workai
查看文件 @eb40821
+++ b/bin/workai
查看文件 @eb40821
@@ -9,10 +9,15 @@ var inquirer = require('inquirer');
 var chalk = require('chalk');
 var shell = require("shelljs");
 var parseArgs = require('minimist');
-const fse = require('fs-extra');
+var fse = require('fs-extra');
 var os = require('os');
-const utils = require('./utils');
-
+var utils = require('./utils');
+var bundleDll = require('./bundle-dll');
+var bundle = require('./bundle');
+var async = require('asyncawait/async');
+var await = require('asyncawait/await');
+var resolveCwd = require('import-cwd');
+require("@babel/register");
 // import config from '../workai.tools.config';
 var program = new commander.Command();
@@ -125,7 +130,7 @@ program
         if (option == 'hro') {
             var hro_template_path = path.resolve(__dirname, '..', 'templates', 'hro_template');
             console.log(hro_template_path);
-            fse.copySync(hro_template_path, './hro_template', {
+            fse.copySync(hro_template_path, './', {
                 filter: (src, dest) => {
                     console.log(src);
                     if (src.indexOf('node_modules') != -1)
@@ -134,13 +139,78 @@ program
                         return true
                 }
             });
-            shell.cd('./hro_template');
+            // shell.cd('./');
             shell.exec('yarn install');
             shell.exec('workai start');
         }
     });
+
+/*
+* deploy 构建项目
+*/
+program
+    .command('deploy [dll|all]')
+    .alias('d')
+    .description('构建项目')
+    .action(option => {
+        var opject_path = process.cwd();
+        process.chdir(opject_path);//跳转到项目目录
+        console.log(path.resolve(__dirname), process.cwd(), path.resolve(process.cwd(), 'configs'));
+
+        if (option == 'dll') {
+            var hro_template_path = path.resolve(__dirname, '..', 'templates', 'hro_template');
+            _checkEnv(["configs/webpack.dll.**", "!node_modules"]).then(flag => {
+                if (flag) {
+                    var webpackDllConfig = resolveCwd('./configs/webpack.dll.config');
+                    bundleDll(webpackDllConfig).then(data => {
+                        console.log("dll file is ok!");
+                    });
+                    // shell.exec('npx babel-node server/development.js');
+                } else {
+                    console.log("当前所在目录不是项目目录");
+                }
+            });
+        } else if (option == 'all') {
+            var hro_template_path = path.resolve(__dirname, '..', 'templates', 'hro_template');
+            _checkEnv(["configs/webpack.production.**", "configs/webpack.dll.**", "!node_modules"]).then(flag => {
+                if (flag) {
+                    var webpackDllConfig = resolveCwd('./configs/webpack.dll.config');
+                    var webpackConfig = resolveCwd('./configs/webpack.production.config');
+                    console.log(webpackDllConfig, webpackConfig);
+                    // shell.exec('npx babel-node server/development.js');
+                } else {
+                    console.log("当前所在目录不是项目目录");
+                }
+            });
+        } else {
+            _checkEnv(["configs/webpack.production.**", "!node_modules"]).then(flag => {
+                if (flag) {
+                    var webpackConfig = resolveCwd('./configs/webpack.production.config');
+                    bundle(webpackConfig).then(data => {
+                        console.log("bundle file is ok!");
+                    });
+                    // shell.exec('npx babel-node server/development.js');
+                } else {
+                    console.log("当前所在目录不是项目目录");
+                }
+            });
+        }
+    });
+
+/* 
+*生产模式启动项目
+*/
+program
+    .command('service [projectPath]')
+    .alias('s')
+    .description('生产模式启动')
+    .action(option => {
+        shell.exec('npx babel-node server/production.js');
+    });
+
+
 /* 
 *开发模式启动项目
 */
@@ -149,7 +219,7 @@ program
     .alias('dev')
     .description('开发模式启动')
     .action(option => {
-        _checkEnv().then(flag => {
+        _checkEnv(["configs/webpack.develop.**", "!node_modules"]).then(flag => {
             console.log("222:::", flag, process.cwd(), path.resolve(__dirname), option);
             if (flag) {
                 shell.exec('npx babel-node server/development.js');
@@ -158,10 +228,13 @@ program
             }
         });
     });
-
-function _checkEnv() {
-    return utils.getPaths(["configs/webpack.**", "!node_modules"]).then(paths => {
-        return paths.length > 0;
+/*环境检测 
+*是否是项目环境
+*paths = [] 例：paths = ["configs/webpack.**", "!node_modules"]
+*/
+function _checkEnv(paths) {
+    return utils.getPaths(paths).then(matching => {
+        return matching.length > 0;
     });
 }
--- a/package-lock.json
查看文件 @eb40821
+++ b/package-lock.json
查看文件 @eb40821
@@ -1106,6 +1106,17 @@
         "map-cache": "^0.2.2"
       }
     },
+    "fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz",
+      "integrity": "sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
     "fs-readdir-recursive": {
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/fs-readdir-recursive/download/fs-readdir-recursive-1.1.0.tgz",
@@ -2083,6 +2094,15 @@
         "minimist": "^1.2.0"
       }
     },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "http://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "kind-of": {
       "version": "6.0.2",
       "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-6.0.2.tgz",
@@ -3058,6 +3078,12 @@
         "set-value": "^2.0.1"
       }
     },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "http://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz",
+      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=",
+      "dev": true
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/unset-value/download/unset-value-1.0.0.tgz",
--- a/package.json
查看文件 @eb40821
+++ b/package.json
查看文件 @eb40821
@@ -20,12 +20,14 @@
     "@babel/core": "^7.4.5",
     "@babel/node": "^7.4.5",
     "@babel/register": "^7.4.4",
+    "asyncawait": "^1.0.8",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
     "es-checker": "^1.4.1",
     "fs-extra": "^8.1.0",
     "git-clone": "^0.1.0",
     "globby": "^9.2.0",
+    "import-cwd": "^3.0.0",
     "inquirer": "^6.4.1",
     "minimist": "^1.2.0",
     "rimraf": "^2.6.3",
--- a/templates/hro_template/.babelrc
查看文件 @eb40821
+++ b/templates/hro_template/.babelrc
查看文件 @eb40821
@@ -5,6 +5,8 @@
     ],
     "plugins": [
         "@babel/plugin-syntax-dynamic-import",
-        "@babel/plugin-proposal-class-properties"
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-proposal-export-default-from",
+        "@babel/plugin-proposal-export-namespace-from"
     ]
 }
--- a/templates/hro_template/configs/webpack.develop.config.js
查看文件 @eb40821
+++ b/templates/hro_template/configs/webpack.develop.config.js
查看文件 @eb40821
@@ -24,7 +24,12 @@ module.exports = {
                 loader: "babel-loader",
                 options: {
                     presets: ["@babel/env", "@babel/react"],
-                    plugins: ["@babel/plugin-proposal-class-properties", "@babel/plugin-syntax-dynamic-import"]
+                    plugins: [
+                        "@babel/plugin-proposal-class-properties",
+                        "@babel/plugin-syntax-dynamic-import",
+                        "@babel/plugin-proposal-export-default-from",
+                        "@babel/plugin-proposal-export-namespace-from"
+                    ]
                 }
             }
         }, {
--- a/templates/hro_template/configs/webpack.dll.config.js
查看文件 @eb40821
+++ b/templates/hro_template/configs/webpack.dll.config.js
查看文件 @eb40821
@@ -18,7 +18,6 @@ const vendor = [
     "react-loadable",
     "react-redux",
     "react-router",
-    "react-router-dom",
     "reduce-reducers",
     "redux",
     "redux-form",
--- a/templates/hro_template/configs/webpack.production.config.js
查看文件 @eb40821
+++ b/templates/hro_template/configs/webpack.production.config.js
查看文件 @eb40821
@@ -94,8 +94,13 @@ module.exports = {
             loaders: [{
                 loader: "babel-loader",
                 options: {
-                    presets: ["env", "react", "stage-0"],
-                    plugins: [["import", { "libraryName": "antd" }, "ant"]]
+                    presets: ["@babel/env", "@babel/react"],
+                    plugins: [
+                        "@babel/plugin-proposal-class-properties",
+                        "@babel/plugin-syntax-dynamic-import",
+                        "@babel/plugin-proposal-export-default-from",
+                        "@babel/plugin-proposal-export-namespace-from"
+                    ]
                 }
             }]
         }),
--- a/templates/hro_template/package.json
查看文件 @eb40821
+++ b/templates/hro_template/package.json
查看文件 @eb40821
@@ -17,6 +17,7 @@
     "isomorphic-fetch": "^2.2.1",
     "localforage": "^1.7.3",
     "moment": "^2.24.0",
+    "plupload": "^2.3.6",
     "prop-types": "^15.7.2",
     "rc-animate": "^2.8.3",
     "react": "^16.8.6",
@@ -31,23 +32,30 @@
     "redux-saga": "^1.0.5",
     "regenerator-runtime": "^0.13.2",
     "uuid": "^3.3.2",
-    "workai-express": "git+http://gitlab.workai.com.cn/fanwh/workai-express.git#aecbfb5"
+    "workai-express": "git+http://gitlab.workai.com.cn/fanwh/workai-express.git#18cf518"
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.5",
     "@babel/node": "^7.4.5",
     "@babel/plugin-proposal-class-properties": "^7.5.0",
+    "@babel/plugin-proposal-export-default-from": "^7.5.2",
+    "@babel/plugin-proposal-export-namespace-from": "^7.5.2",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.6",
+    "babel-plugin-import": "^1.12.0",
     "css-loader": "^3.0.0",
+    "happypack": "^5.0.1",
     "html-webpack-plugin": "^3.2.0",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
+    "mini-css-extract-plugin": "^0.7.0",
     "open-browser-webpack-plugin": "^0.0.5",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
     "style-loader": "^0.23.1",
+    "uglifyjs-webpack-plugin": "^2.1.3",
     "webpack": "^4.35.2",
     "webpack-dev-middleware": "^3.7.0",
     "webpack-hot-middleware": "^2.25.0"
--- a/templates/hro_template/server/production.js
查看文件 @eb40821
+++ b/templates/hro_template/server/production.js
查看文件 @eb40821
+/* eslint-disable no-var */
+import path from 'path';
+import workaiExpress from 'workai-express';
+
+var app = workaiExpress.app;
+var IoC = workaiExpress.IoC;
+var bootable = workaiExpress.bootable;
+
+IoC.use(IoC.dir(path.join(__dirname, 'boot')));//加载配置文件
+
+
+app.phase(bootable.di.routes(path.join(__dirname, 'routes', 'index.js')));//载入路由 
+
+
+app.boot(function (err) {//配置插件加载完启动server
+    if (err) {
+        console.log(err);
+        process.exit(-1);
+        return;
+    }
+});
--- a/yarn.lock
查看文件 @eb40821
+++ b/yarn.lock
查看文件 @eb40821
@@ -269,6 +269,14 @@ async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+asyncawait@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.npm.taobao.org/asyncawait/download/asyncawait-1.0.8.tgz#ecd25d68d870ac36cd96338f844e2a4d2efb7242"
+  dependencies:
+    bluebird "^3.1.1"
+    fibers "^2.0.2"
+    lodash "^4.17.11"
+
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -293,6 +301,10 @@ binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+bluebird@^3.1.1:
+  version "3.5.5"
+  resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.5.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -641,6 +653,10 @@ fast-glob@^2.2.6:
     merge2 "^1.2.3"
     micromatch "^3.1.10"
+fibers@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/fibers/download/fibers-2.0.2.tgz#36db63ea61c543174e2264675fea8c2783371366"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -850,6 +866,18 @@ ignore@^4.0.3:
   version "4.0.6"
   resolved "https://registry.npm.taobao.org/ignore/download/ignore-4.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fignore%2Fdownload%2Fignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+import-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
+  dependencies:
+    import-from "^3.0.0"
+
+import-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/import-from/download/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
+  dependencies:
+    resolve-from "^5.0.0"
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -1474,6 +1502,10 @@ repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"