feat: finish out initial wasm/wasi target support

Signed-off-by: Sam Gammon <[email protected]>
elide-dev · Jan 27, 2024 · 2033d54 · 2033d54
1 parent c405fbe
commit 2033d54
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -129,6 +129,9 @@ rootProject.plugins.withType(YarnPlugin::class.java) {
   rootProject.the<YarnRootExtension>().lockFileDirectory = project.rootDir
   rootProject.the<YarnRootExtension>().lockFileName = "yarn.lock"
 }
+tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask::class.java).configureEach {
+  args.add("--ignore-engines")
+}
 
 apiValidation {
   nonPublicMarkers += listOf(

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -29,6 +29,7 @@
          <trust file="gradle-versions-plugin-.*" regex="true" />
          <trust file=".*wasm.*" regex="true" />
          <trust file=".*kotlinx.*" regex="true" />
+         <trust file="node-.*" regex="true" />
       </trusted-artifacts>
       <ignored-keys>
          <ignored-key id="3FCFA3B530AFDCE3" reason="Key couldn't be downloaded from any key server"/>

diff --git a/packages/uuid b/packages/uuid
diff --git a/tools/conventions/src/main/kotlin/dev.elide.build.wasm.gradle.kts b/tools/conventions/src/main/kotlin/dev.elide.build.wasm.gradle.kts
@@ -36,10 +36,13 @@ kotlin {
   org.jetbrains.kotlin.gradle.plugin.VariantImplementationFactories.getProvider(project)
 
   wasmJs {
-    d8()
     nodejs()
     browser()
   }
+  wasmWasi {
+    nodejs()
+    applyBinaryen()
+  }
 }
 
 // Tool: Kover

diff --git a/tools/elide-build/src/main/kotlin/elide/internal/conventions/kotlin/KotlinMultiplatform.kt b/tools/elide-build/src/main/kotlin/elide/internal/conventions/kotlin/KotlinMultiplatform.kt
@@ -67,24 +67,10 @@ internal fun Project.configureKotlinMultiplatform(
       wasmJs {
         nodejs()
         browser()
-        d8()
-
-        sourceSets.apply {
-          // optional WASM source sets
-          findByName("wasmMain")?.apply { dependsOn(getByName("commonMain")) }
-          findByName("wasmTest")?.apply { dependsOn(getByName("commonTest")) }
-          findByName("wasmJsMain")?.apply { dependsOn(getByName("commonMain")) }
-          findByName("wasmJsTest")?.apply { dependsOn(getByName("commonTest")) }
-        }
       }
       wasmWasi {
         nodejs()
-
-        sourceSets.apply {
-          // optional WASM source sets
-          findByName("wasmWasiMain")?.apply { dependsOn(getByName("commonMain")) }
-          findByName("wasmWasiTest")?.apply { dependsOn(getByName("commonTest")) }
-        }
+        applyBinaryen()
       }
     }