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

[Gradle, JS] Use patch only for webpack 5

Browse Source 
^KT-45621 fixed
This commit is contained in:
Ilya Goncharov
2021-03-23 15:14:00 +03:00
committed by TeamCityServer
parent 4107378d2c
commit b385650bf0
1 changed files with 10 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
+10 -3
View File
@@ -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.npm.npmProject
import org.jetbrains.kotlin.gradle.targets.js.testing.* 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.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.targets.js.webpack.WebpackMajorVersion.Companion.choose
import org.jetbrains.kotlin.gradle.tasks.KotlinTest import org.jetbrains.kotlin.gradle.tasks.KotlinTest
import org.jetbrains.kotlin.gradle.testing.internal.reportsDir import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
@@ -233,9 +234,15 @@ class KotlinKarma(
// noinspection JSUnnecessarySemicolon // noinspection JSUnnecessarySemicolon
;(function(config) { ;(function(config) {
const webpack = require('webpack'); const webpack = require('webpack');
// https://github.com/webpack/webpack/issues/12951 ${
const PatchSourceMapSource = require('kotlin-test-js-runner/webpack-5-debug'); if (webpackMajorVersion != WebpackMajorVersion.V4) {
config.plugins.push(new PatchSourceMapSource()) """
// 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({ config.plugins.push(new webpack.SourceMapDevToolPlugin({
moduleFilenameTemplate: "[absolute-resource-path]" moduleFilenameTemplate: "[absolute-resource-path]"
})) }))