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 2fc44f3e31a..d032ec5e146 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 @@ -543,6 +543,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : build("build") { assertSuccessful() assertFileExists("build/js/node_modules/file-dependency") + assertFileExists("build/js/node_modules/file-dependency-2") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts index a8c68ca889a..8baea33e4f5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts @@ -17,6 +17,7 @@ kotlin.sourceSets { // It has transitive dependency on custom github version of escodegen implementation(npm("@yworks/optimizer", "1.0.6")) implementation(npm("file-dependency", projectDir.resolve("file-dependency"))) + implementation(npm(projectDir.resolve("file-dependency-2"))) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/file-dependency-2/package.json b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/file-dependency-2/package.json new file mode 100644 index 00000000000..afa57ab4698 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/file-dependency-2/package.json @@ -0,0 +1,6 @@ +{ + "name": "file-dependency-2", + "version": "1.0.0", + "main": "index.js", + "private": true +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt index 44fccd9ea0b..e78af5e0c91 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt @@ -133,7 +133,7 @@ internal fun fileVersion(directory: File): String = internal fun moduleName(directory: File): String { val packageJson = directory.resolve(PACKAGE_JSON) - check(!packageJson.isFile) { + check(packageJson.isFile) { "There is no NPM module in $directory. Declare valid $PACKAGE_JSON in it." }