azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commonization of condition for linking node packages

Browse Source
This commit is contained in:
Ilya Goncharov
2019-10-09 14:23:03 +03:00
parent bcbc408892
commit bf0b4f6878
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
+2 -3
View File
@@ -91,9 +91,8 @@ internal class KotlinRootNpmResolver internal constructor(
} }
val upToDate = forceUpToDate || upToDateChecks.all { it.upToDate } val upToDate = forceUpToDate || upToDateChecks.all { it.upToDate }
val hasExternalNpmDependencies = allNpmPackages.any { it.externalNpmDependencies.isNotEmpty() } val hasNodeModulesDependentTasks = projectResolvers.values.any { it.taskRequirements.hasNodeModulesDependentTasks }
val hasNodeModulesDependent = projectResolvers.values.any { it.taskRequirements.hasNodeModulesDependentTasks } if (hasNodeModulesDependentTasks) {
if (hasExternalNpmDependencies || hasNodeModulesDependent) {
nodeJs.packageManager.resolveRootProject(rootProject, allNpmPackages, upToDate) nodeJs.packageManager.resolveRootProject(rootProject, allNpmPackages, upToDate)
} }