Build. Use standard npm extension

JetBrains · Aug 17, 2024 · a77ece2 · a77ece2
1 parent 74d6840
commit a77ece2
Show file tree

Hide file tree

Showing 34 changed files with 49 additions and 51 deletions.
diff --git a/buildSrc/src/main/kotlin/NpmDependencies.kt b/buildSrc/src/main/kotlin/NpmDependencies.kt
@@ -2,7 +2,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderConvertible
-import org.gradle.kotlin.dsl.the
 import org.jetbrains.kotlin.gradle.targets.js.npm.DevNpmDependencyExtension
 import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency
 import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependencyExtension
@@ -17,22 +16,21 @@ internal fun Project.npmVersion(name: String): String {
     return prop("$target.npm.version")
 }
 
-fun Project.npmv(
+operator fun NpmDependencyExtension.invoke(
     dependencyNotation: Provider<MinimalExternalModuleDependency>,
 ): NpmDependency {
-    val npm = dependencies.the<NpmDependencyExtension>()
     val dependency = dependencyNotation.get()
-    return npm(dependency.name, dependency.version!!)
+    return this(dependency.name, dependency.version!!)
 }
 
-fun Project.npmv(
+operator fun NpmDependencyExtension.invoke(
     dependencyNotation: ProviderConvertible<MinimalExternalModuleDependency>,
 ): NpmDependency =
-    npmv(dependencyNotation.asProvider())
+    this(dependencyNotation.asProvider())
 
 operator fun DevNpmDependencyExtension.invoke(
     dependencyNotation: Provider<MinimalExternalModuleDependency>,
 ): NpmDependency {
     val dependency = dependencyNotation.get()
-    return invoke(dependency.name, dependency.version!!)
+    return this(dependency.name, dependency.version!!)
 }
diff --git a/kotlin-actions-toolkit/build.gradle.kts b/kotlin-actions-toolkit/build.gradle.kts
@@ -3,15 +3,15 @@ plugins {
 }
 
 dependencies {
-    jsMainApi(npmv(libs.npm.actions.artifact))
-    jsMainApi(npmv(libs.npm.actions.cache))
-    jsMainApi(npmv(libs.npm.actions.core))
-    jsMainApi(npmv(libs.npm.actions.exec))
-    jsMainApi(npmv(libs.npm.actions.github))
-    jsMainApi(npmv(libs.npm.actions.glob))
-    jsMainApi(npmv(libs.npm.actions.http.client))
-    jsMainApi(npmv(libs.npm.actions.io))
-    jsMainApi(npmv(libs.npm.actions.tool.cache))
+    jsMainApi(npm(libs.npm.actions.artifact))
+    jsMainApi(npm(libs.npm.actions.cache))
+    jsMainApi(npm(libs.npm.actions.core))
+    jsMainApi(npm(libs.npm.actions.exec))
+    jsMainApi(npm(libs.npm.actions.github))
+    jsMainApi(npm(libs.npm.actions.glob))
+    jsMainApi(npm(libs.npm.actions.http.client))
+    jsMainApi(npm(libs.npm.actions.io))
+    jsMainApi(npm(libs.npm.actions.tool.cache))
 
     jsMainApi(projects.kotlinNode)
 }
diff --git a/kotlin-cesium-engine/build.gradle.kts b/kotlin-cesium-engine/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinJs)
     jsMainApi(projects.kotlinBrowser)
 
-    jsMainApi(npmv(libs.npm.cesium.engine))
+    jsMainApi(npm(libs.npm.cesium.engine))
 }
diff --git a/kotlin-cesium-widgets/build.gradle.kts b/kotlin-cesium-widgets/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
     jsMainApi(projects.kotlinBrowser)
     jsMainApi(projects.kotlinCesiumEngine)
 
-    jsMainApi(npmv(libs.npm.cesium.widgets))
+    jsMainApi(npm(libs.npm.cesium.widgets))
 }
diff --git a/kotlin-electron/build.gradle.kts b/kotlin-electron/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
     jsMainApi(projects.kotlinNode)
     jsMainApi(projects.kotlinBrowser)
 
-    jsMainApi(npmv(libs.npm.electron))
+    jsMainApi(npm(libs.npm.electron))
 }
diff --git a/kotlin-emotion/build.gradle.kts b/kotlin-emotion/build.gradle.kts
@@ -7,8 +7,8 @@ dependencies {
     jsMainApi(projects.kotlinBrowser)
     jsMainApi(projects.kotlinReactCore)
 
-    jsMainApi(npmv(libs.npm.emotion.cache))
-    jsMainApi(npmv(libs.npm.emotion.css))
-    jsMainApi(npmv(libs.npm.emotion.react))
-    jsMainApi(npmv(libs.npm.emotion.styled))
+    jsMainApi(npm(libs.npm.emotion.cache))
+    jsMainApi(npm(libs.npm.emotion.css))
+    jsMainApi(npm(libs.npm.emotion.react))
+    jsMainApi(npm(libs.npm.emotion.styled))
 }
