From 14c089b50e3163dc2fd13cec718d219183744709 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Mon, 18 Feb 2019 12:23:02 -0500
Subject: [PATCH] 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>
---
 tools/node_modules/eslint/lib/rules/sort-keys.js | 6 ++++--
 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 08bfcdf3d83..fd5dd8a13bc 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 316fa200c45..6712e948440 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