From 48f8f8af5f4807c7b471509956b7a73bee4523de Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Wed, 10 Jan 2024 18:22:08 +0000 Subject: [PATCH] [K/JS] Fix useEsModules and useCommonJs DSL-functions ^KT-64561 Fixed --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 12 ++++++++---- .../kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 556d99bf138..286527d8d23 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -1868,8 +1868,10 @@ class Kotlin2JsIrGradlePluginIT : KGPBaseTest() { buildGradle.appendText( """ | - |tasks.withType(KotlinJsCompile).configureEach { - | kotlinOptions { moduleKind = "commonjs" } + |kotlin { + | js { + | useCommonJs() + | } |} """.trimMargin() ) @@ -1891,8 +1893,10 @@ class Kotlin2JsIrGradlePluginIT : KGPBaseTest() { buildGradle.appendText( """ | - |tasks.withType(KotlinJsCompile).configureEach { - | kotlinOptions { moduleKind = "es" } + |kotlin { + | js { + | useEsModules() + | } |} """.trimMargin() ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt index dc22d725977..dccc1209a58 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt @@ -388,7 +388,7 @@ constructor( compilations.all { it.kotlinOptions.configureCommonJsOptions() - binaries + it.binaries .withType(JsIrBinary::class.java) .all { it.linkTask.configure { linkTask -> @@ -402,7 +402,7 @@ constructor( compilations.all { it.kotlinOptions.configureEsModulesOptions() - binaries + it.binaries .withType(JsIrBinary::class.java) .all { it.linkTask.configure { linkTask ->