@@ -12,14 +12,14 @@ import {
12
12
resolveNodeModuleDir ,
13
13
UnknownProjectError ,
14
14
} from '@react-native-community/cli-tools' ;
15
- import { collectDependencies , dedupeDependencies } from './resolveDependencies' ;
16
15
import resolveReactNativePath from './resolveReactNativePath' ;
17
16
import {
18
17
readConfigFromDisk ,
19
18
readDependencyConfigFromDisk ,
20
19
} from './readConfigFromDisk' ;
21
20
import assign from './assign' ;
22
21
import merge from './merge' ;
22
+ import findDependencies from './findDependencies' ;
23
23
24
24
function getDependencyConfig (
25
25
root : string ,
@@ -112,24 +112,20 @@ function loadConfig(projectRoot: string = findProjectRoot()): Config {
112
112
return lazyProject ;
113
113
} ,
114
114
} ;
115
- const deps = collectDependencies ( projectRoot ) ;
116
- const dedupedDeps = dedupeDependencies ( deps ) ;
117
115
118
116
const finalConfig = Array . from (
119
- new Set ( [ ...Object . keys ( userConfig . dependencies ) , ...deps . keys ( ) ] ) ,
117
+ new Set ( [
118
+ ...Object . keys ( userConfig . dependencies ) ,
119
+ ...findDependencies ( projectRoot ) ,
120
+ ] ) ,
120
121
) . reduce ( ( acc : Config , dependencyName ) => {
121
122
const localDependencyRoot =
122
123
userConfig . dependencies [ dependencyName ] &&
123
124
userConfig . dependencies [ dependencyName ] . root ;
124
125
try {
125
126
let root =
126
127
localDependencyRoot ||
127
- resolveNodeModuleDir (
128
- dedupedDeps . has ( dependencyName )
129
- ? dedupedDeps . get ( dependencyName ) ! . path
130
- : projectRoot ,
131
- dependencyName ,
132
- ) ;
128
+ resolveNodeModuleDir ( projectRoot , dependencyName ) ;
133
129
let config = readDependencyConfigFromDisk ( root , dependencyName ) ;
134
130
135
131
const isPlatform = Object . keys ( config . platforms ) . length > 0 ;
0 commit comments