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

[Gradle, JS] Use npm project dir as executable

Browse Source 
^KT-40812 fixed
This commit is contained in:
Ilya Goncharov
2020-09-02 14:59:43 +03:00
parent 6db0785615
commit 88755a8d20
1 changed files with 2 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/nodejs/NodeJsExec.kt
+2
View File
@@ -82,6 +82,7 @@ constructor(
val target = compilation.target val target = compilation.target
val project = target.project val project = target.project
val nodeJs = NodeJsRootPlugin.apply(project.rootProject) val nodeJs = NodeJsRootPlugin.apply(project.rootProject)
val npmProject = compilation.npmProject
return project.registerTask( return project.registerTask(
name, name,
@@ -89,6 +90,7 @@ constructor(
) { ) {
it.nodeJs = nodeJs it.nodeJs = nodeJs
it.executable = nodeJs.requireConfigured().nodeExecutable it.executable = nodeJs.requireConfigured().nodeExecutable
it.workingDir = npmProject.dir
it.dependsOn(nodeJs.npmInstallTaskProvider) it.dependsOn(nodeJs.npmInstallTaskProvider)
it.dependsOn(nodeJs.npmInstallTaskProvider, compilation.compileKotlinTaskProvider) it.dependsOn(nodeJs.npmInstallTaskProvider, compilation.compileKotlinTaskProvider)