From 2a2f59ae1cbcf60c1bc2f3d78710cfcb2fbf295a Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Wed, 15 May 2019 12:38:16 +0300
Subject: [PATCH] Gradle, js, run: fix run dependencies on browserRun and
 nodeRun

---
 .../kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt   | 5 +++--
 .../kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt      | 4 ++--
 2 files changed, 5 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 0e26d478a89..7adfd383920 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
@@ -50,7 +50,7 @@ class KotlinBrowserJs(target: KotlinJsTarget) :
             project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(it)
         }
 
-        project.createOrRegisterTask<KotlinWebpack>(disambiguateCamelCased("run")) {
+        val run = project.createOrRegisterTask<KotlinWebpack>(disambiguateCamelCased("run")) {
             val compileKotlinTask = compilation.compileKotlinTask
             it.dependsOn(
                 target.npmResolveTaskHolder.getTaskOrProvider(),
@@ -67,7 +67,8 @@ class KotlinBrowserJs(target: KotlinJsTarget) :
             )
 
             it.outputs.upToDateWhen { false }
-            target.runTask.dependsOn(it)
         }
+
+        target.runTask.dependsOn(run.getTaskOrProvider())
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt
index 905c02da56d..99e4a5c2282 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt
@@ -36,11 +36,11 @@ class KotlinNodeJs(target: KotlinJsTarget) :
 
             val npmProject = project.npmProject
             runTask.args(npmProject.compileOutput(compileKotlinTask))
-
-            target.runTask.dependsOn(runTask)
         }
 
         addSourceMapSupport(compilation, runTaskHolder, project)
+
+        target.runTask.dependsOn(runTaskHolder.getTaskOrProvider())
     }
 
     private fun addSourceMapSupport(