From e0be8f271f1a91c2f7d504dd22d14aaa998e1df8 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 20 Feb 2020 16:43:38 +0300
Subject: [PATCH] [Gradle, JS] Not error, but warning with test fix

---
 .../build.gradle.kts                          |  2 +-
 .../gradle/targets/js/KotlinJsPlugin.kt       | 29 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/build.gradle.kts
index 2ed8e4111af..598c8decf50 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("js").version("<pluginMarkerVersion>")
+    kotlin("js").version("<pluginMarkerVersion>").apply(false)
 }
 
 group = "com.example"
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt
index 8889a8cb150..bcef0fd0d61 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.TEST_COMPI
 import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
 import org.jetbrains.kotlin.gradle.plugin.configureDefaultVersionsResolutionStrategy
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsSingleTargetPreset
+import org.jetbrains.kotlin.gradle.plugin.whenEvaluated
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrSingleTargetPreset
 import org.jetbrains.kotlin.gradle.utils.*
 
@@ -39,20 +40,22 @@ open class KotlinJsPlugin(
             defaultJsCompilerType = PropertiesProvider(project).jsCompiler
         }
 
-        project.afterEvaluate {
-            checkNotNull(kotlinExtension._target) {
-                """
-                    Need to initialize js target.
-                    Use 
-                    kotlin {
-                        js {
-                            // Choose sub target (or both), for which js is necessary
-                            // Affect in which tests are executed and final dist (in browser is only one bundle file)
-                            browser()
-                            nodejs()
+        project.whenEvaluated {
+            if (kotlinExtension._target == null) {
+                project.logger.warn(
+                    """
+                        Need to initialize js target.
+                        Use 
+                        kotlin {
+                            js {
+                                // Choose sub target (or both), for which js is necessary
+                                // Affect in which tests are executed and final dist (in browser is only one bundle file)
+                                browser()
+                                nodejs()
+                            }
                         }
-                    }
-                """.trimIndent()
+                    """.trimIndent()
+                )
             }
         }