Merge pull request #5 from MohamedRejeb/compose-1.6

Add WASM support
MohamedRejeb · Mar 23, 2024 · da40cb2 · da40cb2
2 parents 224fedc + 6459802
commit da40cb2
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 3 deletions.
diff --git a/compose-dnd/build.gradle.kts b/compose-dnd/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 /*
  * Copyright 2023, Mohamed Ben Rejeb and the Compose Dnd project contributors
  *
@@ -41,6 +43,11 @@ kotlin {
         browser()
     }
 
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
+
     iosX64()
     iosArm64()
     iosSimulatorArm64()

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,8 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 
 # Compose for Web
 org.jetbrains.compose.experimental.jscanvas.enabled=true
+org.jetbrains.compose.experimental.wasm.enabled=true
 
 #Android
 android.useAndroidX=true
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
diff --git a/sample/common/build.gradle.kts b/sample/common/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 /*
  * Copyright 2023, Mohamed Ben Rejeb and the Compose Dnd project contributors
  *
@@ -39,6 +41,11 @@ kotlin {
         browser()
     }
 
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
+
     listOf(
         iosX64(),
         iosArm64(),

diff --git a/sample/web/build.gradle.kts b/sample/web/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.jetbrainsCompose)
@@ -9,7 +11,13 @@ kotlin {
         binaries.executable()
     }
 
-    sourceSets.jsMain.dependencies {
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+        binaries.executable()
+    }
+
+    sourceSets.commonMain.dependencies {
         implementation(projects.sample.common)
 
         implementation(compose.foundation)
@@ -18,4 +26,4 @@ kotlin {
 
 compose.experimental {
     web.application {}
-}
+}
diff --git a/sample/web/src/wasmJsMain/kotlin/main.kt b/sample/web/src/wasmJsMain/kotlin/main.kt
@@ -0,0 +1,11 @@
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.window.CanvasBasedWindow
+
+@OptIn(ExperimentalComposeUiApi::class)
+fun main() {
+    CanvasBasedWindow(
+        title = "Compose DND",
+    ) {
+        App()
+    }
+}
diff --git a/sample/web/src/wasmJsMain/resources/index.html b/sample/web/src/wasmJsMain/resources/index.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Multiplatform App</title>
+    <script src="skiko.js"></script>
+    <script src="web.js"></script>
+</head>
+<body>
+<noscript>
+    This page requires JavaScript.
+</noscript>
+<div id="root" class="d-flex flex-column h-100">
+</div>
+<div>
+    <canvas id="ComposeTarget" width="800" height="600"></canvas>
+</div>
+</body>
+</html>