Adopt Kotlin Wasm 2.2.20 two-module-compilation and compose 1.9.0-rc02

Author: ilgonmic

build-settings-logic/src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts

@@ -2,6 +2,7 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenCentral()
+        google()
         mavenLocal()
 
         val additionalRepositoryProperty = providers.gradleProperty("kotlin_repo_url")
@@ -22,6 +23,7 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        google()
         mavenLocal()
 
         val additionalRepositoryProperty = providers.gradleProperty("kotlin_repo_url")

cache-maker/src/wasmJsMain/kotlin/main.kt

@@ -1,42 +1,45 @@
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.window.CanvasBasedWindow
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Button
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.window.ComposeViewport
+import kotlinx.browser.document
 
 //sampleStart
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
-    CanvasBasedWindow { App() }
+    ComposeViewport(document.body!!) {
+        App()
+    }
 }
 
 @Composable
 fun App() {
     MaterialTheme {
-        var greetingText by remember { mutableStateOf("Hello World!") }
-        var showImage by remember { mutableStateOf(false) }
-        var counter by remember { mutableStateOf(0) }
-        Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
-            Button(onClick = {
-                counter++
-                greetingText = "Compose: ${Greeting().greet()}"
-                showImage = !showImage
-            }) {
-                Text(greetingText)
+        var showContent by remember { mutableStateOf(false) }
+        Column(
+            modifier = Modifier
+                .fillMaxSize(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Button(onClick = { showContent = !showContent }) {
+                Text("Click me!")
             }
-            AnimatedVisibility(showImage) {
-                Text(counter.toString())
+            AnimatedVisibility(showContent) {
+                val greeting = remember { Greeting().greet() }
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    Text("Compose: $greeting")
+                }
             }
         }
     }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.2.20-339"
+kotlin = "2.2.21-RC-343"
 kotlinIdeVersion = "1.9.20-506"
 kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
 spring-boot = "3.5.5"
@@ -15,11 +15,12 @@ kotlinx-coroutines-test = "1.6.4"
 kotlinx-datetime = "0.7.1-0.6.x-compat"
 kotlinx-io = "0.8.0"
 kotlinx-serialization = "1.9.0"
-skiko = "0.9.24"
+skiko = "0.9.22.2"
 # don't forget to update jackson version in `executor.policy` file.
 jackson = "2.19.2"
 hamcrest = "3.0"
-compose = "1.7.0"
+compose = "1.9.0-rc02"
+compose-material3 = "1.9.0-beta05"
 gradle-develocity = "3.17.5"
 
 [libraries]
@@ -66,7 +67,7 @@ compose-animation = { group = "org.jetbrains.compose.animation", name = "animati
 compose-animation-graphics = { group = "org.jetbrains.compose.animation", name = "animation-graphics", version.ref = "compose" }
 compose-foundation = { group = "org.jetbrains.compose.foundation", name = "foundation", version.ref = "compose" }
 compose-material = { group = "org.jetbrains.compose.material", name = "material", version.ref = "compose" }
-compose-material3 = { group = "org.jetbrains.compose.material3", name = "material3", version.ref = "compose" }
+compose-material3 = { group = "org.jetbrains.compose.material3", name = "material3", version.ref = "compose-material3" }
 compose-components-resources = { group = "org.jetbrains.compose.components", name = "components-resources", version.ref = "compose" }
 kotlin-serialization-plugin = {group= "org.jetbrains.kotlin", name="kotlin-serialization-compiler-plugin", version.ref = "kotlin"}
 gradle-develocity = {group = "com.gradle", name= "develocity-gradle-plugin", version.ref = "gradle-develocity"}

src/main/kotlin/com/compiler/server/compiler/components/KotlinToJSTranslator.kt

@@ -7,8 +7,6 @@ import org.jetbrains.kotlin.cli.js.K2JSCompiler
 import org.jetbrains.kotlin.psi.KtFile
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
-import java.io.File
-import java.nio.file.Path
 import kotlin.io.path.div
 import kotlin.io.path.readBytes
 import kotlin.io.path.readText
@@ -158,11 +156,10 @@ class KotlinToJSTranslator(
       val moduleName = "playground"
       usingTempDirectory { outputDir ->
         val ioFiles = files.writeToIoFiles(inputDir)
-        val k2JSCompiler = K2JSCompiler()
         val filePaths = ioFiles.map { it.toFile().canonicalPath }
         val klibPath = (outputDir / "klib").toFile().canonicalPath
 
-        k2JSCompiler.tryCompilation(
+        K2JSCompiler().tryCompilation(
           inputDir,
           ioFiles,
           compileWasmArgs(
@@ -175,7 +172,7 @@ class KotlinToJSTranslator(
           )
         )
           .flatMap {
-            k2JSCompiler.tryCompilation(
+            K2JSCompiler().tryCompilation(
               inputDir, ioFiles,
               linkWasmArgs(
                 moduleName,
@@ -189,7 +186,7 @@ class KotlinToJSTranslator(
           }
           .map {
             WasmTranslationSuccessfulOutput(
-              jsCode = (outputDir / "wasm" / "$moduleName.uninstantiated.mjs").readText(),
+              jsCode = (outputDir / "wasm" / "$moduleName.uninstantiated.mjs").readText().fixSkikoImport(),
               jsInstantiated = (outputDir / "wasm" / "$moduleName.mjs").readText(),
               wasm = (outputDir / "wasm" / "$moduleName.wasm").readBytes(),
               wat = if (debugInfo) (outputDir / "wasm" / "$moduleName.wat").readText() else null,
@@ -199,6 +196,10 @@ class KotlinToJSTranslator(
     }
 }
 
+private fun String.fixSkikoImport(): String = lineSequence()
+  .filterNot { it.contains("imports['./skiko.mjs'].skikoApi") }
+  .joinToString("\n")
+
 private fun String.withMainArgumentsIr(arguments: List<String>): String {
   val mainIrFunction = """
     |  function mainWrapper() {