Add fallback-to-our-own-eslint behavior in the worker

Author: savetheclocktower

lib/worker.js

@@ -48,7 +48,12 @@ function emitError (obj) {
   process.stderr.write(`${obj}\n`);
 }
 
+function log (message) {
+  emit({ log: message });
+}
+
 function getPathRoot (filePath, eslintPath) {
+  log(`getPathRoot ${filePath} // ${eslintPath}`);
   filePath = normalize(filePath).split(sep);
   eslintPath = normalize(eslintPath).split(sep);
 
@@ -83,35 +88,26 @@ function clearESLintCache () {
   }
 }
 
-function getESLint (filePath, projectPath, config, { legacyPackagePresent }) {
-  // `eslint` will get resolved relative to the path of the file we're going to
-  // lint — unless the user has specified their own `localNodeModules` path.
-  let { advanced: { localNodeModules } } = config;
-  let resolvePath = filePath;
-  if (localNodeModules) {
-    resolvePath = normalize([projectPath, localNodeModules].join(sep));
+function resolveESLint (filePath) {
+  try {
+    return createRequire(filePath).resolve('eslint');
+  } catch (e) {
+    return createRequire(__dirname).resolve('eslint');
   }
+}
 
-  if (!PATHS_CACHE[resolvePath]) {
-    PATHS_CACHE[resolvePath] = createRequire(resolvePath).resolve('eslint');
+function getESLint (filePath, projectPath, config, { legacyPackagePresent }) {
+  if (!PATHS_CACHE[filePath]) {
+    PATHS_CACHE[filePath] = resolveESLint(filePath);
   }
 
-  const eslintPath = PATHS_CACHE[filePath];
-  const eslintRootPath = eslintPath.replace(/eslint([/\\]).*?$/, 'eslint$1');
+  let eslintPath = PATHS_CACHE[filePath];
 
   if (!ESLINT_CACHE[eslintPath]) {
+    const eslintRootPath = eslintPath.replace(/eslint([/\\]).*?$/, 'eslint$1');
     const packageMeta = require(join(eslintRootPath, 'package.json'));
-    if (compareVersions(packageMeta.version, MINIMUM_ESLINT_VERSION) < 1) {
-      // Unsupported version.
-      throw new IncompatibleVersionError(packageMeta.version);
-    } if ((compareVersions(packageMeta.version, '8.0.0') < 1) && legacyPackagePresent) {
-      // We're dealing with version 7 of ESLint. The legacy `linter-eslint`
-      // package is present and capable of linting with this version, so we
-      // should halt instead of trying to lint everything twice.
-      throw new VersionOverlapError(packageMeta.version);
-    }
 
-    const { ESLint } = createRequire(filePath)('eslint');
+    let { ESLint } = createRequire(eslintPath)('eslint');
     let commonOptions = buildCommonConstructorOptions(config);
 
     // `fix` is a predicate in `commonOptions` and represents the "yes,
@@ -123,9 +119,23 @@ function getESLint (filePath, projectPath, config, { legacyPackagePresent }) {
       eslintFix: new ESLint({ ...commonOptions }),
       workingDir: getPathRoot(filePath, eslintPath),
       eslintPath: eslintRootPath,
-      eslintVersion: packageMeta.version
+      eslintVersion: packageMeta.version,
+      isBuiltIn: eslintPath === PATHS_CACHE[__dirname]
     };
   }
+
+  let cache = ESLINT_CACHE[eslintPath];
+
+  if (compareVersions(cache.eslintVersion, MINIMUM_ESLINT_VERSION) < 1) {
+    // Unsupported version.
+    throw new IncompatibleVersionError(cache.eslintVersion);
+  } else if ((compareVersions(cache.eslintVersion, '8.0.0') < 1) && legacyPackagePresent) {
+    // We're dealing with version 7 of ESLint. The legacy `linter-eslint`
+    // package is present and capable of linting with this version, so we
+    // should halt instead of trying to lint everything twice.
+    throw new VersionOverlapError(cache.eslintVersion);
+  }
+
   return ESLINT_CACHE[eslintPath];
 }
 
@@ -173,7 +183,7 @@ function formatResults (files, rules, config, { isModified, key }) {
 
       let idTag = '';
       if (showRuleIdInMessage && message.ruleId) {
-        idTag = `[${message.ruleId}] `;
+        idTag = ` (${message.ruleId})`;
       }
       let position;
       if (message.fatal) {
@@ -202,7 +212,7 @@ function formatResults (files, rules, config, { isModified, key }) {
           position,
         },
         fix: message.fix,
-        excerpt: `${idTag}${message.message}`
+        excerpt: `${message.message}${idTag}`
       });
     }
   }
@@ -240,14 +250,14 @@ async function processMessage (bundle) {
     return;
   }
 
-  if (!projectPath) {
-    emit({
-      key,
-      error: `Must provide projectPath`,
-      type: 'no-project'
-    });
-    return;
-  }
+  // if (!projectPath) {
+  //   emit({
+  //     key,
+  //     error: `Must provide projectPath`,
+  //     type: 'no-project'
+  //   });
+  //   return;
+  // }
 
   let eslint;
   try {
@@ -268,6 +278,7 @@ async function processMessage (bundle) {
         type: 'version-overlap'
       });
     } else {
+      log(`Error: ${err.message}`);
       emit({
         key,
         error: `Can't find an ESLint for file: ${filePath}`,
@@ -278,7 +289,7 @@ async function processMessage (bundle) {
   }
 
   if (type === 'debug') {
-    let { eslintPath, eslintVersion } = eslint;
+    let { eslintPath, eslintVersion, isBuiltIn } = eslint;
     let isIncompatible = compareVersions(eslintVersion, MINIMUM_ESLINT_VERSION) < 1;
     let isOverlap = (compareVersions(eslintVersion, '8.0.0') < 1) && !isIncompatible;
     emit({
@@ -287,7 +298,8 @@ async function processMessage (bundle) {
       eslintPath,
       eslintVersion,
       isIncompatible,
-      isOverlap
+      isOverlap,
+      isBuiltIn
     });
     return;
   }