diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/PackageDto.kt b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/PackageDto.kt index 054856ada6e..86675298f9f 100644 --- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/PackageDto.kt +++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/PackageDto.kt @@ -7,12 +7,13 @@ package org.jetbrains.kotlin.generators.gradle.targets.js data class Package( val name: String, - val version: String + val version: String, + val displayName: String ) { // Used in velocity template @Suppress("unused") fun camelize(): String = - name + displayName .split("-") .mapIndexed { index, item -> if (index == 0) item else item.capitalize() } .joinToString("") @@ -21,16 +22,19 @@ data class Package( sealed class PackageInformation { abstract val name: String abstract val versions: Set + abstract val displayName: String } data class RealPackageInformation( override val name: String, - override val versions: Set + override val versions: Set, + override val displayName: String = name ) : PackageInformation() data class HardcodedPackageInformation( override val name: String, - val version: String + val version: String, + override val displayName: String = name ) : PackageInformation() { override val versions: Set = setOf(version) } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/VersionFetcher.kt b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/VersionFetcher.kt index 46f57dbdad2..546b9783f15 100644 --- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/VersionFetcher.kt +++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/VersionFetcher.kt @@ -22,16 +22,35 @@ class VersionFetcher : AutoCloseable { return coroutineScope { npmPackages .filter { it.version != null } - .map { HardcodedPackageInformation(it.displayName, it.version!!) } + + .map { + HardcodedPackageInformation( + it.name, + it.version!!, + it.displayName + ) + } + npmPackages .filter { it.version == null } - .map { async { it.displayName to fetchPackageInformationAsync(it.name) } } + .map { + async { + val fetched = fetchPackageInformationAsync(it.name) + object { + val name = it.name + val displayName = it.displayName + val fetched = fetched + } + } + } .map { fetched -> - val (packageName, value) = fetched.await() - val fetchedPackageInformation = Gson().fromJson(value, FetchedPackageInformation::class.java) + val await = fetched.await() + val name = await.name + val displayName = await.displayName + val awaitFetched = await.fetched + val fetchedPackageInformation = Gson().fromJson(awaitFetched, FetchedPackageInformation::class.java) RealPackageInformation( - packageName, - fetchedPackageInformation.versions.keys + name, + fetchedPackageInformation.versions.keys, + displayName ) } } diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt index e888f086e0d..fd394b787d4 100644 --- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt +++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt @@ -65,7 +65,8 @@ fun findLastVersions(packages: List): List { Package( packageInformation.name, - maximumVersion + maximumVersion, + packageInformation.displayName ) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index c6c9cd98586..660a2800860 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -11,9 +11,9 @@ package org.jetbrains.kotlin.gradle.targets.js // DO NOT MODIFY DIRECTLY! Use org.jetbrains.kotlin.generators.gradle.targets.js.MainKt class NpmVersions { val dukat = NpmPackageVersion("dukat", "0.5.8-rc.4") - val webpack4 = NpmPackageVersion("webpack4", "4.46.0") - val sourceMapLoader1 = NpmPackageVersion("sourceMapLoader1", "1.1.3") - val webpack = NpmPackageVersion("webpack", "5.26.3") + val webpack4 = NpmPackageVersion("webpack", "4.46.0") + val sourceMapLoader1 = NpmPackageVersion("source-map-loader", "1.1.3") + val webpack = NpmPackageVersion("webpack", "5.27.1") val webpackCli = NpmPackageVersion("webpack-cli", "4.5.0") val webpackBundleAnalyzer = NpmPackageVersion("webpack-bundle-analyzer", "4.4.0") val webpackDevServer = NpmPackageVersion("webpack-dev-server", "3.11.2")