[Gradle, JS] Use package.json files instead of pre-package.json
This commit is contained in:
committed by
TeamCityServer
parent
f8bd440356
commit
4d2376ac4c
-4
@@ -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"
|
||||
|
||||
|
||||
+1
-1
@@ -489,7 +489,7 @@ internal class KotlinCompilationNpmResolver(
|
||||
}
|
||||
|
||||
if (!skipWriting) {
|
||||
packageJson.saveTo(compilationResolver.npmProject.prePackageJsonFile)
|
||||
packageJson.saveTo(compilationResolver.npmProject.packageJsonFile)
|
||||
}
|
||||
|
||||
return KotlinCompilationNpmResolution(
|
||||
|
||||
+1
-1
@@ -80,7 +80,7 @@ open class KotlinPackageJsonTask : DefaultTask() {
|
||||
|
||||
@get:OutputFile
|
||||
val packageJson: File by lazy {
|
||||
compilationResolver.npmProject.prePackageJsonFile
|
||||
compilationResolver.npmProject.packageJsonFile
|
||||
}
|
||||
|
||||
@TaskAction
|
||||
|
||||
Reference in New Issue
Block a user