From b14724260abe9a3fcebf21586f28a7d31923afbb Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 21 Jun 2022 07:39:44 +0000 Subject: [PATCH] [Gradle, JS] Upgrade npm dependencies ^KT-52856 fixed --- .../build.gradle.kts | 2 +- .../kotlin/gradle/targets/js/NpmVersions.kt | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts index c3384cabd69..b0f468181b6 100644 --- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/build.gradle.kts @@ -17,6 +17,6 @@ val generateNpmVersions by generator( listOf(generateNpmVersions).forEach { it.systemProperty( "org.jetbrains.kotlin.generators.gradle.targets.js.outputSourceRoot", - project(":kotlin-gradle-plugin").projectDir.resolve("src/main/kotlin").absolutePath + project(":kotlin-gradle-plugin").projectDir.resolve("src/common/kotlin").absolutePath ) } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index d0bbd9ae781..2302f97c032 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -17,19 +17,19 @@ class NpmVersions : Serializable { val webpackCli3 = NpmPackageVersion("webpack-cli", "3.3.12") val webpackDevServer3 = NpmPackageVersion("webpack-dev-server", "3.11.2") val sourceMapLoader1 = NpmPackageVersion("source-map-loader", "1.1.0") - val webpack = NpmPackageVersion("webpack", "5.69.1") - val webpackCli = NpmPackageVersion("webpack-cli", "4.9.2") + val webpack = NpmPackageVersion("webpack", "5.73.0") + val webpackCli = NpmPackageVersion("webpack-cli", "4.10.0") val webpackBundleAnalyzer = NpmPackageVersion("webpack-bundle-analyzer", "4.5.0") - val webpackDevServer = NpmPackageVersion("webpack-dev-server", "4.7.4") - val sourceMapLoader = NpmPackageVersion("source-map-loader", "3.0.1") + val webpackDevServer = NpmPackageVersion("webpack-dev-server", "4.9.2") + val sourceMapLoader = NpmPackageVersion("source-map-loader", "4.0.0") val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.21") - val cssLoader = NpmPackageVersion("css-loader", "6.6.0") + val cssLoader = NpmPackageVersion("css-loader", "6.7.1") val styleLoader = NpmPackageVersion("style-loader", "3.3.1") val toStringLoader = NpmPackageVersion("to-string-loader", "1.2.0") - val miniCssExtractPlugin = NpmPackageVersion("mini-css-extract-plugin", "2.5.3") - val mocha = NpmPackageVersion("mocha", "9.2.1") - val karma = NpmPackageVersion("karma", "6.3.16") - val karmaChromeLauncher = NpmPackageVersion("karma-chrome-launcher", "3.1.0") + val miniCssExtractPlugin = NpmPackageVersion("mini-css-extract-plugin", "2.6.1") + val mocha = NpmPackageVersion("mocha", "10.0.0") + val karma = NpmPackageVersion("karma", "6.4.0") + val karmaChromeLauncher = NpmPackageVersion("karma-chrome-launcher", "3.1.1") val karmaPhantomjsLauncher = NpmPackageVersion("karma-phantomjs-launcher", "1.0.4") val karmaFirefoxLauncher = NpmPackageVersion("karma-firefox-launcher", "2.1.2") val karmaOperaLauncher = NpmPackageVersion("karma-opera-launcher", "1.0.0")