Merge pull request #28 from MicroAppJS/develop

Merge Develop

Author: zyao89

.circleci/config.yml

@@ -0,0 +1 @@
+* @zyao89

.github/CODEOWNERS

@@ -0,0 +1,36 @@
+name: Coveralls
+on:
+    push:
+        branches:
+            - master
+            - develop
+jobs:
+    install-and-coveralls:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@master
+
+            - name: Cache node modules
+              uses: actions/cache@v1
+              with:
+                  path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - name: install
+              run: yarn --network-timeout 600000
+
+            - name: yarn add coveralls
+              run: |
+                  yarn add -D coveralls
+                  yarn run test --coverage && cat ./coverage/lcov.info
+
+            - name: Coveralls
+              uses: coverallsapp/github-action@master
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/coveralls.yml

@@ -87,3 +87,6 @@ dist
 *.sln
 *.sw*
 
+
+# 特殊备注
+micros.json

.gitignore

@@ -0,0 +1,125 @@
+## [0.4.1](https://github.com/MicroAppJS/cli/compare/v0.4.0...v0.4.1) (2021-08-04)
+
+
+### Features
+
+* update deps ([577df0a](https://github.com/MicroAppJS/cli/commit/577df0ae16a415092d34e6b22c4b5b6a5f24afe5))
+* 增加适配多服务入口配置逻辑 ([a11d481](https://github.com/MicroAppJS/cli/commit/a11d48155aa933ecfee6d6fab424e1da34e074ff))
+
+# [0.4.0](https://github.com/MicroAppJS/cli/compare/v0.3.17...v0.4.0) (2020-06-10)
+
+
+### Bug Fixes
+
+* 修复 ([347e2ff](https://github.com/MicroAppJS/cli/commit/347e2ff007ccbf22d919a0aad382af1846e1d40d))
+
+
+### Features
+
+* add `micro-app-serve` bin ([019262d](https://github.com/MicroAppJS/cli/commit/019262d0da998318a8a0b53d9e6af981a70f9020))
+
+## [0.3.17](https://github.com/MicroAppJS/cli/compare/v0.3.16...v0.3.17) (2020-04-21)
+
+## [0.3.16](https://github.com/MicroAppJS/cli/compare/v0.3.15...v0.3.16) (2020-04-18)
+
+## [0.3.15](https://github.com/MicroAppJS/cli/compare/v0.3.14...v0.3.15) (2020-03-31)
+
+## [0.3.14](https://github.com/MicroAppJS/cli/compare/v0.3.13...v0.3.14) (2020-03-31)
+
+## [0.3.13](https://github.com/MicroAppJS/cli/compare/v0.3.12...v0.3.13) (2020-03-31)
+
+## [0.3.12](https://github.com/MicroAppJS/cli/compare/v0.3.11...v0.3.12) (2020-03-31)
+
+## [0.3.11](https://github.com/MicroAppJS/cli/compare/v0.3.10...v0.3.11) (2020-03-30)
+
+## [0.3.10](https://github.com/MicroAppJS/cli/compare/v0.3.9...v0.3.10) (2020-03-25)
+
+## [0.3.9](https://github.com/MicroAppJS/cli/compare/v0.3.8...v0.3.9) (2020-03-23)
+
+## [0.3.8](https://github.com/MicroAppJS/cli/compare/v0.3.7...v0.3.8) (2020-03-23)
+
+## [0.3.7](https://github.com/MicroAppJS/cli/compare/v0.3.6...v0.3.7) (2020-03-18)
+
+## [0.3.6](https://github.com/MicroAppJS/cli/compare/v0.1.0...v0.3.6) (2020-03-16)
+
+
+### Bug Fixes
+
+* some bugs ([75d1eea](https://github.com/MicroAppJS/cli/commit/75d1eea5bd7e9dd8290b1fc8f94fd7e8052cacff))
+* 修复 bootstrap， 增肌 release 配置 ([92d323e](https://github.com/MicroAppJS/cli/commit/92d323e12212519838f300d27a9198f21c5ec6f5))
+
+
+### Features
+
+* add build cmd and enhance bootstrap ([677c3c3](https://github.com/MicroAppJS/cli/commit/677c3c32817ee8d293ad2a1cb7e1f378b9bb2e67))
+* remove type, add target ([1723ba0](https://github.com/MicroAppJS/cli/commit/1723ba0645ea92b9f2816fa0c446eb623d282ec2))
+
+## [0.3.5](https://github.com/MicroAppJS/cli/compare/v0.1.0...v0.3.5) (2020-03-12)
+
+
+### Bug Fixes
+
+* some bugs ([75d1eea](https://github.com/MicroAppJS/cli/commit/75d1eea5bd7e9dd8290b1fc8f94fd7e8052cacff))
+* 修复 bootstrap， 增肌 release 配置 ([92d323e](https://github.com/MicroAppJS/cli/commit/92d323e12212519838f300d27a9198f21c5ec6f5))
+
+
+### Features
+
+* add build cmd and enhance bootstrap ([677c3c3](https://github.com/MicroAppJS/cli/commit/677c3c32817ee8d293ad2a1cb7e1f378b9bb2e67))
+* remove type, add target ([1723ba0](https://github.com/MicroAppJS/cli/commit/1723ba0645ea92b9f2816fa0c446eb623d282ec2))
+
+## [0.3.4](https://github.com/MicroAppJS/cli/compare/v0.1.0...v0.3.4) (2020-03-11)
+
+
+### Bug Fixes
+
+* some bugs ([75d1eea](https://github.com/MicroAppJS/cli/commit/75d1eea5bd7e9dd8290b1fc8f94fd7e8052cacff))
+* 修复 bootstrap， 增肌 release 配置 ([92d323e](https://github.com/MicroAppJS/cli/commit/92d323e12212519838f300d27a9198f21c5ec6f5))
+
+
+### Features
+
+* add build cmd and enhance bootstrap ([677c3c3](https://github.com/MicroAppJS/cli/commit/677c3c32817ee8d293ad2a1cb7e1f378b9bb2e67))
+* remove type, add target ([1723ba0](https://github.com/MicroAppJS/cli/commit/1723ba0645ea92b9f2816fa0c446eb623d282ec2))
+
+## [0.3.3](https://github.com/MicroAppJS/cli/compare/v0.1.0...v0.3.3) (2020-03-10)
+
+
+### Bug Fixes
+
+* 修复 bootstrap， 增肌 release 配置 ([92d323e](https://github.com/MicroAppJS/cli/commit/92d323e12212519838f300d27a9198f21c5ec6f5))
+
+
+### Features
+
+* add build cmd and enhance bootstrap ([677c3c3](https://github.com/MicroAppJS/cli/commit/677c3c32817ee8d293ad2a1cb7e1f378b9bb2e67))
+* remove type, add target ([1723ba0](https://github.com/MicroAppJS/cli/commit/1723ba0645ea92b9f2816fa0c446eb623d282ec2))
+
+## [0.3.2](https://github.com/MicroAppJS/cli/compare/v0.1.0...v0.3.2) (2020-03-07)
+
+
+### Bug Fixes
+
+* 修复 bootstrap， 增肌 release 配置 ([92d323e](https://github.com/MicroAppJS/cli/commit/92d323e12212519838f300d27a9198f21c5ec6f5))
+
+
+### Features
+
+* add build cmd and enhance bootstrap ([677c3c3](https://github.com/MicroAppJS/cli/commit/677c3c32817ee8d293ad2a1cb7e1f378b9bb2e67))
+
+## [0.3.1](https://github.com/MicroAppJS/cli/compare/v0.1.0...v0.3.1) (2020-02-09)
+
+
+### Bug Fixes
+
+* 修复 bootstrap， 增肌 release 配置 ([92d323e](https://github.com/MicroAppJS/cli/commit/92d323e12212519838f300d27a9198f21c5ec6f5))
+
+
+### Features
+
+* add build cmd and enhance bootstrap ([677c3c3](https://github.com/MicroAppJS/cli/commit/677c3c32817ee8d293ad2a1cb7e1f378b9bb2e67))
+
+
+
+## 0.0.57 (2019-08-19)
+

CHANGELOG.md

@@ -4,15 +4,15 @@ Pluggable micro application framework.
 
 基于webpack多入口的多仓库业务模块开发的插件应用框架脚手架.
 
+[![Github Actions Coveralls][Github-Actions-Coveralls]][Github-Actions-Coveralls-url]
 [![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/MicrosApp/MicroApp-CLI/tree/master.svg?style=svg
-[CircleCI-url]: https://circleci.com/gh/MicrosApp/MicroApp-CLI/tree/master
+[Github-Actions-Coveralls]: https://github.com/MicroAppJS/cli/workflows/Coveralls/badge.svg
+[Github-Actions-Coveralls-url]: https://github.com/MicroAppJS/cli
+[Coverage-img]: https://coveralls.io/repos/github/MicroAppJS/cli/badge.svg?branch=master
+[Coverage-url]: https://coveralls.io/github/MicroAppJS/cli?branch=master
 [npm-img]: https://img.shields.io/npm/v/@micro-app/cli.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/@micro-app/cli
 [download-img]: https://img.shields.io/npm/dm/@micro-app/cli.svg?style=flat-square
@@ -59,12 +59,6 @@ module.exports = {
         },
     ],
 
-    // dlls: [
-    //     {
-    //         context: __dirname,
-    //     },
-    // ],
-
     alias: { // 别名配置
         api: '',
         config: {
@@ -84,11 +78,9 @@ module.exports = {
 
     // 服务配置
     server: {
+        hooks: '',
         entry: '', // 服务端入口
         port: 8088, // 服务端口号
-        options: {
-            // 服务端回调参数
-        },
     },
 
     plugins: [ // 自定义插件
@@ -103,7 +95,7 @@ module.exports = {
 };
 ```
 
-### 在 `package.json` 中加载其他模块, 例如:
+### 在 `package.json` 中加载其他模块, 例如
 
 ```json
     "dependencies": {
@@ -175,15 +167,6 @@ module.exports = function(api, opts) {
     api.onPluginInitDone(item => {
         console.log('onPluginInitDone', item);
     });
-    api.beforeMergeWebpackConfig(item => {
-        console.log('beforeMergeWebpackConfig', item);
-    });
-    api.afterMergeWebpackConfig(item => {
-        console.log('afterMergeWebpackConfig', item);
-    });
-    // api.onChainWebpcakConfig(webpackChainConfig => {
-    //     console.log('onChainWebpcakConfig', webpackChainConfig);
-    // });
 };
 ```
 
@@ -209,10 +192,6 @@ npx micro-app show methods
      * modifyCommand               ( System Build-in )
      * onRunCommand                ( System Build-in )
      * modifyCommandHelp           ( System Build-in )
-     * beforeMergeWebpackConfig    ( 合并 webpack 配置之前事件 )
-     * afterMergeWebpackConfig     ( 合并 webpack 配置之后事件 )
-     * modifyChainWebpcakConfig    ( 合并之后提供 webpack-chain 进行再次修改事件 )
-     * onChainWebpcakConfig        ( 修改之后提供 webpack-chain 进行查看事件 )
      * modifyWebpackConfig         ( 合并之后提供 webpack config 进行再次修改事件 )
      * onServerInit                ( 服务初始化时事件 )
      * onServerInitWillDone        ( 服务初始化即将完成事件 )

README.md

@@ -1,37 +1,3 @@
 'use strict';
 
-const checker = require('../src/utils/checker');
-if (!checker.checkNode()) {
-    process.exit(1);
-}
-checker.checkUpgrade();
-
-const yParser = require('yargs-parser');
-const cmd = process.argv[2];
-const argv = yParser(process.argv.slice(3));
-
-// 全局环境模式 production, development
-process.env.NODE_ENV = argv.mode || process.env.NODE_ENV || 'development';
-
-const { Service, logger } = require('@micro-app/core');
-
-// 全局指令
-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 service = new Service();
-
-// 注册插件
-require('../plugins/register')(service);
-
-module.exports = { cmd, argv, service };
+module.exports = require('../');

bin/base.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+'use strict';
+
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+
+const { yParser } = require('@micro-app/shared-utils');
+const argv = yParser(process.argv.slice(2));
+const { service } = require('./base');
+
+service.run('build', argv);

bin/micro-app-build

@@ -3,7 +3,7 @@
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const yParser = require('yargs-parser');
+const { yParser } = require('@micro-app/shared-utils');
 const argv = yParser(process.argv.slice(2));
 const { service } = require('./base');
 

bin/micro-app-dev

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