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 418cd95ce32..a33ea8cded5 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 @@ -15,8 +15,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget -import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency -import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinProjectNpmResolution import kotlin.reflect.KClass @@ -41,8 +39,6 @@ internal class KotlinProjectNpmResolver( val compilationResolvers: Collection get() = byCompilation.values - val taskRequirements by lazy { TasksRequirements(this) } - init { addContainerListeners() } @@ -96,37 +92,9 @@ internal class KotlinProjectNpmResolver( return KotlinProjectNpmResolution( project, byCompilation.values.mapNotNull { it.close() }, - taskRequirements.byTask + resolver.nodeJs.taskRequirements.byTask ) } - - class TasksRequirements(val projectNpmResolver: KotlinProjectNpmResolver) { - val byTask = mutableMapOf>() - val byCompilation = mutableMapOf>() - - fun getTaskRequirements(compilation: KotlinJsCompilation): Collection = - byCompilation[compilation] ?: listOf() - - init { - projectNpmResolver.project.tasks.implementing(RequiresNpmDependencies::class).configureEach { task -> - if (task.enabled) { - addTaskRequirements(task as RequiresNpmDependencies) - task.dependsOn(projectNpmResolver[task.compilation].packageJsonTaskHolder) - task.dependsOn(projectNpmResolver.resolver.nodeJs.npmInstallTask) - } - } - } - - private fun addTaskRequirements(task: RequiresNpmDependencies) { - val requirements = task.requiredNpmDependencies.toList() - - byTask[task] = requirements - - byCompilation - .getOrPut(task.compilation) { mutableListOf() } - .add(task) - } - } } /**