Merge branch 'webservice' into 'main'

Webservice

See merge request Griefed/ServerPackCreator!560

build.gradle.kts

@@ -42,12 +42,12 @@ allprojects {
 }
 evaluationDependsOnChildren()
 
-project("serverpackcreator-web").tasks.getByName("build").mustRunAfter(
-    project("serverpackcreator-web-frontend").tasks.getByName("build")
+project("serverpackcreator-web").tasks.build.get().mustRunAfter(
+    project("serverpackcreator-web-frontend").tasks.build.get()
 )
 
-project("serverpackcreator-app").tasks.getByName("build").mustRunAfter(
-    project("serverpackcreator-web").tasks.getByName("build")
+project("serverpackcreator-app").tasks.build.get().mustRunAfter(
+    project("serverpackcreator-web").tasks.build.get()
 )
 
 nexusPublishing {

buildSrc/src/main/kotlin/serverpackcreator.java-conventions.gradle.kts

@@ -71,6 +71,13 @@ tasks.clean {
     doFirst {
         cleanup()
     }
+    doLast {
+        delete {
+            fileTree(projectDir.resolve("src/main/resources/static")) {
+                exclude(".gitkeep")
+            }
+        }
+    }
 }
 
 tasks.test {

buildSrc/src/main/kotlin/serverpackcreator.quasar-conventions.gradle.kts

@@ -38,11 +38,3 @@ tasks.getByName("installNode").finalizedBy(
     tasks.getByName("installQuasar")
 )
 
-tasks.register("copyDist", Copy::class) {
-    from(projectDir.resolve("dist/spa"))
-    into(rootDir.resolve("serverpackcreator-web/src/main/resources/static"))
-}
-
-tasks.getByName("build").finalizedBy(
-    tasks.getByName("copyDist")
-)

serverpackcreator-updater/src/main/kotlin/de/griefed/serverpackcreator/updater/MigrationManager.kt

@@ -71,6 +71,7 @@ class MigrationManager(
     private val previous: String = apiProperties.oldVersion()
     private val current: String = apiProperties.apiVersion
     private val alphaBetaDev = ".*(alpha|beta|dev).*".toRegex()
+    private val release = "[0-9]+.[0-9]+.[0-9]+".toRegex()
     val migrationMessages: MutableList<MigrationMessage> = ArrayList(10)
 
     /**
@@ -92,19 +93,18 @@ class MigrationManager(
             log.info("No migrations to execute. Upgrading from alpha, beta or dev version.")
             return
         }
-        if (isOlder(
-                previous, current
-            )
-        ) {
+        if (!current.matches(release)) {
+            log.info("No migrations to execute. Running development branch.")
+            return
+        }
+        if (isOlder(previous, current)) {
             log.info("No migrations to execute. User went back a version. From $previous to $current.")
             return
         }
         if (previous == current) {
             log.info("No migrations to execute. User has not updated.")
         }
-        val migrationMethods = getMigrationMethods(
-            previous, current
-        )
+        val migrationMethods = getMigrationMethods(previous, current)
         if (migrationMethods.isNotEmpty()) {
             for (method in migrationMethods) {
                 log.info("Resolving migrations for: ${toSemantic(method!!.name)}")

serverpackcreator-web-frontend/build.gradle.kts

@@ -1,3 +1,13 @@
 plugins {
     id("serverpackcreator.quasar-conventions")
-}
+}
+
+/*
+tasks.register("copyDist", Copy::class) {
+    from(projectDir.resolve("dist/spa"))
+    into(rootDir.resolve("serverpackcreator-web/src/main/resources/static"))
+}
+
+tasks.build.get().finalizedBy(
+        tasks.getByName("copyDist")
+)*/

serverpackcreator-web-frontend/quasar.conf.js

@@ -83,6 +83,7 @@ module.exports = function (ctx) {
       scopeHoisting: true,
       vueRouterMode: 'hash', // available values: 'hash', 'history'
       showProgress: true,
+      distDir: "../serverpackcreator-web/src/main/resources/static",
       gzip: false,
       analyze: false,
       publicPath: '',