eslint 9.39.1 → 10.0.0-alpha.0

package/README.md

@@ -42,7 +42,7 @@ ESLint is a tool for identifying and reporting on patterns found in ECMAScript/J
 
 ## Installation and Usage
 
-Prerequisites: [Node.js](https://nodejs.org/) (`^18.18.0`, `^20.9.0`, or `>=21.1.0`) built with SSL support. (If you are using an official Node.js distribution, SSL is always built in.)
+Prerequisites: [Node.js](https://nodejs.org/) (`^20.19.0`, `^22.13.0`, or `>=24`) built with SSL support. (If you are using an official Node.js distribution, SSL is always built in.)
 
 You can install and configure ESLint using this command:
 
@@ -341,9 +341,9 @@ to get your logo on our READMEs and [website](https://eslint.org/sponsors).
 
 <h3>Platinum Sponsors</h3>
 <p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="128"></a></p><h3>Gold Sponsors</h3>
-<p><a href="https://qlty.sh/"><img src="https://images.opencollective.com/qltysh/33d157d/logo.png" alt="Qlty Software" height="96"></a> <a href="https://trunk.io/"><img src="https://images.opencollective.com/trunkio/fb92d60/avatar.png" alt="trunk.io" height="96"></a> <a href="https://shopify.engineering/"><img src="https://avatars.githubusercontent.com/u/8085" alt="Shopify" height="96"></a></p><h3>Silver Sponsors</h3>
+<p><a href="https://qlty.sh/"><img src="https://images.opencollective.com/qltysh/33d157d/logo.png" alt="Qlty Software" height="96"></a> <a href="https://shopify.engineering/"><img src="https://avatars.githubusercontent.com/u/8085" alt="Shopify" height="96"></a></p><h3>Silver Sponsors</h3>
 <p><a href="https://vite.dev/"><img src="https://images.opencollective.com/vite/e6d15e1/logo.png" alt="Vite" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/2d6c3b6/logo.png" alt="Liftoff" height="64"></a> <a href="https://americanexpress.io"><img src="https://avatars.githubusercontent.com/u/3853301" alt="American Express" height="64"></a> <a href="https://stackblitz.com"><img src="https://avatars.githubusercontent.com/u/28635252" alt="StackBlitz" height="64"></a></p><h3>Bronze Sponsors</h3>
-<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104" alt="Nx" height="32"></a> <a href="https://opensource.mercedes-benz.com/"><img src="https://avatars.githubusercontent.com/u/34240465" alt="Mercedes-Benz Group" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="LambdaTest" height="32"></a></p>
+<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://syntax.fm"><img src="https://github.com/syntaxfm.png" alt="Syntax" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://nx.dev"><img src="https://avatars.githubusercontent.com/u/23692104" alt="Nx" height="32"></a> <a href="https://opensource.mercedes-benz.com/"><img src="https://avatars.githubusercontent.com/u/34240465" alt="Mercedes-Benz Group" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="LambdaTest" height="32"></a></p>
 <h3>Technology Sponsors</h3>
 Technology sponsors allow us to use their products and services for free as part of a contribution to the open source ecosystem and our work.
 <p><a href="https://netlify.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/netlify-icon.svg" alt="Netlify" height="32"></a> <a href="https://algolia.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/algolia-icon.svg" alt="Algolia" height="32"></a> <a href="https://1password.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/1password-icon.svg" alt="1Password" height="32"></a></p>

package/bin/eslint.js

@@ -174,8 +174,7 @@ ${getErrorMessage(error)}`;
 	const cli = require("../lib/cli");
 	const exitCode = await cli.execute(
 		process.argv,
-		process.argv.includes("--stdin") ? await readStdin() : null,
-		true,
+		process.argv.includes("--stdin") ? await readStdin() : void 0,
 	);
 
 	/*

package/lib/api.js

@@ -9,8 +9,7 @@
 // Requirements
 //-----------------------------------------------------------------------------
 
-const { ESLint, shouldUseFlatConfig } = require("./eslint/eslint");
-const { LegacyESLint } = require("./eslint/legacy-eslint");
+const { ESLint } = require("./eslint/eslint");
 const { Linter } = require("./linter");
 const { RuleTester } = require("./rule-tester");
 const { SourceCode } = require("./languages/js/source-code");
@@ -21,20 +20,10 @@ const { SourceCode } = require("./languages/js/source-code");
 
 /**
  * Loads the correct ESLint constructor given the options.
- * @param {Object} [options] The options object
- * @param {boolean} [options.useFlatConfig] Whether or not to use a flat config
- * @returns {Promise<ESLint|LegacyESLint>} The ESLint constructor
+ * @returns {Promise<ESLint>} The ESLint constructor
  */
-async function loadESLint({ useFlatConfig } = {}) {
-	/*
-	 * Note: The v8.x version of this function also accepted a `cwd` option, but
-	 * it is not used in this implementation so we silently ignore it.
-	 */
-
-	const shouldESLintUseFlatConfig =
-		useFlatConfig ?? (await shouldUseFlatConfig());
-
-	return shouldESLintUseFlatConfig ? ESLint : LegacyESLint;
+async function loadESLint() {
+	return ESLint;
 }
 
 //-----------------------------------------------------------------------------

package/lib/cli.js

@@ -19,12 +19,7 @@ const fs = require("node:fs"),
 	{ mkdir, stat, writeFile } = require("node:fs/promises"),
 	path = require("node:path"),
 	{ pathToFileURL } = require("node:url"),
-	{ LegacyESLint } = require("./eslint"),
-	{
-		ESLint,
-		shouldUseFlatConfig,
-		locateConfigFileToUse,
-	} = require("./eslint/eslint"),
+	{ ESLint, locateConfigFileToUse } = require("./eslint/eslint"),
 	createCLIOptions = require("./options"),
 	log = require("./shared/logging"),
 	RuntimeInfo = require("./shared/runtime-info"),
@@ -76,7 +71,7 @@ function createOptionsModule(options) {
 	).href;
 	const optionsSrc =
 		`import translateOptions from ${JSON.stringify(translateOptionsFileURL)};\n` +
-		`export default await translateOptions(${JSON.stringify(options)}, "flat");\n`;
+		`export default await translateOptions(${JSON.stringify(options)});\n`;
 
 	// Base64 encoding is typically shorter than URL encoding
 	return new URL(
@@ -199,32 +194,14 @@ const cli = {
 	 * Executes the CLI based on an array of arguments that is passed in.
 	 * @param {string|Array|Object} args The arguments to process.
 	 * @param {string} [text] The text to lint (used for TTY).
-	 * @param {boolean} [allowFlatConfig=true] Whether or not to allow flat config.
 	 * @returns {Promise<number>} The exit code for the operation.
 	 */
-	async execute(args, text, allowFlatConfig = true) {
+	async execute(args, text) {
 		if (Array.isArray(args)) {
 			debug("CLI args: %o", args.slice(2));
 		}
 
-		/*
-		 * Before doing anything, we need to see if we are using a
-		 * flat config file. If so, then we need to change the way command
-		 * line args are parsed. This is temporary, and when we fully
-		 * switch to flat config we can remove this logic.
-		 */
-
-		const usingFlatConfig =
-			allowFlatConfig && (await shouldUseFlatConfig());
-
-		debug("Using flat config?", usingFlatConfig);
-
-		if (allowFlatConfig && !usingFlatConfig) {
-			const { WarningService } = require("./services/warning-service");
-			new WarningService().emitESLintRCWarning();
-		}
-
-		const CLIOptions = createCLIOptions(usingFlatConfig);
+		const CLIOptions = createCLIOptions();
 
 		/** @type {ParsedCLIOptions} */
 		let options;
@@ -233,16 +210,7 @@ const cli = {
 			options = CLIOptions.parse(args);
 			validateConcurrency(options.concurrency);
 		} catch (error) {
-			debug("Error parsing CLI options:", error.message);
-
-			let errorMessage = error.message;
-
-			if (usingFlatConfig) {
-				errorMessage +=
-					"\nYou're using eslint.config.js, some command line flags are no longer available. Please see https://eslint.org/docs/latest/use/command-line-interface for details.";
-			}
-
-			log.error(errorMessage);
+			log.error(error.message);
 			return 2;
 		}
 
@@ -282,9 +250,7 @@ const cli = {
 				return 2;
 			}
 
-			const engine = usingFlatConfig
-				? new ESLint(await translateOptions(options, "flat"))
-				: new LegacyESLint(await translateOptions(options));
+			const engine = new ESLint(await translateOptions(options));
 			const fileConfig = await engine.calculateConfigForFile(
 				options.printConfig,
 			);
@@ -299,7 +265,7 @@ const cli = {
 			);
 
 			try {
-				const flatOptions = await translateOptions(options, "flat");
+				const flatOptions = await translateOptions(options);
 				const spawn = require("cross-spawn");
 				const flags = await cli.calculateInspectConfigFlags(
 					flatOptions.overrideConfigFile,
@@ -349,7 +315,7 @@ const cli = {
 			return 2;
 		}
 
-		if (usingFlatConfig && options.ext) {
+		if (options.ext) {
 			// Passing `--ext ""` results in `options.ext` being an empty array.
 			if (options.ext.length === 0) {
 				log.error("The --ext option value cannot be empty.");
@@ -400,29 +366,21 @@ const cli = {
 			return 2;
 		}
 
-		const ActiveESLint = usingFlatConfig ? ESLint : LegacyESLint;
-
-		/** @type {ESLint|LegacyESLint} */
+		/** @type {ESLint} */
 		let engine;
 
-		if (options.concurrency && options.concurrency !== "off") {
+		if (options.concurrency !== "off") {
 			const optionsURL = createOptionsModule(options);
 			engine = await ESLint.fromOptionsModule(optionsURL);
 		} else {
-			const eslintOptions = await translateOptions(
-				options,
-				usingFlatConfig ? "flat" : "eslintrc",
-			);
-			engine = new ActiveESLint(eslintOptions);
+			const eslintOptions = await translateOptions(options);
+			engine = new ESLint(eslintOptions);
 		}
 		let results;
 
 		if (useStdin) {
 			results = await engine.lintText(text, {
 				filePath: options.stdinFilename,
-
-				// flatConfig respects CLI flag and constructor warnIgnored, eslintrc forces true for backwards compatibility
-				warnIgnored: usingFlatConfig ? void 0 : true,
 			});
 		} else {
 			results = await engine.lintFiles(files);
@@ -430,7 +388,7 @@ const cli = {
 
 		if (options.fix) {
 			debug("Fix mode enabled - applying fixes");
-			await ActiveESLint.outputFixes(results);
+			await ESLint.outputFixes(results);
 		}
 
 		let unusedSuppressions = {};
@@ -489,7 +447,7 @@ const cli = {
 
 		if (options.quiet) {
 			debug("Quiet mode enabled - filtering out warnings");
-			resultsToPrint = ActiveESLint.getErrorResults(resultsToPrint);
+			resultsToPrint = ESLint.getErrorResults(resultsToPrint);
 		}
 
 		const resultCounts = countErrors(results);

package/lib/config/config-loader.js

@@ -147,8 +147,11 @@ async function loadTypeScriptConfigFileWithJiti(filePath, fileURL, mtime) {
 			);
 		});
 
-	// `createJiti` was added in jiti v2.
-	if (typeof createJiti !== "function") {
+	// Ensure the version is at least 2.2.0.
+	const [jitiMajor, jitiMinor] = jitiVersion
+		.split(".")
+		.map(versionPart => Number(versionPart));
+	if (jitiMajor < 2 || (jitiMajor === 2 && jitiMinor < 2)) {
 		throw new Error(
 			"You are using an outdated version of the 'jiti' library. Please update to the latest version of 'jiti' to ensure compatibility and access to the latest features.",
 		);
@@ -162,10 +165,6 @@ async function loadTypeScriptConfigFileWithJiti(filePath, fileURL, mtime) {
 		moduleCache: false,
 	};
 
-	if (jitiVersion.startsWith("2.1.")) {
-		jitiOptions.interopDefault = false;
-	}
-
 	const jiti = createJiti(__filename, jitiOptions);
 	const config = await jiti.import(fileURL.href);
 
@@ -666,151 +665,4 @@ class ConfigLoader {
 	}
 }
 
-/**
- * Encapsulates the loading and caching of configuration files when looking up
- * from the current working directory.
- */
-class LegacyConfigLoader extends ConfigLoader {
-	/**
-	 * The options to use when loading configuration files.
-	 * @type {ConfigLoaderOptions}
-	 */
-	#options;
-
-	/**
-	 * The cached config file path for this instance.
-	 * @type {Promise<{configFilePath:string,basePath:string}|undefined>}
-	 */
-	#configFilePath;
-
-	/**
-	 * The cached config array for this instance.
-	 * @type {FlatConfigArray|Promise<FlatConfigArray>}
-	 */
-	#configArray;
-
-	/**
-	 * Creates a new instance.
-	 * @param {ConfigLoaderOptions} options The options to use when loading configuration files.
-	 */
-	constructor(options) {
-		const normalizedOptions = options.warningService
-			? options
-			: { ...options, warningService: new WarningService() };
-		super(normalizedOptions);
-		this.#options = normalizedOptions;
-	}
-
-	/**
-	 * Determines which config file to use. This is determined by seeing if an
-	 * override config file was specified, and if so, using it; otherwise, as long
-	 * as override config file is not explicitly set to `false`, it will search
-	 * upwards from the cwd for a file named `eslint.config.js`.
-	 * @returns {Promise<{configFilePath:string|undefined,basePath:string}>} Location information for
-	 *      the config file.
-	 */
-	#locateConfigFileToUse() {
-		if (!this.#configFilePath) {
-			this.#configFilePath = ConfigLoader.locateConfigFileToUse({
-				useConfigFile: this.#options.configFile,
-				cwd: this.#options.cwd,
-			});
-		}
-
-		return this.#configFilePath;
-	}
-
-	/**
-	 * Calculates the config array for this run based on inputs.
-	 * @param {string} configFilePath The absolute path to the config file to use if not overridden.
-	 * @param {string} basePath The base path to use for relative paths in the config file.
-	 * @returns {Promise<FlatConfigArray>} The config array for `eslint`.
-	 */
-	async #calculateConfigArray(configFilePath, basePath) {
-		// check for cached version first
-		if (this.#configArray) {
-			return this.#configArray;
-		}
-
-		// ensure `ConfigLoader.calculateConfigArray` is called only once
-		this.#configArray = ConfigLoader.calculateConfigArray(
-			configFilePath,
-			basePath,
-			this.#options,
-		);
-
-		// Unwrap the promise. This is primarily for the sync `getCachedConfigArrayForPath` method.
-		this.#configArray = await this.#configArray;
-
-		return this.#configArray;
-	}
-
-	/**
-	 * Returns the config file path for the given directory. This will either use
-	 * the override config file that was specified in the constructor options or
-	 * search for a config file from the directory of the file being linted.
-	 * @param {string} dirPath The directory path to get the config file path for.
-	 * @returns {Promise<string|undefined>} The config file path or `undefined` if not found.
-	 * @throws {Error} If `fileOrDirPath` is not a non-empty string.
-	 * @throws {Error} If `fileOrDirPath` is not an absolute path.
-	 */
-	async findConfigFileForPath(dirPath) {
-		assertValidFilePath(dirPath);
-
-		const { configFilePath } = await this.#locateConfigFileToUse();
-
-		return configFilePath;
-	}
-
-	/**
-	 * Returns a configuration object for the given file based on the CLI options.
-	 * This is the same logic used by the ESLint CLI executable to determine
-	 * configuration for each file it processes.
-	 * @param {string} dirPath The path of the directory to retrieve config for.
-	 * @returns {Promise<FlatConfigArray>} A configuration object for the file.
-	 */
-	async loadConfigArrayForDirectory(dirPath) {
-		assertValidFilePath(dirPath);
-
-		debug(`[Legacy]: Calculating config for ${dirPath}`);
-
-		const { configFilePath, basePath } =
-			await this.#locateConfigFileToUse();
-
-		debug(
-			`[Legacy]: Using config file ${configFilePath} and base path ${basePath}`,
-		);
-		return this.#calculateConfigArray(configFilePath, basePath);
-	}
-
-	/**
-	 * Returns a configuration array for the given directory based on the CLI options.
-	 * This is a synchronous operation and does not read any files from disk. It's
-	 * intended to be used in locations where we know the config file has already
-	 * been loaded and we just need to get the configuration for a file.
-	 * @param {string} dirPath The path of the directory to retrieve a config object for.
-	 * @returns {FlatConfigArray} A configuration object for the file.
-	 * @throws {Error} If `dirPath` is not a non-empty string.
-	 * @throws {Error} If `dirPath` is not an absolute path.
-	 * @throws {Error} If the config file was not already loaded.
-	 */
-	getCachedConfigArrayForPath(dirPath) {
-		assertValidFilePath(dirPath);
-
-		debug(`[Legacy]: Looking up cached config for ${dirPath}`);
-
-		if (!this.#configArray) {
-			throw new Error(`Could not find config file for ${dirPath}`);
-		}
-
-		if (typeof this.#configArray.then === "function") {
-			throw new Error(
-				`Config array for ${dirPath} has not yet been calculated or an error occurred during the calculation`,
-			);
-		}
-
-		return this.#configArray;
-	}
-}
-
-module.exports = { ConfigLoader, LegacyConfigLoader };
+module.exports = { ConfigLoader };

package/lib/eslint/eslint-helpers.js

@@ -20,7 +20,7 @@ const globParent = require("glob-parent");
 const { Linter } = require("../linter");
 const { getShorthandName } = require("../shared/naming");
 const LintResultCache = require("../cli-engine/lint-result-cache");
-const { ConfigLoader, LegacyConfigLoader } = require("../config/config-loader");
+const { ConfigLoader } = require("../config/config-loader");
 const createDebug = require("debug");
 
 //-----------------------------------------------------------------------------
@@ -247,7 +247,7 @@ async function globMatch({ basePath, pattern }) {
  *      to match.
  * @param {Array<string>} options.rawPatterns An array of glob patterns
  *      as the user inputted them. Used for errors.
- * @param {ConfigLoader|LegacyConfigLoader} options.configLoader The config array to use for
+ * @param {ConfigLoader} options.configLoader The config array to use for
  *      determining what to ignore.
  * @param {boolean} options.errorOnUnmatchedPattern Determines if an error
  *      should be thrown when a pattern is unmatched.
@@ -425,7 +425,7 @@ async function throwErrorForUnmatchedPatterns({
  * @param {Object} options The options for this function.
  * @param {Map<string,GlobSearch>} options.searches
  *      A map of absolute path glob patterns to match.
- * @param {ConfigLoader|LegacyConfigLoader} options.configLoader The config loader to use for
+ * @param {ConfigLoader} options.configLoader The config loader to use for
  *      determining what to ignore.
  * @param {boolean} options.errorOnUnmatchedPattern Determines if an
  *      unmatched glob pattern should throw an error.
@@ -506,7 +506,7 @@ async function globMultiSearch({
  * @param {boolean} args.globInputPaths true to interpret glob patterns,
  *      false to not interpret glob patterns.
  * @param {string} args.cwd The current working directory to find from.
- * @param {ConfigLoader|LegacyConfigLoader} args.configLoader The config loader for the current run.
+ * @param {ConfigLoader} args.configLoader The config loader for the current run.
  * @param {boolean} args.errorOnUnmatchedPattern Determines if an unmatched pattern
  *      should throw an error.
  * @returns {Promise<Array<string>>} The fully resolved file paths.
@@ -708,7 +708,6 @@ function createIgnoreResult(filePath, baseDir, configStatus) {
 				fatal: false,
 				severity: 1,
 				message,
-				nodeType: null,
 			},
 		],
 		suppressedMessages: [],
@@ -1428,9 +1427,7 @@ function createConfigLoader(
 		warningService,
 	};
 
-	return linter.hasFlag("v10_config_lookup_from_file")
-		? new ConfigLoader(configLoaderOptions)
-		: new LegacyConfigLoader(configLoaderOptions);
+	return new ConfigLoader(configLoaderOptions);
 }
 
 //-----------------------------------------------------------------------------

package/lib/eslint/eslint.js

@@ -1347,7 +1347,7 @@ class ESLint {
  * @returns {Promise<boolean>} Whether flat config should be used.
  */
 async function shouldUseFlatConfig() {
-	return process.env.ESLINT_USE_FLAT_CONFIG !== "false";
+	return true;
 }
 
 //------------------------------------------------------------------------------

package/lib/eslint/index.js

@@ -1,9 +1,7 @@
 "use strict";
 
 const { ESLint } = require("./eslint");
-const { LegacyESLint } = require("./legacy-eslint");
 
 module.exports = {
 	ESLint,
-	LegacyESLint,
 };

package/lib/languages/js/source-code/source-code.js

@@ -20,8 +20,7 @@ const { isCommentToken } = require("@eslint-community/eslint-utils"),
 		VisitNodeStep,
 		CallMethodStep,
 		Directive,
-	} = require("@eslint/plugin-kit"),
-	eslintScope = require("eslint-scope");
+	} = require("@eslint/plugin-kit");
 
 //------------------------------------------------------------------------------
 // Type Definitions
@@ -29,6 +28,7 @@ const { isCommentToken } = require("@eslint-community/eslint-utils"),
 
 /** @typedef {import("eslint-scope").Variable} Variable */
 /** @typedef {import("eslint-scope").Scope} Scope */
+/** @typedef {import("eslint-scope").ScopeManager} ScopeManager */
 /** @typedef {import("@eslint/core").SourceCode} ISourceCode */
 /** @typedef {import("@eslint/core").Directive} IDirective */
 /** @typedef {import("@eslint/core").TraversalStep} ITraversalStep */
@@ -264,103 +264,37 @@ function findLineNumberBinarySearch(lineStartIndices, target) {
  * Ensures that variables representing built-in properties of the Global Object,
  * and any globals declared by special block comments, are present in the global
  * scope.
- * @param {Scope} globalScope The global scope.
+ * @param {ScopeManager} scopeManager Scope manager.
  * @param {Object|undefined} configGlobals The globals declared in configuration
  * @param {Object|undefined} inlineGlobals The globals declared in the source code
  * @returns {void}
  */
 function addDeclaredGlobals(
-	globalScope,
-	configGlobals = {},
-	inlineGlobals = {},
+	scopeManager,
+	configGlobals = Object.create(null),
+	inlineGlobals = Object.create(null),
 ) {
-	// Define configured global variables.
-	for (const id of new Set([
-		...Object.keys(configGlobals),
-		...Object.keys(inlineGlobals),
-	])) {
-		/*
-		 * `normalizeConfigGlobal` will throw an error if a configured global value is invalid. However, these errors would
-		 * typically be caught when validating a config anyway (validity for inline global comments is checked separately).
-		 */
-		const configValue =
-			configGlobals[id] === void 0
-				? void 0
-				: normalizeConfigGlobal(configGlobals[id]);
-		const commentValue = inlineGlobals[id] && inlineGlobals[id].value;
-		const value = commentValue || configValue;
-		const sourceComments = inlineGlobals[id] && inlineGlobals[id].comments;
-
-		if (value === "off") {
-			continue;
-		}
-
-		let variable = globalScope.set.get(id);
-
-		if (!variable) {
-			variable = new eslintScope.Variable(id, globalScope);
-
-			globalScope.variables.push(variable);
-			globalScope.set.set(id, variable);
-		}
+	const finalGlobals = { __proto__: null, ...configGlobals };
 
-		variable.eslintImplicitGlobalSetting = configValue;
-		variable.eslintExplicitGlobal = sourceComments !== void 0;
-		variable.eslintExplicitGlobalComments = sourceComments;
-		variable.writeable = value === "writable";
+	for (const [name, data] of Object.entries(inlineGlobals)) {
+		finalGlobals[name] = data.value;
 	}
 
-	/*
-	 * "through" contains all references which definitions cannot be found.
-	 * Since we augment the global scope using configuration, we need to update
-	 * references and remove the ones that were added by configuration.
-	 */
-	globalScope.through = globalScope.through.filter(reference => {
-		const name = reference.identifier.name;
-		const variable = globalScope.set.get(name);
-
-		if (variable) {
-			/*
-			 * Links the variable and the reference.
-			 * And this reference is removed from `Scope#through`.
-			 */
-			reference.resolved = variable;
-			variable.references.push(reference);
+	const names = Object.keys(finalGlobals).filter(
+		name => finalGlobals[name] !== "off",
+	);
 
-			return false;
-		}
+	scopeManager.addGlobals(names);
 
-		return true;
-	});
+	const globalScope = scopeManager.scopes[0];
 
