From 83db4a06d9c3de79a6d10f260764424672e482e8 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 1 May 2023 20:15:32 +0200 Subject: [PATCH] [Gradle, JS] Make esModules property finalized on read --- .../kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt | 4 ++-- .../kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt | 2 +- 2 files changed, 3 insertions(+), 3 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 465c5e03119..89c77233099 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 @@ -290,11 +290,11 @@ abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : val moduleKind = binary.linkTask.flatMap { it.compilerOptions.moduleKind } this.entryModuleName.set(entryModuleName) - this.esModules.set( + this.esModules.convention( project.provider { platformType == KotlinPlatformType.wasm || moduleKind.get() == JsModuleKind.MODULE_ES } - ) + ).finalizeValueOnRead() mainOutputFileName.convention(defaultArchivesName.orElse("main").map { "$it.js" }).finalizeValueOnRead() 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 08926867c92..1394d1f10e6 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 @@ -300,7 +300,7 @@ abstract class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : } ) - this.esModules.set(false) + this.esModules.convention(false).finalizeValueOnRead() resolveFromModulesFirst = true