Skip to content

Commit 0b2dd95

Browse files
ilgonmicSpace Team
authored andcommitted
[Wasm] Do not backport devServer, because it is mutable collection
^KT-80106 fixed (cherry picked from commit 40a04b7)
1 parent 6b0a1e4 commit 0b2dd95

File tree

2 files changed

+27
-11
lines changed
  • libraries/tools

2 files changed

+27
-11
lines changed

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinWasmGradlePluginIT.kt

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.Distribution
1111
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
1212
import org.jetbrains.kotlin.gradle.targets.js.npm.fromSrcPackageJson
1313
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
14+
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
1415
import org.jetbrains.kotlin.gradle.targets.wasm.binaryen.BinaryenEnvSpec
1516
import org.jetbrains.kotlin.gradle.targets.wasm.binaryen.BinaryenPlugin
1617
import org.jetbrains.kotlin.gradle.targets.wasm.d8.D8EnvSpec
@@ -25,6 +26,7 @@ import org.junit.jupiter.api.DisplayName
2526
import org.junit.jupiter.api.condition.OS
2627
import java.net.URI
2728
import java.nio.file.Files
29+
import java.nio.file.Paths
2830
import kotlin.io.path.*
2931
import kotlin.test.assertEquals
3032
import kotlin.test.assertTrue
@@ -574,8 +576,22 @@ class KotlinWasmGradlePluginIT : KGPBaseTest() {
574576
buildScriptInjection {
575577
kotlinMultiplatform.wasmJs {
576578
browser {
579+
webpackTask {
580+
it.generateConfigOnly = true
581+
it.devServerProperty.set(
582+
KotlinWebpackConfig.DevServer(
583+
static = mutableListOf("foo")
584+
)
585+
)
586+
}
587+
577588
commonWebpackConfig {
578589
it.outputFileName = "check.js"
590+
it.devServer = (it.devServer ?: KotlinWebpackConfig.DevServer()).apply {
591+
static = (static ?: mutableListOf()).apply {
592+
add("bar")
593+
}
594+
}
579595
}
580596
}
581597
}
@@ -584,14 +600,24 @@ class KotlinWasmGradlePluginIT : KGPBaseTest() {
584600
it.doLast { task ->
585601
task as KotlinWebpack
586602
println("File output name: " + task.mainOutputFileName.get())
603+
val pathConfig = task.configFile.get().toPath()
604+
println("Path config: " + pathConfig)
587605
}
588606
}
589607
}
590608

591-
build("assemble") {
609+
build("wasmJsBrowserProductionWebpack") {
592610
assertTasksExecuted(":wasmJsBrowserProductionWebpack")
593611

594612
assertOutputContains("File output name: check.js")
613+
val pathConfig = output.substringAfter("Path config: ").substringBefore("webpack.config.js")
614+
assertFileContains(
615+
Path(pathConfig + "webpack.config.js"),
616+
"\"static\": [\n" +
617+
" \"foo\",\n" +
618+
" \"bar\"\n" +
619+
" ]"
620+
)
595621
}
596622
}
597623
}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -261,16 +261,6 @@ internal constructor(
261261
body.execute(fakeWebpackConfig)
262262
fakeWebpackConfig.let {
263263
it.outputFileName?.let { mainOutputFileName.set(it) }
264-
it.devtool?.let { devtool = it }
265-
it.output?.let {
266-
output.library = it.library
267-
output.libraryTarget = it.libraryTarget
268-
output.globalObject = it.globalObject
269-
output.clean = it.clean
270-
}
271-
it.devServer?.let {
272-
devServerProperty.set(it)
273-
}
274264
}
275265
webpackConfigAppliers.add(body)
276266
}

0 commit comments

Comments
 (0)