[Gradle, JS] Small refactoring of yarn imported
^KT-39515 fixed
This commit is contained in:
+12
-13
@@ -30,14 +30,19 @@ class YarnImportedPackagesVersionResolver(
|
||||
}
|
||||
|
||||
fun resolveAndUpdatePackages(): MutableList<String> {
|
||||
resolveAndUpdate(externalModules, false)
|
||||
resolveAndUpdate(internalCompositeModules, true)
|
||||
return importedProjectWorkspaces
|
||||
}
|
||||
resolve(externalModules, false)
|
||||
resolve(internalCompositeModules, true)
|
||||
|
||||
private fun resolveAndUpdate(modules: MutableSet<GradleNodeModule>, isWorkspace: Boolean) {
|
||||
resolve(modules, isWorkspace)
|
||||
updatePackages(modules)
|
||||
if (resolvedVersion.isNotEmpty()) {
|
||||
npmProjects.forEach {
|
||||
updatePackageJson(it.packageJson, it.npmProject.packageJsonFile)
|
||||
}
|
||||
|
||||
updatePackages(externalModules)
|
||||
updatePackages(internalCompositeModules)
|
||||
}
|
||||
|
||||
return importedProjectWorkspaces
|
||||
}
|
||||
|
||||
private fun resolve(modules: MutableSet<GradleNodeModule>, isWorkspace: Boolean) {
|
||||
@@ -63,12 +68,6 @@ class YarnImportedPackagesVersionResolver(
|
||||
}
|
||||
|
||||
private fun updatePackages(modules: MutableSet<GradleNodeModule>) {
|
||||
if (resolvedVersion.isEmpty()) return
|
||||
|
||||
npmProjects.forEach {
|
||||
updatePackageJson(it.packageJson, it.npmProject.packageJsonFile)
|
||||
}
|
||||
|
||||
modules.forEach {
|
||||
val packageJsonFile = it.path.resolve(NpmProject.PACKAGE_JSON)
|
||||
val packageJson = packageJsonFile.reader().use {
|
||||
|
||||
Reference in New Issue
Block a user