From 0d9265388b6d31c180083b842d83921456540f01 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 7 May 2020 19:48:25 +0300 Subject: [PATCH] [Gradle, JS] Add possible variants for generate kotlin variants KT-38331 --- .../targets/js/npm/NpmDependencyExtension.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt index a2040410676..fdb51a2b031 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt @@ -108,7 +108,7 @@ private abstract class AbstractNpmDependencyExtension( DevNpmDependencyExtension, PeerNpmDependencyExtension, Closure(project.dependencies) { - private val defaultGenerateKotlinExternals: Boolean + protected val defaultGenerateKotlinExternals: Boolean get() = _defaultGenerateKotlinExternals ?: false override fun invoke(name: String): NpmDependency = @@ -277,10 +277,20 @@ private class DefaultNpmDependencyExtension( } override fun possibleVariants(): List> { - return super.possibleVariants() + listOf( + val result = super.possibleVariants() + listOf( "npm(File)" to "File.name:File", "npm('name', File)" to "name:File" ) + + if (_defaultGenerateKotlinExternals == null) { + return result + } + + return result + .map { (first, second) -> + val value = first.replace(")", ", generateKotlinExternals = $defaultGenerateKotlinExternals)") + value to second + } } }