From 98f012b1c86dc76c440c1899dbad3fbc93019374 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 30 Mar 2020 10:53:32 +0300 Subject: [PATCH] [Gradle, JS] KT-36784 Dependencies for workspaces But it should be done as a file dependencies This reverts commit c5f2ff30 #KT-32466 fixed #KT-36784 fixed #KT-36864 fixed --- .../js/npm/resolver/KotlinCompilationNpmResolver.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 8e34adc276e..ac7de89383b 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 @@ -308,6 +308,18 @@ internal class KotlinCompilationNpmResolver( packageJson.main = npmProject.main + compositeDependencies.forEach { + packageJson.dependencies[it.name] = it.version + } + + resolvedInternalDependencies.forEach { + packageJson.dependencies[it.packageJson.name] = it.packageJson.version + } + + importedExternalGradleDependencies.forEach { + packageJson.dependencies[it.name] = it.version + } + val dependencies = mutableMapOf() externalNpmDependencies.forEach {