From 2ffd8bed48e44c5b0e0d84a5336a93802dc9435b Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 18 Oct 2019 13:15:45 +0300
Subject: [PATCH] [Gradle, JS] Depends on according to Task Configuration
 Avoidance

---
 .../targets/js/subtargets/KotlinBrowserJs.kt       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
index 4b8e65228cf..c6b6d57a25a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
@@ -73,7 +73,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
 
         buildVariants.all { buildVariant ->
             val kind = buildVariant.kind
-            project.registerTask<KotlinWebpack>(
+            val runTask = project.registerTask<KotlinWebpack>(
                 disambiguateCamelCased(
                     lowerCamelCaseName(
                         buildVariant.name,
@@ -110,10 +110,13 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
                     }
                     BuildVariantKind.DEBUG -> {
                         it.dependsOn(compileKotlinTask)
-                        target.runTask.dependsOn(it)
                     }
                 }
             }
+
+            if (kind == BuildVariantKind.DEBUG) {
+                target.runTask.dependsOn(runTask)
+            }
         }
     }
 
@@ -129,7 +132,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
 
         buildVariants.all { buildVariant ->
             val kind = buildVariant.kind
-            project.registerTask<KotlinWebpack>(
+            val webpackTask = project.registerTask<KotlinWebpack>(
                 disambiguateCamelCased(
                     lowerCamelCaseName(
                         buildVariant.name,
@@ -154,13 +157,16 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
                         }
                         it.resolveFromModulesFirst = true
                         it.dependsOn(dceTaskProvider)
-                        project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(it)
                     }
                     BuildVariantKind.DEBUG -> {
                         it.dependsOn(compileKotlinTask)
                     }
                 }
             }
+
+            if (kind == BuildVariantKind.RELEASE) {
+                project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(webpackTask)
+            }
         }
     }