From dcda8af7dab080b2e5c0f102c0c157f00c8eaaba Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 12:46:07 +0100
Subject: [PATCH 1/8] Some minor GUI tweaks. Fixes for supported project types.
 Upgrade to KVision 3.17.2.

---
 README.md                                     |   6 +-
 build.gradle                                  |   6 +-
 .../stonks/kvizard/KVisionModuleBuilder.kt    |  48 +++--
 .../tech/stonks/kvizard/KVisionModuleType.kt  |  18 +-
 .../stonks/kvizard/generator/TreeGenerator.kt |  98 ++++++----
 .../step/library_choice/LibraryChoiceStep.kt  |   4 +-
 .../step/library_choice/LibraryChoiceView.kt  |  27 ++-
 .../stonks/kvizard/utils/KVisionDialogUtil.kt |   2 +-
 .../kvizard/utils/RunConfigurationUtil.kt     |  16 +-
 .../kotlin/tech/stonks/kvizard/utils/file.kt  |   4 +-
 src/main/resources/META-INF/plugin.xml        |  33 ++--
 .../fileTemplates/internal/Procfile.ft        |   1 -
 .../fileTemplates/internal/app.json.ft        |   4 -
 .../internal/front_build.gradle.kts.ft        |   2 +-
 .../internal/front_gradle.properties.ft       |   3 +-
 .../internal/front_settings.gradle.kts.ft     |   2 +-
 .../frontend_source_frontend_App.kt.ft        |  32 +++
 ...ft => frontend_source_fullstack_App.kt.ft} |   0
 ... => frontend_source_fullstack_Model.kt.ft} |   0
 .../fileTemplates/internal/gradlew.bat.ft     |  89 ---------
 .../fileTemplates/internal/gradlew.ft         | 185 ------------------
 .../internal/ktor_gradle.properties.ft        |   2 +
 .../internal/runConfigurations.xml.ft         |  38 ----
 .../internal/spring_build.gradle.kts.ft       |  12 +-
 .../internal/spring_gradle.properties.ft      |   8 +-
 .../internal/spring_settings.gradle.kts.ft    |   2 +-
 .../internal/webpack_frontend_webpack.js.ft   |   6 +
 ....js.ft => webpack_fullstack_webpack.js.ft} |   4 -
 .../internal/webpack_minify.js.ft             |  17 --
 29 files changed, 216 insertions(+), 453 deletions(-)
 delete mode 100644 src/main/resources/fileTemplates/internal/Procfile.ft
 delete mode 100644 src/main/resources/fileTemplates/internal/app.json.ft
 create mode 100644 src/main/resources/fileTemplates/internal/frontend_source_frontend_App.kt.ft
 rename src/main/resources/fileTemplates/internal/{frontend_source_App.kt.ft => frontend_source_fullstack_App.kt.ft} (100%)
 rename src/main/resources/fileTemplates/internal/{frontend_source_Model.kt.ft => frontend_source_fullstack_Model.kt.ft} (100%)
 delete mode 100644 src/main/resources/fileTemplates/internal/gradlew.bat.ft
 delete mode 100644 src/main/resources/fileTemplates/internal/gradlew.ft
 delete mode 100644 src/main/resources/fileTemplates/internal/runConfigurations.xml.ft
 create mode 100644 src/main/resources/fileTemplates/internal/webpack_frontend_webpack.js.ft
 rename src/main/resources/fileTemplates/internal/{webpack_webpack.js.ft => webpack_fullstack_webpack.js.ft} (61%)
 delete mode 100644 src/main/resources/fileTemplates/internal/webpack_minify.js.ft

diff --git a/README.md b/README.md
index 1aba670..1dcf457 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # kvision-project-wizard
 KVision plugin for project creation.
 Supported project types:
- * Fullstack KTOR
- * Fullstack Spring-Boot
- * Frontend-only
+ * Frontend template
+ * Ktor fullstack project
+ * Spring Boot fullstack project
  
  ## Contribution
 If you want to contribute, You can add support for other backend frameworks like javalin, jooby, vertx and others. To do so You must:
diff --git a/build.gradle b/build.gradle
index 64d42e4..c4e1100 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'org.jetbrains.intellij' version '0.5.0'
-    id 'org.jetbrains.kotlin.jvm' version '1.4.10'
+    id 'org.jetbrains.intellij' version '0.6.5'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.20'
     id 'idea'
 }
 
