diff --git a/buildSrc/src/main/kotlin/NpmDependencies.kt b/buildSrc/src/main/kotlin/NpmDependencies.kt index 0e0a8378201ea..1dc315f0c586b 100644 --- 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, ): NpmDependency { - val npm = dependencies.the() 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, ): NpmDependency = - npmv(dependencyNotation.asProvider()) + this(dependencyNotation.asProvider()) operator fun DevNpmDependencyExtension.invoke( dependencyNotation: Provider, ): 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 index 7f344d7f65abc..b6028a7f14543 100644 --- 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 index 177e8eee385a4..9ffb4c98658a6 100644 --- 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 index 7324cee9b4358..2200e10d13352 100644 --- 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 index 941d4de0156f7..346772170dd6a 100644 --- 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 index aa41d7f5d05df..a0763f5e28a1d 100644 --- 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 index cce1375f829f2..87282f97aefb4 100644 --- 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 index bfee87d0beab8..50249f31ac5cc 100644 --- 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 index 32e9b033aaa49..7fb0d95d7e90f 100644 --- 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 index bad3a1972742b..83159c9ae3865 100644 --- 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 index a56a6625c122c..f17c07c984c1f 100644 --- 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 index 6d17f1867456b..74cd6b85733a3 100644 --- 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 index 14519383d7c2b..da2d012de4802 100644 --- 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 index eb4f8e6c34269..55076ebff4db8 100644 --- 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 index 17911255086b5..0e7c5c3f0d1ca 100644 --- 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 index 191c543a4a8de..946fe7ed141ea 100644 --- 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 index e1b394c95fa1f..14cd5f51b5579 100644 --- 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 index 76262d298f810..55be2dee4e103 100644 --- 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 index 23066abd07af3..1cc0cdc6b6a1f 100644 --- 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 index 97d04c4de4602..1c29be9ce694b 100644 --- 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 index 5934b3b330450..d76c15e24ee9e 100644 --- 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 index 52f05913563be..54c2c12f94e92 100644 --- 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 index 84005ae33d0a9..21dca524982eb 100644 --- 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 index 089dfc44617ce..ac719ce7e264d 100644 --- 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 index bb829b387a4fd..483ec14f8dd80 100644 --- 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 index 5fb31269655ca..fb4d441a1a99b 100644 --- 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 index cff985b929583..860ba81915976 100644 --- 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 index 31c939c5c1eae..12501324144cd 100644 --- 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 index 69f62772ef248..76f52fdb809f9 100644 --- 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 index 98e8374975adf..2a2b4d2a593ab 100644 --- 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 index 14e03e5d2df0f..64f438dedf71a 100644 --- 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 index fee38c615596a..54c3e4e139244 100644 --- 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 index a898e933ccd59..7d65a030cd899 100644 --- 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 index d47b12a41513e..9bc81794671aa 100644 --- 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)) }