From e27c334d4afe07685ccf5b97f07919468168b979 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 30 Mar 2020 16:05:52 +0300 Subject: [PATCH] [Gradle, JS] Fix package.json file #KT-32466 fixed #KT-36784 fixed #KT-36864 fixed --- .../targets/js/npm/resolver/KotlinCompilationNpmResolver.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt index aa31e985b16..269eb116127 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt @@ -346,11 +346,12 @@ internal class KotlinCompilationNpmResolver( } private fun CompositeDependency.getPackages(): List { - return includedBuild + val packages = includedBuild .projectDir .resolve(nodeJs.projectPackagesDir.relativeTo(nodeJs.rootProject.rootDir)) + return packages .list() - ?.map(::File) + ?.map { packages.resolve(it) } ?.map { it.resolve(PACKAGE_JSON) } ?: emptyList() }