From eaf25b517d7581a5dc3f7411eee35e3b076e8d10 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 13 Apr 2021 18:26:05 +0300 Subject: [PATCH] [JS IR] Use module name instead of output file wo extension --- .../src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 77bc986ab39..c4a05082d72 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 @@ -161,9 +161,10 @@ class K2JsIrCompiler : CLICompiler() { val outputFile = File(outputFilePath) + val moduleName = arguments.irModuleName ?: FileUtil.getNameWithoutExtension(outputFile) configurationJs.put( CommonConfigurationKeys.MODULE_NAME, - arguments.irModuleName ?: FileUtil.getNameWithoutExtension(outputFile) + moduleName ) // TODO: in this method at least 3 different compiler configurations are used (original, env.configuration, jsConfig.configuration) @@ -206,7 +207,9 @@ class K2JsIrCompiler : CLICompiler() { irFactory = PersistentIrFactory(), // TODO IrFactoryImpl? outputKlibPath = outputFile.path, nopack = arguments.irProduceKlibDir, - jsOutputName = FileUtil.getNameWithoutExtension(outputFile), + jsOutputName = moduleName + .replace(":", "-") + .replace(".", "-"), ) }