From 8c38c4a8e79cf953338f7dc6b4fd69ab0b4409f4 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 1 Jun 2021 13:47:07 +0300 Subject: [PATCH] [Gradle, JS] Add dependency from packageJson task on included build's rootPackageJson --- .../kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt | 1 + 1 file changed, 1 insertion(+) 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 6aee976c81f..6861c2bc540 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 @@ -63,6 +63,7 @@ open class KotlinPackageJsonTask : DefaultTask() { npmResolutionManager.resolver[dependency.projectPath][dependency.compilationName].npmProject.packageJsonTaskPath } + producer.internalCompositeDependencies.map { dependency -> dependency.includedBuild?.task(":$PACKAGE_JSON_UMBRELLA_TASK_NAME") ?: error("includedBuild instance is not available") + dependency.includedBuild.task(":${RootPackageJsonTask.NAME}") } @get:Input