From a13a86a5431f56506151a872b588f76cd1fa607c Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 14 May 2019 15:08:18 +0300 Subject: [PATCH] Gradle, js: revert to storing compile output inside node_modules #KT-30530 Currently kotlin JS compiler generated `require('a.js')` for test -> main dependencies. This is not worked in layout with compile output at project work dir (will work if compiler will generate `require('a_test.js')`). --- .../kotlin/gradle/targets/js/npm/NpmProjectLayout.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectLayout.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectLayout.kt index 05eea37e474..1d55f64d42b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectLayout.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProjectLayout.kt @@ -32,14 +32,7 @@ enum class NpmProjectLayout { nodeJsWorldDir.resolve("packages").resolve(projectPackage) } - return object : NpmProject( - project, - workDir, - searchInParents = true - ) { - override val compileOutputCopyDest: File? - get() = nodeWorkDir - } + return NpmProject(project, workDir, searchInParents = true) } }, BUILD_DIR {