From b385650bf04e7ffd195920ad89f4448101ae0e16 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 23 Mar 2021 15:14:00 +0300 Subject: [PATCH] [Gradle, JS] Use patch only for webpack 5 ^KT-45621 fixed --- .../gradle/targets/js/testing/karma/KotlinKarma.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 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 725f76c095c..7d79e1c613d 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 @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.testing.* import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig +import org.jetbrains.kotlin.gradle.targets.js.webpack.WebpackMajorVersion import org.jetbrains.kotlin.gradle.targets.js.webpack.WebpackMajorVersion.Companion.choose import org.jetbrains.kotlin.gradle.tasks.KotlinTest import org.jetbrains.kotlin.gradle.testing.internal.reportsDir @@ -233,9 +234,15 @@ class KotlinKarma( // noinspection JSUnnecessarySemicolon ;(function(config) { const webpack = require('webpack'); - // https://github.com/webpack/webpack/issues/12951 - const PatchSourceMapSource = require('kotlin-test-js-runner/webpack-5-debug'); - config.plugins.push(new PatchSourceMapSource()) + ${ + if (webpackMajorVersion != WebpackMajorVersion.V4) { + """ + // https://github.com/webpack/webpack/issues/12951 + const PatchSourceMapSource = require('kotlin-test-js-runner/webpack-5-debug'); + config.plugins.push(new PatchSourceMapSource()) + """ + } else "" + } config.plugins.push(new webpack.SourceMapDevToolPlugin({ moduleFilenameTemplate: "[absolute-resource-path]" })) -- GitLab