From 2e3370f7c4ae0aa2aa96a373955966a8dc82cb4e Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 23 Sep 2024 18:39:58 +0200 Subject: [PATCH] [Wasm] Since webpack emits wasm file by its own we don't need to proxy --- .../api/all/kotlin-gradle-plugin.api | 17 --------------- .../targets/js/testing/karma/KarmaConfig.kt | 7 ------- .../targets/js/testing/karma/KotlinKarma.kt | 21 ------------------- 3 files changed, 45 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/api/all/kotlin-gradle-plugin.api b/libraries/tools/kotlin-gradle-plugin/api/all/kotlin-gradle-plugin.api index b5da5feefe98a..ede0f6ed39c6f 100644 --- a/libraries/tools/kotlin-gradle-plugin/api/all/kotlin-gradle-plugin.api +++ b/libraries/tools/kotlin-gradle-plugin/api/all/kotlin-gradle-plugin.api @@ -5242,23 +5242,6 @@ public final class org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaCon public fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V } -public final class org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaFile { - public fun (Ljava/lang/String;ZZZ)V - public final fun component1 ()Ljava/lang/String; - public final fun component2 ()Z - public final fun component3 ()Z - public final fun component4 ()Z - public final fun copy (Ljava/lang/String;ZZZ)Lorg/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaFile; - public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaFile;Ljava/lang/String;ZZZILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaFile; - public fun equals (Ljava/lang/Object;)Z - public final fun getIncluded ()Z - public final fun getPattern ()Ljava/lang/String; - public final fun getServed ()Z - public final fun getWatched ()Z - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - public final class org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaStackTraceProcessorKt { public static final fun processKarmaStackTrace (Ljava/lang/String;)Ljava/lang/String; public static final fun processWebpackName (Ljava/lang/String;)Ljava/lang/String; diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt index 91db16e4a9296..48ce6177b9657 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt @@ -24,13 +24,6 @@ data class KarmaConfig( val proxies: MutableMap = mutableMapOf() ) -data class KarmaFile( - val pattern: String, - val included: Boolean, - val served: Boolean, - val watched: Boolean -) - data class KarmaClient( val args: MutableList = mutableListOf() ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index 5a6601d241885..199ca956043b0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -346,16 +346,6 @@ class KotlinKarma( config.files.add(npmProject.require("kotlin-web-helpers/dist/kotlin-test-karma-runner.js")) if (!debug) { if (platformType == KotlinPlatformType.wasm) { - val wasmFile = file.parentFile.resolve("${file.nameWithoutExtension}.wasm") - val wasmFileString = wasmFile.normalize().absolutePath - config.files.add( - KarmaFile( - pattern = wasmFileString, - included = false, - served = true, - watched = false - ) - ) config.files.add( createLoadWasm(npmProject.dir.getFile(), file).normalize().absolutePath ) @@ -387,17 +377,6 @@ class KotlinKarma( config.frameworks.add("karma-kotlin-debug") } - val resources = object { - val pattern = file.parentFile.resolve("**/*").normalize().absolutePath - val watched = false - val included = false - } - - config.files.add( - resources - ) - config.proxies["/"] = "/base/kotlin/" - if (config.browsers.isEmpty()) { error("No browsers configured for $task") }