From bf0b4f6878f57865751e60e71b6cdf0d212bafe7 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 9 Oct 2019 14:23:03 +0300 Subject: [PATCH] Commonization of condition for linking node packages --- .../gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt index 58027de120e..67ab1889efa 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt @@ -91,9 +91,8 @@ internal class KotlinRootNpmResolver internal constructor( } val upToDate = forceUpToDate || upToDateChecks.all { it.upToDate } - val hasExternalNpmDependencies = allNpmPackages.any { it.externalNpmDependencies.isNotEmpty() } - val hasNodeModulesDependent = projectResolvers.values.any { it.taskRequirements.hasNodeModulesDependentTasks } - if (hasExternalNpmDependencies || hasNodeModulesDependent) { + val hasNodeModulesDependentTasks = projectResolvers.values.any { it.taskRequirements.hasNodeModulesDependentTasks } + if (hasNodeModulesDependentTasks) { nodeJs.packageManager.resolveRootProject(rootProject, allNpmPackages, upToDate) }