Updated versions

vladleesi · Apr 1, 2024 · 02e69e6 · 02e69e6
1 parent 5d59e8e
commit 02e69e6
Show file tree

Hide file tree

Showing 11 changed files with 424 additions and 550 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    kotlin("js") version "1.8.21"
+    kotlin("js") version "1.9.23"
 }
 
-group = "io.github.vladleesi"
+group = "dev.vladleesi"
 version = "1.0-SNAPSHOT"
 
 repositories {
@@ -11,11 +11,11 @@ repositories {
 
 dependencies {
     // React, React DOM + Wrappers
-    implementation("org.jetbrains.kotlin-wrappers:kotlin-react:18.2.0-pre.557")
-    implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:18.2.0-pre.557")
-    implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion:11.11.0-pre.557")
-    implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router:6.11.2-pre.557")
-    implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom:6.11.2-pre.557")
+    implementation("org.jetbrains.kotlin-wrappers:kotlin-react:18.2.0-pre.722")
+    implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:18.2.0-pre.722")
+    implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion:11.11.4-pre.722")
+    implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router:6.22.1-pre.722")
+    implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom:6.22.1-pre.722")
 
     // Test
     testImplementation(kotlin("test"))

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,3 +1,2 @@
-
 rootProject.name = "vladleesi-gh-pages"
 
diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt
@@ -1,9 +1,9 @@
-import js.core.jso
+import js.objects.jso
 import pages.*
-import react.VFC
+import react.FC
 import react.create
 import react.dom.client.createRoot
-import react.router.RouterProvider
+import react.router.dom.RouterProvider
 import react.router.dom.createHashRouter
 import style.appStyle
 import style.faviconLink
@@ -42,10 +42,10 @@ private val appRouter = createHashRouter(
             element = ScanmatePage.create()
             errorElement = Error.create()
         }
-    ),
+    )
 )
 
-private val App = VFC {
+private val App = FC {
     RouterProvider {
         router = appRouter
     }
@@ -58,7 +58,7 @@ fun main() {
         appendChild(appStyle)
     }
 
-    val root = document.createElement("div")
+    val root = document.createElement("root")
         .also(document.body::appendChild)
 
     createRoot(root)

diff --git a/src/main/kotlin/pages/Braindance.kt b/src/main/kotlin/pages/Braindance.kt
@@ -1,7 +1,7 @@
 package pages
 
 import emotion.react.css
-import react.VFC
+import react.FC
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import web.cssom.AlignItems
@@ -10,7 +10,7 @@ import web.cssom.FlexDirection
 import web.cssom.JustifyContent
 
 
-val BraindancePage = VFC {
+val BraindancePage = FC {
     div {
         css {
             justifyContent = JustifyContent.center

diff --git a/src/main/kotlin/pages/Error.kt b/src/main/kotlin/pages/Error.kt
@@ -1,9 +1,9 @@
 package pages
 
-import react.VFC
+import react.FC
 import react.dom.html.ReactHTML
 
-val Error = VFC {
+val Error = FC {
     ReactHTML.h1 {
         +"Unknown error"
     }

diff --git a/src/main/kotlin/pages/Factastic.kt b/src/main/kotlin/pages/Factastic.kt
@@ -1,15 +1,15 @@
 package pages
 
 import emotion.react.css
-import react.VFC
+import react.FC
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import web.cssom.AlignItems
 import web.cssom.Display
 import web.cssom.FlexDirection
 import web.cssom.JustifyContent
 
-val FactasticPage = VFC {
+val FactasticPage = FC {
     div {
         css {
             justifyContent = JustifyContent.center

diff --git a/src/main/kotlin/pages/Home.kt b/src/main/kotlin/pages/Home.kt
@@ -2,7 +2,7 @@ package pages
 
 import emotion.react.css
 import react.ChildrenBuilder
-import react.VFC
+import react.FC
 import react.dom.html.ReactHTML.a
 import react.dom.html.ReactHTML.b
 import react.dom.html.ReactHTML.div
@@ -14,7 +14,7 @@ import style.*
 import web.cssom.*
 import web.window.WindowTarget
 
-val HomePage = VFC {
+val HomePage = FC {
     val maxContentWidth = 768.px
 
     div {

diff --git a/src/main/kotlin/pages/Kutilicious.kt b/src/main/kotlin/pages/Kutilicious.kt
@@ -1,15 +1,15 @@
 package pages
 
 import emotion.react.css
-import react.VFC
+import react.FC
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import web.cssom.AlignItems
 import web.cssom.Display
 import web.cssom.FlexDirection
 import web.cssom.JustifyContent
 
-val KutiliciousPage = VFC {
+val KutiliciousPage = FC {
     div {
         css {
             justifyContent = JustifyContent.center

diff --git a/src/main/kotlin/pages/Scanmate.kt b/src/main/kotlin/pages/Scanmate.kt
@@ -1,15 +1,15 @@
 package pages
 
 import emotion.react.css
-import react.VFC
+import react.FC
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import web.cssom.AlignItems
 import web.cssom.Display
 import web.cssom.FlexDirection
 import web.cssom.JustifyContent
 
-val ScanmatePage = VFC {
+val ScanmatePage = FC {
     div {
         css {
             justifyContent = JustifyContent.center

diff --git a/src/main/kotlin/pages/YetAnotherCalculator.kt b/src/main/kotlin/pages/YetAnotherCalculator.kt
@@ -1,15 +1,15 @@
 package pages
 
 import emotion.react.css
-import react.VFC
+import react.FC
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h2
 import web.cssom.AlignItems
 import web.cssom.Display
 import web.cssom.FlexDirection
 import web.cssom.JustifyContent
 
-val YetAnotherCalculatorPage = VFC {
+val YetAnotherCalculatorPage = FC {
     div {
         css {
             justifyContent = JustifyContent.center