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

Wizard: use correct version of react libraries

Browse Source 
#KT-38929 fixed
This commit is contained in:
Ilya Kirillov
2020-05-15 12:12:38 +03:00
parent 321272abed
commit 9ca6091b1d
6 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle
Vendored
+3 -3
View File
@@ -18,12 +18,12 @@ dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test-js'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-js'
implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1'
implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1'
implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1'
implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION'
implementation npm('react','16.13.0')
implementation npm('react-dom','16.13.0')
implementation npm('react-is','16.13.0')
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1'
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION'
implementation npm('styled-components','5.0.0')
implementation npm('inline-style-prefixer','5.1.0')
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts
Vendored
+3 -3
View File
@@ -18,12 +18,12 @@ dependencies {
testImplementation(kotlin("test-js"))
implementation(kotlin("stdlib-js"))
implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1")
implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1")
implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1")
implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION")
implementation(npm("react","16.13.0"))
implementation(npm("react-dom","16.13.0"))
implementation(npm("react-is","16.13.0"))
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1")
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION")
implementation(npm("styled-components","5.0.0"))
implementation(npm("inline-style-prefixer","5.1.0"))
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
Vendored
+3 -3
View File
@@ -61,12 +61,12 @@ kotlin {
dependencies {
implementation kotlin('stdlib-js')
implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1'
implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1'
implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1'
implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION'
implementation npm('react','16.13.0')
implementation npm('react-dom','16.13.0')
implementation npm('react-is','16.13.0')
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1'
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION'
implementation npm('styled-components','5.0.0')
implementation npm('inline-style-prefixer','5.1.0')
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
Vendored
+3 -3
View File
@@ -61,12 +61,12 @@ kotlin {
dependencies {
implementation(kotlin("stdlib-js"))
implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1")
implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1")
implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1")
implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION")
implementation(npm("react","16.13.0"))
implementation(npm("react-dom","16.13.0"))
implementation(npm("react-is","16.13.0"))
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1")
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION")
implementation(npm("styled-components","5.0.0"))
implementation(npm("inline-style-prefixer","5.1.0"))
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
+2 -2
View File
@@ -24,9 +24,9 @@ object Versions {
}
object JS_WRAPPERS {
val KOTLIN_REACT = version("16.13.0-pre.93-kotlin-1.4-M1")
val KOTLIN_REACT: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("16.13.0-pre.93-kotlin-$kotlinVersion") }
val KOTLIN_REACT_DOM = KOTLIN_REACT
val KOTLIN_STYLED = version("1.0.0-pre.93-kotlin-1.4-M1")
val KOTLIN_STYLED: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("1.0.0-pre.93-kotlin-$kotlinVersion") }
}
object NPM {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt
+26 -18
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.Templa
import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.interceptTemplate
import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
import org.jetbrains.kotlin.tools.projectWizard.Versions
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin
class SimpleJsClientTemplate : Template() {
override val title: String = KotlinNewProjectWizardBundle.message("module.template.js.simple.title")
@@ -75,14 +76,15 @@ class SimpleJsClientTemplate : Template() {
DependencyType.MAIN
)
val kotlinVersion = KotlinPlugin::version.propertyValue
if (renderEngine.reference.settingValue != RenderEngine.KOTLINX_HTML) {
+Dependencies.KOTLIN_REACT
+Dependencies.KOTLIN_REACT_DOM
+Dependencies.KOTLIN_REACT(kotlinVersion)
+Dependencies.KOTLIN_REACT_DOM(kotlinVersion)
+Dependencies.NPM_REACT
+Dependencies.NPM_REACT_DOM
if (renderEngine.reference.settingValue == RenderEngine.REACT_WITH_STYLED) {
+Dependencies.NPM_REACT_IS
+Dependencies.KOTLIN_STYLED
+Dependencies.KOTLIN_STYLED(kotlinVersion)
+Dependencies.NPM_STYLED_COMPONENTS
+Dependencies.NPM_INLINE_STYLE_PREFIXER
}
@@ -245,21 +247,27 @@ class SimpleJsClientTemplate : Template() {
}
private object Dependencies {
val KOTLIN_REACT = ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-react"),
Versions.JS_WRAPPERS.KOTLIN_REACT,
DependencyType.MAIN
)
val KOTLIN_REACT_DOM = ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-react-dom"),
Versions.JS_WRAPPERS.KOTLIN_REACT_DOM,
DependencyType.MAIN
)
val KOTLIN_STYLED = ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-styled"),
Versions.JS_WRAPPERS.KOTLIN_STYLED,
DependencyType.MAIN
)
val KOTLIN_REACT = { kotlinVersion: Version ->
ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-react"),
Versions.JS_WRAPPERS.KOTLIN_REACT(kotlinVersion),
DependencyType.MAIN
)
}
val KOTLIN_REACT_DOM = { kotlinVersion: Version ->
ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-react-dom"),
Versions.JS_WRAPPERS.KOTLIN_REACT_DOM(kotlinVersion),
DependencyType.MAIN
)
}
val KOTLIN_STYLED = { kotlinVersion: Version ->
ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", "kotlin-styled"),
Versions.JS_WRAPPERS.KOTLIN_STYLED(kotlinVersion),
DependencyType.MAIN
)
}
val NPM_REACT = ArtifactBasedLibraryDependencyIR(
NpmArtifact("react"),