diff --git a/lib/lifecycles/bump.js b/lib/lifecycles/bump.js index a7638b904..2661ec029 100644 --- a/lib/lifecycles/bump.js +++ b/lib/lifecycles/bump.js @@ -162,10 +162,8 @@ function bumpVersion (releaseAs, currentVersion, args) { */ function updateConfigs (args, newVersion) { const dotgit = DotGitignore() - Bump.pkgFiles.concat(Bump.lockFiles).forEach((filename) => { - configsToUpdate[path.resolve(process.cwd(), filename)] = false - }) - Object.keys(configsToUpdate).forEach(function (configPath) { + Bump.pkgFiles.concat(Bump.lockFiles).forEach(function (filename) { + let configPath = path.resolve(process.cwd(), filename) try { if (dotgit.ignore(configPath)) return let stat = fs.lstatSync(configPath) @@ -174,13 +172,12 @@ function updateConfigs (args, newVersion) { let indent = detectIndent(data).indent let newline = detectNewline(data) let config = JSON.parse(data) - let filename = path.basename(configPath) checkpoint(args, 'bumping version in ' + filename + ' from %s to %s', [config.version, newVersion]) config.version = newVersion writeFile(args, configPath, stringifyPackage(config, indent, newline)) // flag any config files that we modify the version # for // as having been updated. - configsToUpdate[configPath] = true + configsToUpdate[filename] = true } } catch (err) { if (err.code !== 'ENOENT') console.warn(err.message) diff --git a/lib/lifecycles/commit.js b/lib/lifecycles/commit.js index 7c7aa6a49..86d443203 100644 --- a/lib/lifecycles/commit.js +++ b/lib/lifecycles/commit.js @@ -25,11 +25,9 @@ function execCommit (args, newVersion) { // commit any of the config files that we've updated // the version # for. Object.keys(bump.getUpdatedConfigs()).forEach(function (p) { - if (bump.getUpdatedConfigs()[p]) { - msg += ' and %s' - paths.unshift(path.basename(p)) - toAdd += ' ' + path.relative(process.cwd(), p) - } + msg += ' and %s' + paths.unshift(p) + toAdd += ' ' + path.relative(process.cwd(), p) }) if (args.commitAll) {