Commit 2ba1171 1 parent 35c94e0 commit 2ba1171 Copy full SHA for 2ba1171
File tree 2 files changed +6
-20
lines changed
workspaces/arborist/lib/arborist
2 files changed +6
-20
lines changed Original file line number Diff line number Diff line change 1
1
// mixin providing the loadVirtual method
2
2
const localeCompare = require ( '@isaacs/string-locale-compare' ) ( 'en' )
3
+ const mapWorkspaces = require ( '@npmcli/map-workspaces' )
3
4
4
5
const { resolve } = require ( 'path' )
5
6
@@ -21,7 +22,6 @@ const loadRoot = Symbol('loadRoot')
21
22
const loadNode = Symbol ( 'loadVirtualNode' )
22
23
const loadLink = Symbol ( 'loadVirtualLink' )
23
24
const loadWorkspaces = Symbol . for ( 'loadWorkspaces' )
24
- const loadWorkspacesVirtual = Symbol . for ( 'loadWorkspacesVirtual' )
25
25
const flagsSuspect = Symbol . for ( 'flagsSuspect' )
26
26
const reCalcDepFlags = Symbol ( 'reCalcDepFlags' )
27
27
const checkRootEdges = Symbol ( 'checkRootEdges' )
@@ -157,7 +157,7 @@ module.exports = cls => class VirtualLoader extends cls {
157
157
}
158
158
159
159
const lockWS = [ ]
160
- const workspaces = this [ loadWorkspacesVirtual ] ( {
160
+ const workspaces = mapWorkspaces . virtual ( {
161
161
cwd : this . path ,
162
162
lockfile : s . data ,
163
163
} )
Original file line number Diff line number Diff line change 1
1
const mapWorkspaces = require ( '@npmcli/map-workspaces' )
2
2
3
- const _appendWorkspaces = Symbol ( 'appendWorkspaces' )
4
3
// shared ref used by other mixins/Arborist
5
4
const _loadWorkspaces = Symbol . for ( 'loadWorkspaces' )
6
- const _loadWorkspacesVirtual = Symbol . for ( 'loadWorkspacesVirtual' )
7
5
8
6
module . exports = cls => class MapWorkspaces extends cls {
9
- [ _appendWorkspaces ] ( node , workspaces ) {
10
- if ( node && workspaces . size ) {
11
- node . workspaces = workspaces
12
- }
13
-
14
- return node
15
- }
16
-
17
7
async [ _loadWorkspaces ] ( node ) {
18
- if ( node . workspaces ) {
19
- return node
20
- }
21
-
22
8
const workspaces = await mapWorkspaces ( {
23
9
cwd : node . path ,
24
10
pkg : node . package ,
25
11
} )
26
12
27
- return this [ _appendWorkspaces ] ( node , workspaces )
28
- }
13
+ if ( node && workspaces . size ) {
14
+ node . workspaces = workspaces
15
+ }
29
16
30
- [ _loadWorkspacesVirtual ] ( opts ) {
31
- return mapWorkspaces . virtual ( opts )
17
+ return node
32
18
}
33
19
}
You can’t perform that action at this time.
0 commit comments