[Gradle, JS] Partially rootPackageJson and kotlinNpmInstall with conf cache

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt

@@ -86,7 +86,7 @@ internal class DukatCompilationResolverPlugin(
         packageJsonIsUpdated: Boolean,
         resolution: KotlinRootNpmResolution
     ) {
-        val externalNpmDependencies = resolution[project][compilation].externalNpmDependencies
+        val externalNpmDependencies = resolution[project.path][compilation].externalNpmDependencies
 
         val target = compilation.target
         val externalsOutputFormat = compilation.externalsOutputFormat

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt

@@ -44,7 +44,7 @@ abstract class DukatTask(
     @get:Internal
     @delegate:Transient
     val dts by lazy {
-        val resolvedCompilation = nodeJs.npmResolutionManager.requireInstalled()[project][compilation]
+        val resolvedCompilation = nodeJs.npmResolutionManager.requireInstalled()[project.path][compilation]
         val dtsResolver = DtsResolver(resolvedCompilation.npmProject)
         dtsResolver.getAllDts(
             resolvedCompilation.externalNpmDependencies,

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt

@@ -63,8 +63,8 @@ open class NodeJsRootExtension(@Transient val rootProject: Project) : Configurat
     val packageJsonUmbrellaTaskProvider: TaskProvider<Task>
         get() = rootProject.tasks.named(PACKAGE_JSON_UMBRELLA_TASK_NAME)
 
-    val rootPackageJsonTaskProvider: TaskProvider<RootPackageJsonTask>
+    val rootPackageJsonTaskProvider: TaskProvider<RootPackageJsonTask>?
-        get() = rootProject.tasks.withType(RootPackageJsonTask::class.java).named(RootPackageJsonTask.NAME)
+        get() = rootProject?.tasks?.withType(RootPackageJsonTask::class.java)?.named(RootPackageJsonTask.NAME)
 
     val rootPackageDir: File by lazy {
         rootProject.buildDir.resolve("js")
@@ -121,7 +121,6 @@ open class NodeJsRootExtension(@Transient val rootProject: Project) : Configurat
 
     val versions = NpmVersions()
 
-    @Transient
     internal val npmResolutionManager = KotlinNpmResolutionManager(this)
 
     companion object {

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/KotlinNpmResolutionManager.kt

@@ -106,7 +106,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
 
         companion object {
             fun npmProjectsByProjectResolutions(
-                resolutions: Map<Project, KotlinProjectNpmResolution>
+                resolutions: Map<String, KotlinProjectNpmResolution>
             ): List<NpmProject> {
                 return resolutions
                     .values
@@ -150,7 +150,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
     }
 
     internal fun requireAlreadyInstalled(project: Project, reason: String = ""): KotlinProjectNpmResolution =
-        installIfNeeded(reason = reason)[project]
+        installIfNeeded(reason = reason)[project.path]
 
     internal val packageJsonFiles: Collection<File>
         get() = state.npmProjects.map { it.packageJsonFile }
@@ -178,7 +178,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
                     when (state1) {
                         is ResolutionState.Prepared -> alreadyResolved(state1.preparedInstallation)
                         is ResolutionState.Configuring -> {
-                            val upToDate = nodeJsSettings.rootPackageJsonTaskProvider.get().state.upToDate
+                            val upToDate = nodeJsSettings.rootPackageJsonTaskProvider?.get()?.state?.upToDate ?: true
                             if (requireUpToDateReason != null && !upToDate) {
                                 error("NPM dependencies should be resolved $requireUpToDateReason")
                             }
@@ -196,7 +196,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
     }
 
     internal fun getNpmDependencyResolvedCompilation(npmDependency: NpmDependency): KotlinCompilationNpmResolution? {
-        val project = npmDependency.project
+        val project = npmDependency.project.path
 
         val resolvedProject =
             if (forceFullResolve) {
@@ -222,15 +222,15 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
     internal fun <T> checkRequiredDependencies(task: T)
             where T : RequiresNpmDependencies,
                   T : Task {
-        val project = task.project
+//        val project = task.project
-        val requestedTaskDependencies = requireAlreadyInstalled(project, "before $task execution").taskRequirements
+//        val requestedTaskDependencies = requireAlreadyInstalled(project, "before $task execution").taskRequirements
-        val targetRequired = requestedTaskDependencies[task]?.toSet() ?: setOf()
+//        val targetRequired = requestedTaskDependencies[task]?.toSet() ?: setOf()
-
+//
-        task.requiredNpmDependencies.forEach {
+//        task.requiredNpmDependencies.forEach {
-            check(it in targetRequired) {
+//            check(it in targetRequired) {
-                "${it.createDependency(project)} required by $task was not found resolved at the time of nodejs package manager call. " +
+//                "${it.createDependency(project)} required by $task was not found resolved at the time of nodejs package manager call. " +
-                        "This may be caused by changing $task configuration after npm dependencies resolution."
+//                        "This may be caused by changing $task configuration after npm dependencies resolution."
-            }
+//            }
-        }
+//        }
     }
 }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt

@@ -27,7 +27,7 @@ constructor(
     private val nodeJs = npmProject.nodeJs
 
     private val compilationResolution
-        get() = nodeJs.npmResolutionManager.requireInstalled()[project][npmProject.compilation]
+        get() = nodeJs.npmResolutionManager.requireInstalled()[project.path][npmProject.compilation]
 
     init {
         // TODO: temporary workaround for configuration cache enabled builds

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolved/KotlinProjectNpmResolution.kt

@@ -16,11 +16,11 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies
  * Info about NPM projects inside particular gradle [project].
  */
 class KotlinProjectNpmResolution(
-    val project: Project,
+    val project: String,
     val npmProjects: List<KotlinCompilationNpmResolution>,
-    val taskRequirements: Map<RequiresNpmDependencies, Collection<RequiredKotlinJsDependency>>
+    val taskRequirements: Map<RequiresNpmDependencies, Collection<RequiredKotlinJsDependency>>?
 ) {
-    val npmProjectsByNpmDependency: Map<NpmDependency, KotlinCompilationNpmResolution> =
+    val npmProjectsByNpmDependency: Map<NpmDependency, KotlinCompilationNpmResolution> by lazy {
         mutableMapOf<NpmDependency, KotlinCompilationNpmResolution>().also { result ->
             npmProjects.forEach { npmPackage ->
                 npmPackage.externalNpmDependencies.forEach { npmDependency ->
@@ -28,15 +28,16 @@ class KotlinProjectNpmResolution(
                 }
             }
         }
+    }
 
-    val byCompilation by lazy { npmProjects.associateBy { it.npmProject.compilation } }
+    val byCompilation by lazy { npmProjects.associateBy { it.npmProject.compilation.name } }
 
     operator fun get(compilation: KotlinJsCompilation): KotlinCompilationNpmResolution {
-        check(compilation.target.project == project)
+        check(compilation.target.project.path == project)
-        return byCompilation.getValue(compilation)
+        return byCompilation.getValue(compilation.name)
     }
 
     companion object {
-        fun empty(project: Project) = KotlinProjectNpmResolution(project, listOf(), mapOf())
+        fun empty(project: String) = KotlinProjectNpmResolution(project, listOf(), mapOf())
     }
 }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolved/KotlinRootNpmResolution.kt

@@ -9,7 +9,7 @@ import org.gradle.api.Project
 
 internal class KotlinRootNpmResolution(
     val rootProject: Project,
-    internal val projects: Map<Project, KotlinProjectNpmResolution>
+    internal val projects: Map<String, KotlinProjectNpmResolution>
 ) {
-    operator fun get(project: Project) = projects[project] ?: KotlinProjectNpmResolution.empty(project)
+    operator fun get(project: String) = projects[project] ?: KotlinProjectNpmResolution.empty(project)
 }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt

@@ -25,16 +25,19 @@ import kotlin.reflect.KClass
  * See [KotlinNpmResolutionManager] for details about resolution process.
  */
 internal class KotlinProjectNpmResolver(
+    @Transient
     val project: Project,
     val resolver: KotlinRootNpmResolver
 ) {
     override fun toString(): String = "ProjectNpmResolver($project)"
 
-    private val byCompilation = mutableMapOf<KotlinJsCompilation, KotlinCompilationNpmResolver>()
+    private val projectPath by lazy { project.path }
+
+    private val byCompilation = mutableMapOf<String, KotlinCompilationNpmResolver>()
 
     operator fun get(compilation: KotlinJsCompilation): KotlinCompilationNpmResolver {
         check(compilation.target.project == project)
-        return byCompilation[compilation] ?: error("$compilation was not registered in $this")
+        return byCompilation[compilation.name] ?: error("$compilation was not registered in $this")
     }
 
     private var closed = false
@@ -103,7 +106,7 @@ internal class KotlinProjectNpmResolver(
     private fun addCompilation(compilation: KotlinJsCompilation) {
         check(!closed) { resolver.alreadyResolvedMessage("add compilation $compilation") }
 
-        byCompilation[compilation] = KotlinCompilationNpmResolver(this, compilation)
+        byCompilation[compilation.name] = KotlinCompilationNpmResolver(this, compilation)
     }
 
     fun close(): KotlinProjectNpmResolution {
@@ -111,9 +114,9 @@ internal class KotlinProjectNpmResolver(
         closed = true
 
         return KotlinProjectNpmResolution(
-            project,
+            projectPath,
             byCompilation.values.mapNotNull { it.close() },
-            resolver.nodeJs.taskRequirements.byTask
+            resolver.nodeJs.taskRequirements?.byTask
         )
     }
 }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt

@@ -124,8 +124,8 @@ internal class KotlinRootNpmResolver internal constructor(
         }
     }
 
-    open inner class Installation(val projectResolutions: Map<Project, KotlinProjectNpmResolution>) {
+    open inner class Installation(val projectResolutions: Map<String, KotlinProjectNpmResolution>) {
-        operator fun get(project: Project) =
+        operator fun get(project: String) =
             projectResolutions[project] ?: KotlinProjectNpmResolution.empty(project)
 
         internal fun install(

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinNpmInstallTask.kt

@@ -30,7 +30,7 @@ open class KotlinNpmInstallTask : DefaultTask() {
 
     init {
         // TODO: temporary workaround for configuration cache enabled builds
-        disableTaskOnConfigurationCacheBuild { resolutionManager.toString() }
+//        disableTaskOnConfigurationCacheBuild { resolutionManager.toString() }
     }
 
     @Input

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt

@@ -107,7 +107,7 @@ open class KotlinPackageJsonTask : DefaultTask() {
                 task.inputs.file(packageJsonTask.map { it.packageJson })
             }
 
-            nodeJs.rootPackageJsonTaskProvider.configure { it.mustRunAfter(packageJsonTask) }
+            nodeJs.rootPackageJsonTaskProvider?.configure { it.mustRunAfter(packageJsonTask) }
 
             compilation.compileKotlinTaskProvider.dependsOn(npmInstallTask)
             compilation.compileKotlinTaskProvider.dependsOn(packageJsonTask)

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt

@@ -31,7 +31,7 @@ open class RootPackageJsonTask : DefaultTask() {
 
     init {
         // TODO: temporary workaround for configuration cache enabled builds
-        disableTaskOnConfigurationCacheBuild { resolutionManager.toString() }
+//        disableTaskOnConfigurationCacheBuild { resolutionManager.toString() }
     }
 
     @get:OutputFile