[Gradle, JS] Fix path setting in Windows

JetBrains · Dec 8, 2021 · 9bffcfa · 9bffcfa
1 parent 06a205f
commit 9bffcfa
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...n-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt b/...n-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
@@ -40,10 +40,17 @@ abstract class YarnBasics : NpmApi {
                             if (yarn.ignoreScripts) "--ignore-scripts" else ""
 
             val nodeExecutable = nodeJs.requireConfigured().nodeExecutable
-            exec.environment(
-                "PATH",
-                "$nodeExecutable${File.pathSeparator}${System.getenv("PATH")}"
-            )
+            if (!yarn.ignoreScripts) {
+                val nodePath = if (nodeJs.requireConfigured().isWindows) {
+                    File(nodeExecutable).parent
+                } else {
+                    nodeExecutable
+                }
+                exec.environment(
+                    "PATH",
+                    "$nodePath${File.pathSeparator}${System.getenv("PATH")}"
+                )
+            }
 
             val command = yarn.executable
             if (yarn.standalone) {