From b12f61f857242174c16ab769bb36739d4b532d9c Mon Sep 17 00:00:00 2001 From: Ivan Kristianto Date: Sun, 13 Feb 2022 12:51:06 +0700 Subject: [PATCH] Fix linter error --- package-lock.json | 13 ++------ package.json | 1 + src/classes/cloudflare.js | 3 +- src/utils/withSpinner.js | 68 ++++++++++++++++++++------------------- 4 files changed, 41 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e09915..8479b62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "@10up/eslint-config": "^2.2.0", "@babel/cli": "^7.12.1", "@babel/core": "^7.12.10", + "@babel/eslint-parser": "^7.17.0", "@babel/plugin-transform-runtime": "^7.12.10", "@babel/preset-env": "^7.12.11", "@babel/register": "^7.12.10", @@ -215,7 +216,6 @@ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", "dev": true, - "peer": true, "dependencies": { "eslint-scope": "^5.1.1", "eslint-visitor-keys": "^2.1.0", @@ -234,7 +234,6 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true, - "peer": true, "engines": { "node": ">=10" } @@ -3814,7 +3813,6 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, - "peer": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -3828,7 +3826,6 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true, - "peer": true, "engines": { "node": ">=4.0" } @@ -7083,7 +7080,6 @@ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz", "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==", "dev": true, - "peer": true, "requires": { "eslint-scope": "^5.1.1", "eslint-visitor-keys": "^2.1.0", @@ -7094,8 +7090,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "peer": true + "dev": true } } }, @@ -9813,7 +9808,6 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, - "peer": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -9823,8 +9817,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "peer": true + "dev": true } } }, diff --git a/package.json b/package.json index f4a092e..1176e95 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "@10up/eslint-config": "^2.2.0", "@babel/cli": "^7.12.1", "@babel/core": "^7.12.10", + "@babel/eslint-parser": "^7.17.0", "@babel/plugin-transform-runtime": "^7.12.10", "@babel/preset-env": "^7.12.11", "@babel/register": "^7.12.10", diff --git a/src/classes/cloudflare.js b/src/classes/cloudflare.js index 53b6a26..83879aa 100644 --- a/src/classes/cloudflare.js +++ b/src/classes/cloudflare.js @@ -63,7 +63,8 @@ class Cloudflare extends Request { */ static isDomain(str) { try { - const regex = /(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/s; + const regex = + /(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/s; if (regex.exec(str) !== null) { const urlTest = str.includes('http') ? str : `https://${str}`; const urlObj = new URL(urlTest); diff --git a/src/utils/withSpinner.js b/src/utils/withSpinner.js index 7c2af51..927482f 100644 --- a/src/utils/withSpinner.js +++ b/src/utils/withSpinner.js @@ -3,40 +3,42 @@ import ora from 'ora'; // Spinner -const withSpinner = (command) => (...args) => { - const { disableSpinner } = args[0]; +const withSpinner = + (command) => + (...args) => { + const { disableSpinner } = args[0]; - if (disableSpinner) { - // eslint-disable-next-line no-param-reassign - args[0].spinner = {}; - return command(...args); - } + if (disableSpinner) { + // eslint-disable-next-line no-param-reassign + args[0].spinner = {}; + return command(...args); + } - const spinner = ora().start(); - // eslint-disable-next-line no-param-reassign - args[0].spinner = spinner; - let time = process.hrtime(); - return command(...args).then( - (message) => { - time = process.hrtime(time); - spinner.succeed( - `${message || spinner.text} (in ${time[0]}s ${(time[1] / 1e6).toFixed(0)}ms)`, - ); - process.exit(0); - }, - (error) => { - if (error) { - // Error is an unknown error. That means there was a bug in our code. - spinner.fail(typeof error === 'string' ? error : error.message); - // Disable reason: Using console.error() means we get a stack trace. - console.error(error); - process.exit(1); - } else { - spinner.fail('An unknown error occurred.'); - process.exit(1); - } - }, - ); -}; + const spinner = ora().start(); + // eslint-disable-next-line no-param-reassign + args[0].spinner = spinner; + let time = process.hrtime(); + return command(...args).then( + (message) => { + time = process.hrtime(time); + spinner.succeed( + `${message || spinner.text} (in ${time[0]}s ${(time[1] / 1e6).toFixed(0)}ms)`, + ); + process.exit(0); + }, + (error) => { + if (error) { + // Error is an unknown error. That means there was a bug in our code. + spinner.fail(typeof error === 'string' ? error : error.message); + // Disable reason: Using console.error() means we get a stack trace. + console.error(error); + process.exit(1); + } else { + spinner.fail('An unknown error occurred.'); + process.exit(1); + } + }, + ); + }; export default withSpinner;