wasm example, fix build

alexzhirkevich · Feb 29, 2024 · 58dc6d6 · 58dc6d6
1 parent 14532c4
commit 58dc6d6
Show file tree

Hide file tree

Showing 9 changed files with 2,908 additions and 7 deletions.
diff --git a/compottie/build.gradle.kts b/compottie/build.gradle.kts
@@ -58,17 +58,20 @@ kotlin {
         }
 
         val desktopMain by getting
+        val wasmJsMain by getting
 
         androidMain.dependencies {
             api(libs.lottie.android)
         }
 
+
         val skikoMain by creating {
             dependsOn(commonMain.get())
             desktopMain.dependsOn(this)
             iosMain.get().dependsOn(this)
             macosMain.get().dependsOn(this)
             jsMain.get().dependsOn(this)
+            wasmJsMain.dependsOn(this)
             dependencies {
                 implementation(libs.serialization)
             }

diff --git a/example/shared/build.gradle.kts b/example/shared/build.gradle.kts
@@ -28,6 +28,9 @@ kotlin {
     js(IR) {
         browser()
     }
+    wasmJs(){
+        browser()
+    }
 
     listOf(
         iosX64(),

diff --git a/example/webJsApp/build.gradle.kts → example/webApp/build.gradle.kts b/example/webJsApp/build.gradle.kts → example/webApp/build.gradle.kts
@@ -9,12 +9,15 @@ kotlin {
         binaries.executable()
     }
 
+    wasmJs(){
+        browser()
+        binaries.executable()
+    }
     sourceSets {
-        val jsMain by getting {
-            dependencies {
-                implementation(compose.ui)
-                implementation(project(":example:shared"))
-            }
+
+        commonMain.dependencies {
+            implementation(compose.ui)
+            implementation(project(":example:shared"))
         }
     }
 }

diff --git a/example/webJsApp/src/jsMain/kotlin/main.kt → example/webApp/src/jsMain/kotlin/main.kt b/example/webJsApp/src/jsMain/kotlin/main.kt → example/webApp/src/jsMain/kotlin/main.kt
diff --git a/.../webJsApp/src/jsMain/resources/index.html → ...le/webApp/src/jsMain/resources/index.html b/.../webJsApp/src/jsMain/resources/index.html → ...le/webApp/src/jsMain/resources/index.html
@@ -7,6 +7,6 @@
 </head>
 <body>
     <canvas id="ComposeTarget"></canvas>
-    <script src="webJsApp.js"></script>
+    <script src="webApp.js"></script>
 </body>
 </html>
diff --git a/example/webApp/src/wasmJsMain/kotlin/main.kt b/example/webApp/src/wasmJsMain/kotlin/main.kt
@@ -0,0 +1,11 @@
+@file:OptIn(ExperimentalComposeUiApi::class)
+
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.window.CanvasBasedWindow
+
+@OptIn(ExperimentalComposeUiApi::class)
+fun main() {
+    CanvasBasedWindow {
+        App()
+    }
+}
diff --git a/example/webApp/src/wasmJsMain/resources/index.html b/example/webApp/src/wasmJsMain/resources/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>QRose example</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script src="skiko.js"></script>
+</head>
+<body>
+    <canvas id="ComposeTarget"></canvas>
+    <script src="webApp.js"></script>
+</body>
+</html>