[Gradle, JS] Small fixes
#KT-32721 fixed
This commit is contained in:
+1
-1
@@ -27,7 +27,7 @@ class NpmVersions {
|
|||||||
val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.16")
|
val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.16")
|
||||||
|
|
||||||
val cssLoader = NpmPackageVersion("css-loader", "3.4.2")
|
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 miniCssExtractPlugin = NpmPackageVersion("mini-css-extract-plugin", "0.9.0")
|
||||||
|
|
||||||
val mocha = NpmPackageVersion("mocha", "7.1.1")
|
val mocha = NpmPackageVersion("mocha", "7.1.1")
|
||||||
|
|||||||
+1
@@ -149,6 +149,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
|
|||||||
outputFileName = outputFileName,
|
outputFileName = outputFileName,
|
||||||
configDirectory = configDirectory,
|
configDirectory = configDirectory,
|
||||||
bundleAnalyzerReportDir = if (report) reportDir else null,
|
bundleAnalyzerReportDir = if (report) reportDir else null,
|
||||||
|
cssSettings = cssSettings,
|
||||||
devServer = devServer,
|
devServer = devServer,
|
||||||
devtool = devtool,
|
devtool = devtool,
|
||||||
sourceMaps = sourceMaps,
|
sourceMaps = sourceMaps,
|
||||||
|
|||||||
+12
@@ -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
|
||||||
|
}
|
||||||
+4
-10
@@ -7,16 +7,10 @@ package org.jetbrains.kotlin.gradle.targets.js.webpack
|
|||||||
|
|
||||||
import org.gradle.api.tasks.Input
|
import org.gradle.api.tasks.Input
|
||||||
|
|
||||||
class KotlinWebpackCssSettings {
|
data class KotlinWebpackCssSettings(
|
||||||
@Input
|
@Input
|
||||||
var enabled: Boolean = true
|
var enabled: Boolean = true,
|
||||||
|
|
||||||
@Input
|
@Input
|
||||||
var extractPolicy: KotlinWebpackCssExtractPolicy = KotlinWebpackCssExtractPolicy.DEPENDS_ON_MODE
|
var extractPolicy: KotlinWebpackAssetExtractPolicy = KotlinWebpackAssetExtractPolicy.DEPENDS_ON_MODE
|
||||||
}
|
)
|
||||||
|
|
||||||
enum class KotlinWebpackCssExtractPolicy {
|
|
||||||
ALWAYS,
|
|
||||||
DEPENDS_ON_MODE,
|
|
||||||
NONE
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user