Merge pull request umijs#642 from paranoidjk/fix-eslintrc

fix: af-webpack should resolve eslintrc according to APP_ROOT
wangxue16292016 · Jun 20, 2018 · 743faa0 · 743faa0
2 parents 2a34948 + 55ca5cb
commit 743faa0
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/af-webpack/src/getConfig.js b/packages/af-webpack/src/getConfig.js
@@ -336,17 +336,18 @@ export default function getConfig(opts = {}) {
   }
 
   // 读用户的 eslintrc
-  if (existsSync(resolve('.eslintrc'))) {
+  const userEslintRulePath = resolve(opts.cwd, '.eslintrc');
+  if (existsSync(userEslintRulePath)) {
     try {
-      const userRc = readRc(resolve('.eslintrc'));
+      const userRc = readRc(userEslintRulePath);
       debug(`userRc: ${JSON.stringify(userRc)}`);
       if (userRc.extends) {
-        debug(`use user's .eslintrc: ${resolve('.eslintrc')}`);
+        debug(`use user's .eslintrc: ${userEslintRulePath}`);
         eslintOptions.useEslintrc = true;
         eslintOptions.baseConfig = false;
         eslintOptions.ignore = true;
       } else {
-        debug(`extend with user's .eslintrc: ${resolve('.eslintrc')}`);
+        debug(`extend with user's .eslintrc: ${userEslintRulePath}`);
         eslintOptions.baseConfig = {
           ...eslintOptions.baseConfig,
           ...userRc,