From 638554ba1cfaf1504cf516203687fb9c0d7e2555 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Sun, 7 Jul 2019 16:53:42 +0300 Subject: [PATCH] Gradle, JS, resolver: don't add files that are not existed, add kjsm files --- .../kotlin/gradle/targets/js/npm/NpmDependency.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt index 1cdec81e59b..c293d14ca16 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt @@ -46,9 +46,17 @@ data class NpmDependency( visited.add(item) npmProject.resolve(item.key)?.let { - all.add(it) + if (it.isFile) all.add(it) if (it.path.endsWith(".js")) { - all.add(File(it.path.removeSuffix(".js") + ".meta.js")) + val baseName = it.path.removeSuffix(".js") + val metaJs = File(baseName + ".meta.js") + if (metaJs.isFile) all.add(metaJs) + val kjsmDir = File(baseName) + if (kjsmDir.isDirectory) { + kjsmDir.walkTopDown() + .filter { it.extension == "kjsm" } + .forEach { all.add(it) } + } } }