turtton · turtton · Jun 4, 2023 · May 19, 2023 · May 25, 2023 · May 25, 2023
diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("multiplatform") version "1.8.10"
-    kotlin("plugin.serialization") version "1.8.10"
+    kotlin("multiplatform") version "1.8.21"
+    kotlin("plugin.serialization") version "1.8.21"
     id("org.jmailen.kotlinter") version "3.14.0"
 }
 
@@ -36,16 +36,16 @@ kotlin {
         }
         val jsMain by getting {
             dependencies {
-                implementation(enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.528"))
+                implementation(enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.554"))
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react")
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion")
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom")
 
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
 
-                implementation("io.github.xxfast:kstore:0.5.0")?.version?.also {
+                implementation("io.github.xxfast:kstore:0.6.0")?.version?.also {
                     implementation("io.github.xxfast:kstore-file:$it")
                 }
 

diff --git a/kotlin/gradle/wrapper/gradle-wrapper.jar b/kotlin/gradle/wrapper/gradle-wrapper.jar
diff --git a/kotlin/gradle/wrapper/gradle-wrapper.properties b/kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlin/gradlew b/kotlin/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# 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
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

diff --git a/kotlin/kotlin-js-store/yarn.lock b/kotlin/kotlin-js-store/yarn.lock
diff --git a/kotlin/src/jsMain/kotlin/Cache.kt b/kotlin/src/jsMain/kotlin/Cache.kt
@@ -1,6 +1,5 @@
 @file:OptIn(ExperimentalJsExport::class)
 
-import csstype.ClassName
 import external.CanvasRender
 import external.CodeEncoder
 import external.MermaidRender
@@ -14,13 +13,13 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.promise
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import markdown.convertMarkdownToReactElement
 import react.FC
 import react.Props
 import react.dom.html.ReactHTML.img
+import web.cssom.ClassName
 
 val cacheScope = CoroutineScope(Dispatchers.Default + SupervisorJob())
 

diff --git a/kotlin/src/jsMain/kotlin/markdown/lexer/_ObsidianLexer.kt b/kotlin/src/jsMain/kotlin/markdown/lexer/_ObsidianLexer.kt
@@ -1,3 +1,4 @@
+@file:Suppress("ktlint")
 package markdown.lexer
 
 import markdown.type.ObsidianTokenTypes.DOLLAR

diff --git a/kotlin/src/jsMain/kotlin/markdown/processor/element/CodeFenceElementProcessor.kt b/kotlin/src/jsMain/kotlin/markdown/processor/element/CodeFenceElementProcessor.kt
@@ -1,6 +1,5 @@
 package markdown.processor.element
 
-import csstype.ClassName
 import external.CodeEncoder
 import external.MermaidRender
 import js.core.jso
@@ -21,6 +20,7 @@ import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.pre
 import react.useEffect
 import react.useState
+import web.cssom.ClassName
 import web.html.HTMLElement
 
 /**

diff --git a/kotlin/src/jsMain/kotlin/markdown/processor/element/ObsidianEmbedLinkProcessor.kt b/kotlin/src/jsMain/kotlin/markdown/processor/element/ObsidianEmbedLinkProcessor.kt
@@ -4,7 +4,6 @@ import DependencyData
 import FileNameInfo
 import FileNameString
 import SlugString
-import csstype.ClassName
 import embedTargets
 import external.CodeEncoder
 import external.MermaidRender
@@ -23,6 +22,7 @@ import react.dom.html.ReactHTML.audio
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.img
 import react.dom.html.ReactHTML.strong
+import web.cssom.ClassName
 import web.html.HTMLElement
 
 /**

diff --git a/kotlin/src/jsMain/kotlin/markdown/processor/element/OrderedListElementProcessor.kt b/kotlin/src/jsMain/kotlin/markdown/processor/element/OrderedListElementProcessor.kt
@@ -19,7 +19,8 @@ import web.html.HTMLOListElement
  */
 class OrderedListElementProcessor<Parent : HTMLAttributes<HTMLElement>> :
     SimpleElementNodeProcessor<
-        Parent, HTMLOListElement,
+        Parent,
+        HTMLOListElement,
         OlHTMLAttributes<HTMLOListElement>,
         IntrinsicType<OlHTMLAttributes<HTMLOListElement>>,
         >(ol) {

diff --git a/kotlin/src/jsMain/kotlin/markdown/processor/element/TexElementProcessor.kt b/kotlin/src/jsMain/kotlin/markdown/processor/element/TexElementProcessor.kt
@@ -1,6 +1,5 @@
 package markdown.processor.element
 
-import csstype.ClassName
 import external.TexRender
 import js.core.jso
 import markdown.LeafVisitor
@@ -13,6 +12,7 @@ import react.ChildrenBuilder
 import react.IntrinsicType
 import react.dom.html.HTMLAttributes
 import react.dom.html.ReactHTML.p
+import web.cssom.ClassName
 import web.html.HTMLElement
 
 class TexElementProcessor<Parent>(private val renderTex: TexRender?) : NodeProcessor<IntrinsicType<HTMLAttributes<HTMLElement>>, Parent>

diff --git a/kotlin/src/jsTest/kotlin/markdown/TestObsidianElement.kt b/kotlin/src/jsTest/kotlin/markdown/TestObsidianElement.kt
@@ -1,6 +1,5 @@
 package markdown
 
-import csstype.ClassName
 import kotlin.test.Test
 import mysticfall.kotlin.react.test.ReactTestSupport
 import react.dom.html.ReactHTML.a
@@ -10,6 +9,7 @@ import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.li
 import react.dom.html.ReactHTML.strong
 import react.dom.html.ReactHTML.ul
+import web.cssom.ClassName
 
 class TestObsidianElement : ReactTestSupport {
     @Test

diff --git a/kotlin/src/jsTest/kotlin/markdown/TestReactElementGenerator.kt b/kotlin/src/jsTest/kotlin/markdown/TestReactElementGenerator.kt
@@ -1,6 +1,5 @@
 package markdown
 
-import csstype.ClassName
 import js.core.jso
 import kotlin.test.Ignore
 import kotlin.test.Test
@@ -27,6 +26,7 @@ import react.dom.html.ReactHTML.table
 import react.dom.html.ReactHTML.td
 import react.dom.html.ReactHTML.tr
 import react.dom.html.ReactHTML.ul
+import web.cssom.ClassName
 
 /**
  * Related [CommonMarkSpecTest.kt](https://github.com/JetBrains/markdown/blob/master/src/commonTest/kotlin/org/intellij/markdown/CommonMarkSpecTest.kt)

diff --git a/package.json b/package.json
@@ -59,5 +59,5 @@
     "tailwindcss": "^3.2.4",
     "typescript": "^5.0.0"
   },
-  "packageManager": "pnpm@8.1.0"
+  "packageManager": "pnpm@8.5.1"
 }