[Gradle, JS] Tools npm dependencies resolved in task execution
This commit is contained in:
+12
-2
@@ -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
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user