:fix: fix logic

Author: zyao89

package.json

@@ -46,15 +46,13 @@
         ]
     },
     "peerDependencies": {
-        "@micro-app/cli": ">=0.3.1"
+        "@micro-app/cli": ">=0.3.5"
     },
     "devDependencies": {
-        "@micro-app/cli": "^0.3.1",
+        "@micro-app/cli": "^0.3.5",
         "@micro-app/plugin-deploy": "^0.0.4",
         "@types/jest": "^24.9.1",
-        "babel-eslint": "^10.1.0",
-        "eslint": "^5.16.0",
-        "eslint-config-2o3t": "^1.1.17",
+        "eslint-config-2o3t": "^2.0.1",
         "husky": "^3.1.0",
         "jest": "^24.9.0",
         "lint-staged": "^9.5.0"

src/index.js

@@ -1,16 +1,18 @@
 'use strict';
 
-module.exports = function(api, opts = {}) {
+module.exports = function compatible(api, opts = {}) {
 
     const version = opts.version || 'v1';
 
     // adapter
     switch (version.toLowerCase()) {
         case 'v1':
-        default: {
-            require('./v1')(api, opts);
+            return require('./v1')(api, opts);
+        default:
             break;
-        }
     }
 
+    api.logger.warn('[compatible]', `Not Support Version: ${version}`);
+
+    return;
 };

src/v1/convertHooks.js

@@ -16,37 +16,43 @@ module.exports = function(api, { hooks, entrys }) {
     // 生成模拟插件注册
     // hooks
     (hooks || []).map(({ key, link, info = {} }) => {
-        const hook = tryRequire(link);
-        if (hook && _.isFunction(hook)) {
+        if (link && tryRequire.resolve(link)) {
             const hookName = HOOK_KEY_MAP[key];
             if (hookName) {
                 return {
-                    hookName, hook,
+                    hookName,
                     info, link, key,
                 };
             }
         }
         return false;
-    }).filter(item => !!item).forEach(({ hookName, hook, info, link, key }) => {
+    }).filter(item => !!item).forEach(({ hookName, info, link, key }) => {
         api[hookName](params => {
-            logger.info('[compatible]', `【 ${info.name} 】Hook inject "${key}"`);
-            logger.debug('[compatible]', `【 ${info.name} 】Hook inject "${key}" Link: ${link}`);
-            return hook(params.app, info);
+            const hook = tryRequire(link);
+            if (hook && _.isFunction(hook)) {
+                logger.info('[compatible]', `【 ${info.name} 】Hook inject "${key}"`);
+                logger.debug('[compatible]', `【 ${info.name} 】Hook inject "${key}" Link: ${link}`);
+                return hook(params.app, info);
+            }
+            return false;
         });
     });
 
     // entrys
     (entrys || []).map(item => {
-        const entry = tryRequire(item.link);
-        if (entry && _.isFunction(entry)) {
-            return { ...item, entry };
+        if (item && item.link && tryRequire.resolve(item.link)) {
+            return { ...item };
         }
         return false;
-    }).filter(item => !!item).forEach(({ entry, info, link }) => {
+    }).filter(item => !!item).forEach(({ link, info }) => {
         api.onServerEntry(params => {
-            logger.info(`【 ${info.name} 】Inserted`);
-            logger.debug(`【 ${info.name} 】Inserted Link: ${link}`);
-            return entry(params.app, info);
+            const entry = tryRequire(link);
+            if (entry && _.isFunction(entry)) {
+                logger.info(`【 ${info.name} 】Inserted`);
+                logger.debug(`【 ${info.name} 】Inserted Link: ${link}`);
+                return entry(params.app, info);
+            }
+            return false;
         });
     });
 };

src/v1/index.js

@@ -12,11 +12,13 @@ module.exports = function(api, opts) {
         api.modifyChainWebpackConfig((...args) => api.applyPluginHooks('modifyChainWebpcakConfig', ...args));
     }
 
-    if (opts.server !== false) {
+    if (opts.server === true) {
         const createKoaServer = require('./createKoaServer');
         createKoaServer(api);
     }
 
+    // modify micros: 增加 scope
+
     // 用于兼容老版本的 hooks 和 entrys
     api.onInitWillDone(() => {
         const serverMerge = require('./lib/merge-server');