[Gradle, JS] Make esModules property finalized on read
This commit is contained in:
+2
-2
@@ -290,11 +290,11 @@ abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
|
|||||||
val moduleKind = binary.linkTask.flatMap { it.compilerOptions.moduleKind }
|
val moduleKind = binary.linkTask.flatMap { it.compilerOptions.moduleKind }
|
||||||
|
|
||||||
this.entryModuleName.set(entryModuleName)
|
this.entryModuleName.set(entryModuleName)
|
||||||
this.esModules.set(
|
this.esModules.convention(
|
||||||
project.provider {
|
project.provider {
|
||||||
platformType == KotlinPlatformType.wasm || moduleKind.get() == JsModuleKind.MODULE_ES
|
platformType == KotlinPlatformType.wasm || moduleKind.get() == JsModuleKind.MODULE_ES
|
||||||
}
|
}
|
||||||
)
|
).finalizeValueOnRead()
|
||||||
|
|
||||||
mainOutputFileName.convention(defaultArchivesName.orElse("main").map { "$it.js" }).finalizeValueOnRead()
|
mainOutputFileName.convention(defaultArchivesName.orElse("main").map { "$it.js" }).finalizeValueOnRead()
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -300,7 +300,7 @@ abstract class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
this.esModules.set(false)
|
this.esModules.convention(false).finalizeValueOnRead()
|
||||||
|
|
||||||
resolveFromModulesFirst = true
|
resolveFromModulesFirst = true
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user