From b824c091dabf8ff468aa52de8f6d8dbdebc905de Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 1 May 2023 19:12:54 +0200 Subject: [PATCH] [Gradle, JS] Add additional diagnostic for composite build test --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 28a45cb695e..1bd4b68995e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.targets.js.dsl.Distribution import org.jetbrains.kotlin.gradle.targets.js.ir.KLIB_TYPE import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectModules import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson import org.jetbrains.kotlin.gradle.targets.js.npm.fromSrcPackageJson import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockCopyTask.Companion.STORE_YARN_LOCK_NAME @@ -30,7 +29,6 @@ import org.jetbrains.kotlin.gradle.util.normalizePath import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.DisabledIf import java.nio.file.Files -import java.nio.file.Paths import java.util.zip.ZipFile import kotlin.io.path.* import kotlin.streams.toList @@ -99,6 +97,43 @@ class Kotlin2JsIrGradlePluginIT : AbstractKotlin2JsGradlePluginIT(true) { fun moduleVersion(rootModulePath: String, moduleName: String): String = projectPath.resolve(rootModulePath).toFile() .resolve(NpmProject.PACKAGE_JSON) + .also { + if (!it.exists()) { + it + .parentFile // lib2 + .parentFile // node_modules + .parentFile // js + .resolve(NpmProject.PACKAGE_JSON) + .let { + println("root package.json:") + println(it.readText()) + } + + it + .parentFile // lib2 + .parentFile // node_modules + .parentFile // js + .resolve("packages_imported") + .also { + println("ALL IMPORTED: ") + it.listFiles() + ?.forEach { + println(it.absolutePath) + } + } + .resolve("lib2") + .resolve("0.0.0-unspecified") + .resolve(NpmProject.PACKAGE_JSON) + .let { + println("lib2 package.json state:") + if (it.exists()) { + println(it.readText()) + } else { + println("lib2 package.json does not exists") + } + } + } + } .let { fromSrcPackageJson(it) } .let { it?.dependencies } ?.getValue(moduleName)