From d3cb31c5842c8fc26c8e9c3fccc4ce51dcb86597 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 27 Mar 2020 15:49:50 +0300
Subject: [PATCH] [Gradle, JS] KT-36784 Add internalCompositeDependencies as
 inputs

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
---
 .../targets/js/npm/resolver/KotlinCompilationNpmResolver.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
index a55d32488df..08889e03349 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
@@ -53,7 +53,7 @@ internal class KotlinCompilationNpmResolver(
 
     override fun toString(): String = "KotlinCompilationNpmResolver(${npmProject.name})"
 
-    val aggregatedConfiguration: Configuration by lazy {
+    private val aggregatedConfiguration: Configuration by lazy {
         createAggregatedConfiguration()
     }
 
@@ -247,6 +247,9 @@ internal class KotlinCompilationNpmResolver(
         @get:Input
         val internalDependencies: Collection<String>,
 
+        @get:Input
+        val internalCompositeDependencies: Collection<String>,
+
         @get:InputFiles
         val externalGradleDependencies: Collection<File>,
 
@@ -264,6 +267,7 @@ internal class KotlinCompilationNpmResolver(
         val inputs: PackageJsonProducerInputs
             get() = PackageJsonProducerInputs(
                 internalDependencies.map { it.npmProject.name },
+                internalCompositeDependencies.map { it.includedBuild.projectDir.canonicalPath },
                 externalGradleDependencies.map { it.artifact.file },
                 externalNpmDependencies.map { "${it.scope} ${it.key}:${it.version}" }
             )