Gradle, js, npm: don't setup package manager without npm dependencies

#KT-31729 Fixed
This commit is contained in:
Sergey Rostov
2019-05-31 16:01:01 +03:00
parent 8caafa874e
commit 00f8f09274
3 changed files with 5 additions and 5 deletions
@@ -76,11 +76,8 @@ internal class NpmResolver private constructor(val rootProject: Project) : AutoC
val gradleNodeModules = GradleNodeModulesCache(rootProject)
val nodeJs = NodeJsPlugin.apply(rootProject).root
val packageManager by lazy {
val packageManager = nodeJs.packageManager
packageManager.setup(rootProject)
packageManager
}
val packageManager
get() = nodeJs.packageManager
private val allNpmPackages = mutableListOf<NpmProjectPackage>()
@@ -11,6 +11,8 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectPackage
object YarnSimple : YarnBasics() {
override fun resolveProject(resolvedNpmProject: NpmProjectPackage) {
setup(resolvedNpmProject.project.rootProject)
val project = resolvedNpmProject.project
YarnUpToDateCheck(resolvedNpmProject.npmProject).updateIfNeeded {
@@ -18,6 +18,7 @@ object YarnWorkspaces : YarnBasics() {
override fun resolveRootProject(rootProject: Project, subProjects: MutableList<NpmProjectPackage>) {
check(rootProject == rootProject.rootProject)
setup(rootProject)
resolveWorkspaces(rootProject, subProjects)
}