From 1a81f023770da3cfa00bae9e1879bc40897f004a Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 9 Jun 2020 16:24:51 +0300 Subject: [PATCH] [Gradle, JS] Add tools npm dependencies as input to package json task --- .../targets/js/npm/tasks/KotlinPackageJsonTask.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt index 37f52970c0a..aaa33814021 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt @@ -7,10 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.js.npm.tasks import org.gradle.api.DefaultTask import org.gradle.api.plugins.BasePlugin -import org.gradle.api.tasks.Nested -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction -import org.gradle.api.tasks.TaskProvider +import org.gradle.api.tasks.* import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin @@ -37,6 +34,14 @@ open class KotlinPackageJsonTask : DefaultTask() { dependency.includedBuild.task(":$PACKAGE_JSON_UMBRELLA_TASK_NAME") } + @get:Input + internal val toolsNpmDependencies: List + get() = nodeJs.taskRequirements + .getTaskRequirements(compilation) + .flatMap { it.requiredNpmDependencies } + .map { it.createDependency(project) } + .map { it.toString() } + @get:Nested internal val producerInputs: KotlinCompilationNpmResolver.PackageJsonProducerInputs get() = producer.inputs