From f55998a015ab50204d51cfe17b034e592341cdbe Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 31 Mar 2020 14:44:39 +0300 Subject: [PATCH] [Gradle, JS] Update evaluate reporting #KT-32721 fixed --- .../targets/js/webpack/KotlinWebpackConfig.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt index bdfed6e9a0b..48a199fdd82 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt @@ -131,11 +131,12 @@ data class KotlinWebpackConfig( appendln( """ // save evaluated config file - var util = require('util'); - var fs = require("fs"); - var evaluatedConfig = util.inspect(config, {showHidden: false, depth: null, compact: false}); - fs.writeFile($filePath, evaluatedConfig, function (err) {}); - + ;(function(config) { + const util = require('util'); + const fs = require('fs'); + const evaluatedConfig = util.inspect(config, {showHidden: false, depth: null, compact: false}); + fs.writeFile($filePath, evaluatedConfig, function (err) {}); + })(config); """.trimIndent() ) } @@ -257,7 +258,7 @@ data class KotlinWebpackConfig( ;(function(config) { const webpack = require('webpack'); 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(' ')}`; ${if (progressReporterPathFilter == null) "" else """ msg = msg.replace(new RegExp(${progressReporterPathFilter.jsQuoted()}, 'g'), '');