From fe40056abeed2ed68805695bc0295ee3f15c0d00 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Wed, 1 Apr 2020 12:38:01 +0300
Subject: [PATCH] [Gradle, JS] KT-36784 Remove hasNodeModulesDependentTasks

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
---
 .../js/npm/resolver/KotlinProjectNpmResolver.kt   | 11 -----------
 .../js/npm/resolver/KotlinRootNpmResolver.kt      | 15 ++++++---------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
index b5bf6822097..300f0b957b9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
@@ -107,13 +107,6 @@ internal class KotlinProjectNpmResolver(
         fun getTaskRequirements(compilation: KotlinJsCompilation): Collection<RequiresNpmDependencies> =
             byCompilation[compilation] ?: listOf()
 
-        val hasNodeModulesDependentTasks: Boolean
-            get() = _hasNodeModulesDependentTasks
-
-        @Volatile
-        var _hasNodeModulesDependentTasks = false
-            private set
-
         init {
             projectNpmResolver.project.tasks.implementing(RequiresNpmDependencies::class).forEach { task ->
                 if (task.enabled) {
@@ -125,10 +118,6 @@ internal class KotlinProjectNpmResolver(
         }
 
         private fun addTaskRequirements(task: RequiresNpmDependencies) {
-            if (!_hasNodeModulesDependentTasks && task.nodeModulesRequired) {
-                _hasNodeModulesDependentTasks = true
-            }
-
             val requirements = task.requiredNpmDependencies.toList()
 
             byTask[task] = requirements
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 f91540fb3b1..773c97aee28 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
@@ -108,15 +108,12 @@ internal class KotlinRootNpmResolver internal constructor(
         }
         val upToDate = forceUpToDate || upToDateChecks.all { it.upToDate }
 
-        val hasNodeModulesDependentTasks = projectResolvers.values.any { it.taskRequirements.hasNodeModulesDependentTasks }
-        if (hasNodeModulesDependentTasks) {
-            nodeJs.packageManager.resolveRootProject(
-                rootProject,
-                allNpmPackages,
-                upToDate,
-                *nodeJs.npmInstallTask.args.toTypedArray()
-            )
-        }
+        nodeJs.packageManager.resolveRootProject(
+            rootProject,
+            allNpmPackages,
+            upToDate,
+            nodeJs.npmInstallTask.args
+        )
 
         nodeJs.rootNodeModulesStateFile.writeText(System.currentTimeMillis().toString())