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 967d41436da..b0b61df802f 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 @@ -376,6 +376,7 @@ internal class KotlinCompilationNpmResolver( ) } + @Suppress("unused") class PackageJsonProducerInputs( @get:Input val internalDependencies: Collection, @@ -424,7 +425,7 @@ internal class KotlinCompilationNpmResolver( ) fun createPackageJson(skipWriting: Boolean): KotlinCompilationNpmResolution { - val resolvedInternalDependencies = internalDependencies.map { + internalDependencies.map { compilationResolver.rootResolver[it.projectPath][it.compilationName].getResolutionOrResolveIfForced() ?: error("Unresolved dependent npm package: ${compilationResolver} -> $it") } @@ -483,14 +484,6 @@ internal class KotlinCompilationNpmResolver( packageJson.dependencies[it.name] = it.version } - resolvedInternalDependencies.forEach { - packageJson.dependencies[it.packageJson.name] = it.packageJson.version - } - - importedExternalGradleDependencies.forEach { - packageJson.dependencies[it.name] = fileVersion(it.path) - } - compilationResolver.packageJsonHandlers.forEach { it(packageJson) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnImportedPackagesVersionResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnImportedPackagesVersionResolver.kt index 61e0229789f..f0340ca4682 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnImportedPackagesVersionResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnImportedPackagesVersionResolver.kt @@ -31,7 +31,7 @@ class YarnImportedPackagesVersionResolver( } fun resolveAndUpdatePackages(): MutableList { - resolve(externalModules, false) + resolve(externalModules, true) resolve(internalCompositeModules, true) npmProjects.forEach {