[Gradle, JS] KT-36784 Remove hasNodeModulesDependentTasks

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
This commit is contained in:
Ilya Goncharov
2020-04-01 12:38:01 +03:00
parent 9806ac992e
commit fe40056abe
2 changed files with 6 additions and 20 deletions
@@ -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
@@ -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())