diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt index 01d1cd8ea7b..e56aaf98123 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt @@ -41,19 +41,19 @@ open class NodeJsRootPlugin : Plugin { val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME) + val setupFileHasherTask = registerTask(KotlinNpmCachesSetup.NAME) { + it.description = "Setup file hasher for caches" + } + registerTask(KotlinNpmInstallTask.NAME) { it.dependsOn(setupTask) + it.dependsOn(setupFileHasherTask) it.group = TASKS_GROUP_NAME it.description = "Find, download and link NPM dependencies and projects" it.mustRunAfter(rootClean) } - registerTask(KotlinNpmCachesSetup.NAME) { - it.group = TASKS_GROUP_NAME - it.description = "Setup file hasher for caches" - } - registerTask(PACKAGE_JSON_UMBRELLA_TASK_NAME) YarnPlugin.apply(project) 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 6c237e575ce..856a8f5be34 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 @@ -41,6 +41,7 @@ open class YarnPlugin : Plugin { val rootClean = project.rootProject.tasks.named(BasePlugin.CLEAN_TASK_NAME) val rootPackageJson = tasks.register(RootPackageJsonTask.NAME, RootPackageJsonTask::class.java) { task -> + task.dependsOn(nodeJs.npmCachesSetupTaskProvider) task.group = NodeJsRootPlugin.TASKS_GROUP_NAME task.description = "Create root package.json"