Gradle, JS: make KotlinWebpack.configDirectory optional

#KT-31013
This commit is contained in:
Sergey Rostov
2019-05-13 14:42:51 +03:00
parent c0deea33bb
commit baf9ecd641
3 changed files with 12 additions and 6 deletions
@@ -48,7 +48,10 @@ internal class NpmResolver private constructor(val rootProject: Project) {
else { else {
val resolver = NpmResolver(rootProject) val resolver = NpmResolver(rootProject)
check(resolver.resolve(rootProject, null)) check(resolver.resolve(rootProject, null))
ResolvedNow(ResolvedProject(resolver.npmPackages, resolver.requiredByTasks)) val resolution = ResolvedProject(resolver.npmPackages, resolver.requiredByTasks)
ProjectData[rootProject]!!.resolved = resolution
ResolvedNow(resolution)
} }
} }
@@ -47,8 +47,8 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
open val outputPath: File open val outputPath: File
@OutputDirectory get() = project.buildDir.resolve("lib") @OutputDirectory get() = project.buildDir.resolve("lib")
open val configDirectory: File open val configDirectory: File?
@InputDirectory get() = project.projectDir.resolve("webpack.config.d") @Optional @InputDirectory get() = project.projectDir.resolve("webpack.config.d").takeIf { it.isDirectory }
@Input @Input
var report: Boolean = false var report: Boolean = false
@@ -18,7 +18,7 @@ class KotlinWebpackConfig(
val entry: File, val entry: File,
val reportEvaluatedConfigFile: File?, val reportEvaluatedConfigFile: File?,
val outputPath: File, val outputPath: File,
val configDirectory: File, val configDirectory: File?,
val reportDir: File?, val reportDir: File?,
var devServer: DevServer? = null, var devServer: DevServer? = null,
val showProgress: Boolean = false, val showProgress: Boolean = false,
@@ -116,8 +116,11 @@ config.plugins.push(new BundleAnalyzerPlugin(${json(config)}));
) )
} }
appendln() if (configDirectory != null) {
loadConfigs(configDirectory) appendln()
loadConfigs(configDirectory)
}
appendln() appendln()
if (reportEvaluatedConfigFile != null) { if (reportEvaluatedConfigFile != null) {