diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 28e7a8f00b4..3e93e8474f0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -182,11 +182,14 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : } it.doLast { _ -> - compilation.output.resourcesDir - .copyRecursively( - target = it.destinationDirectory!!, - overwrite = true - ) + val resourcesDir = compilation.output.resourcesDir + if (resourcesDir.exists()) { + resourcesDir + .copyRecursively( + target = it.destinationDirectory!!, + overwrite = true + ) + } } } 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 e649d3413aa..88020d2d568 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 @@ -101,6 +101,16 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { open val evaluatedConfigFile: File @OutputFile get() = reportDir.resolve("webpack.config.evaluated.js") + val resourcesDir: File? + @Optional + @InputDirectory + get() { + val resourcesDir = compilation.output.resourcesDir + return if (resourcesDir.exists()) { + resourcesDir + } else null + } + @Input var bin: String = "webpack/bin/webpack.js"