From e3187217ee7a89421a4cb7acb62c3dc1112818a3 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 12 Sep 2019 18:59:33 +0300 Subject: [PATCH] Fix executable files for nodejs - For windows NPM doesn't create symlinks, but cretae CMD files, so it is necessary to provide path to JS file explicitly #KT-33710 fixed --- .../jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt | 2 +- .../kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt index 304a048ff74..278920b7d61 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt @@ -39,7 +39,7 @@ class DukatExecutor( args.addAll(dTsFiles.map { it.absolutePath }) - compilation.npmProject.useTool(exec, ".bin/dukat", *args.toTypedArray()) + compilation.npmProject.useTool(exec, "dukat/bin/dukat-cli.js", *args.toTypedArray()) } } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt index 283ac150708..03d63b702d1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt @@ -10,9 +10,9 @@ import org.gradle.process.ProcessForkOptions import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation -import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm import org.jetbrains.kotlin.gradle.targets.js.KotlinGradleNpmPackage import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency +import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest @@ -47,7 +47,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF ) val nodeModules = listOf( - ".bin/mocha", + "mocha/bin/mocha", task.nodeModulesToLoad.single() )