🐛 更新build脚本. 更新 hot middleware. 等.

Author: zyao89

README.md

@@ -3,7 +3,7 @@
 ## Install
 
 ```sh
-npm install -g @micro-app/cli
+yarn add @micro-app/cli
 ```
 
 or
@@ -17,55 +17,90 @@ npm install -D @micro-app/cli
 1. 在项目 `根目录` 初始化创建一个 `micro-app.config.js` 文件
 
 ```sh
-micro-app init
+npx micro-app init
 ```
 
 2. 对 `micro-app.config.js` 配置文件进行编辑
 
 ```js
 module.exports = {
-    name: '@micro-app/demo', // 名称
-    description: '', // 描述
-    version: '0.0.1', // 版本
+    name: '@micro-app/demo',
+    description: '',
+    version: '0.0.1',
     type: '', // types 类型
     webpack: { // webpack 配置
-        entry: {
-
-        },
         // output: {
         //     path: path.resolve(__dirname, 'public'),
         //     publicPath: '/public/',
         // },
-        resolve: {
-            alias: {},
-            // modules: [],
-        },
-        plugins: [],
     },
-    alias: { // 前端共享接口
-        api: '',
+
+    entry: {
+        main: './test/index.js',
     },
-    shared: { // 后端共享接口
-        config: '',
-        // middleware: '', // koa-middleware
-        // router: '', // koa-router
+
+    htmls: [
+        {
+            template: './test/index.js',
+        },
+    ],
+
+    // dlls: [
+    //     {
+    //         context: __dirname,
+    //     },
+    // ],
+
+    alias: { // 前端
+        api: '',
+        config: {
+            link: '',
+            description: '配置',
+        },
+        service: {
+            link: '',
+            description: '接口',
+            type: 'server',
+        },
     },
 
+    strict: true,
+
     micros: [ 'test' ], // 被注册的容器
     // micros$$test: { // 单独配置
     //     disabled: true, // 禁用入口
+    //     link: '', // 本地路径, 进行本地开发使用的软链接.
     // },
 
     // 服务配置
     server: {
         entry: '', // 服务端入口
         port: 8088, // 服务端口号
-        // staticBase: 'public', // 静态文件地址
         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 中增加内容
+    // },
 };
 ```
 
