Update eslint-config-airbnb-base (major)

Rick Bergfalk · Rick Bergfalk · commit a4fcf98b5e4f · 2019-10-09T00:30:14.000-05:00
diff --git a/server/drivers/cassandra/test.js b/server/drivers/cassandra/test.js
@@ -52,7 +52,7 @@ describe('drivers/cassandra', function() {
   });
 
   it('runQuery over limit', async function() {
-    const limitedConnection = Object.assign({}, connection, { maxRows: 2 });
+    const limitedConnection = { ...connection, maxRows: 2 };
     const results = await cassandra.runQuery(
       'SELECT * FROM test.test;',
       limitedConnection
diff --git a/server/drivers/crate/test.js b/server/drivers/crate/test.js
@@ -52,7 +52,7 @@ describe('drivers/crate', function() {
   });
 
   it('runQuery over limit', function() {
-    const limitedConnection = Object.assign({}, connection, { maxRows: 2 });
+    const limitedConnection = { ...connection, maxRows: 2 };
     return crate
       .runQuery('SELECT * FROM test;', limitedConnection)
       .then(results => {
diff --git a/server/drivers/hdb/test.js b/server/drivers/hdb/test.js
@@ -59,7 +59,7 @@ describe('drivers/hdb', function() {
   });
 
   it('runQuery over limit', function() {
-    const limitedConnection = Object.assign({}, connection, { maxRows: 2 });
+    const limitedConnection = { ...connection, maxRows: 2 };
     return hdb
       .runQuery('SELECT * FROM test;', limitedConnection)
       .then(results => {
diff --git a/server/drivers/mock/index.js b/server/drivers/mock/index.js
@@ -73,7 +73,7 @@ function cartesianify(rows, field) {
   } else {
     rows.forEach(row => {
       field.values.forEach(value => {
-        const newRow = Object.assign({}, row, { [field.name]: value });
+        const newRow = { ...row, [field.name]: value };
         newRows.push(newRow);
       });
     });
diff --git a/server/drivers/mock/test.js b/server/drivers/mock/test.js
@@ -25,7 +25,7 @@ describe('drivers/mock', function() {
   });
 
   it('runQuery under limit', function() {
-    const c = Object.assign({}, connection, { maxRows: 10000 });
+    const c = { ...connection, maxRows: 10000 };
     const query = `
       -- dimensions = product 5
     `;
@@ -36,7 +36,7 @@ describe('drivers/mock', function() {
   });
 
   it('runQuery over limit', function() {
-    const c = Object.assign({}, connection, { maxRows: 10 });
+    const c = { ...connection, maxRows: 10 };
     const query = `
       -- dimensions = product 10, color 10, orderdate 500
     `;
diff --git a/server/drivers/mysql/test.js b/server/drivers/mysql/test.js
@@ -51,7 +51,7 @@ describe('drivers/mysql', function() {
   });
 
   it('runQuery over limit', function() {
-    const limitedConnection = Object.assign({}, connection, { maxRows: 2 });
+    const limitedConnection = { ...connection, maxRows: 2 };
     return mysql
       .runQuery('SELECT * FROM test;', limitedConnection)
       .then(results => {
diff --git a/server/drivers/presto/test.js b/server/drivers/presto/test.js
@@ -72,7 +72,7 @@ describe('drivers/presto', function() {
   });
 
   it('runQuery over limit', function() {
-    const limitedConnection = Object.assign({}, connection, { maxRows: 2 });
+    const limitedConnection = { ...connection, maxRows: 2 };
     return presto
       .runQuery('SELECT * FROM test LIMIT 10', limitedConnection)
       .then(results => {
diff --git a/server/drivers/vertica/test.js b/server/drivers/vertica/test.js
@@ -55,7 +55,7 @@ describe('drivers/vertica', function() {
   });
 
   it('runQuery over limit', function() {
-    const limitedConnection = Object.assign({}, connection, { maxRows: 2 });
+    const limitedConnection = { ...connection, maxRows: 2 };
     return vertica
       .runQuery('SELECT * FROM test;', limitedConnection)
       .then(results => {
diff --git a/server/lib/config/index.js b/server/lib/config/index.js
@@ -18,7 +18,7 @@ if (warnings.length) {
   warnings.forEach(warning => console.warn(warning));
 }
 
-const all = Object.assign({}, defaultConfig, envConfig, fileConfig, cliConfig);
+const all = { ...defaultConfig, ...envConfig, ...fileConfig, ...cliConfig };
 
 // Clean string boolean values
 Object.keys(all).forEach(key => {
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -85,7 +85,7 @@
   },
   "devDependencies": {
     "eslint": "^6.5.1",
-    "eslint-config-airbnb-base": "^13.1.0",
+    "eslint-config-airbnb-base": "^14.0.0",
     "eslint-config-prettier": "^6.4.0",
     "eslint-plugin-import": "^2.18.0",
     "eslint-plugin-prettier": "^3.1.1",

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ if (warnings.length) {`
`18`	`18`	`warnings.forEach(warning => console.warn(warning));`
`19`	`19`	`}`
`20`	`20`
`21`		`-const all = Object.assign({}, defaultConfig, envConfig, fileConfig, cliConfig);`
	`21`	`+const all = { ...defaultConfig, ...envConfig, ...fileConfig, ...cliConfig };`
`22`	`22`
`23`	`23`	`// Clean string boolean values`
`24`	`24`	`Object.keys(all).forEach(key => {`