From f0e74c5ed5dc993933461cfc04e1a5bc63246751 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:44:11 +0000 Subject: [PATCH] Update all non-major dependencies (except core Kotlin) (#2221) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] Co-authored-by: Nariman Abdullin --- gradle/libs.versions.toml | 50 +-- renovate.json | 4 +- save-backend/build.gradle.kts | 2 +- .../com/saveourtool/save/frontend/App.kt | 4 +- .../save/frontend/components/HasErrorModal.kt | 2 +- .../frontend/components/basic/Markdown.kt | 4 +- .../basic/contests/PublicTestCardComponent.kt | 2 +- .../basic/graph/SigmaGraphVisualizer.kt | 4 +- .../components/tables/TableComponent.kt | 6 +- .../frontend/components/topbar/TopBarLinks.kt | 4 +- .../components/topbar/TopBarUrlSplits.kt | 2 +- .../components/views/AwesomeBenchmarksView.kt | 2 +- .../frontend/components/views/ContestView.kt | 2 +- .../frontend/components/views/FallbackView.kt | 2 +- .../components/views/OrganizationView.kt | 2 +- .../frontend/components/views/ProjectView.kt | 2 +- .../views/contests/ContestGlobalRatingView.kt | 2 +- .../calendar/ReactCalendarBuilder.kt | 2 +- .../save/frontend/externals/cookie/Cookie.kt | 2 +- .../graph/cytoscape/CytoscapeWrapper.kt | 2 +- .../frontend/externals/reactace/AceBuilder.kt | 2 +- .../frontend/externals/reactace/AceThemes.kt | 2 +- .../save/frontend/utils/LocationUtils.kt | 12 +- .../save/frontend/utils/RequestUtils.kt | 5 +- .../save/frontend/utils/RouterUtils.kt | 2 +- .../save/frontend/utils/TestUtils.kt | 4 +- .../docker/DockerContainerRunner.kt | 2 +- settings.gradle.kts | 2 +- yarn.lock | 350 ++++++++---------- 29 files changed, 211 insertions(+), 272 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 36c3d6091f..d965fbaa6b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,47 +2,47 @@ kotlin = "1.9.10" jetbrains-annotations = "24.0.1" save-cli = "0.4.0-SNAPSHOT" -ktor = "2.3.1" +ktor = "2.3.5" okio = "3.3.0" serialization = "1.6.0" kotlinx-datetime = "0.4.1" kotlinx-coroutines = "1.7.3" -kotlin-wrappers = "1.0.0-pre.566" -spring-boot = "2.7.12" -spring-cloud = "3.1.7" -spring-cloud-kubernetes = "2.1.7" -kafka-client = "3.5.0" -junit = "5.9.3" +kotlin-wrappers = "1.0.0-pre.634" +spring-boot = "2.7.17" +spring-cloud = "3.1.8" +spring-cloud-kubernetes = "2.1.8" +kafka-client = "3.6.0" +junit = "5.10.0" assertj = "3.24.2" diktat = "1.2.5" -detekt = "1.23.0" -liquibase-core = "4.22.0" -docker-java = "3.3.1" -jgit = "6.6.0.202305301015-r" +detekt = "1.23.2" +liquibase-core = "4.24.0" +docker-java = "3.3.4" +jgit = "6.7.0.202309050840-r" mockito = "5.3.1" mockito-kotlin = "5.0.0" # only in save-cli -log4j = "2.20.0" +log4j = "2.21.1" jpa = "1.0.2" mySql = "8.0.33" -testcontainers = "1.18.3" +testcontainers = "1.19.1" okhttp3 = "4.11.0" -reckon = "0.18.0" -commons-compress = "1.23.0" +reckon = "0.18.1" +commons-compress = "1.24.0" zip4j = "2.11.5" ktoml = "0.5.0" springdoc = "1.7.0" kotlinx-cli = "0.3.6" -spotless = "6.19.0" -fabric8 = "6.7.1" -arrow-kt = "1.1.5" +spotless = "6.22.0" +fabric8 = "6.9.1" +arrow-kt = "1.2.1" publish = "1.3.0" -download = "5.4.0" -cpg = "7.0.0" +download = "5.5.0" +cpg = "7.1.2" # should be taken from cpg -cpg-neo4j-ogm = { strictly = "4.0.4" } -cpg-neo4j-java-driver = { strictly = "5.6.0" } -aws-sdk = "2.20.84" +cpg-neo4j-ogm = { strictly = "4.0.6" } +cpg-neo4j-java-driver = { strictly = "5.7.0" } +aws-sdk = "2.21.11" cosv4k = "0.0.14" [plugins] @@ -52,7 +52,7 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-plugin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" } kotlin-plugin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } -talaiot-base = { id = "io.github.cdsap.talaiot.plugin.base", version = "2.0.1" } +talaiot-base = { id = "io.github.cdsap.talaiot.plugin.base", version = "2.0.3" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } spotless = { id = "com.diffplug.gradle.spotless", version.ref = "spotless" } download = { id = "de.undercouch.download", version.ref = "download" } @@ -121,7 +121,7 @@ springdoc-openapi-ui = { module = "org.springdoc:springdoc-openapi-ui", version. springdoc-openapi-webflux-ui = { module = "org.springdoc:springdoc-openapi-webflux-ui", version.ref = "springdoc" } springdoc-openapi-security = { module = "org.springdoc:springdoc-openapi-security", version.ref = "springdoc" } springdoc-openapi-kotlin = { module = "org.springdoc:springdoc-openapi-kotlin", version.ref = "springdoc" } -swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.11" } +swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.18" } ktor-client-apache = { module = "io.ktor:ktor-client-apache", version.ref = "ktor" } ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" } diff --git a/renovate.json b/renovate.json index 547f5cbd1a..15090001d5 100644 --- a/renovate.json +++ b/renovate.json @@ -39,7 +39,7 @@ "^org\\.neo4j\\:neo4j-ogm-bolt-driver", "^org\\.neo4j\\:neo4j-ogm-core" ], - "allowedVersions": "4.0.4", + "allowedVersions": "4.0.6", "groupName": "all non-major dependencies (except core Kotlin)", "groupSlug": "all-minor-patch" }, @@ -48,7 +48,7 @@ "matchPackagePatterns": [ "^org\\.neo4j\\.driver\\:neo4j-java-driver" ], - "allowedVersions": "5.6.0", + "allowedVersions": "5.7.0", "groupName": "all non-major dependencies (except core Kotlin)", "groupSlug": "all-minor-patch" }, diff --git a/save-backend/build.gradle.kts b/save-backend/build.gradle.kts index 20fb7c5f48..0316899d2a 100644 --- a/save-backend/build.gradle.kts +++ b/save-backend/build.gradle.kts @@ -9,7 +9,7 @@ plugins { id("com.saveourtool.save.buildutils.code-quality-convention") // this plugin will generate generateOpenApiDocs task // running this task, it will write the OpenAPI spec into a backend-api-docs.json file in save-backend dir. - id("org.springdoc.openapi-gradle-plugin") version "1.6.0" + id("org.springdoc.openapi-gradle-plugin") version "1.8.0" } openApi { diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt index fb64633735..d3e4b15466 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt @@ -83,8 +83,8 @@ fun main() { return } - kotlinext.js.require("../scss/save-frontend.scss") // this is needed for webpack to include resource - kotlinext.js.require("bootstrap") // this is needed for webpack to include bootstrap + kotlinext.js.require("../scss/save-frontend.scss") // this is needed for webpack to include resource + kotlinext.js.require("bootstrap") // this is needed for webpack to include bootstrap ReactModal.setAppElement(document.getElementById("wrapper") as HTMLElement) // required for accessibility in react-modal initI18n() diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt index f3ce2b0d30..e896799fc7 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt @@ -128,7 +128,7 @@ val requestModalHandler: FC = FC { props -> div { className = ClassName("d-flex justify-content-center mt-4") div { - child(ringLoader) + +ringLoader span { className = ClassName("sr-only") +"Loading..." diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Markdown.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Markdown.kt index d76e8d9c2d..c4dfd48772 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Markdown.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Markdown.kt @@ -15,8 +15,8 @@ import react.ChildrenBuilder * @param classes class names that should be applied to high-level div */ fun ChildrenBuilder.markdown(text: String, classes: String? = null) { - child(reactMarkdown(jso { + +reactMarkdown(jso { this.children = text this.className = classes - })) + }) } diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/contests/PublicTestCardComponent.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/contests/PublicTestCardComponent.kt index 20356a3cc0..6a25a72bb0 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/contests/PublicTestCardComponent.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/contests/PublicTestCardComponent.kt @@ -49,7 +49,7 @@ private fun ChildrenBuilder.displayTestLines(header: String, lines: List this.rehypePlugins = arrayOf(::rehypeHighlightPlugin) } publicTestCard { - child(reactMarkdown(reactMarkdownOptions)) + +reactMarkdown(reactMarkdownOptions) } } diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/graph/SigmaGraphVisualizer.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/graph/SigmaGraphVisualizer.kt index 9198e03242..cde13f1bac 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/graph/SigmaGraphVisualizer.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/graph/SigmaGraphVisualizer.kt @@ -19,9 +19,9 @@ import web.cssom.* * Graph visualizer based on Sigma and Graphology libs */ val sigmaGraphVisualizer: FC = FC { props -> - kotlinext.js.require("@react-sigma/core/lib/react-sigma.min.css") + kotlinext.js.require("@react-sigma/core/lib/react-sigma.min.css") val (selectedNodeName, setSelectedNodeName) = useState(null) - val graphology = kotlinext.js.require("graphology") + val graphology: dynamic = kotlinext.js.require("graphology") sigmaContainer { settings = getSigmaContainerSettings() this.graph = graphology.MultiDirectedGraph diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt index 4a9352c38e..4fd30b98d9 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt @@ -262,9 +262,7 @@ fun > tableComponent( val column = header.column th { this.className = className - child( - renderHeader(header) - ) + +renderHeader(header) if (column.getCanSort()) { style = style ?: jso() style?.cursor = "pointer".unsafeCast() @@ -287,7 +285,7 @@ fun > tableComponent( tr { spread(getRowProps(row)) row.getVisibleCells().map { cell -> - child(renderCell(cell)) + +renderCell(cell) } } if (row.isExpanded) { diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarLinks.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarLinks.kt index 8b921966e3..8ef445f246 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarLinks.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarLinks.kt @@ -88,7 +88,7 @@ external interface TopBarLinksProps : Props { /** * The location is needed to change the color of the text. */ - var location: Location + var location: Location<*> } /** @@ -104,7 +104,7 @@ data class TopBarLink( private fun textColor( hrefAnchor: String, - location: Location, + location: Location<*>, ) = if (location.pathname.endsWith(hrefAnchor) && location.pathname.count { it == '/' } < TOP_BAR_PATH_SEGMENTS_HIGHLIGHT) { "text-warning" } else { diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarUrlSplits.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarUrlSplits.kt index 00e06180f6..39166dbdc7 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarUrlSplits.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarUrlSplits.kt @@ -87,5 +87,5 @@ external interface TopBarUrlSplitsProps : Props { /** * User location for url analysis. */ - var location: Location + var location: Location<*> } diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AwesomeBenchmarksView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AwesomeBenchmarksView.kt index 67608c30a9..8885024774 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AwesomeBenchmarksView.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AwesomeBenchmarksView.kt @@ -56,7 +56,7 @@ const val ALL_LANGS = "all" */ @Suppress("MISSING_KDOC_CLASS_ELEMENTS") external interface AwesomeBenchmarksProps : PropsWithChildren { - var location: Location + var location: Location<*> } /** diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ContestView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ContestView.kt index e1ea62916a..43f2acd219 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ContestView.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ContestView.kt @@ -48,7 +48,7 @@ enum class ContestMenuBar { external interface ContestViewProps : Props { var currentUserInfo: UserInfo? var currentContestName: String? - var location: Location + var location: Location<*> } /** diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/FallbackView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/FallbackView.kt index b3f50479f6..d6df76f3f5 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/FallbackView.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/FallbackView.kt @@ -76,7 +76,7 @@ class FallbackView : AbstractView(Style.SAVE_LIGHT) { if (props.withRouterLink == true) { Navigate { to = "/" - buttonBuilder("Back to the main page", style = "info") { } + this@render.buttonBuilder("Back to the main page", style = "info") { } } } else { a { diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt index 14caf1a868..ebd41302eb 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt @@ -72,7 +72,7 @@ val actionIconClasses: List = listOf("trash-alt") external interface OrganizationProps : PropsWithChildren { var organizationName: String var currentUserInfo: UserInfo? - var location: Location + var location: Location<*> } /** diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ProjectView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ProjectView.kt index 960946d0af..5577f680e3 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ProjectView.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ProjectView.kt @@ -44,7 +44,7 @@ external interface ProjectViewProps : PropsWithChildren { var owner: String var name: String var currentUserInfo: UserInfo? - var location: Location + var location: Location<*> } /** diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/contests/ContestGlobalRatingView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/contests/ContestGlobalRatingView.kt index 559520aa51..744536fd75 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/contests/ContestGlobalRatingView.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/contests/ContestGlobalRatingView.kt @@ -57,7 +57,7 @@ external interface ContestGlobalRatingProps : Props { /** * Location for checking change url */ - var location: Location + var location: Location<*> } /** diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/calendar/ReactCalendarBuilder.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/calendar/ReactCalendarBuilder.kt index d59f8d2840..f2a8786e13 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/calendar/ReactCalendarBuilder.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/calendar/ReactCalendarBuilder.kt @@ -15,7 +15,7 @@ fun ChildrenBuilder.calendar( onChange: (Date, Event) -> Unit, handler: ChildrenBuilder.(ReactCalendarProps) -> Unit = {}, ) { - kotlinext.js.require("react-calendar/dist/Calendar.css") + kotlinext.js.require("react-calendar/dist/Calendar.css") ReactCalendar::class.react { this.onChange = onChange this.showNeighboringMonth = false diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/cookie/Cookie.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/cookie/Cookie.kt index b6a8da3b55..dbf99b62e4 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/cookie/Cookie.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/cookie/Cookie.kt @@ -8,7 +8,7 @@ import kotlinext.js.require /** * Object that manages cookies */ -val cookie: Cookie = require("js-cookie").unsafeCast() +val cookie: Cookie = require("js-cookie") /** * Interface that encapsulates all cookies interactions diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/graph/cytoscape/CytoscapeWrapper.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/graph/cytoscape/CytoscapeWrapper.kt index 99b5e2c52d..fbdf1447b5 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/graph/cytoscape/CytoscapeWrapper.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/graph/cytoscape/CytoscapeWrapper.kt @@ -82,6 +82,6 @@ fun cytoscape( """) } - val cytoscapeJs = kotlinext.js.require("cytoscape") + val cytoscapeJs: dynamic = kotlinext.js.require("cytoscape") return cytoscapeJs(options) } diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceBuilder.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceBuilder.kt index 2b22362d73..14a867f693 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceBuilder.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceBuilder.kt @@ -32,7 +32,7 @@ fun ChildrenBuilder.aceBuilder( onChangeFun: (String) -> Unit, ) { selectedTheme.require() - kotlinext.js.require("ace-builds/src-min-noconflict/mode-${selectedMode.modeName}") + kotlinext.js.require("ace-builds/src-min-noconflict/mode-${selectedMode.modeName}") div { className = ClassName("d-flex justify-content-center flex-fill") diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceThemes.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceThemes.kt index 7c7d11c0be..aa0f36db12 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceThemes.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/reactace/AceThemes.kt @@ -25,7 +25,7 @@ enum class AceThemes(val themeName: String) { /** * Method that includes required theme */ - fun require() = kotlinext.js.require("ace-builds/src-min-noconflict/theme-$themeName") + fun require() = kotlinext.js.require("ace-builds/src-min-noconflict/theme-$themeName") companion object { /** * Theme that is recommended to be used everywhere diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/LocationUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/LocationUtils.kt index 338c8cb307..7b04cf454d 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/LocationUtils.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/LocationUtils.kt @@ -10,31 +10,31 @@ import remix.run.router.Location * @param url url for comparison * @return true if [Location.pathname] is not [url], false otherwise */ -fun Location.not(url: String) = pathname != url +fun Location<*>.not(url: String) = pathname != url /** * @param urls list of urls * @return true of [Location] is not in [urls] */ -fun Location.notIn(urls: List) = urls.all { not(it) } +fun Location<*>.notIn(urls: List) = urls.all { not(it) } /** * @param routes array of [FrontendRoutes] * @return true of [Location] is not in [FrontendRoutes.path] of [routes] */ -fun Location.notIn(routes: Array) = notIn(routes.map { "/$it" }) +fun Location<*>.notIn(routes: Array) = notIn(routes.map { "/$it" }) /** * @return true if [Location.pathname] starts with `/vuln`, false otherwise */ -fun Location.isVuln() = this.pathname.startsWith("/vuln") +fun Location<*>.isVuln() = this.pathname.startsWith("/vuln") /** * @return true if [Location.pathname] starts with `/settings`, false otherwise */ -fun Location.isSettings() = this.pathname.startsWith("/$SETTINGS") +fun Location<*>.isSettings() = this.pathname.startsWith("/$SETTINGS") /** * @return true if we are on a main (index) page */ -fun Location.isIndex() = pathname == "/" +fun Location<*>.isIndex() = pathname == "/" diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RequestUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RequestUtils.kt index 311d3919a1..c3c7b5a5d4 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RequestUtils.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RequestUtils.kt @@ -14,6 +14,7 @@ import com.saveourtool.save.v1 import js.buffer.ArrayBuffer import js.core.jso +import js.promise.asDeferred import js.typedarrays.Int8Array import js.typedarrays.Uint8Array import org.w3c.dom.url.URLSearchParams @@ -22,7 +23,7 @@ import org.w3c.fetch.RequestCredentials import org.w3c.fetch.RequestInit import org.w3c.fetch.Response import web.streams.ReadableStream -import web.streams.ReadableStreamDefaultReadValueResult +import web.streams.ReadableStreamReadValueResult import kotlin.js.Promise import kotlinx.browser.window @@ -48,7 +49,7 @@ val jsonHeaders = Headers() * * @param T the type of the data (usually a byte array). */ -private typealias ResultAsync = Promise> +private typealias ResultAsync = Promise> /** * Interface for objects that have access to [requestStatusContext] diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RouterUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RouterUtils.kt index cb0253e1b9..0f27fa16d7 100644 --- a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RouterUtils.kt +++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RouterUtils.kt @@ -44,7 +44,7 @@ fun ChildrenBuilder.withNavigate(handler: ChildrenBuilder.(NavigateFunctionConte * @return a function component */ @Suppress("TYPE_ALIAS") -fun withRouter(handler: ChildrenBuilder.(Location, Params) -> Unit): FC = FC { +fun withRouter(handler: ChildrenBuilder.(Location<*>, Params) -> Unit): FC = FC { val location = useLocation() val params = useParams() handler(location, params) diff --git a/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/utils/TestUtils.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/utils/TestUtils.kt index 3779c49532..edcf7c4a39 100644 --- a/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/utils/TestUtils.kt +++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/utils/TestUtils.kt @@ -18,14 +18,14 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import react.router.MemoryRouter -val wrapper: FC = FC { +val wrapper: FC = FC { props -> val (_, setMockState) = useState(null) val (_, setRedirectToFallbackView) = useState(false) val (_, setLoadingCounter) = useState(0) MemoryRouter { requestStatusContext.Provider { value = RequestStatusContext(setMockState, setRedirectToFallbackView, setLoadingCounter) - +it.children + +props.children } } } diff --git a/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/docker/DockerContainerRunner.kt b/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/docker/DockerContainerRunner.kt index 48028af105..7223cc81b1 100644 --- a/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/docker/DockerContainerRunner.kt +++ b/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/docker/DockerContainerRunner.kt @@ -61,7 +61,7 @@ class DockerContainerRunner( throw ContainerRunnerException("Failed to fetch image ${configuration.imageTag}", dex) } - (1..replicas).forEach { number -> + for (number in 1..replicas) { log.info("Creating a container #$number for execution.id=$executionId") val containerId = try { createContainerFromImage(configuration, containerName(executionId, number)) diff --git a/settings.gradle.kts b/settings.gradle.kts index e8546687fe..12b40171a1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,7 +31,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version "3.13.3" + id("com.gradle.enterprise") version "3.15.1" } includeBuild("gradle/plugins") diff --git a/yarn.lock b/yarn.lock index e4a64bbdb0..0baaa9fdc7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -66,7 +66,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.13", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.1", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885" integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg== @@ -87,39 +87,6 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@date-io/core@^2.15.0": - version "2.15.0" - resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.15.0.tgz#8133860c8ce163b8d0cca3c1caed8d5d1fbfb14e" - integrity sha512-3CRvQUEK7aF87NUOwcTtmJ2Rc1kN0D4jFQUfRoanuAnE4o5HzHx4E2YenjaKjSPWeZYiWG6ZhDomx5hp1AaCJA== - -"@date-io/date-fns@^2.15.0": - version "2.15.0" - resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-2.15.0.tgz#2541144f4fc40365efd7d0b7affa5d77dbe59102" - integrity sha512-hkVeLm0jijHS2F9YVQcf0LSlD55w9xPvvIfuxDE0XWNXOTcRAAhqw2aqOxyeGbmHxc5U4HqyPZaqs9tfeTsomQ== - dependencies: - "@date-io/core" "^2.15.0" - -"@date-io/dayjs@^2.15.0": - version "2.15.0" - resolved "https://registry.yarnpkg.com/@date-io/dayjs/-/dayjs-2.15.0.tgz#474a42586e67be1108a6f68b0a2e5e6088620fb6" - integrity sha512-wgYzwaXr9KxkHNYxrOb1t8fYLfAdjIf0Q86qdVCwANObcvyGcPBm0uFtpPK7ApeE4DJUlbuG0IX75TtO+uITwQ== - dependencies: - "@date-io/core" "^2.15.0" - -"@date-io/luxon@^2.15.0": - version "2.15.0" - resolved "https://registry.yarnpkg.com/@date-io/luxon/-/luxon-2.15.0.tgz#ad5bea9c46b46230bd780dc91413f31d1967830f" - integrity sha512-CxTRCo5AM96ainnYaTpe1NS9GiA78SIgXBScgeAresCS20AvMcOd5XKerDj+y/KLhbSQbU6WUDqG9QcsrImXyQ== - dependencies: - "@date-io/core" "^2.15.0" - -"@date-io/moment@^2.15.0": - version "2.15.0" - resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-2.15.0.tgz#d6c2c88b58534d0c44644abcfefc27cb32182dd8" - integrity sha512-AcYBjl3EnEGsByaM5ir644CKbhgJsgc1iWFa9EXfdb4fQexxOC8oCdPAurK2ZDTwg62odyyKa/05YE7ElYh5ag== - dependencies: - "@date-io/core" "^2.15.0" - "@discoveryjs/json-ext@^0.5.0": version "0.5.5" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" @@ -169,14 +136,7 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.1.tgz#4ffb0055f7ef676ebc3a5a91fb621393294e2f43" integrity sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ== -"@emotion/is-prop-valid@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz#7f2d35c97891669f7e276eb71c83376a5dc44c83" - integrity sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg== - dependencies: - "@emotion/memoize" "^0.8.0" - -"@emotion/memoize@^0.8.0", "@emotion/memoize@^0.8.1": +"@emotion/memoize@^0.8.1": version "0.8.1" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17" integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA== @@ -212,6 +172,33 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6" integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww== +"@floating-ui/core@^1.4.2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.0.tgz#5c05c60d5ae2d05101c3021c1a2a350ddc027f8c" + integrity sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg== + dependencies: + "@floating-ui/utils" "^0.1.3" + +"@floating-ui/dom@^1.5.1": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.3.tgz#54e50efcb432c06c23cd33de2b575102005436fa" + integrity sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA== + dependencies: + "@floating-ui/core" "^1.4.2" + "@floating-ui/utils" "^0.1.3" + +"@floating-ui/react-dom@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.2.tgz#fab244d64db08e6bed7be4b5fcce65315ef44d20" + integrity sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ== + dependencies: + "@floating-ui/dom" "^1.5.1" + +"@floating-ui/utils@^0.1.3": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9" + integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A== + "@fortawesome/fontawesome-common-types@^0.2.35", "@fortawesome/fontawesome-common-types@^0.2.36": version "0.2.36" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz#b44e52db3b6b20523e0c57ef8c42d315532cb903" @@ -315,145 +302,110 @@ outvariant "^1.2.1" strict-event-emitter "^0.2.0" -"@mui/base@5.0.0-alpha.125": - version "5.0.0-alpha.125" - resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.125.tgz#6bb3df0760d87aa9186ed9add29b3ae96dee4aa8" - integrity sha512-hAHJJ97SATu6SrkLH/HsAayK1zMZt89lrWyKuAInBKVyn363H78d1MnwyZwre9vDK5MrPoDL/NnZxtAXhwTnBA== - dependencies: - "@babel/runtime" "^7.21.0" - "@emotion/is-prop-valid" "^1.2.0" - "@mui/types" "^7.2.4" - "@mui/utils" "^5.12.0" - "@popperjs/core" "^2.11.7" - clsx "^1.2.1" +"@mui/base@5.0.0-beta.18": + version "5.0.0-beta.18" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.18.tgz#f95d393cf80974e77c0823170cc15c854d5af84b" + integrity sha512-e9ZCy/ndhyt5MTshAS3qAUy/40UiO0jX+kAo6a+XirrPJE+rrQW+mKPSI0uyp+5z4Vh+z0pvNoJ2S2gSrNz3BQ== + dependencies: + "@babel/runtime" "^7.23.1" + "@floating-ui/react-dom" "^2.0.2" + "@mui/types" "^7.2.5" + "@mui/utils" "^5.14.12" + "@popperjs/core" "^2.11.8" + clsx "^2.0.0" prop-types "^15.8.1" - react-is "^18.2.0" - -"@mui/base@5.0.0-alpha.126": - version "5.0.0-alpha.126" - resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.126.tgz#99555a5876a60e7dad772d75eb171e3d1336321d" - integrity sha512-I5e52A0Muv9Gaoy2GcqbYrQ6dpRyC2UXeA00brT3HuW0nF0E4fiTOIqdNTN+N5gyaYK0z3O6jtLt/97CCrIxVA== - dependencies: - "@babel/runtime" "^7.21.0" - "@emotion/is-prop-valid" "^1.2.0" - "@mui/types" "^7.2.4" - "@mui/utils" "^5.12.0" - "@popperjs/core" "^2.11.7" - clsx "^1.2.1" - prop-types "^15.8.1" - react-is "^18.2.0" -"@mui/core-downloads-tracker@^5.12.1": - version "5.13.4" - resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.13.4.tgz#7e4b491d8081b6d45ae51556d82cb16b31315a19" - integrity sha512-yFrMWcrlI0TqRN5jpb6Ma9iI7sGTHpytdzzL33oskFHNQ8UgrtPas33Y1K7sWAMwCrr1qbWDrOHLAQG4tAzuSw== - -"@mui/icons-material@5.11.16": - version "5.11.16" - resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.11.16.tgz#417fa773c56672e39d6ccfed9ac55591985f0d38" - integrity sha512-oKkx9z9Kwg40NtcIajF9uOXhxiyTZrrm9nmIJ4UjkU2IdHpd4QVLbCc/5hZN/y0C6qzi2Zlxyr9TGddQx2vx2A== - dependencies: - "@babel/runtime" "^7.21.0" - -"@mui/lab@5.0.0-alpha.126": - version "5.0.0-alpha.126" - resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.126.tgz#70b35fa0c6be7a0516d5e1b2252c4a31b6f98474" - integrity sha512-Hdv0q0mO2B+S1NGkEBJcBYiapmNEMlDF4PKko+v5StB0ntLA0+U/hB8RVBbjh7eqbUyZI1/wVvLH9+HxNA6Qyw== - dependencies: - "@babel/runtime" "^7.21.0" - "@mui/base" "5.0.0-alpha.125" - "@mui/system" "^5.12.0" - "@mui/types" "^7.2.4" - "@mui/utils" "^5.12.0" - clsx "^1.2.1" +"@mui/base@^5.0.0-beta.18": + version "5.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.22.tgz#9ea6be6c8bfc4d8f825660da36d228f5315d4706" + integrity sha512-l4asGID5tmyerx9emJfXOKLyXzaBtdXNIFE3M+IrSZaFtGFvaQKHhc3+nxxSxPf1+G44psjczM0ekRQCdXx9HA== + dependencies: + "@babel/runtime" "^7.23.2" + "@floating-ui/react-dom" "^2.0.2" + "@mui/types" "^7.2.8" + "@mui/utils" "^5.14.16" + "@popperjs/core" "^2.11.8" + clsx "^2.0.0" prop-types "^15.8.1" - react-is "^18.2.0" -"@mui/material@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.12.1.tgz#3297ffc6836f426a26568332d68357c1398f0630" - integrity sha512-m+G9J6+FzIMhRqKV2y30yONH97wX107z9EWgiNCeS1/+y1CnytFZNG1ENdOuaJo1NimCRnmB/iXPvoOaSo6dOg== - dependencies: - "@babel/runtime" "^7.21.0" - "@mui/base" "5.0.0-alpha.126" - "@mui/core-downloads-tracker" "^5.12.1" - "@mui/system" "^5.12.1" - "@mui/types" "^7.2.4" - "@mui/utils" "^5.12.0" - "@types/react-transition-group" "^4.4.5" - clsx "^1.2.1" +"@mui/core-downloads-tracker@^5.14.12": + version "5.14.16" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.16.tgz#03ceb422d69a33e6c1cbd7e943cf60816878be2a" + integrity sha512-97isBjzH2v1K7oB4UH2f4NOkBShOynY6dhnoR2XlUk/g6bb7ZBv2I3D1hvvqPtpEigKu93e7f/jAYr5d9LOc5w== + +"@mui/icons-material@5.14.12": + version "5.14.12" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.14.12.tgz#6634cdc3198bc438e8d38ce591c96d63d5df99a0" + integrity sha512-aFm6g/AIB3RQN9h/4MKoBoBybLZXeR3aDHWNx6KzemEpIlElUxv5uXRX5Qk1VC6v/YPkhbaPsiLLjsRSTiZF3w== + dependencies: + "@babel/runtime" "^7.23.1" + +"@mui/material@5.14.12": + version "5.14.12" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.14.12.tgz#8fa5bebd1a096796a288b548f1ba867e068601c8" + integrity sha512-EelF2L46VcVqhg3KjzIGBBpOtcBgRh0MMy9Efuk6Do81QdcZsFC9RebCVAflo5jIdbHiBmxBs5/l5Q9NjONozg== + dependencies: + "@babel/runtime" "^7.23.1" + "@mui/base" "5.0.0-beta.18" + "@mui/core-downloads-tracker" "^5.14.12" + "@mui/system" "^5.14.12" + "@mui/types" "^7.2.5" + "@mui/utils" "^5.14.12" + "@types/react-transition-group" "^4.4.6" + clsx "^2.0.0" csstype "^3.1.2" prop-types "^15.8.1" react-is "^18.2.0" react-transition-group "^4.4.5" -"@mui/private-theming@^5.13.1": - version "5.13.1" - resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.13.1.tgz#c3e9a0b44f9c5a51b92cfcfb660536060cb61ed7" - integrity sha512-HW4npLUD9BAkVppOUZHeO1FOKUJWAwbpy0VQoGe3McUYTlck1HezGHQCfBQ5S/Nszi7EViqiimECVl9xi+/WjQ== +"@mui/private-theming@^5.14.16": + version "5.14.16" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.14.16.tgz#ffdc9a9d3deaa46af000f04c0a9cc3a982f73071" + integrity sha512-FNlL0pTSEBh8nXsVWreCHDSHk+jG8cBx1sxRbT8JVtL+PYbYPi802zfV4B00Kkf0LNRVRvAVQwojMWSR/MYGng== dependencies: - "@babel/runtime" "^7.21.0" - "@mui/utils" "^5.13.1" + "@babel/runtime" "^7.23.2" + "@mui/utils" "^5.14.16" prop-types "^15.8.1" -"@mui/styled-engine@^5.13.2": - version "5.13.2" - resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.13.2.tgz#c87bd61c0ab8086d34828b6defe97c02bcd642ef" - integrity sha512-VCYCU6xVtXOrIN8lcbuPmoG+u7FYuOERG++fpY74hPpEWkyFQG97F+/XfTQVYzlR2m7nPjnwVUgATcTCMEaMvw== +"@mui/styled-engine@^5.14.16": + version "5.14.16" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.14.16.tgz#a4a78a9980f138c2e705d04d67d44051f5005f22" + integrity sha512-FfvYvTG/Zd+KXMMImbcMYEeQAbONGuX5Vx3gBmmtB6KyA7Mvm9Pma1ly3R0gc44yeoFd+2wBjn1feS8h42HW5w== dependencies: - "@babel/runtime" "^7.21.0" + "@babel/runtime" "^7.23.2" "@emotion/cache" "^11.11.0" csstype "^3.1.2" prop-types "^15.8.1" -"@mui/system@^5.12.0", "@mui/system@^5.12.1": - version "5.13.5" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.13.5.tgz#9f67ea0c4f6974713f90b7b94c999fd3f40f8de3" - integrity sha512-n0gzUxoZ2ZHZgnExkh2Htvo9uW2oakofgPRQrDoa/GQOWyRD0NH9MDszBwOb6AAoXZb+OV5TE7I4LeZ/dzgHYA== - dependencies: - "@babel/runtime" "^7.21.0" - "@mui/private-theming" "^5.13.1" - "@mui/styled-engine" "^5.13.2" - "@mui/types" "^7.2.4" - "@mui/utils" "^5.13.1" - clsx "^1.2.1" +"@mui/system@^5.14.12": + version "5.14.16" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.14.16.tgz#5c30c5123767416358c3b73774eb985e189119a4" + integrity sha512-uKnPfsDqDs8bbN54TviAuoGWOmFiQLwNZ3Wvj+OBkJCzwA6QnLb/sSeCB7Pk3ilH4h4jQ0BHtbR+Xpjy9wlOuA== + dependencies: + "@babel/runtime" "^7.23.2" + "@mui/private-theming" "^5.14.16" + "@mui/styled-engine" "^5.14.16" + "@mui/types" "^7.2.8" + "@mui/utils" "^5.14.16" + clsx "^2.0.0" csstype "^3.1.2" prop-types "^15.8.1" -"@mui/types@^7.2.4": - version "7.2.4" - resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.4.tgz#b6fade19323b754c5c6de679a38f068fd50b9328" - integrity sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA== +"@mui/types@^7.2.5", "@mui/types@^7.2.8": + version "7.2.8" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.8.tgz#2ed4402f104d65fcd4f460ca358654c8935e2285" + integrity sha512-9u0ji+xspl96WPqvrYJF/iO+1tQ1L5GTaDOeG3vCR893yy7VcWwRNiVMmPdPNpMDqx0WV1wtEW9OMwK9acWJzQ== -"@mui/utils@^5.10.3", "@mui/utils@^5.12.0", "@mui/utils@^5.13.1": - version "5.13.1" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.13.1.tgz#86199e46014215f95da046a5ec803f4a39c96eee" - integrity sha512-6lXdWwmlUbEU2jUI8blw38Kt+3ly7xkmV9ljzY4Q20WhsJMWiNry9CX8M+TaP/HbtuyR8XKsdMgQW7h7MM3n3A== +"@mui/utils@^5.14.12", "@mui/utils@^5.14.16": + version "5.14.16" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.14.16.tgz#09a15fd45530cadc642c5c08eb6cc660ea230506" + integrity sha512-3xV31GposHkwRbQzwJJuooWpK2ybWdEdeUPtRjv/6vjomyi97F3+68l+QVj9tPTvmfSbr2sx5c/NuvDulrdRmA== dependencies: - "@babel/runtime" "^7.21.0" - "@types/prop-types" "^15.7.5" - "@types/react-is" "^18.2.0" + "@babel/runtime" "^7.23.2" + "@types/prop-types" "^15.7.9" prop-types "^15.8.1" react-is "^18.2.0" -"@mui/x-date-pickers@5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-5.0.4.tgz#79a509354eea4bedaa955ee52f37d80256d7e415" - integrity sha512-Co4tbwqXSdHfR8UoZSHQpDZqnFdikzQr0lQPG2AjGh9BdB4EdY3YE2+sZyAltjk/AXxp5JzIWDZ2Kj83ClzjwA== - dependencies: - "@babel/runtime" "^7.18.9" - "@date-io/core" "^2.15.0" - "@date-io/date-fns" "^2.15.0" - "@date-io/dayjs" "^2.15.0" - "@date-io/luxon" "^2.15.0" - "@date-io/moment" "^2.15.0" - "@mui/utils" "^5.10.3" - "@types/react-transition-group" "^4.4.5" - clsx "^1.2.1" - prop-types "^15.7.2" - react-transition-group "^4.4.5" - rifm "^0.12.1" - "@open-draft/until@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca" @@ -464,7 +416,7 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@popperjs/core@^2.0.0", "@popperjs/core@^2.11.7", "@popperjs/core@^2.11.8": +"@popperjs/core@^2.0.0", "@popperjs/core@^2.11.8": version "2.11.8" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== @@ -502,27 +454,27 @@ dependencies: "@react-sigma/layout-core" "^3.1.0" -"@remix-run/router@1.6.3", "@remix-run/router@^1.6.3": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.6.3.tgz#8205baf6e17ef93be35bf62c37d2d594e9be0dad" - integrity sha512-EXJysQ7J3veRECd0kZFQwYYd5sJMcq2O/m60zu1W2l3oVQ9xtub8jTOtYRE0+M2iomyG/W3Ps7+vp2kna0C27Q== +"@remix-run/router@1.10.0", "@remix-run/router@^1.9.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.10.0.tgz#e2170dc2049b06e65bbe883adad0e8ddf8291278" + integrity sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw== "@socket.io/base64-arraybuffer@~1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61" integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ== -"@tanstack/react-table@^8.9.2": - version "8.9.2" - resolved "https://registry.yarnpkg.com/@tanstack/react-table/-/react-table-8.9.2.tgz#31b9e72387b888fca200d3397d11cc1baf7fa841" - integrity sha512-Irvw4wqVF9hhuYzmNrlae4IKdlmgSyoRWnApSLebvYzqHoi5tEsYzBj6YPd0hX78aB/L+4w/jgK2eBQVpGfThQ== +"@tanstack/react-table@^8.10.0": + version "8.10.7" + resolved "https://registry.yarnpkg.com/@tanstack/react-table/-/react-table-8.10.7.tgz#733f4bee8cf5aa19582f944dd0fd3224b21e8c94" + integrity sha512-bXhjA7xsTcsW8JPTTYlUg/FuBpn8MNjiEPhkNhIGCUR6iRQM2+WEco4OBpvDeVcR9SE+bmWLzdfiY7bCbCSVuA== dependencies: - "@tanstack/table-core" "8.9.2" + "@tanstack/table-core" "8.10.7" -"@tanstack/table-core@8.9.2", "@tanstack/table-core@^8.9.2": - version "8.9.2" - resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.9.2.tgz#0402364a2a9692edf04e05ee6f385dfa27271da5" - integrity sha512-ajc0OF+karBAdaSz7OK09rCoAHB1XI1+wEhu+tDNMPc+XcO+dTlXXN/Vc0a8vym4kElvEjXEDd9c8Zfgt4bekA== +"@tanstack/table-core@8.10.7", "@tanstack/table-core@^8.10.0": + version "8.10.7" + resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.10.7.tgz#577e8a635048875de4c9d6d6a3c21d26ff9f9d08" + integrity sha512-KQk5OMg5OH6rmbHZxuNROvdI+hKDIUxANaHlV+dPlNN7ED3qYQ/WkpY2qlXww1SIdeMlkIhpN/2L00rof0fXFw== "@testing-library/dom@^8.5.0": version "8.13.0" @@ -725,10 +677,10 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prop-types@*", "@types/prop-types@^15.0.0", "@types/prop-types@^15.7.5": - version "15.7.5" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" - integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== +"@types/prop-types@*", "@types/prop-types@^15.0.0", "@types/prop-types@^15.7.9": + version "15.7.9" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.9.tgz#b6f785caa7ea1fe4414d9df42ee0ab67f23d8a6d" + integrity sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g== "@types/qs@*": version "6.9.7" @@ -747,17 +699,10 @@ dependencies: "@types/react" "*" -"@types/react-is@^18.2.0": - version "18.2.0" - resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-18.2.0.tgz#2f5137853a46017b3d56447940fb3eb92bbf24a5" - integrity sha512-1vz2yObaQkLL7YFe/pme2cpvDsCwI1WXIfL+5eLz0MI9gFG24Re16RzUsI8t9XZn9ZWvgLNDrJBmrqXJO7GNQQ== - dependencies: - "@types/react" "*" - -"@types/react-transition-group@^4.4.5": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416" - integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA== +"@types/react-transition-group@^4.4.6": + version "4.4.8" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.8.tgz#46f87d80512959cac793ecc610a93d80ef241ccf" + integrity sha512-QmQ22q+Pb+HQSn04NL3HtrqHwYMf4h3QKArOy5F8U5nEVMaihBs3SR10WiOM1iwPz5jIo8x/u11al+iEGZZrvg== dependencies: "@types/react" "*" @@ -1710,10 +1655,10 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clsx@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" - integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== +clsx@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.0.0.tgz#12658f3fd98fafe62075595a5c30e43d18f3d00b" + integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q== co@^4.6.0: version "4.6.0" @@ -5321,20 +5266,20 @@ react-modal@^3.0.0: react-lifecycles-compat "^3.0.0" warning "^4.0.3" -react-router-dom@6.12.0: - version "6.12.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.12.0.tgz#372279caaaa1ffb0204926c83e93a139b112d861" - integrity sha512-UzLwZ3ZVaDr6YV0HdjwxuwtDKgwpJx9o1ea9fU0HV4tTvzdB8WPHzlLFMo5orchpIS84e8G4Erlhu7Rl84XDFQ== +react-router-dom@^6.16.0: + version "6.17.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.17.0.tgz#ea73f89186546c1cf72b10fcb7356d874321b2ad" + integrity sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ== dependencies: - "@remix-run/router" "1.6.3" - react-router "6.12.0" + "@remix-run/router" "1.10.0" + react-router "6.17.0" -react-router@6.12.0: - version "6.12.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.12.0.tgz#1afae9219c24c8611809469d7a386c8023ade39a" - integrity sha512-/tCGtLq9umxRvbYeIx3j94CmpQfue0E3qnetVm9luKhu58cR4t+3O4ZrQXBdXfJrBATOAj+wF/1ihJJQI8AoTw== +react-router@6.17.0, react-router@^6.16.0: + version "6.17.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.17.0.tgz#7b680c4cefbc425b57537eb9c73bedecbdc67c1e" + integrity sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA== dependencies: - "@remix-run/router" "1.6.3" + "@remix-run/router" "1.10.0" react-scroll-motion@^0.3.0: version "0.3.0" @@ -5538,11 +5483,6 @@ rfdc@^1.3.0: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== -rifm@^0.12.1: - version "0.12.1" - resolved "https://registry.yarnpkg.com/rifm/-/rifm-0.12.1.tgz#8fa77f45b7f1cda2a0068787ac821f0593967ac4" - integrity sha512-OGA1Bitg/dSJtI/c4dh90svzaUPt228kzFsUkJbtA2c964IqEAwWXeL9ZJi86xWv3j5SMqRvGULl7bA6cK0Bvg== - rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"