diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRange.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRange.kt index 05a6cf91c54..34f0edd8e53 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRange.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRange.kt @@ -65,6 +65,8 @@ infix fun NpmRange.union(other: NpmRange): List { } fun NpmRange.invert(): List { + if (startVersion == null && endVersion == null) return emptyList() + val result = mutableListOf() if (startVersion != null || endVersion == null) { result.add( diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt index ba3c9a00fd8..9aa1cab73c9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt @@ -175,5 +175,6 @@ class NpmRangeVisitor : NodeSemverExpressionBaseVisitor>() { const val AND = " " const val OR = " || " + const val WILDCARD = "*" } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersionConstraint.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersionConstraint.kt index e12f98d9f6a..baf2908902e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersionConstraint.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersionConstraint.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.gradle.targets.js.npm -import com.github.gundy.semver4j.SemVer import org.gradle.api.internal.artifacts.dependencies.DefaultMutableVersionConstraint +import org.jetbrains.kotlin.gradle.targets.js.npm.NpmRangeVisitor.Companion.WILDCARD class NpmVersionConstraint( version: String ) : DefaultMutableVersionConstraint(version) { override fun rejectAll() { super.rejectAll() - reject(NONE_VERSION) + reject(WILDCARD) } fun toSemVer(): String { @@ -37,6 +37,4 @@ class NpmVersionConstraint( true ) } -} - -const val NONE_VERSION = "0.0.0" \ No newline at end of file +} \ No newline at end of file