diff --git a/kotlin-mui-base/build.gradle.kts b/kotlin-mui-base/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinMuiSystem)
     jsMainApi(projects.kotlinPopperjsCore)
 
-    jsMainApi(npmv(libs.npm.mui.base))
+    jsMainApi(npm(libs.npm.mui.base))
 }
diff --git a/kotlin-mui-icons-material/build.gradle.kts b/kotlin-mui-icons-material/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinMuiMaterial)
 
-    jsMainApi(npmv(libs.npm.mui.icons.material))
+    jsMainApi(npm(libs.npm.mui.icons.material))
 }
diff --git a/kotlin-mui-lab/build.gradle.kts b/kotlin-mui-lab/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinMuiMaterial)
     jsMainApi(projects.kotlinMuixTreeView)
 
-    jsMainApi(npmv(libs.npm.mui.lab))
+    jsMainApi(npm(libs.npm.mui.lab))
 }
diff --git a/kotlin-mui-material/build.gradle.kts b/kotlin-mui-material/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinMuiBase)
 
-    jsMainApi(npmv(libs.npm.mui.material))
+    jsMainApi(npm(libs.npm.mui.material))
 }
diff --git a/kotlin-mui-system/build.gradle.kts b/kotlin-mui-system/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinReactDom)
 
-    jsMainApi(npmv(libs.npm.mui.system))
+    jsMainApi(npm(libs.npm.mui.system))
 }
diff --git a/kotlin-muix-date-pickers/build.gradle.kts b/kotlin-muix-date-pickers/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinMuiMaterial)
 
-    jsMainApi(npmv(libs.npm.muix.date.pickers))
+    jsMainApi(npm(libs.npm.muix.date.pickers))
 }
diff --git a/kotlin-muix-tree-view/build.gradle.kts b/kotlin-muix-tree-view/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinMuiMaterial)
 
-    jsMainApi(npmv(libs.npm.muix.tree.view))
+    jsMainApi(npm(libs.npm.muix.tree.view))
 }
diff --git a/kotlin-popperjs-core/build.gradle.kts b/kotlin-popperjs-core/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinJs)
     jsMainApi(projects.kotlinBrowser)
 
-    jsMainApi(npmv(libs.npm.popperjs.core))
+    jsMainApi(npm(libs.npm.popperjs.core))
 }
diff --git a/kotlin-preact-signals-core/build.gradle.kts b/kotlin-preact-signals-core/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinJs)
 
-    jsMainApi(npmv(libs.npm.preact.signals.core))
+    jsMainApi(npm(libs.npm.preact.signals.core))
 }
diff --git a/kotlin-preact-signals-react/build.gradle.kts b/kotlin-preact-signals-react/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
     jsMainApi(projects.kotlinReactCore)
     jsMainApi(projects.kotlinPreactSignalsCore)
 
-    jsMainApi(npmv(libs.npm.preact.signals.react))
+    jsMainApi(npm(libs.npm.preact.signals.react))
 }
diff --git a/kotlin-react-beautiful-dnd/build.gradle.kts b/kotlin-react-beautiful-dnd/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinReactCore)
     jsMainApi(projects.kotlinReactDom)
 
-    jsMainApi(npmv(libs.npm.react.beautiful.dnd))
+    jsMainApi(npm(libs.npm.react.beautiful.dnd))
 }
diff --git a/kotlin-react-core/build.gradle.kts b/kotlin-react-core/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     jsTestImplementation(libs.kotlin.test.js)
     jsTestImplementation(libs.coroutines.test)
 
-    jsMainApi(npmv(libs.npm.react))
+    jsMainApi(npm(libs.npm.react))
 }
diff --git a/kotlin-react-dom-test-utils/build.gradle.kts b/kotlin-react-dom-test-utils/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     jsMainImplementation(libs.coroutines.core)
     jsMainImplementation(libs.coroutines.test)
 
-    jsMainApi(npmv(libs.npm.react.dom))
+    jsMainApi(npm(libs.npm.react.dom))
 }
diff --git a/kotlin-react-dom/build.gradle.kts b/kotlin-react-dom/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
     jsMainApi(projects.kotlinBrowser)
     jsMainApi(projects.kotlinReactCore)
 
-    jsMainApi(npmv(libs.npm.react.dom))
+    jsMainApi(npm(libs.npm.react.dom))
 }
diff --git a/kotlin-react-popper/build.gradle.kts b/kotlin-react-popper/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinPopperjsCore)
     jsMainApi(projects.kotlinReactCore)
 
