diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt index c33cafa9e02..6304ee95bb7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.gradle.targets.js.subtargets.BrowserDistribution import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig -import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Devtool import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode +import org.jetbrains.kotlin.gradle.targets.js.webpack.WebpackDevtool import org.jetbrains.kotlin.gradle.tasks.registerTask import javax.inject.Inject @@ -190,8 +190,8 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : devtool = getByKind( kind = kind, - releaseValue = Devtool.SOURCE_MAP, - debugValue = Devtool.EVAL_SOURCE_MAP + releaseValue = WebpackDevtool.SOURCE_MAP, + debugValue = WebpackDevtool.EVAL_SOURCE_MAP ) } 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 a10b0cfa6a9..0c93311dd99 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 @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig -import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Devtool import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode +import org.jetbrains.kotlin.gradle.targets.js.webpack.WebpackDevtool import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import java.io.File @@ -269,8 +269,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : devtool = getByKind( kind = kind, - releaseValue = Devtool.SOURCE_MAP, - debugValue = Devtool.EVAL_SOURCE_MAP + releaseValue = WebpackDevtool.SOURCE_MAP, + debugValue = WebpackDevtool.EVAL_SOURCE_MAP ) } 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 80b5483ae7f..eeae9b19d56 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 @@ -130,7 +130,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { var devServer: KotlinWebpackConfig.DevServer? = null @Input - var devtool: String = KotlinWebpackConfig.Devtool.EVAL_SOURCE_MAP + var devtool: String = WebpackDevtool.EVAL_SOURCE_MAP private fun createRunner() = KotlinWebpackRunner( compilation.npmProject, 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 7c990157673..6da41ea2f7e 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 @@ -27,7 +27,7 @@ data class KotlinWebpackConfig( val bundleAnalyzerReportDir: File? = null, val reportEvaluatedConfigFile: File? = null, val devServer: DevServer? = null, - val devtool: String? = Devtool.EVAL_SOURCE_MAP, + val devtool: String? = WebpackDevtool.EVAL_SOURCE_MAP, val showProgress: Boolean = false, val sourceMaps: Boolean = false, val export: Boolean = true, @@ -79,11 +79,6 @@ data class KotlinWebpackConfig( val contentBase: List ) : Serializable - object Devtool { - val EVAL_SOURCE_MAP = "eval-source-map" - val SOURCE_MAP = "source-map" - } - fun save(configFile: File) { configFile.writer().use { appendTo(it) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/WebpackDevtool.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/WebpackDevtool.kt new file mode 100644 index 00000000000..6e6864f6a43 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/WebpackDevtool.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.targets.js.webpack + +object WebpackDevtool { + const val EVAL = "eval" + const val EVAL_CHEAP_SOURCE_MAP = "eval-cheap-source-map" + const val EVAL_CHEAP_MODULE_SOURCE_MAP = "eval-cheap-module-source-map" + const val EVAL_SOURCE_MAP = "eval-source-map" + const val EVAL_NOSOURCES_SOURCE_MAP = "eval-nosources-source-map" + const val EVAL_NOSOURCES_CHEAP_SOURCE_MAP = "eval-nosources-cheap-source-map" + const val EVAL_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = "eval-nosources-cheap-module-source-map" + const val CHEAP_SOURCE_MAP = "cheap-source-map" + const val CHEAP_MODULE_SOURCE_MAP = "cheap-module-source-map" + const val INLINE_CHEAP_SOURCE_MAP = "inline-cheap-source-map" + const val INLINE_CHEAP_MODULE_SOURCE_MAP = "inline-cheap-module-source-map" + const val INLINE_SOURCE_MAP = "inline-source-map" + const val INLINE_NOSOURCES_SOURCE_MAP = "inline-nosources-source-map" + const val INLINE_NOSOURCES_CHEAP_SOURCE_MAP = "inline-nosources-cheap-source-map" + const val INLINE_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = "inline-nosources-cheap-module-source-map" + const val SOURCE_MAP = "source-map" + const val HIDDEN_SOURCE_MAP = "hidden-source-map" + const val HIDDEN_NOSOURCES_SOURCE_MAP = "hidden-nosources-source-map" + const val HIDDEN_NOSOURCES_CHEAP_SOURCE_MAP = "hidden-nosources-cheap-source-map" + const val HIDDEN_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = "hidden-nosources-cheap-module-source-map" + const val HIDDEN_CHEAP_SOURCE_MAP = "hidden-cheap-source-map" + const val HIDDEN_CHEAP_MODULE_SOURCE_MAP = "hidden-cheap-module-source-map" + const val NOSOURCES_SOURCE_MAP = "nosources-source-map" + const val NOSOURCES_CHEAP_SOURCE_MAP = "nosources-cheap-source-map" + const val NOSOURCES_CHEAP_MODULE_SOURCE_MAP = "nosources-cheap-module-source-map" +} \ No newline at end of file