Support latest kotlin wrapper (#2090)

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ okio = "3.3.0"
 serialization = "1.5.0"
 kotlinx-datetime = "0.4.0"
 kotlinx-coroutines = "1.6.4"
-kotlin-wrappers = "1.0.0-pre.490"
+kotlin-wrappers = "1.0.0-pre.523" # 524 is on IR only
 spring-boot = "2.7.10"
 spring-cloud = "3.1.6"
 spring-cloud-kubernetes = "2.1.6"

renovate.json

@@ -21,7 +21,6 @@
       ],
       "excludePackagePatterns": [
         "^org\\.jetbrains\\.kotlin[.:]",
-        "^org\\.jetbrains\\.kotlin-wrappers\\:kotlin-wrappers-bom",
         "^org\\.neo4j\\:neo4j-ogm-bolt-driver",
         "^org\\.neo4j\\:neo4j-ogm-core",
         "^org\\.neo4j\\.driver\\:neo4j-java-driver"
@@ -52,15 +51,6 @@
       "groupName": "all non-major dependencies (except core Kotlin)",
       "groupSlug": "all-minor-patch"
     },
-    {
-      "managers": ["gradle"],
-      "matchPackagePatterns": [
-        "^org\\.jetbrains\\.kotlin-wrappers\\:kotlin-wrappers-bom"
-      ],
-      "allowedVersions": "<=1.0.0-pre.490",
-      "groupName": "all non-major dependencies (except core Kotlin)",
-      "groupSlug": "all-minor-patch"
-    },
     {
       "managers": ["gradle"],
       "matchPackagePatterns": [

save-cloud-common/build.gradle.kts

@@ -25,7 +25,10 @@ kotlin {
     jvmToolchain {
         this.languageVersion.set(JavaLanguageVersion.of(Versions.jdk))
     }
-    js(BOTH).browser()
+    js(BOTH) {
+        browser()
+        useCommonJs()
+    }
 
     // setup native compilation
     linuxX64()

save-frontend/build.gradle.kts

@@ -57,6 +57,9 @@ kotlin {
                 }
             }
         }
+        // kotlin-wrapper migrates to commonjs and missed @JsNonModule annotations
+        // https://github.com/JetBrains/kotlin-wrappers/issues/1935
+        useCommonJs()
         binaries.executable()  // already default for LEGACY, but explicitly needed for IR
         sourceSets.all {
             languageSettings.optIn("kotlin.RequiresOptIn")

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt

@@ -9,7 +9,6 @@ import com.saveourtool.save.domain.Role
 import com.saveourtool.save.frontend.components.*
 import com.saveourtool.save.frontend.components.basic.scrollToTopButton
 import com.saveourtool.save.frontend.components.topbar.topBar
-import com.saveourtool.save.frontend.components.views.*
 import com.saveourtool.save.frontend.externals.modal.ReactModal
 import com.saveourtool.save.frontend.http.getUser
 import com.saveourtool.save.frontend.routing.basicRouting
@@ -22,8 +21,7 @@ import csstype.ClassName
 import react.*
 import react.dom.client.createRoot
 import react.dom.html.ReactHTML.div
-import react.router.Navigate
-import react.router.Route
+import react.router.*
 import react.router.dom.HashRouter
 import web.dom.document
 import web.html.HTMLElement
@@ -166,12 +164,12 @@ inline fun <reified T : Enum<T>> ChildrenBuilder.createRoutersWithPathAndEachLis
     routeElement: FC<Props>
 ) {
     enumValues<T>().map { it.name.lowercase() }.forEach { item ->
-        Route {
+        PathRoute {
             path = "$basePath/$item"
             element = routeElement.create()
         }
     }
-    Route {
+    PathRoute {
         path = basePath
         element = routeElement.create()
     }

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt

@@ -13,11 +13,11 @@ import csstype.ClassName
 import js.core.jso
 import org.w3c.fetch.Response
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import react.dom.html.ReactHTML.span
+import web.html.ButtonType
 
 import kotlinx.browser.window
 
@@ -35,7 +35,7 @@ val ringLoader = ringLoader(jso {
  * Context to store data about current request such as errors and isLoading flag.
  */
 @Suppress("TYPE_ALIAS")
-val requestStatusContext: Context<RequestStatusContext> = createContext()
+val requestStatusContext: Context<RequestStatusContext?> = createContext()
 
 /**
  * Component that displays generic warning about unsuccessful request based on info in [requestStatusContext].

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ContestEnroller.kt

@@ -17,12 +17,12 @@ import csstype.ClassName
 import org.w3c.fetch.Headers
 import react.*
 import react.dom.aria.ariaLabel
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h5
 import react.dom.html.ReactHTML.option
 import react.dom.html.ReactHTML.select
+import web.html.ButtonType
 
 import kotlinx.coroutines.await
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/FiltersRow.kt

@@ -13,14 +13,14 @@ import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
 import csstype.ClassName
 import react.FC
 import react.Props
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.input
 import react.dom.html.ReactHTML.option
 import react.dom.html.ReactHTML.select
 import react.useEffect
 import react.useState
+import web.html.ButtonType
 import web.html.InputType
 
 val testExecutionFiltersRow = testExecutionFiltersRow()

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ManageUserRoleCard.kt

@@ -17,11 +17,11 @@ import com.saveourtool.save.utils.getHighestRole
 
 import csstype.ClassName
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.option
 import react.dom.html.ReactHTML.select
+import web.html.ButtonType
 
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectInfo.kt

@@ -16,7 +16,6 @@ import com.saveourtool.save.frontend.utils.*
 import csstype.ClassName
 import react.FC
 import react.Props
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.form
@@ -25,6 +24,7 @@ import react.dom.html.ReactHTML.label
 import react.useEffect
 import react.useRef
 import react.useState
+import web.html.ButtonType
 import web.html.InputType
 
 import kotlinx.serialization.encodeToString

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TestResourcesSelection.kt

@@ -17,11 +17,11 @@ import com.saveourtool.save.testsuite.TestSuiteVersioned
 
 import csstype.ClassName
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.input
 import react.dom.html.ReactHTML.label
+import web.html.ButtonType
 
 val testResourcesSelection = prepareTestResourcesSelection()
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/contests/ContestCreationComponent.kt

@@ -19,10 +19,10 @@ import com.saveourtool.save.validation.isValidName
 import csstype.ClassName
 import org.w3c.fetch.Response
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.form
+import web.html.ButtonType
 
 import kotlin.js.json
 import kotlinx.datetime.*

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/fileuploader/HeavyFileUploader.kt

@@ -20,7 +20,6 @@ import js.core.jso
 import org.w3c.fetch.Response
 import react.*
 import react.dom.aria.AriaRole
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.a
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
@@ -32,6 +31,7 @@ import react.dom.html.ReactHTML.select
 import react.dom.html.ReactHTML.strong
 import react.dom.html.ReactHTML.ul
 import web.file.File
+import web.html.ButtonType
 import web.html.InputType
 
 import kotlinx.browser.window

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/organizations/GitWindow.kt

@@ -14,10 +14,10 @@ import com.saveourtool.save.frontend.utils.*
 
 import csstype.ClassName
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.input
+import web.html.ButtonType
 import web.html.InputType
 
 /**

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/organizations/ManageGitCredentialsCard.kt

@@ -20,11 +20,11 @@ import org.w3c.fetch.Response
 import react.FC
 import react.Props
 import react.StateSetter
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.hr
 import react.useState
+import web.html.ButtonType
 
 typealias RequestWithDependency<R> = Triple<R, StateSetter<R>, () -> Unit>
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/organizations/OrganizationToolsMenu.kt

@@ -19,14 +19,15 @@ import com.saveourtool.save.frontend.utils.*
 import com.saveourtool.save.frontend.utils.isSuperAdmin
 import com.saveourtool.save.info.UserInfo
 import com.saveourtool.save.validation.FrontendRoutes
+
 import csstype.ClassName
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.a
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.td
 import react.router.dom.Link
+import web.html.ButtonType
 
 val organizationToolsMenu = organizationToolsMenu()
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/projects/ProjectInfoMenu.kt

@@ -14,12 +14,12 @@ import com.saveourtool.save.validation.FrontendRoutes
 
 import csstype.ClassName
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.a
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.li
 import react.dom.html.ReactHTML.ul
+import web.html.ButtonType
 
 import kotlinx.browser.window
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/projects/ProjectSettingsMenu.kt

@@ -16,7 +16,6 @@ import csstype.ClassName
 import org.w3c.fetch.Response
 import react.*
 import react.dom.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.form
@@ -26,6 +25,7 @@ import react.dom.html.ReactHTML.label
 import react.dom.html.ReactHTML.option
 import react.dom.html.ReactHTML.select
 import react.router.useNavigate
+import web.html.ButtonType
 import web.html.HTMLInputElement
 import web.html.InputType
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/testsuiteselector/TestSuiteSelector.kt

@@ -18,10 +18,10 @@ import com.saveourtool.save.testsuite.TestSuiteVersioned
 import csstype.ClassName
 import react.*
 import react.dom.aria.ariaLabel
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h5
+import web.html.ButtonType
 
 val testSuiteSelector = testSuiteSelector()
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/testsuiteselector/TestSuiteSelectorBrowserMode.kt

@@ -12,11 +12,11 @@ import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
 import com.saveourtool.save.frontend.utils.*
 import com.saveourtool.save.frontend.utils.noopResponseHandler
 import com.saveourtool.save.testsuite.TestSuiteVersioned
+
 import csstype.ClassName
 import react.*
 import react.dom.aria.AriaRole
 import react.dom.aria.ariaLabel
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.a
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
@@ -25,6 +25,7 @@ import react.dom.html.ReactHTML.li
 import react.dom.html.ReactHTML.nav
 import react.dom.html.ReactHTML.ol
 import react.dom.html.ReactHTML.ul
+import web.html.ButtonType
 
 val testSuiteSelectorBrowserMode = testSuiteSelectorBrowserMode()
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/testsuitessources/TestSuiteSourceUpsertComponent.kt

@@ -23,11 +23,11 @@ import csstype.ClassName
 import react.*
 import react.dom.aria.AriaRole
 import react.dom.aria.ariaLabel
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.a
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h5
+import web.html.ButtonType
 
 import kotlin.js.json
 

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/testsuitessources/fetch/TestSuitesSourceFetcher.kt

@@ -16,12 +16,13 @@ import com.saveourtool.save.frontend.externals.fontawesome.*
 import com.saveourtool.save.frontend.utils.*
 import com.saveourtool.save.testsuite.TestSuitesSourceDto
 import com.saveourtool.save.testsuite.TestSuitesSourceFetchMode
+
 import csstype.ClassName
 import js.core.jso
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
+import web.html.ButtonType
 
 @Suppress("GENERIC_VARIABLE_WRONG_DECLARATION")
 private val innerTestSuitesSourceFetcher = innerTestSuitesSourceFetcher()

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/modal/ModalBuilder.kt

@@ -11,12 +11,12 @@ import com.saveourtool.save.frontend.utils.buttonBuilder
 import csstype.ClassName
 import react.ChildrenBuilder
 import react.dom.aria.ariaLabel
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import react.dom.html.ReactHTML.h5
 import react.dom.html.ReactHTML.span
+import web.html.ButtonType
 
 /**
  * Universal function to create modals with bootstrap styles inside react modals.

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/PagingControl.kt

@@ -8,7 +8,6 @@ import csstype.ClassName
 import react.ChildrenBuilder
 import react.StateSetter
 import react.dom.aria.ariaDescribedBy
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.em
@@ -19,6 +18,7 @@ import react.dom.html.ReactHTML.select
 import tanstack.table.core.RowData
 import tanstack.table.core.Table
 import tanstack.table.core.Updater
+import web.html.ButtonType
 import web.html.InputType
 
 /**

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBar.kt

@@ -12,10 +12,10 @@ import com.saveourtool.save.info.UserInfo
 import csstype.ClassName
 import react.*
 import react.dom.html.ButtonHTMLAttributes
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML.button
 import react.dom.html.ReactHTML.nav
 import react.router.useLocation
+import web.html.ButtonType
 import web.html.HTMLButtonElement
 
 /**