diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt index dd62986ba6e..d4ff7063e05 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt @@ -10,7 +10,7 @@ import org.gradle.api.tasks.Input import org.gradle.api.tasks.Nested import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject.Companion.PACKAGE_JSON import org.jetbrains.kotlin.gradle.utils.property import java.io.File @@ -19,10 +19,13 @@ import javax.inject.Inject open class PublicPackageJsonTask @Inject constructor( - private val nodeJs: NodeJsRootExtension, - private val npmProject: NpmProject + compilation: KotlinJsCompilation ) : DefaultTask() { + private val npmProject = compilation.npmProject + + private val nodeJs = npmProject.nodeJs + private val compilationResolution get() = nodeJs.npmResolutionManager.requireInstalled()[project][npmProject.compilation] diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt index bdc57e6c7e7..f934a4f3e80 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt @@ -54,7 +54,7 @@ internal class KotlinCompilationNpmResolver( val publicPackageJsonTaskHolder: TaskProvider = project.registerTask( npmProject.publicPackageJsonTaskName, - listOf(nodeJs, npmProject) + listOf(compilation) ) { it.skipOnEmptyNpmDependencies = true it.dependsOn(nodeJs.npmInstallTaskProvider)