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

[Gradle, JS] Use new npm versions

Browse Source
This commit is contained in:
Ilya Goncharov
2020-09-11 22:49:40 +03:00
parent 9f9cb4f57e
commit 16b2379cd7
2 changed files with 10 additions and 17 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/NpmVersions.kt
+8 -15
View File
@@ -8,38 +8,31 @@ package org.jetbrains.kotlin.gradle.targets.js
/** /**
* Package versions used by tasks * Package versions used by tasks
*/ */
// DO NOT MODIFY DIRECTLY! Use org.jetbrains.kotlin.generators.gradle.targets.js.MainKt
class NpmVersions { class NpmVersions {
val dukat = NpmPackageVersion("dukat", "0.5.7") val dukat = NpmPackageVersion("dukat", "0.5.7")
val webpack = NpmPackageVersion("webpack", "4.44.1") val webpack = NpmPackageVersion("webpack", "4.44.1")
val webpackCli = NpmPackageVersion("webpack-cli", "3.3.12") val webpackCli = NpmPackageVersion("webpack-cli", "3.3.12")
val webpackBundleAnalyzer = NpmPackageVersion("webpack-bundle-analyzer", "3.8.0") val webpackBundleAnalyzer = NpmPackageVersion("webpack-bundle-analyzer", "3.8.0")
val webpackDevServer = NpmPackageVersion("webpack-dev-server", "3.11.0") val webpackDevServer = NpmPackageVersion("webpack-dev-server", "3.11.0")
val sourceMapLoader = NpmPackageVersion("source-map-loader", "1.1.0")
val sourceMapLoader = NpmPackageVersion("source-map-loader", "1.0.1")
val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.19") val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.19")
val cssLoader = NpmPackageVersion("css-loader", "4.3.0")
val cssLoader = NpmPackageVersion("css-loader", "4.2.1")
val styleLoader = NpmPackageVersion("style-loader", "1.2.1") val styleLoader = NpmPackageVersion("style-loader", "1.2.1")
val toStringLoader = NpmPackageVersion("to-string-loader", "1.1.6") val toStringLoader = NpmPackageVersion("to-string-loader", "1.1.6")
val miniCssExtractPlugin = NpmPackageVersion("mini-css-extract-plugin", "0.10.0") val miniCssExtractPlugin = NpmPackageVersion("mini-css-extract-plugin", "0.11.1")
val mocha = NpmPackageVersion("mocha", "8.1.3")
val mocha = NpmPackageVersion("mocha", "8.1.1") val karma = NpmPackageVersion("karma", "5.2.2")
val karma = NpmPackageVersion("karma", "5.1.1")
val karmaChromeLauncher = NpmPackageVersion("karma-chrome-launcher", "3.1.0") val karmaChromeLauncher = NpmPackageVersion("karma-chrome-launcher", "3.1.0")
val karmaPhantomJsLauncher = NpmPackageVersion("karma-phantomjs-launcher", "1.0.4") val karmaPhantomjsLauncher = NpmPackageVersion("karma-phantomjs-launcher", "1.0.4")
val karmaFirefoxLauncher = NpmPackageVersion("karma-firefox-launcher", "1.3.0") val karmaFirefoxLauncher = NpmPackageVersion("karma-firefox-launcher", "1.3.0")
val karmaOperaLauncher = NpmPackageVersion("karma-opera-launcher", "1.0.0") val karmaOperaLauncher = NpmPackageVersion("karma-opera-launcher", "1.0.0")
val karmaIeLauncher = NpmPackageVersion("karma-ie-launcher", "1.0.0") val karmaIeLauncher = NpmPackageVersion("karma-ie-launcher", "1.0.0")
val karmaSafariLauncher = NpmPackageVersion("karma-safari-launcher", "1.0.0") val karmaSafariLauncher = NpmPackageVersion("karma-safari-launcher", "1.0.0")
val karmaMocha = NpmPackageVersion("karma-mocha", "2.0.1") val karmaMocha = NpmPackageVersion("karma-mocha", "2.0.1")
val karmaWebpack = NpmPackageVersion("karma-webpack", "4.0.2") val karmaWebpack = NpmPackageVersion("karma-webpack", "4.0.2")
val karmaCoverage = NpmPackageVersion("karma-coverage", "2.0.3") val karmaCoverage = NpmPackageVersion("karma-coverage", "2.0.3")
val karmaSourcemapLoader = NpmPackageVersion("karma-sourcemap-loader", "0.3.8")
val karmaSourceMapLoader = NpmPackageVersion("karma-sourcemap-loader", "0.3.7")
val kotlinJsTestRunner = KotlinGradleNpmPackage("test-js-runner") val kotlinJsTestRunner = KotlinGradleNpmPackage("test-js-runner")
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+2 -2
View File
@@ -139,7 +139,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
useChromeLike(debuggableChrome) useChromeLike(debuggableChrome)
} }
fun usePhantomJS() = useBrowser("PhantomJS", versions.karmaPhantomJsLauncher) fun usePhantomJS() = useBrowser("PhantomJS", versions.karmaPhantomjsLauncher)
private fun useFirefoxLike(id: String) = useBrowser(id, versions.karmaFirefoxLauncher) private fun useFirefoxLike(id: String) = useBrowser(id, versions.karmaFirefoxLauncher)
@@ -255,7 +255,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
} }
fun useSourceMapSupport() { fun useSourceMapSupport() {
requiredDependencies.add(versions.karmaSourceMapLoader) requiredDependencies.add(versions.karmaSourcemapLoader)
sourceMaps = true sourceMaps = true
addPreprocessor("sourcemap") addPreprocessor("sourcemap")
} }