From d494881cb980250e836c7f6a34113e2cbbe6aee6 Mon Sep 17 00:00:00 2001
From: Victor Turansky <victor.turansky@gmail.com>
Date: Mon, 23 Mar 2020 20:31:41 +0300
Subject: [PATCH] KT-34468 Yarn. Dependency check at the beginning

---
 .../gradle/targets/js/yarn/YarnBasics.kt      | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
index 2adb31147bc..15e07312831 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
@@ -120,26 +120,26 @@ abstract class YarnBasics : NpmApi {
                         ?.value
                     else null
 
-                if (deps != null) {
-                    src.resolvedVersion = deps.version
-                    src.integrity = deps.integrity
-                    src.dependencies.addAll(deps.dependencies.map { dep ->
-                        val scopedName = dep.scopedName
-                        val child = NpmDependency(
-                            src.project,
-                            scopedName.toString(),
-                            dep.version ?: "*"
-                        )
-                        child.parent = src
-
-                        resolveRecursively(child)
-
-                        child
-                    })
-                } else {
+                if (deps == null) {
                     error("Cannot find $key in yarn.lock")
                 }
 
+                src.resolvedVersion = deps.version
+                src.integrity = deps.integrity
+                src.dependencies.addAll(deps.dependencies.map { dep ->
+                    val scopedName = dep.scopedName
+                    val child = NpmDependency(
+                        src.project,
+                        scopedName.toString(),
+                        dep.version ?: "*"
+                    )
+                    child.parent = src
+
+                    resolveRecursively(child)
+
+                    child
+                })
+
                 return src
             }