Merge pull request #8 from MicrosApp/develop

Develop

Author: zyao89

README.md

@@ -96,7 +96,6 @@ module.exports = {
     server: {
         entry: '', // 服务端入口
         port: 8088, // 服务端口号
-        contentBase: 'public', // 静态文件地址
         options: {
             // 服务端回调参数
         },

bin/base.js

@@ -10,23 +10,24 @@ const yParser = require('yargs-parser');
 const cmd = process.argv[2];
 const argv = yParser(process.argv.slice(3));
 
-// 全局环境
-if ([ 'start', 'build' ].includes(cmd)) {
-    process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-} else if ([ 'serve' ].includes(cmd)) {
-    process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-}
+// 全局环境模式 production, development
+process.env.NODE_ENV = argv.mode || process.env.NODE_ENV || 'development';
+
+const { Service, logger } = require('@micro-app/core');
 
 // 全局指令
-if (!global.MicroAppConfig) {
-    global.MicroAppConfig = {};
+if (argv.openSoftLink) {
+    process.env.MICRO_APP_OPEN_SOFT_LINK = argv.openSoftLink || false; // 开启软链接
+    if (process.env.MICRO_APP_OPEN_SOFT_LINK === 'true') {
+        logger.info(`开启软链接; --open-soft-link = ${process.env.MICRO_APP_OPEN_SOFT_LINK}`);
+    }
+}
+if (argv.openDisabledEntry) {
+    process.env.MICRO_APP_OPEN_DISABLED_ENTRY = argv.openDisabledEntry || false; // 开启禁用指定模块入口, 优化开发速度
+    if (process.env.MICRO_APP_OPEN_DISABLED_ENTRY === 'true') {
+        logger.info(`开启禁用指定模块入口; --open-disabled-entry = ${process.env.MICRO_APP_OPEN_DISABLED_ENTRY}`);
+    }
 }
-const MicroAppConfig = global.MicroAppConfig;
-MicroAppConfig.OPEN_SOFT_LINK = argv.openSoftLink || false; // 开启软链接
-MicroAppConfig.OPEN_DISABLED_ENTRY = argv.openDisabledEntry || false; // 开启禁用指定模块入口, 优化开发速度
-
-const microApp = require('@micro-app/core');
-const Service = microApp.Service;
 
 const service = new Service();
 

bin/micro-app-build.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
 const yParser = require('yargs-parser');
 const argv = yParser(process.argv.slice(2));

bin/micro-app-dev.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 'use strict';
 
-process.env.NODE_ENV = 'development';
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
 const yParser = require('yargs-parser');
 const argv = yParser(process.argv.slice(2));
-
 const { service } = require('./base');
 
 service.run('serve', argv);

bin/micro-app-start.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
 const yParser = require('yargs-parser');
 const argv = yParser(process.argv.slice(2));

libs/deploy.js

@@ -45,7 +45,7 @@ module.exports = {
 
     strict: true,
 
-    micros: [ 'test' ], // 被注册的容器
+    // micros: [ 'test' ], // 被注册的容器
     // micros$$test: { // 单独配置
     //     disabled: true, // 禁用入口
     //     link: '', // 本地路径, 进行本地开发使用的软链接.
@@ -55,29 +55,18 @@ module.exports = {
     server: {
         entry: '', // 服务端入口
         port: 8088, // 服务端口号
-        contentBase: 'public', // 静态文件地址
         options: {
             // 服务端回调参数
         },
     },
 
-    plugins: [
-        [{
-            id: 'test',
-            description: '这是test',
-            link: __dirname + '/test/testPlugin',
-        }, {
-            a: 1,
-        }],
-    ],
-
-    // deploy: {
-    //     git: 'git+ssh://[email protected]',
-    //     branch: 'test',
-    //     // branch: {
-    //     //     name: 'develop',
-    //     //     extends: true,
-    //     // },
-    //     message: '', // 提交 message 中增加内容
-    // },
+    // plugins: [
+    //     [{
+    //         id: 'test',
+    //         description: '这是test',
+    //         link: __dirname + '/test/testPlugin',
+    //     }, {
+    //         a: 1,
+    //     }],
+    // ],
 };

libs/update.js

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/cli",
-    "version": "0.1.3",
+    "version": "0.1.6",
     "description": "[CLI] Pluggable micro application framework.",
     "bin": {
         "micro-app": "./bin/micro-app.js",
@@ -36,27 +36,25 @@
     },
     "license": "MIT",
     "devDependencies": {
-        "@micro-app/core": "^0.1.3",
-        "@micro-app/plugin-webpack-adapter": "^0.0.3",
+        "@micro-app/core": "^0.1.7",
         "@micro-app/plugin-koa-static-server": "^0.0.1",
-        "@micro-app/plugin-koa-webpack-middleware": "^0.0.1",
-        "@micro-app/plugin-vue-cli": "^0.0.2",
-        "@micro-app/plugin-vusion-cli": "^0.0.3",
+        "@micro-app/plugin-koa-webpack-middleware": "^0.0.2",
+        "@micro-app/plugin-webpack-adapter": "^0.0.5",
         "@types/jest": "^24.0.18",
-        "babel-eslint": "^10.0.2",
+        "babel-eslint": "^10.0.3",
         "coveralls": "^3.0.6",
         "eslint": "^5.16.0",
         "eslint-config-2o3t": "^1.1.17",
         "jest": "^24.9.0",
         "webpack": "^4.39.2"
     },
     "peerDependencies": {
-        "@micro-app/core": "^0.1.3",
-        "@micro-app/plugin-webpack-adapter": "^0.0.3"
+        "@micro-app/core": ">=0.1.7",
+        "@micro-app/plugin-webpack-adapter": "^0.0.5"
     },
     "dependencies": {
+        "cli-highlight": "^2.1.1",
         "koa": "^2.8.1",
-        "opn": "^5.5.0",
         "shelljs": "^0.8.3",
         "update-notifier": "^3.0.1",
         "yargs-parser": "^13.1.1"