@@ -23,7 +23,7 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version '2020.2.1'
+    version '2020.3'
     plugins = ['gradle', 'java', 'org.jetbrains.kotlin']
 }
 patchPluginXml {
diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
index e739819..71bab78 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
@@ -1,6 +1,5 @@
 package tech.stonks.kvizard
 
-import com.intellij.ide.fileTemplates.FileTemplateManager
 import com.intellij.ide.util.projectWizard.ModuleBuilder
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.WizardContext
@@ -19,7 +18,10 @@ import tech.stonks.kvizard.generator.KtorTreeGenerator
 import tech.stonks.kvizard.generator.SpringTreeGenerator
 import tech.stonks.kvizard.generator.TreeGenerator
 import tech.stonks.kvizard.step.library_choice.LibraryChoiceStep
-import tech.stonks.kvizard.utils.*
+import tech.stonks.kvizard.utils.KVisionDialogUtil
+import tech.stonks.kvizard.utils.RunConfigurationUtil
+import tech.stonks.kvizard.utils.backgroundTask
+import tech.stonks.kvizard.utils.runGradle
 import java.io.File
 
 class KVisionModuleBuilder : ModuleBuilder() {
@@ -28,14 +30,14 @@ class KVisionModuleBuilder : ModuleBuilder() {
         /**
          * Here add libraries that were newly supported
          */
-        val supportedBackendLibraries = arrayOf(
-            KVisionBackendLibrary.KTOR,
-            KVisionBackendLibrary.SPRING_BOOT,
-            KVisionBackendLibrary.FRONTEND_ONLY
+        val supportedProjectTypes = arrayOf(
+            KVisionProjectType.FRONTEND_ONLY,
+            KVisionProjectType.KTOR,
+            KVisionProjectType.SPRING_BOOT
         )
     }
 
-    var backendLibrary: KVisionBackendLibrary = KVisionBackendLibrary.KTOR
+    var projectType: KVisionProjectType = KVisionProjectType.FRONTEND_ONLY
     var groupId: String = "com.example"
     var artifactId: String = "project"
 
@@ -58,24 +60,32 @@ class KVisionModuleBuilder : ModuleBuilder() {
             try {
                 generator.generate(root, artifactId, groupId)
             } catch (ex: Exception) {
-
             }
-            runGradleTasks(modifiableRootModel.project)
-            RunConfigurationUtil.createConfiguration(modifiableRootModel.project)
+            installGradleWrapper(modifiableRootModel.project)
+            if (projectType == KVisionProjectType.FRONTEND_ONLY) {
+                RunConfigurationUtil.createFrontendConfiguration(modifiableRootModel.project)
+            } else {
+                runCompileMetadata(modifiableRootModel.project)
+                RunConfigurationUtil.createFullstackConfiguration(modifiableRootModel.project)
+            }
             KVisionDialogUtil.showNewsDialog()
         }
     }
 
-    private fun runGradleTasks(project: Project) {
+    private fun runCompileMetadata(project: Project) {
         project.runGradle("compileKotlinMetadata")
     }
 
+    private fun installGradleWrapper(project: Project) {
+        project.runGradle("wrapper --gradle-version 6.7.1 --distribution-type all")
+    }
+
     private fun createGenerator(): TreeGenerator {
-        return when (backendLibrary) {
-            KVisionBackendLibrary.KTOR -> KtorTreeGenerator()
-            KVisionBackendLibrary.FRONTEND_ONLY -> FrontendTreeGenerator()
-            KVisionBackendLibrary.SPRING_BOOT -> SpringTreeGenerator()
-            else -> throw IllegalStateException("${backendLibrary.name} is not supported yet.")
+        return when (projectType) {
+            KVisionProjectType.KTOR -> KtorTreeGenerator()
+            KVisionProjectType.FRONTEND_ONLY -> FrontendTreeGenerator()
+            KVisionProjectType.SPRING_BOOT -> SpringTreeGenerator()
+            else -> throw IllegalStateException("${projectType.name} is not supported yet.")
         }
     }
 
@@ -88,9 +98,7 @@ class KVisionModuleBuilder : ModuleBuilder() {
         return KVisionModuleType()
     }
 
-    override fun getCustomOptionsStep(context: WizardContext?, parentDisposable: Disposable?): ModuleWizardStep? {
+    override fun getCustomOptionsStep(context: WizardContext?, parentDisposable: Disposable?): ModuleWizardStep {
         return LibraryChoiceStep(this)
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt
index af0affc..87373c5 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt
@@ -6,18 +6,18 @@ import javax.swing.Icon
 
 class KVisionModuleType : ModuleType<KVisionModuleBuilder>("KVISION_WIZARD") {
 
-    private val _icon: Icon by lazy { IconLoader.getIcon("/images/logo16.png") }
+    private val _icon: Icon by lazy { IconLoader.getIcon("/images/logo16.png", KVisionModuleType::class.java) }
 
     override fun createModuleBuilder(): KVisionModuleBuilder {
         return KVisionModuleBuilder()
     }
 
     override fun getName(): String {
-        return "KVision Project"
+        return "KVision"
     }
 
     override fun getDescription(): String {
-        return "KVision Project wizard. It is a fullstack kotlin framework"
+        return "A new project with KVision - an object oriented web framework for Kotlin/JS"
     }
 
     override fun getNodeIcon(isOpened: Boolean): Icon {
@@ -29,6 +29,12 @@ class KVisionModuleType : ModuleType<KVisionModuleBuilder>("KVISION_WIZARD") {
     }
 }
 
-enum class KVisionBackendLibrary {
-    KTOR, FRONTEND_ONLY, JAVALIN, JOOBY, MICRONAUT, SPRING_BOOT, VERTX;
-}
\ No newline at end of file
+enum class KVisionProjectType(val displayName: String) {
+    FRONTEND_ONLY("Frontend template"),
+    KTOR("Ktor fullstack project"),
+    SPRING_BOOT("Spring Boot fullstack project"),
+    JAVALIN("Javalin fullstack project"),
+    JOOBY("Jooby fullstack project"),
+    MICRONAUT("Micronaut fullstack project"),
+    VERTX("Vert.x fullstack project");
+}
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
index 22fd608..e938ae1 100644
--- a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
@@ -2,8 +2,17 @@ package tech.stonks.kvizard.generator
 
 import com.intellij.openapi.vfs.VirtualFile
 import tech.stonks.kvizard.data.VersionApi
-import tech.stonks.kvizard.data.model.*
-import tech.stonks.kvizard.utils.*
+import tech.stonks.kvizard.data.model.TemplateJooby
+import tech.stonks.kvizard.data.model.TemplateKtor
+import tech.stonks.kvizard.data.model.TemplateMicronaut
+import tech.stonks.kvizard.data.model.TemplateSpring
+import tech.stonks.kvizard.data.model.TemplateVertx
+import tech.stonks.kvizard.data.model.VersionData
+import tech.stonks.kvizard.utils.TemplateAttributes
+import tech.stonks.kvizard.utils.build
+import tech.stonks.kvizard.utils.dir
+import tech.stonks.kvizard.utils.file
+import tech.stonks.kvizard.utils.packages
 
 /**
  * Base class for building KVision project.
@@ -35,11 +44,7 @@ abstract class TreeGenerator(
     private val rootFiles: Array<String> = arrayOf(
         ".gettext.json",
         ".gitignore",
-        "app.json",
-        "system.properties",
-        "gradlew.bat",
-        "gradlew",
-        "Procfile"
+        "system.properties"
     ),
     private val webpackFiles: Array<String> = arrayOf(
         "bootstrap.js",
@@ -47,14 +52,18 @@ abstract class TreeGenerator(
         "file.js",
         "handlebars.js",
         "jquery.js",
-        "minify.js",
-        "moment.js",
+        "moment.js"
+    ),
+    private val webpackCustomFiles: Array<String> = arrayOf(
         "webpack.js"
     ),
     private val commonFiles: Array<String> = arrayOf(
         "Service.kt"
     ),
-    private val frontendSourceFiles: Array<String> = arrayOf(
+    private val frontendSourceFrontendFiles: Array<String> = arrayOf(
+        "App.kt"
+    ),
+    private val frontendSourceFullstackFiles: Array<String> = arrayOf(
         "App.kt",
         "Model.kt"
     ),
@@ -72,10 +81,10 @@ abstract class TreeGenerator(
     fun generate(root: VirtualFile, artifactId: String, groupId: String) {
         try {
             val packageSegments = groupId
-            .split(".")
-            .toMutableList()
-            .apply { add(artifactId) }
-            .toList()
+                .split(".")
+                .toMutableList()
+                .apply { add(artifactId) }
+                .toList()
             val attrs = generateAttributes(artifactId, groupId)
             root.build {
                 dir("src") {
@@ -102,28 +111,40 @@ abstract class TreeGenerator(
                                 }
                             }
                         }
-                    }
-                    dir("commonMain") {
-                        dir("kotlin") {
-                            packages(packageSegments) {
-                                commonFiles.forEach { fileName -> file(fileName, "common_$fileName", attrs) }
+                        dir("commonMain") {
+                            dir("kotlin") {
+                                packages(packageSegments) {
+                                    commonFiles.forEach { fileName -> file(fileName, "common_$fileName", attrs) }
+                                }
                             }
                         }
                     }
-                    dir("frontendMain") {
+                    val frontendMain = if (isFrontendOnly) "main" else "frontendMain"
+                    dir(frontendMain) {
                         dir("kotlin") {
                             packages(packageSegments) {
-                                frontendSourceFiles.forEach { fileName ->
-                                    file(
-                                        fileName,
-                                        "frontend_source_$fileName",
-                                        attrs
-                                    )
+                                if (isFrontendOnly) {
+                                    frontendSourceFrontendFiles.forEach { fileName ->
+                                        file(
+                                            fileName,
+                                            "frontend_source_frontend_$fileName",
+                                            attrs
+                                        )
+                                    }
+                                } else {
+                                    frontendSourceFullstackFiles.forEach { fileName ->
+                                        file(
+                                            fileName,
+                                            "frontend_source_fullstack_$fileName",
+                                            attrs
+                                        )
+                                    }
                                 }
                             }
                         }
                         dir("web") {
                             frontendWebFiles.forEach { fileName -> file(fileName, "frontend_web_$fileName", attrs) }
+
                         }
                         dir("resources") {
                             dir("i18n") {
@@ -137,7 +158,8 @@ abstract class TreeGenerator(
                             }
                         }
                     }
-                    dir("frontendTest") {
+                    val frontendTest = if (isFrontendOnly) "test" else "frontendTest"
+                    dir(frontendTest) {
                         dir("kotlin") {
                             dir("test") {
                                 packages(packageSegments) {
@@ -158,11 +180,15 @@ abstract class TreeGenerator(
                     dir("wrapper") {
                     }
                 }
-                dir("idea.") {
+                dir(".idea") {
                     ideaFiles.forEach { fileName -> file(fileName, "idea_${fileName}", attrs) }
                 }
                 dir("webpack.config.d") {
                     webpackFiles.forEach { fileName -> file(fileName, "webpack_${fileName}", attrs) }
+                    val customPrefix = if (isFrontendOnly) "frontend" else "fullstack"
+                    webpackCustomFiles.forEach { fileName ->
+                        file(fileName, "webpack_${customPrefix}_${fileName}", attrs)
+                    }
                 }
                 gradleFile.forEach { fileName -> file(fileName, "${templateName}_${fileName}", attrs) }
                 rootFiles.forEach { fileName -> file(fileName, fileName, attrs) }
@@ -200,16 +226,16 @@ abstract class TreeGenerator(
             VersionApi.create().getVersionData().blockingGet()
         } catch (ex: Exception) {
             VersionData(
-                kVision = "3.16.3",
-                kotlin = "1.4.10",
+                kVision = "3.17.2",
+                kotlin = "1.4.20",
                 serialization = "1.0.1",
-                coroutines = "1.3.9",
-                templateJooby = TemplateJooby("2.9.2"),
-                templateKtor = TemplateKtor("1.4.2"),
-                templateMicronaut = TemplateMicronaut("2.1.3"),
+                coroutines = "1.4.2",
+                templateJooby = TemplateJooby("2.9.4"),
+                templateKtor = TemplateKtor("1.4.1"),
+                templateMicronaut = TemplateMicronaut("2.2.0"),
                 templateSpring = TemplateSpring(
-                    springBoot = "2.3.5.RELEASE",
-                    springDataR2dbc = "1.1.5.RELEASE",
+                    springBoot = "2.4.0",
+                    springDataR2dbc = "1.2.1",
                     r2dbcPostgres = "0.8.6.RELEASE",
                     r2dbcH2 = "0.8.4.RELEASE"
                 ),
diff --git a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt
index 1f9288f..e31a69c 100644
--- a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt
@@ -7,7 +7,7 @@ import javax.swing.JComponent
 class LibraryChoiceStep(private val _builder: KVisionModuleBuilder): ModuleWizardStep() {
     private val _view: LibraryChoiceView by lazy {
         LibraryChoiceView(
-            _builder.backendLibrary, _builder.groupId, _builder.artifactId
+            _builder.projectType, _builder.groupId, _builder.artifactId
         ).apply {
             onChanged = {
                 updateDataModel()
@@ -19,7 +19,7 @@ class LibraryChoiceStep(private val _builder: KVisionModuleBuilder): ModuleWizar
     }
 
     override fun updateDataModel() {
-        _builder.backendLibrary = _view.backendLibrary
+        _builder.projectType = _view.projectType
         _builder.groupId = _view.groupId
         _builder.artifactId = _view.artifactId
     }
diff --git a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt
index bbf9ff4..16a7076 100644
--- a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt
@@ -2,15 +2,23 @@ package tech.stonks.kvizard.step.library_choice
 
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.ui.ComboBox
-import tech.stonks.kvizard.KVisionBackendLibrary
+import tech.stonks.kvizard.KVisionProjectType
 import tech.stonks.kvizard.KVisionModuleBuilder
 import tech.stonks.kvizard.utils.setOnTextChangedListener
 import java.awt.Color
 import java.awt.FlowLayout
-import javax.swing.*
+import javax.swing.BoxLayout
+import javax.swing.JButton
+import javax.swing.JComponent
+import javax.swing.JLabel
+import javax.swing.JPanel
+import javax.swing.JTextField
+import java.awt.Dimension
+import javax.swing.Box
+
 
 class LibraryChoiceView(
-    var backendLibrary: KVisionBackendLibrary,
+    var projectType: KVisionProjectType,
     var groupId: String,
     var artifactId: String
 ) : JPanel() {
@@ -23,18 +31,18 @@ class LibraryChoiceView(
         val panel = JPanel().apply {
             layout = BoxLayout(this, BoxLayout.Y_AXIS)
             alignmentX = JComponent.LEFT_ALIGNMENT
-            add(JLabel("Choose your backend library").apply { alignmentX = LEFT_ALIGNMENT })
-            add(ComboBox<KVisionBackendLibrary>(KVisionModuleBuilder.supportedBackendLibraries).apply {
+            add(JLabel("Project type:").apply { alignmentX = LEFT_ALIGNMENT })
+            add(ComboBox(KVisionModuleBuilder.supportedProjectTypes.map { it.displayName }.toTypedArray()).apply {
                 alignmentX = LEFT_ALIGNMENT
-                prototypeDisplayValue = backendLibrary
+                setMinimumAndPreferredWidth(250)
                 addItemListener { event: java.awt.event.ItemEvent ->
                     if (event.stateChange == java.awt.event.ItemEvent.SELECTED) {
-                        backendLibrary = event.item as KVisionBackendLibrary
+                        projectType = KVisionProjectType.values().find { it.displayName == event.item }!!
                         onChanged()
                     }
                 }
             })
-            add(JLabel("GroupId").apply { alignmentX = LEFT_ALIGNMENT })
+            add(JLabel("GroupId:").apply { alignmentX = LEFT_ALIGNMENT })
             add(JTextField(groupId).apply {
                 alignmentX = LEFT_ALIGNMENT
                 setOnTextChangedListener {
@@ -42,7 +50,7 @@ class LibraryChoiceView(
                     onChanged()
                 }
             })
-            add(JLabel("ArtifactId").apply { alignmentX = LEFT_ALIGNMENT })
+            add(JLabel("ArtifactId:").apply { alignmentX = LEFT_ALIGNMENT })
             add(JTextField(artifactId).apply {
                 alignmentX = LEFT_ALIGNMENT
                 setOnTextChangedListener {
@@ -50,6 +58,7 @@ class LibraryChoiceView(
                     onChanged()
                 }
             })
+            add(Box.createRigidArea(Dimension(0, 20)))
             add(JButton("Check Kotlin.News").apply {
                 background = Color(0xffe017)
 
diff --git a/src/main/kotlin/tech/stonks/kvizard/utils/KVisionDialogUtil.kt b/src/main/kotlin/tech/stonks/kvizard/utils/KVisionDialogUtil.kt
index 56f8085..dc3ae06 100644
--- a/src/main/kotlin/tech/stonks/kvizard/utils/KVisionDialogUtil.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/utils/KVisionDialogUtil.kt
@@ -20,7 +20,7 @@ object KVisionDialogUtil {
                     "You have got invitation to join our community! Join Kotlin.News and become ninja developer in Kotlin.",
                     NotificationType.INFORMATION
                 ).apply {
-                    icon = IconLoader.getIcon("/images/email-black-18dp.svg")
+                    icon = IconLoader.getIcon("/images/email-black-18dp.svg", KVisionDialogUtil::class.java)
                     this.addAction(NewsAction("Join Kotlin.News"))
                     this.addAction(NotShowAction("Do not show again"))
                 }
diff --git a/src/main/kotlin/tech/stonks/kvizard/utils/RunConfigurationUtil.kt b/src/main/kotlin/tech/stonks/kvizard/utils/RunConfigurationUtil.kt
index 820b0de..408afbb 100644
--- a/src/main/kotlin/tech/stonks/kvizard/utils/RunConfigurationUtil.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/utils/RunConfigurationUtil.kt
@@ -27,7 +27,7 @@ class KVisionConfigurationFactory(val task: String, private val args: String = "
 
     override fun getName(): String = "Run $task"
 
-    override fun getIcon(): Icon = IconLoader.getIcon("/images/logo16.png")
+    override fun getIcon(): Icon = IconLoader.getIcon("/images/logo16.png", KVisionConfigurationFactory::class.java)
 }
 
 class RunnerComparator : Comparator<RunnerAndConfigurationSettings> {
@@ -41,7 +41,19 @@ class RunnerComparator : Comparator<RunnerAndConfigurationSettings> {
 }
 
 object RunConfigurationUtil {
-    fun createConfiguration(project: Project) {
+    fun createFrontendConfiguration(project: Project) {
+        val runManager = RunManagerImpl.getInstanceImpl(project)
+        runManager.addConfiguration(
+            RunnerAndConfigurationSettingsImpl(
+                RunManagerImpl.getInstanceImpl(project),
+                KVisionConfigurationFactory("run", "-t").createTemplateConfiguration(project)
+            )
+        )
+        runManager.setOrder(RunnerComparator())
+        runManager.requestSort()
+    }
+
+    fun createFullstackConfiguration(project: Project) {
         val runManager = RunManagerImpl.getInstanceImpl(project)
         runManager.addConfiguration(
             RunnerAndConfigurationSettingsImpl(
diff --git a/src/main/kotlin/tech/stonks/kvizard/utils/file.kt b/src/main/kotlin/tech/stonks/kvizard/utils/file.kt
index bdcb761..60294bc 100644
--- a/src/main/kotlin/tech/stonks/kvizard/utils/file.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/utils/file.kt
@@ -61,8 +61,8 @@ fun String.insertAfter(after: Regex, insert: String): String {
     return if(last != null) {
         buildString {
             append(this.substring(0, last+1))
-            appendln(insert)
-            appendln(this.substring(last+1))
+            appendLine(insert)
+            appendLine(this.substring(last+1))
         }
     }else {
         this
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index f4e2cee..1937c11 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -3,19 +3,30 @@
     <name>KVision Project Wizard</name>
     <vendor email="jakub.neukirch@stonks.tech" url="https://stonks.tech">Stonks.tech</vendor>
     <change-notes>
-        version 0.2.2:
-         * Add more detailed description
-        version 0.2.1:
-         * Add icon and description
-        version 0.2.0:
-         * Added spring support
-         * Added run configurations for backendRun and frontendRun
-        version 0.1.0:
-         * added support for ktor
+        &lt;i&gt;Version 0.2.2:&lt;/i&gt;
+        &lt;ul&gt;
+         &lt;li&gt;Add more detailed description&lt;/li&gt;
+        &lt;/ul&gt;
+
+        &lt;i&gt;Version 0.2.1:&lt;/i&gt;
+        &lt;ul&gt;
+         &lt;li&gt;Add icon and description&lt;/li&gt;
+        &lt;/ul&gt;
+
+        &lt;i&gt;Version 0.2.0:&lt;/i&gt;
+        &lt;ul&gt;
+         &lt;li&gt;Added spring support&lt;/li&gt;
+         &lt;li&gt;Added run configurations for backendRun and frontendRun&lt;/li&gt;
+        &lt;/ul&gt;
+
+        &lt;i&gt;Version 0.1.0:&lt;/i&gt;
+        &lt;ul&gt;
+         &lt;li&gt;Added support for Ktor&lt;/li&gt;
+        &lt;/ul&gt;
     </change-notes>
 
-    <description>Simple project wizard for KVision based projects. It allows You to create KVision projects based on Spring and Ktor (more supported backend frameworks in future).
-    To use it, click File -> New -> Project. In left panel choose KVision and then choose Your preferred backend framework or just simple frontend project. To run project choose "Frontend Run" and/or "Backend Run".
+    <description>Simple project wizard for KVision based projects. It allows you to create KVision frontend and fullstack projects.
+    To use it, click File -> New -> Project. In left panel choose KVision and then choose your preferred project type.
     </description>
 
     <!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
diff --git a/src/main/resources/fileTemplates/internal/Procfile.ft b/src/main/resources/fileTemplates/internal/Procfile.ft
deleted file mode 100644
index 94012ea..0000000
--- a/src/main/resources/fileTemplates/internal/Procfile.ft
+++ /dev/null
@@ -1 +0,0 @@
-web: java -jar build/libs/template-fullstack-ktor-1.0.0-SNAPSHOT.jar -port=$PORT
diff --git a/src/main/resources/fileTemplates/internal/app.json.ft b/src/main/resources/fileTemplates/internal/app.json.ft
deleted file mode 100644
index 7b67e74..0000000
--- a/src/main/resources/fileTemplates/internal/app.json.ft
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "KVision fullstack template",
-  "description": "A multiplatform template application example for KVision."
-}
diff --git a/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft
index 31eb7fe..e5797f0 100644
--- a/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft
@@ -9,7 +9,7 @@ plugins {
 }
 
 version = "1.0.0-SNAPSHOT"
-group = "com.example"
+group = "${GROUP_ID}"
 
 repositories {
     mavenCentral()
diff --git a/src/main/resources/fileTemplates/internal/front_gradle.properties.ft b/src/main/resources/fileTemplates/internal/front_gradle.properties.ft
index 47690e1..4699d75 100644
--- a/src/main/resources/fileTemplates/internal/front_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/front_gradle.properties.ft
@@ -3,4 +3,5 @@ javaVersion=1.8
 systemProp.kotlinVersion=${kotlin_version}
 serializationVersion=${serialization_version}
 #Dependencies
-systemProp.kvisionVersion=${kvision_version}
\ No newline at end of file
+systemProp.kvisionVersion=${kvision_version}
+kotlin.js.compiler=legacy
diff --git a/src/main/resources/fileTemplates/internal/front_settings.gradle.kts.ft b/src/main/resources/fileTemplates/internal/front_settings.gradle.kts.ft
index 1b24138..d49ae8f 100644
--- a/src/main/resources/fileTemplates/internal/front_settings.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/front_settings.gradle.kts.ft
@@ -16,4 +16,4 @@ pluginManagement {
         }
     }
 }
-rootProject.name = "template"
\ No newline at end of file
+rootProject.name = "${ARTIFACT_ID}"
\ No newline at end of file
diff --git a/src/main/resources/fileTemplates/internal/frontend_source_frontend_App.kt.ft b/src/main/resources/fileTemplates/internal/frontend_source_frontend_App.kt.ft
new file mode 100644
index 0000000..1ecca2c
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/frontend_source_frontend_App.kt.ft
@@ -0,0 +1,32 @@
+package ${PACKAGE_NAME}
+
+import pl.treksoft.kvision.Application
+import pl.treksoft.kvision.html.div
+import pl.treksoft.kvision.i18n.DefaultI18nManager
+import pl.treksoft.kvision.i18n.I18n
+import pl.treksoft.kvision.i18n.I18n.tr
+import pl.treksoft.kvision.module
+import pl.treksoft.kvision.panel.root
+import pl.treksoft.kvision.require
+import pl.treksoft.kvision.startApplication
+
+class App : Application() {
+    override fun start() {
+        I18n.manager =
+            DefaultI18nManager(
+                mapOf(
+                    "pl" to require("i18n/messages-pl.json"),
+                    "en" to require("i18n/messages-en.json")
+                )
+            )
+
+        root("kvapp") {
+            div(tr("This is a localized message."))
+            // TODO
+        }
+    }
+}
+
+fun main() {
+    startApplication(::App, module.hot)
+}
diff --git a/src/main/resources/fileTemplates/internal/frontend_source_App.kt.ft b/src/main/resources/fileTemplates/internal/frontend_source_fullstack_App.kt.ft
similarity index 100%
rename from src/main/resources/fileTemplates/internal/frontend_source_App.kt.ft
rename to src/main/resources/fileTemplates/internal/frontend_source_fullstack_App.kt.ft
diff --git a/src/main/resources/fileTemplates/internal/frontend_source_Model.kt.ft b/src/main/resources/fileTemplates/internal/frontend_source_fullstack_Model.kt.ft
similarity index 100%
rename from src/main/resources/fileTemplates/internal/frontend_source_Model.kt.ft
rename to src/main/resources/fileTemplates/internal/frontend_source_fullstack_Model.kt.ft
diff --git a/src/main/resources/fileTemplates/internal/gradlew.bat.ft b/src/main/resources/fileTemplates/internal/gradlew.bat.ft
deleted file mode 100644
index 107acd3..0000000
--- a/src/main/resources/fileTemplates/internal/gradlew.bat.ft
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/src/main/resources/fileTemplates/internal/gradlew.ft b/src/main/resources/fileTemplates/internal/gradlew.ft
deleted file mode 100644
index 4f906e0..0000000
--- a/src/main/resources/fileTemplates/internal/gradlew.ft
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft b/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft
index 7eae0db..f4c4ef6 100644
--- a/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft
@@ -15,3 +15,5 @@ pgsqlVersion=42.2.2
 kweryVersion=0.17
 
 kotlin.mpp.stability.nowarn=true
+kotlin.js.compiler=legacy
+org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/runConfigurations.xml.ft b/src/main/resources/fileTemplates/internal/runConfigurations.xml.ft
deleted file mode 100644
index 6e9f372..0000000
--- a/src/main/resources/fileTemplates/internal/runConfigurations.xml.ft
+++ /dev/null
@@ -1,38 +0,0 @@
-<configuration name="backend" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list>
-            <option value="backendRun" />
-          </list>
-        </option>
-        <option name="vmOptions" value="" />
-      </ExternalSystemSettings>
-      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-      <method v="2" />
-    </configuration>
-    <configuration name="frontend" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="-t" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list>
-            <option value="frontendRun" />
-          </list>
-        </option>
-        <option name="vmOptions" value="" />
-      </ExternalSystemSettings>
-      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-      <method v="2" />
-    </configuration>
\ No newline at end of file
diff --git a/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft
index f4b0e7a..ecc19fc 100644
--- a/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft
@@ -16,8 +16,6 @@ plugins {
     id("kvision") version kvisionVersion
 }
 
-extra["kotlin.version"] = "1.4.10"
-
 version = "1.0.0-SNAPSHOT"
 group = "${GROUP_ID}"
 
@@ -37,10 +35,6 @@ repositories {
 val kotlinVersion: String by System.getProperties()
 val kvisionVersion: String by System.getProperties()
 val coroutinesVersion: String by project
-val springDataR2dbcVersion: String by project
-val r2dbcPostgresqlVersion: String by project
-val r2dbcH2Version: String by project
-val kweryVersion: String by project
 
 val webDir = file("src/frontendMain/web")
 val mainClassName = "${GROUP_ID}.${ARTIFACT_ID}.MainKt"
@@ -102,10 +96,6 @@ kotlin {
                 implementation("org.springframework.boot:spring-boot-devtools")
                 implementation("org.springframework.boot:spring-boot-starter-webflux")
                 implementation("org.springframework.boot:spring-boot-starter-security")
-                implementation("org.springframework.data:spring-data-r2dbc:$springDataR2dbcVersion")
-                implementation("io.r2dbc:r2dbc-postgresql:$r2dbcPostgresqlVersion")
-                implementation("io.r2dbc:r2dbc-h2:$r2dbcH2Version")
-                implementation("com.github.andrewoma.kwery:core:$kweryVersion")
             }
         }
         val backendTest by getting {
@@ -245,4 +235,4 @@ afterEvaluate {
             dependsOn("compileKotlinMetadata")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft b/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft
index f7dccf9..435a8d7 100644
--- a/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft
@@ -7,9 +7,7 @@ systemProp.springBootVersion=${spring_boot_version}
 #Dependencies
 systemProp.kvisionVersion=${kvision_version}
 coroutinesVersion=${coroutines_version}
-springDataR2dbcVersion=${spring_datar2dbc_version}
-r2dbcPostgresqlVersion=${r2dbc_postgres_version}
-r2dbcH2Version=${r2dbc_h2_version}
-kweryVersion=0.17
 
-kotlin.mpp.stability.nowarn=true
\ No newline at end of file
+kotlin.mpp.stability.nowarn=true
+kotlin.js.compiler=legacy
+org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/spring_settings.gradle.kts.ft b/src/main/resources/fileTemplates/internal/spring_settings.gradle.kts.ft
index ac1e269..f26bb58 100644
--- a/src/main/resources/fileTemplates/internal/spring_settings.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/spring_settings.gradle.kts.ft
@@ -20,4 +20,4 @@ pluginManagement {
         }
     }
 }
-rootProject.name = "${ARTIFACT_ID}"
\ No newline at end of file
+rootProject.name = "${ARTIFACT_ID}"
diff --git a/src/main/resources/fileTemplates/internal/webpack_frontend_webpack.js.ft b/src/main/resources/fileTemplates/internal/webpack_frontend_webpack.js.ft
new file mode 100644
index 0000000..84ade10
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/webpack_frontend_webpack.js.ft
@@ -0,0 +1,6 @@
+config.resolve.modules.push("../../processedResources/js/main");
+
+if (config.devServer) {
+    config.devServer.hot = true;
+    config.devtool = 'eval-cheap-source-map';
+}
diff --git a/src/main/resources/fileTemplates/internal/webpack_webpack.js.ft b/src/main/resources/fileTemplates/internal/webpack_fullstack_webpack.js.ft
similarity index 61%
rename from src/main/resources/fileTemplates/internal/webpack_webpack.js.ft
rename to src/main/resources/fileTemplates/internal/webpack_fullstack_webpack.js.ft
index 4891faa..b2b5c96 100644
--- a/src/main/resources/fileTemplates/internal/webpack_webpack.js.ft
+++ b/src/main/resources/fileTemplates/internal/webpack_fullstack_webpack.js.ft
@@ -2,9 +2,5 @@ config.resolve.modules.push("../../processedResources/frontend/main");
 
 if (config.devServer) {
     config.devServer.hot = true;
-    config.devServer.stats = {
-        warnings: false
-    };
-    config.devServer.clientLogLevel = 'error';
     config.devtool = 'eval-cheap-source-map';
 }
diff --git a/src/main/resources/fileTemplates/internal/webpack_minify.js.ft b/src/main/resources/fileTemplates/internal/webpack_minify.js.ft
deleted file mode 100644
index 62d97b8..0000000
--- a/src/main/resources/fileTemplates/internal/webpack_minify.js.ft
+++ /dev/null
@@ -1,17 +0,0 @@
-if (!config.devServer) {
-    ;(function() {
-        const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
-
-        config.optimization = {
-            minimizer: [
-                 new UglifyJSPlugin({
-                    uglifyOptions: {
-                        compress: {
-                            unused: false
-                        }
-                    }
-                 })
-            ]
-        }
-    })();
-}

From 621696ed8c68e0eaf71f2fd0c88c8aa458e152fb Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 15:54:42 +0100
Subject: [PATCH 2/8] Add Javalin project support.

---
 README.md                                     |  19 +-
 .../stonks/kvizard/KVisionModuleBuilder.kt    |   7 +-
 .../kvizard/generator/JavalinTreeGenerator.kt |   9 +
 .../stonks/kvizard/generator/TreeGenerator.kt |  12 +
 ...alin_backend_resources_application.conf.ft |   1 +
 ...n_backend_resources_assets_.placeholder.ft |   0
 .../javalin_backend_resources_logback.xml.ft  |  12 +
 .../javalin_backend_source_Main.kt.ft         |  12 +
 .../javalin_backend_source_Service.kt.ft      |   9 +
 .../internal/javalin_build.gradle.kts.ft      | 244 ++++++++++++++++++
 .../internal/javalin_gradle.properties.ft     |  11 +
 .../internal/javalin_settings.gradle.kts.ft   |  20 ++
 12 files changed, 345 insertions(+), 11 deletions(-)
 create mode 100644 src/main/kotlin/tech/stonks/kvizard/generator/JavalinTreeGenerator.kt
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_backend_resources_application.conf.ft
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_backend_resources_assets_.placeholder.ft
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_backend_resources_logback.xml.ft
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_backend_source_Main.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_backend_source_Service.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft
 create mode 100644 src/main/resources/fileTemplates/internal/javalin_settings.gradle.kts.ft

diff --git a/README.md b/README.md
index 1dcf457..fe53536 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
-# kvision-project-wizard
-KVision plugin for project creation.
+# KVision Project Wizard
+KVision IntellJ IDEA plugin for new project creation.
 Supported project types:
- * Frontend template
- * Ktor fullstack project
- * Spring Boot fullstack project
+* Frontend template
+* Ktor fullstack project
+* Spring Boot fullstack project
+* Javalin fullstack project
  
  ## Contribution
-If you want to contribute, You can add support for other backend frameworks like javalin, jooby, vertx and others. To do so You must:
-* inherit by `TreeGenerator`
-* add case to KVisionModuleBuilder.createGenerator()
-* add enum to KVisionModuleBuilder.supportedBackendLibraries
+You can contribute new project types:
+* create new `TreeGenerator` subclass
+* add new case to `KVisionModuleBuilder.createGenerator()`
+* add new value to `KVisionModuleBuilder.supportedProjectTypes`
diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
index 71bab78..8a5e764 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
@@ -14,6 +14,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
 import com.intellij.psi.impl.file.PsiDirectoryFactory
 import tech.stonks.kvizard.generator.FrontendTreeGenerator
+import tech.stonks.kvizard.generator.JavalinTreeGenerator
 import tech.stonks.kvizard.generator.KtorTreeGenerator
 import tech.stonks.kvizard.generator.SpringTreeGenerator
 import tech.stonks.kvizard.generator.TreeGenerator
@@ -33,7 +34,8 @@ class KVisionModuleBuilder : ModuleBuilder() {
         val supportedProjectTypes = arrayOf(
             KVisionProjectType.FRONTEND_ONLY,
             KVisionProjectType.KTOR,
-            KVisionProjectType.SPRING_BOOT
+            KVisionProjectType.SPRING_BOOT,
+            KVisionProjectType.JAVALIN
         )
     }
 
@@ -82,9 +84,10 @@ class KVisionModuleBuilder : ModuleBuilder() {
 
     private fun createGenerator(): TreeGenerator {
         return when (projectType) {
-            KVisionProjectType.KTOR -> KtorTreeGenerator()
             KVisionProjectType.FRONTEND_ONLY -> FrontendTreeGenerator()
+            KVisionProjectType.KTOR -> KtorTreeGenerator()
             KVisionProjectType.SPRING_BOOT -> SpringTreeGenerator()
+            KVisionProjectType.JAVALIN -> JavalinTreeGenerator()
             else -> throw IllegalStateException("${projectType.name} is not supported yet.")
         }
     }
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/JavalinTreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/JavalinTreeGenerator.kt
new file mode 100644
index 0000000..8b93d11
--- /dev/null
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/JavalinTreeGenerator.kt
@@ -0,0 +1,9 @@
+package tech.stonks.kvizard.generator
+
+class JavalinTreeGenerator : TreeGenerator(
+        "javalin",
+        false,
+        backendFiles = arrayOf("Main.kt", "Service.kt"),
+        backendResourcesFiles = arrayOf("application.conf", "logback.xml"),
+        backendResourcesAssetsFiles = arrayOf(".placeholder")
+)
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
index e938ae1..9030c99 100644
--- a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
@@ -35,6 +35,7 @@ abstract class TreeGenerator(
     private val templateName: String,
     private val isFrontendOnly: Boolean = false,
     private val backendResourcesFiles: Array<String> = arrayOf(),
+    private val backendResourcesAssetsFiles: Array<String> = arrayOf(),
     private val backendFiles: Array<String> = arrayOf(),
     private val gradleFile: Array<String> = arrayOf(
         "build.gradle.kts",
@@ -109,6 +110,17 @@ abstract class TreeGenerator(
                                         attrs
                                     )
                                 }
+                                if (backendResourcesAssetsFiles.isNotEmpty()) {
+                                    dir("assets") {
+                                        backendResourcesAssetsFiles.forEach { fileName ->
+                                            file(
+                                                fileName,
+                                                "${templateName}_backend_resources_assets_$fileName",
+                                                attrs
+                                            )
+                                        }
+                                    }
+                                }
                             }
                         }
                         dir("commonMain") {
diff --git a/src/main/resources/fileTemplates/internal/javalin_backend_resources_application.conf.ft b/src/main/resources/fileTemplates/internal/javalin_backend_resources_application.conf.ft
new file mode 100644
index 0000000..b3270fb
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/javalin_backend_resources_application.conf.ft
@@ -0,0 +1 @@
+db = fs
diff --git a/src/main/resources/fileTemplates/internal/javalin_backend_resources_assets_.placeholder.ft b/src/main/resources/fileTemplates/internal/javalin_backend_resources_assets_.placeholder.ft
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/fileTemplates/internal/javalin_backend_resources_logback.xml.ft b/src/main/resources/fileTemplates/internal/javalin_backend_resources_logback.xml.ft
new file mode 100644
index 0000000..e30138a
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/javalin_backend_resources_logback.xml.ft
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="15 seconds" debug="false">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/src/main/resources/fileTemplates/internal/javalin_backend_source_Main.kt.ft b/src/main/resources/fileTemplates/internal/javalin_backend_source_Main.kt.ft
new file mode 100644
index 0000000..db6484c
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/javalin_backend_source_Main.kt.ft
@@ -0,0 +1,12 @@
+package ${PACKAGE_NAME}
+
+import io.javalin.Javalin
+import pl.treksoft.kvision.remote.applyRoutes
+import pl.treksoft.kvision.remote.kvisionInit
+
+fun main() {
+    Javalin.create().start(8080).apply {
+        kvisionInit()
+        applyRoutes(PingServiceManager)
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/javalin_backend_source_Service.kt.ft b/src/main/resources/fileTemplates/internal/javalin_backend_source_Service.kt.ft
new file mode 100644
index 0000000..8b22d52
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/javalin_backend_source_Service.kt.ft
@@ -0,0 +1,9 @@
+package ${PACKAGE_NAME}
+
+actual class PingService : IPingService {
+
+    override suspend fun ping(message: String): String {
+        println(message)
+        return "Hello world from server!"
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft
new file mode 100644
index 0000000..669ea14
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft
@@ -0,0 +1,244 @@
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+
+plugins {
+    val kotlinVersion: String by System.getProperties()
+    id("kotlinx-serialization") version kotlinVersion
+    kotlin("multiplatform") version kotlinVersion
+    val kvisionVersion: String by System.getProperties()
+    id("kvision") version kvisionVersion
+}
+
+version = "1.0.0-SNAPSHOT"
+group = "${GROUP_ID}"
+
+repositories {
+    mavenCentral()
+    jcenter()
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+    maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") }
+    maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+    maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
+    mavenLocal()
+}
+
+// Versions
+val kotlinVersion: String by System.getProperties()
+val kvisionVersion: String by System.getProperties()
+val slf4jVersion: String by project
+
+val webDir = file("src/frontendMain/web")
+val mainClassName = "${GROUP_ID}.${ARTIFACT_ID}.MainKt"
+
+kotlin {
+    jvm("backend") {
+        withJava()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+                freeCompilerArgs = listOf("-Xjsr305=strict")
+            }
+        }
+    }
+    js("frontend") {
+        browser {
+            commonWebpackConfig {
+                outputFileName = "main.bundle.js"
+                this.showProgress
+            }
+            runTask {
+                sourceMaps = false
+                devServer = KotlinWebpackConfig.DevServer(
+                    open = false,
+                    port = 3000,
+                    proxy = mapOf(
+                        "/kv/*" to "http://localhost:8080",
+                        "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
+                    ),
+                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                )
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                }
+            }
+        }
+        binaries.executable()
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api("pl.treksoft:kvision-server-javalin:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/common")
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+        val backendMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-jdk8"))
+                implementation(kotlin("reflect"))
+                implementation("org.slf4j:slf4j-simple:$slf4jVersion")
+            }
+        }
+        val backendTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+            }
+        }
+        val frontendMain by getting {
+            resources.srcDir(webDir)
+            dependencies {
+                implementation("pl.treksoft:kvision:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-css:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-select:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-datetime:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-spinner:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-upload:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-dialog:$kvisionVersion")
+                implementation("pl.treksoft:kvision-fontawesome:$kvisionVersion")
+                implementation("pl.treksoft:kvision-i18n:$kvisionVersion")
+                implementation("pl.treksoft:kvision-richtext:$kvisionVersion")
+                implementation("pl.treksoft:kvision-handlebars:$kvisionVersion")
+                implementation("pl.treksoft:kvision-datacontainer:$kvisionVersion")
+                implementation("pl.treksoft:kvision-redux:$kvisionVersion")
+                implementation("pl.treksoft:kvision-chart:$kvisionVersion")
+                implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
+                implementation("pl.treksoft:kvision-pace:$kvisionVersion")
+                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/frontend")
+        }
+        val frontendTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+                implementation("pl.treksoft:kvision-testutils:$kvisionVersion:tests")
+            }
+        }
+    }
+}
+
+fun getNodeJsBinaryExecutable(): String {
+    val nodeDir = NodeJsRootPlugin.apply(project).nodeJsSetupTaskProvider.get().destination
+    val isWindows = System.getProperty("os.name").toLowerCase().contains("windows")
+    val nodeBinDir = if (isWindows) nodeDir else nodeDir.resolve("bin")
+    val command = NodeJsRootPlugin.apply(project).nodeCommand
+    val finalCommand = if (isWindows && command == "node") "node.exe" else command
+    return nodeBinDir.resolve(finalCommand).absolutePath
+}
+
+tasks {
+    create("generatePotFile", Exec::class) {
+        dependsOn("compileKotlinFrontend")
+        executable = getNodeJsBinaryExecutable()
+        args("$buildDir/js/node_modules/gettext-extract/bin/gettext-extract")
+        inputs.files(kotlin.sourceSets["frontendMain"].kotlin.files)
+        outputs.file("$projectDir/src/frontendMain/resources/i18n/messages.pot")
+    }
+}
+afterEvaluate {
+    tasks {
+        getByName("frontendProcessResources", Copy::class) {
+            dependsOn("compileKotlinFrontend")
+            exclude("**/*.pot")
+            doLast("Convert PO to JSON") {
+                destinationDir.walkTopDown().filter {
+                    it.isFile && it.extension == "po"
+                }.forEach {
+                    exec {
+                        executable = getNodeJsBinaryExecutable()
+                        args(
+                            "$buildDir/js/node_modules/gettext.js/bin/po2json",
+                            it.absolutePath,
+                            "${it.parent}/${it.nameWithoutExtension}.json"
+                        )
+                        println("Converted ${it.name} to ${it.nameWithoutExtension}.json")
+                    }
+                    it.delete()
+                }
+            }
+        }
+        create("frontendArchive", Jar::class).apply {
+            dependsOn("frontendBrowserProductionWebpack")
+            group = "package"
+            archiveAppendix.set("frontend")
+            val distribution =
+                project.tasks.getByName("frontendBrowserProductionWebpack", KotlinWebpack::class).destinationDirectory!!
+            from(distribution) {
+                include("*.*")
+            }
+            from(webDir)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            into("/assets")
+            inputs.files(distribution, webDir)
+            outputs.file(archiveFile)
+            manifest {
+                attributes(
+                    mapOf(
+                        "Implementation-Title" to rootProject.name,
+                        "Implementation-Group" to rootProject.group,
+                        "Implementation-Version" to rootProject.version,
+                        "Timestamp" to System.currentTimeMillis()
+                    )
+                )
+            }
+        }
+        getByName("backendProcessResources", Copy::class) {
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+        getByName("backendJar").group = "package"
+        create("shadowJar", Jar::class).apply {
+            dependsOn("frontendArchive", "backendJar")
+            group = "package"
+            manifest {
+                attributes(
+                    mapOf(
+                        "Implementation-Title" to rootProject.name,
+                        "Implementation-Group" to rootProject.group,
+                        "Implementation-Version" to rootProject.version,
+                        "Timestamp" to System.currentTimeMillis(),
+                        "Main-Class" to mainClassName
+                    )
+                )
+            }
+            val dependencies = configurations["backendRuntimeClasspath"].filter { it.name.endsWith(".jar") } +
+                    project.tasks["backendJar"].outputs.files +
+                    project.tasks["frontendArchive"].outputs.files
+            dependencies.forEach {
+                if (it.isDirectory) from(it) else from(zipTree(it))
+            }
+            exclude("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA")
+            inputs.files(dependencies)
+            outputs.file(archiveFile)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+        getByName("jar", Jar::class).apply {
+            dependsOn("shadowJar")
+        }
+        create("backendRun", JavaExec::class) {
+            dependsOn("compileKotlinBackend")
+            group = "run"
+            main = mainClassName
+            classpath =
+                configurations["backendRuntimeClasspath"] + project.tasks["compileKotlinBackend"].outputs.files +
+                        project.tasks["backendProcessResources"].outputs.files
+            workingDir = buildDir
+        }
+        getByName("compileKotlinBackend") {
+            dependsOn("compileKotlinMetadata")
+        }
+        getByName("compileKotlinFrontend") {
+            dependsOn("compileKotlinMetadata")
+        }
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft b/src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft
new file mode 100644
index 0000000..42f2cf5
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft
@@ -0,0 +1,11 @@
+javaVersion=1.8
+#Plugins
+systemProp.kotlinVersion=${kotlin_version}
+serializationVersion=${serialization_version}
+#Dependencies
+systemProp.kvisionVersion=${kvision_version}
+slf4jVersion=1.7.28
+
+kotlin.mpp.stability.nowarn=true
+kotlin.js.compiler=legacy
+org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/javalin_settings.gradle.kts.ft b/src/main/resources/fileTemplates/internal/javalin_settings.gradle.kts.ft
new file mode 100644
index 0000000..a9ce240
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/javalin_settings.gradle.kts.ft
@@ -0,0 +1,20 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        jcenter()
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+        maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+        mavenLocal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            when {
+                requested.id.id == "kotlinx-serialization" -> useModule("org.jetbrains.kotlin:kotlin-serialization:${requested.version}")
+                requested.id.id == "kvision" -> useModule("pl.treksoft:kvision-gradle-plugin:${requested.version}")
+            }
+        }
+    }
+}
+rootProject.name = "${ARTIFACT_ID}"

From 4b9d75e76252ee75aff0f8f192a2c47e0b6987b7 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 18:50:15 +0100
Subject: [PATCH 3/8] Add Jooby project support.

---
 .../stonks/kvizard/KVisionModuleBuilder.kt    |   5 +-
 .../kvizard/generator/JoobyTreeGenerator.kt   |   8 +
 ...ooby_backend_resources_application.conf.ft |   1 +
 .../jooby_backend_resources_logback.xml.ft    |  12 +
 .../internal/jooby_backend_source_Main.kt.ft  |  15 +
 .../jooby_backend_source_Service.kt.ft        |   9 +
 .../internal/jooby_build.gradle.kts.ft        | 257 ++++++++++++++++++
 .../internal/jooby_gradle.properties.ft       |  15 +
 .../internal/jooby_settings.gradle.kts.ft     |  20 ++
 9 files changed, 341 insertions(+), 1 deletion(-)
 create mode 100644 src/main/kotlin/tech/stonks/kvizard/generator/JoobyTreeGenerator.kt
 create mode 100644 src/main/resources/fileTemplates/internal/jooby_backend_resources_application.conf.ft
 create mode 100644 src/main/resources/fileTemplates/internal/jooby_backend_resources_logback.xml.ft
 create mode 100644 src/main/resources/fileTemplates/internal/jooby_backend_source_Main.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/jooby_backend_source_Service.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft
 create mode 100644 src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft
 create mode 100644 src/main/resources/fileTemplates/internal/jooby_settings.gradle.kts.ft

diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
index 8a5e764..d1f4591 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
@@ -15,6 +15,7 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.impl.file.PsiDirectoryFactory
 import tech.stonks.kvizard.generator.FrontendTreeGenerator
 import tech.stonks.kvizard.generator.JavalinTreeGenerator
+import tech.stonks.kvizard.generator.JoobyTreeGenerator
 import tech.stonks.kvizard.generator.KtorTreeGenerator
 import tech.stonks.kvizard.generator.SpringTreeGenerator
 import tech.stonks.kvizard.generator.TreeGenerator
@@ -35,7 +36,8 @@ class KVisionModuleBuilder : ModuleBuilder() {
             KVisionProjectType.FRONTEND_ONLY,
             KVisionProjectType.KTOR,
             KVisionProjectType.SPRING_BOOT,
-            KVisionProjectType.JAVALIN
+            KVisionProjectType.JAVALIN,
+            KVisionProjectType.JOOBY
         )
     }
 
@@ -88,6 +90,7 @@ class KVisionModuleBuilder : ModuleBuilder() {
             KVisionProjectType.KTOR -> KtorTreeGenerator()
             KVisionProjectType.SPRING_BOOT -> SpringTreeGenerator()
             KVisionProjectType.JAVALIN -> JavalinTreeGenerator()
+            KVisionProjectType.JOOBY -> JoobyTreeGenerator()
             else -> throw IllegalStateException("${projectType.name} is not supported yet.")
         }
     }
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/JoobyTreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/JoobyTreeGenerator.kt
new file mode 100644
index 0000000..376ab5b
--- /dev/null
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/JoobyTreeGenerator.kt
@@ -0,0 +1,8 @@
+package tech.stonks.kvizard.generator
+
+class JoobyTreeGenerator : TreeGenerator(
+    "jooby",
+    false,
+    backendFiles = arrayOf("Main.kt", "Service.kt"),
+    backendResourcesFiles = arrayOf("application.conf", "logback.xml")
+)
diff --git a/src/main/resources/fileTemplates/internal/jooby_backend_resources_application.conf.ft b/src/main/resources/fileTemplates/internal/jooby_backend_resources_application.conf.ft
new file mode 100644
index 0000000..b3270fb
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/jooby_backend_resources_application.conf.ft
@@ -0,0 +1 @@
+db = fs
diff --git a/src/main/resources/fileTemplates/internal/jooby_backend_resources_logback.xml.ft b/src/main/resources/fileTemplates/internal/jooby_backend_resources_logback.xml.ft
new file mode 100644
index 0000000..e30138a
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/jooby_backend_resources_logback.xml.ft
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="15 seconds" debug="false">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/src/main/resources/fileTemplates/internal/jooby_backend_source_Main.kt.ft b/src/main/resources/fileTemplates/internal/jooby_backend_source_Main.kt.ft
new file mode 100644
index 0000000..4c44370
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/jooby_backend_source_Main.kt.ft
@@ -0,0 +1,15 @@
+package ${PACKAGE_NAME}
+
+import io.jooby.runApp
+import pl.treksoft.kvision.remote.applyRoutes
+import pl.treksoft.kvision.remote.kvisionInit
+
+fun main(args: Array<String>) {
+    runApp(args) {
+        kvisionInit()
+        applyRoutes(PingServiceManager)
+        onStarted {
+            // Initialization
+        }
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/jooby_backend_source_Service.kt.ft b/src/main/resources/fileTemplates/internal/jooby_backend_source_Service.kt.ft
new file mode 100644
index 0000000..8b22d52
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/jooby_backend_source_Service.kt.ft
@@ -0,0 +1,9 @@
+package ${PACKAGE_NAME}
+
+actual class PingService : IPingService {
+
+    override suspend fun ping(message: String): String {
+        println(message)
+        return "Hello world from server!"
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft
new file mode 100644
index 0000000..971781e
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft
@@ -0,0 +1,257 @@
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+
+plugins {
+    val kotlinVersion: String by System.getProperties()
+    id("kotlinx-serialization") version kotlinVersion
+    kotlin("multiplatform") version kotlinVersion
+    val joobyVersion: String by System.getProperties()
+    id("io.jooby.run") version joobyVersion
+    val kvisionVersion: String by System.getProperties()
+    id("kvision") version kvisionVersion
+}
+
+version = "1.0.0-SNAPSHOT"
+group = "${GROUP_ID}"
+
+repositories {
+    mavenCentral()
+    jcenter()
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+    maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") }
+    maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+    maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
+    mavenLocal()
+}
+
+// Versions
+val kotlinVersion: String by System.getProperties()
+val kvisionVersion: String by System.getProperties()
+val joobyVersion: String by System.getProperties()
+val h2Version: String by project
+val pgsqlVersion: String by project
+val kweryVersion: String by project
+val logbackVersion: String by project
+
+val webDir = file("src/frontendMain/web")
+val mainClassNameVal = "${GROUP_ID}.${ARTIFACT_ID}.MainKt"
+
+kotlin {
+    jvm("backend") {
+        withJava()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+                freeCompilerArgs = listOf("-Xjsr305=strict")
+            }
+        }
+    }
+    js("frontend") {
+        browser {
+            runTask {
+                outputFileName = "main.bundle.js"
+                sourceMaps = false
+                devServer = KotlinWebpackConfig.DevServer(
+                    open = false,
+                    port = 3000,
+                    proxy = mapOf(
+                        "/kv/*" to "http://localhost:8080",
+                        "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
+                    ),
+                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                )
+            }
+            webpackTask {
+                outputFileName = "main.bundle.js"
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                }
+            }
+        }
+        binaries.executable()
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api("pl.treksoft:kvision-server-jooby:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/common")
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+        val backendMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-jdk8"))
+                implementation(kotlin("reflect"))
+                implementation("io.jooby:jooby-netty:$joobyVersion")
+                implementation("io.jooby:jooby-hikari:$joobyVersion")
+                implementation("ch.qos.logback:logback-classic:$logbackVersion")
+                implementation("com.h2database:h2:$h2Version")
+                implementation("org.postgresql:postgresql:$pgsqlVersion")
+                implementation("com.github.andrewoma.kwery:core:$kweryVersion")
+                implementation("com.github.andrewoma.kwery:mapper:$kweryVersion")
+            }
+        }
+        val backendTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+            }
+        }
+        val frontendMain by getting {
+            resources.srcDir(webDir)
+            dependencies {
+                implementation("pl.treksoft:kvision:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-css:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-select:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-datetime:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-spinner:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-upload:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-dialog:$kvisionVersion")
+                implementation("pl.treksoft:kvision-fontawesome:$kvisionVersion")
+                implementation("pl.treksoft:kvision-i18n:$kvisionVersion")
+                implementation("pl.treksoft:kvision-richtext:$kvisionVersion")
+                implementation("pl.treksoft:kvision-handlebars:$kvisionVersion")
+                implementation("pl.treksoft:kvision-datacontainer:$kvisionVersion")
+                implementation("pl.treksoft:kvision-redux:$kvisionVersion")
+                implementation("pl.treksoft:kvision-chart:$kvisionVersion")
+                implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
+                implementation("pl.treksoft:kvision-pace:$kvisionVersion")
+                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/frontend")
+        }
+        val frontendTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+                implementation("pl.treksoft:kvision-testutils:$kvisionVersion:tests")
+            }
+        }
+    }
+}
+
+fun getNodeJsBinaryExecutable(): String {
+    val nodeDir = NodeJsRootPlugin.apply(project).nodeJsSetupTaskProvider.get().destination
+    val isWindows = System.getProperty("os.name").toLowerCase().contains("windows")
+    val nodeBinDir = if (isWindows) nodeDir else nodeDir.resolve("bin")
+    val command = NodeJsRootPlugin.apply(project).nodeCommand
+    val finalCommand = if (isWindows && command == "node") "node.exe" else command
+    return nodeBinDir.resolve(finalCommand).absolutePath
+}
+
+tasks {
+    joobyRun {
+        mainClassName = mainClassNameVal
+        restartExtensions = listOf("conf", "properties", "class")
+        compileExtensions = listOf("java", "kt")
+        port = 8080
+    }
+    create("generatePotFile", Exec::class) {
+        dependsOn("compileKotlinFrontend")
+        executable = getNodeJsBinaryExecutable()
+        args("$buildDir/js/node_modules/gettext-extract/bin/gettext-extract")
+        inputs.files(kotlin.sourceSets["frontendMain"].kotlin.files)
+        outputs.file("$projectDir/src/frontendMain/resources/i18n/messages.pot")
+    }
+}
+afterEvaluate {
+    tasks {
+        getByName("frontendProcessResources", Copy::class) {
+            dependsOn("compileKotlinFrontend")
+            exclude("**/*.pot")
+            doLast("Convert PO to JSON") {
+                destinationDir.walkTopDown().filter {
+                    it.isFile && it.extension == "po"
+                }.forEach {
+                    exec {
+                        executable = getNodeJsBinaryExecutable()
+                        args(
+                            "$buildDir/js/node_modules/gettext.js/bin/po2json",
+                            it.absolutePath,
+                            "${it.parent}/${it.nameWithoutExtension}.json"
+                        )
+                        println("Converted ${it.name} to ${it.nameWithoutExtension}.json")
+                    }
+                    it.delete()
+                }
+            }
+        }
+        create("frontendArchive", Jar::class).apply {
+            dependsOn("frontendBrowserProductionWebpack")
+            group = "package"
+            archiveAppendix.set("frontend")
+            val distribution =
+                project.tasks.getByName("frontendBrowserProductionWebpack", KotlinWebpack::class).destinationDirectory!!
+            from(distribution) {
+                include("*.*")
+            }
+            from(webDir)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            into("/assets")
+            inputs.files(distribution, webDir)
+            outputs.file(archiveFile)
+            manifest {
+                attributes(
+                    mapOf(
+                        "Implementation-Title" to rootProject.name,
+                        "Implementation-Group" to rootProject.group,
+                        "Implementation-Version" to rootProject.version,
+                        "Timestamp" to System.currentTimeMillis()
+                    )
+                )
+            }
+        }
+        getByName("backendProcessResources", Copy::class) {
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+        getByName("backendJar").group = "package"
+        create("shadowJar", Jar::class).apply {
+            dependsOn("frontendArchive", "backendJar")
+            group = "package"
+            manifest {
+                attributes(
+                    mapOf(
+                        "Implementation-Title" to rootProject.name,
+                        "Implementation-Group" to rootProject.group,
+                        "Implementation-Version" to rootProject.version,
+                        "Timestamp" to System.currentTimeMillis(),
+                        "Main-Class" to mainClassNameVal
+                    )
+                )
+            }
+            val dependencies = configurations["backendRuntimeClasspath"].filter { it.name.endsWith(".jar") } +
+                    project.tasks["backendJar"].outputs.files +
+                    project.tasks["frontendArchive"].outputs.files
+            dependencies.forEach {
+                if (it.isDirectory) from(it) else from(zipTree(it))
+            }
+            exclude("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA")
+            inputs.files(dependencies)
+            outputs.file(archiveFile)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+        getByName("jar", Jar::class).apply {
+            dependsOn("shadowJar")
+        }
+        create("backendRun") {
+            dependsOn("joobyRun")
+            group = "run"
+        }
+        getByName("compileKotlinBackend") {
+            dependsOn("compileKotlinMetadata")
+        }
+        getByName("compileKotlinFrontend") {
+            dependsOn("compileKotlinMetadata")
+        }
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft b/src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft
new file mode 100644
index 0000000..555969f
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft
@@ -0,0 +1,15 @@
+javaVersion=1.8
+#Plugins
+systemProp.kotlinVersion=${kotlin_version}
+serializationVersion=${serialization_version}
+#Dependencies
+systemProp.kvisionVersion=${kvision_version}
+systemProp.joobyVersion=${jooby_version}
+h2Version=1.4.197
+pgsqlVersion=42.2.2
+kweryVersion=0.17
+logbackVersion=1.2.3
+
+kotlin.mpp.stability.nowarn=true
+kotlin.js.compiler=legacy
+org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/jooby_settings.gradle.kts.ft b/src/main/resources/fileTemplates/internal/jooby_settings.gradle.kts.ft
new file mode 100644
index 0000000..a9ce240
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/jooby_settings.gradle.kts.ft
@@ -0,0 +1,20 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        jcenter()
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+        maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+        mavenLocal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            when {
+                requested.id.id == "kotlinx-serialization" -> useModule("org.jetbrains.kotlin:kotlin-serialization:${requested.version}")
+                requested.id.id == "kvision" -> useModule("pl.treksoft:kvision-gradle-plugin:${requested.version}")
+            }
+        }
+    }
+}
+rootProject.name = "${ARTIFACT_ID}"

From 117ac00aa2d3e11d81294f5cf4f46ec5fd59e4bc Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 19:11:55 +0100
Subject: [PATCH 4/8] Add Micronaut project support.

---
 .../stonks/kvizard/KVisionModuleBuilder.kt    |   5 +-
 .../generator/MicronautTreeGenerator.kt       |   8 +
 ...onaut_backend_resources_application.yml.ft |   3 +
 ...micronaut_backend_resources_logback.xml.ft |  14 +
 .../micronaut_backend_source_Main.kt.ft       |  19 ++
 .../micronaut_backend_source_Service.kt.ft    |  12 +
 .../internal/micronaut_build.gradle.kts.ft    | 288 ++++++++++++++++++
 .../internal/micronaut_gradle.properties.ft   |  13 +
 .../internal/micronaut_settings.gradle.kts.ft |  22 ++
 .../internal/spring_backend_source_Main.kt.ft |   2 +-
 .../spring_backend_source_Service.kt.ft       |   2 +-
 11 files changed, 385 insertions(+), 3 deletions(-)
 create mode 100644 src/main/kotlin/tech/stonks/kvizard/generator/MicronautTreeGenerator.kt
 create mode 100644 src/main/resources/fileTemplates/internal/micronaut_backend_resources_application.yml.ft
 create mode 100644 src/main/resources/fileTemplates/internal/micronaut_backend_resources_logback.xml.ft
 create mode 100644 src/main/resources/fileTemplates/internal/micronaut_backend_source_Main.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/micronaut_backend_source_Service.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft
 create mode 100644 src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft
 create mode 100644 src/main/resources/fileTemplates/internal/micronaut_settings.gradle.kts.ft

diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
index d1f4591..7c9e08d 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
@@ -17,6 +17,7 @@ import tech.stonks.kvizard.generator.FrontendTreeGenerator
 import tech.stonks.kvizard.generator.JavalinTreeGenerator
 import tech.stonks.kvizard.generator.JoobyTreeGenerator
 import tech.stonks.kvizard.generator.KtorTreeGenerator
+import tech.stonks.kvizard.generator.MicronautTreeGenerator
 import tech.stonks.kvizard.generator.SpringTreeGenerator
 import tech.stonks.kvizard.generator.TreeGenerator
 import tech.stonks.kvizard.step.library_choice.LibraryChoiceStep
@@ -37,7 +38,8 @@ class KVisionModuleBuilder : ModuleBuilder() {
             KVisionProjectType.KTOR,
             KVisionProjectType.SPRING_BOOT,
             KVisionProjectType.JAVALIN,
-            KVisionProjectType.JOOBY
+            KVisionProjectType.JOOBY,
+            KVisionProjectType.MICRONAUT
         )
     }
 
