From 1cc5a9493cd6438b6d2fad449f5780b9dd56702e Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 9 Apr 2021 12:13:42 +0300
Subject: [PATCH] [Gradle, JS] RootPackageJson task with up-to-date status

---
 .../targets/js/npm/AbstractNodeModulesCache.kt      |  4 +++-
 .../targets/js/npm/CompositeNodeModulesCache.kt     |  3 +++
 .../gradle/targets/js/npm/GradleNodeModulesCache.kt |  3 +++
 .../js/npm/resolver/KotlinRootNpmResolver.kt        |  2 +-
 .../targets/js/npm/tasks/RootPackageJsonTask.kt     | 13 +++++++------
 .../kotlin/gradle/targets/js/yarn/YarnPlugin.kt     |  4 ++++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt
index 6561ec37e29..8858af66ffb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt
@@ -26,6 +26,8 @@ internal abstract class AbstractNodeModulesCache : AutoCloseable, BuildService<A
         const val STATE_FILE_NAME = ".visited"
     }
 
+    abstract val type: String
+
     lateinit var fileHasher: FileHasher
 
     private val cache by lazy {
@@ -33,7 +35,7 @@ internal abstract class AbstractNodeModulesCache : AutoCloseable, BuildService<A
             fileHasher,
             parameters.rootProjectDir.get().asFile,
             parameters.cacheDir.get().asFile,
-            STATE_FILE_NAME,
+            "$STATE_FILE_NAME-$type",
             "9"
         )
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/CompositeNodeModulesCache.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/CompositeNodeModulesCache.kt
index 93960bfc0d0..11cf03bfb0a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/CompositeNodeModulesCache.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/CompositeNodeModulesCache.kt
@@ -13,6 +13,9 @@ import java.io.File
  * Cache for storing already created [GradleNodeModule]s
  */
 internal abstract class CompositeNodeModulesCache : AbstractNodeModulesCache() {
+    override val type: String
+        get() = "composite"
+
     override fun buildImportedPackage(
         name: String,
         version: String,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt
index 949fd5fd237..69db10669a8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt
@@ -21,6 +21,9 @@ internal abstract class GradleNodeModulesCache : AbstractNodeModulesCache() {
     @Transient
     lateinit var fs: FileSystemOperationsCompat
 
+    override val type: String
+        get() = "gradle"
+
     // TODO: replace by injected service org.gradle.api.file.ArchiveOperations once min supported Gradle is 6.6
     @Transient
     lateinit var archiveOperations: ArchiveOperationsCompat
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
index 789d87638ce..a0fcfaa2476 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt
@@ -126,7 +126,7 @@ internal class KotlinRootNpmResolver internal constructor(
     val plugins
         get() = plugins_ ?: resolverStateHolder.get().parameters.plugins.get()
 
-    val projectResolvers
+    private val projectResolvers
         get() = projectResolvers_ ?: configurationCacheProjectResolvers
 
     val yarn by lazy {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt
index c7ca35c83f5..65e985b4e9b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt
@@ -6,8 +6,7 @@
 package org.jetbrains.kotlin.gradle.targets.js.npm.tasks
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
 import java.io.File
@@ -16,10 +15,6 @@ open class RootPackageJsonTask : DefaultTask() {
     init {
         check(project == project.rootProject)
 
-        outputs.upToDateWhen {
-            false
-        }
-
         onlyIf {
             resolutionManager.isConfiguringState()
         }
@@ -34,6 +29,12 @@ open class RootPackageJsonTask : DefaultTask() {
         nodeJs.rootPackageDir.resolve(NpmProject.PACKAGE_JSON)
     }
 
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    @get:InputFiles
+    val packageJsonFiles: Collection<File> by lazy {
+        resolutionManager.packageJsonFiles
+    }
+
     @TaskAction
     fun resolve() {
         resolutionManager.prepare(logger)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt
index 39439de90e5..4ec11659adf 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt
@@ -7,7 +7,11 @@ package org.jetbrains.kotlin.gradle.targets.js.yarn
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.attributes.Usage
 import org.gradle.api.plugins.BasePlugin
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
+import org.jetbrains.kotlin.gradle.plugin.mpp.disambiguateName
+import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf
 import org.jetbrains.kotlin.gradle.targets.js.MultiplePluginDeclarationDetector
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask