[Gradle, JS] Fix package.json file

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
This commit is contained in:
Ilya Goncharov
2020-03-30 16:05:52 +03:00
parent fa632a2aea
commit e27c334d4a
@@ -346,11 +346,12 @@ internal class KotlinCompilationNpmResolver(
} }
private fun CompositeDependency.getPackages(): List<File> { private fun CompositeDependency.getPackages(): List<File> {
return includedBuild val packages = includedBuild
.projectDir .projectDir
.resolve(nodeJs.projectPackagesDir.relativeTo(nodeJs.rootProject.rootDir)) .resolve(nodeJs.projectPackagesDir.relativeTo(nodeJs.rootProject.rootDir))
return packages
.list() .list()
?.map(::File) ?.map { packages.resolve(it) }
?.map { it.resolve(PACKAGE_JSON) } ?.map { it.resolve(PACKAGE_JSON) }
?: emptyList() ?: emptyList()
} }