From d2113766e19b01e81b76898d5bef02d1ad9a9770 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 16 Jul 2020 22:20:43 +0300 Subject: [PATCH] Wizard: do not add NPM dependencies for Kotlin/JS wrappers Those dependencies are included now into corresponding libraries #KT-40377 fixed --- .../frontendApplication/build.gradle | 5 --- .../frontendApplication/build.gradle.kts | 5 --- .../fullStackWebApplication/build.gradle | 5 --- .../fullStackWebApplication/build.gradle.kts | 5 --- .../kotlin/tools/projectWizard/Versions.kt | 9 ------ .../templates/SimpleJsClientTemplate.kt | 31 ------------------- 6 files changed, 60 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 c67e47172d7..3befa228911 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 @@ -23,12 +23,7 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION' - implementation npm('react','16.13.1') - implementation npm('react-dom','16.13.1') - implementation npm('react-is','16.13.1') implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION' - implementation npm('styled-components','5.0.0') - implementation npm('inline-style-prefixer','5.1.0') } 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 727cf477c5b..2a833b7d3b5 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 @@ -23,12 +23,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION") - implementation(npm("react","16.13.1")) - implementation(npm("react-dom","16.13.1")) - implementation(npm("react-is","16.13.1")) implementation("org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION") - implementation(npm("styled-components","5.0.0")) - implementation(npm("inline-style-prefixer","5.1.0")) } 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 df75b360aaa..2d50115f037 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 @@ -78,12 +78,7 @@ kotlin { implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION' - implementation npm('react','16.13.1') - implementation npm('react-dom','16.13.1') - implementation npm('react-is','16.13.1') implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION' - implementation npm('styled-components','5.0.0') - implementation npm('inline-style-prefixer','5.1.0') } } 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 8d13cc6c458..6bf514d12ee 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 @@ -78,12 +78,7 @@ kotlin { implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION") - implementation(npm("react","16.13.1")) - implementation(npm("react-dom","16.13.1")) - implementation(npm("react-is","16.13.1")) implementation("org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION") - implementation(npm("styled-components","5.0.0")) - implementation(npm("inline-style-prefixer","5.1.0")) } } val jsTest by getting { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt index 2262bd9284a..7dcbb40804a 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt @@ -29,15 +29,6 @@ object Versions { val KOTLIN_STYLED: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("1.0.0-pre.109-kotlin-$kotlinVersion") } } - object NPM { - val REACT = version("16.13.1") - val REACT_DOM = REACT - val REACT_IS = REACT - - val STYLED_COMPONENTS = version("5.0.0") - val INLINE_STYLE_PREFIXER = version("5.1.0") - } - object GRADLE_PLUGINS { val ANDROID = version("3.5.2") } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt index 4749c0c70e1..e8be8461481 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt @@ -91,13 +91,8 @@ class SimpleJsClientTemplate : Template() { if (renderEngine.reference.settingValue != RenderEngine.KOTLINX_HTML) { +Dependencies.KOTLIN_REACT(kotlinVersion.version) +Dependencies.KOTLIN_REACT_DOM(kotlinVersion.version) - +Dependencies.NPM_REACT - +Dependencies.NPM_REACT_DOM if (renderEngine.reference.settingValue == RenderEngine.REACT_WITH_STYLED) { - +Dependencies.NPM_REACT_IS +Dependencies.KOTLIN_STYLED(kotlinVersion.version) - +Dependencies.NPM_STYLED_COMPONENTS - +Dependencies.NPM_INLINE_STYLE_PREFIXER } } } @@ -279,32 +274,6 @@ class SimpleJsClientTemplate : Template() { DependencyType.MAIN ) } - - val NPM_REACT = ArtifactBasedLibraryDependencyIR( - NpmArtifact("react"), - Versions.NPM.REACT, - DependencyType.MAIN - ) - val NPM_REACT_DOM = ArtifactBasedLibraryDependencyIR( - NpmArtifact("react-dom"), - Versions.NPM.REACT_DOM, - DependencyType.MAIN - ) - val NPM_REACT_IS = ArtifactBasedLibraryDependencyIR( - NpmArtifact("react-is"), - Versions.NPM.REACT_IS, - DependencyType.MAIN - ) - val NPM_STYLED_COMPONENTS = ArtifactBasedLibraryDependencyIR( - NpmArtifact("styled-components"), - Versions.NPM.STYLED_COMPONENTS, - DependencyType.MAIN - ) - val NPM_INLINE_STYLE_PREFIXER = ArtifactBasedLibraryDependencyIR( - NpmArtifact("inline-style-prefixer"), - Versions.NPM.INLINE_STYLE_PREFIXER, - DependencyType.MAIN - ) } enum class RenderEngine(@Nls override val text: String) : DisplayableSettingItem {