summaryrefslogtreecommitdiff
path: root/tools/node_modules/eslint/lib/cli-engine/config-array
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2019-10-25 12:48:14 -0700
committercjihrig <cjihrig@gmail.com>2019-10-28 09:51:24 -0400
commit511f67bcb42b59c9a3a3efab8fed578db100afe1 (patch)
tree8b64f390dd727dd739fd2fb84d69df3c829a9315 /tools/node_modules/eslint/lib/cli-engine/config-array
parentb35181f877d5a92e8bb52eb071489f2a7d87494b (diff)
downloadandroid-node-v8-511f67bcb42b59c9a3a3efab8fed578db100afe1.tar.gz
android-node-v8-511f67bcb42b59c9a3a3efab8fed578db100afe1.tar.bz2
android-node-v8-511f67bcb42b59c9a3a3efab8fed578db100afe1.zip
tools: update ESLint to 6.6.0
Update ESLint to 6.6.0 PR-URL: https://github.com/nodejs/node/pull/30123 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'tools/node_modules/eslint/lib/cli-engine/config-array')
-rw-r--r--tools/node_modules/eslint/lib/cli-engine/config-array/config-array.js4
-rw-r--r--tools/node_modules/eslint/lib/cli-engine/config-array/config-dependency.js2
-rw-r--r--tools/node_modules/eslint/lib/cli-engine/config-array/override-tester.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/node_modules/eslint/lib/cli-engine/config-array/config-array.js b/tools/node_modules/eslint/lib/cli-engine/config-array/config-array.js
index 6383c02115..089ff305a2 100644
--- a/tools/node_modules/eslint/lib/cli-engine/config-array/config-array.js
+++ b/tools/node_modules/eslint/lib/cli-engine/config-array/config-array.js
@@ -126,7 +126,6 @@ function isNonNullObject(x) {
*
* Assign every property values of `y` to `x` if `x` doesn't have the property.
* If `x`'s property value is an object, it does recursive.
- *
* @param {Object} target The destination to merge
* @param {Object|undefined} source The source to merge.
* @returns {void}
@@ -157,7 +156,6 @@ function mergeWithoutOverwrite(target, source) {
/**
* Merge plugins.
* `target`'s definition is prior to `source`'s.
- *
* @param {Record<string, DependentPlugin>} target The destination to merge
* @param {Record<string, DependentPlugin>|undefined} source The source to merge.
* @returns {void}
@@ -187,7 +185,6 @@ function mergePlugins(target, source) {
/**
* Merge rule configs.
* `target`'s definition is prior to `source`'s.
- *
* @param {Record<string, Array>} target The destination to merge
* @param {Record<string, RuleConf>|undefined} source The source to merge.
* @returns {void}
@@ -382,7 +379,6 @@ function ensurePluginMemberMaps(instance) {
* You need to call `ConfigArray#extractConfig(filePath)` method in order to
* extract, merge and get only the config data which is related to an arbitrary
* file.
- *
* @extends {Array<ConfigArrayElement>}
*/
class ConfigArray extends Array {
diff --git a/tools/node_modules/eslint/lib/cli-engine/config-array/config-dependency.js b/tools/node_modules/eslint/lib/cli-engine/config-array/config-dependency.js
index 8db9ff00c5..0d5f6f7139 100644
--- a/tools/node_modules/eslint/lib/cli-engine/config-array/config-dependency.js
+++ b/tools/node_modules/eslint/lib/cli-engine/config-array/config-dependency.js
@@ -81,6 +81,7 @@ class ConfigDependency {
this.importerPath = importerPath;
}
+ // eslint-disable-next-line jsdoc/require-description
/**
* @returns {Object} a JSON compatible object.
*/
@@ -95,6 +96,7 @@ class ConfigDependency {
return obj;
}
+ // eslint-disable-next-line jsdoc/require-description
/**
* @returns {Object} an object to display by `console.log()`.
*/
diff --git a/tools/node_modules/eslint/lib/cli-engine/config-array/override-tester.js b/tools/node_modules/eslint/lib/cli-engine/config-array/override-tester.js
index d6695423e2..67c8a6ed8a 100644
--- a/tools/node_modules/eslint/lib/cli-engine/config-array/override-tester.js
+++ b/tools/node_modules/eslint/lib/cli-engine/config-array/override-tester.js
@@ -166,6 +166,7 @@ class OverrideTester {
));
}
+ // eslint-disable-next-line jsdoc/require-description
/**
* @returns {Object} a JSON compatible object.
*/
@@ -182,6 +183,7 @@ class OverrideTester {
};
}
+ // eslint-disable-next-line jsdoc/require-description
/**
* @returns {Object} an object to display by `console.log()`.
*/