@@ -91,6 +93,7 @@ class KVisionModuleBuilder : ModuleBuilder() {
             KVisionProjectType.SPRING_BOOT -> SpringTreeGenerator()
             KVisionProjectType.JAVALIN -> JavalinTreeGenerator()
             KVisionProjectType.JOOBY -> JoobyTreeGenerator()
+            KVisionProjectType.MICRONAUT -> MicronautTreeGenerator()
             else -> throw IllegalStateException("${projectType.name} is not supported yet.")
         }
     }
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/MicronautTreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/MicronautTreeGenerator.kt
new file mode 100644
index 0000000..a78b178
--- /dev/null
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/MicronautTreeGenerator.kt
@@ -0,0 +1,8 @@
+package tech.stonks.kvizard.generator
+
+class MicronautTreeGenerator : TreeGenerator(
+    "micronaut",
+    false,
+    backendFiles = arrayOf("Main.kt", "Service.kt"),
+    backendResourcesFiles = arrayOf("application.yml", "logback.xml")
+)
diff --git a/src/main/resources/fileTemplates/internal/micronaut_backend_resources_application.yml.ft b/src/main/resources/fileTemplates/internal/micronaut_backend_resources_application.yml.ft
new file mode 100644
index 0000000..6d9d0f7
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/micronaut_backend_resources_application.yml.ft
@@ -0,0 +1,3 @@
+micronaut:
+  application:
+    name: ${ARTIFACT_ID}
diff --git a/src/main/resources/fileTemplates/internal/micronaut_backend_resources_logback.xml.ft b/src/main/resources/fileTemplates/internal/micronaut_backend_resources_logback.xml.ft
new file mode 100644
index 0000000..d40ac2a
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/micronaut_backend_resources_logback.xml.ft
@@ -0,0 +1,14 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d [%thread] %-5level %logger{36} - %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>
diff --git a/src/main/resources/fileTemplates/internal/micronaut_backend_source_Main.kt.ft b/src/main/resources/fileTemplates/internal/micronaut_backend_source_Main.kt.ft
new file mode 100644
index 0000000..2e287f7
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/micronaut_backend_source_Main.kt.ft
@@ -0,0 +1,19 @@
+package ${PACKAGE_NAME}
+
+import io.micronaut.context.annotation.Bean
+import io.micronaut.context.annotation.Factory
+import io.micronaut.runtime.Micronaut.build
+import pl.treksoft.kvision.remote.KVManagers
+
+@Factory
+class KVApplication {
+    @Bean
+    fun getManagers() = KVManagers(listOf(PingServiceManager))
+}
+
+fun main(args: Array<String>) {
+    build()
+        .args(*args)
+        .packages("${PACKAGE_NAME}")
+        .start()
+}
diff --git a/src/main/resources/fileTemplates/internal/micronaut_backend_source_Service.kt.ft b/src/main/resources/fileTemplates/internal/micronaut_backend_source_Service.kt.ft
new file mode 100644
index 0000000..92f0b5d
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/micronaut_backend_source_Service.kt.ft
@@ -0,0 +1,12 @@
+package ${PACKAGE_NAME}
+
+import io.micronaut.context.annotation.Prototype
+
+@Prototype
+actual class PingService : IPingService {
+
+    override suspend fun ping(message: String): String {
+        println(message)
+        return "Hello world from server!"
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft
new file mode 100644
index 0000000..fecf30a
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft
@@ -0,0 +1,288 @@
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    val kotlinVersion: String by System.getProperties()
+    id("kotlinx-serialization") version kotlinVersion
+    kotlin("multiplatform") version kotlinVersion
+    kotlin("plugin.allopen") version kotlinVersion
+    kotlin("kapt") version kotlinVersion
+    val shadowVersion: String by System.getProperties()
+    id("com.github.johnrengelman.shadow") version shadowVersion
+    val kvisionVersion: String by System.getProperties()
+    id("kvision") version kvisionVersion
+    id("application")
+}
+
+version = "1.0.0-SNAPSHOT"
+group = "${GROUP_ID}"
+
+repositories {
+    mavenCentral()
+    jcenter()
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+    maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") }
+    maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+    maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
+    mavenLocal()
+}
+
+// Versions
+val kotlinVersion: String by System.getProperties()
+val micronautVersion: String by System.getProperties()
+val kvisionVersion: String by System.getProperties()
+val coroutinesVersion: String by project
+
+val webDir = file("src/frontendMain/web")
+val mainClassNameVal = "${GROUP_ID}.${ARTIFACT_ID}.MainKt"
+
+application {
+    mainClassName = mainClassNameVal
+}
+
+allOpen {
+    annotation("io.micronaut.aop.Around")
+}
+
+kotlin {
+    jvm("backend") {
+        withJava()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+                freeCompilerArgs = listOf("-Xjsr305=strict")
+                javaParameters = true
+            }
+        }
+    }
+    js("frontend") {
+        browser {
+            runTask {
+                outputFileName = "main.bundle.js"
+                sourceMaps = false
+                devServer = KotlinWebpackConfig.DevServer(
+                    open = false,
+                    port = 3000,
+                    proxy = mapOf(
+                        "/kv/*" to "http://localhost:8080",
+                        "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
+                    ),
+                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                )
+            }
+            webpackTask {
+                outputFileName = "main.bundle.js"
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                }
+            }
+        }
+        binaries.executable()
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api("pl.treksoft:kvision-server-micronaut:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/common")
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+        val backendMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-jdk8"))
+                implementation(kotlin("reflect"))
+                implementation(project.dependencies.enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion"))
+                implementation("io.micronaut:micronaut-inject")
+                implementation("io.micronaut:micronaut-validation")
+                implementation("io.micronaut.kotlin:micronaut-kotlin-runtime")
+                implementation("io.micronaut:micronaut-runtime")
+                implementation("io.micronaut:micronaut-http-server-netty")
+                implementation("io.micronaut:micronaut-http-client")
+                implementation("io.micronaut:micronaut-session")
+                implementation("ch.qos.logback:logback-classic")
+                implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+            }
+        }
+        val backendTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+                implementation(project.dependencies.enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion"))
+                implementation("org.junit.jupiter:junit-jupiter-api")
+                implementation("io.micronaut.test:micronaut-test-junit5")
+                implementation("org.junit.jupiter:junit-jupiter-engine")
+            }
+        }
+        val frontendMain by getting {
+            resources.srcDir(webDir)
+            dependencies {
+                implementation("pl.treksoft:kvision:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-css:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-select:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-datetime:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-spinner:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-upload:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-dialog:$kvisionVersion")
+                implementation("pl.treksoft:kvision-fontawesome:$kvisionVersion")
+                implementation("pl.treksoft:kvision-i18n:$kvisionVersion")
+                implementation("pl.treksoft:kvision-richtext:$kvisionVersion")
+                implementation("pl.treksoft:kvision-handlebars:$kvisionVersion")
+                implementation("pl.treksoft:kvision-datacontainer:$kvisionVersion")
+                implementation("pl.treksoft:kvision-redux:$kvisionVersion")
+                implementation("pl.treksoft:kvision-chart:$kvisionVersion")
+                implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
+                implementation("pl.treksoft:kvision-pace:$kvisionVersion")
+                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/frontend")
+        }
+        val frontendTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+                implementation("pl.treksoft:kvision-testutils:$kvisionVersion:tests")
+            }
+        }
+    }
+}
+
+fun getNodeJsBinaryExecutable(): String {
+    val nodeDir = NodeJsRootPlugin.apply(project).nodeJsSetupTaskProvider.get().destination
+    val isWindows = System.getProperty("os.name").toLowerCase().contains("windows")
+    val nodeBinDir = if (isWindows) nodeDir else nodeDir.resolve("bin")
+    val command = NodeJsRootPlugin.apply(project).nodeCommand
+    val finalCommand = if (isWindows && command == "node") "node.exe" else command
+    return nodeBinDir.resolve(finalCommand).absolutePath
+}
+
+tasks {
+    create("generatePotFile", Exec::class) {
+        dependsOn("compileKotlinFrontend")
+        executable = getNodeJsBinaryExecutable()
+        args("$buildDir/js/node_modules/gettext-extract/bin/gettext-extract")
+        inputs.files(kotlin.sourceSets["frontendMain"].kotlin.files)
+        outputs.file("$projectDir/src/frontendMain/resources/i18n/messages.pot")
+    }
+    withType<JavaExec> {
+        jvmArgs("-XX:TieredStopAtLevel=1", "-Dcom.sun.management.jmxremote")
+        if (gradle.startParameter.isContinuous) {
+            systemProperties(
+                mapOf(
+                    "micronaut.io.watch.restart" to "true",
+                    "micronaut.io.watch.enabled" to "true",
+                    "micronaut.io.watch.paths" to "src/backendMain"
+                )
+            )
+        }
+    }
+}
+
+afterEvaluate {
+    tasks {
+        getByName("frontendProcessResources", Copy::class) {
+            dependsOn("compileKotlinFrontend")
+            exclude("**/*.pot")
+            doLast("Convert PO to JSON") {
+                destinationDir.walkTopDown().filter {
+                    it.isFile && it.extension == "po"
+                }.forEach {
+                    exec {
+                        executable = getNodeJsBinaryExecutable()
+                        args(
+                            "$buildDir/js/node_modules/gettext.js/bin/po2json",
+                            it.absolutePath,
+                            "${it.parent}/${it.nameWithoutExtension}.json"
+                        )
+                        println("Converted ${it.name} to ${it.nameWithoutExtension}.json")
+                    }
+                    it.delete()
+                }
+            }
+        }
+        create("frontendArchive", Jar::class).apply {
+            dependsOn("frontendBrowserProductionWebpack")
+            group = "package"
+            archiveAppendix.set("frontend")
+            val distribution =
+                project.tasks.getByName("frontendBrowserProductionWebpack", KotlinWebpack::class).destinationDirectory!!
+            from(distribution) {
+                include("*.*")
+            }
+            from(webDir)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            into("/public")
+            inputs.files(distribution, webDir)
+            outputs.file(archiveFile)
+            manifest {
+                attributes(
+                    mapOf(
+                        "Implementation-Title" to rootProject.name,
+                        "Implementation-Group" to rootProject.group,
+                        "Implementation-Version" to rootProject.version,
+                        "Timestamp" to System.currentTimeMillis()
+                    )
+                )
+            }
+        }
+        getByName("backendProcessResources", Copy::class) {
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+        getByName("backendJar").group = "package"
+        getByName("shadowJar", ShadowJar::class) {
+            dependsOn("frontendArchive", "backendJar")
+            manifest {
+                attributes(
+                    mapOf(
+                        "Implementation-Title" to rootProject.name,
+                        "Implementation-Group" to rootProject.group,
+                        "Implementation-Version" to rootProject.version,
+                        "Timestamp" to System.currentTimeMillis(),
+                        "Main-Class" to mainClassNameVal
+                    )
+                )
+            }
+            from(project.tasks["frontendArchive"].outputs.files)
+            mergeServiceFiles()
+        }
+        getByName("jar", Jar::class).apply {
+            dependsOn("shadowJar")
+        }
+        create("backendRun", JavaExec::class) {
+            dependsOn("run")
+        }
+        getByName("compileKotlinBackend") {
+            dependsOn("compileKotlinMetadata")
+        }
+        getByName("compileKotlinFrontend") {
+            dependsOn("compileKotlinMetadata")
+        }
+    }
+}
+
+kapt {
+    arguments {
+        arg("micronaut.processing.incremental", true)
+        arg("micronaut.processing.annotations", "${GROUP_ID}.*")
+        arg("micronaut.processing.group", "${GROUP_ID}")
+        arg("micronaut.processing.module", "template-fullstack-micronaut")
+    }
+}
+
+dependencies {
+    "kapt"(platform("io.micronaut:micronaut-bom:$micronautVersion"))
+    "kapt"("io.micronaut:micronaut-inject-java")
+    "kapt"("io.micronaut:micronaut-validation")
+    "kaptTest"("io.micronaut:micronaut-bom:$micronautVersion")
+    "kaptTest"("io.micronaut:micronaut-inject-java")
+}
diff --git a/src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft b/src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft
new file mode 100644
index 0000000..b8bfbb0
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft
@@ -0,0 +1,13 @@
+javaVersion=1.8
+#Plugins
+systemProp.kotlinVersion=${kotlin_version}
+serializationVersion=${serialization_version}
+systemProp.micronautVersion=${micronaut_version}
+systemProp.shadowVersion=6.0.0
+#Dependencies
+systemProp.kvisionVersion=${kvision_version}
+coroutinesVersion=${coroutines_version}
+
+kotlin.mpp.stability.nowarn=true
+kotlin.js.compiler=legacy
+org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/micronaut_settings.gradle.kts.ft b/src/main/resources/fileTemplates/internal/micronaut_settings.gradle.kts.ft
new file mode 100644
index 0000000..d6d1ab5
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/micronaut_settings.gradle.kts.ft
@@ -0,0 +1,22 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        jcenter()
+        gradlePluginPortal()
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+        mavenLocal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            when {
+                requested.id.id == "kotlinx-serialization" -> useModule("org.jetbrains.kotlin:kotlin-serialization:${requested.version}")
+                requested.id.id == "kvision" -> useModule("pl.treksoft:kvision-gradle-plugin:${requested.version}")
+            }
+        }
+    }
+}
+rootProject.name = "${ARTIFACT_ID}"
diff --git a/src/main/resources/fileTemplates/internal/spring_backend_source_Main.kt.ft b/src/main/resources/fileTemplates/internal/spring_backend_source_Main.kt.ft
index 1464180..c50501f 100644
--- a/src/main/resources/fileTemplates/internal/spring_backend_source_Main.kt.ft
+++ b/src/main/resources/fileTemplates/internal/spring_backend_source_Main.kt.ft
@@ -19,4 +19,4 @@ class KVApplication {
 
 fun main(args: Array<String>) {
     runApplication<KVApplication>(*args)
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/fileTemplates/internal/spring_backend_source_Service.kt.ft b/src/main/resources/fileTemplates/internal/spring_backend_source_Service.kt.ft
index 4b8527f..1da30b3 100644
--- a/src/main/resources/fileTemplates/internal/spring_backend_source_Service.kt.ft
+++ b/src/main/resources/fileTemplates/internal/spring_backend_source_Service.kt.ft
@@ -12,4 +12,4 @@ actual class PingService : IPingService {
         println(message)
         return "Hello world from server!"
     }
-}
\ No newline at end of file
+}

