Use convention plugin for nodejs configuration

JetBrains · Nov 19, 2024 · 47cc013 · 47cc013
1 parent be7b03c
commit 47cc013
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -49,6 +49,7 @@ plugins {
     }
     `jvm-toolchains`
     alias(libs.plugins.gradle.node) apply false
+    id("nodejs-cache-redirector-configuration")
 }
 
 val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
@@ -1147,16 +1148,6 @@ if (disableVerificationTasks) {
 
 gradle.taskGraph.whenReady(checkYarnAndNPMSuppressed)
 
-allprojects {
-    plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin::class) {
-        extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsEnvSpec::class.java) {
-            if (kotlinBuildProperties.isCacheRedirectorEnabled) {
-                downloadBaseUrl = "https://cache-redirector.jetbrains.com/nodejs.org/dist"
-            }
-        }
-    }
-}
-
 plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) {
     extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) {
         npmInstallTaskProvider.configure {

diff --git a/libraries/kotlin.test/build.gradle.kts b/libraries/kotlin.test/build.gradle.kts
@@ -16,6 +16,7 @@ plugins {
     kotlin("multiplatform")
     `maven-publish`
     signing
+    id("nodejs-cache-redirector-configuration")
 }
 
 description = "Kotlin Test Library"

diff --git a/libraries/kotlin.test/js/it/build.gradle.kts b/libraries/kotlin.test/js/it/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     alias(libs.plugins.gradle.node)
     idea
+    id("nodejs-cache-redirector-configuration")
 }
 
 description = "Kotlin-test integration tests for JS"

diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
@@ -26,6 +26,7 @@ plugins {
     kotlin("multiplatform")
     `maven-publish`
     signing
+    id("nodejs-cache-redirector-configuration")
 }
 
 description = "Kotlin Standard Library"

diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.*
 
 plugins {
     kotlin("multiplatform")
+    id("nodejs-cache-redirector-configuration")
 }
 
 kotlin {

diff --git a/plugins/atomicfu/atomicfu-runtime/build.gradle.kts b/plugins/atomicfu/atomicfu-runtime/build.gradle.kts
@@ -6,6 +6,7 @@ description = "Runtime library for the Atomicfu compiler plugin"
 plugins {
     kotlin("js")
     `maven-publish`
+    id("nodejs-cache-redirector-configuration")
 }
 
 group = "org.jetbrains.kotlin"

diff --git a/plugins/js-plain-objects/runtime/build.gradle.kts b/plugins/js-plain-objects/runtime/build.gradle.kts
@@ -6,6 +6,7 @@ description = "Runtime library for the JS Plain Objects compiler plugin"
 plugins {
     kotlin("js")
     `maven-publish`
+    id("nodejs-cache-redirector-configuration")
 }
 
 group = "org.jetbrains.kotlin"

diff --git a/...ventions/buildsrc-compat/src/main/kotlin/nodejs-cache-redirector-configuration.gradle.kts b/...ventions/buildsrc-compat/src/main/kotlin/nodejs-cache-redirector-configuration.gradle.kts
@@ -0,0 +1,11 @@
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsEnvSpec
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin
+
+plugins.withType(NodeJsPlugin::class) {
+    extensions.configure(NodeJsEnvSpec::class.java) {
+        if (kotlinBuildProperties.isCacheRedirectorEnabled) {
+            downloadBaseUrl = "https://cache-redirector.jetbrains.com/nodejs.org/dist"
+        }
+    }
+}