@@ -80,19 +115,19 @@ module.exports = {
 4. 开发模式
 
 ```sh
-micro-app-dev
+npx micro-app serve
 ```
 
 5. Build
 
 ```sh
-micro-app-build
+npx micro-app build
 ```
 
 6. 运行
 
 ```sh
-micro-app-build
+npx micro-app start
 ```
 
 ## 项目中使用共享接口
@@ -101,22 +136,24 @@ micro-app-build
 const api = require('@micro-demo/api');
 ```
 
+## Plugins 扩展
+
 ## 其他
 
 - 展示所有容器
 
 ```js
-micro-app -l
+npx micro-app show micros
 ```
 
 - 展示所有前端共享接口
 
 ```js
-micro-app -s alias
+npx micro-app show alias
 ```
 
 - 展示所有后端共享接口
 
 ```js
-micro-app -s shared
+npx micro-app show shared
 ```

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/cli",
-    "version": "0.1.0-beta.19",
+    "version": "0.1.0-RC2",
     "description": "micro app cli",
     "bin": {
         "micro-app": "./bin/micro-app.js",
@@ -34,7 +34,7 @@
         "webpack": "^4.39.2"
     },
     "dependencies": {
-        "@micro-app/core": "^0.1.0-beta.26",
+        "@micro-app/core": "^0.1.0-RC",
         "koa": "^2.8.1",
         "koa-static": "^5.0.0",
         "opn": "^5.5.0",

plugins/commands/build.js

@@ -51,6 +51,9 @@ function runServe(api, type) {
 
     if (type === 'vusion') {
         const vusionAdapter = require('../../src/adapter/vusion')(webpackConfig, false, {
+            modifyDefaultVusionConfig(vusionConfig) {
+                return api.applyPluginHooks('modifyDefaultVusionConfig', vusionConfig);
+            },
             resolveVusionConfig(vusionConfig) {
                 return api.applyPluginHooks('modifyVusionConfig', vusionConfig);
             },
@@ -66,6 +69,15 @@ function runServe(api, type) {
         webpackDevOptions = webpackAdapter.devOptions || {};
     }
 
+    // [ 'post', 'host', 'contentBase', 'entrys', 'hooks' ]; // serverConfig
+    const info = {
+        type,
+        config: api.config,
+        serverConfig: api.serverConfig,
+        onlyNode: false,
+        webpackConfig,
+    };
+
     // 更新一次
     api.setState('webpackConfig', webpackConfig);
 
@@ -76,16 +88,8 @@ function runServe(api, type) {
         devOptions: webpackDevOptions,
     });
 
-    // [ 'post', 'host', 'contentBase', 'entrys', 'hooks' ]; // serverConfig
-    const info = {
-        type,
-        config: api.config,
-        serverConfig: api.serverConfig,
-        onlyNode: false,
-        webpackConfig,
-        compiler,
-        devOptions,
-    };
+    info.compiler = compiler;
+    info.devOptions = devOptions;
 
     return new Promise((resolve, reject) => {
         const spinner = logger.spinner('Building for production...');

src/server/createServer.js

@@ -9,15 +9,15 @@ const tryRequire = require('try-require');
 const HookEvent = require('./HookEvent');
 const staticServer = require('./staticServer');
 
-module.exports = function(options = {}, api) {
+module.exports = function(opts = {}, api) {
     const logger = api.logger;
-    const isDev = options.isDev || false;
-    const onlyNode = options.onlyNode || false;
+    const isDev = opts.isDev || false;
+    const onlyNode = opts.onlyNode || false;
     if (isDev) {
         logger.info('Dev Server Start...');
     }
 
-    const serverConfig = options.serverConfig;
+    const serverConfig = opts.serverConfig;
 
     const app = new Koa();
     // 兼容koa1的中间件
@@ -49,8 +49,8 @@ module.exports = function(options = {}, api) {
     applyHooks(_HookEvent, 'after');
 
     if (isDev) {
-        const compiler = options.compiler || false;
-        const devOptions = options.devOptions || {};
+        const compiler = opts.compiler || false;
+        const devOptions = opts.devOptions || {};
         if (!onlyNode && !!compiler) {
             const koaWebpackMiddleware = require('./koa-webpack-middleware');
             app.use(koaWebpackMiddleware.devMiddleware(compiler, devOptions));
@@ -61,14 +61,24 @@ module.exports = function(options = {}, api) {
         const { contentBase, options = {} } = serverConfig;
         const koaStatic = staticServer(contentBase, options);
         if (koaStatic) {
+            if (opts.type === 'vusion') {
+                const config = opts.config;
+                const prePath = contentBase.replace(config.root, '');
+                app.use((ctx, next) => {
+                    if (ctx.url) {
+                        ctx.url = ctx.url.replace(prePath, '');
+                    }
+                    return next();
+                });
+            }
             app.use(koaStatic);
         }
     }
 
     api.applyPluginHooks('onServerInitDone', { app, config: serverConfig });
 
-    const port = options.port || serverConfig.port || 8888;
-    const host = options.host || serverConfig.host || 'localhost';
+    const port = opts.port || serverConfig.port || 8888;
+    const host = opts.host || serverConfig.host || 'localhost';
     return new Promise((resolve, reject) => {
         app.listen(port, host === 'localhost' ? '0.0.0.0' : host, err => {
             if (err) {

src/server/koa-webpack-middleware/devMiddleware.js

@@ -7,7 +7,7 @@ module.exports = function(compiler, opts) {
     const expressMiddleware = devMiddleware(compiler, opts);
 
     async function middleware(ctx, next) {
-        await expressMiddleware(ctx.req, {
+        return await expressMiddleware(ctx.req, {
             end: content => {
                 ctx.body = content;
             },

src/server/koa-webpack-middleware/hotMiddleware.js

@@ -10,10 +10,10 @@ module.exports = function(compiler, opts) {
     const expressMiddleware = hotMiddleware(compiler, opts);
     return async (ctx, next) => {
         const stream = new PassThrough();
-        ctx.body = stream;
-        await expressMiddleware(ctx.req, {
+        return await expressMiddleware(ctx.req, {
             write: stream.write.bind(stream),
             writeHead: (status, headers) => {
+                ctx.body = stream; // ok 才赋值
                 ctx.status = status;
                 ctx.set(headers);
             },

yarn.lock

@@ -182,10 +182,10 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@micro-app/core@^0.1.0-beta.26":
-  version "0.1.0-beta.26"
-  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.1.0-beta.26.tgz#9c98691a4cd8b4758069ce1b792be3bd8c59dabe"
-  integrity sha512-5lwI9eYg2QUeN1lMWYlyBClMhBXX1gzyiJlcbJyp7DDYtrkRIiMXu+5ve+BGbny7sEcXveBNcOLTIlC5/P4nwg==
+"@micro-app/core@^0.1.0-RC":
+  version "0.1.0-RC"
+  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.1.0-RC.tgz#9479c5e0e72648b17335c26d243648f9a9408994"
+  integrity sha512-p8/bklly6y5ajOrB3Cjp/M16gbD8xiS3Dc7VkBVTOWp2nOMZzu2m6+Ms6a5V1e75mQGPGXk+15zQXg2YD4f/hA==
   dependencies:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"