[Gradle, JS] Use package.json candidate

^KT-39515 fixed
This commit is contained in:
Ilya Goncharov
2020-07-09 18:14:59 +03:00
parent 8586d5e206
commit b4a774e821
4 changed files with 7 additions and 3 deletions
@@ -46,6 +46,9 @@ open class NpmProject(val compilation: KotlinJsCompilation) {
val packageJsonFile: File val packageJsonFile: File
get() = dir.resolve(PACKAGE_JSON) get() = dir.resolve(PACKAGE_JSON)
val packageCandidateJsonFile: File
get() = dir.resolve(PACKAGE_CANDIDATE_JSON)
val packageJsonTaskName: String val packageJsonTaskName: String
get() = compilation.disambiguateName("packageJson") get() = compilation.disambiguateName("packageJson")
@@ -140,6 +143,7 @@ open class NpmProject(val compilation: KotlinJsCompilation) {
companion object { companion object {
const val PACKAGE_JSON = "package.json" const val PACKAGE_JSON = "package.json"
const val PACKAGE_CANDIDATE_JSON = "package-candidate.json"
const val NODE_MODULES = "node_modules" const val NODE_MODULES = "node_modules"
const val DIST_FOLDER = "kotlin" const val DIST_FOLDER = "kotlin"
} }
@@ -24,7 +24,7 @@ class PackageJsonUpToDateCheck(val npmProject: NpmProject) {
if (packageJsonHashFile.exists()) packageJsonHashFile.readText() else null if (packageJsonHashFile.exists()) packageJsonHashFile.readText() else null
} }
private val packageJsonFile = npmProject.packageJsonFile private val packageJsonFile = npmProject.packageCandidateJsonFile
private val hash by lazy { private val hash by lazy {
val hasher = (project as ProjectInternal).services.get(FileHasher::class.java) val hasher = (project as ProjectInternal).services.get(FileHasher::class.java)
@@ -352,7 +352,7 @@ internal class KotlinCompilationNpmResolver(
} }
if (!skipWriting) { if (!skipWriting) {
packageJson.saveTo(npmProject.packageJsonFile) packageJson.saveTo(npmProject.packageCandidateJsonFile)
} }
return KotlinCompilationNpmResolution( return KotlinCompilationNpmResolution(
@@ -47,7 +47,7 @@ open class KotlinPackageJsonTask : DefaultTask() {
@get:OutputFile @get:OutputFile
val packageJson: File val packageJson: File
get() = compilationResolver.npmProject.packageJsonFile get() = compilationResolver.npmProject.packageCandidateJsonFile
@TaskAction @TaskAction
fun resolve() { fun resolve() {