-	/*
-	 * "implicit" contains information about implicit global variables (those created
-	 * implicitly by assigning values to undeclared variables in non-strict code).
-	 * Since we augment the global scope using configuration, we need to remove
-	 * the ones that were added by configuration, as they are either built-in
-	 * or declared elsewhere, therefore not implicit.
-	 * Since the "implicit" property was not documented, first we'll check if it exists
-	 * because it's possible that not all custom scope managers create this property.
-	 * If it exists, we assume it has properties `variables` and `set`. Property
-	 * `left` is considered optional (for example, typescript-eslint's scope manage
-	 * has this property named `leftToBeResolved`).
-	 */
-	const { implicit } = globalScope;
-	if (typeof implicit === "object" && implicit !== null) {
-		implicit.variables = implicit.variables.filter(variable => {
-			const name = variable.name;
-			if (globalScope.set.has(name)) {
-				implicit.set.delete(name);
-				return false;
-			}
-			return true;
-		});
+	for (const name of names) {
+		const variable = globalScope.set.get(name);
 
-		if (implicit.left) {
-			implicit.left = implicit.left.filter(
-				reference => !globalScope.set.has(reference.identifier.name),
-			);
-		}
+		variable.eslintImplicitGlobalSetting = configGlobals[name];
+		variable.eslintExplicitGlobal = !!inlineGlobals[name];
+		variable.eslintExplicitGlobalComments = inlineGlobals[name]?.comments;
+		variable.writeable = finalGlobals[name] === "writable";
 	}
 }
 
