diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt index da8404d47fb..757f4fb1152 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt @@ -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() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSimple.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSimple.kt index 522104e1140..2d218db72a3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSimple.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSimple.kt @@ -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 { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt index 7ae41c02db3..b010682c89c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt @@ -18,6 +18,7 @@ object YarnWorkspaces : YarnBasics() { override fun resolveRootProject(rootProject: Project, subProjects: MutableList) { check(rootProject == rootProject.rootProject) + setup(rootProject) resolveWorkspaces(rootProject, subProjects) }