From 937fc0a30c4b4aa4b25819f65ce624c14af83c7e Mon Sep 17 00:00:00 2001 From: cjihrig Date: Mon, 26 Oct 2020 23:48:35 -0400 Subject: [PATCH] tools: update ESLint to 7.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update ESLint to 7.12.1 PR-URL: https://github.com/nodejs/node/pull/35799 Reviewed-By: Rich Trott Reviewed-By: Juan José Arboleda Reviewed-By: Daijiro Wachi --- tools/node_modules/eslint/README.md | 2 +- .../node_modules/eslint/lib/cli-engine/file-enumerator.js | 6 +++++- .../eslintrc/lib/cascading-config-array-factory.js | 8 +++++--- .../@eslint/eslintrc/lib/shared/config-validator.js | 2 +- .../eslint/node_modules/@eslint/eslintrc/package.json | 2 +- tools/node_modules/eslint/package.json | 4 ++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tools/node_modules/eslint/README.md b/tools/node_modules/eslint/README.md index 2d1b8eafe7955d..2a5084522a4185 100644 --- a/tools/node_modules/eslint/README.md +++ b/tools/node_modules/eslint/README.md @@ -252,7 +252,7 @@ The following companies, organizations, and individuals support ESLint's ongoing

Automattic

Gold Sponsors

Shopify Salesforce Airbnb Microsoft FOSS Fund Sponsorships

Silver Sponsors

Liftoff AMP Project

Bronze Sponsors

-

Writers Per Hour 2021 calendar Buy.Fineproxy.Org Veikkaajat.com Anagram Solver Bugsnag Stability Monitoring Mixpanel VPS Server Icons8: free icons, photos, illustrations, and music Discord ThemeIsle Marfeel Fire Stick Tricks

+

Writers Per Hour 2021 calendar Buy.Fineproxy.Org Veikkaajat.com Anagram Solver Bugsnag Stability Monitoring Mixpanel VPS Server Icons8: free icons, photos, illustrations, and music Discord ThemeIsle Marfeel Fire Stick Tricks

## Technology Sponsors diff --git a/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js b/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js index 446342a1a93293..c2961d71ac0632 100644 --- a/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js +++ b/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js @@ -213,7 +213,11 @@ class FileEnumerator { */ constructor({ cwd = process.cwd(), - configArrayFactory = new CascadingConfigArrayFactory({ cwd }), + configArrayFactory = new CascadingConfigArrayFactory({ + cwd, + eslintRecommendedPath: path.resolve(__dirname, "../../conf/eslint-recommended.js"), + eslintAllPath: path.resolve(__dirname, "../../conf/eslint-all.js") + }), extensions = null, globInputPaths = true, errorOnUnmatchedPattern = true, 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 5f0da057e96a51..147c4d1e151d6c 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 @@ -255,7 +255,8 @@ class CascadingConfigArrayFactory { ignorePath, rulePaths, specificConfigPath, - useEslintrc + useEslintrc, + builtInRules }); } @@ -438,7 +439,8 @@ class CascadingConfigArrayFactory { cliConfigArray, configArrayFactory, finalizeCache, - useEslintrc + useEslintrc, + builtInRules } = internalSlotsMap.get(this); let finalConfigArray = finalizeCache.get(configArray); @@ -484,7 +486,7 @@ class CascadingConfigArrayFactory { // Validate rule settings and environments. const validator = new ConfigValidator({ - builtInRules: configArrayFactory.builtInRules + builtInRules }); validator.validateConfigArray(finalConfigArray); 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 d3c70012788c61..dbc6f3f389e800 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 @@ -265,7 +265,7 @@ module.exports = class ConfigValidator { * @returns {void} */ validateConfigSchema(config, source = null) { - validateSchema = this.validateSchema || ajv.compile(configSchema); + validateSchema = validateSchema || ajv.compile(configSchema); if (!validateSchema(config)) { throw new Error(`ESLint configuration in ${source} is invalid:\n${this.formatErrors(validateSchema.errors)}`); 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 106b9b07d22edc..425193aa3971ae 100644 --- a/tools/node_modules/eslint/node_modules/@eslint/eslintrc/package.json +++ b/tools/node_modules/eslint/node_modules/@eslint/eslintrc/package.json @@ -62,5 +62,5 @@ "publish-release": "eslint-publish-release", "test": "mocha -R progress -c tests/lib/shared" }, - "version": "0.2.0" + "version": "0.2.1" } \ No newline at end of file diff --git a/tools/node_modules/eslint/package.json b/tools/node_modules/eslint/package.json index 8e0da149b15ead..304b3060c226c9 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.2.0", + "@eslint/eslintrc": "^0.2.1", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -155,5 +155,5 @@ "test:cli": "mocha", "webpack": "node Makefile.js webpack" }, - "version": "7.12.0" + "version": "7.12.1" } \ No newline at end of file