[Gradle, JS] Fix devServer usage in KotlinWebpackConfig
^KT-64260 fixed
This commit is contained in:
committed by
Space Team
parent
88e35fafd9
commit
1d692ce6d1
+1
-1
@@ -244,7 +244,7 @@ constructor(
|
|||||||
outputFileName = mainOutputFileName.get(),
|
outputFileName = mainOutputFileName.get(),
|
||||||
configDirectory = configDirectory,
|
configDirectory = configDirectory,
|
||||||
rules = rules,
|
rules = rules,
|
||||||
devServer = devServerProperty,
|
devServerProperty = devServerProperty,
|
||||||
devtool = devtool,
|
devtool = devtool,
|
||||||
sourceMaps = sourceMaps,
|
sourceMaps = sourceMaps,
|
||||||
resolveFromModulesFirst = resolveFromModulesFirst,
|
resolveFromModulesFirst = resolveFromModulesFirst,
|
||||||
|
|||||||
+17
-4
@@ -8,7 +8,9 @@
|
|||||||
package org.jetbrains.kotlin.gradle.targets.js.webpack
|
package org.jetbrains.kotlin.gradle.targets.js.webpack
|
||||||
|
|
||||||
import com.google.gson.GsonBuilder
|
import com.google.gson.GsonBuilder
|
||||||
|
import org.gradle.api.provider.Property
|
||||||
import org.gradle.api.provider.Provider
|
import org.gradle.api.provider.Provider
|
||||||
|
import org.gradle.api.tasks.Internal
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.NpmVersions
|
import org.jetbrains.kotlin.gradle.targets.js.NpmVersions
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
|
import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.appendConfigsFromDir
|
import org.jetbrains.kotlin.gradle.targets.js.appendConfigsFromDir
|
||||||
@@ -31,7 +33,7 @@ data class KotlinWebpackConfig(
|
|||||||
var outputFileName: String? = entry?.name,
|
var outputFileName: String? = entry?.name,
|
||||||
var configDirectory: File? = null,
|
var configDirectory: File? = null,
|
||||||
var reportEvaluatedConfigFile: File? = null,
|
var reportEvaluatedConfigFile: File? = null,
|
||||||
var devServer: Provider<DevServer>? = null,
|
val devServerProperty: Property<DevServer>? = null,
|
||||||
var watchOptions: WatchOptions? = null,
|
var watchOptions: WatchOptions? = null,
|
||||||
var experiments: MutableSet<String> = mutableSetOf(),
|
var experiments: MutableSet<String> = mutableSetOf(),
|
||||||
override val rules: KotlinWebpackRulesContainer,
|
override val rules: KotlinWebpackRulesContainer,
|
||||||
@@ -54,6 +56,17 @@ data class KotlinWebpackConfig(
|
|||||||
val progressReporterPathFilterInput: String?
|
val progressReporterPathFilterInput: String?
|
||||||
get() = npmProjectDir?.get()?.let { npmProjectDir -> progressReporterPathFilter?.relativeOrAbsolute(npmProjectDir) }
|
get() = npmProjectDir?.get()?.let { npmProjectDir -> progressReporterPathFilter?.relativeOrAbsolute(npmProjectDir) }
|
||||||
|
|
||||||
|
@get:Internal
|
||||||
|
@Deprecated(
|
||||||
|
"This property is deprecated and will be removed in future. Use devServerProperty instead",
|
||||||
|
replaceWith = ReplaceWith("devServerProperty")
|
||||||
|
)
|
||||||
|
var devServer: DevServer?
|
||||||
|
get() = devServerProperty?.get()
|
||||||
|
set(value) {
|
||||||
|
devServerProperty?.set(value)
|
||||||
|
}
|
||||||
|
|
||||||
fun getRequiredDependencies(versions: NpmVersions) =
|
fun getRequiredDependencies(versions: NpmVersions) =
|
||||||
mutableSetOf<RequiredKotlinJsDependency>().also {
|
mutableSetOf<RequiredKotlinJsDependency>().also {
|
||||||
it.add(
|
it.add(
|
||||||
@@ -69,7 +82,7 @@ data class KotlinWebpackConfig(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (devServer != null && devServer!!.isPresent) {
|
if (devServerProperty != null && devServerProperty!!.isPresent) {
|
||||||
it.add(
|
it.add(
|
||||||
versions.webpackDevServer
|
versions.webpackDevServer
|
||||||
)
|
)
|
||||||
@@ -176,10 +189,10 @@ data class KotlinWebpackConfig(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun Appendable.appendDevServer() {
|
private fun Appendable.appendDevServer() {
|
||||||
if (devServer != null && devServer!!.isPresent) {
|
if (devServerProperty != null && devServerProperty!!.isPresent) {
|
||||||
|
|
||||||
appendLine("// dev server")
|
appendLine("// dev server")
|
||||||
appendLine("config.devServer = ${json(devServer!!.get())};")
|
appendLine("config.devServer = ${json(devServerProperty!!.get())};")
|
||||||
appendLine()
|
appendLine()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user