From 7e134b535384a70f607a08cd3b6c5aede7e69e7a Mon Sep 17 00:00:00 2001
From: Adam <897017+asemy@users.noreply.github.com>
Date: Wed, 22 Dec 2021 23:01:24 +0100
Subject: [PATCH] - use kotlin-js convention buildsrc plugin - move yarn-lock

---
 buildSrc/build.gradle.kts                     |  2 +-
 .../kafkatorio/lang/kotlin-js.gradle.kts      | 23 ++++++++-----------
 .../kotlin-js-store}/yarn.lock                |  0
 modules/events-schema/build.gradle.kts        |  2 +-
 modules/web-map/build.gradle.kts              | 11 ++-------
 5 files changed, 13 insertions(+), 25 deletions(-)
 rename {kotlin-js-store => gradle/kotlin-js-store}/yarn.lock (100%)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 2687fad..dc26678 100644
--- a/buildSrc/build.gradle.kts
+++ b/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",
   )
 }
diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts
index fa6b191..62c6d7b 100644
--- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts
+++ b/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")
+}
diff --git a/kotlin-js-store/yarn.lock b/gradle/kotlin-js-store/yarn.lock
similarity index 100%
rename from kotlin-js-store/yarn.lock
rename to gradle/kotlin-js-store/yarn.lock
diff --git a/modules/events-schema/build.gradle.kts b/modules/events-schema/build.gradle.kts
index 729a5e1..ad6a372 100644
--- a/modules/events-schema/build.gradle.kts
+++ b/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")
       }
diff --git a/modules/web-map/build.gradle.kts b/modules/web-map/build.gradle.kts
index bef04c4..74c5e4b 100644
--- a/modules/web-map/build.gradle.kts
+++ b/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"))
       }