✨ 增加 api.onServerInitWillDone 方法, 优化调整调用顺序.

Author: zyao89

README.md

@@ -215,6 +215,7 @@ npx micro-app show methods
      * modifyChainWebpcakConfig    ( 合并之后提供 webpack-chain 进行再次修改事件 )
      * onChainWebpcakConfig        ( 修改之后提供 webpack-chain 进行查看事件 )
      * onServerInit                ( 服务初始化时事件 )
+     * onServerInitWillDone        ( 服务初始化即将完成事件 )
      * onServerInitDone            ( 服务初始化完成事件 )
      * onServerRunSuccess          ( 服务运行启动成功时事件 )
      * onServerRunFail             ( 服务运行启动失败时事件 )

micro-app.config.js

@@ -45,11 +45,7 @@ module.exports = {
 
     strict: true,
 
-    // micros: [ 'test' ], // 被注册的容器
-    // micros$$test: { // 单独配置
-    //     disabled: true, // 禁用入口
-    //     link: '', // 本地路径, 进行本地开发使用的软链接.
-    // },
+    micros: [ 'test' ], // 被注册的容器
 
     // 服务配置
     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,
+        }],
+    ],
 };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/cli",
-    "version": "0.2.0-beta.1",
+    "version": "0.2.0-beta.2",
     "description": "[CLI] Pluggable micro application framework.",
     "bin": {
         "micro-app": "./bin/micro-app.js",
@@ -35,10 +35,9 @@
     },
     "license": "MIT",
     "devDependencies": {
-        "@micro-app/core": "^0.1.7",
+        "@micro-app/core": "^0.2.0-beta.1",
         "@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",
+        "@micro-app/plugin-koa-webpack-middleware": "^0.0.3",
         "@types/jest": "^24.0.18",
         "babel-eslint": "^10.0.3",
         "coveralls": "^3.0.6",
@@ -48,8 +47,7 @@
         "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",

plugins/commands/serve/serve.js plugins/commands/serve/serve.test.jsplugins/commands/serve/serve.js renamed to plugins/commands/serve/serve.test.js

@@ -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();

plugins/commands/start/methods.js

@@ -11,6 +11,10 @@ module.exports = api => {
         type: api.API_TYPE.EVENT,
         description: '服务初始化时事件',
     });
