From 6106a07282bfca888f494e2b19d3dfcaf2a41e82 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 2 Apr 2020 16:57:04 +0300 Subject: [PATCH] [Gradle, JS] Css settings for karma #KT-32721 fixed --- .../kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt | 6 +++--- .../gradle/targets/js/webpack/KotlinWebpackCssSettings.kt | 2 +- 2 files changed, 4 insertions(+), 4 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 b4e44922087..9103ff7405c 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 cssSettings: KotlinWebpackCssSettings? = null, + val cssSettings: KotlinWebpackCssSettings = KotlinWebpackCssSettings(), val devtool: String? = WebpackDevtool.EVAL_SOURCE_MAP, val showProgress: Boolean = false, val sourceMaps: Boolean = false, @@ -54,7 +54,7 @@ data class KotlinWebpackConfig( it.add(versions.webpackDevServer) } - if (cssSettings == null || !cssSettings.enabled) return@also + if (!cssSettings.enabled) return@also it.add(versions.cssLoader) if (cssSettings.inline) { @@ -248,7 +248,7 @@ data class KotlinWebpackConfig( } private fun Appendable.appendCssSettings() { - if (cssSettings == null || !cssSettings.enabled) + if (!cssSettings.enabled) return appendln( diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSettings.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSettings.kt index 83ae2ce52c5..6ae43fceb12 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSettings.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSettings.kt @@ -12,5 +12,5 @@ data class KotlinWebpackCssSettings( var enabled: Boolean = true, @Input - var inline: Boolean = false + var inline: Boolean = true ) \ No newline at end of file