From 61f14374b9e378b28b785f0106ccb5af1a19bc79 Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Thu, 1 Feb 2024 11:00:19 +0000 Subject: [PATCH] [Gradle JS/Wasm] Force CLI arg usage in case of debug property for the Webpack DevServer --- .../kotlin/gradle/targets/js/webpack/KotlinWebpack.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt index f421c637b08..2e904341a07 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt @@ -183,6 +183,9 @@ constructor( open val configDirectory: File? get() = projectDir.resolve("webpack.config.d").takeIf { it.isDirectory } + @Input + var debug: Boolean = false + @Input var bin: String = "webpack/bin/webpack.js" @@ -263,13 +266,19 @@ constructor( webpackConfigAppliers .forEach { it.execute(config) } + val webpackArgs = args.run { + val port = devServerProperty.orNull?.port + if (debug && port != null) plus(listOf("--port", port.toString())) + else this + } + return KotlinWebpackRunner( npmProject, logger, configFile.get(), execHandleFactory, bin, - args, + webpackArgs, nodeArgs, config )