azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Add other devtools

Browse Source 
#KT-37635 fixed
This commit is contained in:
Ilya Goncharov
2020-03-20 15:13:44 +03:00
parent 5058c396c1
commit 40a0e31be4
5 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
+3 -3
View File
@@ -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
)
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+3 -3
View File
@@ -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
)
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
+1 -1
View File
@@ -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,
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt
+1 -6
View File
@@ -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<String>
) : Serializable
object Devtool {
val EVAL_SOURCE_MAP = "eval-source-map"
val SOURCE_MAP = "source-map"
}
fun save(configFile: File) {
configFile.writer().use {
appendTo(it)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/WebpackDevtool.kt
+34
View File
@@ -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"
}