Prioritize nodeModulesPath over config.root if present. (microsoft#2507)

joarkosberg · DmitriyKirakosyan · web-flow · commit df2de5e4702a · 2023-11-01T12:56:46.000+07:00
Co-authored-by: Dima &lt;v-dmkira@microsoft.com&gt;
diff --git a/android/codepush.gradle b/android/codepush.gradle
@@ -33,10 +33,10 @@ gradle.projectsEvaluated {
         }
 
         def nodeModulesPath;
-        if (config.root) {
-            nodeModulesPath = Paths.get(config.root.asFile.get().absolutePath, "/node_modules");
-        } else if (project.hasProperty('nodeModulesPath')) {
+        if (project.hasProperty('nodeModulesPath')) {
             nodeModulesPath = project.nodeModulesPath
+        } else if (config.root) {
+            nodeModulesPath = Paths.get(config.root.asFile.get().absolutePath, "/node_modules");
         } else {
             nodeModulesPath = "../../node_modules";
         }

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ gradle.projectsEvaluated {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`def nodeModulesPath;`
`36`		`- if (config.root) {`
`37`		`- nodeModulesPath = Paths.get(config.root.asFile.get().absolutePath, "/node_modules");`
`38`		`- } else if (project.hasProperty('nodeModulesPath')) {`
	`36`	`+ if (project.hasProperty('nodeModulesPath')) {`
`39`	`37`	`nodeModulesPath = project.nodeModulesPath`
	`38`	`+ } else if (config.root) {`
	`39`	`+ nodeModulesPath = Paths.get(config.root.asFile.get().absolutePath, "/node_modules");`
`40`	`40`	`} else {`
`41`	`41`	`nodeModulesPath = "../../node_modules";`
`42`	`42`	`}`