azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/JS] Fix useEsModules and useCommonJs DSL-functions ^KT-64561 Fixed

Browse Source
This commit is contained in:
Artem Kobzar
2024-01-10 18:22:08 +00:00
committed by Space Team
parent 300702a7e7
commit 48f8f8af5f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+8 -4
View File
@@ -1868,8 +1868,10 @@ class Kotlin2JsIrGradlePluginIT : KGPBaseTest() {
buildGradle.appendText( buildGradle.appendText(
""" """
| |
|tasks.withType(KotlinJsCompile).configureEach { |kotlin {
| kotlinOptions { moduleKind = "commonjs" } | js {
| useCommonJs()
| }
|} |}
""".trimMargin() """.trimMargin()
) )
@@ -1891,8 +1893,10 @@ class Kotlin2JsIrGradlePluginIT : KGPBaseTest() {
buildGradle.appendText( buildGradle.appendText(
""" """
| |
|tasks.withType(KotlinJsCompile).configureEach { |kotlin {
| kotlinOptions { moduleKind = "es" } | js {
| useEsModules()
| }
|} |}
""".trimMargin() """.trimMargin()
) )
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
+2 -2
View File
@@ -388,7 +388,7 @@ constructor(
compilations.all { compilations.all {
it.kotlinOptions.configureCommonJsOptions() it.kotlinOptions.configureCommonJsOptions()
binaries it.binaries
.withType(JsIrBinary::class.java) .withType(JsIrBinary::class.java)
.all { .all {
it.linkTask.configure { linkTask -> it.linkTask.configure { linkTask ->
@@ -402,7 +402,7 @@ constructor(
compilations.all { compilations.all {
it.kotlinOptions.configureEsModulesOptions() it.kotlinOptions.configureEsModulesOptions()
binaries it.binaries
.withType(JsIrBinary::class.java) .withType(JsIrBinary::class.java)
.all { .all {
it.linkTask.configure { linkTask -> it.linkTask.configure { linkTask ->