azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wasm] Use ModuleKind.ES

Browse Source 
As the only JS-interop module kind Wasm supports
This commit is contained in:
Svyatoslav Kuzmich
2023-01-11 12:58:28 +01:00
committed by Space Team
parent ca31307941
commit 80e07d628b
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+4
View File
@@ -797,6 +797,10 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
) )
moduleKind = ModuleKind.PLAIN moduleKind = ModuleKind.PLAIN
} }
if (arguments.wasm) {
// K/Wasm support ES modules only.
moduleKind = ModuleKind.ES
}
configuration.put(JSConfigurationKeys.MODULE_KIND, moduleKind) configuration.put(JSConfigurationKeys.MODULE_KIND, moduleKind)
configuration.putIfNotNull(JSConfigurationKeys.INCREMENTAL_DATA_PROVIDER, services[IncrementalDataProvider::class.java]) configuration.putIfNotNull(JSConfigurationKeys.INCREMENTAL_DATA_PROVIDER, services[IncrementalDataProvider::class.java])
js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
+2
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtNamedFunction
import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.resolve.CompilerEnvironment import org.jetbrains.kotlin.resolve.CompilerEnvironment
import org.jetbrains.kotlin.serialization.js.ModuleKind
import org.jetbrains.kotlin.test.* import org.jetbrains.kotlin.test.*
import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.KtTestUtil
import java.io.Closeable import java.io.Closeable
@@ -270,6 +271,7 @@ abstract class BasicWasmBoxTest(
configuration.put(CommonConfigurationKeys.MODULE_NAME, TEST_MODULE) configuration.put(CommonConfigurationKeys.MODULE_NAME, TEST_MODULE)
configuration.put(JSConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, true) configuration.put(JSConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, true)
configuration.put(JSConfigurationKeys.WASM_ENABLE_ASSERTS, true) configuration.put(JSConfigurationKeys.WASM_ENABLE_ASSERTS, true)
configuration.put(JSConfigurationKeys.MODULE_KIND, ModuleKind.ES)
configuration.languageVersionSettings = languageVersionSettings configuration.languageVersionSettings = languageVersionSettings
?: LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, specificFeatures = extraLanguageFeatures) ?: LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, specificFeatures = extraLanguageFeatures)
return JsConfig(project, configuration, CompilerEnvironment, null, null) return JsConfig(project, configuration, CompilerEnvironment, null, null)