From 296febcffa123c55f06daeda868db1f3d5cf55c6 Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Mon, 18 Oct 2021 17:06:53 +0800 Subject: [PATCH] Lint '/extras/*' + fixes - Add `/extras` to the precommit hooks (lint, prettier). - Remove `preinstall` since these modules don't exist anymore. - Fix missing brace if one single-line if-statement. --- .lintstagedrc.json | 2 ++ extras/lbryinc/lbryio.js | 40 +++++++++++++++++++--------------------- package.json | 6 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.lintstagedrc.json b/.lintstagedrc.json index ae253a628..0e729e8bd 100644 --- a/.lintstagedrc.json +++ b/.lintstagedrc.json @@ -1,8 +1,10 @@ { "linters": { "ui/**/*.{js,jsx,scss,json}": ["prettier --write", "git add"], + "extras/**/*.{js,jsx,scss,json}": ["prettier --write", "git add"], "web/**/*.{js,jsx,scss,json}": ["prettier --write", "git add"], "ui/**/*.{js,jsx}": ["eslint", "flow focus-check --color always", "git add"], + "extras/**/*.{js,jsx}": ["eslint", "flow focus-check --color always", "git add"], "web/**/*.{js,jsx}": ["eslint", "git add"] }, "ignore": ["node_modules", "web/dist/**/*", "dist/**/*", "package-lock.json"] diff --git a/extras/lbryinc/lbryio.js b/extras/lbryinc/lbryio.js index 89c0536e9..770e2b6e8 100644 --- a/extras/lbryinc/lbryio.js +++ b/extras/lbryinc/lbryio.js @@ -14,7 +14,7 @@ const EXCHANGE_RATE_TIMEOUT = 20 * 60 * 1000; const INTERNAL_APIS_DOWN = 'internal_apis_down'; // We can't use env's because they aren't passed into node_modules -Lbryio.setLocalApi = endpoint => { +Lbryio.setLocalApi = (endpoint) => { Lbryio.CONNECTION_STRING = endpoint.replace(/\/*$/, '/'); // exactly one slash at the end; }; @@ -36,8 +36,8 @@ Lbryio.call = (resource, action, params = {}, method = 'get') => { return Promise.reject(INTERNAL_APIS_DOWN); } - if (response) - return response.json().then(json => { + if (response) { + return response.json().then((json) => { let error; if (json.error) { error = new Error(json.error); @@ -47,15 +47,16 @@ Lbryio.call = (resource, action, params = {}, method = 'get') => { error.response = response; // This is primarily a hack used in actions/user.js return Promise.reject(error); }); + } } function makeRequest(url, options) { return fetch(url, options).then(checkAndParse); } - return Lbryio.getAuthToken().then(token => { + return Lbryio.getAuthToken().then((token) => { const fullParams = { auth_token: token, ...params }; - Object.keys(fullParams).forEach(key => { + Object.keys(fullParams).forEach((key) => { const value = fullParams[key]; if (typeof value === 'object') { fullParams[key] = JSON.stringify(value); @@ -80,18 +81,18 @@ Lbryio.call = (resource, action, params = {}, method = 'get') => { url = `${Lbryio.CONNECTION_STRING}${resource}/${action}`; } - return makeRequest(url, options).then(response => response.data); + return makeRequest(url, options).then((response) => response.data); }); }; Lbryio.authToken = null; Lbryio.getAuthToken = () => - new Promise(resolve => { + new Promise((resolve) => { if (Lbryio.authToken) { resolve(Lbryio.authToken); } else if (Lbryio.overrides.getAuthToken) { - Lbryio.overrides.getAuthToken().then(token => { + Lbryio.overrides.getAuthToken().then((token) => { resolve(token); }); } else if (typeof window !== 'undefined') { @@ -122,7 +123,7 @@ Lbryio.authenticate = (domain, language) => { language: language || 'en', }; - return new Promise(resolve => { + return new Promise((resolve) => { resolve(params); }); } @@ -130,15 +131,15 @@ Lbryio.authenticate = (domain, language) => { if (Lbryio.authenticationPromise === null) { Lbryio.authenticationPromise = new Promise((resolve, reject) => { Lbryio.getAuthToken() - .then(token => { + .then((token) => { if (!token || token.length > 60) { return false; } // check that token works return Lbryio.getCurrentUser() - .then(user => user) - .catch(error => { + .then((user) => user) + .catch((error) => { if (error === INTERNAL_APIS_DOWN) { throw new Error('Internal APIS down'); } @@ -146,14 +147,14 @@ Lbryio.authenticate = (domain, language) => { return false; }); }) - .then(user => { + .then((user) => { if (user) { return user; } return Lbry.status() .then( - status => + (status) => new Promise((res, rej) => { const appId = domain && domain !== 'lbry.tv' @@ -169,7 +170,7 @@ Lbryio.authenticate = (domain, language) => { }, 'post' ) - .then(response => { + .then((response) => { if (!response.auth_token) { throw new Error('auth_token was not set in the response'); } @@ -188,10 +189,10 @@ Lbryio.authenticate = (domain, language) => { Lbryio.authToken = response.auth_token; return res(response); }) - .catch(error => rej(error)); + .catch((error) => rej(error)); }) ) - .then(newUser => { + .then((newUser) => { if (!newUser) { return Lbryio.getCurrentUser(); } @@ -211,10 +212,7 @@ Lbryio.getStripeToken = () => : 'pk_live_e8M4dRNnCCbmpZzduEUZBgJO'; Lbryio.getExchangeRates = () => { - if ( - !Lbryio.exchangeLastFetched || - Date.now() - Lbryio.exchangeLastFetched > EXCHANGE_RATE_TIMEOUT - ) { + if (!Lbryio.exchangeLastFetched || Date.now() - Lbryio.exchangeLastFetched > EXCHANGE_RATE_TIMEOUT) { Lbryio.exchangePromise = new Promise((resolve, reject) => { Lbryio.call('lbc', 'exchange_rate', {}, 'get', true) .then(({ lbc_usd: LBC_USD, lbc_btc: LBC_BTC, btc_usd: BTC_USD }) => { diff --git a/package.json b/package.json index 2b63197ae..adc63c7a6 100644 --- a/package.json +++ b/package.json @@ -38,12 +38,12 @@ "build:dir": "yarn build -- --dir -c.compression=store -c.mac.identity=null", "crossenv": "./node_modules/cross-env/dist/bin/cross-env", "flow": "flow", - "lint": "eslint 'ui/**/*.{js,jsx}' && eslint 'web/**/*.{js,jsx}' && eslint 'electron/**/*.js' && flow", - "lint-fix": "eslint --fix --quiet 'ui/**/*.{js,jsx}' && eslint --fix --quiet 'web/**/*.{js,jsx}' && eslint --fix --quiet 'electron/**/*.js'", + "lint": "eslint 'ui/**/*.{js,jsx}' && eslint 'extras/**/*.{js,jsx}' && eslint 'web/**/*.{js,jsx}' && eslint 'electron/**/*.js' && flow", + "lint-fix": "eslint --fix --quiet 'ui/**/*.{js,jsx}' && eslint --fix --quiet 'extras/**/*.{js,jsx}' && eslint --fix --quiet 'web/**/*.{js,jsx}' && eslint --fix --quiet 'electron/**/*.js'", "format": "prettier 'src/**/*.{js,jsx,scss,json}' --write", "flow-defs": "flow-typed install", "precommit": "lint-staged", - "preinstall": "yarn cache clean lbry-redux && yarn cache clean lbryinc", + "preinstall": "", "postinstall": "cd web && yarn && cd .. && if-env NODE_ENV=production && yarn postinstall:warning || if-env APP_ENV=web && echo 'Done installing deps' || yarn postinstall:electron", "postinstall:electron": "electron-builder install-app-deps && node ./build/downloadDaemon.js && node ./build/downloadLBRYFirst.js", "postinstall:warning": "echo '\n\nWARNING\n\nNot all node modules were installed because NODE_ENV is set to \"production\".\nThis should only be set after installing dependencies with \"yarn\". The app will not work.\n\n'"