diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt index a5ef81c16cd..757784b23fe 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt @@ -125,17 +125,18 @@ fun fromSrcPackageJson(packageJson: File?): PackageJson? = } fun packageJson( - npmProject: NpmProject, + name: String, + version: String, + main: String, npmDependencies: Collection ): PackageJson { - val compilation = npmProject.compilation val packageJson = PackageJson( - npmProject.name, - fixSemver(compilation.target.project.version.toString()) + name, + fixSemver(version) ) - packageJson.main = npmProject.main + packageJson.main = main val dependencies = mutableMapOf() @@ -154,9 +155,9 @@ fun packageJson( } } - compilation.packageJsonHandlers.forEach { - it(packageJson) - } +// compilation.packageJsonHandlers.forEach { +// it(packageJson) +// } return packageJson } 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 83a3e636651..5ad8535bfe1 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 @@ -70,24 +70,24 @@ constructor( fun resolve() { val compilation = npmProject.compilation - packageJson(npmProject, realExternalDependencies).let { packageJson -> - packageJson.main = "${npmProject.name}.js" - - if (compilation is KotlinJsIrCompilation) { - packageJson.types = "${npmProject.name}.d.ts" - } - - packageJson.apply { - listOf( - dependencies, - devDependencies, - peerDependencies, - optionalDependencies - ).forEach { it.processDependencies() } - } - - packageJson.saveTo(this@PublicPackageJsonTask.packageJsonFile) - } +// packageJson(npmProject, realExternalDependencies).let { packageJson -> +// packageJson.main = "${npmProject.name}.js" +// +// if (compilation is KotlinJsIrCompilation) { +// packageJson.types = "${npmProject.name}.d.ts" +// } +// +// packageJson.apply { +// listOf( +// dependencies, +// devDependencies, +// peerDependencies, +// optionalDependencies +// ).forEach { it.processDependencies() } +// } +// +// packageJson.saveTo(this@PublicPackageJsonTask.packageJsonFile) +// } } private fun MutableMap.processDependencies() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolved/KotlinCompilationNpmResolution.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolved/KotlinCompilationNpmResolution.kt index ecc968cd7c4..430f5883ac1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolved/KotlinCompilationNpmResolution.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolved/KotlinCompilationNpmResolution.kt @@ -16,12 +16,17 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson */ class KotlinCompilationNpmResolution( @Transient - val project: Project, + private val _project: Project?, @Transient - val npmProject: NpmProject, + private val _npmProject: NpmProject?, val internalDependencies: Collection, val internalCompositeDependencies: Collection, val externalGradleDependencies: Collection, val externalNpmDependencies: Collection, val packageJson: PackageJson -) \ No newline at end of file +) { + val project + get() = _project!! + val npmProject + get() = _npmProject!! +} \ No newline at end of file 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 b3c3c495a51..1121e87b082 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 @@ -62,6 +62,22 @@ internal class KotlinCompilationNpmResolver( @Transient val npmProject = compilation.npmProject + val npmName by lazy { + npmProject.name + } + + val npmVersion by lazy { + project.version.toString() + } + + val npmMain by lazy { + npmProject.main + } + + val prePackageJsonFile by lazy { + npmProject.prePackageJsonFile + } + val nodeJs get() = resolver.nodeJs val target get() = compilation.target @@ -405,7 +421,9 @@ internal class KotlinCompilationNpmResolver( val allNpmDependencies = externalNpmDependencies/* + toolsNpmDependencies*/ val packageJson = packageJson( - npmProject, + npmName, + npmVersion, + npmMain, allNpmDependencies ) @@ -421,17 +439,17 @@ internal class KotlinCompilationNpmResolver( packageJson.dependencies[it.name] = fileVersion(it.path) } - compilation.packageJsonHandlers.forEach { - it(packageJson) - } +// compilation.packageJsonHandlers.forEach { +// it(packageJson) +// } if (!skipWriting) { - packageJson.saveTo(npmProject.prePackageJsonFile) + packageJson.saveTo(prePackageJsonFile) } return KotlinCompilationNpmResolution( - project, - npmProject, + if (compilation != null) project else null, + if (compilation != null) npmProject else null, resolvedInternalDependencies, compositeDependencies, importedExternalGradleDependencies,