diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt index 56251e78635..f48f5ffbc4f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt @@ -64,12 +64,6 @@ open class NpmProject(val compilation: KotlinJsCompilation) { val externalsDir: File get() = externalsDirRoot.resolve("src") - val publicPackageJson: File - get() = project.buildDir - .resolve("tmp") - .resolve(publicPackageJsonTaskName) - .resolve(PACKAGE_JSON) - val publicPackageJsonTaskName: String get() = compilation.disambiguateName(PublicPackageJsonTask.NAME) 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 188d2d2c2de..dd62986ba6e 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 @@ -11,6 +11,8 @@ 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.targets.js.npm.NpmProject.Companion.PACKAGE_JSON +import org.jetbrains.kotlin.gradle.utils.property import java.io.File import javax.inject.Inject @@ -42,8 +44,12 @@ constructor( var skipOnEmptyNpmDependencies: Boolean = false @get:OutputFile - val packageJson: File - get() = npmProject.publicPackageJson + var packageJson: File by property { + project.buildDir + .resolve("tmp") + .resolve(npmProject.publicPackageJsonTaskName) + .resolve(PACKAGE_JSON) + } @TaskAction fun resolve() { @@ -62,7 +68,7 @@ constructor( packageJson.devDependencies.clear() - packageJson.saveTo(npmProject.publicPackageJson) + packageJson.saveTo(this@PublicPackageJsonTask.packageJson) } }