Adopt #3

Author: ilgonmic

build.gradle.kts

@@ -50,6 +50,18 @@ val kotlinComposeWasmStdlibFile: Configuration by configurations.creating {
     }
 }
 
+val composeWasmStaticResources: Configuration by configurations.creating {
+    isTransitive = false
+    isCanBeResolved = true
+    isCanBeConsumed = false
+    attributes {
+        attribute(
+            Category.CATEGORY_ATTRIBUTE,
+            objects.categoryComposeWasmResources
+        )
+    }
+}
+
 dependencies {
     annotationProcessor("org.springframework:spring-context-indexer")
     implementation("com.google.code.gson:gson")
@@ -77,6 +89,7 @@ dependencies {
     testImplementation(libs.kotlinx.coroutines.test)
 
     kotlinComposeWasmStdlibFile(project(":cache-maker"))
+    composeWasmStaticResources(project(":resource-server"))
 }
 
 fun Project.generateProperties(
@@ -104,7 +117,11 @@ fun Project.generateProperties(
 val propertiesGenerator by tasks.registering(PropertiesGenerator::class) {
     dependsOn(kotlinComposeWasmStdlibFile)
     propertiesFile.fileValue(rootDir.resolve("src/main/resources/${propertyFile}"))
-    hashableFile.set(kotlinComposeWasmStdlibFile.singleFile)
+    hashableFile.fileProvider(
+        provider {
+            kotlinComposeWasmStdlibFile.singleFile
+        }
+    )
     generateProperties().forEach { (name, value) ->
         propertiesMap.put(name, value)
     }
@@ -113,7 +130,12 @@ val propertiesGenerator by tasks.registering(PropertiesGenerator::class) {
 val lambdaPropertiesGenerator by tasks.registering(PropertiesGenerator::class) {
     dependsOn(kotlinComposeWasmStdlibFile)
     propertiesFile.set(layout.buildDirectory.file("tmp/propertiesGenerator/${propertyFile}"))
-    hashableFile.set(kotlinComposeWasmStdlibFile.singleFile)
+    hashableFile.fileProvider(
+        provider {
+            kotlinComposeWasmStdlibFile.singleFile
+        }
+    )
+
     generateProperties(lambdaPrefix).forEach { (name, value) ->
         propertiesMap.put(name, value)
     }
@@ -159,6 +181,11 @@ val buildLambda by tasks.creating(Zip::class) {
     }
 }
 
+val prepareComposeWasmResources by tasks.registering(Sync::class) {
+    from(composeWasmStaticResources)
+    into(layout.buildDirectory.dir("compose-wasm-resources"))
+}
+
 tasks.named<Copy>("processResources") {
     dependsOn(propertiesGenerator)
 }

buildSrc/src/main/kotlin/CategoryAttribute.kt

@@ -2,4 +2,7 @@ import org.gradle.api.attributes.Category
 import org.gradle.api.model.ObjectFactory
 
 val ObjectFactory.categoryComposeCache
-    get() = named(Category::class.java, "compose-cache")
+    get() = named(Category::class.java, "compose-cache")
+
+val ObjectFactory.categoryComposeWasmResources
+    get() = named(Category::class.java, "compose-wasm-resources")

cache-maker/Dockerfile

@@ -1,15 +1,32 @@
+@file:OptIn(ExperimentalWasmDsl::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenExec
+import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenRootEnvSpec
+import org.jetbrains.kotlin.gradle.targets.js.ir.JsIrBinary
+import org.jetbrains.kotlin.gradle.targets.js.ir.WasmBinary
+
 plugins {
     kotlin("multiplatform")
 }
 
 kotlin {
     wasmJs {
         outputModuleName.set("stdlib")
-        binaries.executable().forEach {
-            it.linkTask.configure {
+        binaries.executable().forEach { binary: JsIrBinary ->
+            binary.linkTask.configure {
                 compilerOptions.freeCompilerArgs.add("-Xir-dce=false")
                 compilerOptions.freeCompilerArgs.add("-Xwasm-multimodule-mode=master")
             }
+
+            (binary as WasmBinary).optimizeTask.configure {
+                inputFileProperty.fileProvider(
+                    binary.mainFile.map {
+                        val file = it.asFile
+                        file.resolveSibling("${file.nameWithoutExtension}_master.wasm")
+                    }
+                )
+            }
         }
     }
 
@@ -23,28 +40,19 @@ kotlin {
     }
 }
 
-val composeWasmStdlib: Provider<Directory> = layout.buildDirectory
-    .dir("compose-wasm-stdlib-output")
-val composeWasmStdlibTypeInfo: Provider<RegularFile> = composeWasmStdlib
-    .map { it.file("stdlib_master.wasm") }
-
-val buildComposeWasmStdlibModule by tasks.registering(Exec::class) {
-
-    inputs.files(configurations.named("wasmJsRuntimeClasspath"))
-
-    workingDir = rootDir
-    executable = "${project.name}/docker-build-incremental-cache.sh"
-
-    val outputDir = composeWasmStdlib
+val compileProductionExecutableKotlinWasmJsOptimize: TaskProvider<BinaryenExec> by tasks.existing(BinaryenExec::class) {
+}
 
-    inputs.file(layout.projectDirectory.file("Dockerfile"))
-    inputs.file(layout.projectDirectory.file("docker-build-incremental-cache.sh"))
-    outputs.dir(outputDir)
+val composeWasmStdlib: Provider<Directory> = compileProductionExecutableKotlinWasmJsOptimize
+    .flatMap { it.outputDirectory.locationOnly }
+val composeWasmStdlibFile: Provider<RegularFile> = composeWasmStdlib
+    .map { it.file("stdlib_master.wasm") }
 
-    args(lambdaPrefix, outputDir.get().asFile.normalize().absolutePath)
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenRootPlugin> {
+    rootProject.the<BinaryenRootEnvSpec>().version = "122"
 }
 
-val kotlinComposeWasmStdlibTypeInfo: Configuration by configurations.creating {
+val kotlinComposeWasmStdlibFile: Configuration by configurations.creating {
     isTransitive = false
     isCanBeResolved = false
     isCanBeConsumed = true
@@ -56,7 +64,7 @@ val kotlinComposeWasmStdlibTypeInfo: Configuration by configurations.creating {
     }
 }
 
-kotlinComposeWasmStdlibTypeInfo.outgoing.variants.create("stdlib") {
+kotlinComposeWasmStdlibFile.outgoing.variants.create("stdlib") {
     attributes {
         attribute(
             CacheAttribute.cacheAttribute,
@@ -65,20 +73,20 @@ kotlinComposeWasmStdlibTypeInfo.outgoing.variants.create("stdlib") {
     }
 
     artifact(composeWasmStdlib) {
-        builtBy(buildComposeWasmStdlibModule)
+        builtBy(compileProductionExecutableKotlinWasmJsOptimize)
     }
 }
 
-kotlinComposeWasmStdlibTypeInfo.outgoing.variants.create("typeinfo") {
+kotlinComposeWasmStdlibFile.outgoing.variants.create("wasm-file") {
     attributes {
         attribute(
             CacheAttribute.cacheAttribute,
             CacheAttribute.WASM
         )
     }
 
-    artifact(composeWasmStdlibTypeInfo) {
-        builtBy(buildComposeWasmStdlibModule)
+    artifact(composeWasmStdlibFile) {
+        builtBy(compileProductionExecutableKotlinWasmJsOptimize)
     }
 }
 

cache-maker/build.gradle.kts

@@ -1,6 +1,5 @@
 [versions]
 kotlin = "2.2.0"
-kotlinWasmStdlibCompiler = "2.2.0-dev-8507"
 kotlinIdeVersion = "1.9.20-506"
 kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
 spring-boot = "3.5.3"

cache-maker/docker-build-incremental-cache.sh

@@ -73,11 +73,11 @@ val propertiesGenerator by tasks.registering(PropertiesGenerator::class) {
 
     propertiesFile.fileValue(applicationPropertiesPath)
 
-    val composeWasmStdlibTypeInfo: FileCollection = kotlinComposeWasmStdlibFile
+    val composeWasmStdlibFile: FileCollection = kotlinComposeWasmStdlibFile
 
     hashableFile.fileProvider(
         provider {
-            composeWasmStdlibTypeInfo.singleFile
+            composeWasmStdlibFile.singleFile
         }
     )
 }
@@ -89,29 +89,32 @@ tasks.withType<KotlinCompile> {
 
 val skikoVersion = libs.versions.skiko
 
-tasks.named<Copy>("processResources") {
+val prepareComposeWasmResources by tasks.registering(Sync::class) {
     dependsOn(kotlinComposeWasmStdlibFile)
     dependsOn(propertiesGenerator)
     val archiveOperation = project.serviceOf<ArchiveOperations>()
+
+    into(layout.buildDirectory.dir("tmp/prepareResources"))
+
     from(resourceDependency.map {
         archiveOperation.zipTree(it)
     }) {
-        into("com/compiler/server")
         rename("skiko\\.(.*)", "skiko-${skikoVersion.get()}.\$1")
+        include("skiko.mjs", "skiko.wasm")
     }
 
     val propertiesFile = propertiesGenerator.flatMap { it.propertiesFile }
 
     from(kotlinComposeWasmStdlib) {
-        into("com/compiler/server")
+        include("stdlib_master.uninstantiated.mjs", "stdlib_master.wasm")
 
         rename { original ->
             val properties = FileInputStream(propertiesFile.get().asFile).use {
                 Properties().apply {
                     load(it)
                 }
             }
-            val regex = Regex("stdlib_master\\.(.*)")
+            val regex = Regex("stdlib_master\\.uninstantiated\\.(.*)")
             regex.find(original)?.groupValues?.get(1)?.let { extension ->
                 "stdlib-${properties["dependencies.compose.wasm"]}.$extension"
             } ?: original
@@ -120,10 +123,33 @@ tasks.named<Copy>("processResources") {
     }
 }
 
+tasks.named<Copy>("processResources") {
+    dependsOn(prepareComposeWasmResources)
+    from(prepareComposeWasmResources) {
+        into("com/compiler/server")
+    }
+}
+
 tasks.withType<Test> {
     useJUnitPlatform()
     javaLauncher.set(javaToolchains.launcherFor {
         languageVersion.set(JavaLanguageVersion.of(17))
         vendor.set(JvmVendorSpec.AMAZON)
     })
+}
+
+val composeWasmStaticResources: Configuration by configurations.creating {
+    isTransitive = false
+    isCanBeResolved = false
+    isCanBeConsumed = true
+    attributes {
+        attribute(
+            Category.CATEGORY_ATTRIBUTE,
+            objects.categoryComposeWasmResources
+        )
+    }
+
+    outgoing.artifact(prepareComposeWasmResources) {
+        builtBy(prepareComposeWasmResources)
+    }
 }