From 9e71148d190560a4d87246c4ebfb51c263bc22a7 Mon Sep 17 00:00:00 2001
From: Andrew Baldwin <andrew.baldwin44@gmail.com>
Date: Wed, 9 Oct 2024 15:13:49 +0200
Subject: [PATCH 1/2] Allow alerts and errors on new and edit form

---
 locust/webui/src/components/Modal/Modal.tsx   |  8 +-
 .../components/StateButtons/EditButton.tsx    |  6 +-
 .../components/StateButtons/NewTestButton.tsx |  6 +-
 .../components/SwarmForm/SwarmEditForm.tsx    | 61 -------------
 .../src/components/SwarmForm/SwarmForm.tsx    | 89 +++++++++++--------
 .../SwarmForm/tests/SwarmEditForm.test.tsx    | 52 -----------
 locust/webui/src/lib.tsx                      |  1 +
 7 files changed, 65 insertions(+), 158 deletions(-)
 delete mode 100644 locust/webui/src/components/SwarmForm/SwarmEditForm.tsx
 delete mode 100644 locust/webui/src/components/SwarmForm/tests/SwarmEditForm.test.tsx

diff --git a/locust/webui/src/components/Modal/Modal.tsx b/locust/webui/src/components/Modal/Modal.tsx
index a07e549aa7..d7416eca6f 100644
--- a/locust/webui/src/components/Modal/Modal.tsx
+++ b/locust/webui/src/components/Modal/Modal.tsx
@@ -1,5 +1,5 @@
 import CloseIcon from '@mui/icons-material/Close';