From 972812fda359beea6b28c373fdce8c05ac4c63ba Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 19:32:37 +0100
Subject: [PATCH 5/8] Add Vert.x project support.

---
 .../stonks/kvizard/KVisionModuleBuilder.kt    |   9 +-
 .../stonks/kvizard/generator/TreeGenerator.kt |   4 +-
 .../kvizard/generator/VertxTreeGenerator.kt   |   8 +
 .../vertx_backend_resources_logback.xml.ft    |  12 +
 .../internal/vertx_backend_source_Main.kt.ft  |  15 ++
 .../vertx_backend_source_Service.kt.ft        |   9 +
 .../internal/vertx_build.gradle.kts.ft        | 234 ++++++++++++++++++
 .../internal/vertx_gradle.properties.ft       |  12 +
 .../internal/vertx_settings.gradle.kts.ft     |  20 ++
 9 files changed, 316 insertions(+), 7 deletions(-)
 create mode 100644 src/main/kotlin/tech/stonks/kvizard/generator/VertxTreeGenerator.kt
 create mode 100644 src/main/resources/fileTemplates/internal/vertx_backend_resources_logback.xml.ft
 create mode 100644 src/main/resources/fileTemplates/internal/vertx_backend_source_Main.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/vertx_backend_source_Service.kt.ft
 create mode 100644 src/main/resources/fileTemplates/internal/vertx_build.gradle.kts.ft
 create mode 100644 src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft
 create mode 100644 src/main/resources/fileTemplates/internal/vertx_settings.gradle.kts.ft

diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
index 7c9e08d..78f778c 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
@@ -20,6 +20,7 @@ import tech.stonks.kvizard.generator.KtorTreeGenerator
 import tech.stonks.kvizard.generator.MicronautTreeGenerator
 import tech.stonks.kvizard.generator.SpringTreeGenerator
 import tech.stonks.kvizard.generator.TreeGenerator
+import tech.stonks.kvizard.generator.VertxTreeGenerator
 import tech.stonks.kvizard.step.library_choice.LibraryChoiceStep
 import tech.stonks.kvizard.utils.KVisionDialogUtil
 import tech.stonks.kvizard.utils.RunConfigurationUtil
@@ -30,16 +31,14 @@ import java.io.File
 class KVisionModuleBuilder : ModuleBuilder() {
 
     companion object {
-        /**
-         * Here add libraries that were newly supported
-         */
         val supportedProjectTypes = arrayOf(
             KVisionProjectType.FRONTEND_ONLY,
             KVisionProjectType.KTOR,
             KVisionProjectType.SPRING_BOOT,
             KVisionProjectType.JAVALIN,
             KVisionProjectType.JOOBY,
-            KVisionProjectType.MICRONAUT
+            KVisionProjectType.MICRONAUT,
+            KVisionProjectType.VERTX
         )
     }
 
@@ -94,7 +93,7 @@ class KVisionModuleBuilder : ModuleBuilder() {
             KVisionProjectType.JAVALIN -> JavalinTreeGenerator()
             KVisionProjectType.JOOBY -> JoobyTreeGenerator()
             KVisionProjectType.MICRONAUT -> MicronautTreeGenerator()
-            else -> throw IllegalStateException("${projectType.name} is not supported yet.")
+            KVisionProjectType.VERTX -> VertxTreeGenerator()
         }
     }
 
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
index 9030c99..10b78f2 100644
--- a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
@@ -229,7 +229,7 @@ abstract class TreeGenerator(
             "spring_datar2dbc_version" to versionData.templateSpring.springDataR2dbc,
             "r2dbc_postgres_version" to versionData.templateSpring.r2dbcPostgres,
             "r2dbc_h2_version" to versionData.templateSpring.r2dbcH2,
-            "vertx_version" to versionData.templateVertx.vertxPlugin
+            "vertx_plugin_version" to versionData.templateVertx.vertxPlugin
         )
     }
 
