From 024636f704c8672d93b28ea9dfe7d49f3a7e6d9e Mon Sep 17 00:00:00 2001 From: ilgonmic Date: Sun, 16 Jun 2019 14:36:31 +0300 Subject: [PATCH] Gradle, JS, webpack: run js directly (don't use bin script) On windows, bin script wrapped with bashsh and cmd shell, so node failed to run it #KT-31985 Fixed --- .../kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt | 2 +- .../kotlin/gradle/targets/js/webpack/KotlinWebpack.kt | 2 +- .../kotlin/gradle/targets/js/webpack/KotlinWebpackRunner.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 5523b2e5945..414af6ceb6c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -59,7 +59,7 @@ class KotlinBrowserJs(target: KotlinJsTarget) : project.getTasksByName(compilation.processResourcesTaskName, false) ) - it.bin = "webpack-dev-server" + it.bin = "webpack-dev-server/bin/webpack-dev-server.js" it.compilation = compilation it.description = "start webpack dev server" diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt index f2ded54c529..fa14faf3091 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt @@ -75,7 +75,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { @OutputFile get() = reportDir.resolve("webpack.config.evaluated.js") @Input - var bin: String = "webpack" + var bin: String = "webpack/bin/webpack.js" @Input var sourceMaps: Boolean = true diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackRunner.kt index 43800fe1e0b..5dfdac1d4dd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackRunner.kt @@ -16,7 +16,7 @@ internal data class KotlinWebpackRunner( val npmProject: NpmProject, val configFile: File, val execHandleFactory: ExecHandleFactory, - val bin: String, + val tool: String, val configWriter: KotlinWebpackConfigWriter ) { fun execute() = npmProject.project.execWithProgress("webpack") { @@ -43,6 +43,6 @@ internal data class KotlinWebpackRunner( args.add("--progress") } - npmProject.useTool(execFactory, ".bin/$bin", *args.toTypedArray()) + npmProject.useTool(execFactory, tool, *args.toTypedArray()) } } \ No newline at end of file