🎨 适配新的 core 配置.

Author: zyao89

package.json

@@ -28,6 +28,7 @@
     "keywords": [
         "micro",
         "micro-app",
+        "micro-application",
         "core",
         "cli"
     ],
@@ -37,7 +38,7 @@
     },
     "license": "MIT",
     "devDependencies": {
-        "@micro-app/core": "^0.2.0-beta.4",
+        "@micro-app/core": "^0.2.0-beta.5",
         "@micro-app/plugin-koa-static-server": "^0.0.1",
         "@micro-app/plugin-koa-webpack-middleware": "^0.0.3",
         "@types/jest": "^24.0.18",

plugins/commands/init/index.js

@@ -35,7 +35,7 @@ Examples:
 
 function initMicro(api, args) {
     const logger = api.logger;
-    const config = api.self;
+    const config = api.selfConfig;
     const micros = api.micros;
     const microsConfig = api.microsConfig;
 

plugins/commands/serve/serve.test.js

@@ -136,4 +136,15 @@ describe('Command serve', () => {
 
     });
 
+    it('global cmd config', async () => {
+
+        const { service } = require('../../../bin/base');
+
+        await service.run('serve', Object.assign({
+            openSoftLink: true,
+            openDisabledEntry: true,
+        }, getArgvs()));
+
+    });
+
 });

plugins/commands/update.js plugins/commands/update/index.jsplugins/commands/update.js renamed to plugins/commands/update/index.js

@@ -38,7 +38,7 @@ Examples:
 
 function updateMicro(api, name) {
     const logger = api.logger;
-    const microAppConfig = api.self;
+    const microAppConfig = api.selfConfig;
     const micros = api.micros;
     const microsConfig = api.microsConfig;
     const currentNodeModules = microAppConfig.nodeModules;
@@ -102,7 +102,7 @@ function updateMicro(api, name) {
         logger.logo(`${chalk.green('Finish!')}`);
         return;
     } else {
-        logger.error(`not found micros: "${name}"`);
+        logger.error(`Not Found micros: "${name}"`);
     }
 
     api.applyPluginHooks('afterCommandUpdate', { name, logger, microsConfig });

plugins/commands/update/update.test.js

@@ -0,0 +1,12 @@
+'use strict';
+
+/* global expect */
+
+describe('Command update', () => {
+
+    it('run', () => {
+
+
+    });
+
+});

plugins/extends/server/index.js

@@ -7,7 +7,6 @@ module.exports = function extendServer(api, opts) {
     const registerMethods = require('./methods');
     registerMethods(api);
 
-    const requireMicro = require('@micro-app/core');
     const _ = require('lodash');
 
     const logger = api.logger;
@@ -16,26 +15,57 @@ module.exports = function extendServer(api, opts) {
         cache: true,
         description: '当前工程下的服务配置',
     }, function() {
-        return api.self.toServerConfig(true);
+        const microConfig = this.selfConfig;
+        const _originalConfig = microConfig.originalConfig || {};
+        const _serverConfig = _originalConfig.server || {};
+        const { entry, options = {}, hooks } = _serverConfig;
+        return {
+            // ...microConfig,
+            entry,
+            hooks,
+            options,
+            info: _.cloneDeep(microConfig),
+            shared: microConfig.shared,
+            sharedObj: microConfig.sharedObj,
+            resolveShared: microConfig.resolveShared,
+            port: _serverConfig.port,
+            host: _serverConfig.host,
+            proxy: _serverConfig.proxy,
+        };
     });
 
     api.extendConfig('microsServerConfig', {
         cache: true,
         description: '当前工程下所有依赖的服务配置合集',
     }, function() {
-        const _self = this.self;
+        const selfConfig = this.selfConfig;
+        const micros = api.micros;
+        const microsConfig = api.microsConfig;
         const config = {};
-        const micros = _.cloneDeep([ ...this.micros ]);
         micros.forEach(key => {
-            const microConfig = requireMicro(key);
+            const microConfig = microsConfig[key];
             if (microConfig) {
-                config[key] = microConfig.toServerConfig(true);
+                const _originalConfig = microConfig.originalConfig || {};
+                const _serverConfig = _originalConfig.server || {};
+                const { entry, options = {}, hooks } = _serverConfig;
+                config[key] = {
+                    // ...microConfig,
+                    entry,
+                    hooks,
+                    options,
+                    info: _.cloneDeep(microConfig),
+                    shared: microConfig.shared,
+                    sharedObj: microConfig.sharedObj,
+                    resolveShared: microConfig.resolveShared,
+                    port: _serverConfig.port,
+                    host: _serverConfig.host,
+                    proxy: _serverConfig.proxy,
+                };
             } else {
-                this.micros.delete(key);
                 logger.error(`Not Found micros: "${key}"`);
             }
         });
-        config[_self.key] = api.selfServerConfig || _self.toServerConfig(true);
+        config[selfConfig.key] = api.selfServerConfig;
         return config;
     });
 

yarn.lock

@@ -379,10 +379,10 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@micro-app/core@^0.2.0-beta.4":
-  version "0.2.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.2.0-beta.4.tgz#db7a7342ceae012a3e40957737962e125dfe9680"
-  integrity sha512-/gJ6fvydEXxhHohDZVxsF71Kla7vf7WJ8xIGsIT6qcXTiweQiAWQdJfdWn97rLPUR6Kxw9BqSZp4szuklbvrmA==
+"@micro-app/core@^0.2.0-beta.5":
+  version "0.2.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.2.0-beta.5.tgz#6763b09b4403bb9db6ae8f4c63a2b32d23ae3536"
+  integrity sha512-p7c0C4BOHD6askAlqOdyPiNNzmIWW0A8a2zsV5aXlz89QuFZTL433/B5LLSndHiAvCC1ryMi25caJA7OSbPq5g==
   dependencies:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"