[Gradle, JS] this globalObject in webpack

^KT-40159 fixed
This commit is contained in:
Ilya Goncharov
2020-07-10 17:36:32 +03:00
parent 93a82060d4
commit 2c67ab924f
3 changed files with 12 additions and 3 deletions
@@ -93,7 +93,8 @@ constructor(
@Nested @Nested
val output: KotlinWebpackOutput = KotlinWebpackOutput( val output: KotlinWebpackOutput = KotlinWebpackOutput(
library = baseConventions?.archivesBaseName, library = baseConventions?.archivesBaseName,
libraryTarget = KotlinWebpackOutput.Target.UMD libraryTarget = KotlinWebpackOutput.Target.UMD,
globalObject = "this"
) )
@get:Internal @get:Internal
@@ -253,6 +253,7 @@ data class KotlinWebpackConfig(
}, },
library: "${output.library}", library: "${output.library}",
libraryTarget: "${output.libraryTarget}", libraryTarget: "${output.libraryTarget}",
globalObject: "${output.globalObject}"
}; };
""".trimIndent() """.trimIndent()
@@ -6,10 +6,17 @@
package org.jetbrains.kotlin.gradle.targets.js.webpack package org.jetbrains.kotlin.gradle.targets.js.webpack
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Optional
data class KotlinWebpackOutput( data class KotlinWebpackOutput(
@Input var library: String?, @Input
@Input var libraryTarget: String? @Optional
var library: String?,
@Input
@Optional
var libraryTarget: String?,
@Input
var globalObject: String = "window"
) { ) {
object Target { object Target {
const val VAR = "var" const val VAR = "var"