From 60173771e840295db7ef6d0ff82f43d8e97cb483 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2019 07:16:36 +0000
Subject: [PATCH 1/2] Bump eslint-config-airbnb-base from 13.2.0 to 14.0.0

Bumps [eslint-config-airbnb-base](https://github.com/airbnb/javascript) from 13.2.0 to 14.0.0.
- [Release notes](https://github.com/airbnb/javascript/releases)
- [Commits](https://github.com/airbnb/javascript/compare/eslint-config-airbnb-base-v13.2.0...eslint-config-airbnb-base-v14.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 18db68c50..4af7a5fa1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1590,9 +1590,9 @@
       }
     },
     "confusing-browser-globals": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.7.tgz",
-      "integrity": "sha512-cgHI1azax5ATrZ8rJ+ODDML9Fvu67PimB6aNxBrc/QwSaDaM9eTfIEUHx3bBLJJ82ioSb+/5zfsMCCEJax3ByQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz",
+      "integrity": "sha512-lI7asCibVJ6Qd3FGU7mu4sfG4try4LX3+GVS+Gv8UlrEf2AeW57piecapnog2UHZSbcX/P/1UDWVaTsblowlZg==",
       "dev": true
     },
     "contains-path": {
@@ -2398,12 +2398,12 @@
       }
     },
     "eslint-config-airbnb-base": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz",
-      "integrity": "sha512-1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz",
+      "integrity": "sha512-2IDHobw97upExLmsebhtfoD3NAKhV4H0CJWP3Uprd/uk+cHuWYOczPVxQ8PxLFUAw7o3Th1RAU8u1DoUpr+cMA==",
       "dev": true,
       "requires": {
-        "confusing-browser-globals": "^1.0.5",
+        "confusing-browser-globals": "^1.0.7",
         "object.assign": "^4.1.0",
         "object.entries": "^1.1.0"
       }
diff --git a/package.json b/package.json
index 3998ca5be..c92abefd0 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
+    "eslint-config-airbnb-base": "^14.0.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-import": "^2.11.0",
     "jest": "^24.7.1",

From 98b4c11c61606b0458f51f5560cff9d62062de2a Mon Sep 17 00:00:00 2001
From: Jon Ursenbach <jon@ursenba.ch>
Date: Tue, 13 Aug 2019 10:35:05 -0700
Subject: [PATCH 2/2] Resolving ESLint issues.

---
 cli.js          | 2 +-
 cmds/swagger.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli.js b/cli.js
index 911dff701..ed111800b 100644
--- a/cli.js
+++ b/cli.js
@@ -107,7 +107,7 @@ module.exports = processArgv => {
       cmdArgv = cliArgs(bin.args, { partial: true, argv: processArgv.slice(1) });
     }
 
-    cmdArgv = Object.assign({}, { key: configStore.get('apiKey') }, cmdArgv);
+    cmdArgv = { key: configStore.get('apiKey'), ...cmdArgv };
 
     return bin.run(cmdArgv);
   } catch (e) {
diff --git a/cmds/swagger.js b/cmds/swagger.js
index 5a5b00e07..09e78ab49 100644
--- a/cmds/swagger.js
+++ b/cmds/swagger.js
@@ -151,7 +151,7 @@ exports.run = async function(opts) {
 
   // If the user didn't supply a specification, let's try to locate what they've got, and upload
   // that. If they don't have any, let's let the user know how they can get one going.
-  return new Promise(async (resolve, reject) => {
+  return new Promise((resolve, reject) => {
     ['swagger.json', 'swagger.yaml', 'openapi.json', 'openapi.yaml'].forEach(file => {
       if (!fs.existsSync(file)) {
         return;