azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-34468 Yarn. Star version support fix

Browse Source
This commit is contained in:
Victor Turansky
2020-03-23 20:35:40 +03:00
committed by Ilya Goncharov
parent d494881cb9
commit 0d1bf66c2a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
+5 -3
View File
@@ -114,11 +114,13 @@ abstract class YarnBasics : NpmApi {
visited[src] = src visited[src] = src
val key = dependencyKey(src.key, src.version) val key = dependencyKey(src.key, src.version)
val deps = byKey[key] val deps = if (src.version != "*") {
?: if (src.version == "*") byKey.entries byKey[key]
} else {
byKey.entries
.firstOrNull { it.key.startsWith(dependencyKey(src.key, "")) } .firstOrNull { it.key.startsWith(dependencyKey(src.key, "")) }
?.value ?.value
else null }
if (deps == null) { if (deps == null) {
error("Cannot find $key in yarn.lock") error("Cannot find $key in yarn.lock")