[Gradle, JS] Fix for IDEA import with dukat binaries
^KT-42954 fixed
This commit is contained in:
+4
-2
@@ -89,7 +89,9 @@ internal class DukatCompilationResolverPlugin(
|
||||
|
||||
val target = compilation.target
|
||||
val externalsOutputFormat = compilation.externalsOutputFormat
|
||||
if (target is KotlinJsTarget && externalsOutputFormat == ExternalsOutputFormat.SOURCE) {
|
||||
val legacyTargetReuseIrTask =
|
||||
target is KotlinJsTarget && (target.irTarget != null && externalsOutputFormat == ExternalsOutputFormat.SOURCE)
|
||||
if (legacyTargetReuseIrTask) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -105,7 +107,7 @@ internal class DukatCompilationResolverPlugin(
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val VERSION = "2"
|
||||
const val VERSION = "3"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ class DukatExecutor(
|
||||
versionFile.delete()
|
||||
|
||||
npmProject.externalsDirRoot.mkdirs()
|
||||
val inputs = typeDefinitions.joinToString("\n") { it.inputKey }
|
||||
val inputs = "$externalsOutputFormat: " + typeDefinitions.joinToString("\n") { it.inputKey }
|
||||
|
||||
if (!compareInputs || !inputsFile.isFile || inputsFile.readText() != inputs) {
|
||||
// delete file to run visit on error even without package.json updates
|
||||
|
||||
Reference in New Issue
Block a user