azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Use webpack config's required dependencies in karma

Browse Source 
^KT-41663 fixed
^KT-41662 fixed
This commit is contained in:
Ilya Goncharov
2020-09-07 13:40:43 +03:00
parent b5aca450b1
commit 210cd982f0
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+1 -3
View File
@@ -53,7 +53,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
} }
override val requiredNpmDependencies: Set<RequiredKotlinJsDependency> override val requiredNpmDependencies: Set<RequiredKotlinJsDependency>
get() = requiredDependencies get() = requiredDependencies + webpackConfig.getRequiredDependencies(versions)
override val settingsState: String override val settingsState: String
get() = "KotlinKarma($config)" get() = "KotlinKarma($config)"
@@ -184,8 +184,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
requiredDependencies.add(versions.karmaWebpack) requiredDependencies.add(versions.karmaWebpack)
requiredDependencies.add(versions.webpack) requiredDependencies.add(versions.webpack)
requiredDependencies.addAll(webpackConfig.getRequiredDependencies(versions))
addPreprocessor("webpack") addPreprocessor("webpack")
confJsWriters.add { confJsWriters.add {
it.appendln() it.appendln()