mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-03-27 11:31:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(pkgs-graph): include workspace version aliases (#3401)

Browse Source 
close #3400
This commit is contained in:
javier-garcia-meteologica
2021-04-27 22:09:27 +02:00
committed by GitHub
parent 3e3c3ff714
commit 1084ca1a75
3 changed files with 106 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/two-socks-bathe.md Normal file
View File

@@ -0,0 +1,5 @@
---
"pkgs-graph": patch
---
Include dependencies with workspace version aliases in graph

3
packages/pkgs-graph/src/index.ts
View File

@@ -62,6 +62,9 @@ export default function <T> (pkgs: Array<Package & T>, opts?: {
try {
if (isWorkspaceSpec) {
rawSpec = rawSpec.substr(10)
if (rawSpec === '^' || rawSpec === '~') {
rawSpec = '*'
};
}
spec = npa.resolve(depName, rawSpec, pkg.dir)
} catch (err) {

98
packages/pkgs-graph/test/index.ts
View File

@@ -7,6 +7,8 @@ const FOO1_PATH = pathResolve('/zkochan/src/foo')
const BAR2_PATH = pathResolve('/zkochan/src/bar@2')
const FOO2_PATH = pathResolve('/zkochan/src/foo@2')
const BAR3_PATH = pathResolve('/zkochan/src/bar@3')
const BAR4_PATH = pathResolve('/zkochan/src/bar@4')
const BAR5_PATH = pathResolve('/zkochan/src/bar@5')
test('create package graph', () => {
const result = createPkgGraph([
@@ -257,6 +259,28 @@ test('create package graph ignoring the workspace protocol', () => {
version: '2.0.0',
},
},
{
dir: BAR3_PATH,
manifest: {
name: 'bar',
version: '3.0.0',
dependencies: {
foo: 'workspace:^',
},
},
},
{
dir: BAR4_PATH,
manifest: {
name: 'bar',
version: '4.0.0',
dependencies: {
foo: 'workspace:~',
},
},
},
])
expect(result.unmatched).toStrictEqual([{ pkgName: 'bar', range: '^10.0.0' }])
expect(result.graph).toStrictEqual({
@@ -313,6 +337,34 @@ test('create package graph ignoring the workspace protocol', () => {
},
},
},
[BAR3_PATH]: {
dependencies: [FOO2_PATH],
package: {
dir: BAR3_PATH,
manifest: {
name: 'bar',
version: '3.0.0',
dependencies: {
foo: 'workspace:^',
},
},
},
},
[BAR4_PATH]: {
dependencies: [FOO2_PATH],
package: {
dir: BAR4_PATH,
manifest: {
name: 'bar',
version: '4.0.0',
dependencies: {
foo: 'workspace:~',
},
},
},
},
})
})
@@ -358,6 +410,26 @@ test('create package graph respects linked-workspace-packages = false', () => {
version: '3.0.0',
},
},
{
dir: BAR4_PATH,
manifest: {
dependencies: {
foo: 'workspace:^',
},
name: 'bar',
version: '4.0.0',
},
},
{
dir: BAR5_PATH,
manifest: {
dependencies: {
foo: 'workspace:~',
},
name: 'bar',
version: '5.0.0',
},
},
], { linkWorkspacePackages: false })
expect(result.unmatched).toStrictEqual([{ pkgName: 'bar', range: '^10.0.0' }, { pkgName: 'foo', range: '1.0.1' }])
expect(result.graph).toStrictEqual({
@@ -415,6 +487,32 @@ test('create package graph respects linked-workspace-packages = false', () => {
},
},
},
[BAR4_PATH]: {
dependencies: [FOO1_PATH],
package: {
dir: BAR4_PATH,
manifest: {
dependencies: {
foo: 'workspace:^',
},
name: 'bar',
version: '4.0.0',
},
},
},
[BAR5_PATH]: {
dependencies: [FOO1_PATH],
package: {
dir: BAR5_PATH,
manifest: {
dependencies: {
foo: 'workspace:~',
},
name: 'bar',
version: '5.0.0',
},
},
},
})
})