Upgrade to Compose 1.6.0-alpha01. Replace stdlib DOM/W3C bindings wit…

…h a custom bindings in kilua-dom submodule to make project buildable.
rjaros · Dec 8, 2023 · 05eff6e · 05eff6e
1 parent e9a9efd
commit 05eff6e
Show file tree

Hide file tree

Showing 242 changed files with 12,993 additions and 760 deletions.
diff --git a/buildSrc/src/main/kotlin/Shared.kt b/buildSrc/src/main/kotlin/Shared.kt
@@ -12,45 +12,41 @@ fun KotlinMultiplatformExtension.compilerOptions() {
     }
 }
 
-fun KotlinMultiplatformExtension.kotlinJsTargets(buildTarget: String, isInIdea: Boolean, withNode: Boolean = true) {
-    if (buildTarget == "js" || !isInIdea) {
-        js(IR) {
-            useEsModules()
-            browser {
-                testTask {
-                    useKarma {
-                        useChromeHeadless()
-                    }
+fun KotlinMultiplatformExtension.kotlinJsTargets(withNode: Boolean = true) {
+    js(IR) {
+        useEsModules()
+        browser {
+            testTask {
+                useKarma {
+                    useChromeHeadless()
                 }
             }
-            if (withNode) {
-                nodejs {
-                    testTask {
-                        useMocha()
-                    }
+        }
+        if (withNode) {
+            nodejs {
+                testTask {
+                    useMocha()
                 }
             }
         }
     }
 }
 
 @OptIn(ExperimentalWasmDsl::class)
-fun KotlinMultiplatformExtension.kotlinWasmTargets(buildTarget: String, isInIdea: Boolean, withNode: Boolean = true) {
-    if (buildTarget == "wasm" || !isInIdea) {
-        wasmJs {
-            useEsModules()
-            browser {
-                testTask {
-                    useKarma {
-                        useChromeHeadlessWasmGc()
-                    }
+fun KotlinMultiplatformExtension.kotlinWasmTargets(withNode: Boolean = true) {
+    wasmJs {
+        useEsModules()
+        browser {
+            testTask {
+                useKarma {
+                    useChromeHeadlessWasmGc()
                 }
             }
-            if (withNode) {
-                nodejs {
-                    testTask {
-                        useMocha()
-                    }
+        }
+        if (withNode) {
+            nodejs {
+                testTask {
+                    useMocha()
                 }
             }
         }

diff --git a/examples/bootstrap-form/build.gradle.kts b/examples/bootstrap-form/build.gradle.kts
@@ -6,67 +6,60 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-val isInIdea = System.getProperty("idea.vendor.name") != null
-val buildTarget: String by project
-
 @OptIn(ExperimentalWasmDsl::class)
 kotlin {
-    if (buildTarget == "js" || !isInIdea) {
-        js(IR) {
-            useEsModules()
-            browser {
-                commonWebpackConfig {
-                    outputFileName = "main.bundle.js"
-                }
-                runTask {
-                    sourceMaps = false
-                }
-                testTask {
-                    useKarma {
-                        useChromeHeadless()
-                    }
+    js(IR) {
+        useEsModules()
+        browser {
+            commonWebpackConfig {
+                outputFileName = "main.bundle.js"
+            }
+            runTask {
+                sourceMaps = false
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
                 }
             }
-            binaries.executable()
         }
+        binaries.executable()
     }
-    if (buildTarget == "wasm" || !isInIdea) {
-        wasmJs {
-            useEsModules()
-            browser {
-                commonWebpackConfig {
-                    outputFileName = "main.bundle.js"
-                }
-                runTask {
-                    sourceMaps = false
-                }
-                testTask {
-                    useKarma {
-                        useChromeHeadlessWasmGc()
-                    }
-                }
+    wasmJs {
+        useEsModules()
+        browser {
+            commonWebpackConfig {
+                outputFileName = "main.bundle.js"
             }
-            binaries.executable()
-            if (project.gradle.startParameter.taskNames.find { it.contains("wasmJsBrowserProductionWebpack") } != null) {
-                applyBinaryen {
-                    binaryenArgs = mutableListOf(
-                        "--enable-nontrapping-float-to-int",
-                        "--enable-gc",
-                        "--enable-reference-types",
-                        "--enable-exception-handling",
-                        "--enable-bulk-memory",
-                        "--inline-functions-with-loops",
-                        "--traps-never-happen",
-                        "--fast-math",
-                        "--closed-world",
-                        "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                    )
+            runTask {
+                sourceMaps = false
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadlessWasmGc()
                 }
             }
         }
+        binaries.executable()
+        if (project.gradle.startParameter.taskNames.find { it.contains("wasmJsBrowserProductionWebpack") } != null) {
+            applyBinaryen {
+                binaryenArgs = mutableListOf(
+                    "--enable-nontrapping-float-to-int",
+                    "--enable-gc",
+                    "--enable-reference-types",
+                    "--enable-exception-handling",
+                    "--enable-bulk-memory",
+                    "--inline-functions-with-loops",
+                    "--traps-never-happen",
+                    "--fast-math",
+                    "--closed-world",
+                    "--metrics",
+                    "-O3", "--gufa", "--metrics",
+                    "-O3", "--gufa", "--metrics",
+                    "-O3", "--gufa", "--metrics",
+                )
+            }
+        }
     }
     sourceSets {
         val commonMain by getting {
@@ -75,16 +68,12 @@ kotlin {
                 implementation(project(":modules:kilua-bootstrap"))
             }
         }
-        if (buildTarget == "js" || !isInIdea) {
-            val jsMain by getting {
-                dependencies {
-                }
+        val jsMain by getting {
+            dependencies {
             }
         }
-        if (buildTarget == "wasm" || !isInIdea) {
-            val wasmJsMain by getting {
-                dependencies {
-                }
+        val wasmJsMain by getting {
+            dependencies {
             }
         }
     }

diff --git a/examples/hello-world/build.gradle.kts b/examples/hello-world/build.gradle.kts
@@ -6,84 +6,73 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-val isInIdea = System.getProperty("idea.vendor.name") != null
-val buildTarget: String by project
-
 @OptIn(ExperimentalWasmDsl::class)
 kotlin {
-    if (buildTarget == "js" || !isInIdea) {
-        js(IR) {
-            useEsModules()
-            browser {
-                commonWebpackConfig {
-                    outputFileName = "main.bundle.js"
-                }
-                runTask {
-                    sourceMaps = false
-                }
-                testTask {
-                    useKarma {
-                        useChromeHeadless()
-                    }
+    js(IR) {
+        useEsModules()
+        browser {
+            commonWebpackConfig {
+                outputFileName = "main.bundle.js"
+            }
+            runTask {
+                sourceMaps = false
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
                 }
             }
-            binaries.executable()
         }
+        binaries.executable()
     }
-    if (buildTarget == "wasm" || !isInIdea) {
-        wasmJs {
-            useEsModules()
-            browser {
-                commonWebpackConfig {
-                    outputFileName = "main.bundle.js"
-                }
-                runTask {
-                    sourceMaps = false
-                }
-                testTask {
-                    useKarma {
-                        useChromeHeadlessWasmGc()
-                    }
-                }
+    wasmJs {
+        useEsModules()
+        browser {
+            commonWebpackConfig {
+                outputFileName = "main.bundle.js"
             }
-            binaries.executable()
-            if (project.gradle.startParameter.taskNames.find { it.contains("wasmJsBrowserProductionWebpack") } != null) {
-                applyBinaryen {
-                    binaryenArgs = mutableListOf(
-                        "--enable-nontrapping-float-to-int",
-                        "--enable-gc",
-                        "--enable-reference-types",
-                        "--enable-exception-handling",
-                        "--enable-bulk-memory",
-                        "--inline-functions-with-loops",
-                        "--traps-never-happen",
-                        "--fast-math",
-                        "--closed-world",
-                        "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                    )
+            runTask {
+                sourceMaps = false
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadlessWasmGc()
                 }
             }
         }
+        binaries.executable()
+        if (project.gradle.startParameter.taskNames.find { it.contains("wasmJsBrowserProductionWebpack") } != null) {
+            applyBinaryen {
+                binaryenArgs = mutableListOf(
+                    "--enable-nontrapping-float-to-int",
+                    "--enable-gc",
+                    "--enable-reference-types",
+                    "--enable-exception-handling",
+                    "--enable-bulk-memory",
+                    "--inline-functions-with-loops",
+                    "--traps-never-happen",
+                    "--fast-math",
+                    "--closed-world",
+                    "--metrics",
+                    "-O3", "--gufa", "--metrics",
+                    "-O3", "--gufa", "--metrics",
+                    "-O3", "--gufa", "--metrics",
+                )
+            }
+        }
     }
     sourceSets {
         val commonMain by getting {
             dependencies {
                 implementation(project(":kilua"))
             }
         }
-        if (buildTarget == "js" || !isInIdea) {
-            val jsMain by getting {
-                dependencies {
-                }
+        val jsMain by getting {
+            dependencies {
             }
         }
-        if (buildTarget == "wasm" || !isInIdea) {
-            val wasmJsMain by getting {
-                dependencies {
-                }
+        val wasmJsMain by getting {
+            dependencies {
             }
         }
     }