From 210cd982f04e338188d1ae47bf0d45b2fdb3cf6a Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 7 Sep 2020 13:40:43 +0300 Subject: [PATCH] [Gradle, JS] Use webpack config's required dependencies in karma ^KT-41663 fixed ^KT-41662 fixed --- .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index 7f927771884..6b4804df9b8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -53,7 +53,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : } override val requiredNpmDependencies: Set - get() = requiredDependencies + get() = requiredDependencies + webpackConfig.getRequiredDependencies(versions) override val settingsState: String get() = "KotlinKarma($config)" @@ -184,8 +184,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : requiredDependencies.add(versions.karmaWebpack) requiredDependencies.add(versions.webpack) - requiredDependencies.addAll(webpackConfig.getRequiredDependencies(versions)) - addPreprocessor("webpack") confJsWriters.add { it.appendln()