Upgrade xo to 0.23.0

package.json

@@ -48,7 +48,7 @@
 		"pify": "^4.0.0",
 		"sqlite3": "^4.0.2",
 		"this": "^1.0.2",
-		"xo": "^0.22.0"
+		"xo": "^0.23.0"
 	},
 	"xo": {
 		"extends": "xo-lukechilds"

src/index.js

@@ -41,6 +41,7 @@ class CacheableRequest {
 					'';
 				url = normalizeUrlObject({ ...opts, pathname, search });
 			}
+
 			opts = {
 				headers: {},
 				method: 'GET',
@@ -128,16 +129,16 @@ class CacheableRequest {
 								}
 
 								await this.cache.set(key, value, ttl);
-							} catch (err) {
-								ee.emit('error', new CacheableRequest.CacheError(err));
+							} catch (error) {
+								ee.emit('error', new CacheableRequest.CacheError(error));
 							}
 						})();
 					} else if (opts.cache && revalidate) {
 						(async () => {
 							try {
 								await this.cache.delete(key);
-							} catch (err) {
-								ee.emit('error', new CacheableRequest.CacheError(err));
+							} catch (error) {
+								ee.emit('error', new CacheableRequest.CacheError(error));
 							}
 						})();
 					}
@@ -153,8 +154,8 @@ class CacheableRequest {
 					req.once('error', requestErrorCallback);
 					req.once('abort', requestErrorCallback);
 					ee.emit('request', req);
-				} catch (err) {
-					ee.emit('error', new CacheableRequest.RequestError(err));
+				} catch (error) {
+					ee.emit('error', new CacheableRequest.RequestError(error));
 				}
 			};
 
@@ -185,15 +186,16 @@ class CacheableRequest {
 					}
 				};
 
-				this.cache.on('error', err => ee.emit('error', new CacheableRequest.CacheError(err)));
+				this.cache.on('error', error => ee.emit('error', new CacheableRequest.CacheError(error)));
 
 				try {
 					await get(opts);
-				} catch (err) {
+				} catch (error) {
 					if (opts.automaticFailover && !madeRequest) {
 						makeRequest(opts);
 					}
-					ee.emit('error', new CacheableRequest.CacheError(err));
+
+					ee.emit('error', new CacheableRequest.CacheError(error));
 				}
 			})();
 
@@ -229,18 +231,18 @@ function normalizeUrlObject(url) {
 }
 
 CacheableRequest.RequestError = class extends Error {
-	constructor(err) {
-		super(err.message);
+	constructor(error) {
+		super(error.message);
 		this.name = 'RequestError';
-		Object.assign(this, err);
+		Object.assign(this, error);
 	}
 };
 
 CacheableRequest.CacheError = class extends Error {
-	constructor(err) {
-		super(err.message);
+	constructor(error) {
+		super(error.message);
 		this.name = 'CacheError';
-		Object.assign(this, err);
+		Object.assign(this, error);
 	}
 };
 

test/cache.js

@@ -168,6 +168,7 @@ async function testCacheKey(t, input, expected) {
 		okMessage
 	);
 }
+
 testCacheKey.title = (providedTitle, input) => util.format(
 	'Cache key is http.request compatible for arg %s(%j)%s',
 	input.constructor.name,
@@ -299,6 +300,7 @@ test('request options path query is passed through', async t => {
 		port: urlObject.port,
 		path: urlObject.path
 	};
+
 	const inputs = [argString, argURL, argOptions];
 	for (const input of inputs) {
 		// eslint-disable-next-line no-await-in-loop
@@ -553,7 +555,7 @@ test('Keyv cache adapters load via connection uri', async t => {
 	t.true(secondResponse.fromCache);
 	t.is(cacheResult.length, 1);
 
-	await query(`DELETE FROM keyv`);
+	await query('DELETE FROM keyv');
 });
 
 test('ability to force refresh', async t => {

test/cacheable-request-instance.js

@@ -93,7 +93,7 @@ test.cb('cacheableRequest emits response event for cached responses', t => {
 });
 
 test.cb('cacheableRequest emits CacheError if cache adapter connection errors', t => {
-	const cacheableRequest = new CacheableRequest(request, `sqlite://non/existent/database.sqlite`);
+	const cacheableRequest = new CacheableRequest(request, 'sqlite://non/existent/database.sqlite');
 	cacheableRequest(url.parse(s.url))
 		.on('error', err => {
 			t.true(err instanceof CacheableRequest.CacheError);