@@ -251,7 +251,7 @@ abstract class TreeGenerator(
                     r2dbcPostgres = "0.8.6.RELEASE",
                     r2dbcH2 = "0.8.4.RELEASE"
                 ),
-                templateVertx = TemplateVertx("1.1.3")
+                templateVertx = TemplateVertx(vertxPlugin = "1.1.3")
             )
         }
     }
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/VertxTreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/VertxTreeGenerator.kt
new file mode 100644
index 0000000..83e1d4f
--- /dev/null
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/VertxTreeGenerator.kt
@@ -0,0 +1,8 @@
+package tech.stonks.kvizard.generator
+
+class VertxTreeGenerator : TreeGenerator(
+    "vertx",
+    false,
+    backendFiles = arrayOf("Main.kt", "Service.kt"),
+    backendResourcesFiles = arrayOf("logback.xml")
+)
diff --git a/src/main/resources/fileTemplates/internal/vertx_backend_resources_logback.xml.ft b/src/main/resources/fileTemplates/internal/vertx_backend_resources_logback.xml.ft
new file mode 100644
index 0000000..e30138a
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/vertx_backend_resources_logback.xml.ft
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="15 seconds" debug="false">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/src/main/resources/fileTemplates/internal/vertx_backend_source_Main.kt.ft b/src/main/resources/fileTemplates/internal/vertx_backend_source_Main.kt.ft
new file mode 100644
index 0000000..b422bd8
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/vertx_backend_source_Main.kt.ft
@@ -0,0 +1,15 @@
+package ${PACKAGE_NAME}
+
+import io.vertx.core.AbstractVerticle
+import io.vertx.ext.web.Router
+import pl.treksoft.kvision.remote.applyRoutes
+import pl.treksoft.kvision.remote.kvisionInit
+
+class MainVerticle : AbstractVerticle() {
+    override fun start() {
+        val router = Router.router(vertx)
+        vertx.kvisionInit(router)
+        vertx.applyRoutes(router, PingServiceManager)
+        vertx.createHttpServer().requestHandler(router).listen(8080)
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/vertx_backend_source_Service.kt.ft b/src/main/resources/fileTemplates/internal/vertx_backend_source_Service.kt.ft
new file mode 100644
index 0000000..8b22d52
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/vertx_backend_source_Service.kt.ft
@@ -0,0 +1,9 @@
+package ${PACKAGE_NAME}
+
+actual class PingService : IPingService {
+
+    override suspend fun ping(message: String): String {
+        println(message)
+        return "Hello world from server!"
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/vertx_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/vertx_build.gradle.kts.ft
new file mode 100644
index 0000000..458de2c
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/vertx_build.gradle.kts.ft
@@ -0,0 +1,234 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+
+plugins {
+    val kotlinVersion: String by System.getProperties()
+    id("kotlinx-serialization") version kotlinVersion
+    kotlin("multiplatform") version kotlinVersion
+    val kvisionVersion: String by System.getProperties()
+    id("kvision") version kvisionVersion
+    val vertxPluginVersion: String by System.getProperties()
+    id("io.vertx.vertx-plugin") version vertxPluginVersion
+}
+
+version = "1.0.0-SNAPSHOT"
+group = "${GROUP_ID}"
+
+repositories {
+    mavenCentral()
+    jcenter()
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+    maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") }
+    maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+    maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
+    mavenLocal()
+}
+
+// Versions
+val kotlinVersion: String by System.getProperties()
+val kvisionVersion: String by System.getProperties()
+val logbackVersion: String by project
+
+val webDir = file("src/frontendMain/web")
+
+kotlin {
+    jvm("backend") {
+        withJava()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+                freeCompilerArgs = listOf("-Xjsr305=strict")
+            }
+        }
+    }
+    js("frontend") {
+        browser {
+            runTask {
+                outputFileName = "main.bundle.js"
+                sourceMaps = false
+                devServer = KotlinWebpackConfig.DevServer(
+                    open = false,
+                    port = 3000,
+                    proxy = mapOf(
+                        "/kv/*" to "http://localhost:8080",
+                        "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
+                    ),
+                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                )
+            }
+            webpackTask {
+                outputFileName = "main.bundle.js"
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                }
+            }
+        }
+        binaries.executable()
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api("pl.treksoft:kvision-server-vertx:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/common")
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+        val backendMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-jdk8"))
+                implementation(kotlin("reflect"))
+                implementation("ch.qos.logback:logback-classic:$logbackVersion")
+            }
+        }
+        val backendTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+            }
+        }
+        val frontendMain by getting {
+            resources.srcDir(webDir)
+            dependencies {
+                implementation("pl.treksoft:kvision:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-css:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-select:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-datetime:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-spinner:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-upload:$kvisionVersion")
+                implementation("pl.treksoft:kvision-bootstrap-dialog:$kvisionVersion")
+                implementation("pl.treksoft:kvision-fontawesome:$kvisionVersion")
+                implementation("pl.treksoft:kvision-i18n:$kvisionVersion")
+                implementation("pl.treksoft:kvision-richtext:$kvisionVersion")
+                implementation("pl.treksoft:kvision-handlebars:$kvisionVersion")
+                implementation("pl.treksoft:kvision-datacontainer:$kvisionVersion")
+                implementation("pl.treksoft:kvision-redux:$kvisionVersion")
+                implementation("pl.treksoft:kvision-chart:$kvisionVersion")
+                implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
+                implementation("pl.treksoft:kvision-pace:$kvisionVersion")
+                implementation("pl.treksoft:kvision-print:$kvisionVersion")
+            }
+            kotlin.srcDir("build/generated-src/frontend")
+        }
+        val frontendTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+                implementation("pl.treksoft:kvision-testutils:$kvisionVersion:tests")
+            }
+        }
+    }
+}
+
+fun getNodeJsBinaryExecutable(): String {
+    val nodeDir = NodeJsRootPlugin.apply(project).nodeJsSetupTaskProvider.get().destination
+    val isWindows = System.getProperty("os.name").toLowerCase().contains("windows")
+    val nodeBinDir = if (isWindows) nodeDir else nodeDir.resolve("bin")
+    val command = NodeJsRootPlugin.apply(project).nodeCommand
+    val finalCommand = if (isWindows && command == "node") "node.exe" else command
+    return nodeBinDir.resolve(finalCommand).absolutePath
+}
+
+vertx {
+    mainVerticle = "${GROUP_ID}.${ARTIFACT_ID}.MainVerticle"
+    jvmArgs = listOf("-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory")
+}
+
+tasks {
+    create("generatePotFile", Exec::class) {
+        dependsOn("compileKotlinFrontend")
+        executable = getNodeJsBinaryExecutable()
+        args("$buildDir/js/node_modules/gettext-extract/bin/gettext-extract")
+        inputs.files(kotlin.sourceSets["frontendMain"].kotlin.files)
+        outputs.file("$projectDir/src/frontendMain/resources/i18n/messages.pot")
+    }
+}
+
+afterEvaluate {
+    tasks {
+        getByName("frontendProcessResources", Copy::class) {
+            dependsOn("compileKotlinFrontend")
+            exclude("**/*.pot")
+            doLast("Convert PO to JSON") {
+                destinationDir.walkTopDown().filter {
+                    it.isFile && it.extension == "po"
+                }.forEach {
+                    exec {
+                        executable = getNodeJsBinaryExecutable()
+                        args(
+                            "$buildDir/js/node_modules/gettext.js/bin/po2json",
+                            it.absolutePath,
+                            "${it.parent}/${it.nameWithoutExtension}.json"
+                        )
+                        println("Converted ${it.name} to ${it.nameWithoutExtension}.json")
+                    }
+                    it.delete()
+                }
+            }
+        }
+        create("frontendArchive", Jar::class).apply {
+            dependsOn("frontendBrowserProductionWebpack")
+            group = "package"
+            archiveAppendix.set("frontend")
+            val distribution =
+                project.tasks.getByName("frontendBrowserProductionWebpack", KotlinWebpack::class).destinationDirectory!!
+            from(distribution) {
+                include("*.*")
+            }
+            from(webDir)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            into("/webroot")
+            inputs.files(distribution, webDir)
+            outputs.file(archiveFile)
+            manifest {
+                attributes(
+                    mapOf(
+                        "Implementation-Title" to rootProject.name,
+                        "Implementation-Group" to rootProject.group,
+                        "Implementation-Version" to rootProject.version,
+                        "Timestamp" to System.currentTimeMillis()
+                    )
+                )
+            }
+        }
+        getByName("backendProcessResources", Copy::class) {
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+        create("backendRun") {
+            dependsOn("vertxRun")
+            group = "run"
+        }
+        getByName("jar", Jar::class).apply {
+            dependsOn("shadowJar")
+        }
+        getByName("backendJar").group = "package"
+        getByName("shadowJar", ShadowJar::class) {
+            archiveClassifier.set(null as String?)
+            dependsOn("frontendArchive", "backendJar")
+            val dependencies = project.configurations["backendRuntimeClasspath"].filter { it.name.endsWith(".jar") } +
+                    project.tasks["backendJar"].outputs.files +
+                    project.tasks["frontendArchive"].outputs.files
+            dependencies.forEach {
+                if (it.isDirectory) from(it) else from(zipTree(it))
+            }
+            exclude("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA")
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
+        getByName("compileKotlinBackend") {
+            dependsOn("compileKotlinMetadata")
+        }
+        getByName("compileKotlinFrontend") {
+            dependsOn("compileKotlinMetadata")
+        }
+    }
+}
diff --git a/src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft b/src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft
new file mode 100644
index 0000000..d3a3471
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft
@@ -0,0 +1,12 @@
+javaVersion=1.8
+#Plugins
+systemProp.kotlinVersion=${kotlin_version}
+serializationVersion=${serialization_version}
+#Dependencies
+systemProp.kvisionVersion=${kvision_version}
+systemProp.vertxPluginVersion=${vertx_plugin_version}
+logbackVersion=1.1.7
+
+kotlin.mpp.stability.nowarn=true
+kotlin.js.compiler=legacy
+org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/vertx_settings.gradle.kts.ft b/src/main/resources/fileTemplates/internal/vertx_settings.gradle.kts.ft
new file mode 100644
index 0000000..a9ce240
--- /dev/null
+++ b/src/main/resources/fileTemplates/internal/vertx_settings.gradle.kts.ft
@@ -0,0 +1,20 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        jcenter()
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+        maven { url = uri("https://dl.bintray.com/rjaros/kotlin") }
+        mavenLocal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            when {
+                requested.id.id == "kotlinx-serialization" -> useModule("org.jetbrains.kotlin:kotlin-serialization:${requested.version}")
+                requested.id.id == "kvision" -> useModule("pl.treksoft:kvision-gradle-plugin:${requested.version}")
+            }
+        }
+    }
+}
+rootProject.name = "${ARTIFACT_ID}"

