From 134aa6182edb0926c233b88ab3bfba849d9c5f1c Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 28 Aug 2020 15:14:45 +0300 Subject: [PATCH] [Gradle, JS] Process resources into kotlin folder ^KT-41566 fixed --- .../kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt | 3 +-- .../jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt index 831b262fa0d..b102777bf3c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt @@ -215,9 +215,8 @@ abstract class KotlinJsIrSubTarget( PREPARE_JS_LIBRARY_TASK_NAME ) ) { - it.from(processResourcesTask) it.from(project.tasks.named(npmProject.publicPackageJsonTaskName)) - it.from(binary.linkTask) + it.from(binary.linkSyncTask) it.into(binary.distribution.directory) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt index 49f454e2043..4ecb70ae0ca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt @@ -126,6 +126,8 @@ constructor( project.layout.file(binary.linkTask.map { it.destinationDir }) ) + task.from(project.tasks.named(compilation.processResourcesTaskName)) + task.into( npmProject.dist )