[Gradle, JS] Reuse yarn resolution results from configuration cache
This commit is contained in:
committed by
Space
parent
6c5fdfe070
commit
e9a231e97e
+1
-2
@@ -252,8 +252,7 @@ class KotlinNpmResolutionManager(@Transient private val nodeJsSettings: NodeJsRo
|
||||
internal fun <T> checkRequiredDependencies(task: T, services: ServiceRegistry, logger: Logger, projectPath: String)
|
||||
where T : RequiresNpmDependencies,
|
||||
T : Task {
|
||||
val requestedTaskDependencies = requireInstalled(services, logger, "before $task execution")[projectPath].taskRequirements
|
||||
val targetRequired = requestedTaskDependencies[task.path]?.toSet() ?: setOf()
|
||||
val targetRequired = resolver.taskRequirements.byTask[task.path]?.toSet() ?: setOf()
|
||||
|
||||
task.requiredNpmDependencies.forEach {
|
||||
check(it in targetRequired) {
|
||||
|
||||
+6
-6
@@ -32,12 +32,6 @@ constructor(
|
||||
private val compilationName = compilation.disambiguatedName
|
||||
private val projectPath = project.path
|
||||
|
||||
private val compilationResolution
|
||||
get() = resolutionManager.requireInstalled(
|
||||
services,
|
||||
logger
|
||||
)[projectPath][compilationName]
|
||||
|
||||
private val packageJsonHandlers = compilation.packageJsonHandlers
|
||||
|
||||
@get:Input
|
||||
@@ -47,6 +41,12 @@ constructor(
|
||||
packageJsonHandlers.forEach { it() }
|
||||
}.customFields
|
||||
|
||||
private val compilationResolver
|
||||
get() = resolutionManager.resolver[projectPath][compilationName]
|
||||
|
||||
private val compilationResolution
|
||||
get() = compilationResolver.getResolutionOrResolveIfForced() ?: error("Compilation resolution isn't available")
|
||||
|
||||
@get:Nested
|
||||
internal val externalDependencies: Collection<NpmDependencyDeclaration>
|
||||
get() = compilationResolution.externalNpmDependencies
|
||||
|
||||
Reference in New Issue
Block a user