diff --git a/client/build.gradle.kts b/client/build.gradle.kts index acfc0b72d1..561e129d46 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -208,12 +208,12 @@ tasks { } tasks { -// formatKotlinJsMain { -// dependsOn("kspKotlinJs") -// } -// lintKotlinJsMain { -// dependsOn("kspKotlinJs") -// } + formatKotlinJsMain { + dependsOn("kspKotlinJs") + } + lintKotlinJsMain { + dependsOn("kspKotlinJs") + } } artifacts { diff --git a/client/components/build.gradle.kts b/client/components/build.gradle.kts index fc59c7cd50..945ee18f0d 100644 --- a/client/components/build.gradle.kts +++ b/client/components/build.gradle.kts @@ -16,12 +16,12 @@ kotlin { } tasks { -// formatKotlinJsMain { -// dependsOn("kspKotlinJs") -// } -// lintKotlinJsMain { -// dependsOn("kspKotlinJs") -// } + formatKotlinJsMain { + dependsOn("kspKotlinJs") + } + lintKotlinJsMain { + dependsOn("kspKotlinJs") + } } dependencies { diff --git a/client/components/external/build.gradle.kts b/client/components/external/build.gradle.kts index 266ea40b1b..f2dc44303a 100644 --- a/client/components/external/build.gradle.kts +++ b/client/components/external/build.gradle.kts @@ -22,12 +22,12 @@ kotlin { } tasks { -// formatKotlinJsMain { -// dependsOn("kspKotlinJs") -// } -// lintKotlinJsMain { -// dependsOn("kspKotlinJs") -// } + formatKotlinJsMain { + dependsOn("kspKotlinJs") + } + lintKotlinJsMain { + dependsOn("kspKotlinJs") + } } dependencies { diff --git a/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/NotificationButton.kt b/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/NotificationButton.kt index 799e5a2b00..64a87cb733 100644 --- a/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/NotificationButton.kt +++ b/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/NotificationButton.kt @@ -32,8 +32,7 @@ private fun saveNotificationLog(updatedThing: Array) { localStorage.setItem("notification-log", JSON.stringify(updatedThing)) } -private fun loadNotificationLog() = - localStorage.getItem("notification-log")?.let { JSON.parse>(it) } ?: emptyArray() +private fun loadNotificationLog() = localStorage.getItem("notification-log")?.let { JSON.parse>(it) } ?: emptyArray() val NotificationButton by nfc { val recentInfoMd = loadMarkdownString("recent-info") diff --git a/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/external/marked/External.kt b/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/external/marked/External.kt index 7b86bde254..b181f13754 100644 --- a/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/external/marked/External.kt +++ b/client/components/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/external/marked/External.kt @@ -7,5 +7,4 @@ external interface Marked { fun parse(markdown: String): String } - fun parse(markdown: String): String = marked.parse(markdown) diff --git a/client/components/src/jsTest/kotlin/com/zegreatrob/coupling/client/components/stats/PairFrequencyControlsTest.kt b/client/components/src/jsTest/kotlin/com/zegreatrob/coupling/client/components/stats/PairFrequencyControlsTest.kt index 94a1a5de73..b411a4ca88 100644 --- a/client/components/src/jsTest/kotlin/com/zegreatrob/coupling/client/components/stats/PairFrequencyControlsTest.kt +++ b/client/components/src/jsTest/kotlin/com/zegreatrob/coupling/client/components/stats/PairFrequencyControlsTest.kt @@ -1,6 +1,5 @@ package com.zegreatrob.coupling.client.components.stats -//import com.zegreatrob.coupling.client.components.stats.Visualization.Heatmap import com.zegreatrob.coupling.json.GqlContributionWindow import com.zegreatrob.coupling.model.Contribution import com.zegreatrob.coupling.model.ContributionReport diff --git a/client/src/jsMain/kotlin/com/zegreatrob/coupling/client/AboutPage.kt b/client/src/jsMain/kotlin/com/zegreatrob/coupling/client/AboutPage.kt index 5d16d93f49..1bc24c4fa2 100644 --- a/client/src/jsMain/kotlin/com/zegreatrob/coupling/client/AboutPage.kt +++ b/client/src/jsMain/kotlin/com/zegreatrob/coupling/client/AboutPage.kt @@ -30,8 +30,9 @@ import web.cssom.px val AboutPage by nfc { aboutPageContent { div { - dangerouslySetInnerHTML = jso { __html = - parse(loadMarkdownString("About")) + dangerouslySetInnerHTML = jso { + __html = + parse(loadMarkdownString("About")) } } } diff --git a/coupling-plugins/build.gradle.kts b/coupling-plugins/build.gradle.kts index a4be6090e2..5dda8c8eb7 100644 --- a/coupling-plugins/build.gradle.kts +++ b/coupling-plugins/build.gradle.kts @@ -9,7 +9,7 @@ repositories { plugins { `kotlin-dsl` id("java-gradle-plugin") -// alias(libs.plugins.org.jmailen.kotlinter) + alias(libs.plugins.org.jmailen.kotlinter) alias(libs.plugins.com.github.ben.manes.versions) alias(libs.plugins.nl.littlerobots.version.catalog.update) } @@ -33,7 +33,7 @@ dependencies { implementation(libs.org.apache.logging.log4j.log4j.iostreams) implementation(libs.org.jetbrains.kotlin.kotlin.stdlib) implementation(libs.org.jetbrains.kotlin.plugin.serialization.gradle.plugin) -// implementation(libs.org.jmailen.gradle.kotlinter.gradle) + implementation(libs.org.jmailen.gradle.kotlinter.gradle) implementation(libs.org.slf4j.slf4j.api) implementation(platform(libs.com.zegreatrob.jsmints.jsmints.bom)) implementation(platform(libs.com.zegreatrob.testmints.testmints.bom)) diff --git a/coupling-plugins/gradle/libs.versions.toml b/coupling-plugins/gradle/libs.versions.toml index ad72892f24..a3ee5a841c 100644 --- a/coupling-plugins/gradle/libs.versions.toml +++ b/coupling-plugins/gradle/libs.versions.toml @@ -1,24 +1,24 @@ [versions] kotlin = "2.1.0" ktlint = "0.45.2" -org-apache-logging-log4j = "2.24.2" +org-apache-logging-log4j = "2.24.3" org-jlleitschuh-gradle-ktlint = "11.0.0" [libraries] com-fasterxml-jackson-core-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2" com-github-ben-manes-gradle-versions-plugin = "com.github.ben-manes:gradle-versions-plugin:0.51.0" -com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.97" +com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.99" com-zegreatrob-testmints-testmints-bom = "com.zegreatrob.testmints:testmints-bom:12.1.33" -com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.30" +com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.32" org-apache-logging-log4j-log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "org-apache-logging-log4j" } org-apache-logging-log4j-log4j-iostreams = { module = "org.apache.logging.log4j:log4j-iostreams", version.ref = "org-apache-logging-log4j" } org-jetbrains-kotlin-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } org-jetbrains-kotlin-plugin-serialization-gradle-plugin = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:1.9.22" org-jlleitschuh-gradle-ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "org-jlleitschuh-gradle-ktlint" } -org-jmailen-gradle-kotlinter-gradle = "org.jmailen.gradle:kotlinter-gradle:4.5.0" +org-jmailen-gradle-kotlinter-gradle = "org.jmailen.gradle:kotlinter-gradle:5.0.1" org-slf4j-slf4j-api = "org.slf4j:slf4j-api:2.0.16" [plugins] com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0" nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.5" -org-jmailen-kotlinter = "org.jmailen.kotlinter:4.5.0" +org-jmailen-kotlinter = "org.jmailen.kotlinter:5.0.1" diff --git a/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/linter.gradle.kts b/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/linter.gradle.kts index 279236b6a3..6de612bda3 100644 --- a/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/linter.gradle.kts +++ b/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/linter.gradle.kts @@ -1,23 +1,23 @@ package com.zegreatrob.coupling.plugins -//import org.jmailen.gradle.kotlinter.tasks.FormatTask -//import org.jmailen.gradle.kotlinter.tasks.LintTask +import org.jmailen.gradle.kotlinter.tasks.FormatTask +import org.jmailen.gradle.kotlinter.tasks.LintTask repositories { mavenCentral() } plugins { -// id("org.jmailen.kotlinter") + id("org.jmailen.kotlinter") } afterEvaluate { -// tasks { -// withType { -// exclude { spec -> spec.file.absolutePath.contains("generated") } -// } -// withType { -// exclude { spec -> spec.file.absolutePath.contains("generated") } -// } -// } + tasks { + withType { + exclude { spec -> spec.file.absolutePath.contains("generated") } + } + withType { + exclude { spec -> spec.file.absolutePath.contains("generated") } + } + } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 54d256ac17..f8cf388926 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,12 +3,12 @@ com-benasher44-uuid = "com.benasher44:uuid:0.8.4" com-fasterxml-jackson-core-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2" com-github-ajalt-clikt-clikt = "com.github.ajalt.clikt:clikt:5.0.2" com-lemonappdev-konsist = "com.lemonappdev:konsist:0.17.3" -com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.97" +com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.99" com-zegreatrob-testmints-testmints-bom = "com.zegreatrob.testmints:testmints-bom:12.1.33" -com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.30" +com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.32" io-github-oshai-kotlin-logging = "io.github.oshai:kotlin-logging:7.0.3" -io-ktor-ktor-bom = "io.ktor:ktor-bom:3.0.1" -org-jetbrains-kotlin-wrappers-kotlin-wrappers-bom = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.851" +io-ktor-ktor-bom = "io.ktor:ktor-bom:3.0.2" +org-jetbrains-kotlin-wrappers-kotlin-wrappers-bom = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.852" org-jetbrains-kotlinx-kotlinx-coroutines-bom = "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0" org-jetbrains-kotlinx-kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1" org-jetbrains-kotlinx-kotlinx-serialization-bom = "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3" @@ -17,8 +17,8 @@ org-kotools-types = "org.kotools:types:4.5.3" org-slf4j-slf4j-simple = "org.slf4j:slf4j-simple:2.0.16" [plugins] -com-avast-gradle-docker-compose = "com.avast.gradle.docker-compose:0.17.11" +com-avast-gradle-docker-compose = "com.avast.gradle.docker-compose:0.17.12" com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0" com-github-sghill-distribution-sha = "com.github.sghill.distribution-sha:0.4.0" -com-zegreatrob-tools-digger = "com.zegreatrob.tools.digger:1.5.30" +com-zegreatrob-tools-digger = "com.zegreatrob.tools.digger:1.5.32" nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.5" diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index e4cb25ef93..27d0b280f7 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -153,17 +153,17 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-apigatewaymanagementapi@~3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-apigatewaymanagementapi/-/client-apigatewaymanagementapi-3.709.0.tgz#c121a9c1d48815362618df58ab23d3cb21aeb7de" - integrity sha512-dY7aJ+52C+OO3ZiUpPgBu+tWsrZNjlILXwo3TXgrzAdqO+PcbwmJRd/f3vZk5uXYytw9Pdq777oh3YIbYRl8OA== +"@aws-sdk/client-apigatewaymanagementapi@~3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-apigatewaymanagementapi/-/client-apigatewaymanagementapi-3.712.0.tgz#b42130a1ea21ee3f92663b35418b275963f8f66e" + integrity sha512-4HtFKfQQeqZq5W6kfDjCBNiVrdzhw78CZ6e4SPxo3d7KYCR79w6jZmCEWl9KD5gyTzxfeucNV9C2/VwU7jD/Ew== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.709.0" - "@aws-sdk/client-sts" "3.709.0" + "@aws-sdk/client-sso-oidc" "3.712.0" + "@aws-sdk/client-sts" "3.712.0" "@aws-sdk/core" "3.709.0" - "@aws-sdk/credential-provider-node" "3.709.0" + "@aws-sdk/credential-provider-node" "3.712.0" "@aws-sdk/middleware-host-header" "3.709.0" "@aws-sdk/middleware-logger" "3.709.0" "@aws-sdk/middleware-recursion-detection" "3.709.0" @@ -172,7 +172,7 @@ "@aws-sdk/types" "3.709.0" "@aws-sdk/util-endpoints" "3.709.0" "@aws-sdk/util-user-agent-browser" "3.709.0" - "@aws-sdk/util-user-agent-node" "3.709.0" + "@aws-sdk/util-user-agent-node" "3.712.0" "@smithy/config-resolver" "^3.0.13" "@smithy/core" "^2.5.5" "@smithy/fetch-http-handler" "^4.1.2" @@ -249,17 +249,17 @@ tslib "^2.6.2" uuid "^9.0.1" -"@aws-sdk/client-dynamodb@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-dynamodb/-/client-dynamodb-3.709.0.tgz#589cfab9d27f7d0d2056f72e4674315ccd98b6bc" - integrity sha512-p/GVuEgfPccFUm5lxr7EPi5gQAsUO4SDdKcIV+v/dNwtH2SXEgnFN0o1TEIJtuVY3BsQyXyR1aMjeQ81O832kw== +"@aws-sdk/client-dynamodb@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-dynamodb/-/client-dynamodb-3.712.0.tgz#a81f6c1dd1f296311867080657251460084dbb83" + integrity sha512-BCIKfjkItIM8eP6/QOP+DD89xYLw0jTTgErSMq6tmSGf4PKtVk3VV4GyKqEm9vKBzbz0/7068YADKALd5Uv4nA== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.709.0" - "@aws-sdk/client-sts" "3.709.0" + "@aws-sdk/client-sso-oidc" "3.712.0" + "@aws-sdk/client-sts" "3.712.0" "@aws-sdk/core" "3.709.0" - "@aws-sdk/credential-provider-node" "3.709.0" + "@aws-sdk/credential-provider-node" "3.712.0" "@aws-sdk/middleware-endpoint-discovery" "3.709.0" "@aws-sdk/middleware-host-header" "3.709.0" "@aws-sdk/middleware-logger" "3.709.0" @@ -269,7 +269,7 @@ "@aws-sdk/types" "3.709.0" "@aws-sdk/util-endpoints" "3.709.0" "@aws-sdk/util-user-agent-browser" "3.709.0" - "@aws-sdk/util-user-agent-node" "3.709.0" + "@aws-sdk/util-user-agent-node" "3.712.0" "@smithy/config-resolver" "^3.0.13" "@smithy/core" "^2.5.5" "@smithy/fetch-http-handler" "^4.1.2" @@ -352,17 +352,17 @@ "@smithy/util-waiter" "^3.1.5" tslib "^2.6.2" -"@aws-sdk/client-lambda@~3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.709.0.tgz#7f2d32e9f75f4e6847d6ede3362a5f544208e913" - integrity sha512-MKnx5n7/Wp4qk+Wd1nJQGJ/520rNJDUnBbHTY3x8iPyeKK+8fNy25hWi0lV3gsHhTDvAcVb7UgSSJ5qNVec0GA== +"@aws-sdk/client-lambda@~3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.712.0.tgz#3a0f80c07d2cbdfabec281dd74ac7fbedf736e8b" + integrity sha512-vGTnWXQkWx+dfqS6wso+nSCvQB8o7+6R/im78gTzRXBsvj/b8MWYua0Kbvse+YFqegT+59BBmFB3tC3f5y3nEQ== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.709.0" - "@aws-sdk/client-sts" "3.709.0" + "@aws-sdk/client-sso-oidc" "3.712.0" + "@aws-sdk/client-sts" "3.712.0" "@aws-sdk/core" "3.709.0" - "@aws-sdk/credential-provider-node" "3.709.0" + "@aws-sdk/credential-provider-node" "3.712.0" "@aws-sdk/middleware-host-header" "3.709.0" "@aws-sdk/middleware-logger" "3.709.0" "@aws-sdk/middleware-recursion-detection" "3.709.0" @@ -371,7 +371,7 @@ "@aws-sdk/types" "3.709.0" "@aws-sdk/util-endpoints" "3.709.0" "@aws-sdk/util-user-agent-browser" "3.709.0" - "@aws-sdk/util-user-agent-node" "3.709.0" + "@aws-sdk/util-user-agent-node" "3.712.0" "@smithy/config-resolver" "^3.0.13" "@smithy/core" "^2.5.5" "@smithy/eventstream-serde-browser" "^3.0.14" @@ -495,15 +495,15 @@ "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.709.0.tgz#959e4df4070f1d059d8d0cd5b9028d9a46ac7ecf" - integrity sha512-1w6egz17QQy661lNCRmZZlqIANEbD6g2VFAQIJbVwSiu7brg+GUns+mT1eLLLHAMQc1sL0Ds8/ybSK2SrgGgIA== +"@aws-sdk/client-sso-oidc@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.712.0.tgz#ba3c9ae1b74f3c44e406397c60c812bb9e2e98a4" + integrity sha512-xNFrG9syrG6pxUP7Ld/nu3afQ9+rbJM9qrE+wDNz4VnNZ3vLiJty4fH85zBFhOQ5OF2DIJTWsFzXGi2FYjsCMA== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" "@aws-sdk/core" "3.709.0" - "@aws-sdk/credential-provider-node" "3.709.0" + "@aws-sdk/credential-provider-node" "3.712.0" "@aws-sdk/middleware-host-header" "3.709.0" "@aws-sdk/middleware-logger" "3.709.0" "@aws-sdk/middleware-recursion-detection" "3.709.0" @@ -512,7 +512,7 @@ "@aws-sdk/types" "3.709.0" "@aws-sdk/util-endpoints" "3.709.0" "@aws-sdk/util-user-agent-browser" "3.709.0" - "@aws-sdk/util-user-agent-node" "3.709.0" + "@aws-sdk/util-user-agent-node" "3.712.0" "@smithy/config-resolver" "^3.0.13" "@smithy/core" "^2.5.5" "@smithy/fetch-http-handler" "^4.1.2" @@ -628,10 +628,10 @@ "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.709.0.tgz#b5b29161e07af6f82afd7a6e750c09b0158d19e3" - integrity sha512-Qxeo8cN0jNy6Wnbqq4wucffAGJM6sJjofoTgNtPA6cC7sPYx7aYC6OAAAo6NaMRY+WywOKdS9Wgjx2QYRxKx7w== +"@aws-sdk/client-sso@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.712.0.tgz#9644585700f5d96a16151bdb5387755adc524db8" + integrity sha512-tBo/eW3YpZ9f3Q1qA7aA8uliNFJJX0OP7R2IUJ8t6rqVTk15wWCEPNmXzUZKgruDnKUfCaF4+r9q/Yy4fBc9PA== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" @@ -644,7 +644,7 @@ "@aws-sdk/types" "3.709.0" "@aws-sdk/util-endpoints" "3.709.0" "@aws-sdk/util-user-agent-browser" "3.709.0" - "@aws-sdk/util-user-agent-node" "3.709.0" + "@aws-sdk/util-user-agent-node" "3.712.0" "@smithy/config-resolver" "^3.0.13" "@smithy/core" "^2.5.5" "@smithy/fetch-http-handler" "^4.1.2" @@ -764,16 +764,16 @@ "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.709.0.tgz#b9ad3c9c6419d0d149b28cdd6c115cc40c4e7906" - integrity sha512-cBAvlPg6yslXNL385UUGFPw+XY+lA9BzioNdIFkMo3fEUlTShogTtiWz4LsyLHoN6LhKojssP9DSmmWKWjCZIw== +"@aws-sdk/client-sts@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.712.0.tgz#455daebd946369c60c7795efbd7a6b5981d0662a" + integrity sha512-gIO6BD+hkEe3GKQhbiFP0zcNQv0EkP1Cl9SOstxS+X9CeudEgVX/xEPUjyoFVkfkntPBJ1g0I1u5xOzzRExl4g== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.709.0" + "@aws-sdk/client-sso-oidc" "3.712.0" "@aws-sdk/core" "3.709.0" - "@aws-sdk/credential-provider-node" "3.709.0" + "@aws-sdk/credential-provider-node" "3.712.0" "@aws-sdk/middleware-host-header" "3.709.0" "@aws-sdk/middleware-logger" "3.709.0" "@aws-sdk/middleware-recursion-detection" "3.709.0" @@ -782,7 +782,7 @@ "@aws-sdk/types" "3.709.0" "@aws-sdk/util-endpoints" "3.709.0" "@aws-sdk/util-user-agent-browser" "3.709.0" - "@aws-sdk/util-user-agent-node" "3.709.0" + "@aws-sdk/util-user-agent-node" "3.712.0" "@smithy/config-resolver" "^3.0.13" "@smithy/core" "^2.5.5" "@smithy/fetch-http-handler" "^4.1.2" @@ -966,16 +966,16 @@ "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.709.0.tgz#b01c68d98ce4cc48f79405234e32a9de2f943ea1" - integrity sha512-qCF8IIGcPoUp+Ib3ANhbF5gElxFd+kIrtv2/1tKdvhudMANstQbMiWV0LTH47ZZR6c3as4iSrm09NZnpEoD/pA== +"@aws-sdk/credential-provider-ini@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.712.0.tgz#21d94d3fbaf5cece29bc62d56cf7f0dfb8b7d25e" + integrity sha512-sTsdQ/Fm/suqMdpjhMuss/5uKL18vcuWnNTQVrG9iGNRqZLbq65MXquwbUpgzfoUmIcH+4CrY6H2ebpTIECIag== dependencies: "@aws-sdk/core" "3.709.0" "@aws-sdk/credential-provider-env" "3.709.0" "@aws-sdk/credential-provider-http" "3.709.0" "@aws-sdk/credential-provider-process" "3.709.0" - "@aws-sdk/credential-provider-sso" "3.709.0" + "@aws-sdk/credential-provider-sso" "3.712.0" "@aws-sdk/credential-provider-web-identity" "3.709.0" "@aws-sdk/types" "3.709.0" "@smithy/credential-provider-imds" "^3.2.8" @@ -1020,16 +1020,16 @@ "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.709.0.tgz#270a31aae394e6c8fe7d3fdd0b92e7c3a863b933" - integrity sha512-4HRX9KYWPSjO5O/Vg03YAsebKpvTjTvpK1n7zHYBmlLMBLxUrVsL1nNKKC5p2/7OW3RL8XR1ki3QkoV7kGRxUQ== +"@aws-sdk/credential-provider-node@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.712.0.tgz#6f017382b1182578cf62798310f42264b652e36e" + integrity sha512-gXrHymW3rMRYORkPVQwL8Gi5Lu92F16SoZR543x03qCi7rm00oL9tRD85ACxkhprS1Wh8lUIUMNoeiwnYWTNuQ== dependencies: "@aws-sdk/credential-provider-env" "3.709.0" "@aws-sdk/credential-provider-http" "3.709.0" - "@aws-sdk/credential-provider-ini" "3.709.0" + "@aws-sdk/credential-provider-ini" "3.712.0" "@aws-sdk/credential-provider-process" "3.709.0" - "@aws-sdk/credential-provider-sso" "3.709.0" + "@aws-sdk/credential-provider-sso" "3.712.0" "@aws-sdk/credential-provider-web-identity" "3.709.0" "@aws-sdk/types" "3.709.0" "@smithy/credential-provider-imds" "^3.2.8" @@ -1098,12 +1098,12 @@ "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.709.0.tgz#f0cb855eed86748ff0c9afa06b3a234fb04b3206" - integrity sha512-rYdTDOxazS2GdGScelsRK5CAkktRLCCdRjlwXaxrcW57j749hEqxcF5uTv9RD6WBwInfedcSywErNZB+hylQlg== +"@aws-sdk/credential-provider-sso@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.712.0.tgz#d29c8c14e2460a817ed2eb7ad5d205d7914817af" + integrity sha512-8lCMxY7Lb9VK9qdlNXRJXE3W1UDVURnJZ3a4XWYNY6yr1TfQaN40mMyXX1oNlXXJtMV0szRvjM8dZj37E/ESAw== dependencies: - "@aws-sdk/client-sso" "3.709.0" + "@aws-sdk/client-sso" "3.712.0" "@aws-sdk/core" "3.709.0" "@aws-sdk/token-providers" "3.709.0" "@aws-sdk/types" "3.709.0" @@ -1151,13 +1151,13 @@ mnemonist "0.38.3" tslib "^2.6.2" -"@aws-sdk/lib-dynamodb@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/lib-dynamodb/-/lib-dynamodb-3.709.0.tgz#fd90b76bce67af1a3079524710f7bc19647829ad" - integrity sha512-piIyvQ1DhoUEosKmjGnMxLClUb9tv5rPPZfgh9J4MmSygsYbE9HvC3tstje0xUudVZjsmzZpNyibl/n0LA0gdQ== +"@aws-sdk/lib-dynamodb@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/lib-dynamodb/-/lib-dynamodb-3.712.0.tgz#7a8356a3ca4e4eaad7557de9c6f3ce298a2ef80e" + integrity sha512-VgaKdVOEFHuuDaM8LPSEO0YC05X8khGPlCz/3/ZGvoRWToypdAWvObaIXRhBvnrTzaUyR6Gf9IcxI3xsgepAxg== dependencies: "@aws-sdk/core" "3.709.0" - "@aws-sdk/util-dynamodb" "3.709.0" + "@aws-sdk/util-dynamodb" "3.712.0" "@smithy/core" "^2.5.5" "@smithy/smithy-client" "^3.5.0" "@smithy/types" "^3.7.2" @@ -1398,10 +1398,10 @@ "@smithy/types" "^2.3.1" tslib "^2.5.0" -"@aws-sdk/util-dynamodb@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-dynamodb/-/util-dynamodb-3.709.0.tgz#12ced0849ff8f1ac8a1921f97fdb57813f22ec14" - integrity sha512-rGr9+Po6Ma2BHV2hIhfXdn8hWxLtmgFzFRqqtxOlRRIDN55wkb2AYXz/ydzf4kgb+PzT8sQxtn6hf7pDkl+yAg== +"@aws-sdk/util-dynamodb@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-dynamodb/-/util-dynamodb-3.712.0.tgz#68b696b8acf8a90198286c31f77b3e73e500a795" + integrity sha512-YYy2+1Cey3SrdM6DWZtnkikxdu4wpHhUXXxN7P1WQV/ZURw7AeavowfW3BPS1hkmM/nVNU+ahx2hBOEMxxU1MA== dependencies: tslib "^2.6.2" @@ -1492,10 +1492,10 @@ "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.709.0": - version "3.709.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.709.0.tgz#7ff5a508bcad49963a550acadcced43d7af9960d" - integrity sha512-trBfzSCVWy7ILgqhEXgiuM7hfRCw4F4a8IK90tjk9YL0jgoJ6eJuOp7+DfCtHJaygoBxD3cdMFkOu+lluFmGBA== +"@aws-sdk/util-user-agent-node@3.712.0": + version "3.712.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.712.0.tgz#7634627775e0993eace70dea1dd915122f1a053f" + integrity sha512-26X21bZ4FWsVpqs33uOXiB60TOWQdVlr7T7XONDFL/XN7GEpUJkWuuIB4PTok6VOmh1viYcdxZQqekXPuzXexQ== dependencies: "@aws-sdk/middleware-user-agent" "3.709.0" "@aws-sdk/types" "3.709.0" @@ -2917,7 +2917,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@^7.25.9": +"@babel/preset-react@^7.26.3": version "7.26.3" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.26.3.tgz#7c5e028d623b4683c1f83a0bd4713b9100560caa" integrity sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw== @@ -3603,12 +3603,12 @@ "@whatwg-node/fetch" "^0.9.0" tslib "^2.4.0" -"@graphql-tools/batch-delegate@^9.0.23": - version "9.0.23" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-delegate/-/batch-delegate-9.0.23.tgz#dc600141a84a2b30b887e385b221478fdc87053b" - integrity sha512-5TCIQPZv2fAC17ROqmECQ4M+BU3o16uLE/hT1x3TmWqIWEtxow3eGfiAdd/MY6026CU3Qkgdvm3WJibXLursGA== +"@graphql-tools/batch-delegate@^9.0.24": + version "9.0.24" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-delegate/-/batch-delegate-9.0.24.tgz#3106b6d790490699ed3d17350df9dfd9ef4254ca" + integrity sha512-HjJqQcE4AgSUyYOEOiUXugwS6EH0efTOJu2OTYuxhnoAy2Qdo2kzWz0rbTP4RXXSUESWGJ/QuUnCObi5INZEvg== dependencies: - "@graphql-tools/delegate" "^10.2.7" + "@graphql-tools/delegate" "^10.2.8" "@graphql-tools/utils" "^10.6.2" dataloader "^2.2.3" tslib "^2.8.1" @@ -3655,13 +3655,13 @@ dataloader "^2.2.2" tslib "^2.5.0" -"@graphql-tools/delegate@^10.2.7": - version "10.2.7" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-10.2.7.tgz#b3a5b0bced795881d9ac5b910f082df94c540da8" - integrity sha512-cHNRguTi/RGxLttmDR5F4698kVtoPnYCFjgEZh/sg8MGrejTiCpQeg+aXUqcj0efWmnKIkeia5JaqqbTGpc0xA== +"@graphql-tools/delegate@^10.2.8": + version "10.2.8" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-10.2.8.tgz#8e004a303e32e935d38c4f06fab55fc67448ab6a" + integrity sha512-pUnsfsczDleGwixW18QLXBFGFqaJ12ApHaSZbbwoIqir/kZEl0Oqa9n5VDYxml0glVvK+AjYJzC3gJ+F/refvA== dependencies: "@graphql-tools/batch-execute" "^9.0.10" - "@graphql-tools/executor" "^1.3.6" + "@graphql-tools/executor" "^1.3.8" "@graphql-tools/schema" "^10.0.11" "@graphql-tools/utils" "^10.6.2" "@repeaterjs/repeater" "^3.0.6" @@ -3736,6 +3736,18 @@ tslib "^2.4.0" value-or-promise "^1.0.12" +"@graphql-tools/executor@^1.3.8": + version "1.3.8" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-1.3.8.tgz#aa612ea475fd0df2a236f1272c955cf3456e655a" + integrity sha512-tiZ8/PaQ+wkdZeCSyHa7vOUqCJndnpnN5ilUpi5UwsFrFFyN71sr4NJeib7Txf1VdufJNB4ed/0yFd39O0L3AQ== + dependencies: + "@graphql-tools/utils" "^10.6.3" + "@graphql-typed-document-node/core" "^3.2.0" + "@repeaterjs/repeater" "^3.0.4" + "@whatwg-node/disposablestack" "^0.0.5" + tslib "^2.4.0" + value-or-promise "^1.0.12" + "@graphql-tools/git-loader@^8.0.0": version "8.0.6" resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-8.0.6.tgz#afc88e31e9ebd0a8b576c5e46192d83efea5437c" @@ -3830,6 +3842,14 @@ "@graphql-tools/utils" "^10.6.2" tslib "^2.4.0" +"@graphql-tools/merge@^9.0.13": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.13.tgz#c75a1a2a94e5d73700e47bb3943b696554ff0c92" + integrity sha512-OSEOaFOjdkAwR6umRHrTrKjYANbh/0OBb1W8B21dxu8XPaOeoCuShDGXY6ZpragiO8Ke0qFXZGwJGg8ZbDPfvQ== + dependencies: + "@graphql-tools/utils" "^10.6.3" + tslib "^2.4.0" + "@graphql-tools/merge@^9.0.3": version "9.0.3" resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.3.tgz#4d0b467132e6f788b69fab803d31480b8ce4b61a" @@ -3912,6 +3932,16 @@ tslib "^2.4.0" value-or-promise "^1.0.12" +"@graphql-tools/schema@^10.0.12": + version "10.0.12" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.12.tgz#ddfa529cff08090c19080ff904562e7743c3d399" + integrity sha512-ukIZBdD4jI94ren5GK6nnHe+YvDVOfoI8cz50pdE1+FYf9NSFUu7HJXmIBHGIIWFbE5lz4qb5MfUeuBkffs3lw== + dependencies: + "@graphql-tools/merge" "^9.0.13" + "@graphql-tools/utils" "^10.6.3" + tslib "^2.4.0" + value-or-promise "^1.0.12" + "@graphql-tools/schema@^10.0.3": version "10.0.3" resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.3.tgz#48c14be84cc617c19c4c929258672b6ab01768de" @@ -3922,18 +3952,18 @@ tslib "^2.4.0" value-or-promise "^1.0.12" -"@graphql-tools/stitch@^9.4.9": - version "9.4.9" - resolved "https://registry.yarnpkg.com/@graphql-tools/stitch/-/stitch-9.4.9.tgz#df339a31d09298b2b111e88e401c9ead3ce57afb" - integrity sha512-39TKygps4uWot94gpogrgaSHcJ8gNAO6vp2F1uCDk2ZQ9HA8BSXu1OeeW+HCIVm/oPZjXBKwZfgWN0IfbU4REQ== +"@graphql-tools/stitch@^9.4.10": + version "9.4.10" + resolved "https://registry.yarnpkg.com/@graphql-tools/stitch/-/stitch-9.4.10.tgz#dcb08d289307b38009e2680a33bf3b3cd4fa31f7" + integrity sha512-RoFtwuCpBiIfAv4naIC4dL8paErx+Cymd2hjsEEIOTgipRU7bSST04b6JtHsOrmKuCtgp+aYj3cldN1cmSGuhQ== dependencies: - "@graphql-tools/batch-delegate" "^9.0.23" - "@graphql-tools/delegate" "^10.2.7" + "@graphql-tools/batch-delegate" "^9.0.24" + "@graphql-tools/delegate" "^10.2.8" "@graphql-tools/executor" "^1.3.6" "@graphql-tools/merge" "^9.0.12" "@graphql-tools/schema" "^10.0.11" "@graphql-tools/utils" "^10.6.2" - "@graphql-tools/wrap" "^10.0.25" + "@graphql-tools/wrap" "^10.0.26" tslib "^2.8.1" "@graphql-tools/url-loader@^8.0.0", "@graphql-tools/url-loader@^8.0.2": @@ -3995,6 +4025,16 @@ dset "^3.1.2" tslib "^2.4.0" +"@graphql-tools/utils@^10.6.3": + version "10.6.3" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.6.3.tgz#d178bca50b260ea6e113b792e672fa1bc5b78bfe" + integrity sha512-hEaQTGyQUG3DJqCaIsiu4M+jUgWUf+h6kDwC8MtGElwkL1HWi+qX2qyynw8h9WoV7STmmHDSwkk2ET1IC3nRPw== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + cross-inspect "1.0.1" + dset "^3.1.2" + tslib "^2.4.0" + "@graphql-tools/utils@^8.8.0": version "8.13.1" resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.13.1.tgz#b247607e400365c2cd87ff54654d4ad25a7ac491" @@ -4021,12 +4061,12 @@ tslib "^2.4.0" value-or-promise "^1.0.12" -"@graphql-tools/wrap@^10.0.25": - version "10.0.25" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-10.0.25.tgz#30a23ddf6d7f41299bb630d36034692f877e7fb2" - integrity sha512-51Koxi6IZHF4Ns7c6jvLU2x7GJyGGDL7V6e0u4J6ci/0vSCqLBwT3YYutDlZ7uJTpbLjEbjl0R0+1fOerdIkOQ== +"@graphql-tools/wrap@^10.0.26": + version "10.0.26" + resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-10.0.26.tgz#a31d5575cb04f291d1291c14d272448397949318" + integrity sha512-vCeM30vm5gtTswg1Tebn0bSBrn74axlqmu9kDrPwlqjum5ykZQjkSwuCXcGuBS/4pNhmaTirXLuUL1vP5FvEHA== dependencies: - "@graphql-tools/delegate" "^10.2.7" + "@graphql-tools/delegate" "^10.2.8" "@graphql-tools/schema" "^10.0.11" "@graphql-tools/utils" "^10.6.2" tslib "^2.8.1" @@ -6255,17 +6295,17 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== -"@stripe/react-stripe-js@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-3.0.0.tgz#8970af4283478662a277870ddb1ea173de635ba8" - integrity sha512-Crn9t+uvfEJnFSEE8Le9Boj3+J4QdB7DrIa+VyhDgTAHC1z9fk7d/cfSrjNO2RcdRh9zN9Blk/XKccHq9kUlTw== +"@stripe/react-stripe-js@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-3.1.1.tgz#78a2575683637f87c965a81cc1e0f626138f20f1" + integrity sha512-+JzYFgUivVD7koqYV7LmLlt9edDMAwKH7XhZAHFQMo7NeRC+6D2JmQGzp9tygWerzwttwFLlExGp4rAOvD6l9g== dependencies: prop-types "^15.7.2" -"@stripe/stripe-js@^5.2.0": - version "5.2.0" - resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-5.2.0.tgz#2d696ed622def8c4407c658d8294c3e0365b0f1b" - integrity sha512-2ZpEaezx3S0QPtnske175NDaLvUvaVKd4ePHpUN0QF/uV4BBBBRUy5BvQONDym+utbbW0QhSJoiRPnp4FS+4Vg== +"@stripe/stripe-js@^5.3.0": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-5.3.0.tgz#56f9fe2ac0df8de714fd3c0c80ea4263d821795d" + integrity sha512-lNCZwCak1Yk0x2ecQO+4kcV7MwxAXapfgmLEh5SIoczc/r4GWAmcfyXZu3AAle+MAVW9HBe6f7tywuxJtYomcg== "@szmarczak/http-timer@^4.0.5": version "4.0.6" @@ -8821,7 +8861,7 @@ compress-commons@^6.0.0: normalize-path "^3.0.0" readable-stream "^4.0.0" -compressible@~2.0.16, compressible@~2.0.18: +compressible@~2.0.16: version "2.0.18" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== @@ -8841,19 +8881,6 @@ compression@^1.7.4: safe-buffer "5.1.2" vary "~1.1.2" -compression@^1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93" - integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q== - dependencies: - bytes "3.1.2" - compressible "~2.0.18" - debug "2.6.9" - negotiator "~0.6.4" - on-headers "~1.0.2" - safe-buffer "5.2.1" - vary "~1.1.2" - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -13551,7 +13578,7 @@ long-timeout@0.1.1: resolved "https://registry.yarnpkg.com/long-timeout/-/long-timeout-0.1.1.tgz#9721d788b47e0bcb5a24c2e2bee1a0da55dab514" integrity sha512-BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w== -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: +loose-envify@^1.0.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -14094,11 +14121,6 @@ negotiator@^1.0.0: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a" integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg== -negotiator@~0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" - integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== - neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -15334,14 +15356,7 @@ react-use-websocket@^4.11.1: resolved "https://registry.yarnpkg.com/react-use-websocket/-/react-use-websocket-4.11.1.tgz#6c6546c4921c057e8a6ee418fd01705bffa80d8e" integrity sha512-39e8mK2a2A1h8uY3ePF45b2q0vwMOmaEy7J5qEhQg4n7vYa5oDLmqutG36kZQgAQ/3KCZS0brlGRbbZJ0+zfKQ== -react@18.3.1: - version "18.3.1" - resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" - integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== - dependencies: - loose-envify "^1.1.0" - -react@^19.0.0: +react@19.0.0, react@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/react/-/react-19.0.0.tgz#6e1969251b9f108870aa4bff37a0ce9ddfaaabdd" integrity sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ== diff --git a/libraries/action/build.gradle.kts b/libraries/action/build.gradle.kts index 84e3bb9b7a..afb4311b30 100644 --- a/libraries/action/build.gradle.kts +++ b/libraries/action/build.gradle.kts @@ -54,24 +54,24 @@ tasks { systemProperty("junit.jupiter.extensions.autodetection.enabled", "true") useJUnitPlatform() } -// "formatKotlinCommonMain" { -// dependsOn("kspCommonMainKotlinMetadata") -// } -// "formatKotlinJsMain" { -// dependsOn("kspCommonMainKotlinMetadata") -// } -// "formatKotlinJsTest" { -// dependsOn("kspCommonMainKotlinMetadata") -// } -// "lintKotlinCommonMain" { -// dependsOn("kspCommonMainKotlinMetadata") -// } -// "lintKotlinJsMain" { -// dependsOn("kspCommonMainKotlinMetadata") -// } -// "lintKotlinJsTest" { -// dependsOn("kspCommonMainKotlinMetadata") -// } + "formatKotlinCommonMain" { + dependsOn("kspCommonMainKotlinMetadata") + } + "formatKotlinJsMain" { + dependsOn("kspCommonMainKotlinMetadata") + } + "formatKotlinJsTest" { + dependsOn("kspCommonMainKotlinMetadata") + } + "lintKotlinCommonMain" { + dependsOn("kspCommonMainKotlinMetadata") + } + "lintKotlinJsMain" { + dependsOn("kspCommonMainKotlinMetadata") + } + "lintKotlinJsTest" { + dependsOn("kspCommonMainKotlinMetadata") + } withType(KotlinCompilationTask::class).configureEach { if (name != "kspCommonMainKotlinMetadata") { dependsOn("kspCommonMainKotlinMetadata") diff --git a/libraries/js-dependencies/build.gradle.kts b/libraries/js-dependencies/build.gradle.kts index 91adac83c2..9b88670034 100644 --- a/libraries/js-dependencies/build.gradle.kts +++ b/libraries/js-dependencies/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("com.zegreatrob.jsmints.plugins.ncu") -// id("org.jmailen.kotlinter") + id("org.jmailen.kotlinter") } repositories { diff --git a/libraries/js-dependencies/package.json b/libraries/js-dependencies/package.json index c976c8f325..13582c15e1 100644 --- a/libraries/js-dependencies/package.json +++ b/libraries/js-dependencies/package.json @@ -1,17 +1,17 @@ { "dependencies": { "@auth0/auth0-react": "2.2.4", - "@aws-sdk/client-apigatewaymanagementapi": "~3.709.0", - "@aws-sdk/client-dynamodb": "3.709.0", - "@aws-sdk/client-lambda": "~3.709.0", - "@aws-sdk/lib-dynamodb": "3.709.0", + "@aws-sdk/client-apigatewaymanagementapi": "~3.712.0", + "@aws-sdk/client-dynamodb": "3.712.0", + "@aws-sdk/client-lambda": "~3.712.0", + "@aws-sdk/lib-dynamodb": "3.712.0", "@babel/core": "^7.26.0", "@babel/preset-env": "^7.26.0", - "@babel/preset-react": "^7.25.9", + "@babel/preset-react": "^7.26.3", "@graphql-codegen/cli": "^5.0.3", "@graphql-codegen/kotlin": "^3.0.1", - "@graphql-tools/schema": "^10.0.11", - "@graphql-tools/stitch": "^9.4.9", + "@graphql-tools/schema": "^10.0.12", + "@graphql-tools/stitch": "^9.4.10", "@graphql-codegen/java-common": "^3.0.0", "@graphql-codegen/plugin-helpers": "^5.1.0", "@graphql-codegen/visitor-plugin-common": "5.6.0", @@ -28,13 +28,12 @@ "@slack/oauth": "^3.0.2", "@slack/web-api": "^7.8.0", "@slack/webhook": "^7.0.4", - "@stripe/react-stripe-js": "^3.0.0", - "@stripe/stripe-js": "^5.2.0", + "@stripe/react-stripe-js": "^3.1.1", + "@stripe/stripe-js": "^5.3.0", "babel-loader": "^9.2.1", "blueimp-md5": "^2.19.0", "body-parser": "^1.20.3", "chromedriver": "131.0.3", - "compression": "^1.7.5", "cookie-parser": "^1.4.7", "core-js": "^3.39.0", "css-loader": "^7.1.2", @@ -70,7 +69,7 @@ "parse5": "^7.2.1", "parse5-html-rewriting-stream": "^7.0.0", "raw-loader": "^4.0.2", - "react": "18.3.1", + "react": "19.0.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-flip-toolkit": "^7.2.4", diff --git a/libraries/json/build.gradle.kts b/libraries/json/build.gradle.kts index a00806c379..cb21ee1469 100644 --- a/libraries/json/build.gradle.kts +++ b/libraries/json/build.gradle.kts @@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon -//import org.jmailen.gradle.kotlinter.tasks.FormatTask -//import org.jmailen.gradle.kotlinter.tasks.LintTask +import org.jmailen.gradle.kotlinter.tasks.FormatTask +import org.jmailen.gradle.kotlinter.tasks.LintTask plugins { id("com.zegreatrob.coupling.plugins.jstools") @@ -71,10 +71,10 @@ tasks { withType(Kotlin2JsCompile::class) { dependsOn(gqlCodeGen) } -// withType { -// dependsOn(gqlCodeGen) -// } -// withType { -// dependsOn(gqlCodeGen) -// } + withType { + dependsOn(gqlCodeGen) + } + withType { + dependsOn(gqlCodeGen) + } } diff --git a/server/actionz/build.gradle.kts b/server/actionz/build.gradle.kts index 46489a40fd..30480e5098 100644 --- a/server/actionz/build.gradle.kts +++ b/server/actionz/build.gradle.kts @@ -27,10 +27,10 @@ dependencies { "jsTestImplementation"("org.jetbrains.kotlin:kotlin-test-annotations-common") } tasks { -// "formatKotlinJsMain" { -// dependsOn("kspKotlinJs") -// } -// "lintKotlinJsMain" { -// dependsOn("kspKotlinJs") -// } + "formatKotlinJsMain" { + dependsOn("kspKotlinJs") + } + "lintKotlinJsMain" { + dependsOn("kspKotlinJs") + } } diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 48878af118..3d8ff01d12 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -56,7 +56,6 @@ dependencies { jsMainImplementation(npmConstrained("@graphql-tools/schema")) jsMainImplementation(npmConstrained("@graphql-tools/stitch")) jsMainImplementation(npmConstrained("body-parser")) - jsMainImplementation(npmConstrained("compression")) jsMainImplementation(npmConstrained("cookie-parser")) jsMainImplementation(npmConstrained("express")) jsMainImplementation(npmConstrained("express-jwt")) diff --git a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/express/middleware/Middleware.kt b/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/express/middleware/Middleware.kt index 85c9283548..53c7e3b0c4 100644 --- a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/express/middleware/Middleware.kt +++ b/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/express/middleware/Middleware.kt @@ -2,13 +2,11 @@ package com.zegreatrob.coupling.server.express.middleware import com.zegreatrob.coupling.server.express.Config import com.zegreatrob.coupling.server.express.route.jwtMiddleware -import com.zegreatrob.coupling.server.external.compression.compression import com.zegreatrob.coupling.server.external.cookieparser.cookieParser import com.zegreatrob.coupling.server.external.express.Express import com.zegreatrob.coupling.server.external.methodoverride.methodOverride fun Express.middleware() { - use(compression()) set("port", Config.port) use(tracer()) use(scope()) diff --git a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/external/compression/External.kt b/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/external/compression/External.kt deleted file mode 100644 index 3a79bf34d6..0000000000 --- a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/external/compression/External.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.zegreatrob.coupling.server.external.compression - -import com.zegreatrob.coupling.server.external.express.Handler - -@JsModule("compression") -@JsNonModule -external fun compression(): Handler diff --git a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/graphql/Dispatch.kt b/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/graphql/Dispatch.kt index 9a38468945..6466722e67 100644 --- a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/graphql/Dispatch.kt +++ b/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/graphql/Dispatch.kt @@ -25,7 +25,7 @@ suspend inline fun cannon( return ActionCannon(dispatcher, LoggingActionPipe(dispatcher.traceId)) } -typealias CommandFunc = (entity: E, input: I?) -> C? +typealias CommandFunc = (entity: E, input: I?) -> C? inline fun dispatch( crossinline dispatcherFunc: GraphQLDispatcherProvider,