Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
f318951b
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f318951b
编写于
3月 22, 2021
作者:
I
Ilya Goncharov
提交者:
TeamCityServer
3月 24, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Gradle, JS] Fix packages with hardcoded display name
^KT-45621 fixed
上级
fae0aa42
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
14 deletion
+38
-14
libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/PackageDto.kt
...tbrains/kotlin/generators/gradle/targets/js/PackageDto.kt
+8
-4
libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/VersionFetcher.kt
...ins/kotlin/generators/gradle/targets/js/VersionFetcher.kt
+25
-6
libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt
...org/jetbrains/kotlin/generators/gradle/targets/js/main.kt
+2
-1
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
...lin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
+3
-3
未找到文件。
libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/PackageDto.kt
浏览文件 @
f318951b
...
...
@@ -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
=
n
ame
displayN
ame
.
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
<
String
>
abstract
val
displayName
:
String
}
data class
RealPackageInformation
(
override
val
name
:
String
,
override
val
versions
:
Set
<
String
>
override
val
versions
:
Set
<
String
>,
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
<
String
>
=
setOf
(
version
)
}
\ No newline at end of file
libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/VersionFetcher.kt
浏览文件 @
f318951b
...
...
@@ -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 display
Name
=
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
)
}
}
...
...
libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt
浏览文件 @
f318951b
...
...
@@ -65,7 +65,8 @@ fun findLastVersions(packages: List<PackageInformation>): List<Package> {
Package
(
packageInformation
.
name
,
maximumVersion
maximumVersion
,
packageInformation
.
displayName
)
}
}
\ No newline at end of file
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
浏览文件 @
f318951b
...
...
@@ -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
(
"webpack
4
"
,
"4.46.0"
)
val
sourceMapLoader1
=
NpmPackageVersion
(
"source
MapLoader1
"
,
"1.1.3"
)
val
webpack
=
NpmPackageVersion
(
"webpack"
,
"5.2
6.3
"
)
val
webpack4
=
NpmPackageVersion
(
"webpack"
,
"4.46.0"
)
val
sourceMapLoader1
=
NpmPackageVersion
(
"source
-map-loader
"
,
"1.1.3"
)
val
webpack
=
NpmPackageVersion
(
"webpack"
,
"5.2
7.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"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录