From 3ee7e9272b9321a7108d2b3e400cf8f007ab1f2f Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 26 Dec 2019 17:23:52 +0300
Subject: [PATCH] [Gradle, JS] Depends on prod and dev compile tasks

---
 .../gradle/targets/js/ir/KotlinBrowserJsIr.kt      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
index 82bf82f5e31..60fe60ff633 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
@@ -9,8 +9,8 @@ import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Task
 import org.gradle.api.plugins.BasePluginConvention
 import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.TaskProvider
 import org.gradle.language.base.plugins.LifecycleBasePlugin
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
 import org.jetbrains.kotlin.gradle.targets.js.dsl.*
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.subtargets.BrowserDistribution
@@ -85,7 +85,11 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
             ) {
                 it.dependsOn(
                     nodeJs.npmInstallTask,
-                    compileKotlinTask,
+                    getByKind(
+                        kind,
+                        compilation.productionCompileTask,
+                        compilation.developmentCompileTask
+                    ),
                     target.project.tasks.getByName(compilation.processResourcesTaskName)
                 )
 
@@ -152,7 +156,11 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
             ) {
                 it.dependsOn(
                     nodeJs.npmInstallTask,
-                    compileKotlinTask,
+                    getByKind(
+                        kind,
+                        compilation.productionCompileTask,
+                        compilation.developmentCompileTask
+                    ),
                     target.project.tasks.getByName(compilation.processResourcesTaskName),
                     distributionTask
                 )