-    jsMainApi(npmv(libs.npm.react.popper))
+    jsMainApi(npm(libs.npm.react.popper))
 }
diff --git a/kotlin-react-router-dom/build.gradle.kts b/kotlin-react-router-dom/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     jsMainApi(projects.kotlinReactRouter)
     jsMainApi(projects.kotlinReactDom)
 
-    jsMainApi(npmv(libs.npm.react.router.dom))
+    jsMainApi(npm(libs.npm.react.router.dom))
 
     jsTestImplementation(libs.kotlin.test.js)
 }
diff --git a/kotlin-react-router/build.gradle.kts b/kotlin-react-router/build.gradle.kts
@@ -8,5 +8,5 @@ dependencies {
     jsMainApi(projects.kotlinRemixRunRouter)
     jsMainApi(projects.kotlinReactCore)
 
-    jsMainApi(npmv(libs.npm.react.router))
+    jsMainApi(npm(libs.npm.react.router))
 }
diff --git a/kotlin-react-select/build.gradle.kts b/kotlin-react-select/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
     jsMainApi(projects.kotlinReact)
     jsMainApi(projects.kotlinReactDom)
 
-    jsMainApi(npmv(libs.npm.react.select))
+    jsMainApi(npm(libs.npm.react.select))
 }
diff --git a/kotlin-remix-run-router/build.gradle.kts b/kotlin-remix-run-router/build.gradle.kts
@@ -6,5 +6,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinBrowser)
 
-    jsMainApi(npmv(libs.npm.remix.run.router))
+    jsMainApi(npm(libs.npm.remix.run.router))
 }
diff --git a/kotlin-styled-next/build.gradle.kts b/kotlin-styled-next/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 
     jsMainApi(libs.html.js)
 
-    jsMainApi(npmv(libs.npm.inline.style.prefixer))
+    jsMainApi(npm(libs.npm.inline.style.prefixer))
 
     jsTestImplementation(libs.kotlin.test.js)
     jsTestImplementation(libs.coroutines.core)

diff --git a/kotlin-tanstack-query-core/build.gradle.kts b/kotlin-tanstack-query-core/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinBrowser)
 
-    jsMainApi(npmv(libs.npm.tanstack.query.core))
+    jsMainApi(npm(libs.npm.tanstack.query.core))
 }
diff --git a/kotlin-tanstack-react-query-devtools/build.gradle.kts b/kotlin-tanstack-react-query-devtools/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinReactCore)
 
-    jsMainApi(npmv(libs.npm.tanstack.react.query.devtools))
+    jsMainApi(npm(libs.npm.tanstack.react.query.devtools))
 }
diff --git a/kotlin-tanstack-react-query/build.gradle.kts b/kotlin-tanstack-react-query/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinReactCore)
     jsMainApi(projects.kotlinTanstackQueryCore)
 
-    jsMainApi(npmv(libs.npm.tanstack.react.query))
+    jsMainApi(npm(libs.npm.tanstack.react.query))
 }
diff --git a/kotlin-tanstack-react-table/build.gradle.kts b/kotlin-tanstack-react-table/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinReactCore)
     jsMainApi(projects.kotlinTanstackTableCore)
 
-    jsMainApi(npmv(libs.npm.tanstack.react.table))
+    jsMainApi(npm(libs.npm.tanstack.react.table))
 }
diff --git a/kotlin-tanstack-react-virtual/build.gradle.kts b/kotlin-tanstack-react-virtual/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
     jsMainApi(projects.kotlinBrowser)
     jsMainApi(projects.kotlinTanstackVirtualCore)
 
-    jsMainApi(npmv(libs.npm.tanstack.react.virtual))
+    jsMainApi(npm(libs.npm.tanstack.react.virtual))
 }
diff --git a/kotlin-tanstack-table-core/build.gradle.kts b/kotlin-tanstack-table-core/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinBrowser)
 
-    jsMainApi(npmv(libs.npm.tanstack.table.core))
+    jsMainApi(npm(libs.npm.tanstack.table.core))
 }
diff --git a/kotlin-tanstack-virtual-core/build.gradle.kts b/kotlin-tanstack-virtual-core/build.gradle.kts
@@ -6,5 +6,5 @@ dependencies {
     jsMainApi(projects.kotlinJs)
     jsMainApi(projects.kotlinBrowser)
 
-    jsMainApi(npmv(libs.npm.tanstack.virtual.core))
+    jsMainApi(npm(libs.npm.tanstack.virtual.core))
 }
diff --git a/kotlin-typescript/build.gradle.kts b/kotlin-typescript/build.gradle.kts
@@ -6,5 +6,5 @@ plugins {
 dependencies {
     jsMainApi(projects.kotlinJs)
 
-    jsMainApi(npmv(libs.npm.typescript))
+    jsMainApi(npm(libs.npm.typescript))
 }