From 9818321b46a0c60410f1ba64512351ffebec3f15 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 26 Aug 2020 16:23:06 +0300 Subject: [PATCH] [JS, Wizard] Use react template in full stack ^KT-41417 fixed --- .../frontendApplication/build.gradle | 10 ---------- .../frontendApplication/build.gradle.kts | 10 ---------- .../fullStackWebApplication/build.gradle | 2 -- .../fullStackWebApplication/build.gradle.kts | 2 -- .../projectWizard/projectTemplates/ProjectTemplate.kt | 2 +- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle index a6484d93141..6a6cce42ce4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle @@ -10,19 +10,9 @@ repositories { maven { 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 { 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 { js { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts index 8b30b2832f4..e9c68c069e4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts @@ -10,19 +10,9 @@ repositories { maven { 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 { 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 { js { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index c3711f5fb38..adea41dfe5c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -71,10 +71,8 @@ kotlin { } jsMain { 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-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION' - implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.110-kotlin-KOTLIN_VERSION' } } jsTest { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index 070b5fae5ba..83d5489b1b5 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -69,10 +69,8 @@ kotlin { } val jsMain by getting { 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-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 { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt index b4cc2e27239..da95171e083 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt @@ -239,7 +239,7 @@ object FullStackWebApplicationProjectTemplate : ProjectTemplate() { } }, ModuleType.js.createDefaultTarget().apply { - withTemplate(SimpleJsClientTemplate()) + withTemplate(ReactJsClientTemplate()) } ) )