From 194175d2d03c2141fd4150acbaa616cf70e1ddfa Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 15 Jan 2021 13:33:04 +0300
Subject: [PATCH] [Gradle, JS] Use multiple arguments for ignoring

---
 .../gradle/targets/js/ir/KotlinJsIrLink.kt    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
index e07a38a3eec..2051134b1e3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
@@ -181,7 +181,11 @@ internal class CacheBuilder(
             val compilerArgs = compilerArgsFactory()
             kotlinOptions.copyFreeCompilerArgsToArgs(compilerArgs)
             compilerArgs.freeArgs = compilerArgs.freeArgs
-                .filterNot { it.startsWith(ENTRY_IR_MODULE) }
+                .filterNot { arg ->
+                    IGNORED_ARGS.any {
+                        arg.startsWith(it)
+                    }
+                }
 
             compilerArgs.includes = library.file.normalize().absolutePath
             compilerArgs.outputFile = cacheDirectory.resolve("${library.name}.js").normalize().absolutePath
@@ -189,6 +193,9 @@ internal class CacheBuilder(
                 compilerArgs.freeArgs += "-Xcache-directory=${it.absolutePath}"
             }
 
+            // Change it for produce caches
+            compilerArgs.irProduceJs = true
+
             compilerArgs.libraries = getAllDependencies(dependency)
                 .flatMap { it.moduleArtifacts }
                 .map { it.file }
@@ -215,4 +222,14 @@ internal class CacheBuilder(
                 )
         }
     }
+
+    companion object {
+        private val IGNORED_ARGS = listOf(
+            ENTRY_IR_MODULE,
+            PRODUCE_JS,
+            PRODUCE_UNZIPPED_KLIB,
+            ENABLE_DCE,
+            GENERATE_D_TS
+        )
+    }
 }
\ No newline at end of file