resources demo js workaround

1 year ago · 0af19270f2
10 changed files with 59 additions and 16 deletions
--- a/components/README.md
+++ b/components/README.md
@ -11,7 +11,7 @@ in Android Studio or in AppCode with [installed CocoaPods](https://kotlinlang.or
 `./gradlew :resources:demo:desktopApp:run`

 ### Run JS in browser with WebAssembly Skia via Gradle:
-`./gradlew :resources:demo:shared:jsBrowserDevelopmentRun`
+`./gradlew :resources:demo:jsApp:jsBrowserDevelopmentRun`

 ### Run MacOS via Gradle:
 - on Intel CPU: `./gradlew :resources:demo:shared:runDebugExecutableMacosX64`
--- a/components/resources/demo/jsApp/build.gradle.kts
+++ b/components/resources/demo/jsApp/build.gradle.kts
@ -0,0 +1,36 @@
+plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
+}
+
+val copyResources = tasks.create("copyJsResourcesWorkaround", Copy::class.java) {
+    from(project(":resources:demo:shared").file("src/commonMain/resources"))
+    to("build/processedResources/js/main")
+}
+
+kotlin {
+    js(IR) {
+        browser {
+            this.commonWebpackConfig {
+                println("this.outputPath: ${this.outputPath}")
+                this.devServer?.contentBase
+            }
+            this.webpackTask {
+                this.dependsOn(copyResources)
+            }
+        }
+        binaries.executable()
+    }
+    sourceSets {
+        val jsMain by getting  {
+            dependencies {
+                implementation(project(":resources:demo:shared"))
+            }
+            resources.srcDirs += project(":resources:demo:shared").file("src/commonMain/resources")
+        }
+    }
+}
+
+compose.experimental {
+    web.application {}
+}
--- a/components/resources/demo/jsApp/src/jsMain/kotlin/main.js.kt
+++ b/components/resources/demo/jsApp/src/jsMain/kotlin/main.js.kt
@ -0,0 +1,15 @@
+/*
+* Copyright 2020-2023 JetBrains s.r.o. and respective authors and developers.
+* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
+*/
+
+import androidx.compose.ui.window.Window
+import org.jetbrains.skiko.wasm.onWasmReady
+
+fun main() {
+    onWasmReady {
+        Window("Resources demo") {
+            MainView()
+        }
+    }
+}
--- a/components/resources/demo/jsApp/src/jsMain/resources/dir/img.png
+++ b/components/resources/demo/jsApp/src/jsMain/resources/dir/img.png
--- a/components/resources/demo/jsApp/src/jsMain/resources/img.webp
+++ b/components/resources/demo/jsApp/src/jsMain/resources/img.webp
--- a/components/resources/demo/shared/src/jsMain/resources/index.html
+++ b/components/resources/demo/shared/src/jsMain/resources/index.html
@ -7,10 +7,10 @@
    <link type="text/css" rel="stylesheet" href="styles.css" />
 </head>
 <body>
-    <h1>compose multiplatform web demo</h1>
-    <div>
-        <canvas id="ComposeTarget" width="800" height="600"></canvas>
-    </div>
-    <script src="shared.js"> </script>
+<h1>compose multiplatform web demo</h1>
+<div>
+    <canvas id="ComposeTarget" width="800" height="600"></canvas>
+</div>
+<script src="jsApp.js"> </script>
 </body>
 </html>
--- a/components/resources/demo/shared/src/jsMain/resources/styles.css
+++ b/components/resources/demo/shared/src/jsMain/resources/styles.css
--- a/components/resources/demo/shared/build.gradle.kts
+++ b/components/resources/demo/shared/build.gradle.kts
@ -14,7 +14,6 @@ kotlin {
    iosSimulatorArm64()
    js(IR) {
        browser()
-        binaries.executable()
    }
    macosX64 {
        binaries {
--- a/components/resources/demo/shared/src/jsMain/kotlin/main.js.kt
+++ b/components/resources/demo/shared/src/jsMain/kotlin/main.js.kt
@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 JetBrains s.r.o. and respective authors and developers.
+ * Copyright 2020-2023 JetBrains s.r.o. and respective authors and developers.
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

@ -14,14 +14,6 @@ import androidx.compose.ui.window.Window
 import org.jetbrains.compose.resources.demo.shared.UseResources
 import org.jetbrains.skiko.wasm.onWasmReady

-fun main() {
-    onWasmReady {
-        Window("Resources demo") {
-            MainView()
-        }
-    }
-}
-
@Composable
 fun MainView() {
    Column(modifier = Modifier.fillMaxSize()) {
--- a/components/settings.gradle.kts
+++ b/components/settings.gradle.kts
@ -22,4 +22,5 @@ include("AnimatedImage:demo")
 include(":resources:library")
 include(":resources:demo:androidApp")
 include(":resources:demo:desktopApp")
+include(":resources:demo:jsApp")
 include(":resources:demo:shared")