From 5058c396c117e7a88e1eaf8e4d7bc0d50d94917f Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 20 Mar 2020 12:37:27 +0300 Subject: [PATCH] [Gradle, JS] Webpack devtool as a String #KT-37635 fixed --- .../kotlin/gradle/targets/js/webpack/KotlinWebpack.kt | 2 +- .../gradle/targets/js/webpack/KotlinWebpackConfig.kt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt index 44760db03d1..80b5483ae7f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt @@ -130,7 +130,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { var devServer: KotlinWebpackConfig.DevServer? = null @Input - var devtool: KotlinWebpackConfig.Devtool = KotlinWebpackConfig.Devtool.EVAL_SOURCE_MAP + var devtool: String = KotlinWebpackConfig.Devtool.EVAL_SOURCE_MAP private fun createRunner() = KotlinWebpackRunner( compilation.npmProject, 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 8012bb300a1..7c990157673 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 @@ -27,7 +27,7 @@ data class KotlinWebpackConfig( val bundleAnalyzerReportDir: File? = null, val reportEvaluatedConfigFile: File? = null, val devServer: DevServer? = null, - val devtool: Devtool? = Devtool.EVAL_SOURCE_MAP, + val devtool: String? = Devtool.EVAL_SOURCE_MAP, val showProgress: Boolean = false, val sourceMaps: Boolean = false, val export: Boolean = true, @@ -79,9 +79,9 @@ data class KotlinWebpackConfig( val contentBase: List ) : Serializable - enum class Devtool(val code: String) { - EVAL_SOURCE_MAP("eval-source-map"), - SOURCE_MAP("source-map") + object Devtool { + val EVAL_SOURCE_MAP = "eval-source-map" + val SOURCE_MAP = "source-map" } fun save(configFile: File) { @@ -199,7 +199,7 @@ data class KotlinWebpackConfig( use: ["kotlin-source-map-loader"], enforce: "pre" }); - config.devtool = ${devtool?.code?.let { "'$it'" } ?: false}; + config.devtool = ${devtool?.let { "'$it'" } ?: false}; """.trimIndent() )