From 88755a8d20babea0c226ef891042d277d0435854 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 2 Sep 2020 14:59:43 +0300 Subject: [PATCH] [Gradle, JS] Use npm project dir as executable ^KT-40812 fixed --- .../org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt index 3a745b7947b..13222df0864 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt @@ -82,6 +82,7 @@ constructor( val target = compilation.target val project = target.project val nodeJs = NodeJsRootPlugin.apply(project.rootProject) + val npmProject = compilation.npmProject return project.registerTask( name, @@ -89,6 +90,7 @@ constructor( ) { it.nodeJs = nodeJs it.executable = nodeJs.requireConfigured().nodeExecutable + it.workingDir = npmProject.dir it.dependsOn(nodeJs.npmInstallTaskProvider) it.dependsOn(nodeJs.npmInstallTaskProvider, compilation.compileKotlinTaskProvider)