Merge pull request #988 from forcedotcom/d/W-12608309

FIX (ESLint): @W-12608309@: Fixed import for relocated ESLint configs.

package.json

@@ -7,6 +7,7 @@
 	"dependencies": {
 		"@babel/core": "^7.11.0",
 		"@babel/eslint-parser": "^7",
+		"@eslint/js": "^8.35.0",
 		"@lwc/eslint-plugin-lwc": "^1.1.2",
 		"@oclif/command": "^1",
 		"@oclif/config": "^1",
@@ -19,7 +20,7 @@
 		"@typescript-eslint/parser": "^5.14.0",
 		"cross-spawn": "^7.0.3",
 		"csv-stringify": "^6.0.5",
-		"eslint": "^8.10.0",
+		"eslint": "^8.35.0",
 		"eslint-plugin-import": "^2.25.4",
 		"eslint-plugin-jest": "^26.1.1",
 		"find-java-home": "1.2.2",
@@ -75,7 +76,7 @@
 		"@types/uuid": "^8.3.4",
 		"chai": "^4",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.10.0",
+		"eslint": "^8.35.0",
 		"mocha": "^9",
 		"mocha-junit-reporter": "^2.0.0",
 		"nyc": "^15.0.0",

src/lib/eslint/JavascriptEslintStrategy.ts

@@ -3,8 +3,8 @@ import {ENGINE, LANGUAGE, HARDCODED_RULES} from '../../Constants';
 import {ESRule, ESRuleConfigValue, ESRuleConfig, RuleViolation} from '../../types';
 import { Logger } from '@salesforce/core';
 import {EslintStrategyHelper, ProcessRuleViolationType, RuleDefaultStatus} from './EslintCommons';
-import path = require('path');
 import {ESLint} from 'eslint';
+import {configs} from '@eslint/js';
 
 const ES_CONFIG: ESLint.Options = {
 	"baseConfig": {},
@@ -41,8 +41,8 @@ export class JavascriptEslintStrategy implements EslintStrategy {
 		this.logger = await Logger.child(this.getEngine().valueOf());
 		// When we're building our catalog, we'll want to get any bonus configuration straight from the horse's mouth.
 		// This lets us do that.
-		const pathToRecommendedConfig = require.resolve('eslint').replace(path.join('lib', 'api.js'), path.join('conf', 'eslint-recommended.js'));
-		this.recommendedConfig = (await import(pathToRecommendedConfig)) as ESRuleConfig;
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		this.recommendedConfig = configs.recommended as ESRuleConfig;
 		this.initialized = true;
 	}
 

src/lib/eslint/TypescriptEslintStrategy.ts

@@ -9,6 +9,7 @@ import {deepCopy} from '../util/Utils';
 import { rules } from '@typescript-eslint/eslint-plugin';
 import {EslintStrategyHelper, ProcessRuleViolationType, RuleDefaultStatus} from './EslintCommons';
 import {ESLint} from 'eslint';
+import {configs} from '@eslint/js';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/sfdx-scanner', 'TypescriptEslintStrategy');
@@ -61,9 +62,8 @@ export class TypescriptEslintStrategy implements EslintStrategy {
 		this.logger = await Logger.child(this.getEngine().valueOf());
 		this.fileHandler = new FileHandler();
 		this.outputProcessor = await OutputProcessor.create({});
-		const pathToBaseConfig = require.resolve('eslint')
-			.replace(path.join('lib', 'api.js'), path.join('conf', 'eslint-recommended.js'));
-		this.baseEslintConfig = (await import(pathToBaseConfig)) as ESRuleConfig;
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		this.baseEslintConfig = configs.recommended as ESRuleConfig;
 
 		const pathToExtendedBaseConfig = require.resolve('@typescript-eslint/eslint-plugin')
 			.replace('index.js', path.join('configs', 'eslint-recommended.js'));

test/code-fixtures/projects/js/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-	"root": true
+	"root": true,
 	"extends": ["eslint:recommended"],
 	"parserOptions": {
 		"sourceType": "module",