From 0b9e5e14be5c78a68984dfa1cf8afaa8eb0d9c3f Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 30 May 2022 11:36:52 +0000
Subject: [PATCH] [Gradle, JS] Use overlay with false warnings

Merge-request: KT-MR-6343
Merged-by: Ilya Goncharov <Ilya.Goncharov@jetbrains.com>

^KT-51527 fixed
---
 .../gradle/targets/js/ir/KotlinBrowserJsIr.kt      |  8 +++++++-
 .../targets/js/subtargets/KotlinBrowserJs.kt       |  8 +++++++-
 .../targets/js/webpack/KotlinWebpackConfig.kt      | 14 ++++++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
index 0c42283875c..7a979d05e67 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
@@ -117,7 +117,13 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
                         {
                             task.devServer = KotlinWebpackConfig.DevServer(
                                 open = true,
-                                static = mutableListOf(compilation.output.resourcesDir.canonicalPath)
+                                static = mutableListOf(compilation.output.resourcesDir.canonicalPath),
+                                client = KotlinWebpackConfig.DevServer.Client(
+                                    KotlinWebpackConfig.DevServer.Client.Overlay(
+                                        errors = true,
+                                        warnings = false
+                                    )
+                                )
                             )
                         },
                         {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
index 0dffcdf8bad..db0e321792e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
@@ -157,7 +157,13 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
                         {
                             task.devServer = KotlinWebpackConfig.DevServer(
                                 open = true,
-                                static = mutableListOf(compilation.output.resourcesDir.canonicalPath)
+                                static = mutableListOf(compilation.output.resourcesDir.canonicalPath),
+                                client = KotlinWebpackConfig.DevServer.Client(
+                                    KotlinWebpackConfig.DevServer.Client.Overlay(
+                                        errors = true,
+                                        warnings = false
+                                    )
+                                )
                             )
                         },
                         {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt
index 4a57f57d558..a15109383b6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt
@@ -169,8 +169,18 @@ data class KotlinWebpackConfig(
         var port: Int? = null,
         var proxy: MutableMap<String, Any>? = null,
         var static: MutableList<String>? = null,
-        var contentBase: MutableList<String>? = null
-    ) : Serializable
+        var contentBase: MutableList<String>? = null,
+        var client: Client? = null
+    ) : Serializable {
+        data class Client(
+            var overlay: Any /* Overlay | Boolean */
+        ) : Serializable {
+            data class Overlay(
+                var errors: Boolean,
+                var warnings: Boolean
+            ) : Serializable
+        }
+    }
 
     fun save(configFile: File) {
         configFile.writer().use {