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

[Gradle, JS] Update evaluate reporting

Browse Source 
#KT-32721 fixed
This commit is contained in:
Ilya Goncharov
2020-03-31 14:44:39 +03:00
parent dd320040cd
commit f55998a015
1 changed files with 7 additions and 6 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/KotlinWebpackConfig.kt
+7 -6
View File
@@ -131,11 +131,12 @@ data class KotlinWebpackConfig(
appendln( appendln(
""" """
// save evaluated config file // save evaluated config file
var util = require('util'); ;(function(config) {
var fs = require("fs"); const util = require('util');
var evaluatedConfig = util.inspect(config, {showHidden: false, depth: null, compact: false}); const fs = require('fs');
fs.writeFile($filePath, evaluatedConfig, function (err) {}); const evaluatedConfig = util.inspect(config, {showHidden: false, depth: null, compact: false});
fs.writeFile($filePath, evaluatedConfig, function (err) {});
})(config);
""".trimIndent() """.trimIndent()
) )
} }
@@ -257,7 +258,7 @@ data class KotlinWebpackConfig(
;(function(config) { ;(function(config) {
const webpack = require('webpack'); const webpack = require('webpack');
const handler = (percentage, message, ...args) => { const handler = (percentage, message, ...args) => {
let p = percentage * 100; const p = percentage * 100;
let msg = `${"$"}{Math.trunc(p / 10)}${"$"}{Math.trunc(p % 10)}% ${"$"}{message} ${"$"}{args.join(' ')}`; let msg = `${"$"}{Math.trunc(p / 10)}${"$"}{Math.trunc(p % 10)}% ${"$"}{message} ${"$"}{args.join(' ')}`;
${if (progressReporterPathFilter == null) "" else """ ${if (progressReporterPathFilter == null) "" else """
msg = msg.replace(new RegExp(${progressReporterPathFilter.jsQuoted()}, 'g'), ''); msg = msg.replace(new RegExp(${progressReporterPathFilter.jsQuoted()}, 'g'), '');