[Gradle, JS] Provide js compilations parameters to link tasks

#KT-36796 fixed
This commit is contained in:
Ilya Goncharov
2020-02-17 19:21:03 +03:00
parent ce8e511b79
commit 9f0ef77531
2 changed files with 27 additions and 4 deletions
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.gradle.targets.js.JsAggregatingExecutionSource
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsProducingType
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsReportAggregatingTestRun
import org.jetbrains.kotlin.gradle.targets.js.dsl.*
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
import javax.inject.Inject
@@ -129,11 +130,24 @@ constructor(
fun useCommonJs() {
compilations.all {
it.compileKotlinTask.kotlinOptions {
moduleKind = "commonjs"
sourceMap = true
sourceMapEmbedSources = null
it.compileKotlinTask.configureCommonJsOptions()
listOf(
it.productionLinkTask,
it.developmentLinkTask
).forEach {
it.configure { linkTask ->
linkTask.configureCommonJsOptions()
}
}
}
}
private fun Kotlin2JsCompile.configureCommonJsOptions() {
kotlinOptions {
moduleKind = "commonjs"
sourceMap = true
sourceMapEmbedSources = null
}
}
}
@@ -72,6 +72,15 @@ open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) :
PRODUCE_UNZIPPED_KLIB
)
}
listOf(
it.productionLinkTask,
it.developmentLinkTask
).forEach {
it.configure { linkTask ->
linkTask.kotlinOptions.configureOptions()
}
}
}
}