From deb6b7105a4a97a7f1bfb53a618ca3ae0cb8af6c Mon Sep 17 00:00:00 2001 From: ilgonmic Date: Sat, 13 Jul 2019 15:13:21 +0300 Subject: [PATCH] Remove duplicated source-map-loader configuring and cleanup kotlin webpack config writer (cherry picked from commit 681eeaedfb359e85cf98e0e9a7239a0364a5d41c) --- .../gradle/targets/js/webpack/KotlinWebpackConfigWriter.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfigWriter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfigWriter.kt index a499a12fb7a..e8a92a5c01f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfigWriter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfigWriter.kt @@ -186,7 +186,6 @@ data class KotlinWebpackConfigWriter( use: ["source-map-loader"], enforce: "pre" }); - config.module.rules.push({test: /\.js${'$'}/, use: ['source-map-loader'], enforce: 'pre'}); config.devtool = 'eval-source-map'; """.trimIndent() @@ -223,7 +222,7 @@ data class KotlinWebpackConfigWriter( const p = percentage*100; let msg = Math.trunc(p/100) + Math.trunc(p%100) + '% ' + message + ' ' + args.join(' '); ${if (progressReporterPathFilter == null) "" else """ - msg = msg.replace(new RegExp(${jsQuotedString(progressReporterPathFilter ?: "")}, 'g'), ''); + msg = msg.replace(new RegExp(${jsQuotedString(progressReporterPathFilter)}, 'g'), ''); """.trimIndent()} console.log(msg); };