From e0749bfff50024cec2f10b4a3c8ba83e02b3d55d Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 13:27:07 +0900 Subject: [PATCH 01/17] =?UTF-8?q?feat:=20loader=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=EC=A0=95=EB=B3=B4=20prefetch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/src/hooks/query/useGetUserInfo.ts | 18 ++++++++++-------- packages/user/src/routes/loader/index.ts | 10 +++++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/packages/user/src/hooks/query/useGetUserInfo.ts b/packages/user/src/hooks/query/useGetUserInfo.ts index e8457db0..6649f6d7 100644 --- a/packages/user/src/hooks/query/useGetUserInfo.ts +++ b/packages/user/src/hooks/query/useGetUserInfo.ts @@ -6,25 +6,21 @@ import http from 'src/services/api/index.ts'; import QUERY_KEYS from 'src/services/api/queryKey.ts'; import CustomError from 'src/utils/error.ts'; -export type UserResponse = { +export interface UserInfoResponse { userId: string; userName: string; team: ServerCategoryEnum | null; url: string | null; -}; +} export default function useGetUserInfo() { - const { isAuthenticated, token, clearAuthData } = useAuth(); + const { token, clearAuthData } = useAuth(); const { data: userInfo, status, ...props - } = useQuery({ - queryKey: [QUERY_KEYS.USER_INFO, token], - queryFn: () => http.get('/user-info'), - enabled: isAuthenticated, - }); + } = useQuery(userInfoQueryOptions(token)); useEffect(() => { if (status === 'error') { @@ -35,3 +31,9 @@ export default function useGetUserInfo() { return { userInfo, ...props }; } + +export const userInfoQueryOptions = (token: string | null) => ({ + queryKey: [QUERY_KEYS.USER_INFO, token], + queryFn: () => http.get('/user-info'), + enabled: Boolean(token), +}); diff --git a/packages/user/src/routes/loader/index.ts b/packages/user/src/routes/loader/index.ts index f8c80299..b66d8161 100644 --- a/packages/user/src/routes/loader/index.ts +++ b/packages/user/src/routes/loader/index.ts @@ -1,5 +1,8 @@ +import { ACCESS_TOKEN_KEY } from '@softeer/common/constants'; +import { Cookie } from '@softeer/common/utils'; import { defer } from 'react-router-dom'; import { EventDuration, eventDurationQueryOptions } from 'src/hooks/query/useGetEventDuration.ts'; +import { userInfoQueryOptions } from 'src/hooks/query/useGetUserInfo.ts'; import { queryClient } from 'src/libs/query/index.tsx'; import QUERY_KEYS from 'src/services/api/queryKey.ts'; import CustomError from 'src/utils/error.ts'; @@ -8,11 +11,16 @@ export default async function indexLoader() { await queryClient.prefetchQuery(eventDurationQueryOptions); const duration = queryClient.getQueryData([QUERY_KEYS.EVENT_DURATION]); - if (!duration) { throw new CustomError('이벤트 기간 데이터를 불러올 수 없습니다.', 500); } + const token = Cookie.getCookie(ACCESS_TOKEN_KEY); + + if (token) { + await queryClient.prefetchQuery(userInfoQueryOptions(token)); + } + const currentTime = new Date(); const startTime = new Date(duration.startTime); From d3787e3bdd2430d6f0eb9bf6a503dc80497d089d Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 13:27:32 +0900 Subject: [PATCH 02/17] =?UTF-8?q?feat:=20global=20loading=20component=20?= =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=EB=B6=80=EB=B6=84=20=EB=8B=A4?= =?UTF-8?q?=EC=8B=9C=20=EC=B1=84=EC=9A=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/user/src/App.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/user/src/App.tsx b/packages/user/src/App.tsx index 449a01ad..d8c0c5d7 100644 --- a/packages/user/src/App.tsx +++ b/packages/user/src/App.tsx @@ -1,6 +1,7 @@ import { RouterProvider } from 'react-router-dom'; import ToasterStack from 'src/components/common/toast/ToasterStack.tsx'; import GlobalErrorBoundary from 'src/components/layout/GlobalErrorBoundary.tsx'; +import LayoutSuspenseFallback from 'src/components/layout/LayoutSuspenseFallback.tsx'; import AppProviders from 'src/libs/index.tsx'; import router from 'src/routes/router.tsx'; import CasperCursor from './components/cursor/CasperCursor.tsx'; @@ -8,12 +9,12 @@ import useCursor from './hooks/useCursor.ts'; export default function App() { useCursor(); + return ( <> - {/* TODO: create global loading component */} - loading...} /> + } /> From dc7fe3acfcc20ebfe5daf57840e814726e21f2b1 Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 13:37:39 +0900 Subject: [PATCH 03/17] =?UTF-8?q?feat:=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20prefetch=20=EB=A1=9C=EC=A7=81=20=EC=9C=84=EC=B9=98?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/user/src/routes/loader/index.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/user/src/routes/loader/index.ts b/packages/user/src/routes/loader/index.ts index b66d8161..bf462af0 100644 --- a/packages/user/src/routes/loader/index.ts +++ b/packages/user/src/routes/loader/index.ts @@ -11,16 +11,11 @@ export default async function indexLoader() { await queryClient.prefetchQuery(eventDurationQueryOptions); const duration = queryClient.getQueryData([QUERY_KEYS.EVENT_DURATION]); + if (!duration) { throw new CustomError('이벤트 기간 데이터를 불러올 수 없습니다.', 500); } - const token = Cookie.getCookie(ACCESS_TOKEN_KEY); - - if (token) { - await queryClient.prefetchQuery(userInfoQueryOptions(token)); - } - const currentTime = new Date(); const startTime = new Date(duration.startTime); @@ -28,5 +23,11 @@ export default async function indexLoader() { throw new CustomError('이벤트가 아직 시작되지 않았습니다.', 403); } + const token = Cookie.getCookie(ACCESS_TOKEN_KEY); + + if (token) { + await queryClient.prefetchQuery(userInfoQueryOptions(token)); + } + return defer({ duration }); } From fb9c4711710a713fd1cae86bce995a5c4f2012fa Mon Sep 17 00:00:00 2001 From: racgoo Date: Mon, 19 Aug 2024 14:17:09 +0900 Subject: [PATCH 04/17] fix(yarn): yarn-lock update --- yarn.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index b08fbeda..f68fa276 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6635,7 +6635,6 @@ __metadata: tailwind-merge: "npm:^2.4.0" tailwindcss: "npm:^3.4.6" typescript: "npm:^5.5.4" - xlsx: "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz" languageName: unknown linkType: soft From 9a79b7ad7593298aa1f39c287993942c1e401dab Mon Sep 17 00:00:00 2001 From: racgoo Date: Mon, 19 Aug 2024 14:28:28 +0900 Subject: [PATCH 05/17] =?UTF-8?q?fix(cursor):=20=EC=BB=A4=EC=84=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=8B=9C=EA=B3=84=20=ED=94=8C?= =?UTF-8?q?=EB=A6=BD=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/hooks/socket/useChatSocket.ts | 1 - packages/common/src/utils/socket.ts | 1 + .../src/components/cursor/CasperCursor.tsx | 2 +- .../src/components/shared/timer/TimeUnit.tsx | 25 ++++--------------- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/packages/admin/src/hooks/socket/useChatSocket.ts b/packages/admin/src/hooks/socket/useChatSocket.ts index 809144d8..d1cf060e 100644 --- a/packages/admin/src/hooks/socket/useChatSocket.ts +++ b/packages/admin/src/hooks/socket/useChatSocket.ts @@ -9,7 +9,6 @@ export type UseChatSocketReturnType = ReturnType; export default function useChatSocket() { // const { toast } = useToast(); - const socketClient = socketManager.getSocketClient(); const [chatMessages, setChatMessages] = useState([]); diff --git a/packages/common/src/utils/socket.ts b/packages/common/src/utils/socket.ts index 7ac86ba4..c6ce46ca 100644 --- a/packages/common/src/utils/socket.ts +++ b/packages/common/src/utils/socket.ts @@ -33,6 +33,7 @@ export default class Socket { } private setup(url: string): Client { + console.log(url); const stompClient = new Client({ webSocketFactory: () => new SockJS(`${url}/ws`), connectHeaders: this.headers, diff --git a/packages/user/src/components/cursor/CasperCursor.tsx b/packages/user/src/components/cursor/CasperCursor.tsx index 852ccd29..713751f2 100644 --- a/packages/user/src/components/cursor/CasperCursor.tsx +++ b/packages/user/src/components/cursor/CasperCursor.tsx @@ -12,7 +12,7 @@ function CasperCursor() { }} > 커서 diff --git a/packages/user/src/components/shared/timer/TimeUnit.tsx b/packages/user/src/components/shared/timer/TimeUnit.tsx index 2dc8e2ca..d04951a8 100644 --- a/packages/user/src/components/shared/timer/TimeUnit.tsx +++ b/packages/user/src/components/shared/timer/TimeUnit.tsx @@ -1,34 +1,19 @@ -import { memo, useEffect, useState } from 'react'; +import { memo } from 'react'; interface TimeUnitProps { value: number; label: string; } -const TimeUnit = memo(({ value, label }: TimeUnitProps) => { - const [animation, setAnimation] = useState('animate-fold'); - useEffect(() => { - setTimeout(() => { - setAnimation('animate-fold'); - }, 0); - setTimeout(() => { - setAnimation('animate-unfold'); - }, 500); - }, [value]); - - return
+const TimeUnit = memo(({ value, label }: TimeUnitProps) => ( +

{value < 10 ? `0${value}` : value}

-
-

- {value < 10 ? `0${value}` : value} -

-

{label}

-
; -}); +
+)); export default TimeUnit; From acf019ea1e2c0b92d72e96699edbbbaa05d556bb Mon Sep 17 00:00:00 2001 From: racgoo Date: Mon, 19 Aug 2024 14:34:00 +0900 Subject: [PATCH 06/17] =?UTF-8?q?feat(s3):=20=EB=B0=B0=ED=8F=AC=20?= =?UTF-8?q?=EC=9D=B4=EC=A0=84=20s3=20=EB=B2=84=ED=82=B7=20=ED=81=B4?= =?UTF-8?q?=EB=A6=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dd73af1f..9093f446 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,6 +35,13 @@ jobs: - name: Build User run: yarn run build:user + - name: Clear Admin S3 Bucket + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: | + aws s3 rm s3://yangbong-admin --recursive --region ap-northeast-2 + - name: Deploy-Admin env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -45,6 +52,13 @@ jobs: --region ap-northeast-2 \ packages/admin/dist s3://yangbong-admin + - name: Clear User S3 Bucket + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: | + aws s3 rm s3://yangbong-front --recursive --region ap-northeast-2 + - name: Deploy-User env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} From f5ae228da865e27ce3ce7e486e2a5e0a33665b9f Mon Sep 17 00:00:00 2001 From: racgoo Date: Mon, 19 Aug 2024 15:19:17 +0900 Subject: [PATCH 07/17] =?UTF-8?q?fix(cursor):=20=EB=A7=88=EC=9A=B0?= =?UTF-8?q?=EC=8A=A4=20=EC=BB=A4=EC=84=9C=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F?= =?UTF-8?q?=20.env=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/src/utils/socket.ts | 1 - packages/user/public/cursor/cursor-50.png | Bin 818 -> 1889 bytes 2 files changed, 1 deletion(-) diff --git a/packages/common/src/utils/socket.ts b/packages/common/src/utils/socket.ts index c6ce46ca..7ac86ba4 100644 --- a/packages/common/src/utils/socket.ts +++ b/packages/common/src/utils/socket.ts @@ -33,7 +33,6 @@ export default class Socket { } private setup(url: string): Client { - console.log(url); const stompClient = new Client({ webSocketFactory: () => new SockJS(`${url}/ws`), connectHeaders: this.headers, diff --git a/packages/user/public/cursor/cursor-50.png b/packages/user/public/cursor/cursor-50.png index 653c2869e2b88b9fa0b71966a4a4420cfff091e2..931ce7815096e3cbbb5b4aad72ba82711064b583 100644 GIT binary patch delta 1881 zcmV-f2d4P42H_4iiBL{Q4GJ0x0000DNk~Le0000l0000n2nGNE080DtM*si-32;bR za{vGf6951U69E94oEVWdAAbh+Nklq@(Zoc`!iXUX2_OlC zm%Jat^!t9!rGEwnrZBge-sI%|FDLhW_dDM?=b}=!;rII;up*dO{eKTe)CSLLU>$UT z&ZtNqSR^N+?id&t*oApqtTNIaa0p!-m6eswl9G~`rKP3Iot>Tj-rin3_SZ+O1F|q$ zbU{IZ3v*mcOH0}(Gu6W4oy zenBwwX*w4`O4pF(!YRE7?mjxGglY>53*YjcG5T-;d3kxUHuUqWtE(%5p>KD9)F55B zdp$ipNBK;DL%AIt9i4do{P}*|8_O4#@@Vwq;^MrxFMoXU7PbT9MYj*N_a zasB%Bb%BoeEx3*eMX9zsEc7vljJ^_d>EP__>~E0LJ2f>m>)ta)fPTJ|Bu0W)*E?<) z(YLt275d7S%s99kf$xYuK)5YQ(a5kALn=*{3?ZYhE!a02eH4EmNNzFXfD+|VtLS@y ze&M4>kAJR&g8pVE=>JLdrJqn?AEF3$-OrDSiFs#!ets|%^wlP@!QdwPq$d|2cJr|2_z+0j=ff>(22%4I9-V%{MgUBsuYXvR1ZLe}=#$TrlaoEDcc#vrJGUkJ zC@Z>%zDTDz?x&@tCF+VZ82WUmwYBvdI8ldeJ9P2l#VyfCM*d7nax>i5^}em*EWCU7 z?j<|=%&J_l)9HMlcKY<`Pq+(BO-&Y^R1ox8fl5*gKl-}c3as}7(I;j4`ugr*;m2`* zjDIuiy{Au~{!Vq-sAN!rK7OYG*G^LnOJK#hPI(xp*REar5>Ayeq2bvP%w==}?|up9 zfS^C|`0?X(BUv}F*R^F`3w@#v?!M$bzA0cEiTM!j4`VKc14rB1+P)qh9-a!UIF+Dp zYgkm+hppmVhdwLG!NI}XxIcvF``8EbJ%8!NZ{WlcIshkYHwt9#2>W89uT1H_?zXh@ z;1RR#;pyq=?h6+#e8`gr+-JeLG#b9i#{E7zg}DS)e&)=XkLdsd+3osaii(PAH05oK6CDSf*)HC@cYjZ# zZ^i+w`#k5t{T@Ml4=h8nF{O{GKMt0J(>N|D7vH^wxd=|Yi}_erSJ%(>K-SGV0Wwna z+fN#JvP=g^AWi4SLOIXM}I6OBqGk-G=Cl;|QzLO_U`iLT~{l&$_%bA&(3$Qs*Y9=~5 zdIrBS3!BI9ER~m+x1wSH{N~M@FVCJmtD2jelS@lWzlTHk#7xO!p$~KMoQ9RBH14hq z5VKTDDo9Uqa&iiG>2<1-T9s4MsHCBx;UiFHfF}=Z7m?iZnuz#bQ>*wO5>>ywW+Bv447ho5P}*EGkCF0j@J(*>r>@h$K7iP_)To!fg%xcQK)c zn{hxj!gVTh1{Y6y+0XZ#DnbTx1_$*VG+IQturf6@OUv6&h3XU7Oa0~i~ z`@5<}6;6;wY<$+%h=u#`ens9#7t<832;bR za{vGZi2wivi2-eBo%)eBAAbVJNkl&z!DJf@84SkoPQ;Pk8L3@(k+L-%;Z?>2MWL_fb>9c} z(a3K|4?ModoW#GE*K0BwA<|yj6cJPn}78ilarGw7*jf( zKH1*hK58@?!>mtG(nqt|wR&u0W8;(PfarF+`D`}(k*uh!UawCxnYd5|(PFXu z@ja19914e$g-$M@VpOU^N;&|_d0IGFZxE_O3%a(pww_B>NPiiPM&+xZKUl3+Gb(DN zyQ0G3@EKK*R0VP|b5Ys;wF-83cYoRK_NGFiI8&)qVQkWwcRHP^si~>gi;IhOacwf0 zWU*N6O(+zScQ2$WW@l&l_4V}^_~~9C5O|FId>4~WDr&XbjNHq|c|0DCUaue8+1YuT zN~KPb_*-yD7k}*b{QUeQ-0H7l*+RwfrE&p7Dm;68dr!z29z>JDV7P|)F@*0vk{lf$ z9~Ud?nJg7pOhyAbX!F6rK_kXWoSLf40gk}Q-CQpBfs&8A^Q}-Q*qIzqGh*juYw&u# zYC0j2!e=s>Z1e)-w~2#;gI8;7Yd_Jr-pYOm1t*>E*J3rzAuQBS%%B_j@vf|_JirtG zrCcuCSRbKuI2>1ChoEK{VY-8!a+S%s-T#7640@1GZWnSS@1^Yl9OZ}_7g;7K=${P1 fN!OTX{{z1PL}pKJsshjv00000NkvXXu0mjf^PY6k From 1ec5d135218e70bb1639988dcb1e8efe3854d841 Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 15:26:15 +0900 Subject: [PATCH 08/17] =?UTF-8?q?feat:=20header=EA=B0=80=20=EC=95=84?= =?UTF-8?q?=EB=8B=8C=20query=20string=EC=9C=BC=EB=A1=9C=20token=20?= =?UTF-8?q?=EC=A0=84=EB=8B=AC=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/src/utils/socket.ts | 20 +- yarn.lock | 1154 ++++++++++----------------- 2 files changed, 433 insertions(+), 741 deletions(-) diff --git a/packages/common/src/utils/socket.ts b/packages/common/src/utils/socket.ts index 7ac86ba4..e61e27fd 100644 --- a/packages/common/src/utils/socket.ts +++ b/packages/common/src/utils/socket.ts @@ -25,17 +25,20 @@ export default class Socket { private subscriptions: Map = new Map(); - private headers?: Record = {}; + private token?: string | undefined | null = undefined; constructor(url: string, token?: string | null) { - this.client = this.setup(url); - this.headers = token ? { Authorization: token } : {}; + let baseUrl = url; + if (token) { + this.token = token; + baseUrl += `?Authorization=${token}`; + } + this.client = this.setup(baseUrl); } private setup(url: string): Client { const stompClient = new Client({ - webSocketFactory: () => new SockJS(`${url}/ws`), - connectHeaders: this.headers, + webSocketFactory: () => new SockJS(url), reconnectDelay: 5000, // Reconnect if the connection drops }); this.client = stompClient; @@ -63,15 +66,14 @@ export default class Socket { } } - sendMessages({ destination, body, headers = {} }: SendMessageProps) { - if (!this.headers?.Authorization) { + sendMessages({ destination, body }: SendMessageProps) { + if (!this.token) { throw new Error('로그인 후 참여할 수 있어요!'); } const messageProps = { destination, body: JSON.stringify(body), - headers: { ...this.headers, ...headers }, }; if (!this.client.connected) { @@ -86,7 +88,7 @@ export default class Socket { private createSubscription({ destination, callback, headers = {} }: SubscriptionProps) { const subscriptionProps = { destination, - headers: { ...this.headers, ...headers }, + headers, callback: (message: IMessage) => { const messageId = message.headers['message-id']; const data = JSON.parse(message.body); diff --git a/yarn.lock b/yarn.lock index b08fbeda..bba1e1fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32,86 +32,58 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.24.8": - version: 7.24.9 - resolution: "@babel/compat-data@npm:7.24.9" - checksum: 10c0/95a69c9ed00ae78b4921f33403e9b35518e6139a0c46af763c65dea160720cb57c6cc23f7d30249091a0248335b0e39de5c8dfa8e7877c830e44561e0bdc1254 +"@babel/compat-data@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/compat-data@npm:7.25.2" + checksum: 10c0/5bf1f14d6e5f0d37c19543e99209ff4a94bb97915e1ce01e5334a144aa08cd56b6e62ece8135dac77e126723d63d4d4b96fc603a12c43b88c28f4b5e070270c5 languageName: node linkType: hard "@babel/core@npm:^7.21.3, @babel/core@npm:^7.24.5": - version: 7.24.9 - resolution: "@babel/core@npm:7.24.9" + version: 7.25.2 + resolution: "@babel/core@npm:7.25.2" dependencies: "@ampproject/remapping": "npm:^2.2.0" "@babel/code-frame": "npm:^7.24.7" - "@babel/generator": "npm:^7.24.9" - "@babel/helper-compilation-targets": "npm:^7.24.8" - "@babel/helper-module-transforms": "npm:^7.24.9" - "@babel/helpers": "npm:^7.24.8" - "@babel/parser": "npm:^7.24.8" - "@babel/template": "npm:^7.24.7" - "@babel/traverse": "npm:^7.24.8" - "@babel/types": "npm:^7.24.9" + "@babel/generator": "npm:^7.25.0" + "@babel/helper-compilation-targets": "npm:^7.25.2" + "@babel/helper-module-transforms": "npm:^7.25.2" + "@babel/helpers": "npm:^7.25.0" + "@babel/parser": "npm:^7.25.0" + "@babel/template": "npm:^7.25.0" + "@babel/traverse": "npm:^7.25.2" + "@babel/types": "npm:^7.25.2" convert-source-map: "npm:^2.0.0" debug: "npm:^4.1.0" gensync: "npm:^1.0.0-beta.2" json5: "npm:^2.2.3" semver: "npm:^6.3.1" - checksum: 10c0/e104ec6efbf099f55184933e9ab078eb5821c792ddfef3e9c6561986ec4ff103f5c11e3d7d6e5e8929e50e2c58db1cc80e5b6f14b530335b6622095ec4b4124c + checksum: 10c0/a425fa40e73cb72b6464063a57c478bc2de9dbcc19c280f1b55a3d88b35d572e87e8594e7d7b4880331addb6faef641bbeb701b91b41b8806cd4deae5d74f401 languageName: node linkType: hard -"@babel/generator@npm:^7.24.8, @babel/generator@npm:^7.24.9": - version: 7.24.10 - resolution: "@babel/generator@npm:7.24.10" +"@babel/generator@npm:^7.25.0": + version: 7.25.0 + resolution: "@babel/generator@npm:7.25.0" dependencies: - "@babel/types": "npm:^7.24.9" + "@babel/types": "npm:^7.25.0" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10c0/abcfd75f625aecc87ce6036ef788b12723fd3c46530df1130d1f00d18e48b462849ddaeef8b1a02bfdcb6e28956389a98c5729dad1c3c5448307dacb6c959f29 + checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7 languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/helper-compilation-targets@npm:7.24.8" +"@babel/helper-compilation-targets@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/helper-compilation-targets@npm:7.25.2" dependencies: - "@babel/compat-data": "npm:^7.24.8" + "@babel/compat-data": "npm:^7.25.2" "@babel/helper-validator-option": "npm:^7.24.8" browserslist: "npm:^4.23.1" lru-cache: "npm:^5.1.1" semver: "npm:^6.3.1" - checksum: 10c0/2885c44ef6aaf82b7e4352b30089bb09fbe08ed5ec24eb452c2bdc3c021e2a65ab412f74b3d67ec1398da0356c730b33a2ceca1d67d34c85080d31ca6efa9aec - languageName: node - linkType: hard - -"@babel/helper-environment-visitor@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-environment-visitor@npm:7.24.7" - dependencies: - "@babel/types": "npm:^7.24.7" - checksum: 10c0/36ece78882b5960e2d26abf13cf15ff5689bf7c325b10a2895a74a499e712de0d305f8d78bb382dd3c05cfba7e47ec98fe28aab5674243e0625cd38438dd0b2d - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-function-name@npm:7.24.7" - dependencies: - "@babel/template": "npm:^7.24.7" - "@babel/types": "npm:^7.24.7" - checksum: 10c0/e5e41e6cf86bd0f8bf272cbb6e7c5ee0f3e9660414174435a46653efba4f2479ce03ce04abff2aa2ef9359cf057c79c06cb7b134a565ad9c0e8a50dcdc3b43c4 - languageName: node - linkType: hard - -"@babel/helper-hoist-variables@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-hoist-variables@npm:7.24.7" - dependencies: - "@babel/types": "npm:^7.24.7" - checksum: 10c0/19ee37563bbd1219f9d98991ad0e9abef77803ee5945fd85aa7aa62a67c69efca9a801696a1b58dda27f211e878b3327789e6fd2a6f6c725ccefe36774b5ce95 + checksum: 10c0/de10e986b5322c9f807350467dc845ec59df9e596a5926a3b5edbb4710d8e3b8009d4396690e70b88c3844fe8ec4042d61436dd4b92d1f5f75655cf43ab07e99 languageName: node linkType: hard @@ -125,18 +97,17 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.24.9": - version: 7.24.9 - resolution: "@babel/helper-module-transforms@npm:7.24.9" +"@babel/helper-module-transforms@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/helper-module-transforms@npm:7.25.2" dependencies: - "@babel/helper-environment-visitor": "npm:^7.24.7" "@babel/helper-module-imports": "npm:^7.24.7" "@babel/helper-simple-access": "npm:^7.24.7" - "@babel/helper-split-export-declaration": "npm:^7.24.7" "@babel/helper-validator-identifier": "npm:^7.24.7" + "@babel/traverse": "npm:^7.25.2" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10c0/e27bca43bc113731ee4f2b33a4c5bf9c7eebf4d64487b814c305cbd5feb272c29fcd3d79634ba03131ade171e5972bc7ede8dbc83ba0deb02f1e62d318c87770 + checksum: 10c0/adaa15970ace0aee5934b5a633789b5795b6229c6a9cf3e09a7e80aa33e478675eee807006a862aa9aa517935d81f88a6db8a9f5936e3a2a40ec75f8062bc329 languageName: node linkType: hard @@ -157,15 +128,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/helper-split-export-declaration@npm:7.24.7" - dependencies: - "@babel/types": "npm:^7.24.7" - checksum: 10c0/0254577d7086bf09b01bbde98f731d4fcf4b7c3fa9634fdb87929801307c1f6202a1352e3faa5492450fa8da4420542d44de604daf540704ff349594a78184f6 - languageName: node - linkType: hard - "@babel/helper-string-parser@npm:^7.24.8": version: 7.24.8 resolution: "@babel/helper-string-parser@npm:7.24.8" @@ -187,13 +149,13 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/helpers@npm:7.24.8" +"@babel/helpers@npm:^7.25.0": + version: 7.25.0 + resolution: "@babel/helpers@npm:7.25.0" dependencies: - "@babel/template": "npm:^7.24.7" - "@babel/types": "npm:^7.24.8" - checksum: 10c0/42b8939b0a0bf72d6df9721973eb0fd7cd48f42641c5c9c740916397faa586255c06d36c6e6a7e091860723096281c620f6ffaee0011a3bb254a6f5475d89a12 + "@babel/template": "npm:^7.25.0" + "@babel/types": "npm:^7.25.0" + checksum: 10c0/b7fe007fc4194268abf70aa3810365085e290e6528dcb9fbbf7a765d43c74b6369ce0f99c5ccd2d44c413853099daa449c9a0123f0b212ac8d18643f2e8174b8 languageName: node linkType: hard @@ -209,12 +171,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/parser@npm:7.24.8" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3": + version: 7.25.3 + resolution: "@babel/parser@npm:7.25.3" + dependencies: + "@babel/types": "npm:^7.25.2" bin: parser: ./bin/babel-parser.js - checksum: 10c0/ce69671de8fa6f649abf849be262707ac700b573b8b1ce1893c66cc6cd76aeb1294a19e8c290b0eadeb2f47d3f413a2e57a281804ffbe76bfb9fa50194cf3c52 + checksum: 10c0/874b01349aedb805d6694f867a752fdc7469778fad76aca4548d2cc6ce96087c3ba5fb917a6f8d05d2d1a74aae309b5f50f1a4dba035f5a2c9fcfe6e106d2c4e languageName: node linkType: hard @@ -249,54 +213,40 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/template@npm:7.24.7" +"@babel/template@npm:^7.25.0": + version: 7.25.0 + resolution: "@babel/template@npm:7.25.0" dependencies: "@babel/code-frame": "npm:^7.24.7" - "@babel/parser": "npm:^7.24.7" - "@babel/types": "npm:^7.24.7" - checksum: 10c0/95b0b3ee80fcef685b7f4426f5713a855ea2cd5ac4da829b213f8fb5afe48a2a14683c2ea04d446dbc7f711c33c5cd4a965ef34dcbe5bc387c9e966b67877ae3 + "@babel/parser": "npm:^7.25.0" + "@babel/types": "npm:^7.25.0" + checksum: 10c0/4e31afd873215744c016e02b04f43b9fa23205d6d0766fb2e93eb4091c60c1b88897936adb895fb04e3c23de98dfdcbe31bc98daaa1a4e0133f78bb948e1209b languageName: node linkType: hard -"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8": - version: 7.24.8 - resolution: "@babel/traverse@npm:7.24.8" +"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.25.2": + version: 7.25.3 + resolution: "@babel/traverse@npm:7.25.3" dependencies: "@babel/code-frame": "npm:^7.24.7" - "@babel/generator": "npm:^7.24.8" - "@babel/helper-environment-visitor": "npm:^7.24.7" - "@babel/helper-function-name": "npm:^7.24.7" - "@babel/helper-hoist-variables": "npm:^7.24.7" - "@babel/helper-split-export-declaration": "npm:^7.24.7" - "@babel/parser": "npm:^7.24.8" - "@babel/types": "npm:^7.24.8" + "@babel/generator": "npm:^7.25.0" + "@babel/parser": "npm:^7.25.3" + "@babel/template": "npm:^7.25.0" + "@babel/types": "npm:^7.25.2" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10c0/67a5cc35824455cdb54fb9e196a44b3186283e29018a9c2331f51763921e18e891b3c60c283615a27540ec8eb4c8b89f41c237b91f732a7aa518b2eb7a0d434d + checksum: 10c0/4c8a1966fa90b53a783a4afd2fcdaa6ab1a912e6621dca9fcc6633e80ccb9491620e88caf73b537da4e16cefd537b548c87d7087868d5b0066414dea375c0e9b languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.8.3": - version: 7.24.9 - resolution: "@babel/types@npm:7.24.9" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2": + version: 7.25.2 + resolution: "@babel/types@npm:7.25.2" dependencies: "@babel/helper-string-parser": "npm:^7.24.8" "@babel/helper-validator-identifier": "npm:^7.24.7" to-fast-properties: "npm:^2.0.0" - checksum: 10c0/4970b3481cab39c5c3fdb7c28c834df5c7049f3c7f43baeafe121bb05270ebf0da7c65b097abf314877f213baa591109c82204f30d66cdd46c22ece4a2f32415 - languageName: node - linkType: hard - -"@babel/types@npm:^7.21.3": - version: 7.25.0 - resolution: "@babel/types@npm:7.25.0" - dependencies: - "@babel/helper-string-parser": "npm:^7.24.8" - "@babel/helper-validator-identifier": "npm:^7.24.7" - to-fast-properties: "npm:^2.0.0" - checksum: 10c0/3b2087d72442d53944b5365c7082f120e5040b0333d4a82406187c19056261ae2a35e087f8408348baadf1dcd156dc74573ec151272191b4a22b564297473da1 + checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864 languageName: node linkType: hard @@ -307,9 +257,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/aix-ppc64@npm:0.23.0" +"@esbuild/aix-ppc64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/aix-ppc64@npm:0.23.1" conditions: os=aix & cpu=ppc64 languageName: node linkType: hard @@ -321,9 +271,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/android-arm64@npm:0.23.0" +"@esbuild/android-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-arm64@npm:0.23.1" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -335,9 +285,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/android-arm@npm:0.23.0" +"@esbuild/android-arm@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-arm@npm:0.23.1" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -349,9 +299,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/android-x64@npm:0.23.0" +"@esbuild/android-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-x64@npm:0.23.1" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -363,9 +313,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/darwin-arm64@npm:0.23.0" +"@esbuild/darwin-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/darwin-arm64@npm:0.23.1" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -377,9 +327,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/darwin-x64@npm:0.23.0" +"@esbuild/darwin-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/darwin-x64@npm:0.23.1" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -391,9 +341,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/freebsd-arm64@npm:0.23.0" +"@esbuild/freebsd-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/freebsd-arm64@npm:0.23.1" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -405,9 +355,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/freebsd-x64@npm:0.23.0" +"@esbuild/freebsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/freebsd-x64@npm:0.23.1" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -419,9 +369,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-arm64@npm:0.23.0" +"@esbuild/linux-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-arm64@npm:0.23.1" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -433,9 +383,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-arm@npm:0.23.0" +"@esbuild/linux-arm@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-arm@npm:0.23.1" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -447,9 +397,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-ia32@npm:0.23.0" +"@esbuild/linux-ia32@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-ia32@npm:0.23.1" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -461,9 +411,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-loong64@npm:0.23.0" +"@esbuild/linux-loong64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-loong64@npm:0.23.1" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -475,9 +425,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-mips64el@npm:0.23.0" +"@esbuild/linux-mips64el@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-mips64el@npm:0.23.1" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -489,9 +439,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-ppc64@npm:0.23.0" +"@esbuild/linux-ppc64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-ppc64@npm:0.23.1" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -503,9 +453,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-riscv64@npm:0.23.0" +"@esbuild/linux-riscv64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-riscv64@npm:0.23.1" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -517,9 +467,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-s390x@npm:0.23.0" +"@esbuild/linux-s390x@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-s390x@npm:0.23.1" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -531,9 +481,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-x64@npm:0.23.0" +"@esbuild/linux-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-x64@npm:0.23.1" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -545,16 +495,16 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/netbsd-x64@npm:0.23.0" +"@esbuild/netbsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/netbsd-x64@npm:0.23.1" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/openbsd-arm64@npm:0.23.0" +"@esbuild/openbsd-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/openbsd-arm64@npm:0.23.1" conditions: os=openbsd & cpu=arm64 languageName: node linkType: hard @@ -566,9 +516,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/openbsd-x64@npm:0.23.0" +"@esbuild/openbsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/openbsd-x64@npm:0.23.1" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -580,9 +530,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/sunos-x64@npm:0.23.0" +"@esbuild/sunos-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/sunos-x64@npm:0.23.1" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -594,9 +544,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/win32-arm64@npm:0.23.0" +"@esbuild/win32-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-arm64@npm:0.23.1" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -608,9 +558,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/win32-ia32@npm:0.23.0" +"@esbuild/win32-ia32@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-ia32@npm:0.23.1" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -622,9 +572,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/win32-x64@npm:0.23.0" +"@esbuild/win32-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-x64@npm:0.23.1" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -735,7 +685,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.5.0": version: 1.5.0 resolution: "@jridgewell/sourcemap-codec@npm:1.5.0" checksum: 10c0/2eb864f276eb1096c3c11da3e9bb518f6d9fc0023c78344cdc037abadc725172c70314bdb360f2d4b7bffec7f5d657ce006816bc5d4ecb35e61b66132db00c18 @@ -1262,10 +1212,10 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.18.0": - version: 1.18.0 - resolution: "@remix-run/router@npm:1.18.0" - checksum: 10c0/3ec7e441a0e54932a3d3bf932432094420f2c117715d80a5454bc7e55d13b91250749942aab032cd07aee191f1c1de33fede8682025bfd3a453dd207c016e140 +"@remix-run/router@npm:1.19.1": + version: 1.19.1 + resolution: "@remix-run/router@npm:1.19.1" + checksum: 10c0/9101fc96646e5107b6b0ef248d4c93bd965590c37ac02d35bcc57d1902467db7fc6eeec0a1fb97d0ce5bc96fae58e75239555e44a983239a61badba18e82d3b8 languageName: node linkType: hard @@ -1285,226 +1235,114 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.19.0" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - -"@rollup/rollup-android-arm-eabi@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.20.0" +"@rollup/rollup-android-arm-eabi@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.21.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-android-arm64@npm:4.19.0" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"@rollup/rollup-android-arm64@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-android-arm64@npm:4.20.0" +"@rollup/rollup-android-arm64@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-android-arm64@npm:4.21.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-darwin-arm64@npm:4.19.0" +"@rollup/rollup-darwin-arm64@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-darwin-arm64@npm:4.21.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-darwin-arm64@npm:4.20.0" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@rollup/rollup-darwin-x64@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-darwin-x64@npm:4.19.0" +"@rollup/rollup-darwin-x64@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-darwin-x64@npm:4.21.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-darwin-x64@npm:4.20.0" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@rollup/rollup-linux-arm-gnueabihf@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.19.0" +"@rollup/rollup-linux-arm-gnueabihf@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.21.0" conditions: os=linux & cpu=arm & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.20.0" - conditions: os=linux & cpu=arm & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-arm-musleabihf@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.19.0" - conditions: os=linux & cpu=arm & libc=musl - languageName: node - linkType: hard - -"@rollup/rollup-linux-arm-musleabihf@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.20.0" +"@rollup/rollup-linux-arm-musleabihf@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.21.0" conditions: os=linux & cpu=arm & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.19.0" +"@rollup/rollup-linux-arm64-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.21.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.20.0" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-arm64-musl@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.19.0" +"@rollup/rollup-linux-arm64-musl@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.21.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.20.0" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.0" - conditions: os=linux & cpu=ppc64 & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.20.0" +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.0" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-riscv64-gnu@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.19.0" - conditions: os=linux & cpu=riscv64 & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-riscv64-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.20.0" +"@rollup/rollup-linux-riscv64-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.21.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-s390x-gnu@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.19.0" +"@rollup/rollup-linux-s390x-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.21.0" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-s390x-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.20.0" - conditions: os=linux & cpu=s390x & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-x64-gnu@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.19.0" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-x64-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.20.0" +"@rollup/rollup-linux-x64-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.21.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.19.0" +"@rollup/rollup-linux-x64-musl@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.21.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.20.0" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - -"@rollup/rollup-win32-arm64-msvc@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.19.0" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"@rollup/rollup-win32-arm64-msvc@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.20.0" +"@rollup/rollup-win32-arm64-msvc@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.21.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.19.0" +"@rollup/rollup-win32-ia32-msvc@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.21.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.20.0" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - -"@rollup/rollup-win32-x64-msvc@npm:4.19.0": - version: 4.19.0 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.19.0" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - -"@rollup/rollup-win32-x64-msvc@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.20.0" +"@rollup/rollup-win32-x64-msvc@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.21.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1658,21 +1496,21 @@ __metadata: languageName: node linkType: hard -"@tanstack/query-core@npm:5.51.9": - version: 5.51.9 - resolution: "@tanstack/query-core@npm:5.51.9" - checksum: 10c0/05ae00d0f4c80ea82991b7624551da543abbe8782b9b3910867d1d142076e2ac8892f50c37f2bde0bfa70ada3be1ad2f74472aece945a0237d2c86b729a02a1c +"@tanstack/query-core@npm:5.51.21": + version: 5.51.21 + resolution: "@tanstack/query-core@npm:5.51.21" + checksum: 10c0/bb9e03391facd21c431d6571f3e088f47dc996b42a10ef636d3fd4444a483019d0e9bd4eb971d554bb4317ac3ee3ab23d5ce9221345753b792fb6fae030d1ad7 languageName: node linkType: hard "@tanstack/react-query@npm:^5.51.11": - version: 5.51.11 - resolution: "@tanstack/react-query@npm:5.51.11" + version: 5.51.23 + resolution: "@tanstack/react-query@npm:5.51.23" dependencies: - "@tanstack/query-core": "npm:5.51.9" + "@tanstack/query-core": "npm:5.51.21" peerDependencies: react: ^18.0.0 - checksum: 10c0/318aea36ffafc3e5123d970442c1358058137c069ef65dddcef87ea2406bc2f943f5e6da286df581885ba192b962b96eb785e57ef29366ee2178f18e39190f76 + checksum: 10c0/913566a6778197b0b6dd04416e7ccb2fc766b4c0d04b0dc7f0e10f2bb5dee5663688369e363ae129ccbc1844578f57c81ee7599fac7f3b90ab9611bc52a35e69 languageName: node linkType: hard @@ -1718,12 +1556,12 @@ __metadata: linkType: hard "@types/eslint@npm:^8": - version: 8.56.10 - resolution: "@types/eslint@npm:8.56.10" + version: 8.56.11 + resolution: "@types/eslint@npm:8.56.11" dependencies: "@types/estree": "npm:*" "@types/json-schema": "npm:*" - checksum: 10c0/674349d6c342c3864d70f4d5a9965f96fb253801532752c8c500ad6a1c2e8b219e01ccff5dc8791dcb58b5483012c495708bb9f3ff929f5c9322b3da126c15d3 + checksum: 10c0/e47d2b8e0ce1aa7e1f2564555576fa55343e942ae8cba5940b4e2566f842810c007beff80a01d74d48c60a45ecf28150cbc5cbd53324b1e55cf672b24ccf4667 languageName: node linkType: hard @@ -1758,11 +1596,11 @@ __metadata: linkType: hard "@types/node@npm:^20.14.11": - version: 20.14.11 - resolution: "@types/node@npm:20.14.11" + version: 20.16.1 + resolution: "@types/node@npm:20.16.1" dependencies: - undici-types: "npm:~5.26.4" - checksum: 10c0/5306becc0ff41d81b1e31524bd376e958d0741d1ce892dffd586b9ae0cb6553c62b0d62abd16da8bea6b9a2c17572d360450535d7c073794b0cef9cb4e39691e + undici-types: "npm:~6.19.2" + checksum: 10c0/cac13c0f42467df3254805a671ca9e74a6eb7c41568de972e26b10dcc448a45743aaf00e9e5fce4a9214da5bc8444fe902918e105dac5a224e24e83fd9989a97 languageName: node linkType: hard @@ -1807,14 +1645,14 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/eslint-plugin@npm:7.16.1" + version: 7.18.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:7.16.1" - "@typescript-eslint/type-utils": "npm:7.16.1" - "@typescript-eslint/utils": "npm:7.16.1" - "@typescript-eslint/visitor-keys": "npm:7.16.1" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/type-utils": "npm:7.18.0" + "@typescript-eslint/utils": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" @@ -1825,44 +1663,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/3d0d8fa7e00dff4deb70f41432030e4e0e0bc1e4415ae7be969b77bb216fd0797507ed852baaf6d12f6ae022f69ac6356201f6b4129ddfd57b232bfc6715ac8a + checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3 languageName: node linkType: hard "@typescript-eslint/parser@npm:^7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/parser@npm:7.16.1" + version: 7.18.0 + resolution: "@typescript-eslint/parser@npm:7.18.0" dependencies: - "@typescript-eslint/scope-manager": "npm:7.16.1" - "@typescript-eslint/types": "npm:7.16.1" - "@typescript-eslint/typescript-estree": "npm:7.16.1" - "@typescript-eslint/visitor-keys": "npm:7.16.1" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/f0c731d9f22ccbcc2a15eb33376ae09cdcdcb4c69fcce425e8e7e5e3ccce51c4ee431d350109a02a09f40df81349c59eddd0264fe53a4194f326c0e0e2e3e83a + checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/scope-manager@npm:7.16.1" +"@typescript-eslint/scope-manager@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/scope-manager@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:7.16.1" - "@typescript-eslint/visitor-keys": "npm:7.16.1" - checksum: 10c0/5105edd927fd45097eb9c16f235ba48c2d9f2f3a3948fbdc4ffdc9a9fc5f130fa46c32d9188fe4bb303bd99508d7f0aad342c2ec0d9ad887aa1416dd54edeb66 + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/type-utils@npm:7.16.1" +"@typescript-eslint/type-utils@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/type-utils@npm:7.18.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:7.16.1" - "@typescript-eslint/utils": "npm:7.16.1" + "@typescript-eslint/typescript-estree": "npm:7.18.0" + "@typescript-eslint/utils": "npm:7.18.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.3.0" peerDependencies: @@ -1870,23 +1708,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/7551566185ca372dbc3d53b8ab047ea7e2c50b25d9a9293d5163498fb87c4b16a585d267a4a99df57d70326754acf168aad726ee5e8b9c0d4e59f1b8653d951d + checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd languageName: node linkType: hard -"@typescript-eslint/types@npm:7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/types@npm:7.16.1" - checksum: 10c0/5ab7bfcac81adb01672057270d0273da98dcf50d2add5819b4787b5973f6624d11ad33d6fb495f80fe628fefa3a5ed319b433ed57e9121e444cfc002e1e48625 +"@typescript-eslint/types@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/types@npm:7.18.0" + checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/typescript-estree@npm:7.16.1" +"@typescript-eslint/typescript-estree@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:7.16.1" - "@typescript-eslint/visitor-keys": "npm:7.16.1" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -1896,31 +1734,31 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/979269e9d42d75c0e49f47c7bb5e9554bd29041339c6fecfe5c76726699bce25132bef8b54210769e4f0abb858a278923340d3e4decc6551406e2c5ec065fe04 + checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81 languageName: node linkType: hard -"@typescript-eslint/utils@npm:7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/utils@npm:7.16.1" +"@typescript-eslint/utils@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/utils@npm:7.18.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:7.16.1" - "@typescript-eslint/types": "npm:7.16.1" - "@typescript-eslint/typescript-estree": "npm:7.16.1" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" peerDependencies: eslint: ^8.56.0 - checksum: 10c0/22fbf17eec064d1e67f2a4bf512f62d5369a22fe11226f043cbeb0fe79cd18006b04f933e5025f4e5c2f82047248dac52cc97199e495ad17d564084210099d17 + checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:7.16.1": - version: 7.16.1 - resolution: "@typescript-eslint/visitor-keys@npm:7.16.1" +"@typescript-eslint/visitor-keys@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:7.16.1" + "@typescript-eslint/types": "npm:7.18.0" eslint-visitor-keys: "npm:^3.4.3" - checksum: 10c0/060bc6770ba3ea271c6a844501f4dfee1b8842a0c405e60d2a258466b1b4e66086234a3fddac8745bb1a39a89eab29afeaf16133ad925bd426ac8fdb13fb7f94 + checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0 languageName: node linkType: hard @@ -1946,66 +1784,66 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@npm:2.0.4": - version: 2.0.4 - resolution: "@vitest/expect@npm:2.0.4" +"@vitest/expect@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/expect@npm:2.0.5" dependencies: - "@vitest/spy": "npm:2.0.4" - "@vitest/utils": "npm:2.0.4" + "@vitest/spy": "npm:2.0.5" + "@vitest/utils": "npm:2.0.5" chai: "npm:^5.1.1" tinyrainbow: "npm:^1.2.0" - checksum: 10c0/18acdd6b1f5001830722fab7d41b0bd754e37572dded74d1549c5e8f40e58d9e4bbbb6a8ce6be1200b04653237329ba1aeeb3330c2a41f1024450016464d491e + checksum: 10c0/08cb1b0f106d16a5b60db733e3d436fa5eefc68571488eb570dfe4f599f214ab52e4342273b03dbe12331cc6c0cdc325ac6c94f651ad254cd62f3aa0e3d185aa languageName: node linkType: hard -"@vitest/pretty-format@npm:2.0.4, @vitest/pretty-format@npm:^2.0.4": - version: 2.0.4 - resolution: "@vitest/pretty-format@npm:2.0.4" +"@vitest/pretty-format@npm:2.0.5, @vitest/pretty-format@npm:^2.0.5": + version: 2.0.5 + resolution: "@vitest/pretty-format@npm:2.0.5" dependencies: tinyrainbow: "npm:^1.2.0" - checksum: 10c0/c2ac3ca302b93ad53ea2977209ee4eb31a313c18690034a09f8ec5528d7e82715c233c4927ecf8b364203c5e5475231d9b737b3fb7680eea71882e1eae11e473 + checksum: 10c0/236c0798c5170a0b5ad5d4bd06118533738e820b4dd30079d8fbcb15baee949d41c60f42a9f769906c4a5ce366d7ef11279546070646c0efc03128c220c31f37 languageName: node linkType: hard -"@vitest/runner@npm:2.0.4": - version: 2.0.4 - resolution: "@vitest/runner@npm:2.0.4" +"@vitest/runner@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/runner@npm:2.0.5" dependencies: - "@vitest/utils": "npm:2.0.4" + "@vitest/utils": "npm:2.0.5" pathe: "npm:^1.1.2" - checksum: 10c0/b550372ce5e2c6a3f08dbd584ea669723fc0d789ebaa4224b703f12e908813fb76b963ea9ac2265aa751cab0309f637dc1fa7ce3fb3e67e08e52e241d33237ee + checksum: 10c0/d0ed3302a7e015bf44b7c0df9d8f7da163659e082d86f9406944b5a31a61ab9ddc1de530e06176d1f4ef0bde994b44bff4c7dab62aacdc235c8fc04b98e4a72a languageName: node linkType: hard -"@vitest/snapshot@npm:2.0.4": - version: 2.0.4 - resolution: "@vitest/snapshot@npm:2.0.4" +"@vitest/snapshot@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/snapshot@npm:2.0.5" dependencies: - "@vitest/pretty-format": "npm:2.0.4" + "@vitest/pretty-format": "npm:2.0.5" magic-string: "npm:^0.30.10" pathe: "npm:^1.1.2" - checksum: 10c0/67608c5b1e2f8b02ebc95286cd644c31ea29344c81d67151375b6eebf088a0eea242756eefb509aac626b8f7f091044fdcbc80d137d811ead1117a4a524e2d74 + checksum: 10c0/7bf38474248f5ae0aac6afad511785d2b7a023ac5158803c2868fd172b5b9c1a569fb1dd64a09a49e43fd342cab71ea485ada89b7f08d37b1622a5a0ac00271d languageName: node linkType: hard -"@vitest/spy@npm:2.0.4": - version: 2.0.4 - resolution: "@vitest/spy@npm:2.0.4" +"@vitest/spy@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/spy@npm:2.0.5" dependencies: tinyspy: "npm:^3.0.0" - checksum: 10c0/ef0d0c5e36bb6dfa3ef7561368b39c92cd89bb52d112ec13345dfc99981796a9af98bafd35ce6952322a6a7534eaad144485fe7764628d94d77edeba5fa773b6 + checksum: 10c0/70634c21921eb271b54d2986c21d7ab6896a31c0f4f1d266940c9bafb8ac36237846d6736638cbf18b958bd98e5261b158a6944352742accfde50b7818ff655e languageName: node linkType: hard -"@vitest/utils@npm:2.0.4": - version: 2.0.4 - resolution: "@vitest/utils@npm:2.0.4" +"@vitest/utils@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/utils@npm:2.0.5" dependencies: - "@vitest/pretty-format": "npm:2.0.4" + "@vitest/pretty-format": "npm:2.0.5" estree-walker: "npm:^3.0.3" loupe: "npm:^3.1.1" tinyrainbow: "npm:^1.2.0" - checksum: 10c0/48e0bad3aa463d147b125e355b6bc6c5b4a5eab600132ebafac8379800273b2f47df17dbf76fe179b1500cc6b5866ead2d375a39a9114a03f705eb8850b93afa + checksum: 10c0/0d1de748298f07a50281e1ba058b05dcd58da3280c14e6f016265e950bd79adab6b97822de8f0ea82d3070f585654801a9b1bcf26db4372e51cf7746bf86d73b languageName: node linkType: hard @@ -2316,25 +2154,7 @@ __metadata: languageName: node linkType: hard -"autoprefixer@npm:^10.4.19": - version: 10.4.19 - resolution: "autoprefixer@npm:10.4.19" - dependencies: - browserslist: "npm:^4.23.0" - caniuse-lite: "npm:^1.0.30001599" - fraction.js: "npm:^4.3.7" - normalize-range: "npm:^0.1.2" - picocolors: "npm:^1.0.0" - postcss-value-parser: "npm:^4.2.0" - peerDependencies: - postcss: ^8.1.0 - bin: - autoprefixer: bin/autoprefixer - checksum: 10c0/fe0178eb8b1da4f15c6535cd329926609b22d1811e047371dccce50563623f8075dd06fb167daff059e4228da651b0bdff6d9b44281541eaf0ce0b79125bfd19 - languageName: node - linkType: hard - -"autoprefixer@npm:^10.4.20": +"autoprefixer@npm:^10.4.19, autoprefixer@npm:^10.4.20": version: 10.4.20 resolution: "autoprefixer@npm:10.4.20" dependencies: @@ -2362,9 +2182,9 @@ __metadata: linkType: hard "axe-core@npm:^4.9.1": - version: 4.9.1 - resolution: "axe-core@npm:4.9.1" - checksum: 10c0/ac9e5a0c6fa115a43ebffc32a1d2189e1ca6431b5a78e88cdcf94a72a25c5964185682edd94fe6bdb1cb4266c0d06301b022866e0e50dcdf6e3cefe556470110 + version: 4.10.0 + resolution: "axe-core@npm:4.10.0" + checksum: 10c0/732c171d48caaace5e784895c4dacb8ca6155e9d98045138ebe3952f78457dd05b92c57d05b41ce2a570aff87dbd0471e8398d2c0f6ebe79617b746c8f658998 languageName: node linkType: hard @@ -2419,21 +2239,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.23.0, browserslist@npm:^4.23.1": - version: 4.23.2 - resolution: "browserslist@npm:4.23.2" - dependencies: - caniuse-lite: "npm:^1.0.30001640" - electron-to-chromium: "npm:^1.4.820" - node-releases: "npm:^2.0.14" - update-browserslist-db: "npm:^1.1.0" - bin: - browserslist: cli.js - checksum: 10c0/0217d23c69ed61cdd2530c7019bf7c822cd74c51f8baab18dd62457fed3129f52499f8d3a6f809ae1fb7bb3050aa70caa9a529cc36c7478427966dbf429723a5 - languageName: node - linkType: hard - -"browserslist@npm:^4.23.3": +"browserslist@npm:^4.23.1, browserslist@npm:^4.23.3": version: 4.23.3 resolution: "browserslist@npm:4.23.3" dependencies: @@ -2519,17 +2325,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001640": - version: 1.0.30001643 - resolution: "caniuse-lite@npm:1.0.30001643" - checksum: 10c0/7fcd0fd180bbe6764311ad57b0d39c23afdcc3bb1d8f804e7a76752c62a85b1bb7cf74b672d9da2f0afe7ad75336ff811a6fe279eb2a54bc04c272b6b62e57f1 - languageName: node - linkType: hard - "caniuse-lite@npm:^1.0.30001646": - version: 1.0.30001649 - resolution: "caniuse-lite@npm:1.0.30001649" - checksum: 10c0/0ca2f3776324acfc36d72a575e72ffd1408b91f0ac462a6f0aa08ea24d0d16e83f85f652e19d40e6d6d82ab0fb588740f948e7c88d2818fe6bcd68f70ca33acf + version: 1.0.30001651 + resolution: "caniuse-lite@npm:1.0.30001651" + checksum: 10c0/7821278952a6dbd17358e5d08083d258f092e2a530f5bc1840657cb140fbbc5ec44293bc888258c44a18a9570cde149ed05819ac8320b9710cf22f699891e6ad languageName: node linkType: hard @@ -2821,14 +2620,14 @@ __metadata: linkType: hard "debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5": - version: 4.3.5 - resolution: "debug@npm:4.3.5" + version: 4.3.6 + resolution: "debug@npm:4.3.6" dependencies: ms: "npm:2.1.2" peerDependenciesMeta: supports-color: optional: true - checksum: 10c0/082c375a2bdc4f4469c99f325ff458adad62a3fc2c482d59923c260cb08152f34e2659f72b3767db8bb2f21ca81a60a42d1019605a412132d7b9f59363a005cc + checksum: 10c0/3293416bff072389c101697d4611c402a6bacd1900ac20c0492f61a9cdd6b3b29750fc7f5e299f8058469ef60ff8fb79b86395a30374fbd2490113c1c7112285 languageName: node linkType: hard @@ -2989,17 +2788,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.820": - version: 1.4.832 - resolution: "electron-to-chromium@npm:1.4.832" - checksum: 10c0/40d427b513bdfdadaced02163d702a74fe8662cb8d696570fd641f5cef42f362180ea2b4259ab2f3aab30bca66748358f2b552d00ae7915f731ce27bf8052816 - languageName: node - linkType: hard - "electron-to-chromium@npm:^1.5.4": - version: 1.5.4 - resolution: "electron-to-chromium@npm:1.5.4" - checksum: 10c0/139abf1b7281c2f3288819fb9b114f09d541ac38c9f0373f194ce2d483d82d118b8751f1b2a59b04ed0d8f414071b58508a40050fc0f23b5aa7e38d11d0cf30c + version: 1.5.11 + resolution: "electron-to-chromium@npm:1.5.11" + checksum: 10c0/87b4c0c959009d3fa1120c73eb277c3fced527e4348c798384daf044b15cfb30bbaa5004e772ef016c5b2a70ee06bb8f756fb85fe3986d66c12d9f702c1fc5bc languageName: node linkType: hard @@ -3286,33 +3078,33 @@ __metadata: linkType: hard "esbuild@npm:^0.23.0": - version: 0.23.0 - resolution: "esbuild@npm:0.23.0" - dependencies: - "@esbuild/aix-ppc64": "npm:0.23.0" - "@esbuild/android-arm": "npm:0.23.0" - "@esbuild/android-arm64": "npm:0.23.0" - "@esbuild/android-x64": "npm:0.23.0" - "@esbuild/darwin-arm64": "npm:0.23.0" - "@esbuild/darwin-x64": "npm:0.23.0" - "@esbuild/freebsd-arm64": "npm:0.23.0" - "@esbuild/freebsd-x64": "npm:0.23.0" - "@esbuild/linux-arm": "npm:0.23.0" - "@esbuild/linux-arm64": "npm:0.23.0" - "@esbuild/linux-ia32": "npm:0.23.0" - "@esbuild/linux-loong64": "npm:0.23.0" - "@esbuild/linux-mips64el": "npm:0.23.0" - "@esbuild/linux-ppc64": "npm:0.23.0" - "@esbuild/linux-riscv64": "npm:0.23.0" - "@esbuild/linux-s390x": "npm:0.23.0" - "@esbuild/linux-x64": "npm:0.23.0" - "@esbuild/netbsd-x64": "npm:0.23.0" - "@esbuild/openbsd-arm64": "npm:0.23.0" - "@esbuild/openbsd-x64": "npm:0.23.0" - "@esbuild/sunos-x64": "npm:0.23.0" - "@esbuild/win32-arm64": "npm:0.23.0" - "@esbuild/win32-ia32": "npm:0.23.0" - "@esbuild/win32-x64": "npm:0.23.0" + version: 0.23.1 + resolution: "esbuild@npm:0.23.1" + dependencies: + "@esbuild/aix-ppc64": "npm:0.23.1" + "@esbuild/android-arm": "npm:0.23.1" + "@esbuild/android-arm64": "npm:0.23.1" + "@esbuild/android-x64": "npm:0.23.1" + "@esbuild/darwin-arm64": "npm:0.23.1" + "@esbuild/darwin-x64": "npm:0.23.1" + "@esbuild/freebsd-arm64": "npm:0.23.1" + "@esbuild/freebsd-x64": "npm:0.23.1" + "@esbuild/linux-arm": "npm:0.23.1" + "@esbuild/linux-arm64": "npm:0.23.1" + "@esbuild/linux-ia32": "npm:0.23.1" + "@esbuild/linux-loong64": "npm:0.23.1" + "@esbuild/linux-mips64el": "npm:0.23.1" + "@esbuild/linux-ppc64": "npm:0.23.1" + "@esbuild/linux-riscv64": "npm:0.23.1" + "@esbuild/linux-s390x": "npm:0.23.1" + "@esbuild/linux-x64": "npm:0.23.1" + "@esbuild/netbsd-x64": "npm:0.23.1" + "@esbuild/openbsd-arm64": "npm:0.23.1" + "@esbuild/openbsd-x64": "npm:0.23.1" + "@esbuild/sunos-x64": "npm:0.23.1" + "@esbuild/win32-arm64": "npm:0.23.1" + "@esbuild/win32-ia32": "npm:0.23.1" + "@esbuild/win32-x64": "npm:0.23.1" dependenciesMeta: "@esbuild/aix-ppc64": optional: true @@ -3364,7 +3156,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 10c0/08c148c067795165798c0467ce02d2d1ecedc096989bded5f0d795c61a1fcbec6c14d0a3c9f4ad6185cc29ec52087acaa335ed6d98be6ad57f7fa4264626bde0 + checksum: 10c0/08c2ed1105cc3c5e3a24a771e35532fe6089dd24a39c10097899072cef4a99f20860e41e9294e000d86380f353b04d8c50af482483d7f69f5208481cce61eec7 languageName: node linkType: hard @@ -3890,12 +3682,12 @@ __metadata: linkType: hard "foreground-child@npm:^3.1.0": - version: 3.2.1 - resolution: "foreground-child@npm:3.2.1" + version: 3.3.0 + resolution: "foreground-child@npm:3.3.0" dependencies: cross-spawn: "npm:^7.0.0" signal-exit: "npm:^4.0.1" - checksum: 10c0/9a53a33dbd87090e9576bef65fb4a71de60f6863a8062a7b11bc1cbe3cc86d428677d7c0b9ef61cdac11007ac580006f78bd5638618d564cfd5e6fd713d6878f + checksum: 10c0/028f1d41000553fcfa6c4bb5c372963bf3d9bf0b1f25a87d1a6253014343fb69dfb1b42d9625d7cf44c8ba429940f3d0ff718b62105d4d4a4f6ef8ca0a53faa2 languageName: node linkType: hard @@ -3968,7 +3760,7 @@ __metadata: languageName: node linkType: hard -"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6": +"function.prototype.name@npm:^1.1.6": version: 1.1.6 resolution: "function.prototype.name@npm:1.1.6" dependencies: @@ -4293,9 +4085,9 @@ __metadata: linkType: hard "ignore@npm:^5.2.0, ignore@npm:^5.3.1": - version: 5.3.1 - resolution: "ignore@npm:5.3.1" - checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd + version: 5.3.2 + resolution: "ignore@npm:5.3.2" + checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337 languageName: node linkType: hard @@ -5012,11 +4804,11 @@ __metadata: linkType: hard "magic-string@npm:^0.30.10": - version: 0.30.10 - resolution: "magic-string@npm:0.30.10" + version: 0.30.11 + resolution: "magic-string@npm:0.30.11" dependencies: - "@jridgewell/sourcemap-codec": "npm:^1.4.15" - checksum: 10c0/aa9ca17eae571a19bce92c8221193b6f93ee8511abb10f085e55ffd398db8e4c089a208d9eac559deee96a08b7b24d636ea4ab92f09c6cf42a7d1af51f7fd62b + "@jridgewell/sourcemap-codec": "npm:^1.5.0" + checksum: 10c0/b9eb370773d0bd90ca11a848753409d8e5309b1ad56d2a1aa49d6649da710a6d2fe7237ad1a643c5a5d3800de2b9946ed9690acdfc00e6cc1aeafff3ab1752c4 languageName: node linkType: hard @@ -5297,7 +5089,7 @@ __metadata: languageName: node linkType: hard -"node-releases@npm:^2.0.14, node-releases@npm:^2.0.18": +"node-releases@npm:^2.0.18": version: 2.0.18 resolution: "node-releases@npm:2.0.18" checksum: 10c0/786ac9db9d7226339e1dc84bbb42007cb054a346bd9257e6aa154d294f01bc6a6cddb1348fa099f079be6580acbb470e3c048effd5f719325abd0179e566fd27 @@ -5750,12 +5542,12 @@ __metadata: linkType: hard "postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.1.1": - version: 6.1.1 - resolution: "postcss-selector-parser@npm:6.1.1" + version: 6.1.2 + resolution: "postcss-selector-parser@npm:6.1.2" dependencies: cssesc: "npm:^3.0.0" util-deprecate: "npm:^1.0.2" - checksum: 10c0/5608765e033fee35d448e1f607ffbaa750eb86901824a8bc4a911ea8bc137cb82f29239330787427c5d3695afd90d8721e190f211dbbf733e25033d8b3100763 + checksum: 10c0/523196a6bd8cf660bdf537ad95abd79e546d54180f9afb165a4ab3e651ac705d0f8b8ce6b3164fb9e3279ce482c5f751a69eb2d3a1e8eb0fd5e82294fb3ef13e languageName: node linkType: hard @@ -5766,18 +5558,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.23, postcss@npm:^8.4.39": - version: 8.4.39 - resolution: "postcss@npm:8.4.39" - dependencies: - nanoid: "npm:^3.3.7" - picocolors: "npm:^1.0.1" - source-map-js: "npm:^1.2.0" - checksum: 10c0/16f5ac3c4e32ee76d1582b3c0dcf1a1fdb91334a45ad755eeb881ccc50318fb8d64047de4f1601ac96e30061df203f0f2e2edbdc0bfc49b9c57bc9fb9bedaea3 - languageName: node - linkType: hard - -"postcss@npm:^8.4.40": +"postcss@npm:^8.4.23, postcss@npm:^8.4.39, postcss@npm:^8.4.40, postcss@npm:^8.4.41": version: 8.4.41 resolution: "postcss@npm:8.4.41" dependencies: @@ -5805,8 +5586,8 @@ __metadata: linkType: hard "prettier-plugin-tailwindcss@npm:^0.6.5": - version: 0.6.5 - resolution: "prettier-plugin-tailwindcss@npm:0.6.5" + version: 0.6.6 + resolution: "prettier-plugin-tailwindcss@npm:0.6.6" peerDependencies: "@ianvs/prettier-plugin-sort-imports": "*" "@prettier/plugin-pug": "*" @@ -5819,6 +5600,7 @@ __metadata: prettier-plugin-import-sort: "*" prettier-plugin-jsdoc: "*" prettier-plugin-marko: "*" + prettier-plugin-multiline-arrays: "*" prettier-plugin-organize-attributes: "*" prettier-plugin-organize-imports: "*" prettier-plugin-sort-imports: "*" @@ -5845,6 +5627,8 @@ __metadata: optional: true prettier-plugin-marko: optional: true + prettier-plugin-multiline-arrays: + optional: true prettier-plugin-organize-attributes: optional: true prettier-plugin-organize-imports: @@ -5855,7 +5639,7 @@ __metadata: optional: true prettier-plugin-svelte: optional: true - checksum: 10c0/30d62928592b48cab03c46ff63edd35d4a33c4e7c40e583f12bff7223eba8b6f780fd394965b0250160bcf39688f6fb602420374b2055bcbb6a69560b818ca4e + checksum: 10c0/e34743a768631ebc69690b97d7018500f497815bbdc59c95604d09c65ffc25823ffb181e62a457f4d77594bf4ee2de50bab579e68b55440e3fcfa91713b7d7e6 languageName: node linkType: hard @@ -5943,7 +5727,7 @@ __metadata: "@babel/runtime": "npm:^7.12.5" peerDependencies: react: ">=16.13.1" - checksum: 10c0/6f3e0e4d7669f680ccf49c08c9571519c6e31f04dcfc30a765a7136c7e6fbbbe93423dd5a9fce12107f8166e54133e9dd5c2079a00c7a38201ac811f7a28b8e7 + checksum: 10c0/f5ba3a0e87a98d65f6cdc012e17ac746b3510a3d75a4319b0ea3bb581dc38bb2a69584afa5f34732d1764ef7cedc7c2cd3734b8881ca753483d0d94249c7944e languageName: node linkType: hard @@ -5997,26 +5781,26 @@ __metadata: linkType: hard "react-router-dom@npm:^6.25.1": - version: 6.25.1 - resolution: "react-router-dom@npm:6.25.1" + version: 6.26.1 + resolution: "react-router-dom@npm:6.26.1" dependencies: - "@remix-run/router": "npm:1.18.0" - react-router: "npm:6.25.1" + "@remix-run/router": "npm:1.19.1" + react-router: "npm:6.26.1" peerDependencies: react: ">=16.8" react-dom: ">=16.8" - checksum: 10c0/15e2b5bf89a26db9a108d19a4e0e2054180bfb1f5f62662dd93ad697ee1bdc91a8041efd762d552c95e65fc06ca0cb0c1e88acdeeaf03aba37f7a29e470c7cc4 + checksum: 10c0/9d9d8ed54d1c95497c6fa35a6ab46992efeccf1cfc6f0f6089c6c9b040af3eae09568fbb80c690bae08051a955d92d7aa3a0e730f626eb69285114993d31d430 languageName: node linkType: hard -"react-router@npm:6.25.1": - version: 6.25.1 - resolution: "react-router@npm:6.25.1" +"react-router@npm:6.26.1": + version: 6.26.1 + resolution: "react-router@npm:6.26.1" dependencies: - "@remix-run/router": "npm:1.18.0" + "@remix-run/router": "npm:1.19.1" peerDependencies: react: ">=16.8" - checksum: 10c0/a7e824c1f6d9641beabc23111865ddd2525b3794403e07b297fc2bdd4cddec93e166aacdb9d2602768864d70f3bf490f59eeab8474a04ae1f13a832f305eeec3 + checksum: 10c0/463078e740462b42bb5ba8004448f33fc9e63778f432a4ed55c57b93c5b519e25fb17913ee8435b0fda33c6b9f75df8ef6fcb2c3a4f8db84fb546d202e29aa51 languageName: node linkType: hard @@ -6241,26 +6025,26 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^4.13.0": - version: 4.19.0 - resolution: "rollup@npm:4.19.0" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.19.0" - "@rollup/rollup-android-arm64": "npm:4.19.0" - "@rollup/rollup-darwin-arm64": "npm:4.19.0" - "@rollup/rollup-darwin-x64": "npm:4.19.0" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.19.0" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.19.0" - "@rollup/rollup-linux-arm64-gnu": "npm:4.19.0" - "@rollup/rollup-linux-arm64-musl": "npm:4.19.0" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.19.0" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.19.0" - "@rollup/rollup-linux-s390x-gnu": "npm:4.19.0" - "@rollup/rollup-linux-x64-gnu": "npm:4.19.0" - "@rollup/rollup-linux-x64-musl": "npm:4.19.0" - "@rollup/rollup-win32-arm64-msvc": "npm:4.19.0" - "@rollup/rollup-win32-ia32-msvc": "npm:4.19.0" - "@rollup/rollup-win32-x64-msvc": "npm:4.19.0" +"rollup@npm:^4.13.0, rollup@npm:^4.19.0": + version: 4.21.0 + resolution: "rollup@npm:4.21.0" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.21.0" + "@rollup/rollup-android-arm64": "npm:4.21.0" + "@rollup/rollup-darwin-arm64": "npm:4.21.0" + "@rollup/rollup-darwin-x64": "npm:4.21.0" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.21.0" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.21.0" + "@rollup/rollup-linux-arm64-gnu": "npm:4.21.0" + "@rollup/rollup-linux-arm64-musl": "npm:4.21.0" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.21.0" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.21.0" + "@rollup/rollup-linux-s390x-gnu": "npm:4.21.0" + "@rollup/rollup-linux-x64-gnu": "npm:4.21.0" + "@rollup/rollup-linux-x64-musl": "npm:4.21.0" + "@rollup/rollup-win32-arm64-msvc": "npm:4.21.0" + "@rollup/rollup-win32-ia32-msvc": "npm:4.21.0" + "@rollup/rollup-win32-x64-msvc": "npm:4.21.0" "@types/estree": "npm:1.0.5" fsevents: "npm:~2.3.2" dependenciesMeta: @@ -6300,70 +6084,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 10c0/1c656853895f6c7d55492db4661c79d37a3046cff465f4924ac5f053b0f80a079e36f901b154dbe819d9e94dcd83e90e51c7f95e7158bef1a07ceb60df736285 - languageName: node - linkType: hard - -"rollup@npm:^4.19.0": - version: 4.20.0 - resolution: "rollup@npm:4.20.0" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.20.0" - "@rollup/rollup-android-arm64": "npm:4.20.0" - "@rollup/rollup-darwin-arm64": "npm:4.20.0" - "@rollup/rollup-darwin-x64": "npm:4.20.0" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.20.0" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.20.0" - "@rollup/rollup-linux-arm64-gnu": "npm:4.20.0" - "@rollup/rollup-linux-arm64-musl": "npm:4.20.0" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.20.0" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.20.0" - "@rollup/rollup-linux-s390x-gnu": "npm:4.20.0" - "@rollup/rollup-linux-x64-gnu": "npm:4.20.0" - "@rollup/rollup-linux-x64-musl": "npm:4.20.0" - "@rollup/rollup-win32-arm64-msvc": "npm:4.20.0" - "@rollup/rollup-win32-ia32-msvc": "npm:4.20.0" - "@rollup/rollup-win32-x64-msvc": "npm:4.20.0" - "@types/estree": "npm:1.0.5" - fsevents: "npm:~2.3.2" - dependenciesMeta: - "@rollup/rollup-android-arm-eabi": - optional: true - "@rollup/rollup-android-arm64": - optional: true - "@rollup/rollup-darwin-arm64": - optional: true - "@rollup/rollup-darwin-x64": - optional: true - "@rollup/rollup-linux-arm-gnueabihf": - optional: true - "@rollup/rollup-linux-arm-musleabihf": - optional: true - "@rollup/rollup-linux-arm64-gnu": - optional: true - "@rollup/rollup-linux-arm64-musl": - optional: true - "@rollup/rollup-linux-powerpc64le-gnu": - optional: true - "@rollup/rollup-linux-riscv64-gnu": - optional: true - "@rollup/rollup-linux-s390x-gnu": - optional: true - "@rollup/rollup-linux-x64-gnu": - optional: true - "@rollup/rollup-linux-x64-musl": - optional: true - "@rollup/rollup-win32-arm64-msvc": - optional: true - "@rollup/rollup-win32-ia32-msvc": - optional: true - "@rollup/rollup-win32-x64-msvc": - optional: true - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 10c0/9b23bf0e3380e64573a5f68a55274d5c7969036e55c19aab9fb4deea2e938d76769db70f3c95ee3783c24af152bea1772ad73f9e3625b6ffd4e600a788fe97ea + checksum: 10c0/984beb858da245c5e3a9027d6d87e67ad6443f1b46eab07685b861d9e49da5856693265c62a6f8262c36d11c9092713a96a9124f43e6de6698eb84d77118496a languageName: node linkType: hard @@ -6635,7 +6356,6 @@ __metadata: tailwind-merge: "npm:^2.4.0" tailwindcss: "npm:^3.4.6" typescript: "npm:^5.5.4" - xlsx: "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz" languageName: unknown linkType: soft @@ -6911,9 +6631,9 @@ __metadata: linkType: hard "tailwind-merge@npm:^2.4.0": - version: 2.4.0 - resolution: "tailwind-merge@npm:2.4.0" - checksum: 10c0/77bd20647d08db78a0bdf7b57d4b904479aee7727f44570f8834d62a1aa56f42d7ae68ac959e3d610c9f188aa164eeefb6c43df4f0c8bb7cfc3418e1575bfecb + version: 2.5.2 + resolution: "tailwind-merge@npm:2.5.2" + checksum: 10c0/e43a9a468f7ba4ed5b4a399558d96d6270a3d8131dca111cccc803e71cc23885060d18d721f312a24fff0a75c567dbb30b2a87c18aba25eb4255df197d8170ab languageName: node linkType: hard @@ -6926,9 +6646,9 @@ __metadata: languageName: node linkType: hard -"tailwindcss@npm:^3.4.6": - version: 3.4.6 - resolution: "tailwindcss@npm:3.4.6" +"tailwindcss@npm:^3.4.6, tailwindcss@npm:^3.4.7": + version: 3.4.10 + resolution: "tailwindcss@npm:3.4.10" dependencies: "@alloc/quick-lru": "npm:^5.2.0" arg: "npm:^5.0.2" @@ -6955,40 +6675,7 @@ __metadata: bin: tailwind: lib/cli.js tailwindcss: lib/cli.js - checksum: 10c0/8d82b697ecf41d8cd100ab3369e3cbcb30e350afc5b595a000b201ba666628a68543154297f96c5b2a3f2614f37bb981af4766556ebaae832079fa9a436e8563 - languageName: node - linkType: hard - -"tailwindcss@npm:^3.4.7": - version: 3.4.7 - resolution: "tailwindcss@npm:3.4.7" - dependencies: - "@alloc/quick-lru": "npm:^5.2.0" - arg: "npm:^5.0.2" - chokidar: "npm:^3.5.3" - didyoumean: "npm:^1.2.2" - dlv: "npm:^1.1.3" - fast-glob: "npm:^3.3.0" - glob-parent: "npm:^6.0.2" - is-glob: "npm:^4.0.3" - jiti: "npm:^1.21.0" - lilconfig: "npm:^2.1.0" - micromatch: "npm:^4.0.5" - normalize-path: "npm:^3.0.0" - object-hash: "npm:^3.0.0" - picocolors: "npm:^1.0.0" - postcss: "npm:^8.4.23" - postcss-import: "npm:^15.1.0" - postcss-js: "npm:^4.0.1" - postcss-load-config: "npm:^4.0.1" - postcss-nested: "npm:^6.0.1" - postcss-selector-parser: "npm:^6.0.11" - resolve: "npm:^1.22.2" - sucrase: "npm:^3.32.0" - bin: - tailwind: lib/cli.js - tailwindcss: lib/cli.js - checksum: 10c0/dd74c29ae0ec314d46300a1163b106b84d3ca58d71e4e16c2c8ad9ee3d7ba6cfeab4a97176c0e9bfeebc5e9cd9636531648a3f3874ede376751a572d230dd979 + checksum: 10c0/5212f4d90f21fc21b87008570a37de46af9c955a7c197d0f0e1d888edd5ef597f1f41194bec6b1fdc8a21e9460089d370bf728ce39b13abe93324a768b7043fd languageName: node linkType: hard @@ -7032,9 +6719,9 @@ __metadata: linkType: hard "tinybench@npm:^2.8.0": - version: 2.8.0 - resolution: "tinybench@npm:2.8.0" - checksum: 10c0/5a9a642351fa3e4955e0cbf38f5674be5f3ba6730fd872fd23a5c953ad6c914234d5aba6ea41ef88820180a81829ceece5bd8d3967c490c5171bca1141c2f24d + version: 2.9.0 + resolution: "tinybench@npm:2.9.0" + checksum: 10c0/c3500b0f60d2eb8db65250afe750b66d51623057ee88720b7f064894a6cb7eb93360ca824a60a31ab16dab30c7b1f06efe0795b352e37914a9d4bad86386a20c languageName: node linkType: hard @@ -7299,10 +6986,10 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~5.26.4": - version: 5.26.5 - resolution: "undici-types@npm:5.26.5" - checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501 +"undici-types@npm:~6.19.2": + version: 6.19.6 + resolution: "undici-types@npm:6.19.6" + checksum: 10c0/9b2264c5700e7169c6c62c643aac56cd8984c5fd7e18ed31ff11780260e137f6340dee8317a2e6e0ae3c49f5e5ef6fa577ea07193cbaa535265cba76a267cae9 languageName: node linkType: hard @@ -7436,9 +7123,9 @@ __metadata: languageName: node linkType: hard -"vite-node@npm:2.0.4": - version: 2.0.4 - resolution: "vite-node@npm:2.0.4" +"vite-node@npm:2.0.5": + version: 2.0.5 + resolution: "vite-node@npm:2.0.5" dependencies: cac: "npm:^6.7.14" debug: "npm:^4.3.5" @@ -7447,7 +7134,7 @@ __metadata: vite: "npm:^5.0.0" bin: vite-node: vite-node.mjs - checksum: 10c0/2689b05b391b59cf3d15e1e80884e9b054f2ca90b2150cc7a08b0f234e79e6750a28cc8d107a57f005185e759c3bc020030f687065317fc37fe169ce17f4cdb7 + checksum: 10c0/affcc58ae8d45bce3e8bc3b5767acd57c24441634e2cd967cf97f4e5ed2bcead1714b60150cdf7ee153ebad47659c5cd419883207e1a95b69790331e3243749f languageName: node linkType: hard @@ -7465,18 +7152,19 @@ __metadata: linkType: hard "vite@npm:^5.0.0, vite@npm:^5.3.4": - version: 5.3.4 - resolution: "vite@npm:5.3.4" + version: 5.4.1 + resolution: "vite@npm:5.4.1" dependencies: esbuild: "npm:^0.21.3" fsevents: "npm:~2.3.3" - postcss: "npm:^8.4.39" + postcss: "npm:^8.4.41" rollup: "npm:^4.13.0" peerDependencies: "@types/node": ^18.0.0 || >=20.0.0 less: "*" lightningcss: ^1.21.0 sass: "*" + sass-embedded: "*" stylus: "*" sugarss: "*" terser: ^5.4.0 @@ -7492,6 +7180,8 @@ __metadata: optional: true sass: optional: true + sass-embedded: + optional: true stylus: optional: true sugarss: @@ -7500,21 +7190,21 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/604a1c8698bcf09d6889533c552f20137c80cb5027e9e7ddf6215d51e3df763414f8712168c22b3c8c16383aff9447094c05f21d7cca3c115874ff9d12e1538e + checksum: 10c0/b9ea824f1a946aa494f756e6d9dd88869baa62ae5ba3071b32b6a20958fd622cb624c860bdd7daee201c83ca029feaf8bbe2d2a6e172a5d49308772f8899d86d languageName: node linkType: hard "vitest@npm:^2.0.4": - version: 2.0.4 - resolution: "vitest@npm:2.0.4" + version: 2.0.5 + resolution: "vitest@npm:2.0.5" dependencies: "@ampproject/remapping": "npm:^2.3.0" - "@vitest/expect": "npm:2.0.4" - "@vitest/pretty-format": "npm:^2.0.4" - "@vitest/runner": "npm:2.0.4" - "@vitest/snapshot": "npm:2.0.4" - "@vitest/spy": "npm:2.0.4" - "@vitest/utils": "npm:2.0.4" + "@vitest/expect": "npm:2.0.5" + "@vitest/pretty-format": "npm:^2.0.5" + "@vitest/runner": "npm:2.0.5" + "@vitest/snapshot": "npm:2.0.5" + "@vitest/spy": "npm:2.0.5" + "@vitest/utils": "npm:2.0.5" chai: "npm:^5.1.1" debug: "npm:^4.3.5" execa: "npm:^8.0.1" @@ -7525,13 +7215,13 @@ __metadata: tinypool: "npm:^1.0.0" tinyrainbow: "npm:^1.2.0" vite: "npm:^5.0.0" - vite-node: "npm:2.0.4" + vite-node: "npm:2.0.5" why-is-node-running: "npm:^2.3.0" peerDependencies: "@edge-runtime/vm": "*" "@types/node": ^18.0.0 || >=20.0.0 - "@vitest/browser": 2.0.4 - "@vitest/ui": 2.0.4 + "@vitest/browser": 2.0.5 + "@vitest/ui": 2.0.5 happy-dom: "*" jsdom: "*" peerDependenciesMeta: @@ -7549,7 +7239,7 @@ __metadata: optional: true bin: vitest: vitest.mjs - checksum: 10c0/139200d0bda3270fd00641e4bd5524f78a2b1fe9a3d4a0d5ba2b6ed08bbcf6f1e711cc4bfd8b0d823628a2fcab00f822bb210bd5bf3c6a9260fd6115ea085a3d + checksum: 10c0/b4e6cca00816bf967a8589111ded72faa12f92f94ccdd0dcd0698ffcfdfc52ec662753f66b387549c600ac699b993fd952efbd99dc57fcf4d1c69a2f1022b259 languageName: node linkType: hard @@ -7645,11 +7335,11 @@ __metadata: linkType: hard "which-builtin-type@npm:^1.1.3": - version: 1.1.3 - resolution: "which-builtin-type@npm:1.1.3" + version: 1.1.4 + resolution: "which-builtin-type@npm:1.1.4" dependencies: - function.prototype.name: "npm:^1.1.5" - has-tostringtag: "npm:^1.0.0" + function.prototype.name: "npm:^1.1.6" + has-tostringtag: "npm:^1.0.2" is-async-function: "npm:^2.0.0" is-date-object: "npm:^1.0.5" is-finalizationregistry: "npm:^1.0.2" @@ -7658,13 +7348,13 @@ __metadata: is-weakref: "npm:^1.0.2" isarray: "npm:^2.0.5" which-boxed-primitive: "npm:^1.0.2" - which-collection: "npm:^1.0.1" - which-typed-array: "npm:^1.1.9" - checksum: 10c0/2b7b234df3443b52f4fbd2b65b731804de8d30bcc4210ec84107ef377a81923cea7f2763b7fb78b394175cea59118bf3c41b9ffd2d643cb1d748ef93b33b6bd4 + which-collection: "npm:^1.0.2" + which-typed-array: "npm:^1.1.15" + checksum: 10c0/a4a76d20d869a81b1dbb4adea31edc7e6c1a4466d3ab7c2cd757c9219d48d3723b04076c85583257b0f0f8e3ebe5af337248b8ceed57b9051cb97bce5bd881d1 languageName: node linkType: hard -"which-collection@npm:^1.0.1": +"which-collection@npm:^1.0.1, which-collection@npm:^1.0.2": version: 1.0.2 resolution: "which-collection@npm:1.0.2" dependencies: @@ -7676,7 +7366,7 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9": +"which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15": version: 1.1.15 resolution: "which-typed-array@npm:1.1.15" dependencies: @@ -7819,11 +7509,11 @@ __metadata: linkType: hard "yaml@npm:^2.3.4": - version: 2.4.5 - resolution: "yaml@npm:2.4.5" + version: 2.5.0 + resolution: "yaml@npm:2.5.0" bin: yaml: bin.mjs - checksum: 10c0/e1ee78b381e5c710f715cc4082fd10fc82f7f5c92bd6f075771d20559e175616f56abf1c411f545ea0e9e16e4f84a83a50b42764af5f16ec006328ba9476bb31 + checksum: 10c0/771a1df083c8217cf04ef49f87244ae2dd7d7457094425e793b8f056159f167602ce172aa32d6bca21f787d24ec724aee3cecde938f6643564117bd151452631 languageName: node linkType: hard From c751e37f01a1df634da7e9468da60756a13408e7 Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 15:52:37 +0900 Subject: [PATCH 09/17] fix: YARN_CHECKSUM_BEHAVIOR=update yarn --- .DS_Store | Bin 6148 -> 8196 bytes packages/.DS_Store | Bin 6148 -> 6148 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index 7a285522a49b1cc74748df9e10f400efcfa2aacb..2a3f4a22caf7fca98e178a375441e720a3c51a48 100644 GIT binary patch literal 8196 zcmeHMJ#W)M7=G=hjiXX2P%33XwZvLNO24RB(li|^0YY^J1FcFDht#d(ixQ_1sw#y6 z20&ti1r`1QD^O-uSYY5+bYNkE_de2`?W8Ofs?@v4_nz@AO!#h zUQ{NBG3$|NJG~-F7d7K3HM9q}GHI1awHDD-6^a4HfMP%~pcqgLoE8Rf&!)-fv+wg( zl`94m180%}x;~hAQJEF8%_UnpFk?pmlrgMk3Cl@ZKxqn@6|&7GwqVk@DN1gti6e%_ z&9UATdRZacTyk^J#Nk5|ku`Bb(O7i!Z!&ezvRtZMF`yWTGCH4#mW&4=)4{U?4JZKt8_GdE`W=Bs(va~Sym<5K^UM*RfL0ezf2|-M zlj0dfejY&q>fp&(^ef}ngRL@-x3N#<#aV_!vX?pOts%$PXIT6=+=OLVgeABQ7A!5h zq$EZFU1VwRr~j~oC4h5KL#!p(#=HV$#J+`G67WKH??ZM*$gUC8*Dn1_zu0Qj1g;Oo zn(H+DOy-BC55xwC;zryUHrB08(z5)5-)!Ux_51X0l@PbsDHn=&opNgN1@(I19bHc^$@ eWQA;Vi8Yx1`-gz;8|x_U+-m=4y`ZwQ#=u{Bx1wDD delta 143 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGjdE!6q~50D9QxlfW;CS(iu`2ij&HV3nnHm zpKKt*GI_7i%gJ^k{0mdq7PE732r>iJ0)YTGkZ=W=u`%&G^JIP*O9hZH&=iniAese4 R134huKn`Ho9M3a{833t56@mZ& diff --git a/packages/.DS_Store b/packages/.DS_Store index 03e8c520aeb7dd0636b75877af5de1c693a8d8bc..a05c90322f3eb1c28eb82ef014ee151aaafe3b4b 100644 GIT binary patch delta 484 zcmZoMXfc=|#>B!ku~2NHo}w@x0|Nsi1A_nqLtak0VQ_MOZoy_orj^X~APH86M1~ZG zT!u`9Bv6!rVN$U&s%&n)i%U{YeiBfWLnKP)ZjxC6$}cjn3bB9;Qcr~@J}!33f=M~JLp1^|7QaYXB`mu~2NHo}wrd0|Nsi1A_oVQh9MfQcivnkiTPM;qu7_A}o`|S#NI6 wV4KglS%HI{Wnx3+W_AvK4xrx6f*jwOC-aL~3IJ7uw1Z3m(JY%IMAk3^0L(cS2><{9 From 263e435c8d8ace9a7a1584beb5b43432bd2f865d Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 15:55:23 +0900 Subject: [PATCH 10/17] fix: YARN_CHECKSUM_BEHAVIOR=update yarn --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index bba1e1fd..4cf98d48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5727,7 +5727,7 @@ __metadata: "@babel/runtime": "npm:^7.12.5" peerDependencies: react: ">=16.13.1" - checksum: 10c0/f5ba3a0e87a98d65f6cdc012e17ac746b3510a3d75a4319b0ea3bb581dc38bb2a69584afa5f34732d1764ef7cedc7c2cd3734b8881ca753483d0d94249c7944e + checksum: 10c0/6f3e0e4d7669f680ccf49c08c9571519c6e31f04dcfc30a765a7136c7e6fbbbe93423dd5a9fce12107f8166e54133e9dd5c2079a00c7a38201ac811f7a28b8e7 languageName: node linkType: hard From 4fa7277d02e90eb923016ec21c3f6ac8031899aa Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 16:46:01 +0900 Subject: [PATCH 11/17] =?UTF-8?q?fix:=20=EC=9C=A0=ED=98=95=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20=EC=99=84=EB=A3=8C=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?response=EB=A1=9C=20type=20=EB=B0=9B=EC=95=84=EC=99=80=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hooks/query/useSubmitTeamTypeQuizAnswers.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/user/src/hooks/query/useSubmitTeamTypeQuizAnswers.ts b/packages/user/src/hooks/query/useSubmitTeamTypeQuizAnswers.ts index 4b75242c..032532b3 100644 --- a/packages/user/src/hooks/query/useSubmitTeamTypeQuizAnswers.ts +++ b/packages/user/src/hooks/query/useSubmitTeamTypeQuizAnswers.ts @@ -1,9 +1,9 @@ import type { ServerCategoryEnum } from '@softeer/common/types'; import { useMutation } from '@tanstack/react-query'; +import serverTeamEnumToClient from 'src/constants/serverMapping.ts'; import useAuth from 'src/hooks/useAuth.ts'; -import { queryClient } from 'src/libs/query/index.tsx'; import http from 'src/services/api/index.ts'; -import QUERY_KEYS from 'src/services/api/queryKey.ts'; +import type { User } from 'src/types/user.d.ts'; export type SubmitQuizAnswersRequest = { id: number; answer: number }[]; @@ -14,13 +14,17 @@ export interface SubmitQuizAnswersResponse { } export default function useSubmitTeamTypeQuizAnswers() { - const { setAuthData } = useAuth(); + const { user, setAuthData } = useAuth(); const mutation = useMutation({ mutationFn: (data) => http.post('/personality-test', data), - onSuccess: ({ accessToken }) => { - setAuthData({ accessToken }); - queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.USER_INFO] }); + onSuccess: ({ accessToken, team }) => { + const userData = { + ...(user as User), + type: serverTeamEnumToClient[team], + }; + + setAuthData({ accessToken, userData }); }, }); From 5dcf11a2f750051b0fcde22fdc5e73bdc0612cd2 Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 17:03:57 +0900 Subject: [PATCH 12/17] =?UTF-8?q?feat:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=A7=88=EA=B0=90=EB=90=9C=20=EC=9D=B4=ED=9B=84=EC=97=90=20?= =?UTF-8?q?=EC=84=A0=EC=B0=A9=EC=88=9C=20=ED=80=B4=EC=A6=88=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=9A=94=EC=B2=AD=ED=95=A0=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20400=20error=20handling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/src/components/shared/modal/fcfs/ErrorStep.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/user/src/components/shared/modal/fcfs/ErrorStep.tsx b/packages/user/src/components/shared/modal/fcfs/ErrorStep.tsx index 232c9504..a86bb626 100644 --- a/packages/user/src/components/shared/modal/fcfs/ErrorStep.tsx +++ b/packages/user/src/components/shared/modal/fcfs/ErrorStep.tsx @@ -16,6 +16,12 @@ export default function ErrorStep({ error, resetErrorBoundary }: FallbackProps) ); + case 400: + return ( + +

이미 마감된 이벤트입니다.

+ + ); case 404: return ( From 66d1a324ddf0a0de5f7d60c8e9bcb0faef817fef Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 17:05:11 +0900 Subject: [PATCH 13/17] =?UTF-8?q?fix:=20=EC=9C=A0=ED=98=95=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20=EA=B2=B0=EA=B3=BC=20=EB=9D=84=EC=9B=8C=EC=A3=BC?= =?UTF-8?q?=EB=8A=94=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20type=20?= =?UTF-8?q?=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=A0=91=EA=B7=BC=20?= =?UTF-8?q?=EB=B6=88=EA=B0=80=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/teamSelectModal/ModalContent.tsx | 19 +++++++++++-------- .../modal/teamSelectModal/ResultStep.tsx | 10 +++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/packages/user/src/components/shared/modal/teamSelectModal/ModalContent.tsx b/packages/user/src/components/shared/modal/teamSelectModal/ModalContent.tsx index dfcea697..ebf36407 100644 --- a/packages/user/src/components/shared/modal/teamSelectModal/ModalContent.tsx +++ b/packages/user/src/components/shared/modal/teamSelectModal/ModalContent.tsx @@ -3,6 +3,7 @@ import PendingStep from 'src/components/shared/modal/PendingStep.tsx'; import useSubmitTeamTypeQuizAnswers, { type SubmitQuizAnswersRequest, } from 'src/hooks/query/useSubmitTeamTypeQuizAnswers.ts'; +import useAuth from 'src/hooks/useAuth.ts'; import useFunnel from 'src/hooks/useFunnel.ts'; import CustomError from 'src/utils/error.ts'; import ErrorStep from './ErrorStep.tsx'; @@ -15,6 +16,8 @@ interface TeamSelectModalContentProps { export default function TeamSelectModalContent({ initialStep = 'quiz', }: TeamSelectModalContentProps) { + const { user } = useAuth(); + const [Funnel, setStep] = useFunnel( ['quiz', 'pending', 'success', 'error', 'already-done'] as NonEmptyArray, { initialStep }, @@ -48,15 +51,15 @@ export default function TeamSelectModalContent({ 내 유형 불러오는 중 ... - - - + {user?.type && } - -

- 이미 유형 검사를 완료하셨군요! 이전 검사 결과를 보여드릴게요 -

- + {user?.type && ( + +

+ 이미 유형 검사를 완료하셨군요! 이전 검사 결과를 보여드릴게요 +

+ + )} setStep('quiz')}> diff --git a/packages/user/src/components/shared/modal/teamSelectModal/ResultStep.tsx b/packages/user/src/components/shared/modal/teamSelectModal/ResultStep.tsx index 90435fdb..e4e15026 100644 --- a/packages/user/src/components/shared/modal/teamSelectModal/ResultStep.tsx +++ b/packages/user/src/components/shared/modal/teamSelectModal/ResultStep.tsx @@ -8,7 +8,15 @@ import useAuth from 'src/hooks/useAuth.ts'; export default function ResultStep({ children }: PropsWithChildren) { const { user } = useAuth(); - const type = useMemo(() => user?.type as Category, [user]); + const type = useMemo(() => { + if (user?.type) { + return user.type; + } + }, [user?.type]); + + if (!type) { + return null; + } const { title, shortTitle, details } = TEAM_DESCRIPTIONS[type]; const displayTitle = shortTitle ?? title; From 607c452d1f2f3bc4c06c3ae83692905ec956fe5e Mon Sep 17 00:00:00 2001 From: racgoo Date: Mon, 19 Aug 2024 17:14:54 +0900 Subject: [PATCH 14/17] =?UTF-8?q?fix(socket):=20=EC=86=8C=EC=BC=93=20URL?= =?UTF-8?q?=20=EC=88=98=EC=A0=95,=20Common=EC=97=90=20=EC=9E=88=EB=8A=94?= =?UTF-8?q?=20public=20=ED=8C=8C=EC=9D=BC=EB=93=A4=EC=9D=80=20string?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=90=9C=20path=EB=A1=9C=20img=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=EC=97=90=EC=84=9C=20=EC=A0=91=EA=B7=BC=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EB=95=8C=EB=AC=B8=EC=97=90=20bundling=ED=95=A0?= =?UTF-8?q?=EB=95=8C=20admin,user=20=EC=97=90=20=EC=9E=88=EB=8A=94=20dist?= =?UTF-8?q?=EC=97=90=EB=8A=94=20=EB=B0=98=EC=98=81=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=98=84=EC=83=81=20->=20admin/public?= =?UTF-8?q?=EC=97=90=20casper=ED=8F=B4=EB=8D=94=20=EC=B6=94=EA=B0=80,=20us?= =?UTF-8?q?er=EC=99=80=20admin=EC=9D=98=20tailwind.config=EA=B0=80=20?= =?UTF-8?q?=EB=8B=AC=EB=9D=BC=EC=84=9C=20Message=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=EC=9D=98=20content=EB=B6=80=EB=B6=84?= =?UTF-8?q?=EC=9D=B4=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9X?= =?UTF-8?q?=20->=20=EC=A7=81=EC=A0=91=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=A3=BC=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/admin/public/casper/khaki.svg | 11 +++++++++++ packages/admin/public/casper/orange.svg | 9 +++++++++ packages/admin/public/casper/white.svg | 5 +++++ packages/admin/public/casper/yellow.svg | 5 +++++ packages/admin/src/components/chat/Chat.tsx | 2 +- .../admin/src/components/chat/RealTimeChatting.tsx | 1 - packages/admin/src/hooks/socket/index.ts | 5 ++++- packages/admin/vite.config.ts | 1 + 8 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 packages/admin/public/casper/khaki.svg create mode 100644 packages/admin/public/casper/orange.svg create mode 100644 packages/admin/public/casper/white.svg create mode 100644 packages/admin/public/casper/yellow.svg diff --git a/packages/admin/public/casper/khaki.svg b/packages/admin/public/casper/khaki.svg new file mode 100644 index 00000000..ce16a837 --- /dev/null +++ b/packages/admin/public/casper/khaki.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/packages/admin/public/casper/orange.svg b/packages/admin/public/casper/orange.svg new file mode 100644 index 00000000..281ba4d3 --- /dev/null +++ b/packages/admin/public/casper/orange.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/packages/admin/public/casper/white.svg b/packages/admin/public/casper/white.svg new file mode 100644 index 00000000..e92bbcfd --- /dev/null +++ b/packages/admin/public/casper/white.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/admin/public/casper/yellow.svg b/packages/admin/public/casper/yellow.svg new file mode 100644 index 00000000..062cbdfb --- /dev/null +++ b/packages/admin/public/casper/yellow.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/admin/src/components/chat/Chat.tsx b/packages/admin/src/components/chat/Chat.tsx index 30ee121e..684bd6bf 100644 --- a/packages/admin/src/components/chat/Chat.tsx +++ b/packages/admin/src/components/chat/Chat.tsx @@ -12,7 +12,7 @@ export default function Chat({ type, team, sender, content }: ChatProps) { default: return ( - {content} +
{content}
 ); } diff --git a/packages/admin/src/components/chat/RealTimeChatting.tsx b/packages/admin/src/components/chat/RealTimeChatting.tsx index 95e091ee..c0e76e1b 100644 --- a/packages/admin/src/components/chat/RealTimeChatting.tsx +++ b/packages/admin/src/components/chat/RealTimeChatting.tsx @@ -7,7 +7,6 @@ import Chat from './Chat.tsx'; function RealTimeChatting({ chatSocket: { messages } }: Pick) { return (
-
기대평을 남겨보세요!
{messages.map((message) => ( diff --git a/packages/admin/src/hooks/socket/index.ts b/packages/admin/src/hooks/socket/index.ts index d4c7dfce..940daa43 100644 --- a/packages/admin/src/hooks/socket/index.ts +++ b/packages/admin/src/hooks/socket/index.ts @@ -9,9 +9,12 @@ export type UseSocketReturnType = ReturnType; export default function useSocket() { const accessToken = Cookie.getCookie(ACCESS_TOKEN_KEY) ?? ''; const chatSocket = useChatSocket(); + console.log(chatSocket) const { onReceiveMessage, ...chatSocketProps } = chatSocket; useEffect(() => { - socketManager.connectSocketClient({ token: accessToken, onReceiveMessage }); + if(accessToken !== ""){ + socketManager.connectSocketClient({ token: accessToken, onReceiveMessage }); + } }, [socketManager, accessToken]); return { chatSocket: chatSocketProps }; diff --git a/packages/admin/vite.config.ts b/packages/admin/vite.config.ts index 4c54c4ec..27b59065 100644 --- a/packages/admin/vite.config.ts +++ b/packages/admin/vite.config.ts @@ -10,6 +10,7 @@ export default defineConfig({ src: path.resolve(__dirname, './src'), }, }, + publicDir: './public', define: { global: 'window', // web socket }, From b9c6893e2b6b082e3534fe2564c6df161eaa145e Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 17:17:17 +0900 Subject: [PATCH 15/17] design: modal variant --- .../user/src/components/shared/modal/teamSelectModal/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/user/src/components/shared/modal/teamSelectModal/index.tsx b/packages/user/src/components/shared/modal/teamSelectModal/index.tsx index e8d69e17..d2e53915 100644 --- a/packages/user/src/components/shared/modal/teamSelectModal/index.tsx +++ b/packages/user/src/components/shared/modal/teamSelectModal/index.tsx @@ -10,7 +10,7 @@ export default function TeamSelectModal({ openTrigger, ...props }: TeamSelectMod const { user } = useAuth(); return ( - + 유형 검사 리스트 불러오는 중 ...}> From a339424c841823dbe24a1899efedf0e6816243df Mon Sep 17 00:00:00 2001 From: racgoo Date: Mon, 19 Aug 2024 17:18:07 +0900 Subject: [PATCH 16/17] =?UTF-8?q?feat(cookie=20=EC=A0=80=EC=9E=A5):=20cred?= =?UTF-8?q?entials:=20'include'=20=ED=97=88=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/src/utils/api/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/common/src/utils/api/index.ts b/packages/common/src/utils/api/index.ts index 829eec20..048cd3fa 100644 --- a/packages/common/src/utils/api/index.ts +++ b/packages/common/src/utils/api/index.ts @@ -49,7 +49,7 @@ export default class FetchWrapper { async get(url: string): Promise { return this.request(url, { - // credentials: 'include', + credentials: 'include', }); } @@ -60,7 +60,7 @@ export default class FetchWrapper { headers: { ...generateDefaultHeaders(), }, - // credentials: 'include', + credentials: 'include', }); } @@ -71,7 +71,7 @@ export default class FetchWrapper { headers: { ...generateDefaultHeaders(), }, - // credentials: 'include', + credentials: 'include', }); } From 4898c7a12fae981474e56101843392164375f929 Mon Sep 17 00:00:00 2001 From: racgoo Date: Mon, 19 Aug 2024 18:24:43 +0900 Subject: [PATCH 17/17] =?UTF-8?q?fix(border):=20=EC=93=B8=EB=AA=A8?= =?UTF-8?q?=EC=97=86=EB=8A=94=20border=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/admin/src/components/chat/Chat.tsx | 14 +++++++++-- .../src/components/chat/RealTimeChatting.tsx | 20 ++++++++++++++++ .../common/src/components/chat/Message.tsx | 24 ++++++++++++++++--- packages/common/src/components/chat/index.ts | 1 + 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/packages/admin/src/components/chat/Chat.tsx b/packages/admin/src/components/chat/Chat.tsx index 684bd6bf..e7a0015f 100644 --- a/packages/admin/src/components/chat/Chat.tsx +++ b/packages/admin/src/components/chat/Chat.tsx @@ -2,6 +2,9 @@ import { BlockedChat, ChatProps, Message, Notice } from '@softeer/common/compone import { FunctionComponent, useCallback } from 'react'; export default function Chat({ type, team, sender, content }: ChatProps) { + const handleHide = () => { + console.log('hide!'); + }; const Render: FunctionComponent = useCallback(() => { switch (type) { case 'n': @@ -11,8 +14,15 @@ export default function Chat({ type, team, sender, content }: ChatProps) { case 'm': default: return ( - -
{content}
+ { + handleHide(); + }} + > +
{content}
 ); } diff --git a/packages/admin/src/components/chat/RealTimeChatting.tsx b/packages/admin/src/components/chat/RealTimeChatting.tsx index c0e76e1b..984bd40c 100644 --- a/packages/admin/src/components/chat/RealTimeChatting.tsx +++ b/packages/admin/src/components/chat/RealTimeChatting.tsx @@ -1,12 +1,32 @@ import { ChatList } from '@softeer/common/components'; +import { useRef } from 'react'; import { UseSocketReturnType } from 'src/hooks/socket/index.ts'; +import { useAlert } from 'src/store/provider/AlertProvider.tsx'; +import { Button } from '../ui/button.tsx'; +import { Input } from '../ui/input.tsx'; import Chat from './Chat.tsx'; /** 실시간 기대평 섹션 */ function RealTimeChatting({ chatSocket: { messages } }: Pick) { + const { openAlert, addAlertCallback } = useAlert(); + const noticeInputRef = useRef(null); + const handleSend: React.FormEventHandler = (event) => { + event.preventDefault(); + addAlertCallback(() => { + // 삭제하는 로직 들어가야함 + if (noticeInputRef.current) { + noticeInputRef.current.value = ''; + } + }); + openAlert(

정말로 전송하겠습니까?
전송 이후엔 수정이 불가능합니다.

, 'confirm'); + }; return (
+
+ + +
{messages.map((message) => ( diff --git a/packages/common/src/components/chat/Message.tsx b/packages/common/src/components/chat/Message.tsx index d46d22a2..be3d49c1 100644 --- a/packages/common/src/components/chat/Message.tsx +++ b/packages/common/src/components/chat/Message.tsx @@ -1,10 +1,11 @@ -import { PropsWithChildren } from 'react'; +import { FormEventHandler, PropsWithChildren } from 'react'; import { MessageChatProps } from 'src/components/chat/index.ts'; import { SocketCategory } from 'src/types/category.ts'; import { cn } from 'src/utils/index.ts'; interface MessageProps extends Pick { isMyMessage?: boolean; + hideAction?: () => void; } const TYPES: Record = { @@ -19,9 +20,15 @@ export default function Message({ team, isMyMessage = false, children, + hideAction, }: PropsWithChildren) { const { casper, textColor } = TYPES[team.toLowerCase() as SocketCategory]; - + const handlehide: FormEventHandler = (event) => { + event.preventDefault(); + if (hideAction) { + hideAction(); + } + }; return (
@@ -29,7 +36,18 @@ export default function Message({

익명 {sender}

{isMyMessage &&

(나)

}
-

{children}

+
+

{children}

+ { + + hideAction ? +
+ +
+ : +
+ } +
); } diff --git a/packages/common/src/components/chat/index.ts b/packages/common/src/components/chat/index.ts index 8ff0e7a2..2732bb46 100644 --- a/packages/common/src/components/chat/index.ts +++ b/packages/common/src/components/chat/index.ts @@ -30,3 +30,4 @@ export { default as BlockedChat } from './BlockedChat.tsx'; export { default as ChatList } from './ChatList.tsx'; export { default as Message } from './Message.tsx'; export { default as Notice } from './Notice.tsx'; +