Gradle, js, npm: don't setup package manager without npm dependencies
#KT-31729 Fixed
This commit is contained in:
+2
-5
@@ -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>()
|
||||
|
||||
|
||||
+2
@@ -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 {
|
||||
|
||||
+1
@@ -18,6 +18,7 @@ object YarnWorkspaces : YarnBasics() {
|
||||
|
||||
override fun resolveRootProject(rootProject: Project, subProjects: MutableList<NpmProjectPackage>) {
|
||||
check(rootProject == rootProject.rootProject)
|
||||
setup(rootProject)
|
||||
resolveWorkspaces(rootProject, subProjects)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user