mirror of
https://github.com/pnpm/pnpm.git
synced 2026-03-31 21:42:15 -04:00
feat: try adding local pre-release package in workspaces (#5733)
close #5316
This commit is contained in:
6
.changeset/tricky-bulldogs-eat.md
Normal file
6
.changeset/tricky-bulldogs-eat.md
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
"@pnpm/npm-resolver": patch
|
||||||
|
"pnpm": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
`pnpm add` should prefer local projects from the workspace, even if they use prerelease versions.
|
||||||
@@ -291,7 +291,9 @@ function pickMatchingLocalVersionOrNull (
|
|||||||
const localVersions = Object.keys(versions)
|
const localVersions = Object.keys(versions)
|
||||||
switch (spec.type) {
|
switch (spec.type) {
|
||||||
case 'tag':
|
case 'tag':
|
||||||
return semver.maxSatisfying(localVersions, '*')
|
return semver.maxSatisfying(localVersions, '*', {
|
||||||
|
includePrerelease: true,
|
||||||
|
})
|
||||||
case 'version':
|
case 'version':
|
||||||
return versions[spec.fetchSpec] ? spec.fetchSpec : null
|
return versions[spec.fetchSpec] ? spec.fetchSpec : null
|
||||||
case 'range':
|
case 'range':
|
||||||
|
|||||||
@@ -1317,6 +1317,43 @@ test('resolve from local directory when package is not found in the registry and
|
|||||||
expect(resolveResult!.manifest!.version).toBe('2.0.0')
|
expect(resolveResult!.manifest!.version).toBe('2.0.0')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('resolve from local directory when package is not found in the registry and local prerelease available', async () => {
|
||||||
|
nock(registry)
|
||||||
|
.get('/is-positive')
|
||||||
|
.reply(404, {})
|
||||||
|
|
||||||
|
const cacheDir = tempy.directory()
|
||||||
|
const resolve = createResolveFromNpm({
|
||||||
|
cacheDir,
|
||||||
|
})
|
||||||
|
const resolveResult = await resolve({ alias: 'is-positive', pref: 'latest' }, {
|
||||||
|
projectDir: '/home/istvan/src',
|
||||||
|
registry,
|
||||||
|
workspacePackages: {
|
||||||
|
'is-positive': {
|
||||||
|
'3.0.0-alpha.1.2.3': {
|
||||||
|
dir: '/home/istvan/src/is-positive',
|
||||||
|
manifest: {
|
||||||
|
name: 'is-positive',
|
||||||
|
version: '3.0.0-alpha.1.2.3',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(resolveResult!.resolvedVia).toBe('local-filesystem')
|
||||||
|
expect(resolveResult!.id).toBe('link:is-positive')
|
||||||
|
expect(resolveResult!.latest).toBeFalsy()
|
||||||
|
expect(resolveResult!.resolution).toStrictEqual({
|
||||||
|
directory: '/home/istvan/src/is-positive',
|
||||||
|
type: 'directory',
|
||||||
|
})
|
||||||
|
expect(resolveResult!.manifest).toBeTruthy()
|
||||||
|
expect(resolveResult!.manifest!.name).toBe('is-positive')
|
||||||
|
expect(resolveResult!.manifest!.version).toBe('3.0.0-alpha.1.2.3')
|
||||||
|
})
|
||||||
|
|
||||||
test('resolve from local directory when package is not found in the registry and specific version is requested', async () => {
|
test('resolve from local directory when package is not found in the registry and specific version is requested', async () => {
|
||||||
nock(registry)
|
nock(registry)
|
||||||
.get('/is-positive')
|
.get('/is-positive')
|
||||||
|
|||||||
Reference in New Issue
Block a user