From 956b57a55d7cd34d648a26409376818a094d3b39 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Wed, 19 Feb 2020 12:04:51 +0300
Subject: [PATCH] [Gradle, JS] Do not duplicate target initialization

---
 .../gradle/dsl/KotlinProjectExtension.kt      | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
index 7b58f140e30..0a430732516 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
@@ -117,30 +117,32 @@ open class KotlinJsProjectExtension :
         compiler: JsCompilerType = defaultJsCompilerType,
         body: KotlinJsTargetDsl.() -> Unit
     ) {
-        val target: KotlinJsTargetDsl = when (compiler) {
-            legacy -> legacyPreset
-                .also { it.irPreset = null }
-                .createTarget("js")
-            ir -> irPreset
-                .also { it.mixedMode = false }
-                .createTarget("js")
-            both -> legacyPreset
-                .also {
-                    irPreset.mixedMode = true
-                    it.irPreset = irPreset
-                }
-                .createTarget(
-                    lowerCamelCaseName(
-                        "js",
-                        legacy.name
+        if (_target == null) {
+            val target: KotlinJsTargetDsl = when (compiler) {
+                legacy -> legacyPreset
+                    .also { it.irPreset = null }
+                    .createTarget("js")
+                ir -> irPreset
+                    .also { it.mixedMode = false }
+                    .createTarget("js")
+                both -> legacyPreset
+                    .also {
+                        irPreset.mixedMode = true
+                        it.irPreset = irPreset
+                    }
+                    .createTarget(
+                        lowerCamelCaseName(
+                            "js",
+                            legacy.name
+                        )
                     )
-                )
+            }
+
+            this._target = target
+
+            target.project.components.addAll(target.components)
         }
 
-        this._target = target
-
-        target.project.components.addAll(target.components)
-
         target.run(body)
     }