diff --git a/lib/config/migrate-validate.js b/lib/config/migrate-validate.js index bca90733a272ef3af89fdd094743fb9cd31d8c59..1e9e7599ff50aaccaee0270b8af96166b7b18be6 100644 --- a/lib/config/migrate-validate.js +++ b/lib/config/migrate-validate.js @@ -25,10 +25,10 @@ async function migrateAndValidate(config, input) { massagedConfig ); // istanbul ignore if - if (!is.empty(warnings)) { + if (is.nonEmptyArray(warnings)) { logger.info({ warnings }, 'Found renovate config warnings'); } - if (!is.empty(errors)) { + if (is.nonEmptyArray(errors)) { logger.info({ errors }, 'Found renovate config errors'); } massagedConfig.errors = (config.errors || []).concat(errors); diff --git a/lib/datasource/docker.js b/lib/datasource/docker.js index f75338b1ff54453d38523575d26f3e695b8efab1..021427bb3b0ba30350bd4a97c16ed62720b79c0b 100644 --- a/lib/datasource/docker.js +++ b/lib/datasource/docker.js @@ -14,7 +14,7 @@ module.exports = { function massageRegistry(config, input) { let registry = input; - if (!registry && !is.empty(config.registryUrls)) { + if (!registry && is.nonEmptyArray(config.registryUrls)) { [registry] = config.registryUrls; } if (!registry || registry === 'docker.io') { diff --git a/lib/datasource/pypi.js b/lib/datasource/pypi.js index 0dc0b05b9b3877c558520dd78bb2102d5a6ca2ef..b9a2d73cc45eb22d6eeb82059ae4cebf4d156214 100644 --- a/lib/datasource/pypi.js +++ b/lib/datasource/pypi.js @@ -20,7 +20,7 @@ const changelogUrls = { async function getPkgReleases(purl, config = {}) { const { fullname: depName } = purl; let hostUrl = 'https://pypi.org/pypi/'; - if (!is.empty(config.registryUrls)) { + if (is.nonEmptyArray(config.registryUrls)) { [hostUrl] = config.registryUrls; } if (process.env.PIP_INDEX_URL) { diff --git a/lib/workers/branch/commit.js b/lib/workers/branch/commit.js index 8b3de3d328c247a8a2a3819bbd276e1b6e56e830..d5a63e1222fd3d36c9058d6bf271f4622f3aa31e 100644 --- a/lib/workers/branch/commit.js +++ b/lib/workers/branch/commit.js @@ -8,7 +8,7 @@ async function commitFilesToBranch(config) { const updatedFiles = config.updatedPackageFiles.concat( config.updatedLockFiles ); - if (!is.empty(updatedFiles)) { + if (is.nonEmptyArray(updatedFiles)) { logger.debug(`${updatedFiles.length} file(s) to commit`); // API will know whether to create new branch or not diff --git a/lib/workers/pr/pr-body.js b/lib/workers/pr/pr-body.js index 312ecdc8c311da3ca6fe5f8f79d647ebbb33431a..4017dbe174b4d6429e9c9b78ebedd9146ff436f0 100644 --- a/lib/workers/pr/pr-body.js +++ b/lib/workers/pr/pr-body.js @@ -121,7 +121,7 @@ async function getPrBody(config) { const notes = []; for (const upgrade of config.upgrades) { - if (!is.empty(upgrade.prBodyNotes)) { + if (is.nonEmptyArray(upgrade.prBodyNotes)) { for (const note of upgrade.prBodyNotes) { try { const res = handlebars diff --git a/lib/workers/repository/onboarding/branch/config.js b/lib/workers/repository/onboarding/branch/config.js index 7b542b1caf9df04508ae29994fdac6f62dbc8c5d..d50f7eb6b446ca3776e2f112768640d38b019e82 100644 --- a/lib/workers/repository/onboarding/branch/config.js +++ b/lib/workers/repository/onboarding/branch/config.js @@ -26,7 +26,7 @@ async function getOnboardingConfig(config) { String(branchName).replace('greenkeeper', 'renovate'), ]; } - if (!is.empty(ignore)) { + if (is.nonEmptyArray(ignore)) { logger.info({ ignore }, 'Migrating Greenkeeper ignore'); renovateJson.ignoreDeps = ignore.map(String); } diff --git a/lib/workers/repository/onboarding/pr/index.js b/lib/workers/repository/onboarding/pr/index.js index b784eee09f9daf544ed4047b56187e3878a6e38a..a0787c59a36369208a9ba6c431d88c01b66c6787 100644 --- a/lib/workers/repository/onboarding/pr/index.js +++ b/lib/workers/repository/onboarding/pr/index.js @@ -111,7 +111,7 @@ Also, you can post questions about your config in [Renovate's Config Help reposi err.statusCode === 422 && err.response && err.response.body && - !is.empty(err.response.body.errors) && + is.nonEmptyArray(err.response.body.errors) && err.response.body.errors[0].message && err.response.body.errors[0].message.startsWith( 'A pull request already exists' diff --git a/lib/workers/repository/updates/flatten.js b/lib/workers/repository/updates/flatten.js index 67b3a062603aeb16ea8dc937409dfbc05fcf7786..aeb5a5a178d2aa2af1cfdd9b9261e86b8b355460 100644 --- a/lib/workers/repository/updates/flatten.js +++ b/lib/workers/repository/updates/flatten.js @@ -13,7 +13,7 @@ module.exports = { // Return only rules that contain an updateType function getUpdateTypeRules(packageRules) { - return packageRules.filter(rule => !is.empty(rule.updateTypes)); + return packageRules.filter(rule => is.nonEmptyArray(rule.updateTypes)); } function flattenUpdates(config, packageFiles) { diff --git a/package.json b/package.json index 4d1c0bce22c6e605b72a72ed469a8460e665b193..919dc0a157f332492d9c07dbd03f9d47774fae9f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ }, "dependencies": { "@renovate/pep440": "0.4.0", - "@sindresorhus/is": "0.11.0", + "@sindresorhus/is": "0.12.0", "@yarnpkg/lockfile": "1.1.0", "bunyan": "1.8.12", "cacache": "11.2.0", diff --git a/yarn.lock b/yarn.lock index 786c7587424b470f9792f1766974f617c074d53b..420315c1261016d0724a0aae450730a98a42e5db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -144,10 +144,10 @@ into-stream "^3.1.0" lodash "^4.17.4" -"@sindresorhus/is@0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.11.0.tgz#a65970040a5b55c4713452666703b92a6c331fdb" - integrity sha512-i5Zh5+3QARyXtzq3Bd2Lg3aBRFLcgYbNoap3Hyu1uRN8X+D+0JMqqc4uk4XjhNxfVdCnL8WHUA2wxa33QCC50w== +"@sindresorhus/is@0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.12.0.tgz#55c37409c809e802efea25911a579731adfc6e07" + integrity sha512-9ve22cGrAKlSRvi8Vb2JIjzcaaQg79531yQHnF+hi/kOpsSj3Om8AyR1wcHrgl0u7U3vYQ7gmF5erZzOp4+51Q== dependencies: symbol-observable "^1.2.0"