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 6d2168b..36e535b 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 @@ -2,7 +2,11 @@ package dev.adamko.kafkatorio.lang import dev.adamko.kafkatorio.Versions import dev.adamko.kafkatorio.relocateKotlinJsStore +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension + //import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask @@ -42,4 +46,25 @@ plugins { // file //} + relocateKotlinJsStore() + + +plugins.withType { + configure { + nodeVersion = "16.0.0" + } +} + + +afterEvaluate { + rootProject.extensions.configure { + // https://github.com/rjaros/kvision/issues/410 + versions.webpackCli.version = "4.10.0" + versions.webpackDevServer.version = "4.9.2" + } + + rootProject.extensions.configure { + resolution("http-proxy-middleware", "^2.0.6") + } +} diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-multiplatform.gradle.kts index 478bd24..dc77fd0 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-multiplatform.gradle.kts @@ -1,6 +1,9 @@ package dev.adamko.kafkatorio.lang import dev.adamko.kafkatorio.relocateKotlinJsStore +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension plugins { @@ -11,3 +14,23 @@ plugins { relocateKotlinJsStore() + + +plugins.withType { + configure { + nodeVersion = "16.0.0" + } +} + + +afterEvaluate { + rootProject.extensions.configure { + // https://github.com/rjaros/kvision/issues/410 + versions.webpackCli.version = "4.10.0" + versions.webpackDevServer.version = "4.9.2" + } + + rootProject.extensions.configure { + resolution("http-proxy-middleware", "^2.0.6") + } +} diff --git a/modules/web-map/build.gradle.kts b/modules/web-map/build.gradle.kts index ef2b535..97082ac 100644 --- a/modules/web-map/build.gradle.kts +++ b/modules/web-map/build.gradle.kts @@ -1,7 +1,5 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig -import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension plugins { @@ -17,18 +15,6 @@ kvision { } -afterEvaluate { - rootProject.extensions.configure { - // https://github.com/rjaros/kvision/issues/410 - versions.webpackCli.version = "4.10.0" - versions.webpackDevServer.version = "4.9.2" - } - - rootProject.extensions.configure { - resolution("http-proxy-middleware", "^2.0.6") - } -} - kotlin { js(IR) { browser { @@ -124,7 +110,7 @@ kotlin { test { dependencies { - implementation(kotlin("test-js")) + implementation(kotlin("test")) kvision("kvision-testutils") // implementation(npm("karma", "^6.3.16"))