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 b54e1738a4b..cf57b08860e 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 @@ -51,9 +51,6 @@ open class NpmProject(@Transient val compilation: KotlinJsCompilation) : Seriali val packageJsonFile: File get() = dir.resolve(PACKAGE_JSON) - val prePackageJsonFile: File - get() = dir.resolve(PRE_PACKAGE_JSON) - val packageJsonTaskName: String get() = compilation.disambiguateName("packageJson") @@ -160,7 +157,6 @@ open class NpmProject(@Transient val compilation: KotlinJsCompilation) : Seriali companion object { const val PACKAGE_JSON = "package.json" - const val PRE_PACKAGE_JSON = "pre-package.json" const val NODE_MODULES = "node_modules" const val DIST_FOLDER = "kotlin" 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 b0b61df802f..e4425b2d0ff 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 @@ -489,7 +489,7 @@ internal class KotlinCompilationNpmResolver( } if (!skipWriting) { - packageJson.saveTo(compilationResolver.npmProject.prePackageJsonFile) + packageJson.saveTo(compilationResolver.npmProject.packageJsonFile) } return KotlinCompilationNpmResolution( diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt index 6861c2bc540..06f42616f32 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt @@ -80,7 +80,7 @@ open class KotlinPackageJsonTask : DefaultTask() { @get:OutputFile val packageJson: File by lazy { - compilationResolver.npmProject.prePackageJsonFile + compilationResolver.npmProject.packageJsonFile } @TaskAction