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

[JS, Wizard] Use react template in full stack

Browse Source 
^KT-41417 fixed
This commit is contained in:
Ilya Goncharov
2020-08-26 16:23:06 +03:00
parent cd0bdc190b
commit 9818321b46
5 changed files with 1 additions and 25 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
-10
View File
@@ -10,19 +10,9 @@ repositories {
maven { maven {
url 'https://dl.bintray.com/kotlin/kotlin-dev' url 'https://dl.bintray.com/kotlin/kotlin-dev'
} }
maven {
url 'https://dl.bintray.com/kotlin/kotlinx'
}
maven {
url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers'
}
} }
dependencies { dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test-js' testImplementation 'org.jetbrains.kotlin:kotlin-test-js'
implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.110-kotlin-KOTLIN_VERSION'
} }
kotlin { kotlin {
js { js {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts
Vendored
-10
View File
@@ -10,19 +10,9 @@ repositories {
maven { maven {
url = uri("https://dl.bintray.com/kotlin/kotlin-dev") url = uri("https://dl.bintray.com/kotlin/kotlin-dev")
} }
maven {
url = uri("https://dl.bintray.com/kotlin/kotlinx")
}
maven {
url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers")
}
} }
dependencies { dependencies {
testImplementation(kotlin("test-js")) testImplementation(kotlin("test-js"))
implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.110-kotlin-KOTLIN_VERSION")
} }
kotlin { kotlin {
js { js {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
Vendored
-2
View File
@@ -71,10 +71,8 @@ kotlin {
} }
jsMain { jsMain {
dependencies { dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.110-kotlin-KOTLIN_VERSION'
} }
} }
jsTest { jsTest {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
Vendored
-2
View File
@@ -69,10 +69,8 @@ kotlin {
} }
val jsMain by getting { val jsMain by getting {
dependencies { dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.110-kotlin-KOTLIN_VERSION")
} }
} }
val jsTest by getting { val jsTest by getting {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
+1 -1
View File
@@ -239,7 +239,7 @@ object FullStackWebApplicationProjectTemplate : ProjectTemplate() {
} }
}, },
ModuleType.js.createDefaultTarget().apply { ModuleType.js.createDefaultTarget().apply {
withTemplate(SimpleJsClientTemplate()) withTemplate(ReactJsClientTemplate())
} }
) )
) )