- use kotlin-js convention buildsrc plugin

- move yarn-lock

buildSrc/build.gradle.kts

@@ -40,7 +40,7 @@ tasks.withType<KotlinCompile>().configureEach {
     "-Xopt-in=kotlin.RequiresOptIn",
     "-Xopt-in=kotlin.ExperimentalStdlibApi",
     "-Xopt-in=kotlin.time.ExperimentalTime",
-//    "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+    "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
     "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
   )
 }

buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts

@@ -1,31 +1,19 @@
 package dev.adamko.kafkatorio.lang
 
-import org.gradle.kotlin.dsl.kotlin
 import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 
 
 plugins {
   kotlin("js")
   id("dev.adamko.kafkatorio.base")
-  id("dev.adamko.kafkatorio.lang.node")
-}
-
-// not in use at the moment
-
-kotlin {
-  js(IR) {
-    binaries.executable()
-
-    useCommonJs()
-    nodejs()
-  }
 }
 
 dependencies {
   val kotlinWrappersVersion = "0.0.1-pre.276-kotlin-1.6.0"
   implementation(
-    project.dependencies.enforcedPlatform(
+    project.dependencies.platform(
       "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${kotlinWrappersVersion}"
     )
   )
@@ -53,3 +41,10 @@ val nodeModulesDir: Directory by extra {
   logger.lifecycle("Kotlin/JS NODE_MODULES: $file")
   file
 }
+
+rootProject.extensions.configure<YarnRootExtension> {
+  // kotlin-js adds a directory in the root-dir for the Yarn lock.
+  // That's a bit annoying. It's a little neater if it's in the
+  // gradle dir, next to the version-catalog.
+  lockFileDirectory = rootProject.rootDir.resolve("gradle/kotlin-js-store")
+}

modules/events-schema/build.gradle.kts

@@ -22,7 +22,7 @@ kotlin {
         optIn("kotlin.RequiresOptIn")
         optIn("kotlin.ExperimentalStdlibApi")
         optIn("kotlin.time.ExperimentalTime")
-//        optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+        optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
         optIn("kotlinx.serialization.ExperimentalSerializationApi")
         optIn("kotlin.js.ExperimentalJsExport")
       }

modules/web-map/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
-  id("dev.adamko.kafkatorio.base")
+  id("dev.adamko.kafkatorio.lang.kotlin-js")
   kotlin("plugin.serialization")
-  kotlin("js") // version kotlinVersion
+//  kotlin("js") // version kotlinVersion
   id("io.kvision") version "5.6.1"
 }
 
@@ -52,13 +52,6 @@ kotlin {
         implementation("io.kvision:kvision-state:$kvisionVersion")
         implementation("io.kvision:kvision-chart:$kvisionVersion")
 
-        val kotlinWrappersVersion = "0.0.1-pre.276-kotlin-1.6.0"
-        implementation(
-          project.dependencies.enforcedPlatform(
-            "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${kotlinWrappersVersion}"
-          )
-        )
-
 //        implementation(npm("kafkajs", "1.15.0"))
       }