From 4cd4dfee25658eb3cbebfc7a6934bd11f8d56141 Mon Sep 17 00:00:00 2001 From: Victor Turansky Date: Tue, 24 Mar 2020 03:48:27 +0300 Subject: [PATCH] KT-37587 Karma. Support dynamically created webpack configs --- .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt | 4 ++-- .../kotlin/gradle/targets/js/webpack/KotlinWebpack.kt | 4 ++-- .../kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index 5a96aae49e4..07e640aadd6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -154,7 +154,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : requiredDependencies.add(versions.webpack) val webpackConfigWriter = KotlinWebpackConfig( - configDirectory = project.projectDir.resolve("webpack.config.d").takeIf { it.isDirectory }, + configDirectory = project.projectDir.resolve("webpack.config.d"), sourceMaps = true, devtool = null, export = false, @@ -455,4 +455,4 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : const val CHROME_BIN = "CHROME_BIN" const val CHROME_CANARY_BIN = "CHROME_CANARY_BIN" } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt index eeae9b19d56..f6264bd108d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt @@ -108,7 +108,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { get() = destinationDirectory.resolve(outputFileName) open val configDirectory: File? - @Optional @InputDirectory get() = project.projectDir.resolve("webpack.config.d").takeIf { it.isDirectory } + @Optional @InputDirectory get() = project.projectDir.resolve("webpack.config.d") @Input var report: Boolean = false @@ -197,4 +197,4 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt index 6da41ea2f7e..128a8ca81f7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt @@ -141,7 +141,7 @@ data class KotlinWebpackConfig( } private fun Appendable.appendFromConfigDir() { - if (configDirectory == null) return + if (configDirectory == null || !configDirectory.isDirectory) return appendln() appendConfigsFromDir(configDirectory) @@ -275,4 +275,4 @@ data class KotlinWebpackConfig( private fun json(obj: Any) = StringWriter().also { GsonBuilder().setPrettyPrinting().create().toJson(obj, it) }.toString() -} \ No newline at end of file +}