+    api.registerMethod('onServerInitWillDone', {
+        type: api.API_TYPE.EVENT,
+        description: '服务初始化即将完成事件',
+    });
     api.registerMethod('onServerInitDone', {
         type: api.API_TYPE.EVENT,
         description: '服务初始化完成事件',

plugins/commands/start/start.test.js

@@ -62,6 +62,13 @@ describe('Command start', () => {
             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.onServerRunSuccess(({ args, host, port }) => {
             expect(args).not.toBeUndefined();
             expect(args).not.toBeNull();

src/server/createServer.js

@@ -46,6 +46,8 @@ module.exports = function(api, args = {}) {
     api.applyPluginHooks('afterServerEntry', { app, args });
     applyHooks(_HookEvent, 'after');
 
+    api.applyPluginHooks('onServerInitWillDone', { app, args });
+
     api.applyPluginHooks('onServerInitDone', { app, args });
     applyHooks(_HookEvent, 'done');
 
@@ -59,7 +61,7 @@ module.exports = function(api, args = {}) {
                 reject(err);
                 return;
             }
-            console.log('\n');
+            console.log('\r\n');
             logger.success(`Server running... listen on ${port}, host: ${host}`);
 
             api.applyPluginHooks('onServerRunSuccess', { host, port, args });

yarn.lock

@@ -379,10 +379,10 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@micro-app/core@^0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.1.7.tgz#8081614e9c8f32f1db611d3040e670126469529c"
-  integrity sha512-YLEwXFXh+xbbc74nm//jTdOtkZunHnPT058sJEphujAlrW6+4KhtgCgFOg1G7ivWAhJw8hv+IzDKGlkOQRlX3Q==
+"@micro-app/core@^0.2.0-beta.1":
+  version "0.2.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.2.0-beta.1.tgz#898ee980d4a93e505e39d5d38f3b371bac82ec97"
+  integrity sha512-U59cWYS7XgDlrWnRjdHC/LCTIOhvORi/4T/OXltjr73JyQx4CJUOuH5ufVzdPRPASEbPQeeOOVKfGegMVjsCGA==
   dependencies:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
@@ -391,7 +391,6 @@
     cheerio "^1.0.0-rc.3"
     dotenv "^8.1.0"
     lodash "^4.17.15"
-    module-alias "^2.2.1"
     ora "^3.4.0"
     semver "^6.3.0"
     semver-regex "^3.1.0"
@@ -406,21 +405,14 @@
   dependencies:
     koa-static "^5.0.0"
 
-"@micro-app/plugin-koa-webpack-middleware@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@micro-app/plugin-koa-webpack-middleware/-/plugin-koa-webpack-middleware-0.0.2.tgz#5e59b2464e691ce361c54e8c9082e14a1289b584"
-  integrity sha512-u/bMTagxNDnWKdPS97hgxrNnZoMzhiLKTkqeHAhrMGRqpRdbQYGJSJkwEFhXBq0RutkomgHOKg5Y6sFfdoMH2w==
+"@micro-app/plugin-koa-webpack-middleware@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@micro-app/plugin-koa-webpack-middleware/-/plugin-koa-webpack-middleware-0.0.3.tgz#d84d5f96d271510fc4437a8415d7a15288830075"
+  integrity sha512-aRSb7JZleFksSVHjxs6iL5ibq3mDmUR/vA2HBUaviqE+wFPhwDtz78RWaPrtlhF79lPTd60H5zRvTmG8nObEoA==
   dependencies:
     webpack-dev-middleware "^2.0.6"
     webpack-hot-middleware "^2.25.0"
 
-"@micro-app/plugin-webpack-adapter@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@micro-app/plugin-webpack-adapter/-/plugin-webpack-adapter-0.0.5.tgz#5321b1d0db06a6328c5cef6c5b19879ea16f2b45"
-  integrity sha512-YoWlXE9TTGnKiOpMYblN1dFDo5GMsoHzoTJQZkVIQII9RDlFJXEItyTa0qjMmrHSPGugt0nHZuZqwIli1ujh3g==
-  dependencies:
-    webpack-chain "^6.0.0"
-
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -1836,11 +1828,6 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-deepmerge@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
-  integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
-
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -3464,11 +3451,6 @@ istanbul-reports@^2.2.6:
   dependencies:
     handlebars "^4.1.2"
 
-javascript-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.0.0.tgz#ef750216ae66504ffd670b68c8b8aa07bdf7b588"
-  integrity sha512-zzK8+ByrzvOL6N92hRewwUKL0wN0TOaIuUjX0Jj8lraxWvr5wHYs2YTjaj2lstF+8qMv5cmPPef47va8NT8lDw==
-
 jest-changed-files@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
@@ -4412,11 +4394,6 @@ mkdirp@^0.5.0, mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
-module-alias@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.1.tgz#553aea9dc7f99cd45fd75e34a574960dc46550da"
-  integrity sha512-LTez0Eo+YtfUhgzhu/LqxkUzOpD+k5C0wXBLun0L1qE2BhHf6l09dqam8e7BnoMYA6mAlP0vSsGFQ8QHhGN/aQ==
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -6511,14 +6488,6 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-chain@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.0.0.tgz#9c36525a1271a54e7bfd1791199b395f400ae4f1"
-  integrity sha512-NK62XgJOOSmYs4kaXFIKKeClpuOVHY7m6e4XwxbVX/2HAUboH6xFCTVXMVv8+jB6K8o/UGjlo1Cv3XXOyNAAGw==
-  dependencies:
-    deepmerge "^1.5.2"
-    javascript-stringify "^2.0.0"
-
 webpack-dev-middleware@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4"