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

Remove duplicated source-map-loader configuring and cleanup kotlin webpack config writer

Browse Source 
(cherry picked from commit 681eeaedfb359e85cf98e0e9a7239a0364a5d41c)
This commit is contained in:
ilgonmic
2019-07-13 15:13:21 +03:00
committed by Sergey Rostov
parent 3b78ef9cb2
commit deb6b7105a
1 changed files with 1 additions and 2 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/webpack/KotlinWebpackConfigWriter.kt
+1 -2
View File
@@ -186,7 +186,6 @@ data class KotlinWebpackConfigWriter(
use: ["source-map-loader"], use: ["source-map-loader"],
enforce: "pre" enforce: "pre"
}); });
config.module.rules.push({test: /\.js${'$'}/, use: ['source-map-loader'], enforce: 'pre'});
config.devtool = 'eval-source-map'; config.devtool = 'eval-source-map';
""".trimIndent() """.trimIndent()
@@ -223,7 +222,7 @@ data class KotlinWebpackConfigWriter(
const p = percentage*100; const p = percentage*100;
let msg = Math.trunc(p/100) + Math.trunc(p%100) + '% ' + message + ' ' + args.join(' '); let msg = Math.trunc(p/100) + Math.trunc(p%100) + '% ' + message + ' ' + args.join(' ');
${if (progressReporterPathFilter == null) "" else """ ${if (progressReporterPathFilter == null) "" else """
msg = msg.replace(new RegExp(${jsQuotedString(progressReporterPathFilter ?: "")}, 'g'), ''); msg = msg.replace(new RegExp(${jsQuotedString(progressReporterPathFilter)}, 'g'), '');
""".trimIndent()} """.trimIndent()}
console.log(msg); console.log(msg);
}; };