[Gradle, JS] Tools npm dependencies resolved in task execution

This commit is contained in:
Ilya Goncharov
2020-06-09 13:13:25 +03:00
parent 1ab6a9bc84
commit 8f679bf1d3
@@ -307,9 +307,19 @@ internal class KotlinCompilationNpmResolver(
} }
.filterNotNull() .filterNotNull()
val toolsNpmDependencies = nodeJs.taskRequirements
.getTaskRequirements(compilation)
.flatMap { requirement ->
requirement.requiredNpmDependencies
}
.map { it.createDependency(project) }
.filterIsInstance<NpmDependency>()
val allNpmDependencies = externalNpmDependencies + toolsNpmDependencies
val packageJson = packageJson( val packageJson = packageJson(
npmProject, npmProject,
externalNpmDependencies allNpmDependencies
) )
compositeDependencies.forEach { compositeDependencies.forEach {
@@ -338,7 +348,7 @@ internal class KotlinCompilationNpmResolver(
resolvedInternalDependencies, resolvedInternalDependencies,
compositeDependencies, compositeDependencies,
importedExternalGradleDependencies, importedExternalGradleDependencies,
externalNpmDependencies, allNpmDependencies,
packageJson packageJson
) )
} }