From 7c44dabaecce6885aa5526a0aa96cec8818801ec Mon Sep 17 00:00:00 2001 From: "Juan Picado @jotadeveloper" Date: Mon, 30 Apr 2018 18:42:04 +0200 Subject: [PATCH] refactor: enable padded-blocks eslint rule --- .eslintrc | 2 +- src/api/web/api.js | 1 - src/lib/auth.js | 1 - src/lib/bootstrap.js | 1 - src/lib/config.js | 3 --- src/lib/local-storage.js | 6 ------ src/lib/search.js | 1 - src/lib/storage-utils.js | 2 -- src/lib/storage.js | 3 --- src/lib/uplink-util.js | 2 -- src/webui/src/components/PackageList/index.js | 1 - src/webui/src/modules/home/index.js | 1 - 12 files changed, 1 insertion(+), 23 deletions(-) diff --git a/.eslintrc b/.eslintrc index ccf055757..94977db2a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -32,7 +32,7 @@ "rules": { "no-tabs": 2, "keyword-spacing": 2, - "padded-blocks": 0, + "padded-blocks": 2, "no-useless-escape": 0, "handle-callback-err": 2, "no-debugger": 2, diff --git a/src/api/web/api.js b/src/api/web/api.js index 1870641e0..c04255261 100644 --- a/src/api/web/api.js +++ b/src/api/web/api.js @@ -17,7 +17,6 @@ const route = Router(); /* eslint new-cap: 0 */ This file include all verdaccio only API(Web UI), for npm API please see ../endpoint/ */ module.exports = function(config: Config, auth: IAuth, storage: IStorageHandler) { - Search.configureStorage(storage); // validate all of these params as a package name diff --git a/src/lib/auth.js b/src/lib/auth.js index 9a790b3b2..3b4d7f366 100644 --- a/src/lib/auth.js +++ b/src/lib/auth.js @@ -148,7 +148,6 @@ class Auth { } p.allow_access(user, pkg, function(err, ok) { - if (err) { return callback(err); } diff --git a/src/lib/bootstrap.js b/src/lib/bootstrap.js index 4eabe3a95..e233ccd67 100644 --- a/src/lib/bootstrap.js +++ b/src/lib/bootstrap.js @@ -91,7 +91,6 @@ function startVerdaccio(config: any, cliListen: string, callback(webServer, addr, pkgName, pkgVersion); }); }); - } function unlinkAddressPath(addr) { diff --git a/src/lib/config.js b/src/lib/config.js index f94c8568d..23be2da9a 100644 --- a/src/lib/config.js +++ b/src/lib/config.js @@ -66,7 +66,6 @@ function normalizeUserlist() { * Coordinates the application configuration */ class Config { - /** * @param {*} config config the content */ @@ -84,11 +83,9 @@ class Config { if (self[configProp] == null) { self[configProp] = config[configProp]; } - } if (!self.user_agent) { self.user_agent = `${pkgName}/${pkgVersion}`; - } // some weird shell scripts are valid yaml files parsed as string diff --git a/src/lib/local-storage.js b/src/lib/local-storage.js index 5aa123ded..571bf6164 100644 --- a/src/lib/local-storage.js +++ b/src/lib/local-storage.js @@ -41,7 +41,6 @@ import type {IStorage, StringValue} from '../../types'; * Implements Storage interface (same for storage.js, local-storage.js, up-storage.js). */ class LocalStorage implements IStorage { - config: Config; localData: ILocalData; logger: Logger; @@ -260,7 +259,6 @@ class LocalStorage implements IStorage { cb(); }); - }, callback); } @@ -325,7 +323,6 @@ class LocalStorage implements IStorage { this._updatePackage(name, (jsonData, cb) => { for (let ver in jsonData.versions) { - if (_.isNil(pkg.versions[ver])) { this.logger.info( {name: name, version: ver}, 'unpublishing @{name}@@{version}'); @@ -337,7 +334,6 @@ class LocalStorage implements IStorage { } } } - } jsonData[DIST_TAGS] = pkg[DIST_TAGS]; @@ -553,7 +549,6 @@ class LocalStorage implements IStorage { * @return {Function} */ getPackageMetadata(name: string, callback?: Callback = () => {}): void { - const storage: IPackageStorage = this._getLocalStorage(name); if (_.isNil(storage)) { return callback( ErrorCode.get404() ); @@ -863,7 +858,6 @@ class LocalStorage implements IStorage { return plugin.getPackageStorage; })); } - } export default LocalStorage; diff --git a/src/lib/search.js b/src/lib/search.js index c81b20433..c9bbd972a 100644 --- a/src/lib/search.js +++ b/src/lib/search.js @@ -7,7 +7,6 @@ import type {IStorageHandler, IWebSearch} from '../../types'; * Handle the search Indexer. */ class Search implements IWebSearch { - index: any; storage: IStorageHandler; diff --git a/src/lib/storage-utils.js b/src/lib/storage-utils.js index a308d0140..15c5405d7 100644 --- a/src/lib/storage-utils.js +++ b/src/lib/storage-utils.js @@ -124,7 +124,6 @@ export function checkPackageRemote(name: string, isAllowPublishOffline: boolean, return new Promise((resolve, reject) => { // $FlowFixMe syncMetadata(name, null, {}, (err, packageJsonLocal, upLinksErrors) => { - // something weird if (err && err.status !== 404) { return reject(err); @@ -140,7 +139,6 @@ export function checkPackageRemote(name: string, isAllowPublishOffline: boolean, // if uplink fails with a status other than 404, we report failure if (_.isNil(upLinksErrors[errorItem][0]) === false) { if (upLinksErrors[errorItem][0].status !== 404) { - if (isAllowPublishOffline) { return resolve(); } diff --git a/src/lib/storage.js b/src/lib/storage.js index da79bd91c..b66570e66 100644 --- a/src/lib/storage.js +++ b/src/lib/storage.js @@ -434,12 +434,10 @@ class Storage implements IStorageHandler { } async.map(upLinks, (upLink, cb) => { - const _options = Object.assign({}, options); let upLinkMeta = packageInfo._uplinks[upLink.upname]; if (isObject(upLinkMeta)) { - const fetched = upLinkMeta.fetched; if (fetched && (Date.now() - fetched) < upLink.maxage) { @@ -483,7 +481,6 @@ class Storage implements IStorageHandler { try { mergeVersions(packageInfo, upLinkResponse); - } catch (err) { self.logger.error({ sub: 'out', diff --git a/src/lib/uplink-util.js b/src/lib/uplink-util.js index e2d50f0a5..02bfc52fd 100644 --- a/src/lib/uplink-util.js +++ b/src/lib/uplink-util.js @@ -40,13 +40,11 @@ export function updateVersionsHiddenUpLink(versions: Versions, upLink: IProxy) { export function fetchUplinkMetadata(name: string, packageInfo: Package, options: any, upLink: any, logger: Logger): Promise { - return new Promise(function(resolve, reject) { const _options = Object.assign({}, options); const upLinkMeta = packageInfo._uplinks[upLink.upname]; if (isObject(upLinkMeta)) { - const fetched = upLinkMeta.fetched; // check whether is too soon to ask for metadata diff --git a/src/webui/src/components/PackageList/index.js b/src/webui/src/components/PackageList/index.js index e97d503c9..94e690f9a 100644 --- a/src/webui/src/components/PackageList/index.js +++ b/src/webui/src/components/PackageList/index.js @@ -9,7 +9,6 @@ import NoItems from '../NoItems'; import classes from './packageList.scss'; export default class PackageList extends React.Component { - static propTypes = { packages: PropTypes.array, help: PropTypes.bool diff --git a/src/webui/src/modules/home/index.js b/src/webui/src/modules/home/index.js index 8a8f033bf..8160d79f8 100644 --- a/src/webui/src/modules/home/index.js +++ b/src/webui/src/modules/home/index.js @@ -13,7 +13,6 @@ import classes from './home.scss'; export default class Home extends React.Component { - static propTypes = { children: PropTypes.element }