Merge pull request #18 from MicroAppJS/develop

:feat: 增加 parseConfig 方法

Author: zyao89

CODEOWNERS .github/CODEOWNERSCODEOWNERS renamed to .github/CODEOWNERS

@@ -9,10 +9,10 @@ Pluggable micro application framework.
 [![NPM Version][npm-img]][npm-url]
 [![NPM Download][download-img]][download-url]
 
-[Coverage-img]: https://coveralls.io/repos/github/MicrosApp/MicroApp-Core/badge.svg?branch=master
-[Coverage-url]: https://coveralls.io/github/MicrosApp/MicroApp-Core?branch=master
-[CircleCI-img]: https://circleci.com/gh/MicrosApp/MicroApp-Core/tree/master.svg?style=svg
-[CircleCI-url]: https://circleci.com/gh/MicrosApp/MicroApp-Core/tree/master
+[Coverage-img]: https://coveralls.io/repos/github/MicroAppJS/MicroApp-Core/badge.svg?branch=master
+[Coverage-url]: https://coveralls.io/github/MicroAppJS/MicroApp-Core?branch=master
+[CircleCI-img]: https://circleci.com/gh/MicroAppJS/MicroApp-Core/tree/master.svg?style=svg
+[CircleCI-url]: https://circleci.com/gh/MicroAppJS/MicroApp-Core/tree/master
 [npm-img]: https://img.shields.io/npm/v/@micro-app/core.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/@micro-app/core
 [download-img]: https://img.shields.io/npm/dm/@micro-app/core.svg?style=flat-square

README.md

@@ -45,7 +45,9 @@ module.exports = {
 
     strict: true,
 
-    micros: [ 'test', 'abab' ], // 被注册的容器
+    micros: [ 'test', 'abab', '@micro/shared-utils',
+        'git+ssh://git@g.hz.netease.com:22222/ops-fullstack/micro/micro-gportal.git#e718f77fce613a3044c451264e75e9e64b2941f7'
+    ], // 被注册的容器
 
     // 服务配置
     server: {

libs/Config/index.js

@@ -1,25 +1,24 @@
 {
     "name": "@micro-app/core",
-    "version": "0.2.0",
+    "version": "0.3.0",
+    "private": true,
     "description": "[Core] Pluggable micro application framework.",
     "main": "src/index.js",
     "scripts": {
         "lint": "eslint .",
         "lint:fix": "npm run lint -- --fix",
         "test": "jest"
     },
-    "homepage": "https://github.com/MicrosApp/MicroApp-Core",
+    "homepage": "https://github.com/MicroAppJS/MicroApp-Core",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/MicrosApp/MicroApp-Core.git"
+        "url": "git+https://github.com/MicroAppJS/MicroApp-Core.git"
     },
     "bugs": {
-        "url": "https://github.com/MicrosApp/MicroApp-Core/issues"
+        "url": "https://github.com/MicroAppJS/MicroApp-Core/issues"
     },
     "files": [
-        "libs",
         "src",
-        "plugins",
         "micro-app.config.js"
     ],
     "keywords": [
@@ -52,11 +51,14 @@
         "yargs-parser": "^13.1.1"
     },
     "dependencies": {
-        "@micro-app/shared-utils": "^0.0.3",
+        "@micro-app/shared-utils": "file:../MicroApp-Shared-Utils",
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "dotenv": "^8.2.0"
     },
+    "peerDependencies": {
+        "@micro-app/shared-utils": ">=0.1.0"
+    },
     "engines": {
         "node": ">=8"
     }

libs/Service/base/BaseService.js

@@ -3,7 +3,7 @@
 /* global expect */
 
 const MicroAppConfig = require('./index');
-const loadFile = require('../../src/utils/loadFile');
+const loadFile = require('../../utils/loadFile');
 
 describe('MicroAppConfig', () => {
 
@@ -43,8 +43,8 @@ describe('MicroAppConfig', () => {
         expect(config.toJSON(true)).not.toBeUndefined();
         expect(config.toJSON(true)).not.toBeNull();
 
-        expect(config.toConfig(true)).not.toBeUndefined();
-        expect(config.toConfig(true)).not.toBeNull();
+        expect(config).not.toBeUndefined();
+        expect(config).not.toBeNull();
 
         // 已迁移
         expect(config.webpack).toBeUndefined();
@@ -77,8 +77,8 @@ describe('MicroAppConfig', () => {
         expect(config.toJSON(true)).not.toBeUndefined();
         expect(config.toJSON(true)).not.toBeNull();
 
-        expect(config.toConfig(true)).not.toBeUndefined();
-        expect(config.toConfig(true)).not.toBeNull();
+        expect(config).not.toBeUndefined();
+        expect(config).not.toBeNull();
 
         // 已迁移
         expect(config.webpack).toBeUndefined();
@@ -91,4 +91,24 @@ describe('MicroAppConfig', () => {
         expect(config.server).toBeUndefined();
         expect(config.toServerConfig).toBeUndefined();
     });
+
+    it('manifest', () => {
+        const defaultConfig = loadFile(process.cwd(), 'micro-app.config.js');
+        const config = new MicroAppConfig(Object.assign({}, defaultConfig, {
+
+        }));
+
+        expect(config.manifest).not.toBeUndefined();
+        expect(config.manifest).not.toBeNull();
+    });
+
+    it('licensePath', () => {
+        const defaultConfig = loadFile(process.cwd(), 'micro-app.config.js');
+        const config = new MicroAppConfig(Object.assign({}, defaultConfig, {
+
+        }));
+
+        expect(config.licensePath).not.toBeUndefined();
+        expect(config.licensePath).not.toBeNull();
+    });
 });