summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2020-09-01 16:41:32 -0400
committercjihrig <cjihrig@gmail.com>2020-09-03 11:18:48 -0400
commitd0ee7d66bcd4c59baa2d87043688c08074586bb4 (patch)
tree4766c3700d1b941772de25906483c8f14fecce85 /tools
parent385ae17b4d4a976aae8283398f58ec9811909117 (diff)
downloadnode-new-d0ee7d66bcd4c59baa2d87043688c08074586bb4.tar.gz
tools: update ESLint to 7.8.1
Update ESLint to 7.8.1 PR-URL: https://github.com/nodejs/node/pull/35004 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/node_modules/eslint/README.md4
-rw-r--r--tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/environments.js2
-rw-r--r--tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/eslint-all.js1
-rw-r--r--tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/cascading-config-array-factory.js1
-rw-r--r--tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/config-array-factory.js1
-rw-r--r--tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/index.js3
-rw-r--r--tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/shared/config-validator.js9
-rw-r--r--tools/node_modules/eslint/node_modules/@eslint/eslintrc/package.json16
-rw-r--r--tools/node_modules/eslint/package.json4
9 files changed, 27 insertions, 14 deletions
diff --git a/tools/node_modules/eslint/README.md b/tools/node_modules/eslint/README.md
index 963eeedfd1..73abcfe0d1 100644
--- a/tools/node_modules/eslint/README.md
+++ b/tools/node_modules/eslint/README.md
@@ -265,8 +265,8 @@ The following companies, organizations, and individuals support ESLint's ongoing
<!--sponsorsstart-->
<h3>Gold Sponsors</h3>
<p><a href="https://www.salesforce.com"><img src="https://images.opencollective.com/salesforce/ca8f997/logo.png" alt="Salesforce" height="96"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="96"></a> <a href="https://aka.ms/microsoftfossfund"><img src="https://avatars1.githubusercontent.com/u/67931232?u=7fddc652a464d7151b97e8f108392af7d54fa3e8&v=4" alt="Microsoft FOSS Fund Sponsorships" height="96"></a></p><h3>Silver Sponsors</h3>
-<p><a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://www.ampproject.org/"><img src="https://images.opencollective.com/amp/c8a3b25/logo.png" alt="AMP Project" height="64"></a> <a href="https://eslint.org/"><img src="https://images.opencollective.com/eslint/96b09dc/logo.png" alt="ESLint" height="64"></a> <a href="https://eslint.org/"><img src="https://images.opencollective.com/eslint/96b09dc/logo.png" alt="ESLint" height="64"></a></p><h3>Bronze Sponsors</h3>
-<p><a href="https://vpn-review.com/netflix-vpn"><img src="https://images.opencollective.com/vpn-for-netflix/4887627/logo.png" alt="vpn for netflix" height="32"></a> <a href="https://www.veikkaajat.com"><img src="https://images.opencollective.com/veikkaajat/b92b427/logo.png" alt="Veikkaajat.com" height="32"></a> <a href="https://www.nettikasinot.media/"><img src="https://images.opencollective.com/nettikasinot-media/2dba7da/logo.png" alt="Nettikasinot.media" height="32"></a> <a href="https://mytruemedia.com/"><img src="https://images.opencollective.com/my-true-media/03e2168/logo.png" alt="My True Media" height="32"></a> <a href="https://www.norgekasino.com"><img src="https://images.opencollective.com/norgekasino/ecfd57a/logo.png" alt="Norgekasino" height="32"></a> <a href="https://www.japanesecasino.com/"><img src="https://images.opencollective.com/japanesecasino/b0ffe3c/logo.png" alt="Japanesecasino" height="32"></a> <a href="https://bruce.agency"><img src="https://images.opencollective.com/brucemade/0c70c59/logo.png" alt="Bruce" height="32"></a> <a href="https://www.casinotop.com/"><img src="https://images.opencollective.com/casinotop-com/10fd95b/logo.png" alt="CasinoTop.com" height="32"></a> <a href="https://www.casinotopp.net/"><img src="https://images.opencollective.com/casino-topp/1dd399a/logo.png" alt="Casino Topp" height="32"></a> <a href="https://writersperhour.com/write-my-essay"><img src="https://images.opencollective.com/writersperhour/5787d4b/logo.png" alt="Writers Per Hour" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://www.kasinot.fi"><img src="https://images.opencollective.com/kasinot-fi/e09aa2e/logo.png" alt="Kasinot.fi" height="32"></a> <a href="https://www.pelisivut.com"><img src="https://images.opencollective.com/pelisivut/04f08f2/logo.png" alt="Pelisivut" height="32"></a> <a href="https://www.nettikasinot.org"><img src="https://images.opencollective.com/nettikasinot-org/53a4b44/logo.png" alt="Nettikasinot.org" height="32"></a> <a href="https://www.bonus.com.de/freispiele"><img src="https://images.opencollective.com/bonusfinder-deutschland/646169e/logo.png" alt="BonusFinder Deutschland" height="32"></a> <a href="null"><img src="https://images.opencollective.com/bugsnag-stability-monitoring/c2cef36/logo.png" alt="Bugsnag Stability Monitoring" height="32"></a> <a href="https://mixpanel.com"><img src="https://images.opencollective.com/mixpanel/cd682f7/logo.png" alt="Mixpanel" height="32"></a> <a href="https://www.vpsserver.com"><img src="https://images.opencollective.com/vpsservercom/logo.png" alt="VPS Server" height="32"></a> <a href="https://icons8.com"><img src="https://images.opencollective.com/icons8/6e889f6/logo.png" alt="Icons8: free icons, photos, illustrations, and music" height="32"></a> <a href="https://discordapp.com"><img src="https://images.opencollective.com/discordapp/7e3d9a9/logo.png" alt="Discord" height="32"></a> <a href="https://themeisle.com"><img src="https://images.opencollective.com/themeisle/d5592fe/logo.png" alt="ThemeIsle" height="32"></a> <a href="https://www.marfeel.com/"><img src="https://images.opencollective.com/marfeel/4b88e30/logo.png" alt="Marfeel" height="32"></a> <a href="https://www.firesticktricks.com"><img src="https://images.opencollective.com/fire-stick-tricks/b8fbe2c/logo.png" alt="Fire Stick Tricks" height="32"></a></p>
+<p><a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://www.ampproject.org/"><img src="https://images.opencollective.com/amp/c8a3b25/logo.png" alt="AMP Project" height="64"></a></p><h3>Bronze Sponsors</h3>
+<p><a href="https://www.veikkaajat.com"><img src="https://images.opencollective.com/veikkaajat/b92b427/logo.png" alt="Veikkaajat.com" height="32"></a> <a href="https://www.nettikasinot.media/"><img src="https://images.opencollective.com/nettikasinot-media/2dba7da/logo.png" alt="Nettikasinot.media" height="32"></a> <a href="https://mytruemedia.com/"><img src="https://images.opencollective.com/my-true-media/03e2168/logo.png" alt="My True Media" height="32"></a> <a href="https://www.norgekasino.com"><img src="https://images.opencollective.com/norgekasino/ecfd57a/logo.png" alt="Norgekasino" height="32"></a> <a href="https://www.japanesecasino.com/"><img src="https://images.opencollective.com/japanesecasino/b0ffe3c/logo.png" alt="Japanesecasino" height="32"></a> <a href="https://www.casinotop.com/"><img src="https://images.opencollective.com/casinotop-com/10fd95b/logo.png" alt="CasinoTop.com" height="32"></a> <a href="https://www.casinotopp.net/"><img src="https://images.opencollective.com/casino-topp/1dd399a/logo.png" alt="Casino Topp" height="32"></a> <a href="https://writersperhour.com/write-my-essay"><img src="https://images.opencollective.com/writersperhour/5787d4b/logo.png" alt="Writers Per Hour" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="https://www.kasinot.fi"><img src="https://images.opencollective.com/kasinot-fi/e09aa2e/logo.png" alt="Kasinot.fi" height="32"></a> <a href="https://www.pelisivut.com"><img src="https://images.opencollective.com/pelisivut/04f08f2/logo.png" alt="Pelisivut" height="32"></a> <a href="https://www.nettikasinot.org"><img src="https://images.opencollective.com/nettikasinot-org/53a4b44/logo.png" alt="Nettikasinot.org" height="32"></a> <a href="https://www.bonus.com.de/freispiele"><img src="https://images.opencollective.com/bonusfinder-deutschland/646169e/logo.png" alt="BonusFinder Deutschland" height="32"></a> <a href="null"><img src="https://images.opencollective.com/bugsnag-stability-monitoring/c2cef36/logo.png" alt="Bugsnag Stability Monitoring" height="32"></a> <a href="https://mixpanel.com"><img src="https://images.opencollective.com/mixpanel/cd682f7/logo.png" alt="Mixpanel" height="32"></a> <a href="https://www.vpsserver.com"><img src="https://images.opencollective.com/vpsservercom/logo.png" alt="VPS Server" height="32"></a> <a href="https://icons8.com"><img src="https://images.opencollective.com/icons8/6e889f6/logo.png" alt="Icons8: free icons, photos, illustrations, and music" height="32"></a> <a href="https://discordapp.com"><img src="https://images.opencollective.com/discordapp/7e3d9a9/logo.png" alt="Discord" height="32"></a> <a href="https://themeisle.com"><img src="https://images.opencollective.com/themeisle/d5592fe/logo.png" alt="ThemeIsle" height="32"></a> <a href="https://www.marfeel.com/"><img src="https://images.opencollective.com/marfeel/4b88e30/logo.png" alt="Marfeel" height="32"></a></p>
<!--sponsorsend-->
## <a name="technology-sponsors"></a>Technology Sponsors
diff --git a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/environments.js b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/environments.js
index ada09c8c9b..d3237c7256 100644
--- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/environments.js
+++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/environments.js
@@ -90,7 +90,7 @@ module.exports = new Map(Object.entries({
ecmaVersion: 12
}
},
-
+
// Platforms
browser: {
globals: globals.browser
diff --git a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/eslint-all.js b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/eslint-all.js
index 10c5304fd3..cdd8a3e471 100644
--- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/eslint-all.js
+++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/conf/eslint-all.js
@@ -9,6 +9,7 @@
// Requirements
//------------------------------------------------------------------------------
+// FIXME: "../lib/rules" doesn't exist in this package
const builtInRules = require("../lib/rules");
//------------------------------------------------------------------------------
diff --git a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/cascading-config-array-factory.js b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/cascading-config-array-factory.js
index 480496ecba..a6933964e9 100644
--- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/cascading-config-array-factory.js
+++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/cascading-config-array-factory.js
@@ -471,6 +471,7 @@ class CascadingConfigArrayFactory {
const validator = new ConfigValidator({
builtInRules: configArrayFactory.builtInRules
});
+
validator.validateConfigArray(finalConfigArray);
// Cache it.
diff --git a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/config-array-factory.js b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/config-array-factory.js
index 367e5b8068..97f8b5cb2d 100644
--- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/config-array-factory.js
+++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/config-array-factory.js
@@ -628,6 +628,7 @@ class ConfigArrayFactory {
*/
_normalizeConfigData(configData, ctx) {
const validator = new ConfigValidator();
+
validator.validateConfigSchema(configData, ctx.name || ctx.filePath);
return this._normalizeObjectConfigData(configData, ctx);
}
diff --git a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/index.js b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/index.js
index 54a2697b3a..90959c16e8 100644
--- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/index.js
+++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/index.js
@@ -31,11 +31,10 @@ const naming = require("./shared/naming");
module.exports = {
Legacy: {
- // config-array
ConfigArray,
createConfigArrayFactoryContext,
CascadingConfigArrayFactory,
- ConfigArray,
+ ConfigArrayFactory,
ConfigDependency,
ExtractedConfig,
IgnorePattern,
diff --git a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/shared/config-validator.js b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/shared/config-validator.js
index 873e6d3305..d3c7001278 100644
--- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/shared/config-validator.js
+++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/lib/shared/config-validator.js
@@ -13,7 +13,6 @@ const
util = require("util"),
configSchema = require("../../conf/config-schema"),
BuiltInEnvironments = require("../../conf/environments"),
- // BuiltInRules = require("../rules"),
ConfigOps = require("./config-ops"),
{ emitDeprecationWarning } = require("./deprecation-warnings");
@@ -38,7 +37,7 @@ const validated = new WeakSet();
//-----------------------------------------------------------------------------
module.exports = class ConfigValidator {
- constructor({builtInRules = new Map()} = {}) {
+ constructor({ builtInRules = new Map() } = {}) {
this.builtInRules = builtInRules;
}
@@ -266,10 +265,10 @@ module.exports = class ConfigValidator {
* @returns {void}
*/
validateConfigSchema(config, source = null) {
- const validateSchema = this.validateSchema || ajv.compile(configSchema);
+ validateSchema = this.validateSchema || ajv.compile(configSchema);
if (!validateSchema(config)) {
- throw new Error(`ESLint configuration in ${source} is invalid:\n${formatErrors(validateSchema.errors)}`);
+ throw new Error(`ESLint configuration in ${source} is invalid:\n${this.formatErrors(validateSchema.errors)}`);
}
if (Object.hasOwnProperty.call(config, "ecmaFeatures")) {
@@ -322,4 +321,4 @@ module.exports = class ConfigValidator {
}
}
-}
+};
diff --git a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/package.json b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/package.json
index 0da4093568..da4e526248 100644
--- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/package.json
+++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/package.json
@@ -9,7 +9,13 @@
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.1.1",
+ "espree": "^7.3.0",
+ "globals": "^12.1.0",
+ "ignore": "^4.0.6",
"import-fresh": "^3.2.1",
+ "js-yaml": "^3.13.1",
+ "lodash": "^4.17.19",
+ "minimatch": "^3.0.4",
"strip-json-comments": "^3.1.1"
},
"deprecated": false,
@@ -18,9 +24,14 @@
"chai": "^4.2.0",
"eslint": "^7.7.0",
"eslint-config-eslint": "^6.0.0",
- "eslint-release": "^3.1.0",
+ "eslint-plugin-jsdoc": "^22.1.0",
+ "eslint-plugin-node": "^11.1.0",
+ "eslint-release": "^3.1.2",
"mocha": "^8.1.1"
},
+ "engines": {
+ "node": "^10.12.0 || >=12.0.0"
+ },
"files": [
"lib",
"conf",
@@ -47,8 +58,9 @@
"generate-betarelease": "eslint-generate-prerelease beta",
"generate-rcrelease": "eslint-generate-prerelease rc",
"generate-release": "eslint-generate-release",
+ "lint": "eslint .",
"publish-release": "eslint-publish-release",
"test": "mocha tests/lib/shared"
},
- "version": "0.1.0"
+ "version": "0.1.3"
} \ No newline at end of file
diff --git a/tools/node_modules/eslint/package.json b/tools/node_modules/eslint/package.json
index 57d67e647c..c38c46e66a 100644
--- a/tools/node_modules/eslint/package.json
+++ b/tools/node_modules/eslint/package.json
@@ -12,7 +12,7 @@
"bundleDependencies": false,
"dependencies": {
"@babel/code-frame": "^7.0.0",
- "@eslint/eslintrc": "^0.1.0",
+ "@eslint/eslintrc": "^0.1.3",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
@@ -153,5 +153,5 @@
"test:cli": "mocha",
"webpack": "node Makefile.js webpack"
},
- "version": "7.8.0"
+ "version": "7.8.1"
} \ No newline at end of file