fix(plugin): 修复找不到本地ykit-config-xxx

Author: yuhaoju

lib/models/Project.js

@@ -84,16 +84,16 @@ var Project = function () {
                         var localSearchPath = sysPath.join(_this.cwd, 'node_modules/', moduleName);
                         var localSearchPathQnpm = sysPath.join(_this.cwd, 'node_modules/', '@qnpm/' + moduleName);
 
-                        if (requireg.resolve(moduleName)) {
-                            modulePath = requireg.resolve(moduleName);
-                        } else if (requireg.resolve(localSearchPath)) {
+                        if (requireg.resolve(localSearchPath)) {
                             modulePath = localSearchPath;
-                        } else if (requireg.resolve('@qnpm/' + moduleName)) {
-                            modulePath = requireg.resolve('@qnpm/' + moduleName);
-                            moduleName = '@qnpm/' + moduleName;
+                        } else if (requireg.resolve(moduleName)) {
+                            modulePath = requireg.resolve(moduleName);
                         } else if (requireg.resolve(localSearchPathQnpm)) {
                             modulePath = localSearchPathQnpm;
                             moduleName = '@qnpm/' + moduleName;
+                        } else if (requireg.resolve('@qnpm/' + moduleName)) {
+                            modulePath = requireg.resolve('@qnpm/' + moduleName);
+                            moduleName = '@qnpm/' + moduleName;
                         }
 
                         extend(true, userConfig.eslintConfig, Manager.loadEslintConfig(modulePath));

src/models/Project.js

@@ -66,16 +66,16 @@ class Project {
                 const localSearchPath = sysPath.join(this.cwd, 'node_modules/', moduleName)
                 const localSearchPathQnpm = sysPath.join(this.cwd, 'node_modules/', '@qnpm/' + moduleName)
 
-                if(requireg.resolve(moduleName)) {
-                    modulePath = requireg.resolve(moduleName)
-                } else if(requireg.resolve(localSearchPath)) {
+                if(requireg.resolve(localSearchPath)) {
                     modulePath = localSearchPath
-                } else if(requireg.resolve('@qnpm/' + moduleName)) {
-                    modulePath = requireg.resolve('@qnpm/' + moduleName)
-                    moduleName = '@qnpm/' + moduleName
+                } else if(requireg.resolve(moduleName)) {
+                    modulePath = requireg.resolve(moduleName)
                 } else if(requireg.resolve(localSearchPathQnpm)) {
                     modulePath = localSearchPathQnpm
                     moduleName = '@qnpm/' + moduleName
+                } else if(requireg.resolve('@qnpm/' + moduleName)) {
+                    modulePath = requireg.resolve('@qnpm/' + moduleName)
+                    moduleName = '@qnpm/' + moduleName
                 }
 
                 extend(true, userConfig.eslintConfig, Manager.loadEslintConfig(modulePath));