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

Make envJsCollector as map

Browse Source
This commit is contained in:
Ilya Goncharov
2019-09-05 19:28:16 +03:00
parent 3bfb980a39
commit 18f2ba889e
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+9 -12
View File
@@ -39,7 +39,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
private val requiredDependencies = mutableSetOf<NpmPackageVersion>() private val requiredDependencies = mutableSetOf<NpmPackageVersion>()
private val configurators = mutableListOf<(KotlinJsTest) -> Unit>() private val configurators = mutableListOf<(KotlinJsTest) -> Unit>()
private val envJsWriters = mutableListOf<(Appendable) -> Unit>() private val envJsCollector = mutableMapOf<String, String>()
private val confJsWriters = mutableListOf<(Appendable) -> Unit>() private val confJsWriters = mutableListOf<(Appendable) -> Unit>()
private var sourceMaps = false private var sourceMaps = false
private var configDirectory: File? = project.projectDir.resolve("karma.config.d").takeIf { it.isDirectory } private var configDirectory: File? = project.projectDir.resolve("karma.config.d").takeIf { it.isDirectory }
@@ -119,16 +119,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
private fun usePuppeteer(envVar: String) { private fun usePuppeteer(envVar: String) {
requiredDependencies.add(versions.puppeteer) requiredDependencies.add(versions.puppeteer)
envJsWriters.add { //language=JavaScript 1.8
it.appendln() envJsCollector[envVar] = "require('puppeteer').executablePath()"
//language=JavaScript 1.8
it.appendln(
"""
// puppeteer
process.env.$envVar = require('puppeteer').executablePath()
""".trimIndent()
)
}
} }
private fun useMocha() { private fun useMocha() {
@@ -259,7 +251,12 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
val karmaConfJs = npmProject.dir.resolve("karma.conf.js") val karmaConfJs = npmProject.dir.resolve("karma.conf.js")
karmaConfJs.printWriter().use { confWriter -> karmaConfJs.printWriter().use { confWriter ->
envJsWriters.forEach { it(confWriter) } confWriter.println("// environment variables")
envJsCollector.forEach { (envVar, value) ->
//language=JavaScript 1.8
confWriter.println("process.env.$envVar = $value")
}
confWriter.println() confWriter.println()
confWriter.println("module.exports = function(config) {") confWriter.println("module.exports = function(config) {")
confWriter.println() confWriter.println()