-import { Box, IconButton, Modal as MuiModal } from '@mui/material';
+import { Container, IconButton, Modal as MuiModal } from '@mui/material';
 
 interface IModal {
   open: boolean;
@@ -10,13 +10,13 @@ interface IModal {
 export default function Modal({ open, onClose, children }: IModal) {
   return (
     <MuiModal onClose={onClose} open={open}>
-      <Box
+      <Container
+        maxWidth='md'
         sx={{
           position: 'absolute',
           top: '50%',
           left: '50%',
           transform: 'translate(-50%, -50%)',
-          width: 'md',
           maxHeight: '90vh',
           overflowY: 'auto',
           display: 'flex',
@@ -37,7 +37,7 @@ export default function Modal({ open, onClose, children }: IModal) {
           <CloseIcon />
         </IconButton>
         {children}
-      </Box>
+      </Container>
     </MuiModal>
   );
 }
diff --git a/locust/webui/src/components/StateButtons/EditButton.tsx b/locust/webui/src/components/StateButtons/EditButton.tsx
index 2b9d6e5cb8..db88146b20 100644
--- a/locust/webui/src/components/StateButtons/EditButton.tsx
+++ b/locust/webui/src/components/StateButtons/EditButton.tsx
@@ -2,9 +2,9 @@ import { useState } from 'react';
 import { Button } from '@mui/material';
 
 import Modal from 'components/Modal/Modal';
-import SwarmEditForm from 'components/SwarmForm/SwarmEditForm';
+import SwarmForm, { ISwarmFormProps } from 'components/SwarmForm/SwarmForm';
 
-export default function EditButton() {
+export default function EditButton(swarmFormProps: ISwarmFormProps) {
   const [open, setOpen] = useState(false);
 
   return (
@@ -13,7 +13,7 @@ export default function EditButton() {
         Edit
       </Button>
       <Modal onClose={() => setOpen(false)} open={open}>
-        <SwarmEditForm onSubmit={() => setOpen(false)} />
+        <SwarmForm {...swarmFormProps} isEditSwarm onFormSubmit={() => setOpen(false)} />
       </Modal>
     </>
   );
diff --git a/locust/webui/src/components/StateButtons/NewTestButton.tsx b/locust/webui/src/components/StateButtons/NewTestButton.tsx
index 51b429b8e0..70b1a00107 100644
--- a/locust/webui/src/components/StateButtons/NewTestButton.tsx
+++ b/locust/webui/src/components/StateButtons/NewTestButton.tsx
@@ -2,9 +2,9 @@ import { useState } from 'react';
 import { Button } from '@mui/material';
 
 import Modal from 'components/Modal/Modal';
-import SwarmForm from 'components/SwarmForm/SwarmForm';
+import SwarmForm, { ISwarmFormProps } from 'components/SwarmForm/SwarmForm';
 
-export default function NewTestButton() {
+export default function NewTestButton(swarmFormProps: ISwarmFormProps) {
   const [open, setOpen] = useState(false);
 
   return (
@@ -13,7 +13,7 @@ export default function NewTestButton() {
         New
       </Button>
       <Modal onClose={() => setOpen(false)} open={open}>
-        <SwarmForm />
+        <SwarmForm {...swarmFormProps} />
       </Modal>
     </>
   );
diff --git a/locust/webui/src/components/SwarmForm/SwarmEditForm.tsx b/locust/webui/src/components/SwarmForm/SwarmEditForm.tsx
deleted file mode 100644
index 739ceee861..0000000000
--- a/locust/webui/src/components/SwarmForm/SwarmEditForm.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Box, Button, Container, TextField, Typography } from '@mui/material';
-import { connect } from 'react-redux';
-
-import Form from 'components/Form/Form';
-import { useStartSwarmMutation } from 'redux/api/swarm';
-import { swarmActions } from 'redux/slice/swarm.slice';
-import { IRootState } from 'redux/store';
-import { ISwarmFormInput, ISwarmState } from 'types/swarm.types';
-
-interface ISwarmForm extends ISwarmFormInput {
-  onSubmit: () => void;
-  setSwarm: (swarmPayload: Partial<ISwarmState>) => void;
-}
-
-function SwarmEditForm({ onSubmit, userCount, spawnRate, setSwarm }: ISwarmForm) {
-  const [startSwarm] = useStartSwarmMutation();
-
-  const onEditSwarm = (inputData: ISwarmFormInput) => {
-    onSubmit();
-    startSwarm(inputData);
-    setSwarm(inputData);
-  };
-
-  return (
-    <Container maxWidth='md' sx={{ my: 2 }}>
-      <Typography component='h2' noWrap variant='h6'>
-        Edit running load test
-      </Typography>
-      <Form<ISwarmFormInput> onSubmit={onEditSwarm}>
-        <Box sx={{ my: 2, display: 'flex', flexDirection: 'column', rowGap: 4 }}>
-          <TextField
-            defaultValue={userCount || 1}
-            label='Number of users (peak concurrency)'
-            name='userCount'
-          />
-
-          <TextField
-            defaultValue={spawnRate || 1}
-            label='Ramp up (users started/second)'
-            name='spawnRate'
-          />
-
-          <Button size='large' type='submit' variant='contained'>
-            Update
-          </Button>
-        </Box>
-      </Form>
-    </Container>
-  );
-}
-
-const storeConnector = ({ swarm: { spawnRate, userCount } }: IRootState) => ({
-  spawnRate,
-  userCount,
-});
-
-const actionCreator = {
-  setSwarm: swarmActions.setSwarm,
-};
-
-export default connect(storeConnector, actionCreator)(SwarmEditForm);
diff --git a/locust/webui/src/components/SwarmForm/SwarmForm.tsx b/locust/webui/src/components/SwarmForm/SwarmForm.tsx
index 9158227ef1..a7f8b979bc 100644
--- a/locust/webui/src/components/SwarmForm/SwarmForm.tsx
+++ b/locust/webui/src/components/SwarmForm/SwarmForm.tsx
@@ -29,6 +29,17 @@ interface IDispatchProps {
   setSwarm: (swarmPayload: Partial<ISwarmState>) => void;
 }
 
+export interface ISwarmFormProps {
+  alert?: {
+    level?: AlertColor;
+    message: string;
+  };
+  isDisabled?: boolean;
+  isEditSwarm?: boolean;
+  onFormChange?: (formData: React.ChangeEvent<HTMLFormElement>) => void;
+  onFormSubmit?: (inputData: ISwarmFormInput) => void;
+}
+
 interface ISwarmForm
   extends IDispatchProps,
     Pick<
@@ -43,14 +54,9 @@ interface ISwarmForm
       | 'showUserclassPicker'
       | 'spawnRate'
       | 'numUsers'
-    > {
-  alert?: {
-    level?: AlertColor;
-    message: string;
-  };
-  isDisabled?: boolean;
-  onFormChange?: (formData: React.ChangeEvent<HTMLFormElement>) => void;
-}
+      | 'userCount'
+    >,
+    ISwarmFormProps {}
 
 function SwarmForm({
   availableShapeClasses,
@@ -59,6 +65,7 @@ function SwarmForm({
   extraOptions,
   isShape,
   numUsers,
+  userCount,
   overrideHostWarning,
   runTime,
   setSwarm,
@@ -66,7 +73,9 @@ function SwarmForm({
   spawnRate,
   alert,
   isDisabled = false,
+  isEditSwarm = false,
   onFormChange,
+  onFormSubmit,
 }: ISwarmForm) {
   const [startSwarm] = useStartSwarmMutation();
   const [errorMessage, setErrorMessage] = useState('');
@@ -84,11 +93,15 @@ function SwarmForm({
         host: inputData.host || host,
         runTime: inputData.runTime,
         spawnRate: Number(inputData.spawnRate) || null,
-        numUsers: Number(inputData.userCount) || null,
+        userCount: Number(inputData.userCount),
       });
     } else {
       setErrorMessage(data ? data.message : 'An unknown error occured.');
     }
+
+    if (onFormSubmit) {
+      onFormSubmit(inputData);
+    }
   };
 
   const handleSwarmFormChange = (formEvent: React.ChangeEvent<HTMLFormElement>) => {
@@ -104,9 +117,9 @@ function SwarmForm({
   return (
     <Container maxWidth='md' sx={{ my: 2 }}>
       <Typography component='h2' noWrap variant='h6'>
-        Start new load test
+        {isEditSwarm ? 'Edit running load test' : 'Start new load test'}
       </Typography>
-      {showUserclassPicker && (
+      {!isEditSwarm && showUserclassPicker && (
         <Box marginBottom={2} marginTop={2}>
           <SwarmUserClassPicker
             availableUserClasses={availableUserClasses}
@@ -125,11 +138,11 @@ function SwarmForm({
             rowGap: 4,
           }}
         >
-          {showUserclassPicker && (
+          {!isEditSwarm && showUserclassPicker && (
             <Select label='Shape Class' name='shapeClass' options={availableShapeClasses} />
           )}
           <TextField
-            defaultValue={(isShape && '-') || numUsers || 1}
+            defaultValue={(isShape && '-') || userCount || numUsers || 1}
             disabled={!!isShape}
             label='Number of users (peak concurrency)'
             name='userCount'
@@ -141,36 +154,40 @@ function SwarmForm({
             name='spawnRate'
             title='Disabled for tests using LoadTestShape class'
           />
-          <TextField
-            defaultValue={host}
-            label={`Host ${
-              overrideHostWarning
-                ? '(setting this will override the host for the User classes)'
-                : ''
-            }`}
-            name='host'
-            title='Disabled for tests using LoadTestShape class'
-          />
-          <Accordion>
-            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
-              <Typography>Advanced options</Typography>
-            </AccordionSummary>
-            <AccordionDetails>
+          {!isEditSwarm && (
+            <>
               <TextField
-                defaultValue={runTime}
-                label='Run time (e.g. 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc.)'
-                name='runTime'
-                sx={{ width: '100%' }}
+                defaultValue={host}
+                label={`Host ${
+                  overrideHostWarning
+                    ? '(setting this will override the host for the User classes)'
+                    : ''
+                }`}
+                name='host'
+                title='Disabled for tests using LoadTestShape class'
               />
-            </AccordionDetails>
-          </Accordion>
+              <Accordion>
+                <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+                  <Typography>Advanced options</Typography>
+                </AccordionSummary>
+                <AccordionDetails>
+                  <TextField
+                    defaultValue={runTime}
+                    label='Run time (e.g. 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc.)'
+                    name='runTime'
+                    sx={{ width: '100%' }}
+                  />
+                </AccordionDetails>
+              </Accordion>
+            </>
+          )}
           {!isEmpty(extraOptions) && <CustomParameters extraOptions={extraOptions} />}
           {alert && !errorMessage && (
             <Alert severity={alert.level || 'info'}>{alert.message}</Alert>
           )}
           {errorMessage && <Alert severity={'error'}>{errorMessage}</Alert>}
           <Button disabled={isDisabled} size='large' type='submit' variant='contained'>
-            Start
+            {isEditSwarm ? 'Update' : 'Start'}
           </Button>
         </Box>
       </Form>
@@ -186,6 +203,7 @@ const storeConnector = ({
     isShape,
     host,
     numUsers,
+    userCount,
     overrideHostWarning,
     runTime,
     spawnRate,
@@ -200,6 +218,7 @@ const storeConnector = ({
   overrideHostWarning,
   showUserclassPicker,
   numUsers,
+  userCount,
   runTime,
   spawnRate,
 });
diff --git a/locust/webui/src/components/SwarmForm/tests/SwarmEditForm.test.tsx b/locust/webui/src/components/SwarmForm/tests/SwarmEditForm.test.tsx
deleted file mode 100644
index 6980033e87..0000000000
--- a/locust/webui/src/components/SwarmForm/tests/SwarmEditForm.test.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { act, fireEvent, waitFor } from '@testing-library/react';
-import { http } from 'msw';
-import { setupServer } from 'msw/node';
-import { afterEach, afterAll, beforeAll, describe, test, expect, vi } from 'vitest';
-
-import SwarmEditForm from 'components/SwarmForm/SwarmEditForm';
-import { TEST_BASE_API } from 'test/constants';
-import { renderWithProvider } from 'test/testUtils';
-import { camelCaseKeys, queryStringToObject } from 'utils/string';
-
-const startSwarm = vi.fn();
-
-const server = setupServer(
-  http.post(`${TEST_BASE_API}/swarm`, async ({ request }) =>
-    startSwarm(camelCaseKeys(queryStringToObject(await request.text()))),
-  ),
-);
-
-describe('SwarmEditForm', () => {
-  beforeAll(() => server.listen());
-  afterEach(() => server.resetHandlers());
-  afterAll(() => server.close());
-
-  test('should submit form data on button click', async () => {
-    const onSubmit = vi.fn();
-    const { getByText, getByLabelText } = renderWithProvider(<SwarmEditForm onSubmit={onSubmit} />);
-
-    act(() => {
-      fireEvent.change(getByLabelText('Number of users (peak concurrency)'), {
-        target: { value: '5' },
-      });
-      fireEvent.change(getByLabelText('Ramp up (users started/second)'), {
-        target: { value: '10' },
-      });
-
-      fireEvent.click(getByText('Update'));
-    });
-
-    await waitFor(async () => {
-      expect(onSubmit).toHaveBeenCalled();
-
-      const submittedData = startSwarm.mock.calls[0][0];
-
-      if (submittedData) {
-        expect(submittedData).toEqual({
-          spawnRate: '10',
-          userCount: '5',
-        });
-      }
-    });
-  });
-});
diff --git a/locust/webui/src/lib.tsx b/locust/webui/src/lib.tsx
index 5fd6a77bde..eba05208c9 100644
--- a/locust/webui/src/lib.tsx
+++ b/locust/webui/src/lib.tsx
@@ -30,6 +30,7 @@ export { default as NewTestButton } from 'components/StateButtons/NewTestButton'
 export { default as ResetButton } from 'components/StateButtons/ResetButton';
 export { default as StopButton } from 'components/StateButtons/StopButton';
 export { default as Logo } from 'assets/Logo';
+export { default as Modal } from 'components/Modal/Modal';
 export { default as useCreateTheme } from 'hooks/useCreateTheme';
 export { tabConfig } from 'components/Tabs/Tabs.constants';
 export { store as locustStore } from 'redux/store';

From 7529d7c574fef99d3afb620d37137bf581fc5896 Mon Sep 17 00:00:00 2001
From: Andrew Baldwin <andrew.baldwin44@gmail.com>
Date: Wed, 9 Oct 2024 15:35:50 +0200
Subject: [PATCH 2/2] Fix types

---
 locust/webui/package.json             |   1 -
 locust/webui/src/redux/api/swarm.ts   |   8 +-
 locust/webui/src/types/swarm.types.ts |   6 ++
 locust/webui/vite.config.ts           |  14 +--
 locust/webui/yarn.lock                | 129 +++++++++++++-------------
 5 files changed, 75 insertions(+), 83 deletions(-)

diff --git a/locust/webui/package.json b/locust/webui/package.json
index 0ee6b32e6b..172b8565ee 100644
--- a/locust/webui/package.json
+++ b/locust/webui/package.json
@@ -75,7 +75,6 @@
     "jsdom": "^25.0.1",
     "msw": "^2.4.9",
     "prettier": "^3.0.3",
-    "rollup": "^4.22.4",
     "typescript": "^5.2.2",
     "vitest": "^0.34.6",
     "vitest-webgl-canvas-mock": "^1.1.0"
diff --git a/locust/webui/src/redux/api/swarm.ts b/locust/webui/src/redux/api/swarm.ts
index c326f7f0cb..64c84a874c 100644
--- a/locust/webui/src/redux/api/swarm.ts
+++ b/locust/webui/src/redux/api/swarm.ts
@@ -1,6 +1,6 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
 
-import { ISwarmFormInput } from 'types/swarm.types';
+import { IStartSwarmResponse, ISwarmFormInput } from 'types/swarm.types';
 import {
   IStatsResponse,
   ISwarmExceptionsResponse,
@@ -10,12 +10,6 @@ import {
 import { createFormData } from 'utils/object';
 import { camelCaseKeys, snakeCaseKeys } from 'utils/string';
 
-interface IStartSwarmResponse {
-  success: boolean;
-  message: string;
-  host: string;
-}
-
 export const api = createApi({
   baseQuery: fetchBaseQuery(),
   endpoints: builder => ({
diff --git a/locust/webui/src/types/swarm.types.ts b/locust/webui/src/types/swarm.types.ts
index 6626a0ec48..d928e69fa9 100644
--- a/locust/webui/src/types/swarm.types.ts
+++ b/locust/webui/src/types/swarm.types.ts
@@ -94,3 +94,9 @@ export interface ISwarmFormInput
   userClasses?: string[];
   shapeClass?: string;
 }
+
+export interface IStartSwarmResponse {
+  success: boolean;
+  message: string;
+  host: string;
+}
diff --git a/locust/webui/vite.config.ts b/locust/webui/vite.config.ts
index 219b8a97ea..7c89def746 100644
--- a/locust/webui/vite.config.ts
+++ b/locust/webui/vite.config.ts
@@ -1,22 +1,10 @@
 import reactSwcPlugin from '@vitejs/plugin-react-swc';
 import { UserConfig, defineConfig } from 'vite';
-import checkerPlugin from 'vite-plugin-checker';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
 // https://vitejs.dev/config/
 export default defineConfig((config: UserConfig) => ({
-  plugins: [
-    reactSwcPlugin(),
-    tsconfigPaths(),
-    config.mode !== 'production' &&
-      config.mode !== 'test' &&
-      checkerPlugin({
-        typescript: true,
-        eslint: {
-          lintCommand: 'eslint ./src/**/*.{ts,tsx}',
-        },
-      }),
-  ],
+  plugins: [reactSwcPlugin(), tsconfigPaths()],
   base: './',
   build: {
     emptyOutDir: false,
diff --git a/locust/webui/yarn.lock b/locust/webui/yarn.lock
index 4dc433fa74..a92a9b5d45 100644
--- a/locust/webui/yarn.lock
+++ b/locust/webui/yarn.lock
@@ -16,11 +16,11 @@
     chalk "^2.4.2"
 
 "@babel/code-frame@^7.12.13":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
-  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.25.7.tgz#438f2c524071531d643c6f0188e1e28f130cebc7"
+  integrity sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==
   dependencies:
-    "@babel/highlight" "^7.24.7"
+    "@babel/highlight" "^7.25.7"
     picocolors "^1.0.0"
 
 "@babel/helper-module-imports@^7.16.7":
@@ -50,6 +50,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
   integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
+"@babel/helper-validator-identifier@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz#77b7f60c40b15c97df735b38a66ba1d7c3e93da5"
+  integrity sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==
+
 "@babel/highlight@^7.22.13":
   version "7.22.13"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16"
@@ -59,12 +64,12 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
-  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
+"@babel/highlight@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.7.tgz#20383b5f442aa606e7b5e3043b0b1aafe9f37de5"
+  integrity sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.25.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
@@ -1403,45 +1408,45 @@
     loupe "^2.3.6"
     pretty-format "^29.5.0"
 
-"@volar/language-core@2.4.5", "@volar/language-core@~2.4.1":
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.5.tgz#af8ba724b05fc4dce2339c49662e732e9c22c897"
-  integrity sha512-F4tA0DCO5Q1F5mScHmca0umsi2ufKULAnMOVBfMsZdT4myhVl4WdKRwCaKcfOkIEuyrAVvtq1ESBdZ+rSyLVww==
+"@volar/language-core@2.4.6", "@volar/language-core@~2.4.1":
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.6.tgz#159625a6e1263fe68d1afad524ae2bd40c4ee0dd"
+  integrity sha512-FxUfxaB8sCqvY46YjyAAV6c3mMIq/NWQMVvJ+uS4yxr1KzOvyg61gAuOnNvgCvO4TZ7HcLExBEsWcDu4+K4E8A==
   dependencies:
-    "@volar/source-map" "2.4.5"
+    "@volar/source-map" "2.4.6"
 
-"@volar/source-map@2.4.5":
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.5.tgz#81223a06321aaa067b40619189b44a9f0b7ac2d8"
-  integrity sha512-varwD7RaKE2J/Z+Zu6j3mNNJbNT394qIxXwdvz/4ao/vxOfyClZpSDtLKkwWmecinkOVos5+PWkWraelfMLfpw==
+"@volar/source-map@2.4.6":
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.6.tgz#b71ad241216f646812639f359262e6a84b46b6ed"
+  integrity sha512-Nsh7UW2ruK+uURIPzjJgF0YRGP5CX9nQHypA2OMqdM2FKy7rh+uv3XgPnWPw30JADbKvZ5HuBzG4gSbVDYVtiw==
 
 "@volar/typescript@^2.4.4":
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.5.tgz#1210c1e8561ac20af46348ceaf8e6e96c797063f"
-  integrity sha512-mcT1mHvLljAEtHviVcBuOyAwwMKz1ibXTi5uYtP/pf4XxoAzpdkQ+Br2IC0NPCvLCbjPZmbf3I0udndkfB1CDg==
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.6.tgz#6a4611b9fae793ad0d4c66d11d765f2731d93a12"
+  integrity sha512-NMIrA7y5OOqddL9VtngPWYmdQU03htNKFtAYidbYfWA0TOhyGVd9tfcP4TsLWQ+RBWDZCbBqsr8xzU0ZOxYTCQ==
   dependencies:
-    "@volar/language-core" "2.4.5"
+    "@volar/language-core" "2.4.6"
     path-browserify "^1.0.1"
     vscode-uri "^3.0.8"
 
-"@vue/compiler-core@3.5.8":
-  version "3.5.8"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.8.tgz#03ee4a2fa022c9bc3e59f789a1e14593b1e95b10"
-  integrity sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==
+"@vue/compiler-core@3.5.11":
+  version "3.5.11"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.11.tgz#3dcd0c1bab10732f44ab1790735afb03a4b69edc"
+  integrity sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==
   dependencies:
     "@babel/parser" "^7.25.3"
-    "@vue/shared" "3.5.8"
+    "@vue/shared" "3.5.11"
     entities "^4.5.0"
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
 
 "@vue/compiler-dom@^3.4.0":
-  version "3.5.8"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.8.tgz#03e4a6bef00a1979613a1db2ab39e9b2dced3373"
-  integrity sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==
+  version "3.5.11"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.11.tgz#950f8fc610e26326fed008b8d102cc8ee78a6ce5"
+  integrity sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==
   dependencies:
-    "@vue/compiler-core" "3.5.8"
-    "@vue/shared" "3.5.8"
+    "@vue/compiler-core" "3.5.11"
+    "@vue/shared" "3.5.11"
 
 "@vue/compiler-vue2@^2.7.16":
   version "2.7.16"
@@ -1465,10 +1470,10 @@
     muggle-string "^0.4.1"
     path-browserify "^1.0.1"
 
-"@vue/shared@3.5.8", "@vue/shared@^3.4.0":
-  version "3.5.8"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.8.tgz#6ef14933872dcc4f7b79fee3aaecf648ff807fed"
-  integrity sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==
+"@vue/shared@3.5.11", "@vue/shared@^3.4.0":
+  version "3.5.11"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.11.tgz#464b840afc89be9373addff9eeb9dfc98bf3fe2e"
+  integrity sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -1485,7 +1490,7 @@ acorn@^8.10.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
   integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
-acorn@^8.11.3:
+acorn@^8.12.1:
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
   integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
@@ -1973,10 +1978,10 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-confbox@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579"
-  integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==
+confbox@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.8.tgz#820d73d3b3c82d9bd910652c5d4d599ef8ff8b06"
+  integrity sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==
 
 convert-source-map@^1.5.0:
   version "1.9.0"
@@ -2758,9 +2763,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-uri@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134"
-  integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.2.tgz#d78b298cf70fd3b752fd951175a3da6a7b48f024"
+  integrity sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==
 
 fastq@^1.6.0:
   version "1.17.1"
@@ -4080,15 +4085,15 @@ mlly@^1.2.0, mlly@^1.4.0:
     pkg-types "^1.0.3"
     ufo "^1.3.0"
 
-mlly@^1.4.2, mlly@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.1.tgz#e0336429bb0731b6a8e887b438cbdae522c8f32f"
-  integrity sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==
+mlly@^1.4.2, mlly@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.2.tgz#21c0d04543207495b8d867eff0ac29fac9a023c0"
+  integrity sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==
   dependencies:
-    acorn "^8.11.3"
+    acorn "^8.12.1"
     pathe "^1.1.2"
-    pkg-types "^1.1.1"
-    ufo "^1.5.3"
+    pkg-types "^1.2.0"
+    ufo "^1.5.4"
 
 ms@2.1.2:
   version "2.1.2"
@@ -4481,13 +4486,13 @@ pkg-types@^1.0.3:
     mlly "^1.2.0"
     pathe "^1.1.0"
 
-pkg-types@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.2.0.tgz#d0268e894e93acff11a6279de147e83354ebd42d"
-  integrity sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==
+pkg-types@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.2.1.tgz#6ac4e455a5bb4b9a6185c1c79abd544c901db2e5"
+  integrity sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==
   dependencies:
-    confbox "^0.1.7"
-    mlly "^1.7.1"
+    confbox "^0.1.8"
+    mlly "^1.7.2"
     pathe "^1.1.2"
 
 possible-typed-array-names@^1.0.0:
@@ -4827,7 +4832,7 @@ rollup@^3.27.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^4.20.0, rollup@^4.22.4:
+rollup@^4.20.0:
   version "4.22.4"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.22.4.tgz#4135a6446671cd2a2453e1ad42a45d5973ec3a0f"
   integrity sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==
@@ -5549,7 +5554,7 @@ ufo@^1.3.0:
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.1.tgz#e085842f4627c41d4c1b60ebea1f75cdab4ce86b"
   integrity sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==
 
-ufo@^1.5.3:
+ufo@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754"
   integrity sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==
@@ -5718,9 +5723,9 @@ vite-plugin-checker@^0.8.0:
     vscode-uri "^3.0.2"
 
 vite-plugin-dts@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-4.2.2.tgz#96fd412827e545564a6dfe2de678feec5ddbed5c"
-  integrity sha512-USwTMReZFf8yXV+cKkm4WOMqmFjbReAvkyxON5xzdnZzJEBnFgax6BBDZIGGr9WMJYvhHdpaIHLrOjXDcla4OA==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-4.2.3.tgz#e0d9616eb574700111dbd19ae98e166541433263"
+  integrity sha512-O5NalzHANQRwVw1xj8KQun3Bv8OSDAlNJXrnqoAz10BOuW8FVvY5g4ygj+DlJZL5mtSPuMu9vd3OfrdW5d4k6w==
   dependencies:
     "@microsoft/api-extractor" "7.47.7"
     "@rollup/pluginutils" "^5.1.0"