diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt index ed0fe504ff6..e27b017e187 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt @@ -83,6 +83,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : it.commonConfigure( compilation = compilation, binary = binary, + configurationActions = commonRunConfigurations, nodeJs = nodeJs ) @@ -142,6 +143,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : it.commonConfigure( compilation = compilation, binary = binary, + configurationActions = commonWebpackConfigurations, nodeJs = nodeJs ) @@ -173,6 +175,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : private fun KotlinWebpack.commonConfigure( compilation: KotlinJsCompilation, binary: Executable, + configurationActions: List Unit>, nodeJs: NodeJsRootExtension ) { val type = binary.mode @@ -186,7 +189,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : entryProperty.set(project.layout.file(binary.linkTask.map { it.outputFile })) - commonRunConfigurations.forEach { configure -> + configurationActions.forEach { configure -> configure() } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 94972690f5c..91899b98371 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -116,6 +116,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : dceTaskProvider = dceTaskProvider, devDceTaskProvider = devDceTaskProvider, mode = type, + configurationActions = commonRunConfigurations, nodeJs = nodeJs ) @@ -178,6 +179,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : dceTaskProvider = dceTaskProvider, devDceTaskProvider = devDceTaskProvider, mode = type, + configurationActions = commonWebpackConfigurations, nodeJs = nodeJs ) @@ -213,6 +215,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : dceTaskProvider: TaskProvider, devDceTaskProvider: TaskProvider, mode: KotlinJsBinaryMode, + configurationActions: List Unit>, nodeJs: NodeJsRootExtension ) { dependsOn( @@ -235,7 +238,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : resolveFromModulesFirst = true - commonRunConfigurations.forEach { configure -> + configurationActions.forEach { configure -> configure() } }