[Gradle, JS] Add all possible values of library target as enums
This commit is contained in:
+1
-2
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
|
|||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies
|
import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
|
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode
|
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Companion.UMD
|
|
||||||
import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
|
import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
|
||||||
import org.jetbrains.kotlin.gradle.utils.injected
|
import org.jetbrains.kotlin.gradle.utils.injected
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@@ -79,7 +78,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
|
|||||||
@Nested
|
@Nested
|
||||||
val output: KotlinWebpackOutput = KotlinWebpackOutput(
|
val output: KotlinWebpackOutput = KotlinWebpackOutput(
|
||||||
library = baseConventions?.archivesBaseName,
|
library = baseConventions?.archivesBaseName,
|
||||||
libraryTarget = UMD
|
libraryTarget = KotlinWebpackLibraryTarget.UMD
|
||||||
)
|
)
|
||||||
|
|
||||||
@get:Internal
|
@get:Internal
|
||||||
|
|||||||
+38
-3
@@ -6,12 +6,47 @@
|
|||||||
package org.jetbrains.kotlin.gradle.targets.js.webpack
|
package org.jetbrains.kotlin.gradle.targets.js.webpack
|
||||||
|
|
||||||
import org.gradle.api.tasks.Input
|
import org.gradle.api.tasks.Input
|
||||||
|
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackLibraryTarget.Companion.fromString
|
||||||
|
|
||||||
data class KotlinWebpackOutput(
|
data class KotlinWebpackOutput(
|
||||||
@Input var library: String?,
|
@Input var library: String?,
|
||||||
@Input var libraryTarget: String?
|
@Input var libraryTarget: KotlinWebpackLibraryTarget?
|
||||||
) {
|
) {
|
||||||
companion object {
|
fun getLibraryTarget(): String {
|
||||||
const val UMD = "umd"
|
return this.libraryTarget.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setLibraryTarget(value: String) {
|
||||||
|
this.libraryTarget = fromString(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum class KotlinWebpackLibraryTarget {
|
||||||
|
VAR,
|
||||||
|
ASSIGN,
|
||||||
|
THIS,
|
||||||
|
WINDOW,
|
||||||
|
SELF,
|
||||||
|
GLOBAL,
|
||||||
|
COMMONJS,
|
||||||
|
COMMONJS2,
|
||||||
|
COMMONJS_MODULE,
|
||||||
|
AMD,
|
||||||
|
AMD_REQUIRE,
|
||||||
|
UMD,
|
||||||
|
UMD2,
|
||||||
|
JSONP,
|
||||||
|
SYSTEM;
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return super.toString()
|
||||||
|
.toLowerCase()
|
||||||
|
.replace("_", "-")
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
internal fun fromString(value: String): KotlinWebpackLibraryTarget {
|
||||||
|
return valueOf(value.toUpperCase().replace("-", "_"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user