From 14d399e9ab52301d56384eaea9a3fe8e31c063f3 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 14 May 2019 15:40:04 +0300 Subject: [PATCH] Gradle, js, browser: fix run --- .../kotlin/gradle/targets/js/nodejs/NodeJsExec.kt | 7 ------- .../gradle/targets/js/subtargets/KotlinBrowserJs.kt | 10 +++++++--- 2 files changed, 7 insertions(+), 10 deletions(-) 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 0a218b8f7bb..48ee4b50625 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 @@ -29,17 +29,10 @@ open class NodeJsExec : AbstractExecTask(NodeJsExec::class.java) { args("--require", moduleName) } - fun requireSourceMapSupport() { - require("kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js") - } - fun script(file: File) { check(script == null) { "Script was already set to $script" } script = file.canonicalFile.relativeToOrSelf(npmProject.nodeWorkDir).path } - - fun compileOutput(compilationTask: Kotlin2JsCompile) = - script(npmProject.compileOutput(compilationTask)) } \ No newline at end of file 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 847cd91a571..885b33efa79 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 @@ -53,14 +53,18 @@ class KotlinBrowserJs(target: KotlinJsTarget) : project.createOrRegisterTask(disambiguateCamelCased("run")) { val compileKotlinTask = compilation.compileKotlinTask - it.dependsOn(target.npmResolveTaskHolder.getTaskOrProvider(), compileKotlinTask) + it.dependsOn( + target.npmResolveTaskHolder.getTaskOrProvider(), + compileKotlinTask, + project.getTasksByName(compilation.processResourcesTaskName, false) + ) it.bin = "webpack-dev-server" it.entry = npmProject.compileOutput(compileKotlinTask) - val projectDir = target.project.projectDir.canonicalPath it.devServer = KotlinWebpackConfig.DevServer( - contentBase = listOf("$projectDir/src/main/resources") + open = true, + contentBase = listOf(compilation.output.resourcesDir.canonicalPath) ) it.outputs.upToDateWhen { false }