Merge pull request #10 from MicrosApp/develop

Develop

Author: zyao89

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 @micro-app
+Copyright (c) 2019-present, Zyao89
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -123,18 +123,6 @@ or
 npx micro-app-dev
 ```
 
-### Build
-
-```sh
-npx micro-app build
-```
-
-or
-
-```sh
-npx micro-app-build
-```
-
 ### 运行
 
 ```sh
@@ -215,8 +203,7 @@ npx micro-app show methods
      * onPluginInitDone            ( System Build-in )
      * beforeMergeConfig           ( System Build-in )
      * afterMergeConfig            ( System Build-in )
-     * beforeMergeServerConfig     ( System Build-in )
-     * afterMergeServerConfig      ( System Build-in )
+     * modifyDefaultServerConfig   ( System Build-in )
      * onInitWillDone              ( System Build-in )
      * onInitDone                  ( System Build-in )
      * modifyCommand               ( System Build-in )
@@ -226,13 +213,14 @@ npx micro-app show methods
      * afterMergeWebpackConfig     ( 合并 webpack 配置之后事件 )
      * modifyChainWebpcakConfig    ( 合并之后提供 webpack-chain 进行再次修改事件 )
      * onChainWebpcakConfig        ( 修改之后提供 webpack-chain 进行查看事件 )
+     * modifyWebpackConfig         ( 合并之后提供 webpack config 进行再次修改事件 )
      * onServerInit                ( 服务初始化时事件 )
+     * onServerInitWillDone        ( 服务初始化即将完成事件 )
      * onServerInitDone            ( 服务初始化完成事件 )
      * onServerRunSuccess          ( 服务运行启动成功时事件 )
      * onServerRunFail             ( 服务运行启动失败时事件 )
      * beforeServerEntry           ( 服务进入业务逻辑前事件 )
      * afterServerEntry            ( 服务从业务逻辑出来后事件 )
-     * modifyWebpackConfig         ( 对服务启动前对 webpack config 进行修改, 需要返回所有参数 )
      * beforeDevServer             ( 开发服务创建前事件 )
      * afterDevServer              ( 开发服务创建后事件 )
      * onBuildSuccess              ( 构建成功时事件 )

bin/micro-app.js bin/micro-appbin/micro-app.js renamed to bin/micro-app

@@ -45,11 +45,7 @@ module.exports = {
 
     strict: true,
 
-    // micros: [ 'test' ], // 被注册的容器
-    // micros$$test: { // 单独配置
-    //     disabled: true, // 禁用入口
-    //     link: '', // 本地路径, 进行本地开发使用的软链接.
-    // },
+    micros: [ 'test', 'abab' ], // 被注册的容器
 
     // 服务配置
     server: {
@@ -60,13 +56,13 @@ module.exports = {
         },
     },
 
-    // plugins: [
-    //     [{
-    //         id: 'test',
-    //         description: '这是test',
-    //         link: __dirname + '/test/testPlugin',
-    //     }, {
-    //         a: 1,
-    //     }],
-    // ],
+    plugins: [
+        [{
+            id: 'test',
+            description: '这是test',
+            link: __dirname + '/test/testPlugin',
+        }, {
+            a: 1,
+        }],
+    ],
 };

bin/micro-app-dev.js bin/micro-app-devbin/micro-app-dev.js renamed to bin/micro-app-dev

