From bd8348605929589921169f63a2d1d0bada028e3a Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Wed, 20 Sep 2023 15:24:37 +1000 Subject: [PATCH] Fixes for https://github.com/JetBrains/kotlin/commit/8d90173ea5ee4bd2ea3bb7f9f3029b0c205033d3 --- .../com/tschuchort/compiletesting/KotlinJsCompilation.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt b/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt index b79dd312..172fb7df 100644 --- a/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt +++ b/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt @@ -3,6 +3,8 @@ package com.tschuchort.compiletesting import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.js.K2JSCompiler import java.io.* +import java.nio.file.Paths +import kotlin.io.path.nameWithoutExtension @Suppress("MemberVisibilityCanBePrivate") class KotlinJsCompilation : AbstractKotlinCompilation() { @@ -79,7 +81,8 @@ class KotlinJsCompilation : AbstractKotlinCompilation() { args.noStdlib = true args.moduleKind = "commonjs" - args.outputFile = File(outputDir, outputFileName).absolutePath + args.outputDir = outputDir.absolutePath // -ir-output-dir + args.moduleName = Paths.get(outputFileName).nameWithoutExtension // -ir-output-name args.sourceMapBaseDirs = jsClasspath().joinToString(separator = File.pathSeparator) args.libraries = listOfNotNull(kotlinStdLibJsJar).joinToString(separator = ":")