@@ -12,14 +12,14 @@ import {
1212 resolveNodeModuleDir ,
1313 UnknownProjectError ,
1414} from '@react-native-community/cli-tools' ;
15- import { collectDependencies , dedupeDependencies } from './resolveDependencies' ;
1615import resolveReactNativePath from './resolveReactNativePath' ;
1716import {
1817 readConfigFromDisk ,
1918 readDependencyConfigFromDisk ,
2019} from './readConfigFromDisk' ;
2120import assign from './assign' ;
2221import merge from './merge' ;
22+ import findDependencies from './findDependencies' ;
2323
2424function getDependencyConfig (
2525 root : string ,
@@ -112,24 +112,20 @@ function loadConfig(projectRoot: string = findProjectRoot()): Config {
112112 return lazyProject ;
113113 } ,
114114 } ;
115- const deps = collectDependencies ( projectRoot ) ;
116- const dedupedDeps = dedupeDependencies ( deps ) ;
117115
118116 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+ ] ) ,
120121 ) . reduce ( ( acc : Config , dependencyName ) => {
121122 const localDependencyRoot =
122123 userConfig . dependencies [ dependencyName ] &&
123124 userConfig . dependencies [ dependencyName ] . root ;
124125 try {
125126 let root =
126127 localDependencyRoot ||
127- resolveNodeModuleDir (
128- dedupedDeps . has ( dependencyName )
129- ? dedupedDeps . get ( dependencyName ) ! . path
130- : projectRoot ,
131- dependencyName ,
132- ) ;
128+ resolveNodeModuleDir ( projectRoot , dependencyName ) ;
133129 let config = readDependencyConfigFromDisk ( root , dependencyName ) ;
134130
135131 const isPlatform = Object . keys ( config . platforms ) . length > 0 ;
0 commit comments