From e40cc5a190903c8b89d7210ebf908eb2493776fc Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 19:32:56 +0100
Subject: [PATCH 6/8] Change default frontend dependencies

---
 .../resources/fileTemplates/internal/front_build.gradle.kts.ft  | 1 -
 .../fileTemplates/internal/javalin_build.gradle.kts.ft          | 2 +-
 .../resources/fileTemplates/internal/jooby_build.gradle.kts.ft  | 2 +-
 .../resources/fileTemplates/internal/ktor_build.gradle.kts.ft   | 2 +-
 .../fileTemplates/internal/micronaut_build.gradle.kts.ft        | 2 +-
 .../resources/fileTemplates/internal/spring_build.gradle.kts.ft | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft
index e5797f0..dae9dac 100644
--- a/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft
@@ -72,7 +72,6 @@ kotlin {
         implementation("pl.treksoft:kvision-chart:$kvisionVersion")
         implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
         implementation("pl.treksoft:kvision-pace:$kvisionVersion")
-        implementation("pl.treksoft:kvision-moment:$kvisionVersion")
         implementation("pl.treksoft:kvision-toast:$kvisionVersion")
         implementation("pl.treksoft:kvision-print:$kvisionVersion")
     }
diff --git a/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft
index 669ea14..e5f0765 100644
--- a/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft
@@ -115,7 +115,7 @@ kotlin {
                 implementation("pl.treksoft:kvision-chart:$kvisionVersion")
                 implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
                 implementation("pl.treksoft:kvision-pace:$kvisionVersion")
-                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+                implementation("pl.treksoft:kvision-print:$kvisionVersion")
             }
             kotlin.srcDir("build/generated-src/frontend")
         }
diff --git a/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft
index 971781e..fc433dd 100644
--- a/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft
@@ -127,7 +127,7 @@ kotlin {
                 implementation("pl.treksoft:kvision-chart:$kvisionVersion")
                 implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
                 implementation("pl.treksoft:kvision-pace:$kvisionVersion")
-                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+                implementation("pl.treksoft:kvision-print:$kvisionVersion")
             }
             kotlin.srcDir("build/generated-src/frontend")
         }
diff --git a/src/main/resources/fileTemplates/internal/ktor_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/ktor_build.gradle.kts.ft
index 492221b..6d9f760 100644
--- a/src/main/resources/fileTemplates/internal/ktor_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/ktor_build.gradle.kts.ft
@@ -130,7 +130,7 @@ kotlin {
                 implementation("pl.treksoft:kvision-chart:$kvisionVersion")
                 implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
                 implementation("pl.treksoft:kvision-pace:$kvisionVersion")
-                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+                implementation("pl.treksoft:kvision-print:$kvisionVersion")
             }
             kotlin.srcDir("build/generated-src/frontend")
         }
