Skip to content
This repository was archived by the owner on Jan 20, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions lib/arborist/reify.js
Original file line number Diff line number Diff line change
Expand Up @@ -972,8 +972,15 @@ module.exports = cls => class Reifier extends cls {
// would allow versions outside the requested range. Tags and
// specific versions save with the save-prefix.
const isRange = (subSpec || req).type === 'range'
const range = !isRange || subset(prefixRange, spec, { loose: true })
? prefixRange : spec

let range = spec
if (
!isRange ||
spec === '*' ||
subset(prefixRange, spec, { loose: true })
)
range = prefixRange

const pname = child.packageName
const alias = name !== pname
newSpec = alias ? `npm:${pname}@${range}` : range
Expand Down
9 changes: 9 additions & 0 deletions tap-snapshots/test/arborist/reify.js.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,15 @@ exports[`test/arborist/reify.js TAP add multiple pkgs in a specific order > shou
{"name":"multiple-pkgs","dependencies":{"abbrev":"^1.1.1","once":"^1.4.0","wrappy":"^1.0.2"}}
`

exports[`test/arborist/reify.js TAP add spec * with semver prefix range gets updated > must match snapshot 1`] = `
{
"dependencies": {
"latest-is-prerelease": "^1.0.0-beta-rc.3"
}
}

`

exports[`test/arborist/reify.js TAP bad shrinkwrap file > expect resolving Promise 1`] = `
ArboristNode {
"children": Map {
Expand Down
7 changes: 7 additions & 0 deletions test/arborist/reify.js
Original file line number Diff line number Diff line change
Expand Up @@ -1834,3 +1834,10 @@ t.test('do not delete linked targets when link omitted', async t => {
t.notOk(tree.children.get('foo'), 'does not have foo child any more')
t.equal(tree.fsChildren.size, 1, 'still has foo fschild')
})

t.test('add spec * with semver prefix range gets updated', async t => {
const path = t.testdir({ 'package.json': '{}' })
const arb = newArb({ path })
await arb.reify({ add: ['latest-is-prerelease'] })
t.matchSnapshot(fs.readFileSync(path + '/package.json', 'utf8'))
})
20 changes: 20 additions & 0 deletions test/fixtures/registry-mocks/content/latest-is-prerelease.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"_id": "latest-is-prerelease",
"_rev": "477-deadbeef",
"name": "latest-is-prerelease",
"dist-tags": {
"latest": "1.0.0-beta-rc.3"
},
"versions": {
"1.0.0-beta-rc.3": {
"name": "latest-is-prerelease",
"version": "1.0.0-beta-rc.3",
"_id": "latest-is-prerelease@1.0.0-beta-rc.3",
"dist": {
"integrity": "sha512-7SaiJ5Jl1pzXFqooC9SsOOnSjg3EgJhaBCXJgiCOYDThMWPeTXZfJdKkjL+ditI/96gnqpsINTXfC5OyhM1SbA==",
"shasum": "cff0810166a8becd0b469b520f0072ee5af1e015",
"tarball": "https://registry.npmjs.org/latest-is-prerelease/-/latest-is-prerelease-1.0.0-beta-rc.3.tgz"
}
}
}
}