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

Wizard: do not add NPM dependencies for Kotlin/JS wrappers

Browse Source 
Those dependencies are included now into corresponding libraries

#KT-40377 fixed
This commit is contained in:
Ilya Kirillov
2020-07-16 22:20:43 +03:00
parent 9f5dd59d75
commit d2113766e1
6 changed files with 0 additions and 60 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
-5
View File
@@ -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 {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts
Vendored
-5
View File
@@ -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 {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
Vendored
-5
View File
@@ -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 {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
Vendored
-5
View File
@@ -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 {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
-9
View File
@@ -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")
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt
-31
View File
@@ -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 {