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

Gradle, js, yarn: store resolved version and integrity hash to NpmDependency

Browse Source
This commit is contained in:
Sergey Rostov
2019-07-07 17:24:05 +03:00
parent d051748e2b
commit d1789b07ad
2 changed files with 6 additions and 0 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/npm/NpmDependency.kt
+2
View File
@@ -41,6 +41,8 @@ data class NpmDependency(
internal var parent: NpmDependency? = null internal var parent: NpmDependency? = null
internal val dependencies = mutableSetOf<NpmDependency>() internal val dependencies = mutableSetOf<NpmDependency>()
internal var resolvedVersion: String? = null
internal var integrity: String? = null
override fun resolve(transitive: Boolean): MutableSet<File> { override fun resolve(transitive: Boolean): MutableSet<File> {
val npmPackage = resolveProject() ?: return mutableSetOf() val npmPackage = resolveProject() ?: return mutableSetOf()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
+4
View File
@@ -46,6 +46,8 @@ abstract class YarnBasics : NpmApi {
fun resolveRecursively(src: NpmDependency): NpmDependency { fun resolveRecursively(src: NpmDependency): NpmDependency {
val copy = visited[src] val copy = visited[src]
if (copy != null) { if (copy != null) {
src.resolvedVersion = copy.resolvedVersion
src.integrity = copy.integrity
src.dependencies.addAll(copy.dependencies) src.dependencies.addAll(copy.dependencies)
return src return src
} }
@@ -54,6 +56,8 @@ abstract class YarnBasics : NpmApi {
val key = YarnLock.key(src.key, src.version) val key = YarnLock.key(src.key, src.version)
val deps = byKey[key] val deps = byKey[key]
if (deps != null) { if (deps != null) {
src.resolvedVersion = deps.version
src.integrity = deps.integrity
src.dependencies.addAll(deps.dependencies.map { dep -> src.dependencies.addAll(deps.dependencies.map { dep ->
val scopedName = dep.scopedName val scopedName = dep.scopedName
val child = NpmDependency( val child = NpmDependency(