@@ -1,13 +1,16 @@
 {
     "name": "@micro-app/cli",
-    "version": "0.2.0-beta.1",
+    "version": "0.2.0",
     "description": "[CLI] Pluggable micro application framework.",
+    "main": "bin/base.js",
     "bin": {
-        "micro-app": "./bin/micro-app.js",
-        "micro-app-dev": "./bin/micro-app-dev.js",
-        "micro-app-start": "./bin/micro-app-start.js"
+        "micro-app": "bin/micro-app",
+        "micro-app-dev": "bin/micro-app-dev",
+        "micro-app-start": "bin/micro-app-start"
     },
     "scripts": {
+        "lint": "eslint .",
+        "lint:fix": "npm run lint -- --fix",
         "test": "jest"
     },
     "homepage": "https://github.com/MicrosApp/MicroApp-CLI",
@@ -26,6 +29,7 @@
     "keywords": [
         "micro",
         "micro-app",
+        "micro-application",
         "core",
         "cli"
     ],
@@ -35,24 +39,24 @@
     },
     "license": "MIT",
     "devDependencies": {
-        "@micro-app/core": "^0.1.7",
+        "@micro-app/core": "^0.2.0",
         "@micro-app/plugin-koa-static-server": "^0.0.1",
-        "@micro-app/plugin-koa-webpack-middleware": "^0.0.2",
-        "@micro-app/plugin-webpack-adapter": "^0.0.5",
-        "@types/jest": "^24.0.18",
+        "@micro-app/plugin-koa-webpack-middleware": "^0.0.3",
+        "@types/jest": "^24.0.19",
         "babel-eslint": "^10.0.3",
-        "coveralls": "^3.0.6",
+        "coveralls": "^3.0.7",
         "eslint": "^5.16.0",
         "eslint-config-2o3t": "^1.1.17",
+        "husky": "^3.0.9",
         "jest": "^24.9.0",
+        "lint-staged": "^9.4.2",
         "webpack": "^4.39.2"
     },
     "peerDependencies": {
-        "@micro-app/core": ">=0.1.7",
-        "@micro-app/plugin-webpack-adapter": "^0.0.5"
+        "@micro-app/core": ">=0.2.0"
     },
     "dependencies": {
-        "koa": "^2.8.1",
+        "koa": "^2.10.0",
         "shelljs": "^0.8.3",
         "update-notifier": "^3.0.1",
         "yargs-parser": "^13.1.1"

bin/micro-app-start.js bin/micro-app-startbin/micro-app-start.js renamed to bin/micro-app-start

@@ -35,7 +35,7 @@ Examples:
 
 function initMicro(api, args) {
     const logger = api.logger;
-    const config = api.self;
+    const config = api.selfConfig;
     const micros = api.micros;
     const microsConfig = api.microsConfig;
 

micro-app.config.js

@@ -9,11 +9,11 @@ module.exports = function serveCommand(api, opts) {
     const chalk = require('chalk');
 
     api.beforeServer(params => {
-        api.applyPluginHooks('beforeDevServer', params);
+        return api.applyPluginHooks('beforeDevServer', params);
     });
 
     api.afterServer(params => {
-        api.applyPluginHooks('afterDevServer', params);
+        return api.applyPluginHooks('afterDevServer', params);
     });
 
     // serve
@@ -37,7 +37,7 @@ Examples:
     micro-app serve --type vusion --open-soft-link
           `.trim(),
     }, args => {
-        process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+        process.env.NODE_ENV = args.mode || process.env.NODE_ENV || 'development';
 
         const runServe = require('../start/serve');
         return runServe(api, args, opts);

package.json

@@ -56,6 +56,12 @@ describe('Command serve', () => {
             expect(app).not.toBeUndefined();
             expect(app).not.toBeNull();
         });
+        plugin._api.onServerInitWillDone(({ args, app }) => {
+            expect(args).not.toBeUndefined();
+            expect(args).not.toBeNull();
+            expect(app).not.toBeUndefined();
+            expect(app).not.toBeNull();
+        });
         plugin._api.onServerInitDone(({ args, app }) => {
             expect(args).not.toBeUndefined();
             expect(args).not.toBeNull();
@@ -130,4 +136,15 @@ describe('Command serve', () => {
 
     });
 
+    it('global cmd config', async () => {
+
+        const { service } = require('../../../bin/base');
+
+        await service.run('serve', Object.assign({
+            openSoftLink: true,
+            openDisabledEntry: true,
+        }, getArgvs()));
+
+    });
+
 });