From 2c67ab924f4070ec8a7b6def69b69d7f81394601 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 10 Jul 2020 17:36:32 +0300
Subject: [PATCH] [Gradle, JS] this globalObject in webpack

^KT-40159 fixed
---
 .../kotlin/gradle/targets/js/webpack/KotlinWebpack.kt |  3 ++-
 .../gradle/targets/js/webpack/KotlinWebpackConfig.kt  |  1 +
 .../gradle/targets/js/webpack/KotlinWebpackOutput.kt  | 11 +++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
index 5e4a7e69577..5e702869144 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
@@ -93,7 +93,8 @@ constructor(
     @Nested
     val output: KotlinWebpackOutput = KotlinWebpackOutput(
         library = baseConventions?.archivesBaseName,
-        libraryTarget = KotlinWebpackOutput.Target.UMD
+        libraryTarget = KotlinWebpackOutput.Target.UMD,
+        globalObject = "this"
     )
 
     @get:Internal
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt
index 93faa8f0cde..8e25333fa07 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt
@@ -253,6 +253,7 @@ data class KotlinWebpackConfig(
                     },
                     library: "${output.library}",
                     libraryTarget: "${output.libraryTarget}",
+                    globalObject: "${output.globalObject}"
                 };
                 
             """.trimIndent()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt
index 690c6d2da12..3e027b879af 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt
@@ -6,10 +6,17 @@
 package org.jetbrains.kotlin.gradle.targets.js.webpack
 
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
 
 data class KotlinWebpackOutput(
-    @Input var library: String?,
-    @Input var libraryTarget: String?
+    @Input
+    @Optional
+    var library: String?,
+    @Input
+    @Optional
+    var libraryTarget: String?,
+    @Input
+    var globalObject: String = "window"
 ) {
     object Target {
         const val VAR = "var"