@@ -1162,6 +1096,15 @@ class SourceCode extends TokenStore {
 				: void 0,
 			languageOptions.globals,
 		);
+
+		/*
+		 * `normalizeConfigGlobal` will throw an error if a configured global value is invalid. However, these errors would
+		 * typically be caught when validating a config anyway (validity for inline global comments is checked separately).
+		 */
+		for (const [name, value] of Object.entries(configGlobals)) {
+			configGlobals[name] = normalizeConfigGlobal(value);
+		}
+
 		const varsCache = this[caches].get("vars");
 
 		varsCache.set("configGlobals", configGlobals);
@@ -1243,6 +1186,15 @@ class SourceCode extends TokenStore {
 
 					break;
 				}
+				case "eslint-env": {
+					problems.push({
+						ruleId: null,
+						loc: comment.loc,
+						message:
+							"/* eslint-env */ comments are no longer supported.",
+					});
+					break;
+				}
 
 				// no default
 			}
@@ -1273,7 +1225,7 @@ class SourceCode extends TokenStore {
 		const exportedVariables = varsCache.get("exportedVariables");
 		const globalScope = this.scopeManager.scopes[0];
 
-		addDeclaredGlobals(globalScope, configGlobals, inlineGlobals);
+		addDeclaredGlobals(this.scopeManager, configGlobals, inlineGlobals);
 
 		if (exportedVariables) {
 			markExportedVariables(globalScope, exportedVariables);