Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue with preversion script exposing the new updated package information instead of the currently existing one #51

Closed
wants to merge 2 commits into from
Closed

Fixes issue with preversion script exposing the new updated package information instead of the currently existing one #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5e96ac
Fixes issue with preversion script exposing the new updated package i…
luislobo Aug 15, 2018
b0f72c5
Merge branch 'latest' into fix-preversion-package-json
luislobo Sep 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,16 @@ function persistVersion (newVersion, silent, data, localData, cb_) {
if (!npm.config.get('allow-same-version') && data.version === newVersion) {
return cb_(new Error('Version not changed, might want --allow-same-version'))
}
var lifecycleDataPrevious = Object.assign({}, data)
lifecycleDataPrevious._id = data.name + '@' + data.version
data.version = newVersion
var lifecycleData = Object.create(data)
lifecycleData._id = data.name + '@' + newVersion

var where = npm.prefix
chain([
!localData.hasGit && [checkGit, localData],
[lifecycle, lifecycleData, 'preversion', where],
[lifecycle, lifecycleDataPrevious, 'preversion', where],
[updatePackage, newVersion, silent],
[lifecycle, lifecycleData, 'version', where],
[commit, localData, newVersion],
Expand Down
54 changes: 34 additions & 20 deletions test/tap/version-lifecycle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,27 @@ test('npm version <semver> execution order', function (t) {
t.ifError(err, 'version command complete')

t.equal('0.0.0', readPackage('preversion').version, 'preversion')
t.equal('0.0.0', readNpmPackageVersion('preversion'), 'preversion')
t.deepEqual(readStatus('preversion', t), {
'preversion-package.json': 'A'
'preversion-package.json': 'A',
'preversion_npm_package_version.txt': 'A'
})

t.equal('0.0.1', readPackage('version').version, 'version')
t.equal('0.0.1', readNpmPackageVersion('version'), 'version')
t.deepEqual(readStatus('version', t), {
'package.json': 'M',
'preversion-package.json': 'A',
'version-package.json': 'A'
'preversion_npm_package_version.txt': 'A',
'version-package.json': 'A',
'version_npm_package_version.txt': 'A'
})

t.equal('0.0.1', readPackage('postversion').version, 'postversion')
t.equal('0.0.1', readNpmPackageVersion('postversion'), 'postversion')
t.deepEqual(readStatus('postversion', t), {
'postversion-package.json': 'A'
'postversion-package.json': 'A',
'postversion_npm_package_version.txt': 'A'
})
t.end()
})
Expand All @@ -162,23 +169,26 @@ function setup () {
function makeScript (lifecycle) {
function contents (lifecycle) {
var fs = require('fs')
var exec = require('child_process').exec
fs.createReadStream('package.json')
.pipe(fs.createWriteStream(lifecycle + '-package.json'))
.on('close', function () {
exec(
'git add ' + lifecycle + '-package.json',
function () {
exec(
'git status --porcelain',
function (err, stdout) {
if (err) throw err
fs.writeFileSync(lifecycle + '-git.txt', stdout)
}
)
}
)
})
fs.writeFile(lifecycle + '_npm_package_version.txt', process.env.npm_package_version, function (err) {
if (err) throw err
var exec = require('child_process').exec
fs.createReadStream('package.json')
.pipe(fs.createWriteStream(lifecycle + '-package.json'))
.on('close', function () {
exec(
'git add ' + lifecycle + '-package.json ' + lifecycle + '_npm_package_version.txt',
function () {
exec(
'git status --porcelain',
function (err, stdout) {
if (err) throw err
fs.writeFileSync(lifecycle + '-git.txt', stdout)
}
)
}
)
})
})
}
var scriptPath = path.join(pkg, lifecycle + '.js')
fs.writeFileSync(
Expand All @@ -191,6 +201,10 @@ function readPackage (lifecycle) {
return JSON.parse(fs.readFileSync(path.join(pkg, lifecycle + '-package.json'), 'utf-8'))
}

function readNpmPackageVersion (lifecycle) {
return fs.readFileSync(path.join(pkg, lifecycle + '_npm_package_version.txt'), 'utf-8')
}

function readStatus (lifecycle, t) {
var status = {}
fs.readFileSync(path.join(pkg, lifecycle + '-git.txt'), 'utf-8')
Expand Down