From 97fc3fe989fa3596aa0ba20f4da576a3026a5b2d Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Wed, 5 Jun 2019 15:45:47 +0300 Subject: [PATCH] Gradle, js, karma: use ^4.0.0-rc.6 to use webpack 3, require webpack #KT-31564 Fixed --- .../org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt | 2 +- .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index 5bf4e01ad36..42af97fb6a6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -35,7 +35,7 @@ class NpmVersions { val karmaSafariLauncher = NpmPackageVersion("karma-safari-launcher", "1.0.0") val karmaMocha = NpmPackageVersion("karma-mocha", "1.3.0") - val karmaWebpack = NpmPackageVersion("karma-webpack", "3.0.5") + val karmaWebpack = NpmPackageVersion("karma-webpack", "^4.0.0-rc.6") val karmaCoverage = NpmPackageVersion("karma-coverage", "1.1.2") val karmaSourceMapLoader = NpmPackageVersion("karma-sourcemap-loader", "0.3.7") 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 c746d8ba2cb..f78632bdf00 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 @@ -104,6 +104,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF private fun useWebpack() { requiredDependencies.add(versions.karmaWebpack) + requiredDependencies.add(versions.webpack) addPreprocessor("webpack") confJsWriters.add {