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 5a9791f598d..5e4a7e69577 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 @@ -158,7 +158,7 @@ constructor( var sourceMaps: Boolean = true @Nested - val cssSettings: KotlinWebpackCssSettings = KotlinWebpackCssSettings() + val cssSupport: KotlinWebpackCssSupport = KotlinWebpackCssSupport() @Input @Optional @@ -187,7 +187,7 @@ constructor( outputFileName = outputFileName, configDirectory = configDirectory, bundleAnalyzerReportDir = if (report) reportDir else null, - cssSettings = cssSettings, + cssSupport = cssSupport, devServer = devServer, devtool = devtool, sourceMaps = sourceMaps, 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 2b19633f756..4518d58e47d 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 @@ -30,7 +30,7 @@ data class KotlinWebpackConfig( val bundleAnalyzerReportDir: File? = null, val reportEvaluatedConfigFile: File? = null, val devServer: DevServer? = null, - val cssSettings: KotlinWebpackCssSettings = KotlinWebpackCssSettings(), + val cssSupport: KotlinWebpackCssSupport = KotlinWebpackCssSupport(), val devtool: String? = WebpackDevtool.EVAL_SOURCE_MAP, val showProgress: Boolean = false, val sourceMaps: Boolean = false, @@ -57,10 +57,10 @@ data class KotlinWebpackConfig( it.add(versions.webpackDevServer) } - if (!cssSettings.enabled || cssSettings.rules.isEmpty()) return@also + if (!cssSupport.enabled || cssSupport.rules.isEmpty()) return@also it.add(versions.cssLoader) - cssSettings.rules.forEach { rule -> + cssSupport.rules.forEach { rule -> when (rule.mode) { EXTRACT -> it.add(versions.miniCssExtractPlugin) INLINE -> it.add(versions.styleLoader) @@ -260,7 +260,7 @@ data class KotlinWebpackConfig( } private fun Appendable.appendCssSettings() { - if (!cssSettings.enabled || cssSettings.rules.isEmpty()) + if (!cssSupport.enabled || cssSupport.rules.isEmpty()) return appendln( @@ -298,7 +298,7 @@ data class KotlinWebpackConfig( | """.trimMargin() - cssSettings.rules.forEach { rule -> + cssSupport.rules.forEach { rule -> appendln( """ | ;(function(config) { 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/KotlinWebpackCssSupport.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSettings.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackCssSupport.kt index c7131391227..fe95b11b3ef 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/KotlinWebpackCssSupport.kt @@ -10,9 +10,9 @@ import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Nested import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackCssMode.INLINE -data class KotlinWebpackCssSettings( +data class KotlinWebpackCssSupport( @Input - var enabled: Boolean = true, + var enabled: Boolean = false, @Nested var rules: MutableList = mutableListOf(