[Gradle, JS] force write package json in all cases
^KT-39515 fixed
This commit is contained in:
+17
-8
@@ -33,11 +33,15 @@ class YarnImportedPackagesVersionResolver(
|
|||||||
resolve(externalModules, false)
|
resolve(externalModules, false)
|
||||||
resolve(internalCompositeModules, true)
|
resolve(internalCompositeModules, true)
|
||||||
|
|
||||||
if (resolvedVersion.isNotEmpty()) {
|
npmProjects.forEach {
|
||||||
npmProjects.forEach {
|
writePackageJson(
|
||||||
updatePackageJson(it.packageJson, it.npmProject.packageJsonFile)
|
packageJson = it.packageJson,
|
||||||
}
|
path = it.npmProject.packageJsonFile,
|
||||||
|
forceWrite = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resolvedVersion.isNotEmpty()) {
|
||||||
updatePackages(externalModules)
|
updatePackages(externalModules)
|
||||||
updatePackages(internalCompositeModules)
|
updatePackages(internalCompositeModules)
|
||||||
}
|
}
|
||||||
@@ -74,16 +78,21 @@ class YarnImportedPackagesVersionResolver(
|
|||||||
Gson().fromJson<PackageJson>(it, PackageJson::class.java)
|
Gson().fromJson<PackageJson>(it, PackageJson::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
updatePackageJson(packageJson, packageJsonFile)
|
writePackageJson(
|
||||||
|
packageJson = packageJson,
|
||||||
|
path = packageJsonFile,
|
||||||
|
forceWrite = false
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun updatePackageJson(
|
private fun writePackageJson(
|
||||||
packageJson: PackageJson,
|
packageJson: PackageJson,
|
||||||
path: File
|
path: File,
|
||||||
|
forceWrite: Boolean
|
||||||
) {
|
) {
|
||||||
val updates = listOf(packageJson.dependencies, packageJson.devDependencies).map { updateVersionsMap(it) }
|
val updates = listOf(packageJson.dependencies, packageJson.devDependencies).map { updateVersionsMap(it) }
|
||||||
if (updates.any { it }) {
|
if (forceWrite || updates.any { it }) {
|
||||||
packageJson.saveTo(path)
|
packageJson.saveTo(path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user