diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt index 28b99ccf85094..bd79de314a19c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt @@ -350,4 +350,25 @@ class KotlinWasmGradlePluginIT : KGPBaseTest() { } } } + + @DisplayName("Browser case works correctly with custom formatters") + @GradleTest + fun testWasmCustomFormattersUsage(gradleVersion: GradleVersion) { + project("wasm-browser-simple-project", gradleVersion) { + buildGradleKts.append( + //language=Kotlin + """ + | + | tasks.withType().configureEach { + | compilerOptions.freeCompilerArgs.add("-Xwasm-debugger-custom-formatters") + | } + """.trimMargin() + ) + + build("wasmJsBrowserDistribution") { + assertTasksExecuted(":compileKotlinWasmJs") + assertTasksExecuted(":compileProductionExecutableKotlinWasmJs") + } + } + } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/WasmConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/WasmConfigurationCacheIT.kt index b90330de2b883..2e064e53abc89 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/WasmConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/WasmConfigurationCacheIT.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName +import kotlin.io.path.appendText @MppGradlePluginTests class WasmConfigurationCacheIT : KGPBaseTest() { diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 9cb6efea4b133..a81548631d592 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -319,6 +319,7 @@ val proguard by task { !net/sf/cglib/**, !META-INF/maven**, **.class,**.properties,**.kt,**.kotlin_*,**.jnilib,**.so,**.dll,**.txt,**.caps, + custom-formatters.js, META-INF/services/**,META-INF/native/**,META-INF/extensions/**,META-INF/MANIFEST.MF, messages/**""".trimIndent()), packCompiler.map { it.outputs.files.singleFile }