Merge pull request #6 from MicrosApp/develop

Develop

Author: zyao89

README.md

@@ -4,11 +4,13 @@ Pluggable micro application framework.
 
 基于webpack多入口的多仓库业务模块开发的插件应用框架脚手架.
 
-[![Coverage Status](https://coveralls.io/repos/github/zyao89/MicroApp-CLI/badge.svg?branch=master)](https://coveralls.io/github/zyao89/MicroApp-CLI?branch=master)
+[![Coverage Status][Coverage-img]][Coverage-url]
 [![CircleCI][CircleCI-img]][CircleCI-url]
 [![NPM Version][npm-img]][npm-url]
 [![NPM Download][download-img]][download-url]
 
+[Coverage-img]: https://coveralls.io/repos/github/MicrosApp/MicroApp-CLI/badge.svg?branch=master
+[Coverage-url]: https://coveralls.io/github/MicrosApp/MicroApp-CLI?branch=master
 [CircleCI-img]: https://circleci.com/gh/zyao89/MicroApp-CLI/tree/master.svg?style=svg
 [CircleCI-url]: https://circleci.com/gh/zyao89/MicroApp-CLI/tree/master
 [npm-img]: https://img.shields.io/npm/v/@micro-app/cli.svg?style=flat-square
@@ -251,7 +253,7 @@ npx micro-app show methods
      * onServerRunFail             ( 服务运行启动失败时事件 )
      * beforeServerEntry           ( 服务进入业务逻辑前事件 )
      * afterServerEntry            ( 服务从业务逻辑出来后事件 )
-     * modifyWebpackCompiler       ( 对服务启动前对 webpack compiler 进行修改, 需要返回所有参数 )
+     * modifyWebpackConfig         ( 对服务启动前对 webpack config 进行修改, 需要返回所有参数 )
      * beforeDevServer             ( 开发服务创建前事件 )
      * afterDevServer              ( 开发服务创建后事件 )
      * onBuildSuccess              ( 构建成功时事件 )

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/cli",
-    "version": "0.1.1-rc.3",
+    "version": "0.1.2",
     "description": "[CLI] Pluggable micro application framework.",
     "bin": {
         "micro-app": "./bin/micro-app.js",
@@ -36,6 +36,10 @@
     },
     "license": "MIT",
     "devDependencies": {
+        "@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",
         "@types/jest": "^24.0.18",
         "babel-eslint": "^10.0.2",
         "coveralls": "^3.0.6",
@@ -45,14 +49,11 @@
         "webpack": "^4.39.2"
     },
     "dependencies": {
-        "@micro-app/core": "^0.1.1-rc.5",
+        "@micro-app/core": "^0.1.1",
         "koa": "^2.8.1",
-        "koa-static": "^5.0.0",
         "opn": "^5.5.0",
         "shelljs": "^0.8.3",
         "update-notifier": "^3.0.1",
-        "webpack-dev-middleware": "^2.0.6",
-        "webpack-hot-middleware": "^2.25.0",
         "yargs-parser": "^13.1.1"
     },
     "engines": {

plugins/commands/build.js

@@ -52,9 +52,10 @@ function runBuild(api, { type, progress }) {
         type,
         config: api.config,
         serverConfig: api.serverConfig,
+        isDev: false,
     };
 
-    const { compiler, devOptions, webpackConfig } = webpackAdapter(api, { type, isDev: false, progress });
+    const { compiler, devOptions, webpackConfig } = webpackAdapter(api, Object.assign({}, info, { progress }));
 
     info.compiler = compiler;
     info.devOptions = devOptions;

plugins/commands/serve/index.js

@@ -1,17 +1,13 @@
 'use strict';
 
 const registerMethods = require('./methods');
-const registerVusionMethods = require('./vusionMethods');
 const startCommand = require('./start');
 const devCommand = require('./dev');
 
 module.exports = function serveCommand(api, opts) {
 
     registerMethods(api);
 
-    // vusion
-    registerVusionMethods(api);
-
     // start
     startCommand(api, opts);
 

plugins/commands/serve/methods.js

@@ -26,9 +26,9 @@ module.exports = api => {
         type: api.API_TYPE.EVENT,
         description: '服务从业务逻辑出来后事件',
     });
-    api.registerMethod('modifyWebpackCompiler', {
+    api.registerMethod('modifyWebpackConfig', {
         type: api.API_TYPE.MODIFY,
-        description: '对服务启动前对 webpack compiler 进行修改, 需要返回所有参数',
+        description: '对服务启动前对 webpack config 进行修改, 需要返回所有参数',
     });
     api.registerMethod('beforeDevServer', {
         type: api.API_TYPE.EVENT,
@@ -38,9 +38,9 @@ module.exports = api => {
         type: api.API_TYPE.EVENT,
         description: '开发服务创建后事件',
     });
-    api.registerMethod('modifyStaticServerOptions', {
-        type: api.API_TYPE.MODIFY,
-        description: '对静态服务配置进行修改, 需要返回所有参数',
-    });
 
+    api.registerMethod('onDevServerMiddleware', {
+        type: api.API_TYPE.EVENT,
+        description: '开发服务中间件事件, 适用于 webpackMiddleware)',
+    });
 };

plugins/commands/serve/runServe.js

@@ -16,7 +16,7 @@ module.exports = function runServe(api, isDev, { type, onlyNode, progress, port,
     };
 
     if (isDev && !onlyNode) {
-        const { compiler, devOptions, webpackConfig } = webpackAdapter(api, { type, isDev, progress });
+        const { compiler, devOptions, webpackConfig } = webpackAdapter(api, Object.assign({}, startInfo, { progress }));
 
         startInfo.compiler = compiler;
         startInfo.devOptions = devOptions;

plugins/commands/serve/vusionMethods.js

@@ -4,52 +4,34 @@ const chalk = require('chalk');
 const tryRequire = require('try-require');
 const _ = require('lodash');
 
-module.exports = function adapter(api, { type, isDev, progress }) {
+module.exports = function adapter(api, info) {
     const logger = api.logger;
-    let _webpackConfig = api.getState('webpackConfig');
-    let _webpackDevOptions = _webpackConfig.devServer || {};
-
-    if (type === 'vusion') {
-        const vusionAdapter = require('./vusion')(_webpackConfig, isDev, {
-            modifyDefaultVusionConfig(vusionConfig) {
-                return api.applyPluginHooks('modifyDefaultVusionConfig', vusionConfig);
-            },
-            resolveVusionConfig(vusionConfig) {
-                return api.applyPluginHooks('modifyVusionConfig', vusionConfig);
-            },
-            resolveVusionWebpackConfig(vusionWebpackConfig) {
-                return api.applyPluginHooks('modifyVusionWebpackConfig', vusionWebpackConfig);
-            },
-        });
-        _webpackConfig = vusionAdapter.webpackConfig;
-        _webpackDevOptions = vusionAdapter.devOptions || {};
-    }
+    const _webpackConfig = api.getState('webpackConfig');
+    const _webpackDevOptions = _webpackConfig.devServer || {};
 
     const webpack = tryRequire('webpack');
 
-    const { compiler, devOptions = {}, webpackConfig } = api.applyPluginHooks('modifyWebpackCompiler', {
-        type,
-        isDev,
-        compiler: webpack && _.isFunction(webpack) ? webpack(_webpackConfig) : null,
-        webpackConfig: _webpackConfig,
+    const { devOptions = {}, webpackConfig } = api.applyPluginHooks('modifyWebpackConfig', {
+        ...info,
+        webpackConfig: _.cloneDeep(_webpackConfig),
         devOptions: _webpackDevOptions || {},
     });
 
     if (
-        !_.isObject(compiler) || !compiler
-        ||
         !_.isPlainObject(devOptions) || !devOptions
         ||
         !_.isPlainObject(webpackConfig) || !webpackConfig
     ) {
-        logger.error('[Plugin] modifyWebpackCompiler must return { compiler, devOptions, webpackConfig }');
-        return progress.exit(1);
+        logger.error('[Plugin] modifyWebpackConfig must return { devOptions, webpackConfig }');
+        return process.exit(1);
     }
 
     // 更新一次
     api.setState('webpackConfig', webpackConfig);
 
-    if (progress && webpack && webpack.ProgressPlugin) {
+    const compiler = webpack(webpackConfig);
+
+    if (info.progress && webpack && webpack.ProgressPlugin) {
         try {
             let spinner;
             compiler.apply(new webpack.ProgressPlugin({