From abb1a9892b03ab563a344fc7c4b747f348012435 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <sergey.rostov@jetbrains.com>
Date: Fri, 12 Jul 2019 21:39:21 +0300
Subject: [PATCH] Gradle, webpack: use only archivesBaseName as outputFileName

---
 .../targets/js/webpack/KotlinWebpack.kt       | 38 +++----------------
 1 file changed, 5 insertions(+), 33 deletions(-)

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 c4c1972c0da..adce5f71946 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
@@ -6,11 +6,9 @@
 package org.jetbrains.kotlin.gradle.targets.js.webpack
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.api.plugins.BasePluginConvention
-import org.gradle.api.reflect.TypeOf.typeOf
 import org.gradle.api.tasks.*
 import org.gradle.deployment.internal.Deployment
 import org.gradle.deployment.internal.DeploymentHandle
@@ -77,38 +75,12 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
         get() = field ?: project.buildDir.resolve(baseConventions!!.distsDirName)
 
     @get:Internal
-    var archiveBaseName: String? = null
-        get() = field ?: baseConventions?.archivesBaseName
-
-    @get:Internal
-    var archiveAppendix: String? = null
-
-    @get:Internal
-    var archiveVersion: String? = null
-        get() = field ?: project.version.toString()
-
-    @get:Internal
-    var archiveClassifier: String? = null
-
-    @get:Internal
-    var archiveExtension: String? = "js"
-
-    @get:Internal
-    var archiveFileName: String? = null
-        get() = field ?: defaultArchiveFileName
-
-    private val defaultArchiveFileName: String
-        get() {
-            // [baseName]-[appendix]-[version]-[classifier].[extension]
-            val baseFileName = listOf(archiveBaseName, archiveAppendix, archiveVersion, archiveClassifier)
-                .filter { it != null && it.isNotBlank() }
-                .joinToString("-")
-            return baseFileName + if (archiveExtension == null) "" else ".$archiveExtension"
-        }
+    var outputFileName: String? = null
+        get() = field ?: (baseConventions?.archivesBaseName + ".js")
 
     @get:OutputFile
-    open val archiveFile: File
-        get() = destinationDirectory!!.resolve(archiveFileName!!)
+    open val outputFile: File
+        get() = destinationDirectory!!.resolve(outputFileName!!)
 
     open val configDirectory: File?
         @Optional @InputDirectory get() = project.projectDir.resolve("webpack.config.d").takeIf { it.isDirectory }
@@ -141,7 +113,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
             entry = entry,
             reportEvaluatedConfigFile = if (saveEvaluatedConfigFile) evaluatedConfigFile else null,
             outputPath = destinationDirectory,
-            outputFileName = archiveFileName,
+            outputFileName = outputFileName,
             configDirectory = configDirectory,
             bundleAnalyzerReportDir = if (report) reportDir else null,
             devServer = devServer,