1.0.4 release

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The following is a curated list of changes in the Enact proxy ESLint config:
 
+## [1.0.4] (April 11, 2022)
+
+### Fixed
+
+- Applied the new API to call ESLint module resolver correctly with the latest eslint.
+
 ## [1.0.3] (December 28, 2021)
 
 No significant changes.

README.md

@@ -19,7 +19,7 @@ For more information (including editor/IDE setup), please see the [Enact ESLint
 Unless otherwise specified, all content, including all source code files and
 documentation files in this repository are:
 
-Copyright (c) 2020 LG Electronics
+Copyright (c) 2020-2022 LG Electronics
 
 Unless otherwise specified or set forth in the NOTICE file, all content,
 including all source code files and documentation files in this repository are:

get-config.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const semver = require('semver');
 const {npmGlobalModules, yarnGlobalModules, supportGlobalResolving} = require('./global-resolver');
 
 // Find first parent module from the accessing ESLint.
@@ -29,7 +30,28 @@ function getGlobalConfig({
 		...search.map(dir => path.join(dir, 'eslint', 'lib', 'shared', 'relative-module-resolver.js'))
 	].find(dir => fs.existsSync(dir));
 	if (eslintResolverPath) {
-		supportGlobalResolving(eslintResolverPath, search);
+		let eslintResolver;
+
+		if (eslintResolverPath.includes('eslintrc')) {
+			const eslintrcPath = path.join(eslintResolverPath, '..', '..', '..');
+			const version = require(path.join(eslintrcPath, 'package.json')).version;
+			if (semver.gte(version, '0.4.1')) {
+				const {
+					Legacy: {
+						ModuleResolver
+					}
+				} = require(eslintrcPath);
+				eslintResolver = ModuleResolver;
+			} else if (semver.gte(version, '0.2.2')) {
+				eslintResolver = require(eslintResolverPath);
+			} else {
+				eslintResolver = require(path.join(eslintrcPath, '..', '..', '..', 'lib', 'shared', 'relative-module-resolver.js'));
+			}
+		} else {
+			eslintResolver = require(eslintResolverPath);
+		}
+
+		supportGlobalResolving(eslintResolver, search);
 	}
 	// If eslint/lib/shared/relative-module-resolver.js does not exist, then
 	// our global resolving support cannot be patched in.

global-resolver.js

@@ -23,8 +23,7 @@ const npmGlobalModules = () => execSync('npm root -g');
 
 const yarnGlobalModules = () => execSync('yarn global dir');
 
-const supportGlobalResolving = (resolverFile, globalPaths) => {
-	const resolver = require(resolverFile);
+const supportGlobalResolving = (resolver, globalPaths) => {
 	const doResolve = resolver.resolve;
 	if (!Array.isArray(globalPaths)) globalPaths = [globalPaths];
 	resolver.resolve = function(moduleName, relativeToPath) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-enact-proxy",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "ESLint proxy config for global Enact ruleset",
   "main": "index.js",
   "author": "Jason Robitaille <[email protected]>",
@@ -12,5 +12,8 @@
   "scripts": {
     "lint": "eslint .",
     "fix": "eslint . --fix"
+  },
+  "dependencies": {
+    "semver": "^7.3.6"
   }
 }