From 80e07d628b1255cf1dd39b7818918cfd240fe5ca Mon Sep 17 00:00:00 2001
From: Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com>
Date: Wed, 11 Jan 2023 12:58:28 +0100
Subject: [PATCH] [Wasm] Use ModuleKind.ES

As the only JS-interop module kind Wasm supports
---
 .../cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt  | 4 ++++
 .../test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
index ac9eab6d671..7de3c5ba05b 100644
--- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
@@ -797,6 +797,10 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
             )
             moduleKind = ModuleKind.PLAIN
         }
+        if (arguments.wasm) {
+            // K/Wasm support ES modules only.
+            moduleKind = ModuleKind.ES
+        }
         configuration.put(JSConfigurationKeys.MODULE_KIND, moduleKind)
 
         configuration.putIfNotNull(JSConfigurationKeys.INCREMENTAL_DATA_PROVIDER, services[IncrementalDataProvider::class.java])
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
index 91f82144673..a3823d4e381 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.resolve.CompilerEnvironment
+import org.jetbrains.kotlin.serialization.js.ModuleKind
 import org.jetbrains.kotlin.test.*
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import java.io.Closeable
@@ -270,6 +271,7 @@ abstract class BasicWasmBoxTest(
         configuration.put(CommonConfigurationKeys.MODULE_NAME, TEST_MODULE)
         configuration.put(JSConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, true)
         configuration.put(JSConfigurationKeys.WASM_ENABLE_ASSERTS, true)
+        configuration.put(JSConfigurationKeys.MODULE_KIND, ModuleKind.ES)
         configuration.languageVersionSettings = languageVersionSettings
             ?: LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, specificFeatures = extraLanguageFeatures)
         return JsConfig(project, configuration, CompilerEnvironment, null, null)