diff options
| author | cjihrig <cjihrig@gmail.com> | 2019-02-18 12:23:02 -0500 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2019-02-20 12:25:10 -0500 |
| commit | 14c089b50e3163dc2fd13cec718d219183744709 (patch) | |
| tree | 54870c5415043209912108709aca227fdb3a9848 /tools/node_modules/eslint | |
| parent | cfcbfc001150e088b489b1fb3de50d516f4e3c65 (diff) | |
| download | android-node-v8-14c089b50e3163dc2fd13cec718d219183744709.tar.gz android-node-v8-14c089b50e3163dc2fd13cec718d219183744709.tar.bz2 android-node-v8-14c089b50e3163dc2fd13cec718d219183744709.zip | |
tools: update ESLint to 5.14.1
Update ESLint to 5.14.1
PR-URL: https://github.com/nodejs/node/pull/26190
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'tools/node_modules/eslint')
| -rw-r--r-- | tools/node_modules/eslint/lib/rules/sort-keys.js | 6 | ||||
| -rw-r--r-- | tools/node_modules/eslint/package.json | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/node_modules/eslint/lib/rules/sort-keys.js b/tools/node_modules/eslint/lib/rules/sort-keys.js index 08bfcdf3d8..fd5dd8a13b 100644 --- a/tools/node_modules/eslint/lib/rules/sort-keys.js +++ b/tools/node_modules/eslint/lib/rules/sort-keys.js @@ -129,8 +129,10 @@ module.exports = { stack = stack.upper; }, - SpreadElement() { - stack.prevName = null; + SpreadElement(node) { + if (node.parent.type === "ObjectExpression") { + stack.prevName = null; + } }, Property(node) { diff --git a/tools/node_modules/eslint/package.json b/tools/node_modules/eslint/package.json index 316fa200c4..6712e94844 100644 --- a/tools/node_modules/eslint/package.json +++ b/tools/node_modules/eslint/package.json @@ -134,5 +134,5 @@ "publish-release": "node Makefile.js publishRelease", "test": "node Makefile.js test" }, - "version": "5.14.0" + "version": "5.14.1" }
\ No newline at end of file |