wasm web build

ismai117 · Jul 8, 2024 · 0b96ae5 · 0b96ae5
1 parent c634047
commit 0b96ae5
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 21 deletions.
diff --git a/...s/io.ktor-ktor-io-3.0.0-wasm2-iosMain-cinterop/io.ktor_ktor-io-cinterop-mutex-GuQq0w.klib b/...s/io.ktor-ktor-io-3.0.0-wasm2-iosMain-cinterop/io.ktor_ktor-io-cinterop-mutex-GuQq0w.klib
diff --git a/...or-utils-3.0.0-wasm2-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-rkr5ww.klib b/...or-utils-3.0.0-wasm2-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-rkr5ww.klib
diff --git a/...fu-0.23.2-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-yBS35w.klib b/...fu-0.23.2-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-yBS35w.klib
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -22,10 +22,14 @@ kotlin {
         }
     }
 
-
     jvm("desktop")
 
-    js(IR) {
+    js() {
+        browser()
+        binaries.executable()
+    }
+
+    wasmJs {
         moduleName = "composeApp"
         browser {
             commonWebpackConfig {
@@ -35,12 +39,6 @@ kotlin {
         binaries.executable()
     }
 
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
-    wasmJs {
-        browser()
-        binaries.executable()
-    }
-
 
     listOf(
         iosX64(),

diff --git a/composeApp/src/wasmJsMain/kotlin/main.kt b/composeApp/src/wasmJsMain/kotlin/main.kt
@@ -5,6 +5,8 @@ import kotlinx.browser.document
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
-    ComposeViewport(document.body!!) { App(disableDiskCache = true) }
+    ComposeViewport(document.body!!) {
+        App(disableDiskCache = true)
+    }
 }
 
diff --git a/composeApp/src/wasmJsMain/resources/index.html b/composeApp/src/wasmJsMain/resources/index.html
@@ -2,11 +2,13 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <title>SolarSystemKMP</title>
-    <script type="application/javascript" src="skiko.js"></script>
+    <link type="text/css" rel="stylesheet" href="styles.css">
     <script type="application/javascript" src="composeApp.js"></script>
 </head>
 <body>
-<canvas id="ComposeTarget"></canvas>
 </body>
-</html>
+</html>
+
diff --git a/composeApp/src/wasmJsMain/resources/styles.css b/composeApp/src/wasmJsMain/resources/styles.css
@@ -0,0 +1,7 @@
+html, body {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+}
diff --git a/docs/39f400ec3abd9c6d43e3.wasm b/docs/39f400ec3abd9c6d43e3.wasm
diff --git a/docs/composeApp.js b/docs/composeApp.js
diff --git a/docs/composeApp.js.LICENSE.txt b/docs/composeApp.js.LICENSE.txt
@@ -0,0 +1,35 @@
+/*
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/*
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/*
+ * @copyright (c) 2016, Philipp Thürwächter, Pattrick Hüper
+ * @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/**
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+/**
+ * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+//! @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
+
+//! @copyright (c) 2015-present, Philipp Thürwächter, Pattrick Hüper & js-joda contributors
+
+//! @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+
+//! @version @js-joda/core - 3.2.0
diff --git a/docs/composeApp.js.map b/docs/composeApp.js.map
diff --git a/docs/composeApp.wasm b/docs/composeApp.wasm
diff --git a/docs/index.html b/docs/index.html
@@ -2,11 +2,13 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <title>SolarSystemKMP</title>
-    <script src="skiko.js"> </script>
+    <link type="text/css" rel="stylesheet" href="styles.css">
+    <script type="application/javascript" src="composeApp.js"></script>
 </head>
 <body>
-<canvas id="ComposeTarget"></canvas>
-<script src="composeApp.js"> </script>
 </body>
-</html>
+</html>
+
diff --git a/docs/shared.js b/docs/shared.js
diff --git a/docs/shared.js.map b/docs/shared.js.map
diff --git a/docs/styles.css b/docs/styles.css
@@ -0,0 +1,7 @@
+html, body {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+}
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,3 @@ android.nonTransitiveRClass=true
 
 #Compose
 org.jetbrains.compose.experimental.jscanvas.enabled=true
-org.jetbrains.compose.experimental.wasm.enabled=true
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -25,7 +25,6 @@ kotlin {
         binaries.executable()
     }
 
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs() {
         browser()
         binaries.executable()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@ android.nonTransitiveRClass=true

		#Compose
		org.jetbrains.compose.experimental.jscanvas.enabled=true
		org.jetbrains.compose.experimental.wasm.enabled=true