diff --git a/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft
index fecf30a..70f3e9d 100644
--- a/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft
@@ -144,7 +144,7 @@ kotlin {
                 implementation("pl.treksoft:kvision-chart:$kvisionVersion")
                 implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
                 implementation("pl.treksoft:kvision-pace:$kvisionVersion")
-                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+                implementation("pl.treksoft:kvision-print:$kvisionVersion")
             }
             kotlin.srcDir("build/generated-src/frontend")
         }
diff --git a/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft
index ecc19fc..4c7e93a 100644
--- a/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft
@@ -125,7 +125,7 @@ kotlin {
                 implementation("pl.treksoft:kvision-chart:$kvisionVersion")
                 implementation("pl.treksoft:kvision-tabulator:$kvisionVersion")
                 implementation("pl.treksoft:kvision-pace:$kvisionVersion")
-                implementation("pl.treksoft:kvision-moment:$kvisionVersion")
+                implementation("pl.treksoft:kvision-print:$kvisionVersion")
             }
             kotlin.srcDir("build/generated-src/frontend")
         }

From 4fc8a9ccecc7605439e9bb8077a764883f9ae4f1 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 19:50:14 +0100
Subject: [PATCH 7/8] Add an option to choose compiler backend (legacy/ir)

---
 .../stonks/kvizard/KVisionModuleBuilder.kt    |  3 ++-
 .../tech/stonks/kvizard/KVisionModuleType.kt  |  7 ++++++-
 .../stonks/kvizard/generator/TreeGenerator.kt | 14 +++++++++----
 .../step/library_choice/LibraryChoiceStep.kt  |  8 ++++---
 .../step/library_choice/LibraryChoiceView.kt  | 21 +++++++++++++++----
 .../internal/front_gradle.properties.ft       |  2 +-
 .../internal/javalin_gradle.properties.ft     |  2 +-
 .../internal/jooby_gradle.properties.ft       |  2 +-
 .../internal/ktor_gradle.properties.ft        |  2 +-
 .../internal/micronaut_gradle.properties.ft   |  2 +-
 .../internal/spring_gradle.properties.ft      |  2 +-
 .../internal/vertx_gradle.properties.ft       |  2 +-
 12 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
index 78f778c..fe4b5fc 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
@@ -45,6 +45,7 @@ class KVisionModuleBuilder : ModuleBuilder() {
     var projectType: KVisionProjectType = KVisionProjectType.FRONTEND_ONLY
     var groupId: String = "com.example"
     var artifactId: String = "project"
+    var compilerBackend: CompilerBackend = CompilerBackend.LEGACY
 
     override fun setupRootModel(modifiableRootModel: ModifiableRootModel) {
         val root = createAndGetRoot() ?: return
@@ -63,7 +64,7 @@ class KVisionModuleBuilder : ModuleBuilder() {
         val generator: TreeGenerator = createGenerator()
         modifiableRootModel.project.backgroundTask("Setting up project") {
             try {
-                generator.generate(root, artifactId, groupId)
+                generator.generate(root, artifactId, groupId, compilerBackend)
             } catch (ex: Exception) {
             }
             installGradleWrapper(modifiableRootModel.project)
diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt
index 87373c5..0943765 100644
--- a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleType.kt
@@ -30,7 +30,7 @@ class KVisionModuleType : ModuleType<KVisionModuleBuilder>("KVISION_WIZARD") {
 }
 
 enum class KVisionProjectType(val displayName: String) {
-    FRONTEND_ONLY("Frontend template"),
+    FRONTEND_ONLY("Frontend project"),
     KTOR("Ktor fullstack project"),
     SPRING_BOOT("Spring Boot fullstack project"),
     JAVALIN("Javalin fullstack project"),
@@ -38,3 +38,8 @@ enum class KVisionProjectType(val displayName: String) {
     MICRONAUT("Micronaut fullstack project"),
     VERTX("Vert.x fullstack project");
 }
+
+enum class CompilerBackend(val displayName: String) {
+    LEGACY("Legacy"),
+    IR("IR (experimental)")
+}
diff --git a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
index 10b78f2..ca3695a 100644
--- a/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/generator/TreeGenerator.kt
@@ -1,6 +1,7 @@
 package tech.stonks.kvizard.generator
 
 import com.intellij.openapi.vfs.VirtualFile
+import tech.stonks.kvizard.CompilerBackend
 import tech.stonks.kvizard.data.VersionApi
 import tech.stonks.kvizard.data.model.TemplateJooby
 import tech.stonks.kvizard.data.model.TemplateKtor
@@ -79,14 +80,14 @@ abstract class TreeGenerator(
     private val frontendTestFiles: Array<String> = arrayOf("AppSpec.kt"),
     private val ideaFiles: Array<String> = arrayOf("gradle.xml"),
 ) {
-    fun generate(root: VirtualFile, artifactId: String, groupId: String) {
+    fun generate(root: VirtualFile, artifactId: String, groupId: String, compilerBackend: CompilerBackend) {
         try {
             val packageSegments = groupId
                 .split(".")
                 .toMutableList()
                 .apply { add(artifactId) }
                 .toList()
-            val attrs = generateAttributes(artifactId, groupId)
+            val attrs = generateAttributes(artifactId, groupId, compilerBackend)
             root.build {
                 dir("src") {
                     if (!isFrontendOnly) {
@@ -212,7 +213,11 @@ abstract class TreeGenerator(
         }
     }
 
-    private fun generateAttributes(artifactId: String, groupId: String): Map<String, String> {
+    private fun generateAttributes(
+        artifactId: String,
+        groupId: String,
+        compilerBackend: CompilerBackend
+    ): Map<String, String> {
         val versionData = getVersionData()
         return mapOf(
             TemplateAttributes.ARTIFACT_ID to artifactId,
@@ -229,7 +234,8 @@ abstract class TreeGenerator(
             "spring_datar2dbc_version" to versionData.templateSpring.springDataR2dbc,
             "r2dbc_postgres_version" to versionData.templateSpring.r2dbcPostgres,
             "r2dbc_h2_version" to versionData.templateSpring.r2dbcH2,
-            "vertx_plugin_version" to versionData.templateVertx.vertxPlugin
+            "vertx_plugin_version" to versionData.templateVertx.vertxPlugin,
+            "compiler_backend" to compilerBackend.name.toLowerCase()
         )
     }
 
diff --git a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt
index e31a69c..051a455 100644
--- a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceStep.kt
@@ -4,16 +4,17 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import tech.stonks.kvizard.KVisionModuleBuilder
 import javax.swing.JComponent
 
-class LibraryChoiceStep(private val _builder: KVisionModuleBuilder): ModuleWizardStep() {
+class LibraryChoiceStep(private val _builder: KVisionModuleBuilder) : ModuleWizardStep() {
     private val _view: LibraryChoiceView by lazy {
         LibraryChoiceView(
-            _builder.projectType, _builder.groupId, _builder.artifactId
+            _builder.projectType, _builder.groupId, _builder.artifactId, _builder.compilerBackend
         ).apply {
             onChanged = {
                 updateDataModel()
             }
         }
     }
+
     override fun getComponent(): JComponent {
         return _view
     }
@@ -22,5 +23,6 @@ class LibraryChoiceStep(private val _builder: KVisionModuleBuilder): ModuleWizar
         _builder.projectType = _view.projectType
         _builder.groupId = _view.groupId
         _builder.artifactId = _view.artifactId
+        _builder.compilerBackend = _view.compilerBackend
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt
index 16a7076..63913b7 100644
--- a/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt
+++ b/src/main/kotlin/tech/stonks/kvizard/step/library_choice/LibraryChoiceView.kt
@@ -2,25 +2,27 @@ package tech.stonks.kvizard.step.library_choice
 
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.ui.ComboBox
-import tech.stonks.kvizard.KVisionProjectType
+import tech.stonks.kvizard.CompilerBackend
 import tech.stonks.kvizard.KVisionModuleBuilder
+import tech.stonks.kvizard.KVisionProjectType
 import tech.stonks.kvizard.utils.setOnTextChangedListener
 import java.awt.Color
+import java.awt.Dimension
 import java.awt.FlowLayout
+import javax.swing.Box
 import javax.swing.BoxLayout
 import javax.swing.JButton
 import javax.swing.JComponent
 import javax.swing.JLabel
 import javax.swing.JPanel
 import javax.swing.JTextField
-import java.awt.Dimension
-import javax.swing.Box
 
 
 class LibraryChoiceView(
     var projectType: KVisionProjectType,
     var groupId: String,
-    var artifactId: String
+    var artifactId: String,
+    var compilerBackend: CompilerBackend
 ) : JPanel() {
 
     var onChanged: () -> Unit = {}
@@ -58,6 +60,17 @@ class LibraryChoiceView(
                     onChanged()
                 }
             })
+            add(JLabel("Kotlin/JS compiler backend:").apply { alignmentX = LEFT_ALIGNMENT })
+            add(ComboBox(CompilerBackend.values().map { it.displayName }.toTypedArray()).apply {
+                alignmentX = LEFT_ALIGNMENT
+                setMinimumAndPreferredWidth(250)
+                addItemListener { event: java.awt.event.ItemEvent ->
+                    if (event.stateChange == java.awt.event.ItemEvent.SELECTED) {
+                        compilerBackend = CompilerBackend.values().find { it.displayName == event.item }!!
+                        onChanged()
+                    }
+                }
+            })
             add(Box.createRigidArea(Dimension(0, 20)))
             add(JButton("Check Kotlin.News").apply {
                 background = Color(0xffe017)
diff --git a/src/main/resources/fileTemplates/internal/front_gradle.properties.ft b/src/main/resources/fileTemplates/internal/front_gradle.properties.ft
index 4699d75..8b804dd 100644
--- a/src/main/resources/fileTemplates/internal/front_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/front_gradle.properties.ft
@@ -4,4 +4,4 @@ systemProp.kotlinVersion=${kotlin_version}
 serializationVersion=${serialization_version}
 #Dependencies
 systemProp.kvisionVersion=${kvision_version}
-kotlin.js.compiler=legacy
+kotlin.js.compiler=${compiler_backend}
diff --git a/src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft b/src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft
index 42f2cf5..650a7df 100644
--- a/src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/javalin_gradle.properties.ft
@@ -7,5 +7,5 @@ systemProp.kvisionVersion=${kvision_version}
 slf4jVersion=1.7.28
 
 kotlin.mpp.stability.nowarn=true
-kotlin.js.compiler=legacy
+kotlin.js.compiler=${compiler_backend}
 org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft b/src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft
index 555969f..5541a89 100644
--- a/src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/jooby_gradle.properties.ft
@@ -11,5 +11,5 @@ kweryVersion=0.17
 logbackVersion=1.2.3
 
 kotlin.mpp.stability.nowarn=true
-kotlin.js.compiler=legacy
+kotlin.js.compiler=${compiler_backend}
 org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft b/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft
index f4c4ef6..506fd50 100644
--- a/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/ktor_gradle.properties.ft
@@ -15,5 +15,5 @@ pgsqlVersion=42.2.2
 kweryVersion=0.17
 
 kotlin.mpp.stability.nowarn=true
-kotlin.js.compiler=legacy
+kotlin.js.compiler=${compiler_backend}
 org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft b/src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft
index b8bfbb0..a175333 100644
--- a/src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/micronaut_gradle.properties.ft
@@ -9,5 +9,5 @@ systemProp.kvisionVersion=${kvision_version}
 coroutinesVersion=${coroutines_version}
 
 kotlin.mpp.stability.nowarn=true
-kotlin.js.compiler=legacy
+kotlin.js.compiler=${compiler_backend}
 org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft b/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft
index 435a8d7..34b1681 100644
--- a/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/spring_gradle.properties.ft
@@ -9,5 +9,5 @@ systemProp.kvisionVersion=${kvision_version}
 coroutinesVersion=${coroutines_version}
 
 kotlin.mpp.stability.nowarn=true
-kotlin.js.compiler=legacy
+kotlin.js.compiler=${compiler_backend}
 org.gradle.jvmargs=-Xmx2g
diff --git a/src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft b/src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft
index d3a3471..ef03957 100644
--- a/src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft
+++ b/src/main/resources/fileTemplates/internal/vertx_gradle.properties.ft
@@ -8,5 +8,5 @@ systemProp.vertxPluginVersion=${vertx_plugin_version}
 logbackVersion=1.1.7
 
 kotlin.mpp.stability.nowarn=true
-kotlin.js.compiler=legacy
+kotlin.js.compiler=${compiler_backend}
 org.gradle.jvmargs=-Xmx2g

From dc8e693af3d72954ee238bb54c4d6ccd692d38b3 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Sun, 6 Dec 2020 20:01:41 +0100
Subject: [PATCH 8/8] Updated changelog and README

---
 README.md                              |  5 ++++-
 src/main/resources/META-INF/plugin.xml | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fe53536..ec9516c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
 # KVision Project Wizard
 KVision IntellJ IDEA plugin for new project creation.
 Supported project types:
-* Frontend template
+* Frontend project
 * Ktor fullstack project
 * Spring Boot fullstack project
 * Javalin fullstack project
+* Jooby fullstack project
+* Micronaut fullstack project
+* Vert.x fullstack project
  
  ## Contribution
 You can contribute new project types:
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 1937c11..737d782 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -5,23 +5,24 @@
     <change-notes>
         &lt;i&gt;Version 0.2.2:&lt;/i&gt;
         &lt;ul&gt;
-         &lt;li&gt;Add more detailed description&lt;/li&gt;
+            &lt;li&gt;Add support for all project types&lt;/li&gt;
+            &lt;li&gt;Add an option to choose compiler backend&lt;/li&gt;
         &lt;/ul&gt;
 
         &lt;i&gt;Version 0.2.1:&lt;/i&gt;
         &lt;ul&gt;
-         &lt;li&gt;Add icon and description&lt;/li&gt;
+            &lt;li&gt;Add icon and description&lt;/li&gt;
         &lt;/ul&gt;
 
         &lt;i&gt;Version 0.2.0:&lt;/i&gt;
         &lt;ul&gt;
-         &lt;li&gt;Added spring support&lt;/li&gt;
-         &lt;li&gt;Added run configurations for backendRun and frontendRun&lt;/li&gt;
+            &lt;li&gt;Added spring support&lt;/li&gt;
+            &lt;li&gt;Added run configurations for backendRun and frontendRun&lt;/li&gt;
         &lt;/ul&gt;
 
         &lt;i&gt;Version 0.1.0:&lt;/i&gt;
         &lt;ul&gt;
-         &lt;li&gt;Added support for Ktor&lt;/li&gt;
+            &lt;li&gt;Added support for Ktor&lt;/li&gt;
         &lt;/ul&gt;
     </change-notes>