Commit 1145c4d 1 parent 3b1294c commit 1145c4d Copy full SHA for 1145c4d
File tree 1 file changed +5
-5
lines changed
1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ export default function findAddons(isLocal: boolean): AddonSummary[] {
37
37
return finalizeAddons ( addons ) ;
38
38
}
39
39
40
- let addons ;
40
+ let addons : PluginSummary [ ] = [ ] ;
41
41
42
42
// Because yarn stores it's global modules separately, and doesn't yet support the `root` command,
43
43
// we have to double check yarn's global installs for any denali addons. The easiest way of
@@ -50,9 +50,9 @@ export default function findAddons(isLocal: boolean): AddonSummary[] {
50
50
let yarnGlobalInstalls = path . join ( yarnGlobal , 'node_modules' ) ;
51
51
debug ( `searching for addons globally in yarn global installs: ${ yarnGlobalInstalls } ` ) ;
52
52
if ( fs . existsSync ( yarnGlobalInstalls ) ) {
53
- addons = findPlugins ( merge ( {
53
+ addons = addons . concat ( findPlugins ( merge ( {
54
54
dir : yarnGlobalInstalls
55
- } , findOptions ) ) ;
55
+ } , findOptions ) ) ) ;
56
56
} else {
57
57
debug ( `Tried to load globally installed addons from yarn, but ${ yarnGlobalInstalls } doesn't exist, skipping ...` ) ;
58
58
}
@@ -69,10 +69,10 @@ export default function findAddons(isLocal: boolean): AddonSummary[] {
69
69
} else {
70
70
let npmRoot = execSync ( 'npm root -g' ) . toString ( ) . trim ( ) ;
71
71
debug ( `searching for addons globally in npm root: ${ npmRoot } ` ) ;
72
- addons = findPlugins ( merge ( {
72
+ addons = addons . concat ( findPlugins ( merge ( {
73
73
dir : npmRoot ,
74
74
scanAllDirs : true
75
- } , findOptions ) ) ;
75
+ } , findOptions ) ) ) ;
76
76
}
77
77
78
78
return finalizeAddons ( addons ) ;
You can’t perform that action at this time.
0 commit comments