diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index 4ee45ac3471..83be30e4d76 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -27,7 +27,7 @@ class NpmVersions { val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.16") val cssLoader = NpmPackageVersion("css-loader", "3.4.2") - val styleLoader = NpmPackageVersion("css-loader", "1.1.3") + val styleLoader = NpmPackageVersion("style-loader", "1.1.3") val miniCssExtractPlugin = NpmPackageVersion("mini-css-extract-plugin", "0.9.0") val mocha = NpmPackageVersion("mocha", "7.1.1") 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 bcaf397054e..93dc42c36d7 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 @@ -149,6 +149,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { outputFileName = outputFileName, configDirectory = configDirectory, bundleAnalyzerReportDir = if (report) reportDir else null, + cssSettings = cssSettings, devServer = devServer, devtool = devtool, sourceMaps = sourceMaps, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackAssetExtractPolicy.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackAssetExtractPolicy.kt new file mode 100644 index 00000000000..85cbc2314b3 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackAssetExtractPolicy.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.targets.js.webpack + +enum class KotlinWebpackAssetExtractPolicy { + ALWAYS, + DEPENDS_ON_MODE, + NONE +} \ No newline at end of file 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 5c8d19d26c9..51ba0843321 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 @@ -7,16 +7,10 @@ package org.jetbrains.kotlin.gradle.targets.js.webpack import org.gradle.api.tasks.Input -class KotlinWebpackCssSettings { +data class KotlinWebpackCssSettings( @Input - var enabled: Boolean = true + var enabled: Boolean = true, @Input - var extractPolicy: KotlinWebpackCssExtractPolicy = KotlinWebpackCssExtractPolicy.DEPENDS_ON_MODE -} - -enum class KotlinWebpackCssExtractPolicy { - ALWAYS, - DEPENDS_ON_MODE, - NONE -} \ No newline at end of file + var extractPolicy: KotlinWebpackAssetExtractPolicy = KotlinWebpackAssetExtractPolicy.DEPENDS_ON_MODE +) \ No newline at end of file