From d4cad7aee9a40c15292704552cdc1077f62e0a89 Mon Sep 17 00:00:00 2001 From: lielsa2023 Date: Sun, 28 Jul 2024 14:42:12 +0300 Subject: [PATCH 01/10] create models and CURD for message --- server-side/app.js | 7 +- server-side/controllers/message.controller.js | 76 +++++++++++++++++++ .../controllers/messageType.controller.js | 58 ++++++++++++++ server-side/models/Message.model.js | 24 ++++++ server-side/models/messageType.model.js | 12 +++ server-side/router/message.router.js | 12 +++ server-side/router/messageType.router.js | 12 +++ 7 files changed, 199 insertions(+), 2 deletions(-) create mode 100644 server-side/controllers/message.controller.js create mode 100644 server-side/controllers/messageType.controller.js create mode 100644 server-side/models/Message.model.js create mode 100644 server-side/models/messageType.model.js create mode 100644 server-side/router/message.router.js create mode 100644 server-side/router/messageType.router.js diff --git a/server-side/app.js b/server-side/app.js index bedfade28..0cf9d84fd 100644 --- a/server-side/app.js +++ b/server-side/app.js @@ -9,12 +9,13 @@ import visitedWebSitesRouter from './router/visitedWebsite.router.js' import usersRouter from './router/user.router.js' import {pageNotFound,serverErrors} from './middleware/handleErrors.js' import {connectMongo} from './config/db.js' - +import MessageRouter from './router/message.router.js'; +import messageTypeRouter from './router/messageType.router.js'; const app=express(); app.use(express.json()) app.use(express.urlencoded({extended:true})); -app.use(morgan('dev'));//הדפסת המידע של כל הבקשה +app.use(morgan('dev')); app.use(cors()); dotenv.config(); @@ -28,6 +29,8 @@ app.use('/websites',websitesRouter); app.use('/profiles',profilesRouter); app.use('/vistedWebsites',visitedWebSitesRouter); app.use('/users',usersRouter); +app.use('/message',MessageRouter); +app.use('/messageType',messageTypeRouter); app.use(pageNotFound); app.use(serverErrors) let port= process.env.PORT; diff --git a/server-side/controllers/message.controller.js b/server-side/controllers/message.controller.js new file mode 100644 index 000000000..1f335699a --- /dev/null +++ b/server-side/controllers/message.controller.js @@ -0,0 +1,76 @@ + + +import Message from '../models/Message.model.js'; +import MessageType from '../models/MessageType.model.js'; + + + +export const getMessages = async (req, res) => { + try { + const messages = await Message.find().populate('type').populate('userId'); + res.status(200).json(messages); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}; + + +export const getMessageById = async (req, res) => { + try { + const message = await Message.findById(req.params.id).populate('type').populate('userId'); + if (!message) { + return res.status(404).json({ error: 'Message not found' }); + } + res.status(200).json(message); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}; + +export const addMessage = async (req, res) => { + try { + const { type, userId, date, read } = req.body; + + const messageType = await MessageType.findById(type); + if (!messageType) { + return res.status(400).json({ error: 'Invalid message type' }); + } + + const message = new Message({ type, userId, date, read }); + await message.save(); + res.status(201).json(message); + } catch (error) { + res.status(400).json({ error: error.message }); + } +}; +export const updateMessage = async (req, res) => { + try { + const { type, userId, date, read } = req.body; + const message = await Message.findByIdAndUpdate( + req.params.id, + { type, userId, date, read }, + { new: true, runValidators: true } + ); + if (!message) { + return res.status(404).json({ error: 'Message not found' }); + } + res.status(200).json(message); + } catch (error) { + res.status(400).json({ error: error.message }); + } +}; + + +export const deleteMessage = async (req, res) => { + try { + const message = await Message.findByIdAndDelete(req.params.id); + if (!message) { + return res.status(404).json({ error: 'Message not found' }); + } + res.status(200).json({ message: 'Message deleted successfully' }); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}; + + diff --git a/server-side/controllers/messageType.controller.js b/server-side/controllers/messageType.controller.js new file mode 100644 index 000000000..abea0071e --- /dev/null +++ b/server-side/controllers/messageType.controller.js @@ -0,0 +1,58 @@ +import MessageType from '../models/MessageType.model.js'; + + +export const getAllMessageTypes = async (req, res) => { + try { + const messageTypes = await MessageType.find(); + res.status(200).json(messageTypes); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}; + + +export const getMessageTypeById = async (req, res) => { + try { + const messageType = await MessageType.findById(req.params.id); + if (!messageType) { + return res.status(404).json({ error: 'Type not found' }); + } + res.status(200).json(messageType); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}; + + + + + +export const updateMessageType = async (req, res) => { + try { + const { type } = req.body; + const updatedMessageType = await MessageType.findByIdAndUpdate( + req.params.id, + { type }, + { new: true, runValidators: true } + ); + if (!updatedMessageType) { + return res.status(404).json({ error: 'MessageType not found' }); + } + res.status(200).json(updatedMessageType); + } catch (error) { + res.status(400).json({ error: error.message }); + } +}; + + +export const deleteMessageType = async (req, res) => { + try { + const deletedMessageType = await MessageType.findByIdAndDelete(req.params.id); + if (!deletedMessageType) { + return res.status(404).json({ error: 'MessageType not found' }); + } + res.status(200).json({ message: 'MessageType deleted successfully' }); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}; diff --git a/server-side/models/Message.model.js b/server-side/models/Message.model.js new file mode 100644 index 000000000..20994cb3f --- /dev/null +++ b/server-side/models/Message.model.js @@ -0,0 +1,24 @@ +import mongoose, { Schema } from "mongoose"; + +const messageSchema = new mongoose.Schema({ + type: { + type: mongoose.Schema.Types.ObjectId, + ref:'MessageType', + required: true, + }, + userId: { + type: mongoose.Schema.Types.ObjectId, + ref: 'Users', + required: true, + }, + date: { + type: Date, + default: Date.now, + }, + read: { + type: Boolean, + default: false, + }, +}); + +export default mongoose.model('Message', messageSchema); \ No newline at end of file diff --git a/server-side/models/messageType.model.js b/server-side/models/messageType.model.js new file mode 100644 index 000000000..4d0aac85b --- /dev/null +++ b/server-side/models/messageType.model.js @@ -0,0 +1,12 @@ + +import mongoose, { Schema } from "mongoose"; + +const messageTypeSchema = new mongoose.Schema({ + type: { + type: String, + enum: ['welcome'], + required: true, + }, +}); + +export default mongoose.model('MessageType', messageTypeSchema); diff --git a/server-side/router/message.router.js b/server-side/router/message.router.js new file mode 100644 index 000000000..12cafd073 --- /dev/null +++ b/server-side/router/message.router.js @@ -0,0 +1,12 @@ +import express from 'express'; +import { getMessages,getMessageById,addMessage, updateMessage, deleteMessage } from '../controllers/message.controller.js'; + +const MessageRouter=express.Router(); + +MessageRouter.get('/',getMessages); +MessageRouter.get('/:id', getMessageById); +MessageRouter.post('/',addMessage); +MessageRouter.put('/:id',updateMessage); +MessageRouter.delete('/:id',deleteMessage); + +export default MessageRouter; diff --git a/server-side/router/messageType.router.js b/server-side/router/messageType.router.js new file mode 100644 index 000000000..0fcdca8f2 --- /dev/null +++ b/server-side/router/messageType.router.js @@ -0,0 +1,12 @@ +import express from 'express'; +import { getAllMessageTypes, getMessageTypeById, updateMessageType, deleteMessageType } from '../controllers/messageType.controller.js'; + +const messageTypeRouter = express.Router(); + +messageTypeRouter.get('/', getAllMessageTypes); +messageTypeRouter.get('/:id', getMessageTypeById); + +messageTypeRouter.put('/:id', updateMessageType); +messageTypeRouter.delete('/:id', deleteMessageType); + +export default messageTypeRouter \ No newline at end of file From be3bef8288ad9454f29917c00501650c8266032a Mon Sep 17 00:00:00 2001 From: lielsa2023 Date: Wed, 31 Jul 2024 11:45:16 +0300 Subject: [PATCH 02/10] add changes --- server-side/controllers/message.controller.js | 30 +++++++++++++++++-- .../controllers/messageType.controller.js | 6 ++-- server-side/router/message.router.js | 3 +- server-side/router/messageType.router.js | 1 - 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/server-side/controllers/message.controller.js b/server-side/controllers/message.controller.js index 1f335699a..8157d8dc9 100644 --- a/server-side/controllers/message.controller.js +++ b/server-side/controllers/message.controller.js @@ -7,7 +7,8 @@ import MessageType from '../models/MessageType.model.js'; export const getMessages = async (req, res) => { try { - const messages = await Message.find().populate('type').populate('userId'); + const messages = await Message.find().select('-__v'); + res.status(200).json(messages); } catch (error) { res.status(500).json({ error: error.message }); @@ -17,7 +18,9 @@ export const getMessages = async (req, res) => { export const getMessageById = async (req, res) => { try { - const message = await Message.findById(req.params.id).populate('type').populate('userId'); + + const message = await Message.findById(req.params.id,{__v:0}) //.populate('type').populate('userId'); + if (!message) { return res.status(404).json({ error: 'Message not found' }); } @@ -27,6 +30,22 @@ export const getMessageById = async (req, res) => { } }; + +export const getMessagesByUserId = async (req, res) => { + try { + const userId = req.params.userId; + const messages = await Message.find({ userId }).select('-__v').populate('type', 'type -_id'); + + if (!messages) { + return res.status(404).json({ error: 'Messages not found' }); + } + + res.status(200).json(messages); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}; + export const addMessage = async (req, res) => { try { const { type, userId, date, read } = req.body; @@ -46,11 +65,16 @@ export const addMessage = async (req, res) => { export const updateMessage = async (req, res) => { try { const { type, userId, date, read } = req.body; + if (type !== undefined) updateFields.type = type; + if (userId !== undefined) updateFields.userId = userId; + if (date !== undefined) updateFields.date = date; + if (read !== undefined) updateFields.read = read; + const message = await Message.findByIdAndUpdate( req.params.id, { type, userId, date, read }, { new: true, runValidators: true } - ); + ); if (!message) { return res.status(404).json({ error: 'Message not found' }); } diff --git a/server-side/controllers/messageType.controller.js b/server-side/controllers/messageType.controller.js index abea0071e..9e22f60ed 100644 --- a/server-side/controllers/messageType.controller.js +++ b/server-side/controllers/messageType.controller.js @@ -3,7 +3,7 @@ import MessageType from '../models/MessageType.model.js'; export const getAllMessageTypes = async (req, res) => { try { - const messageTypes = await MessageType.find(); + const messageTypes = await MessageType.find().select('-__v'); res.status(200).json(messageTypes); } catch (error) { res.status(500).json({ error: error.message }); @@ -13,7 +13,9 @@ export const getAllMessageTypes = async (req, res) => { export const getMessageTypeById = async (req, res) => { try { - const messageType = await MessageType.findById(req.params.id); + + const messageType = await MessageType.findById(req.params.id).select('-__v'); + if (!messageType) { return res.status(404).json({ error: 'Type not found' }); } diff --git a/server-side/router/message.router.js b/server-side/router/message.router.js index 12cafd073..25c7a98c7 100644 --- a/server-side/router/message.router.js +++ b/server-side/router/message.router.js @@ -1,10 +1,11 @@ import express from 'express'; -import { getMessages,getMessageById,addMessage, updateMessage, deleteMessage } from '../controllers/message.controller.js'; +import { getMessages,getMessageById,addMessage, updateMessage, deleteMessage,getMessagesByUserId } from '../controllers/message.controller.js'; const MessageRouter=express.Router(); MessageRouter.get('/',getMessages); MessageRouter.get('/:id', getMessageById); +MessageRouter.get('/user/:userId',getMessagesByUserId ); MessageRouter.post('/',addMessage); MessageRouter.put('/:id',updateMessage); MessageRouter.delete('/:id',deleteMessage); diff --git a/server-side/router/messageType.router.js b/server-side/router/messageType.router.js index 0fcdca8f2..534c31892 100644 --- a/server-side/router/messageType.router.js +++ b/server-side/router/messageType.router.js @@ -5,7 +5,6 @@ const messageTypeRouter = express.Router(); messageTypeRouter.get('/', getAllMessageTypes); messageTypeRouter.get('/:id', getMessageTypeById); - messageTypeRouter.put('/:id', updateMessageType); messageTypeRouter.delete('/:id', deleteMessageType); From 59da19bbd028909fc11316e03d435e133a4ea620 Mon Sep 17 00:00:00 2001 From: ayeletBinder Date: Sun, 11 Aug 2024 12:42:00 +0300 Subject: [PATCH 03/10] server-client --- client-side/package-lock.json | 7982 ++--------------- client-side/package.json | 3 +- client-side/src/App.jsx | 45 +- server-side/.env | 4 +- server-side/app.js | 4 +- server-side/config/db.js | 2 +- server-side/controllers/message.controller.js | 30 +- server-side/package-lock.json | 1 + server-side/package.json | 1 + server-side/router/message.router.js | 3 +- 10 files changed, 1026 insertions(+), 7049 deletions(-) diff --git a/client-side/package-lock.json b/client-side/package-lock.json index e550168fe..f8a85941a 100644 --- a/client-side/package-lock.json +++ b/client-side/package-lock.json @@ -15,7 +15,6 @@ "@mui/material": "^5.16.0", "@mui/styled-engine-sc": "^6.0.0-alpha.18", "@mui/x-data-grid": "^7.9.0", -<<<<<<< HEAD "@reduxjs/toolkit": "^2.2.6", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^13.4.0", @@ -28,35 +27,14 @@ "react-router-dom": "^6.24.1", "react-scripts": "5.0.1", "redux": "^5.0.1", -======= - "@popperjs/core": "^2.11.8", - "@testing-library/jest-dom": "^5.17.0", - "@testing-library/react": "^13.4.0", - "@testing-library/user-event": "^13.5.0", - "axios": "^1.7.2", - "dotenv": "^16.4.5", - "i18next": "^23.12.1", - "i18next-browser-languagedetector": "^8.0.0", - "i18next-http-backend": "^2.5.2", - "moment-timezone": "^0.5.45", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-i18next": "^14.1.3", - "react-intl": "^6.6.8", - "react-redux": "^9.1.2", - "react-router": "^6.24.1", - "react-router-dom": "^6.24.1", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "styled-components": "^6.1.11", - "web-vitals": "^2.1.4" + "web-vitals": "^2.1.4", + "ws": "^8.18.0" }, "devDependencies": { "@chromatic-com/storybook": "^1.6.0", -<<<<<<< HEAD "@eslint/compat": "^1.1.0", "@eslint/js": "^9.6.0", -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "@storybook/addon-actions": "^8.1.11", "@storybook/addon-essentials": "^8.1.11", "@storybook/addon-interactions": "^8.1.11", @@ -67,10 +45,6 @@ "@storybook/react": "^8.1.11", "@storybook/react-webpack5": "^8.1.11", "@storybook/test": "^8.1.11", -<<<<<<< HEAD - "eslint": "^8.57.0", -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "eslint-config-react-app": "^7.0.1", "eslint-plugin-react": "^7.27.1", "eslint-plugin-storybook": "^0.8.0", @@ -78,12 +52,7 @@ "prop-types": "^15.8.1", "react-scripts": "^5.0.1", "sass": "^1.77.6", -<<<<<<< HEAD - "storybook": "^8.1.11", - "webpack": "^5.92.1" -======= "storybook": "^8.1.11" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/@adobe/css-tools": { @@ -96,10 +65,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -112,10 +78,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -125,27 +88,6 @@ "node": ">=6.0.0" } }, -<<<<<<< HEAD -======= - "node_modules/@apideck/better-ajv-errors": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz", - "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==", - "dev": true, - "license": "MIT", - "dependencies": { - "json-schema": "^0.4.0", - "jsonpointer": "^5.0.0", - "leven": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "ajv": ">=8" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@babel/code-frame": { "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", @@ -160,38 +102,32 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz", - "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz", + "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz", - "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", + "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.9", - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-module-transforms": "^7.24.9", - "@babel/helpers": "^7.24.8", - "@babel/parser": "^7.24.8", - "@babel/template": "^7.24.7", - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.9", + "@babel/generator": "^7.25.0", + "@babel/helper-compilation-targets": "^7.25.2", + "@babel/helper-module-transforms": "^7.25.2", + "@babel/helpers": "^7.25.0", + "@babel/parser": "^7.25.0", + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.2", + "@babel/types": "^7.25.2", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -206,24 +142,11 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT" - }, "node_modules/@babel/eslint-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.8.tgz", - "integrity": "sha512-nYAikI4XTGokU2QX7Jx+v4rxZKhKivaQaREZjuW3mrJrbdWJ5yUfohnoUULge+zEEaKjPYNxhoRgUKktjXtbwA==", -<<<<<<< HEAD -======= + "version": "7.25.1", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz", + "integrity": "sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", @@ -238,25 +161,23 @@ "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0" } }, -<<<<<<< HEAD "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, "license": "Apache-2.0", "engines": { "node": ">=10" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@babel/generator": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.9.tgz", - "integrity": "sha512-G8v3jRg+z8IwY1jHFxvCNhOPYPterE4XljNgdGTYfSTtzzwjIswIzIaSPSLs3R7yFuqnqNeay5rjICfqVr+/6A==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz", + "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==", "license": "MIT", "dependencies": { - "@babel/types": "^7.24.9", + "@babel/types": "^7.25.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -269,10 +190,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/types": "^7.24.7" @@ -285,10 +203,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", @@ -299,16 +214,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz", - "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", + "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.24.8", + "@babel/compat-data": "^7.25.2", "@babel/helper-validator-option": "^7.24.8", "browserslist": "^4.23.1", "lru-cache": "^5.1.1", @@ -319,23 +231,18 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz", - "integrity": "sha512-4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz", + "integrity": "sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", "@babel/helper-member-expression-to-functions": "^7.24.8", "@babel/helper-optimise-call-expression": "^7.24.7", - "@babel/helper-replace-supers": "^7.24.7", + "@babel/helper-replace-supers": "^7.25.0", "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/traverse": "^7.25.0", "semver": "^6.3.1" }, "engines": { @@ -346,13 +253,10 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz", - "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", + "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", @@ -370,10 +274,7 @@ "version": "0.6.2", "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", @@ -386,51 +287,11 @@ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", - "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", - "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", - "license": "MIT", - "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", - "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-member-expression-to-functions": { "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.8", @@ -454,20 +315,16 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz", - "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", + "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", "@babel/helper-module-imports": "^7.24.7", "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7" + "@babel/helper-validator-identifier": "^7.24.7", + "@babel/traverse": "^7.25.2" }, "engines": { "node": ">=6.9.0" @@ -480,10 +337,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/types": "^7.24.7" @@ -496,28 +350,22 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz", - "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", + "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-wrap-function": "^7.24.7" + "@babel/helper-wrap-function": "^7.25.0", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -527,18 +375,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz", - "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", + "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-member-expression-to-functions": "^7.24.7", - "@babel/helper-optimise-call-expression": "^7.24.7" + "@babel/helper-member-expression-to-functions": "^7.24.8", + "@babel/helper-optimise-call-expression": "^7.24.7", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -551,10 +396,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", @@ -568,10 +410,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", @@ -581,18 +420,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", - "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-string-parser": { "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", @@ -615,46 +442,36 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz", - "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", + "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-function-name": "^7.24.7", - "@babel/template": "^7.24.7", - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz", - "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", + "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.8" + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -676,10 +493,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz", - "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==", + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz", + "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.2" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -688,17 +508,30 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz", - "integrity": "sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==", -<<<<<<< HEAD -======= + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", + "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/traverse": "^7.25.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", + "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -708,16 +541,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz", - "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", + "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -730,10 +560,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -748,17 +575,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz", - "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", + "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -772,10 +596,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.18.6", @@ -792,10 +613,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.7.tgz", "integrity": "sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.24.7", @@ -814,10 +632,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.18.6", @@ -835,10 +650,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.18.6", @@ -856,10 +668,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz", "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==", "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", @@ -878,10 +687,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.18.6", @@ -898,10 +704,7 @@ "version": "7.21.0-placeholder-for-preset-env.2", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6.9.0" @@ -914,10 +717,7 @@ "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -930,10 +730,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -946,10 +743,7 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" @@ -962,10 +756,7 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -981,10 +772,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.7.tgz", "integrity": "sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1000,10 +788,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -1016,10 +801,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.3" @@ -1032,10 +814,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.7.tgz", "integrity": "sha512-9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1051,10 +830,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz", "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1070,10 +846,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz", "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1089,10 +862,7 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -1105,10 +875,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -1121,10 +888,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1140,10 +904,7 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -1156,10 +917,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -1172,10 +930,7 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -1188,10 +943,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -1204,10 +956,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -1220,10 +969,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -1236,10 +982,7 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -1255,10 +998,7 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -1274,10 +1014,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz", "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1293,10 +1030,7 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", @@ -1313,10 +1047,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1329,19 +1060,16 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz", - "integrity": "sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz", + "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-remap-async-to-generator": "^7.24.7", - "@babel/plugin-syntax-async-generators": "^7.8.4" + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/helper-remap-async-to-generator": "^7.25.0", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -1354,10 +1082,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.24.7", @@ -1375,10 +1100,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1391,16 +1113,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz", - "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", + "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -1413,10 +1132,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz", "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.24.7", @@ -1433,10 +1149,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.24.7", @@ -1451,22 +1164,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz", - "integrity": "sha512-VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz", + "integrity": "sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.8", - "@babel/helper-replace-supers": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-replace-supers": "^7.25.0", + "@babel/traverse": "^7.25.0", "globals": "^11.1.0" }, "engines": { @@ -1480,10 +1188,7 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4" @@ -1493,10 +1198,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1513,10 +1215,7 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" @@ -1532,10 +1231,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", @@ -1552,10 +1248,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1567,14 +1260,28 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", + "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.25.0", + "@babel/helper-plugin-utils": "^7.24.8" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-transform-dynamic-import": { "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1591,10 +1298,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", @@ -1611,10 +1315,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1628,16 +1329,13 @@ } }, "node_modules/@babel/plugin-transform-flow-strip-types": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.7.tgz", - "integrity": "sha512-cjRKJ7FobOH2eakx7Ja+KpJRj8+y+/SiB3ooYm/n2UJfxu0oEaOoxOinitkJcPqv9KxS0kxTGPUaR7L2XcXDXA==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.2.tgz", + "integrity": "sha512-InBZ0O8tew5V0K6cHcQ+wgxlrjOw1W4wDXLkOTjLRD8GYhTSkxTVBtdy3MMtvYBrbAWa1Qm3hNoTc1620Yj+Mg==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.8", "@babel/plugin-syntax-flow": "^7.24.7" }, "engines": { @@ -1651,10 +1349,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1668,18 +1363,15 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz", - "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==", -<<<<<<< HEAD -======= + "version": "7.25.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", + "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-compilation-targets": "^7.24.8", + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/traverse": "^7.25.1" }, "engines": { "node": ">=6.9.0" @@ -1692,10 +1384,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1709,16 +1398,13 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz", - "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", + "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -1731,10 +1417,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1751,10 +1434,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1770,10 +1450,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.24.7", @@ -1790,10 +1467,7 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.24.8", @@ -1808,19 +1482,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz", - "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==", -<<<<<<< HEAD -======= + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", + "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-hoist-variables": "^7.24.7", - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7" + "@babel/helper-module-transforms": "^7.25.0", + "@babel/helper-plugin-utils": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -1833,10 +1504,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.24.7", @@ -1853,10 +1521,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", @@ -1873,10 +1538,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -1892,10 +1554,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1912,10 +1571,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1932,10 +1588,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.24.7", @@ -1954,10 +1607,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1974,10 +1624,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -1994,10 +1641,7 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8", @@ -2015,10 +1659,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2034,10 +1675,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz", "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.24.7", @@ -2054,10 +1692,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", @@ -2076,10 +1711,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2092,16 +1724,13 @@ } }, "node_modules/@babel/plugin-transform-react-constant-elements": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.24.7.tgz", - "integrity": "sha512-7LidzZfUXyfZ8/buRW6qIIHBY8wAZ1OrY9c/wTr8YhZ6vMPo+Uc/CVFLYY1spZrEQlD4w5u8wjqk5NQ3OVqQKA==", -<<<<<<< HEAD -======= + "version": "7.25.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.25.1.tgz", + "integrity": "sha512-SLV/giH/V4SmloZ6Dt40HjTGTAIkxn33TVIHxNGNvo8ezMhrxBkzisj4op1KZYPIOHFLqhv60OHvX+YRu4xbmQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -2114,10 +1743,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz", "integrity": "sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2130,20 +1756,17 @@ } }, "node_modules/@babel/plugin-transform-react-jsx": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz", - "integrity": "sha512-+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz", + "integrity": "sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-plugin-utils": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.8", "@babel/plugin-syntax-jsx": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.2" }, "engines": { "node": ">=6.9.0" @@ -2156,10 +1779,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz", "integrity": "sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/plugin-transform-react-jsx": "^7.24.7" @@ -2175,10 +1795,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz", "integrity": "sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", @@ -2195,10 +1812,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -2215,10 +1829,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2234,10 +1845,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz", "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.24.7", @@ -2258,10 +1866,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2277,10 +1882,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -2297,10 +1899,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2316,10 +1915,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2335,10 +1931,7 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" @@ -2351,18 +1944,16 @@ } }, "node_modules/@babel/plugin-transform-typescript": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.8.tgz", - "integrity": "sha512-CgFgtN61BbdOGCP4fLaAMOPkzWUh6yQZNMr5YSt8uz2cZSSiQONCQFWqsE4NeVfOIhqDOlS9CR3WD91FzMeB2Q==", -<<<<<<< HEAD -======= + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz", + "integrity": "sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", - "@babel/helper-create-class-features-plugin": "^7.24.8", + "@babel/helper-create-class-features-plugin": "^7.25.0", "@babel/helper-plugin-utils": "^7.24.8", + "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", "@babel/plugin-syntax-typescript": "^7.24.7" }, "engines": { @@ -2376,10 +1967,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" @@ -2395,10 +1983,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", @@ -2415,10 +2000,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", @@ -2435,10 +2017,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz", "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", @@ -2452,23 +2031,21 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.8.tgz", - "integrity": "sha512-vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ==", -<<<<<<< HEAD -======= + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz", + "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.24.8", - "@babel/helper-compilation-targets": "^7.24.8", + "@babel/compat-data": "^7.25.2", + "@babel/helper-compilation-targets": "^7.25.2", "@babel/helper-plugin-utils": "^7.24.8", "@babel/helper-validator-option": "^7.24.8", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", @@ -2489,29 +2066,30 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.24.7", - "@babel/plugin-transform-async-generator-functions": "^7.24.7", + "@babel/plugin-transform-async-generator-functions": "^7.25.0", "@babel/plugin-transform-async-to-generator": "^7.24.7", "@babel/plugin-transform-block-scoped-functions": "^7.24.7", - "@babel/plugin-transform-block-scoping": "^7.24.7", + "@babel/plugin-transform-block-scoping": "^7.25.0", "@babel/plugin-transform-class-properties": "^7.24.7", "@babel/plugin-transform-class-static-block": "^7.24.7", - "@babel/plugin-transform-classes": "^7.24.8", + "@babel/plugin-transform-classes": "^7.25.0", "@babel/plugin-transform-computed-properties": "^7.24.7", "@babel/plugin-transform-destructuring": "^7.24.8", "@babel/plugin-transform-dotall-regex": "^7.24.7", "@babel/plugin-transform-duplicate-keys": "^7.24.7", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0", "@babel/plugin-transform-dynamic-import": "^7.24.7", "@babel/plugin-transform-exponentiation-operator": "^7.24.7", "@babel/plugin-transform-export-namespace-from": "^7.24.7", "@babel/plugin-transform-for-of": "^7.24.7", - "@babel/plugin-transform-function-name": "^7.24.7", + "@babel/plugin-transform-function-name": "^7.25.1", "@babel/plugin-transform-json-strings": "^7.24.7", - "@babel/plugin-transform-literals": "^7.24.7", + "@babel/plugin-transform-literals": "^7.25.2", "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", "@babel/plugin-transform-member-expression-literals": "^7.24.7", "@babel/plugin-transform-modules-amd": "^7.24.7", "@babel/plugin-transform-modules-commonjs": "^7.24.8", - "@babel/plugin-transform-modules-systemjs": "^7.24.7", + "@babel/plugin-transform-modules-systemjs": "^7.25.0", "@babel/plugin-transform-modules-umd": "^7.24.7", "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", "@babel/plugin-transform-new-target": "^7.24.7", @@ -2572,10 +2150,7 @@ "version": "0.1.6-no-external-plugins", "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", @@ -2590,10 +2165,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz", "integrity": "sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -2614,10 +2186,7 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz", "integrity": "sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", @@ -2653,21 +2222,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/register/node_modules/clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@babel/register/node_modules/find-cache-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", @@ -2696,19 +2250,6 @@ "node": ">=6" } }, - "node_modules/@babel/register/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "license": "MIT", - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@babel/register/node_modules/locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -2776,7 +2317,6 @@ "node": ">=4" } }, -<<<<<<< HEAD "node_modules/@babel/register/node_modules/pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", @@ -2787,8 +2327,6 @@ "node": ">=6" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@babel/register/node_modules/pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", @@ -2812,33 +2350,17 @@ "semver": "bin/semver" } }, - "node_modules/@babel/register/node_modules/shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, - "license": "MIT", - "dependencies": { - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@babel/regjsgen": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@babel/runtime": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz", - "integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz", + "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -2848,33 +2370,30 @@ } }, "node_modules/@babel/template": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", - "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", + "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/parser": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz", - "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==", + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz", + "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.8", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", - "@babel/helper-hoist-variables": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/parser": "^7.24.8", - "@babel/types": "^7.24.8", + "@babel/generator": "^7.25.0", + "@babel/parser": "^7.25.3", + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.2", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -2892,9 +2411,9 @@ } }, "node_modules/@babel/types": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz", - "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz", + "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.24.8", @@ -2916,10 +2435,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@chromatic-com/storybook": { @@ -2944,20 +2460,14 @@ "version": "12.1.1", "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.1.1.tgz", "integrity": "sha512-YAYeJ+Xqh7fUou1d1j9XHl44BmsuThiTr4iNrgCQ3J27IbhXsxXDGZ1cXv8Qvs99d4rBbLiSKy3+WZiet32PcQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0" }, "node_modules/@csstools/postcss-cascade-layers": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz", "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/selector-specificity": "^2.0.2", @@ -2978,10 +2488,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz", "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/postcss-progressive-custom-properties": "^1.1.0", @@ -3002,10 +2509,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz", "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3025,10 +2529,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz", "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3048,10 +2549,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz", "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/postcss-progressive-custom-properties": "^1.1.0", @@ -3072,10 +2570,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz", "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/selector-specificity": "^2.0.0", @@ -3096,10 +2591,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz", "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3119,10 +2611,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz", "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3142,10 +2631,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz", "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/postcss-progressive-custom-properties": "^1.1.0", @@ -3166,10 +2652,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz", "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3185,10 +2668,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz", "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3208,10 +2688,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz", "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3231,10 +2708,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz", "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3254,10 +2728,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz", "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "engines": { "node": "^12 || ^14 || >=16" @@ -3274,10 +2745,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "engines": { "node": "^14 || ^16 || >=18" @@ -3291,16 +2759,16 @@ } }, "node_modules/@emotion/babel-plugin": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz", - "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==", + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz", + "integrity": "sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==", "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.16.7", "@babel/runtime": "^7.18.3", - "@emotion/hash": "^0.9.1", - "@emotion/memoize": "^0.8.1", - "@emotion/serialize": "^1.1.2", + "@emotion/hash": "^0.9.2", + "@emotion/memoize": "^0.9.0", + "@emotion/serialize": "^1.2.0", "babel-plugin-macros": "^3.1.0", "convert-source-map": "^1.5.0", "escape-string-regexp": "^4.0.0", @@ -3309,53 +2777,59 @@ "stylis": "4.2.0" } }, + "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "license": "MIT" + }, "node_modules/@emotion/cache": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz", - "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==", + "version": "11.13.1", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz", + "integrity": "sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==", "license": "MIT", "dependencies": { - "@emotion/memoize": "^0.8.1", - "@emotion/sheet": "^1.2.2", - "@emotion/utils": "^1.2.1", - "@emotion/weak-memoize": "^0.3.1", + "@emotion/memoize": "^0.9.0", + "@emotion/sheet": "^1.4.0", + "@emotion/utils": "^1.4.0", + "@emotion/weak-memoize": "^0.4.0", "stylis": "4.2.0" } }, "node_modules/@emotion/hash": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", - "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz", + "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==", "license": "MIT" }, "node_modules/@emotion/is-prop-valid": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", - "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.0.tgz", + "integrity": "sha512-SHetuSLvJDzuNbOdtPVbq6yMMMlLoW5Q94uDqJZqy50gcmAjxFkVqmzqSGEFq9gT2iMuIeKV1PXVWmvUhuZLlQ==", "license": "MIT", "dependencies": { - "@emotion/memoize": "^0.8.1" + "@emotion/memoize": "^0.9.0" } }, "node_modules/@emotion/memoize": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", - "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz", + "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==", "license": "MIT" }, "node_modules/@emotion/react": { - "version": "11.11.4", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", - "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", + "version": "11.13.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz", + "integrity": "sha512-WkL+bw1REC2VNV1goQyfxjx1GYJkcc23CRQkXX+vZNLINyfI7o+uUn/rTGPt/xJ3bJHd5GcljgnxHf4wRw5VWQ==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.11.0", - "@emotion/cache": "^11.11.0", - "@emotion/serialize": "^1.1.3", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", - "@emotion/utils": "^1.2.1", - "@emotion/weak-memoize": "^0.3.1", + "@emotion/babel-plugin": "^11.12.0", + "@emotion/cache": "^11.13.0", + "@emotion/serialize": "^1.3.0", + "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0", + "@emotion/utils": "^1.4.0", + "@emotion/weak-memoize": "^0.4.0", "hoist-non-react-statics": "^3.3.1" }, "peerDependencies": { @@ -3368,36 +2842,36 @@ } }, "node_modules/@emotion/serialize": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.4.tgz", - "integrity": "sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz", + "integrity": "sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==", "license": "MIT", "dependencies": { - "@emotion/hash": "^0.9.1", - "@emotion/memoize": "^0.8.1", - "@emotion/unitless": "^0.8.1", - "@emotion/utils": "^1.2.1", + "@emotion/hash": "^0.9.2", + "@emotion/memoize": "^0.9.0", + "@emotion/unitless": "^0.9.0", + "@emotion/utils": "^1.4.0", "csstype": "^3.0.2" } }, "node_modules/@emotion/sheet": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz", - "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz", + "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==", "license": "MIT" }, "node_modules/@emotion/styled": { - "version": "11.11.5", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.5.tgz", - "integrity": "sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==", + "version": "11.13.0", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.13.0.tgz", + "integrity": "sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.11.0", - "@emotion/is-prop-valid": "^1.2.2", - "@emotion/serialize": "^1.1.4", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", - "@emotion/utils": "^1.2.1" + "@emotion/babel-plugin": "^11.12.0", + "@emotion/is-prop-valid": "^1.3.0", + "@emotion/serialize": "^1.3.0", + "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0", + "@emotion/utils": "^1.4.0" }, "peerDependencies": { "@emotion/react": "^11.0.0-rc.0", @@ -3410,30 +2884,30 @@ } }, "node_modules/@emotion/unitless": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz", + "integrity": "sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==", "license": "MIT" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", - "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz", + "integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==", "license": "MIT", "peerDependencies": { "react": ">=16.8.0" } }, "node_modules/@emotion/utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz", - "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz", + "integrity": "sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==", "license": "MIT" }, "node_modules/@emotion/weak-memoize": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz", - "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz", + "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==", "license": "MIT" }, "node_modules/@esbuild/aix-ppc64": { @@ -3831,10 +3305,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.3.0" @@ -3846,33 +3317,16 @@ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, - "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@eslint-community/regexpp": { "version": "4.11.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, -<<<<<<< HEAD "node_modules/@eslint/compat": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.1.1.tgz", @@ -3883,16 +3337,11 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@eslint/eslintrc": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ajv": "^6.12.4", @@ -3912,34 +3361,11 @@ "url": "https://opencollective.com/eslint" } }, -<<<<<<< HEAD -======= - "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "type-fest": "^0.20.2" @@ -3951,24 +3377,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD -======= - "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" @@ -3978,168 +3391,27 @@ } }, "node_modules/@eslint/js": { -<<<<<<< HEAD - "version": "9.7.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz", - "integrity": "sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz", + "integrity": "sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==", "dev": true, "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@floating-ui/core": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.4.tgz", - "integrity": "sha512-a4IowK4QkXl4SCWTGUR0INAfEOX3wtsYw3rKK5InQEHMGObkR8Xk44qYQD9P4r6HHw0iIfK6GUKECmY8sTkqRA==", -======= - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@fontsource/roboto": { - "version": "5.0.13", - "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.13.tgz", - "integrity": "sha512-j61DHjsdUCKMXSdNLTOxcG701FWnF0jcqNNQi2iPCDxU8seN/sMxeh62dC++UiagCWq9ghTypX+Pcy7kX+QOeQ==", - "license": "Apache-2.0" - }, - "node_modules/@formatjs/ecma402-abstract": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz", - "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "dependencies": { - "@formatjs/intl-localematcher": "0.5.4", - "tslib": "^2.4.0" - } - }, -<<<<<<< HEAD - "node_modules/@floating-ui/dom": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.7.tgz", - "integrity": "sha512-wmVfPG5o2xnKDU4jx/m4w5qva9FWHcnZ8BvzEe90D/RpwsJaTAVYPEPdQ8sbr/N8zZTAHlZUTQdqg8ZUbzHmng==", -======= - "node_modules/@formatjs/fast-memoize": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz", - "integrity": "sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "dependencies": { - "tslib": "^2.4.0" - } - }, -<<<<<<< HEAD - "node_modules/@floating-ui/react-dom": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.1.tgz", - "integrity": "sha512-4h84MJt3CHrtG18mGsXuLCHMrug49d7DFkU0RMIyshRveBeyV2hmV/pDaF2Uxtu8kgq5r46llp5E5FQiR0K2Yg==", -======= - "node_modules/@formatjs/icu-messageformat-parser": { - "version": "2.7.8", - "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz", - "integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "dependencies": { - "@formatjs/ecma402-abstract": "2.0.0", - "@formatjs/icu-skeleton-parser": "1.8.2", - "tslib": "^2.4.0" - } - }, - "node_modules/@formatjs/icu-skeleton-parser": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz", - "integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==", - "license": "MIT", - "dependencies": { - "@formatjs/ecma402-abstract": "2.0.0", - "tslib": "^2.4.0" - } - }, - "node_modules/@formatjs/intl": { - "version": "2.10.4", - "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.4.tgz", - "integrity": "sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==", - "license": "MIT", - "dependencies": { - "@formatjs/ecma402-abstract": "2.0.0", - "@formatjs/fast-memoize": "2.2.0", - "@formatjs/icu-messageformat-parser": "2.7.8", - "@formatjs/intl-displaynames": "6.6.8", - "@formatjs/intl-listformat": "7.5.7", - "intl-messageformat": "10.5.14", - "tslib": "^2.4.0" - }, - "peerDependencies": { - "typescript": "^4.7 || 5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, -<<<<<<< HEAD - "node_modules/@floating-ui/utils": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.4.tgz", - "integrity": "sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA==", - "license": "MIT" - }, "node_modules/@fontsource/roboto": { "version": "5.0.13", "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.13.tgz", "integrity": "sha512-j61DHjsdUCKMXSdNLTOxcG701FWnF0jcqNNQi2iPCDxU8seN/sMxeh62dC++UiagCWq9ghTypX+Pcy7kX+QOeQ==", "license": "Apache-2.0" -======= - "node_modules/@formatjs/intl-displaynames": { - "version": "6.6.8", - "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz", - "integrity": "sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==", - "license": "MIT", - "dependencies": { - "@formatjs/ecma402-abstract": "2.0.0", - "@formatjs/intl-localematcher": "0.5.4", - "tslib": "^2.4.0" - } - }, - "node_modules/@formatjs/intl-listformat": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz", - "integrity": "sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==", - "license": "MIT", - "dependencies": { - "@formatjs/ecma402-abstract": "2.0.0", - "@formatjs/intl-localematcher": "0.5.4", - "tslib": "^2.4.0" - } - }, - "node_modules/@formatjs/intl-localematcher": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz", - "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==", - "license": "MIT", - "dependencies": { - "tslib": "^2.4.0" - } ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "deprecated": "Use @eslint/config-array instead", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", @@ -4154,10 +3426,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "engines": { "node": ">=12.22" @@ -4172,20 +3441,14 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", "deprecated": "Use @eslint/object-schema instead", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause" }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "string-width": "^5.1.2", @@ -4203,10 +3466,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=12" @@ -4219,10 +3479,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", @@ -4240,10 +3497,7 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", @@ -4261,10 +3515,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "camelcase": "^5.3.1", @@ -4281,10 +3532,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" @@ -4294,10 +3542,7 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -4307,10 +3552,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "locate-path": "^5.0.0", @@ -4324,10 +3566,7 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "argparse": "^1.0.7", @@ -4341,10 +3580,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-locate": "^4.1.0" @@ -4357,10 +3593,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-try": "^2.0.0" @@ -4376,10 +3609,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-limit": "^2.2.0" @@ -4392,10 +3622,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -4405,10 +3632,7 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -4418,10 +3642,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz", "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -4439,10 +3660,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4459,10 +3677,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -4472,10 +3687,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -4491,10 +3703,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -4511,10 +3720,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -4524,10 +3730,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -4548,10 +3751,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -4569,10 +3769,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -4585,10 +3782,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz", "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/console": "^27.5.1", @@ -4636,10 +3830,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4656,10 +3847,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -4669,10 +3857,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -4688,10 +3873,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -4708,10 +3890,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -4721,10 +3900,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -4745,10 +3921,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -4766,10 +3939,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -4782,10 +3952,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -4798,10 +3965,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz", "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/fake-timers": "^27.5.1", @@ -4817,10 +3981,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4837,10 +3998,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -4850,10 +4008,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -4869,10 +4024,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -4889,10 +4041,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -4902,10 +4051,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5008,15 +4154,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/@jest/expect/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/@jest/expect/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -5172,9 +4309,9 @@ } }, "node_modules/@jest/expect/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "optional": true, @@ -5221,10 +4358,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz", "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -5242,10 +4376,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -5262,10 +4393,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -5275,10 +4403,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -5294,10 +4419,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -5314,10 +4436,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -5327,10 +4446,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -5351,10 +4467,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -5372,10 +4485,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5388,10 +4498,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz", "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/environment": "^27.5.1", @@ -5406,10 +4513,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -5426,10 +4530,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -5439,10 +4540,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -5458,10 +4556,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -5478,10 +4573,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -5491,10 +4583,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz", "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -5510,10 +4599,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -5523,10 +4609,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -5542,10 +4625,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -5555,10 +4635,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -5574,10 +4651,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -5598,10 +4672,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5614,10 +4685,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz", "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^0.2.3", @@ -5662,10 +4730,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -5682,10 +4747,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -5695,10 +4757,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -5714,10 +4773,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -5734,10 +4790,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -5747,10 +4800,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -5768,10 +4818,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -5781,10 +4828,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5793,42 +4837,6 @@ "node": ">=8" } }, -<<<<<<< HEAD - "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "license": "MIT", - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { -======= - "node_modules/@jest/reporters/node_modules/v8-to-istanbul": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz", - "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==", - "dev": true, - "license": "ISC", - "dependencies": { - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0", - "source-map": "^0.7.3" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/@jest/reporters/node_modules/v8-to-istanbul/node_modules/source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">= 8" - } - }, "node_modules/@jest/schemas": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", @@ -5838,7 +4846,6 @@ "@sinclair/typebox": "^0.27.8" }, "engines": { ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, @@ -5846,10 +4853,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz", "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "callsites": "^3.0.0", @@ -5864,10 +4868,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -5877,10 +4878,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz", "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/console": "^27.5.1", @@ -5896,10 +4894,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -5916,10 +4911,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -5929,10 +4921,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -5948,10 +4937,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -5968,10 +4954,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -5981,10 +4964,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5997,10 +4977,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz", "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/test-result": "^27.5.1", @@ -6016,10 +4993,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz", "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.1.0", @@ -6046,10 +5020,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -6066,10 +5037,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -6079,10 +5047,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -6098,10 +5063,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -6114,14 +5076,18 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/@jest/transform/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true, + "license": "MIT" + }, "node_modules/@jest/transform/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -6131,10 +5097,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -6152,10 +5115,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -6165,10 +5125,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -6177,34 +5134,12 @@ "node": ">=8" } }, -<<<<<<< HEAD - "node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "license": "MIT", - "dependencies": { -======= - "node_modules/@jest/transform/node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, "node_modules/@jest/types": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "license": "MIT", "dependencies": { ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", @@ -6304,10 +5239,7 @@ "version": "0.3.6", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -6334,10 +5266,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@mdx-js/react": { @@ -6358,49 +5287,10 @@ "react": ">=16" } }, -<<<<<<< HEAD - "node_modules/@mui/base": { - "version": "5.0.0-beta.40", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz", - "integrity": "sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@floating-ui/react-dom": "^2.0.8", - "@mui/types": "^7.2.14", - "@mui/utils": "^5.15.14", - "@popperjs/core": "^2.11.8", - "clsx": "^2.1.0", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.1.tgz", - "integrity": "sha512-62Jq7ACYi/55Kjkh/nVfEL3F3ytTYTsdB8MGJ9iI+eRQv+Aoem5CPUAzQihUo25qqh1VkVu9/jQn3dFbyrXHgw==", -======= - "node_modules/@mui/core-downloads-tracker": { - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.2.tgz", - "integrity": "sha512-BUaUnl3pbd00YR2Da241CYtPw6ldNahyCKZMXXs5F1JZTFKWotNq3qQJC6Yq2YQlK3EflfBqzHj6XwwecocHMg==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.6.tgz", + "integrity": "sha512-kytg6LheUG42V8H/o/Ptz3olSO5kUXW9zF0ox18VnblX6bO2yif1FPItgc3ey1t5ansb1+gbe7SatntqusQupg==", "license": "MIT", "funding": { "type": "opencollective", @@ -6408,15 +5298,9 @@ } }, "node_modules/@mui/icons-material": { -<<<<<<< HEAD - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.1.tgz", - "integrity": "sha512-ogQPweYba4+5XZykilwxn2/oS78uwoQ0BVBpOhhCJo0ooZsqTTsalhzP2qD/RdGqMQ8xyXPz1sYM2djTruVVVA==", -======= - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.2.tgz", - "integrity": "sha512-5Pbxpm+o0Is1MwB4Ds/kHDOuo596NSq3vFEaWzmC+0kGCjoHt9ECiiBWMGr48yJUSbW8iTAgt/ugeJH3ZPRtDg==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.6.tgz", + "integrity": "sha512-ceNGjoXheH9wbIFa1JHmSc9QVjJUvh18KvHrR4/FkJCSi9HXJ+9ee1kUhCOEFfuxNF8UB6WWVrIUOUgRd70t0A==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.9" @@ -6440,30 +5324,17 @@ } }, "node_modules/@mui/material": { -<<<<<<< HEAD - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.1.tgz", - "integrity": "sha512-BGTgJRb0d/hX9tus5CEb6N/Fo8pE4tYA+s9r4/S0PCrtZ3urCLXlTH4qrAvggQbiF1cYRAbHCkVHoQ+4Pdxl+w==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/base": "5.0.0-beta.40", - "@mui/core-downloads-tracker": "^5.16.1", - "@mui/system": "^5.16.1", - "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.1", -======= - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.2.tgz", - "integrity": "sha512-VhPiXg60uITmXnaSr6qlxIOgOviYYBe0Hh7rNaSpaTBAtI6mIcYhdl0jihoL0PN9qa9cEm0GZFdBL0K2/Ub56w==", + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.6.tgz", + "integrity": "sha512-0LUIKBOIjiFfzzFNxXZBRAyr9UQfmTAFzbt6ziOU2FDXhorNN2o3N9/32mNJbCA8zJo2FqFU6d3dtoqUDyIEfA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.9", - "@mui/core-downloads-tracker": "^5.16.2", - "@mui/system": "^5.16.2", + "@mui/core-downloads-tracker": "^5.16.6", + "@mui/system": "^5.16.6", "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.2", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "@mui/utils": "^5.16.6", + "@popperjs/core": "^2.11.8", "@types/react-transition-group": "^4.4.10", "clsx": "^2.1.0", "csstype": "^3.1.3", @@ -6498,23 +5369,13 @@ } }, "node_modules/@mui/private-theming": { -<<<<<<< HEAD - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.16.1.tgz", - "integrity": "sha512-2EGCKnAlq9vRIFj61jNWNXlKAxXp56577OVvsts7fAqRx+G1y6F+N7Q198SBaz8jYQeGKSz8ZMXK/M3FqjdEyw==", + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.16.6.tgz", + "integrity": "sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.9", - "@mui/utils": "^5.16.1", -======= - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.16.2.tgz", - "integrity": "sha512-cxztG36hXxhKvD3dmtwrjSqbMtKeYyf2XCZNk0OKRKi81aytSaPImBiCngHIllrkmClwiWRMKxjOHyhSTlqfUg==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/utils": "^5.16.2", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "@mui/utils": "^5.16.6", "prop-types": "^15.8.1" }, "engines": { @@ -6535,15 +5396,9 @@ } }, "node_modules/@mui/styled-engine": { -<<<<<<< HEAD - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.1.tgz", - "integrity": "sha512-JwWUBaYR8HHCFefSeos0z6JoTbu0MnjAuNHu4QoDgPxl2EE70XH38CsKay66Iy0QkNWmGTRXVU2sVFgUOPL/Dw==", -======= - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.2.tgz", - "integrity": "sha512-+a2DE5McPvfuiQXhdfWjcHc82WwBrwCsLryXEhhgsUOVyMgOD8GrEkqr04evivXkIrU2A0fHeWxZu8N+5vogLg==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.6.tgz", + "integrity": "sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.9", @@ -6595,29 +5450,16 @@ } }, "node_modules/@mui/system": { -<<<<<<< HEAD - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.16.1.tgz", - "integrity": "sha512-VaFcClC+uhvIEzhzcNmh9FRBvrG9IPjsOokhj6U1HPZsFnLzHV7AD7dJcT6LxWoiIZj9Ej0GK+MGh/b8+BtSlQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/private-theming": "^5.16.1", - "@mui/styled-engine": "^5.16.1", - "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.1", -======= - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.16.2.tgz", - "integrity": "sha512-gwlqUn2Gs5tF/68wvqlVjsVBahLYwX6WvNTPy/2TXSb7xqJyqso2vGBlImB7/vSaqoZ+jifOEuamSj/nlZIX6A==", + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.16.6.tgz", + "integrity": "sha512-5xgyJjBIMPw8HIaZpfbGAaFYPwImQn7Nyh+wwKWhvkoIeDosQ1ZMVrbTclefi7G8hNmqhip04duYwYpbBFnBgw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.9", - "@mui/private-theming": "^5.16.2", - "@mui/styled-engine": "^5.16.2", + "@mui/private-theming": "^5.16.6", + "@mui/styled-engine": "^5.16.6", "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.2", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "@mui/utils": "^5.16.6", "clsx": "^2.1.0", "csstype": "^3.1.3", "prop-types": "^15.8.1" @@ -6662,23 +5504,15 @@ } }, "node_modules/@mui/utils": { -<<<<<<< HEAD - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.16.1.tgz", - "integrity": "sha512-4UQzK46tAEYs2xZv79hRiIc3GxZScd00kGPDadNrGztAEZlmSaUY8cb9ITd2xCiTfzsx5AN6DH8aaQ8QEKJQeQ==", -======= - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.16.2.tgz", - "integrity": "sha512-AuM5B7DBt8tRgoqgwdx85T6Lkq7QC09PgJs9hb84Z2NfhgSKd5bFUDVW0FXzpX+lFoYG6z9FoInNYT3EMv6VHA==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.16.6.tgz", + "integrity": "sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.9", + "@mui/types": "^7.2.15", "@types/prop-types": "^15.7.12", -<<<<<<< HEAD -======= "clsx": "^2.1.1", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "prop-types": "^15.8.1", "react-is": "^18.3.1" }, @@ -6700,15 +5534,15 @@ } }, "node_modules/@mui/x-data-grid": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.10.0.tgz", - "integrity": "sha512-8nOwgtjOe7GzkygJsQow0Rf8ceV1s1oxHEUI2hx1IKfCsnVLGuX6cn9QZJcUwAaaUcVmWU3Pisz9vH2nFSioOQ==", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.11.1.tgz", + "integrity": "sha512-7D8fK4NZolU4vGIhKrI8FSFp6CwlpUwBXr944GsKjOTzvC1yASkqD6b2VAYPvvpb94BzqQsvePHT3if/JZylKA==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.24.7", - "@mui/system": "^5.16.0", - "@mui/utils": "^5.16.0", - "@mui/x-internals": "7.10.0", + "@babel/runtime": "^7.24.8", + "@mui/system": "^5.16.5", + "@mui/utils": "^5.16.5", + "@mui/x-internals": "7.11.1", "clsx": "^2.1.1", "prop-types": "^15.8.1", "reselect": "^4.1.8" @@ -6727,13 +5561,13 @@ } }, "node_modules/@mui/x-internals": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.10.0.tgz", - "integrity": "sha512-yfO9DkmXqxDdX98PWcchhYhWYtqqwmTQ774M3LYjYlE6SfVXqdfWbEoeRPvH5jLQrwCQ0MoC1FhMKJ9Yt9R5fw==", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.11.1.tgz", + "integrity": "sha512-CN9HmtcyJ6/1fd8by5h1/R8WmFN4xyk6XYvYG9++oAaSF1ttX16oiE5vB+gGafl7St0epCWWjvOzl21h29k6WQ==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.24.7", - "@mui/utils": "^5.16.0" + "@babel/runtime": "^7.24.8", + "@mui/utils": "^5.16.5" }, "engines": { "node": ">=14.0.0" @@ -6750,10 +5584,7 @@ "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "eslint-scope": "5.1.1" @@ -6763,6 +5594,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -6776,6 +5608,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -6785,10 +5618,7 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", @@ -6802,10 +5632,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 8" @@ -6815,10 +5642,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", @@ -6832,10 +5656,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "optional": true, "engines": { @@ -6846,10 +5667,7 @@ "version": "0.5.15", "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.15.tgz", "integrity": "sha512-LFWllMA55pzB9D34w/wXUCf8+c+IYKuJDgxiZ3qMhl64KRMBHYM1I3VdGaD2BV5FNPV2/S2596bppxHbv2ZydQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-html": "^0.0.9", @@ -6898,10 +5716,7 @@ "version": "0.7.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">= 8" @@ -6917,11 +5732,10 @@ "url": "https://opencollective.com/popperjs" } }, -<<<<<<< HEAD "node_modules/@reduxjs/toolkit": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.6.tgz", - "integrity": "sha512-kH0r495c5z1t0g796eDQAkYbEQ3a1OLYN9o8jQQVZyKyw367pfRGS+qZLkHYvFHiUUdafpoSlQ2QYObIApjPWA==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.7.tgz", + "integrity": "sha512-faI3cZbSdFb8yv9dhDTmGwclW0vk0z5o1cia+kf7gCbaCwHI5e+7tP57mJUv22pNcNbeA62GSrPpfrUfdXcQ6g==", "license": "MIT", "dependencies": { "immer": "^10.0.3", @@ -6942,28 +5756,16 @@ } } }, - "node_modules/@reduxjs/toolkit/node_modules/immer": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz", - "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/immer" - } - }, "node_modules/@reduxjs/toolkit/node_modules/reselect": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz", "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==", "license": "MIT" }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@remix-run/router": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.17.1.tgz", - "integrity": "sha512-mCOMec4BKd6BRGBZeSnGiIgwsbLGp3yhVqAD8H+PxiRNEHgDpZb8J1TnrSDlg97t0ySKMQJTHCWBCmBpSmkF6Q==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.18.0.tgz", + "integrity": "sha512-L3jkqmqoSVBVKHfpGZmLrex0lxR5SucGA0sUfFzGctehw+S/ggL9L/0NnC5mw6P8HUWpFZ3nQw3cRApjjWx9Sw==", "license": "MIT", "engines": { "node": ">=14.0.0" @@ -6973,10 +5775,7 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.10.4", @@ -7000,10 +5799,7 @@ "version": "11.2.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz", "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@rollup/pluginutils": "^3.1.0", @@ -7024,10 +5820,7 @@ "version": "1.17.1", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -7037,10 +5830,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz", "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@rollup/pluginutils": "^3.1.0", @@ -7054,10 +5844,7 @@ "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "sourcemap-codec": "^1.4.8" @@ -7067,10 +5854,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/estree": "0.0.39", @@ -7088,30 +5872,21 @@ "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@rollup/pluginutils/node_modules/estree-walker": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@rushstack/eslint-patch": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.3.tgz", - "integrity": "sha512-qC/xYId4NMebE6w/V33Fh9gWxLgURiNYgVNObbJl2LZv0GUUItCcCqC5axQSwRaAgaxl2mELq1rMzlswaQ0Zxg==", -<<<<<<< HEAD -======= + "version": "1.10.4", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.4.tgz", + "integrity": "sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@sinclair/typebox": { @@ -7137,32 +5912,36 @@ "version": "1.8.6", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } }, + "node_modules/@sinonjs/commons/node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/@sinonjs/fake-timers": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^1.7.0" } }, "node_modules/@storybook/addon-actions": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.2.4.tgz", - "integrity": "sha512-l1dlzWBBkR/5aullsX8N1ZbYr2bkeHPAaMCRy1jG5BBA8IHbi55JFwmJ8XF2gXkT2GyAZnePzb43RuLXz4KxFQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.2.7.tgz", + "integrity": "sha512-wDnMGGmaogAForkNncfCx8BEDiwxeK8zC0lj8HkRPUuH6vTr81U5RIb12Wa2TnnNKLKMFAtyPSnofHf3OAfzZQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7177,13 +5956,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-backgrounds": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.2.4.tgz", - "integrity": "sha512-4oU25rFyr4OgMxHe4RpLJ7lxVwUDfdTi1j/YVyHfYv8koTqjagso8bv0uj0ujP5C3dSsVO0sp3/JOfPDkEUtrA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.2.7.tgz", + "integrity": "sha512-kEL3kzYB0qNfpznchlGBnQm4iydyzdTYDPlCFsKUAxfUmJFnpz2H52Sl5lB+qJC/4OREp1Usltag7cUjeuyzMQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7196,13 +5975,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-controls": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.2.4.tgz", - "integrity": "sha512-e56aUYhxyR8zJJstRAUP3WILhWTcvgRf5bysTtiyjFAL7U47cuCr043+IYEsxLkXhuZTKX2pcYSrjBtT5bYkVA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.2.7.tgz", + "integrity": "sha512-u3MruX0Zh6l1iNkoJdXwx+zPVqpDKypVrC0YdN3qQ3+mtTwqt35rgetYqtOkDnJ8mXKxo8A5giERKPIyzH9iBA==", "dev": true, "license": "MIT", "dependencies": { @@ -7215,22 +5994,22 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-docs": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.2.4.tgz", - "integrity": "sha512-oyrDw4nGfntu5Hkhr2Qt1wUOyLaVVERQekYyejyir92QhM10UeA7ZarPXNLfCTj7rbTrWmM1Waka9Tsf8TGMrw==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.2.7.tgz", + "integrity": "sha512-icLbvUWp95WUxq2sY+0xgJ49MaQ2HqtWY9RUJUZswJ/ZPJTCCpIoa6HP/NOB9A90Oec9n8sW+1CdDL4CxfxfZg==", "dev": true, "license": "MIT", "dependencies": { "@babel/core": "^7.24.4", "@mdx-js/react": "^3.0.0", - "@storybook/blocks": "8.2.4", - "@storybook/csf-plugin": "8.2.4", + "@storybook/blocks": "8.2.7", + "@storybook/csf-plugin": "8.2.7", "@storybook/global": "^5.0.0", - "@storybook/react-dom-shim": "8.2.4", + "@storybook/react-dom-shim": "8.2.7", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "fs-extra": "^11.1.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -7244,25 +6023,25 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-essentials": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.2.4.tgz", - "integrity": "sha512-4upNauDJAJxauxnoUpUvzDnLo18C2yTVxgg+Id9wrKpt9C+CYH2oXyXzxoYGucYWZEe7zgCO6rWrGrKEisiLPQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.2.7.tgz", + "integrity": "sha512-5qe7La9B2Z4Y9Fet3C35y8zOZwKgrqduNk8yAUmPRAOwopdo8SGKYpnFTnAtTfTCVk6Y+AZlRfQq0yLUk0Wl3g==", "dev": true, "license": "MIT", "dependencies": { - "@storybook/addon-actions": "8.2.4", - "@storybook/addon-backgrounds": "8.2.4", - "@storybook/addon-controls": "8.2.4", - "@storybook/addon-docs": "8.2.4", - "@storybook/addon-highlight": "8.2.4", - "@storybook/addon-measure": "8.2.4", - "@storybook/addon-outline": "8.2.4", - "@storybook/addon-toolbars": "8.2.4", - "@storybook/addon-viewport": "8.2.4", + "@storybook/addon-actions": "8.2.7", + "@storybook/addon-backgrounds": "8.2.7", + "@storybook/addon-controls": "8.2.7", + "@storybook/addon-docs": "8.2.7", + "@storybook/addon-highlight": "8.2.7", + "@storybook/addon-measure": "8.2.7", + "@storybook/addon-outline": "8.2.7", + "@storybook/addon-toolbars": "8.2.7", + "@storybook/addon-viewport": "8.2.7", "ts-dedent": "^2.0.0" }, "funding": { @@ -7270,13 +6049,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-highlight": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.2.4.tgz", - "integrity": "sha512-Ll/2y0m/q9ko9jFt40qsiee4fds6vpcwwxi3mPAVwRV/J7PpMzPkoLxM54bKpeHiWdTeGCXRguXNvyeQMQf3pg==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.2.7.tgz", + "integrity": "sha512-YhiLtyJ3NBNV3FQoQo8RFjj59QGSmmeSwRvCjoac6No2DY5vkMW5a8mW6ORr6QYd7ratRNtd3AsPqksZIehRwQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7287,19 +6066,19 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-interactions": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-interactions/-/addon-interactions-8.2.4.tgz", - "integrity": "sha512-jGGTCKfqZzq3DSZF+cimD8FBcO8X9yu/cNTcxHtx6TN9McV69sTiSzOpGgbWkLjLjP0XU12NQGqFw38tIn7n9Q==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-interactions/-/addon-interactions-8.2.7.tgz", + "integrity": "sha512-WZXlwpBNLE483uKuR70A7nm+ZbcZNEmuVz/J1/u7dbi0BUWzmJUa9YIgVeQ/1KTwW8KTkxvB0TuUUH3aA4ZKlA==", "dev": true, "license": "MIT", "dependencies": { "@storybook/global": "^5.0.0", - "@storybook/instrumenter": "8.2.4", - "@storybook/test": "8.2.4", + "@storybook/instrumenter": "8.2.7", + "@storybook/test": "8.2.7", "polished": "^4.2.2", "ts-dedent": "^2.2.0" }, @@ -7308,13 +6087,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-links": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-8.2.4.tgz", - "integrity": "sha512-1FgD6YXdXXSEDrp2aO4LxYt/X7LnBYx7cLlFla+xbn1CZLGqWLLeOT+BFd29wxpzs3u1Tap9r1iz1vRYL5ziyg==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-8.2.7.tgz", + "integrity": "sha512-BJdR+vdj7S6Rtx8XqBNQzLsRGH/FYHJ6B6BPWGp0awVx0jNWJnxepINQov8i+GAddUVQGCNG+r4LI3QSD3tNAA==", "dev": true, "license": "MIT", "dependencies": { @@ -7328,7 +6107,7 @@ }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.2.4" + "storybook": "^8.2.7" }, "peerDependenciesMeta": { "react": { @@ -7337,9 +6116,9 @@ } }, "node_modules/@storybook/addon-measure": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.2.4.tgz", - "integrity": "sha512-bSyE3mGDaaIKoe6Kt/f20YXKsn8WSoJUHrfKA68gbb+H3tegVQaqeS2KY5YzLqvjHe1qSmrO132NJt8RixLOPQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.2.7.tgz", + "integrity": "sha512-cS5njwlzrgrUjigUKjhbgJMT8bhPmVDK3FwrQqGhw6xYP4cd9/YBJ4RLNPWhOgGJ+EUTz7eFZ/Rkli5mNrhYcQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7351,13 +6130,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-onboarding": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-onboarding/-/addon-onboarding-8.2.4.tgz", - "integrity": "sha512-guFRNPoNpLTR6hReGClUZasyMstGR2XmM4fjKg1iVvodw0nI/sZE/8eG2J2pWUGnp5YzFYirLuIZ03QO7edEMg==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-onboarding/-/addon-onboarding-8.2.7.tgz", + "integrity": "sha512-YgpQY0uhYRi+3vny2BjnFlY19ga9/GGZlcFTfaf2wCO7KhjXdES3bp4VTtdNkAwbVaXYY+b33ERd4x1UQ7jSkA==", "dev": true, "license": "MIT", "dependencies": { @@ -7368,13 +6147,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-outline": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.2.4.tgz", - "integrity": "sha512-1C6NrvSDREgCZ7o/1n7Ca81uDDzrSrzWiOkh4OeA7PPQ/445cAOX2OMvxzNkKDIT9GLCLNi9M5XIVyGxJVS4dQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.2.7.tgz", + "integrity": "sha512-oFSo3o5eEUSsdGUSPV22pGoJ5lL0PGcqjcee2hyl0Rc60ovsnB1BEGOoaGk7/bmkywMxRZm8D6j85V8HftA/kg==", "dev": true, "license": "MIT", "dependencies": { @@ -7386,13 +6165,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-toolbars": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.2.4.tgz", - "integrity": "sha512-iPnSr+hdz40Uoqg2cimyWf01/Y8GdgdMKB+b47TGIxtn9SEFBXck00ZG8ttwBvEsecu9K9CDt20fIOnr6oK5tQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.2.7.tgz", + "integrity": "sha512-lEq0/uiogQSxS8pM5AqIexPiG2mudHUxgBiVWSspbTQDUbGBUxB64VYeYERat50N/GyS2iCymlfSkC+OUXaYLQ==", "dev": true, "license": "MIT", "funding": { @@ -7400,13 +6179,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/addon-viewport": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.2.4.tgz", - "integrity": "sha512-58DcoX0xGpWlJfc0iLDjggkVPYzT4JdCZA2ioK9SQXQMsUzGFwR5PAAJv1tivYp7467tNkXvcM3QTb3Q3g8p4g==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.2.7.tgz", + "integrity": "sha512-d4+klwM/duTukNED1WCeBgIMqL5Jvm/iUs2rUc5HI1FGMEDYnoLVR2ztjivQs+6f1cJWuGwWZD/toB5pKHuR/A==", "dev": true, "license": "MIT", "dependencies": { @@ -7417,13 +6196,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/blocks": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.2.4.tgz", - "integrity": "sha512-Hl2Dpg41YiJLSVXxjEJPjgPShrDJM3RY6HEEOjqTcAADsheX1IHAWXMJSJGMmne3Sew6VdJXPuHBIOFV4suZxg==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.2.7.tgz", + "integrity": "sha512-lZB4EzmY4ftgubkf7hmkALEhmfMhRkDRD5QjrgTZLRpdVXPzFUyljgLlTBhv34YTN+ZLYK618/4uSVJBpgoKeQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7449,7 +6228,7 @@ "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.2.4" + "storybook": "^8.2.7" }, "peerDependenciesMeta": { "react": { @@ -7461,13 +6240,13 @@ } }, "node_modules/@storybook/builder-webpack5": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.2.4.tgz", - "integrity": "sha512-O+upj4dsqmQuOJ1MzxypOoVfZ/bN78em/Px6Dks9LUdvLe/bLLXBeB0HsXdmuUE3GZS5LnR8gQQncl5V3pRLkA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.2.7.tgz", + "integrity": "sha512-3SWN0X6qB14jnCrpMWd5tCshxzLEcRK5Sw/vBIW9HUsUx9OVMPxWp+Ti6NZHqj6FfHVbJb+qOwHl493JAJaFdg==", "dev": true, "license": "MIT", "dependencies": { - "@storybook/core-webpack": "8.2.4", + "@storybook/core-webpack": "8.2.7", "@types/node": "^18.0.0", "@types/semver": "^7.3.4", "browser-assert": "^1.2.1", @@ -7500,7 +6279,7 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" }, "peerDependenciesMeta": { "typescript": { @@ -7508,236 +6287,43 @@ } } }, -<<<<<<< HEAD "node_modules/@storybook/builder-webpack5/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, -======= - "node_modules/@storybook/builder-webpack5/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "license": "ISC", + "bin": { + "semver": "bin/semver.js" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" + "engines": { + "node": ">=10" } }, - "node_modules/@storybook/builder-webpack5/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/@storybook/codemod": { + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-8.2.7.tgz", + "integrity": "sha512-D2sJcZMUO6Y7DNja4LvdT6uBee4bZbQKB904kEG9Kpr0XF20IHAP9BbkfG8HEFaS0GbJwvGvE03Sg+S1y+vO6Q==", "dev": true, "license": "MIT", "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" + "@babel/core": "^7.24.4", + "@babel/preset-env": "^7.24.4", + "@babel/types": "^7.24.0", + "@storybook/core": "8.2.7", + "@storybook/csf": "0.1.11", + "@types/cross-spawn": "^6.0.2", + "cross-spawn": "^7.0.3", + "globby": "^14.0.1", + "jscodeshift": "^0.15.1", + "lodash": "^4.17.21", + "prettier": "^3.1.1", + "recast": "^0.23.5", + "tiny-invariant": "^1.3.1" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz", - "integrity": "sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.16.7", - "chalk": "^4.1.2", - "chokidar": "^3.5.3", - "cosmiconfig": "^7.0.1", - "deepmerge": "^4.2.2", - "fs-extra": "^10.0.0", - "memfs": "^3.4.1", - "minimatch": "^3.0.4", - "node-abort-controller": "^3.0.1", - "schema-utils": "^3.1.1", - "semver": "^7.3.5", - "tapable": "^2.2.1" - }, - "engines": { - "node": ">=12.13.0", - "yarn": ">=1.0.0" - }, - "peerDependencies": { - "typescript": ">3.6.0", - "webpack": "^5.11.0" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@storybook/builder-webpack5/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, -<<<<<<< HEAD -======= - "node_modules/@storybook/builder-webpack5/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@storybook/builder-webpack5/node_modules/webpack-dev-middleware": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.3.tgz", - "integrity": "sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "colorette": "^2.0.10", - "memfs": "^3.4.12", - "mime-types": "^2.1.31", - "range-parser": "^1.2.1", - "schema-utils": "^4.0.0" - }, - "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.0.0" - }, - "peerDependenciesMeta": { - "webpack": { - "optional": true - } - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "node_modules/@storybook/codemod": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-8.2.4.tgz", - "integrity": "sha512-QcZdqjX4NvkVcWR3yI9it3PfqmBOCR+3iY6j4PmG7p5IE0j9kXMKBbeFrBRprSijHKlwcjbc3bRx2SnKF6AFEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.24.4", - "@babel/preset-env": "^7.24.4", - "@babel/types": "^7.24.0", - "@storybook/core": "8.2.4", - "@storybook/csf": "0.1.11", - "@types/cross-spawn": "^6.0.2", - "cross-spawn": "^7.0.3", - "globby": "^14.0.1", - "jscodeshift": "^0.15.1", - "lodash": "^4.17.21", - "prettier": "^3.1.1", - "recast": "^0.23.5", - "tiny-invariant": "^1.3.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" + "type": "opencollective", + "url": "https://opencollective.com/storybook" } }, "node_modules/@storybook/codemod/node_modules/globby": { @@ -7788,9 +6374,9 @@ } }, "node_modules/@storybook/components": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.2.4.tgz", - "integrity": "sha512-JLT1RoR/RXX+ZTeFoY85CRHb9Zz3l0PRRUSetEjoIJdnBGeL5C38bs0s9QnYjpCDLUlhdYhTln+GzmbyH8ocpA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.2.7.tgz", + "integrity": "sha512-FXhnoHl9S+tKSFc62iUG3EWplQP9ojGQaSMhqP4QTus6xmo53oSsPzuTPQilKVHkGxFQW8eGgKKsfHw3G2NT2g==", "dev": true, "license": "MIT", "funding": { @@ -7798,13 +6384,13 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/core": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.2.4.tgz", - "integrity": "sha512-jePmsGZT2hhUNQs8ED6+hFVt2m4hrMseO8kkN7Mcsve1MIujzHUS7Gjo4uguBwHJJOtiXB2fw4OSiQCmsXscZA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.2.7.tgz", + "integrity": "sha512-vgw5MYN9Bq2/ZsObCOEHbBHwi4RpbYCHPFtKkr4kTnWID++FCSiSVd7jY3xPvcNxWqCxOyH6dThpBi+SsB/ZAA==", "dev": true, "license": "MIT", "dependencies": { @@ -7826,9 +6412,9 @@ } }, "node_modules/@storybook/core-webpack": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.2.4.tgz", - "integrity": "sha512-yJeBZ5EIcU1qtZxc4E/0tgNovBiDdMsCOmWTBi724sqlGscvYSGhsI2v9JBvg3fJhnU2whCakeq4IOLOtiMAeQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.2.7.tgz", + "integrity": "sha512-eVtizQZdjPePjjPBfMw+74ha2yZw68AQZu5TK01Vetdjz1h+SSt+p/otWcJWPMGpZOg9p+n0krWvlcYHBsZsbA==", "dev": true, "license": "MIT", "dependencies": { @@ -7840,29 +6426,7 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" - } - }, - "node_modules/@storybook/core/node_modules/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } + "storybook": "^8.2.7" } }, "node_modules/@storybook/csf": { @@ -7876,9 +6440,9 @@ } }, "node_modules/@storybook/csf-plugin": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.2.4.tgz", - "integrity": "sha512-7V2tmeyAwv4/AQiBpB+7fCpphnY1yhcz+Zv9esUOHKqFn5+7u9FKpEXFFcf6fcbqXr2KoNw2F1EnTv3K/SxXrg==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.2.7.tgz", + "integrity": "sha512-rBdplL6xcVJcuq+uM0eidomMQ5BtAlVAejYrOTNiqBk/zVh5JSvchYzYG9n6Fo2PdKLLKdlZ874zhsVuNriNBQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7889,7 +6453,7 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/global": { @@ -7900,9 +6464,9 @@ "license": "MIT" }, "node_modules/@storybook/icons": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/@storybook/icons/-/icons-1.2.9.tgz", - "integrity": "sha512-cOmylsz25SYXaJL/gvTk/dl3pyk7yBFRfeXTsHvTA3dfhoU/LWSq0NKL9nM7WBasJyn6XPSGnLS4RtKXLw5EUg==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@storybook/icons/-/icons-1.2.10.tgz", + "integrity": "sha512-310apKdDcjbbX2VSLWPwhEwAgjxTzVagrwucVZIdGPErwiAppX8KvBuWZgPo+rQLVrtH8S+pw1dbUwjcE6d7og==", "dev": true, "license": "MIT", "engines": { @@ -7914,9 +6478,9 @@ } }, "node_modules/@storybook/instrumenter": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/instrumenter/-/instrumenter-8.2.4.tgz", - "integrity": "sha512-szcRjg7XhtobDW4omexWqBRlmRyrKW9p8uF9k6hanJqhHl4iG9D8xbi3SdaRhcn5KN1Wqv6RDAB+kXzHlFfdKA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/instrumenter/-/instrumenter-8.2.7.tgz", + "integrity": "sha512-Zm6Ty4uWFTNchKUviuJ9vfcMb7+qU8eyrFXVY80XRpr62JEWkYj4eCwx4OG8GzlQahTh9aSv9+hzV6p/5Ld4mw==", "dev": true, "license": "MIT", "dependencies": { @@ -7929,75 +6493,27 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/manager-api": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.2.4.tgz", - "integrity": "sha512-ayiOtcGupSeLCi2doEsRpALNPo4MBWYruc+e3jjkeVJQIg9A1ipSogNQh8unuOmq9rezO4/vcNBd6MxLs3xLWg==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.2.7.tgz", + "integrity": "sha512-BXjz6eNl1GyFcMwzRQTIokslcIY71AYblJUscPcy03X93oqI0GjFVa1xuSMwYw/oXWn7SHhKmqtqEG19lvBGRQ==", "dev": true, "license": "MIT", -<<<<<<< HEAD - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "storybook": "^8.2.4" - } - }, - "node_modules/@storybook/preset-create-react-app": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/preset-create-react-app/-/preset-create-react-app-8.2.4.tgz", - "integrity": "sha512-GGIUGMilyKF2UZ40hbqokOgHlzf6pWpV8ZTdy0LW+Az726ruMUBUxjv6fmaLPrGIfHJymJ+bojY9OCe2JZ/4FQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", - "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0", - "@types/semver": "^7.5.6", - "pnp-webpack-plugin": "^1.7.0", - "semver": "^7.5.4" - }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "funding": { "type": "opencollective", "url": "https://opencollective.com/storybook" }, "peerDependencies": { -<<<<<<< HEAD - "react-scripts": ">=5.0.0", - "storybook": "^8.2.4" - } - }, - "node_modules/@storybook/preset-create-react-app/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@storybook/preset-react-webpack": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-8.2.4.tgz", - "integrity": "sha512-uu77sBOibgPGWhG84eJsQkGv/UwbVnG/gS4CqHvHeuivtZup5vWxwuqh3ifsU7+uX94ZZuFJ5DNuo6194x9CdA==", - "dev": true, -======= - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/node-logger": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-8.2.4.tgz", - "integrity": "sha512-Jp7B0QMBkeZgqQpSm+KWmKrnupPKmTyZcLEcjR+Efp+66e/9uAujmy3AeG6FYf34vPdOcMQMouRvBfDyUgnjtQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-8.2.7.tgz", + "integrity": "sha512-12Uc+0OzIAO2h7gQLGeJovePpuMFmeeo6oNggJUpyJ/dgIOFRNnBonVqwkv/RqEDejflP/7h64X58SVssVdHgg==", "dev": true, "license": "MIT", "peer": true, @@ -8006,7 +6522,7 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/preset-create-react-app": { @@ -8031,9 +6547,9 @@ } }, "node_modules/@storybook/preset-create-react-app/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "bin": { @@ -8044,15 +6560,14 @@ } }, "node_modules/@storybook/preset-react-webpack": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-8.2.4.tgz", - "integrity": "sha512-uu77sBOibgPGWhG84eJsQkGv/UwbVnG/gS4CqHvHeuivtZup5vWxwuqh3ifsU7+uX94ZZuFJ5DNuo6194x9CdA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-8.2.7.tgz", + "integrity": "sha512-kJIgSub9wmoQgpLDfDlugK3nXeHL+skzRhUNH1ft80Il79hfQsNg7MLv6fXPvAJbjHYiQubYMwfdL4+Zwajopw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "@storybook/core-webpack": "8.2.4", - "@storybook/react": "8.2.4", + "@storybook/core-webpack": "8.2.7", + "@storybook/react": "8.2.7", "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0", "@types/node": "^18.0.0", "@types/semver": "^7.3.4", @@ -8075,7 +6590,7 @@ "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.2.4" + "storybook": "^8.2.7" }, "peerDependenciesMeta": { "typescript": { @@ -8084,9 +6599,9 @@ } }, "node_modules/@storybook/preset-react-webpack/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "bin": { @@ -8097,9 +6612,9 @@ } }, "node_modules/@storybook/preview-api": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.2.4.tgz", - "integrity": "sha512-IxOiUYYzNnk1OOz3zQBhsa3P1fsgqeMBZcH7TjiQWs9osuWG20oqsFR6+Z3dxoW8IuQHvpnREGKvAbRsDsThcA==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.2.7.tgz", + "integrity": "sha512-lNZBTjZaYNSwBY8dEcDZdkOBvq1/JoVWpuvqDEKvGmp5usTe77xAOwGyncEb96Cx1BbXXkMiDrqbV5G23PFRYA==", "dev": true, "license": "MIT", "funding": { @@ -8107,22 +6622,22 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/react": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/react/-/react-8.2.4.tgz", - "integrity": "sha512-tRkEeFhwq2GeRsPwFc8dINI5L4mXanXaa7/JreB6ZcUeOZD8d81TWXCH9QyGvxfe0LW+DeNujA91mx5Yja35Zw==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/react/-/react-8.2.7.tgz", + "integrity": "sha512-Qkw1K1iBDk+E9dlHrEWOOkn0trUU6wSt4mvzyOekiApM290esnPtw6GYXvxfBgFwNXfXbaGG3QNYGAFevf7qHw==", "dev": true, "license": "MIT", "dependencies": { - "@storybook/components": "^8.2.4", + "@storybook/components": "^8.2.7", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "^8.2.4", - "@storybook/preview-api": "^8.2.4", - "@storybook/react-dom-shim": "8.2.4", - "@storybook/theming": "^8.2.4", + "@storybook/manager-api": "^8.2.7", + "@storybook/preview-api": "^8.2.7", + "@storybook/react-dom-shim": "8.2.7", + "@storybook/theming": "^8.2.7", "@types/escodegen": "^0.0.6", "@types/estree": "^0.0.51", "@types/node": "^18.0.0", @@ -8149,7 +6664,7 @@ "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.2.4", + "storybook": "^8.2.7", "typescript": ">= 4.2.x" }, "peerDependenciesMeta": { @@ -8179,9 +6694,9 @@ } }, "node_modules/@storybook/react-dom-shim": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.2.4.tgz", - "integrity": "sha512-p2ypPWuKKFY/ij7yYjvdnrOcfdpxnAJd9D4/2Hm2eVioE4y8HQSND54t9OfkW+498Ez7ph4zW9ez005XqzH/+w==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.2.7.tgz", + "integrity": "sha512-9VI+NrC09DAr0QQZsFmU5Fd9eqdJp/1AHK+sm9BOZretGGGJwn22xS7UXhHIiFpfXJQnr3TNcYWRzXFyuaE/Sw==", "dev": true, "license": "MIT", "funding": { @@ -8191,19 +6706,19 @@ "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/react-webpack5": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-8.2.4.tgz", - "integrity": "sha512-ZwJQF8vW6XcdHrmuEX+rNNV9/lmAFs+p/FoDGGhsiUD7fIUX/F9xak0Ug+uhBcCEniY2suXcNHVQIInaH5/B8Q==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-8.2.7.tgz", + "integrity": "sha512-BbwYkULRwp+rfVxH8MhaCQydlgd1eJdzdDhhIzViv3gKVVt7Kg5hUDgxQc2yRwWbUcuN/f5G3sx/CVGoavp3Ow==", "dev": true, "license": "MIT", "dependencies": { - "@storybook/builder-webpack5": "8.2.4", - "@storybook/preset-react-webpack": "8.2.4", - "@storybook/react": "8.2.4", + "@storybook/builder-webpack5": "8.2.7", + "@storybook/preset-react-webpack": "8.2.7", + "@storybook/react": "8.2.7", "@types/node": "^18.0.0" }, "engines": { @@ -8216,7 +6731,7 @@ "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.2.4", + "storybook": "^8.2.7", "typescript": ">= 4.2.x" }, "peerDependenciesMeta": { @@ -8225,36 +6740,13 @@ } } }, -<<<<<<< HEAD - "node_modules/@storybook/react/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "license": "ISC", - "bin": { -======= - "node_modules/@storybook/react/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/@storybook/react/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "bin": { ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "semver": "bin/semver.js" }, "engines": { @@ -8262,14 +6754,14 @@ } }, "node_modules/@storybook/test": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/test/-/test-8.2.4.tgz", - "integrity": "sha512-boFjNFja4BNSbQhvmMlTVdQmZh36iM9+8w0sb7IK2e9Xnoi4+utupPNwBLvSsw4bRayK8+mP4Vk46O8h3TaiMw==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/test/-/test-8.2.7.tgz", + "integrity": "sha512-7xypGR0zjJaM5MkxIz513SYiGs5vDJZL1bbkG1YKeBMff+ZRpa8y8VDYn/WDWuDw76KcFEXoPsPzKwktGhvnpw==", "dev": true, "license": "MIT", "dependencies": { "@storybook/csf": "0.1.11", - "@storybook/instrumenter": "8.2.4", + "@storybook/instrumenter": "8.2.7", "@testing-library/dom": "10.1.0", "@testing-library/jest-dom": "6.4.5", "@testing-library/user-event": "14.5.2", @@ -8282,7 +6774,7 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@storybook/test/node_modules/@jest/console": { @@ -8305,25 +6797,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/@jest/console/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@storybook/test/node_modules/@jest/core": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", @@ -8374,23 +6847,18 @@ } } }, - "node_modules/@storybook/test/node_modules/@jest/core/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@storybook/test/node_modules/@jest/core/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", "optional": true, "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { "node": ">=10" }, "funding": { -<<<<<<< HEAD "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, @@ -8409,9 +6877,6 @@ }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" -======= - "url": "https://github.com/chalk/chalk?sponsor=1" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/@storybook/test/node_modules/@jest/environment": { @@ -8516,28 +6981,6 @@ } } }, -<<<<<<< HEAD -======= - "node_modules/@storybook/test/node_modules/@jest/reporters/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/@jest/source-map": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", @@ -8620,28 +7063,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, -<<<<<<< HEAD -======= - "node_modules/@storybook/test/node_modules/@jest/transform/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", @@ -8666,7 +7087,6 @@ "@sinonjs/commons": "^3.0.0" } }, -<<<<<<< HEAD "node_modules/@storybook/test/node_modules/@testing-library/dom": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.1.0.tgz", @@ -8687,8 +7107,6 @@ "node": ">=18" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/@testing-library/jest-dom": { "version": "6.4.5", "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.5.tgz", @@ -8735,7 +7153,6 @@ } } }, -<<<<<<< HEAD "node_modules/@storybook/test/node_modules/@testing-library/jest-dom/node_modules/chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -8757,8 +7174,6 @@ "dev": true, "license": "MIT" }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/@testing-library/user-event": { "version": "14.5.2", "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.2.tgz", @@ -8813,25 +7228,6 @@ "@babel/core": "^7.8.0" } }, - "node_modules/@storybook/test/node_modules/babel-jest/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@storybook/test/node_modules/babel-plugin-jest-hoist": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", @@ -8870,9 +7266,9 @@ } }, "node_modules/@storybook/test/node_modules/chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "license": "MIT", "dependencies": { @@ -8880,7 +7276,10 @@ "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/@storybook/test/node_modules/cliui": { @@ -8900,15 +7299,6 @@ "node": ">=12" } }, - "node_modules/@storybook/test/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/@storybook/test/node_modules/dedent": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", @@ -8926,16 +7316,6 @@ } } }, -<<<<<<< HEAD -======= - "node_modules/@storybook/test/node_modules/dom-accessibility-api": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz", - "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==", - "dev": true, - "license": "MIT" - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/emittery": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", @@ -9060,23 +7440,18 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-circus/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@storybook/test/node_modules/jest-circus/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", "optional": true, "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { "node": ">=10" }, "funding": { -<<<<<<< HEAD "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, @@ -9095,9 +7470,6 @@ }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" -======= - "url": "https://github.com/chalk/chalk?sponsor=1" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/@storybook/test/node_modules/jest-cli": { @@ -9136,25 +7508,6 @@ } } }, - "node_modules/@storybook/test/node_modules/jest-cli/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@storybook/test/node_modules/jest-config": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", @@ -9203,23 +7556,18 @@ } } }, - "node_modules/@storybook/test/node_modules/jest-config/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@storybook/test/node_modules/jest-config/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", "optional": true, "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { "node": ">=10" }, "funding": { -<<<<<<< HEAD "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, @@ -9238,9 +7586,6 @@ }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" -======= - "url": "https://github.com/chalk/chalk?sponsor=1" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/@storybook/test/node_modules/jest-docblock": { @@ -9277,23 +7622,18 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-each/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@storybook/test/node_modules/jest-each/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", "optional": true, "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { "node": ">=10" }, "funding": { -<<<<<<< HEAD "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, @@ -9312,9 +7652,6 @@ }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" -======= - "url": "https://github.com/chalk/chalk?sponsor=1" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/@storybook/test/node_modules/jest-environment-node": { @@ -9381,7 +7718,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, -<<<<<<< HEAD "node_modules/@storybook/test/node_modules/jest-leak-detector/node_modules/ansi-styles": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", @@ -9414,8 +7750,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/jest-mock": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", @@ -9484,25 +7818,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-resolve/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@storybook/test/node_modules/jest-runner": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", @@ -9538,25 +7853,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-runner/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@storybook/test/node_modules/jest-runtime": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", @@ -9593,25 +7889,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-runtime/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@storybook/test/node_modules/jest-snapshot": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", @@ -9646,23 +7923,18 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-snapshot/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@storybook/test/node_modules/jest-snapshot/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, + "optional": true, + "peer": true, "engines": { "node": ">=10" }, "funding": { -<<<<<<< HEAD "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, @@ -9681,9 +7953,6 @@ }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" -======= - "url": "https://github.com/chalk/chalk?sponsor=1" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/@storybook/test/node_modules/jest-validate": { @@ -9706,23 +7975,18 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-validate/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/@storybook/test/node_modules/jest-validate/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", "optional": true, "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { "node": ">=10" }, "funding": { -<<<<<<< HEAD "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, @@ -9741,9 +8005,6 @@ }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" -======= - "url": "https://github.com/chalk/chalk?sponsor=1" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/@storybook/test/node_modules/jest-watcher": { @@ -9768,25 +8029,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@storybook/test/node_modules/jest-watcher/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@storybook/test/node_modules/jest-worker": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", @@ -9823,41 +8065,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, -<<<<<<< HEAD -======= - "node_modules/@storybook/test/node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@storybook/test/node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/resolve.exports": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", @@ -9871,9 +8078,9 @@ } }, "node_modules/@storybook/test/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "optional": true, @@ -9925,21 +8132,6 @@ "node": ">=8" } }, -<<<<<<< HEAD -======= - "node_modules/@storybook/test/node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -9953,7 +8145,18 @@ "node": ">=8" } }, -<<<<<<< HEAD + "node_modules/@storybook/test/node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=4" + } + }, "node_modules/@storybook/test/node_modules/v8-to-istanbul": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", @@ -9971,8 +8174,6 @@ "node": ">=10.12.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@storybook/test/node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", @@ -10023,9 +8224,9 @@ } }, "node_modules/@storybook/theming": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.2.4.tgz", - "integrity": "sha512-B4HQMzTeg1TgV9uPDIoDkMSnP839Y05I9+Tw60cilAD+jTqrCvMlccHfehsTzJk+gioAflunATcbU05TMZoeIQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.2.7.tgz", + "integrity": "sha512-+iqm0GfRkshrjjNSOzwl7AD2m+LtJGXJCr93ke1huDK497WUKbX1hbbw51h5E1tEkx0c2wIqUlaqCM+7XMYcpw==", "dev": true, "license": "MIT", "funding": { @@ -10033,17 +8234,14 @@ "url": "https://opencollective.com/storybook" }, "peerDependencies": { - "storybook": "^8.2.4" + "storybook": "^8.2.7" } }, "node_modules/@surma/rollup-plugin-off-main-thread": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz", "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "ejs": "^3.1.6", @@ -10056,10 +8254,7 @@ "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "sourcemap-codec": "^1.4.8" @@ -10069,10 +8264,7 @@ "version": "5.4.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz", "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10086,10 +8278,7 @@ "version": "5.4.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz", "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10103,10 +8292,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz", "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10120,10 +8306,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz", "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10137,10 +8320,7 @@ "version": "5.4.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz", "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10154,10 +8334,7 @@ "version": "5.4.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz", "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10171,10 +8348,7 @@ "version": "5.4.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz", "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10188,10 +8362,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz", "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -10205,10 +8376,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz", "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0", @@ -10232,10 +8400,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz", "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@svgr/plugin-jsx": "^5.5.0", @@ -10254,10 +8419,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz", "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/types": "^7.12.6" @@ -10274,10 +8436,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz", "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.12.3", @@ -10297,10 +8456,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz", "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cosmiconfig": "^7.0.0", @@ -10319,10 +8475,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz", "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.12.3", @@ -10343,18 +8496,11 @@ } }, "node_modules/@testing-library/dom": { -<<<<<<< HEAD - "version": "10.3.2", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.3.2.tgz", - "integrity": "sha512-0bxIdP9mmPiOJ6wHLj8bdJRq+51oddObeCGdEf6PNEhYd93ZYAN+lPRnEOVFtheVwDM7+p+tza3LAQgp0PTudg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz", + "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==", "license": "MIT", "peer": true, -======= - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.1.0.tgz", - "integrity": "sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==", - "license": "MIT", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -10374,10 +8520,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "license": "MIT", -<<<<<<< HEAD "peer": true, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dependencies": { "color-convert": "^2.0.1" }, @@ -10393,10 +8536,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "license": "MIT", -<<<<<<< HEAD "peer": true, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -10413,10 +8553,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "license": "MIT", -<<<<<<< HEAD "peer": true, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "engines": { "node": ">=8" } @@ -10426,10 +8563,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "license": "MIT", -<<<<<<< HEAD "peer": true, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dependencies": { "has-flag": "^4.0.0" }, @@ -10626,10 +8760,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 6" @@ -10639,10 +8770,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": ">=10.13.0" @@ -10658,10 +8786,7 @@ "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/parser": "^7.20.7", @@ -10675,10 +8800,7 @@ "version": "7.6.8", "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/types": "^7.0.0" @@ -10688,10 +8810,7 @@ "version": "7.4.4", "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/parser": "^7.1.0", @@ -10702,10 +8821,7 @@ "version": "7.20.6", "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/types": "^7.20.7" @@ -10715,10 +8831,7 @@ "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/connect": "*", @@ -10729,10 +8842,7 @@ "version": "3.5.13", "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -10742,10 +8852,7 @@ "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -10755,10 +8862,7 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/express-serve-static-core": "*", @@ -10797,13 +8901,10 @@ "license": "MIT" }, "node_modules/@types/eslint": { - "version": "8.56.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", - "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", -<<<<<<< HEAD -======= + "version": "8.56.11", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz", + "integrity": "sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/estree": "*", @@ -10814,10 +8915,7 @@ "version": "3.7.7", "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/eslint": "*", @@ -10828,20 +8926,14 @@ "version": "0.0.51", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/express": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/body-parser": "*", @@ -10854,10 +8946,7 @@ "version": "4.19.5", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*", @@ -10870,10 +8959,7 @@ "version": "4.1.9", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -10889,44 +8975,25 @@ "@types/unist": "*" } }, - "node_modules/@types/hoist-non-react-statics": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", - "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", - "license": "MIT", - "dependencies": { - "@types/react": "*", - "hoist-non-react-statics": "^3.3.0" - } - }, "node_modules/@types/html-minifier-terser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/http-errors": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/http-proxy": { "version": "1.17.14", "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz", "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -10996,20 +9063,14 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/lodash": { @@ -11030,16 +9091,13 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/node": { - "version": "18.19.39", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz", - "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==", + "version": "18.19.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz", + "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -11049,10 +9107,7 @@ "version": "1.3.11", "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz", "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -11068,10 +9123,7 @@ "version": "2.7.3", "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/prop-types": { @@ -11084,30 +9136,21 @@ "version": "1.5.8", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz", "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/qs": { "version": "6.9.15", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/range-parser": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/react": { @@ -11155,30 +9198,21 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/mime": "^1", @@ -11189,10 +9223,7 @@ "version": "1.9.4", "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/express": "*" @@ -11202,10 +9233,7 @@ "version": "1.15.7", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/http-errors": "*", @@ -11217,10 +9245,7 @@ "version": "0.3.36", "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -11251,10 +9276,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@types/unist": { @@ -11278,13 +9300,10 @@ "license": "MIT" }, "node_modules/@types/ws": { - "version": "8.5.11", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.11.tgz", - "integrity": "sha512-4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w==", -<<<<<<< HEAD -======= + "version": "8.5.12", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", + "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*" @@ -11309,10 +9328,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.4.0", @@ -11344,13 +9360,10 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -11363,10 +9376,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz", "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@typescript-eslint/utils": "5.62.0" @@ -11386,10 +9396,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "5.62.0", @@ -11417,10 +9424,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@typescript-eslint/types": "5.62.0", @@ -11438,10 +9442,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "5.62.0", @@ -11469,10 +9470,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -11486,10 +9484,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "5.62.0", @@ -11514,13 +9509,10 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -11533,10 +9525,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", @@ -11559,11 +9548,11 @@ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, -<<<<<<< HEAD "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -11577,21 +9566,17 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -11604,10 +9589,7 @@ "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@typescript-eslint/types": "5.62.0", @@ -11621,27 +9603,11 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/@vitest/expect": { @@ -11720,10 +9686,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", @@ -11734,40 +9697,28 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", @@ -11779,20 +9730,14 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -11805,10 +9750,7 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" @@ -11818,10 +9760,7 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" @@ -11831,20 +9770,14 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -11861,10 +9794,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -11878,10 +9808,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -11894,10 +9821,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -11912,10 +9836,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", @@ -11926,20 +9847,14 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause" }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0" }, "node_modules/@yarnpkg/fslib": { @@ -11989,20 +9904,14 @@ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", "deprecated": "Use your platform's native atob() and btoa() methods instead", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause" }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "mime-types": "~2.1.34", @@ -12013,16 +9922,10 @@ } }, "node_modules/acorn": { -<<<<<<< HEAD "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", -======= - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -12035,50 +9938,18 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "acorn": "^7.1.1", "acorn-walk": "^7.1.1" } }, -<<<<<<< HEAD -======= - "node_modules/acorn-globals/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-import-attributes": { - "version": "1.9.5", - "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", - "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^8" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" @@ -12088,10 +9959,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.4.0" @@ -12101,10 +9969,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz", "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 10.0.0" @@ -12114,10 +9979,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "loader-utils": "^2.0.0", @@ -12131,10 +9993,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "debug": "4" @@ -12144,22 +10003,16 @@ } }, "node_modules/ajv": { -<<<<<<< HEAD "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", -======= - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" }, "funding": { "type": "github", @@ -12170,10 +10023,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ajv": "^8.0.0" @@ -12187,11 +10037,11 @@ } } }, -<<<<<<< HEAD "node_modules/ajv-formats/node_modules/ajv": { "version": "8.17.1", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -12208,36 +10058,24 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, "license": "MIT" }, "node_modules/ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "license": "MIT", -======= - "node_modules/ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3" - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "peerDependencies": { - "ajv": "^8.8.2" + "ajv": "^6.9.1" } }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "type-fest": "^0.21.3" @@ -12253,10 +10091,7 @@ "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" @@ -12331,20 +10166,14 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -12358,20 +10187,14 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Python-2.0" }, "node_modules/aria-query": { @@ -12403,20 +10226,14 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/array-includes": { "version": "3.1.8", "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -12437,10 +10254,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -12450,10 +10264,7 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -12474,10 +10285,7 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -12498,10 +10306,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.2", @@ -12520,10 +10325,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.2", @@ -12542,10 +10344,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz", "integrity": "sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -12563,30 +10362,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.toreversed": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", - "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - } - }, "node_modules/array.prototype.tosorted": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -12603,10 +10383,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -12629,10 +10406,7 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/assertion-error": { @@ -12662,20 +10436,14 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz", "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/async": { "version": "3.2.5", "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/asynckit": { @@ -12688,10 +10456,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": ">= 4.0.0" @@ -12751,13 +10516,10 @@ } }, "node_modules/axe-core": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.9.1.tgz", - "integrity": "sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==", -<<<<<<< HEAD -======= + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz", + "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MPL-2.0", "engines": { "node": ">=4" @@ -12778,10 +10540,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "deep-equal": "^2.0.5" @@ -12801,10 +10560,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz", "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/transform": "^27.5.1", @@ -12827,10 +10583,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -12847,10 +10600,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -12860,10 +10610,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -12879,10 +10626,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -12899,10 +10643,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -12912,10 +10653,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -12928,10 +10666,7 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "find-cache-dir": "^3.3.1", @@ -12947,48 +10682,11 @@ "webpack": ">=2" } }, - "node_modules/babel-loader/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/babel-loader/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/babel-loader/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, "node_modules/babel-loader/node_modules/schema-utils": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.5", @@ -13007,10 +10705,7 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", @@ -13027,10 +10722,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz", "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/template": "^7.3.3", @@ -13061,10 +10753,7 @@ "version": "0.3.8", "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz", "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peerDependencies": { "@babel/core": "^7.1.0" @@ -13074,10 +10763,7 @@ "version": "0.4.11", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", @@ -13092,10 +10778,7 @@ "version": "0.10.4", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz", "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.6.1", @@ -13109,10 +10792,7 @@ "version": "0.6.2", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.6.2" @@ -13140,19 +10820,6 @@ "dev": true, "license": "MIT" }, - "node_modules/babel-plugin-react-docgen/node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/babel-plugin-react-docgen/node_modules/react-docgen": { "version": "5.4.3", "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.4.3.tgz", @@ -13195,20 +10862,14 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/babel-preset-current-node-syntax": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", @@ -13232,10 +10893,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz", "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "babel-plugin-jest-hoist": "^27.5.1", @@ -13252,10 +10910,7 @@ "version": "10.0.1", "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz", "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.16.0", @@ -13280,10 +10935,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/base64-js": { @@ -13311,20 +10963,14 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/bfj": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.1.0.tgz", "integrity": "sha512-I6MMLkn+anzNdCUp9hMRyui1HaNEUCco50lxbvNS4+EyXg8lN3nJ48PjPWtbH8UVS9CuMoaKE9U2V3l29DaRQw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "bluebird": "^3.7.2", @@ -13341,10 +10987,7 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "*" @@ -13354,10 +10997,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -13382,20 +11022,14 @@ "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/body-parser": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "bytes": "3.1.2", @@ -13420,10 +11054,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -13433,20 +11064,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/bonjour-service": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -13457,20 +11082,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -13499,20 +11118,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause" }, "node_modules/browserslist": { "version": "4.23.2", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz", "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "funding": [ { "type": "opencollective", @@ -13545,10 +11158,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" @@ -13583,20 +11193,14 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/builtin-modules": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -13609,10 +11213,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" @@ -13645,6 +11246,21 @@ "node": ">=10.12.0" } }, + "node_modules/c8/node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, "node_modules/call-bind": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", @@ -13677,10 +11293,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "pascal-case": "^3.1.2", @@ -13691,10 +11304,7 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -13707,10 +11317,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 6" @@ -13729,10 +11336,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.0.0", @@ -13742,13 +11346,10 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001642", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", - "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", -<<<<<<< HEAD -======= + "version": "1.0.30001646", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz", + "integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "funding": [ { "type": "opencollective", @@ -13769,19 +11370,16 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz", "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/chai": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", - "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", + "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "dev": true, "license": "MIT", "dependencies": { @@ -13791,7 +11389,7 @@ "get-func-name": "^2.0.2", "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.8" + "type-detect": "^4.1.0" }, "engines": { "node": ">=4" @@ -13824,10 +11422,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -13850,20 +11445,14 @@ "version": "11.2.3", "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.3.tgz", "integrity": "sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/chokidar": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "anymatch": "~3.1.2", @@ -13884,11 +11473,11 @@ "fsevents": "~2.3.2" } }, -<<<<<<< HEAD "node_modules/chokidar/node_modules/glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -13897,8 +11486,6 @@ "node": ">= 6" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", @@ -13910,9 +11497,9 @@ } }, "node_modules/chromatic": { - "version": "11.5.5", - "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-11.5.5.tgz", - "integrity": "sha512-YS0GJwegF0vpMbwZE68/xJlI4SlUGMqI78V2ATAF19YwTHaq8jGP1CPQGKUSlgWUhzPtyu3ELy6Dvv/owYljAg==", + "version": "11.7.0", + "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-11.7.0.tgz", + "integrity": "sha512-Afblm4MWK6GXutxHPJVWKoY1PxCD98Uw0S3/f1a2wu4VTQy97g4+G8vPVqutSMpZFGzG5NjH9QdzKPFMmZczpw==", "dev": true, "license": "MIT", "bin": { @@ -13937,10 +11524,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6.0" @@ -13975,20 +11559,14 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/clean-css": { "version": "5.3.3", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "source-map": "~0.6.0" @@ -14001,10 +11579,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -14040,10 +11615,7 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "string-width": "^4.2.0", @@ -14055,10 +11627,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -14077,7 +11646,6 @@ "node": ">=0.8" } }, -<<<<<<< HEAD "node_modules/clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", @@ -14106,8 +11674,6 @@ "node": ">=0.10.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/clsx": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", @@ -14121,10 +11687,7 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "iojs": ">= 1.0.0", @@ -14135,10 +11698,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/q": "^1.5.1", @@ -14153,10 +11713,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/color-convert": { @@ -14181,20 +11738,14 @@ "version": "2.9.3", "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/colorette": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/combined-stream": { @@ -14213,10 +11764,7 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 12" @@ -14226,10 +11774,7 @@ "version": "1.8.2", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4.0.0" @@ -14239,20 +11784,14 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "mime-db": ">= 1.43.0 < 2" @@ -14265,10 +11804,7 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "accepts": "~1.3.5", @@ -14287,10 +11823,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" @@ -14300,10 +11833,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -14313,30 +11843,21 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/compression/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/confbox": { @@ -14350,20 +11871,14 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/connect-history-api-fallback": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.8" @@ -14390,10 +11905,7 @@ "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" @@ -14406,29 +11918,24 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, "license": "MIT" }, "node_modules/cookie": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -14438,10 +11945,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/core-js": { @@ -14460,10 +11964,7 @@ "version": "3.37.1", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz", "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.23.0" @@ -14486,16 +11987,10 @@ } }, "node_modules/core-util-is": { -<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/cosmiconfig": { @@ -14818,15 +12313,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/create-jest/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/create-jest/node_modules/dedent": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", @@ -15331,9 +12817,9 @@ } }, "node_modules/create-jest/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "optional": true, @@ -15358,28 +12844,16 @@ } }, "node_modules/create-jest/node_modules/source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/create-jest/node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, "license": "MIT", "optional": true, "peer": true, - "engines": { - "node": ">=8" + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, "node_modules/create-jest/node_modules/supports-color": { @@ -15397,6 +12871,18 @@ "node": ">=8" } }, + "node_modules/create-jest/node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=4" + } + }, "node_modules/create-jest/node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", @@ -15413,23 +12899,11 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/cross-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", - "license": "MIT", - "dependencies": { - "node-fetch": "^2.6.12" - } - }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -15473,10 +12947,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz", "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-selector-parser": "^6.0.9" @@ -15504,10 +12975,7 @@ "version": "6.4.1", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz", "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": "^10 || ^12 || >=14" @@ -15520,10 +12988,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz", "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-selector-parser": "^6.0.9" @@ -15542,10 +13007,7 @@ "version": "6.11.0", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz", "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "icss-utils": "^5.1.0", @@ -15578,13 +13040,10 @@ } }, "node_modules/css-loader/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -15597,10 +13056,7 @@ "version": "3.4.1", "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz", "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cssnano": "^5.0.6", @@ -15639,10 +13095,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -15652,10 +13105,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "bin": { "css-prefers-color-scheme": "dist/cli.cjs" @@ -15671,10 +13121,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", @@ -15691,10 +13138,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/css-to-react-native": { @@ -15712,10 +13156,7 @@ "version": "1.0.0-alpha.37", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "mdn-data": "2.0.4", @@ -15729,10 +13170,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -15742,10 +13180,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "engines": { "node": ">= 6" @@ -15781,10 +13216,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "cssesc": "bin/cssesc" @@ -15797,10 +13229,7 @@ "version": "5.1.15", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz", "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cssnano-preset-default": "^5.2.14", @@ -15822,10 +13251,7 @@ "version": "5.2.14", "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz", "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "css-declaration-sorter": "^6.3.1", @@ -15869,10 +13295,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" @@ -15885,10 +13308,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "css-tree": "^1.1.2" @@ -15901,10 +13321,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "mdn-data": "2.0.14", @@ -15918,20 +13335,14 @@ "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0" }, "node_modules/csso/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -15941,20 +13352,14 @@ "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/cssstyle": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cssom": "~0.3.6" @@ -15967,10 +13372,7 @@ "version": "0.3.8", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/csstype": { @@ -15983,20 +13385,14 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause" }, "node_modules/data-urls": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "abab": "^2.0.3", @@ -16007,42 +13403,11 @@ "node": ">=10" } }, - "node_modules/data-urls/node_modules/tr46": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", - "dev": true, - "license": "MIT", - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/data-urls/node_modules/whatwg-url": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash": "^4.7.0", - "tr46": "^2.1.0", - "webidl-conversions": "^6.1.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/data-view-buffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.6", @@ -16060,10 +13425,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -16081,10 +13443,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.6", @@ -16099,9 +13458,9 @@ } }, "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "license": "MIT", "dependencies": { "ms": "2.1.2" @@ -16119,20 +13478,14 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/dedent": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/deep-eql": { @@ -16184,20 +13537,14 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -16207,10 +13554,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "execa": "^5.0.0" @@ -16253,10 +13597,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -16299,10 +13640,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" @@ -16321,10 +13659,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8", @@ -16345,10 +13680,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -16358,20 +13690,14 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/detect-port-alt": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz", "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "address": "^1.0.1", @@ -16389,10 +13715,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -16402,20 +13725,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0" }, "node_modules/diff-sequences": { @@ -16431,10 +13748,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "path-type": "^4.0.0" @@ -16447,20 +13761,14 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/dns-packet": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@leichtgewicht/ip-codec": "^2.0.1" @@ -16470,22 +13778,16 @@ } }, "node_modules/doctrine": { -<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", -======= - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, "engines": { - "node": ">=0.10.0" + "node": ">=6.0.0" } }, "node_modules/dom-accessibility-api": { @@ -16498,10 +13800,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "utila": "~0.4" @@ -16521,10 +13820,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", @@ -16553,10 +13849,7 @@ "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "deprecated": "Use your platform's native DOMException instead", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "webidl-conversions": "^5.0.0" @@ -16569,10 +13862,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "engines": { "node": ">=8" @@ -16582,10 +13872,7 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.2.0" @@ -16601,10 +13888,7 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^1.0.1", @@ -16619,10 +13903,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "no-case": "^3.0.4", @@ -16630,71 +13911,48 @@ } }, "node_modules/dotenv": { -<<<<<<< HEAD "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", -======= - "version": "16.4.5", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", - "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "dev": true, "license": "BSD-2-Clause", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" + "node": ">=10" } }, "node_modules/dotenv-expand": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause" }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/ejs": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "jake": "^10.8.5" @@ -16707,23 +13965,17 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.828", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.828.tgz", - "integrity": "sha512-QOIJiWpQJDHAVO4P58pwb133Cwee0nbvy/MV1CwzZVGpkH1RX33N3vsaWRCpR6bF63AAq366neZrRTu7Qlsbbw==", -<<<<<<< HEAD -======= + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", + "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/emittery": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz", "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -16736,20 +13988,14 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 4" @@ -16759,10 +14005,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" @@ -16781,13 +14024,10 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.17.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz", - "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==", -<<<<<<< HEAD -======= + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", @@ -16801,10 +14041,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" @@ -16836,10 +14073,7 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "stackframe": "^1.3.4" @@ -16849,10 +14083,7 @@ "version": "1.23.3", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -16913,10 +14144,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/es-define-property": { @@ -16964,10 +14192,7 @@ "version": "1.0.19", "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -16993,20 +14218,14 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/es-object-atoms": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -17019,10 +14238,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.4", @@ -17037,10 +14253,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "hasown": "^2.0.0" @@ -17050,10 +14263,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "is-callable": "^1.1.4", @@ -17107,9 +14317,9 @@ } }, "node_modules/esbuild-register": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.5.0.tgz", - "integrity": "sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.6.0.tgz", + "integrity": "sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==", "dev": true, "license": "MIT", "dependencies": { @@ -17123,10 +14333,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -17136,10 +14343,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/escape-string-regexp": { @@ -17158,10 +14362,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "esprima": "^4.0.1", @@ -17183,10 +14384,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "optional": true, "engines": { @@ -17197,10 +14395,7 @@ "version": "8.57.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", @@ -17256,10 +14451,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz", "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.16.0", @@ -17288,10 +14480,7 @@ "version": "0.3.9", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "debug": "^3.2.7", @@ -17303,10 +14492,7 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "^2.1.1" @@ -17316,10 +14502,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "debug": "^3.2.7" @@ -17337,10 +14520,7 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "^2.1.1" @@ -17350,10 +14530,7 @@ "version": "8.0.3", "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz", "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "lodash": "^4.17.21", @@ -17372,10 +14549,7 @@ "version": "2.29.1", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "array-includes": "^3.1.7", @@ -17407,41 +14581,30 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, -<<<<<<< HEAD "node_modules/eslint-plugin-import/node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "license": "Apache-2.0", -======= - "node_modules/eslint-plugin-import/node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, - "license": "MIT", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "license": "Apache-2.0", "dependencies": { - "minimist": "^1.2.0" + "esutils": "^2.0.2" }, - "bin": { - "json5": "lib/cli.js" + "engines": { + "node": ">=0.10.0" } }, -<<<<<<< HEAD "node_modules/eslint-plugin-import/node_modules/json5": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, "license": "MIT", "dependencies": { "minimist": "^1.2.0" @@ -17454,21 +14617,17 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, "license": "MIT", "engines": { "node": ">=4" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": { "version": "3.15.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/json5": "^0.0.29", @@ -17481,10 +14640,7 @@ "version": "25.7.0", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz", "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@typescript-eslint/experimental-utils": "^5.0.0" @@ -17509,10 +14665,7 @@ "version": "6.9.0", "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.9.0.tgz", "integrity": "sha512-nOFOCaJG2pYqORjK19lqPqxMO/JpvdCZdPtNdxY3kvom3jTvkAbOvQvD8wuD0G8BYR0IGAGYDlzqWJOh/ybn2g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "aria-query": "~5.1.3", @@ -17543,29 +14696,22 @@ "version": "5.1.3", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "deep-equal": "^2.0.5" } }, "node_modules/eslint-plugin-react": { - "version": "7.34.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.4.tgz", - "integrity": "sha512-Np+jo9bUwJNxCsT12pXtrGhJgT3T44T1sHhn1Ssr42XFn8TES0267wPGo5nNrMHi8qkyimDAX2BUmkf9pSaVzA==", -<<<<<<< HEAD -======= + "version": "7.35.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz", + "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", "array.prototype.flatmap": "^1.3.2", - "array.prototype.toreversed": "^1.1.2", "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.0.19", @@ -17586,17 +14732,14 @@ "node": ">=4" }, "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" } }, "node_modules/eslint-plugin-react-hooks": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz", "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -17605,11 +14748,11 @@ "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" } }, -<<<<<<< HEAD "node_modules/eslint-plugin-react/node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" @@ -17618,16 +14761,11 @@ "node": ">=0.10.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/eslint-plugin-react/node_modules/resolve": { "version": "2.0.0-next.5", "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", @@ -17674,10 +14812,7 @@ "version": "5.11.1", "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz", "integrity": "sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@typescript-eslint/utils": "^5.58.0" @@ -17691,10 +14826,10 @@ } }, "node_modules/eslint-scope": { -<<<<<<< HEAD "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -17711,6 +14846,7 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -17719,49 +14855,11 @@ "url": "https://opencollective.com/eslint" } }, -======= - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-scope/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/eslint-webpack-plugin": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz", "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/eslint": "^7.29.0 || ^8.4.1", @@ -17786,7 +14884,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -17796,6 +14894,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -17810,6 +14909,7 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -17825,73 +14925,17 @@ "version": "8.57.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "license": "MIT", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint-webpack-plugin/node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/eslint-webpack-plugin/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/eslint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/eslint/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -17907,10 +14951,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -17923,73 +14964,11 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, -<<<<<<< HEAD -======= - "node_modules/eslint/node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/eslint/node_modules/globals": { "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "type-fest": "^0.20.2" @@ -18005,43 +14984,17 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "engines": { - "node": ">=8" - } - }, -<<<<<<< HEAD -======= - "node_modules/eslint/node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/eslint/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/eslint/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -18054,10 +15007,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -18070,10 +15020,7 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" @@ -18086,10 +15033,7 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", @@ -18103,40 +15047,24 @@ "url": "https://opencollective.com/eslint" } }, -<<<<<<< HEAD "node_modules/espree/node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" }, "engines": { "node": ">=0.4.0" -======= - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", @@ -18150,10 +15078,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" @@ -18166,10 +15091,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" @@ -18182,10 +15104,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -18227,10 +15146,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" @@ -18240,10 +15156,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -18253,45 +15166,24 @@ "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "engines": { - "node": ">=0.8.x" - } - }, - "node_modules/eventsource": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz", - "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, "license": "MIT", - "optional": true, - "peer": true, "engines": { - "node": ">=0.12.0" + "node": ">=0.8.x" } }, "node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", @@ -18311,26 +15203,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/execa/node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/execa/node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -18360,10 +15232,7 @@ "version": "4.19.2", "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -18406,10 +15275,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -18419,30 +15285,21 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -18455,11 +15312,11 @@ "node": ">=8.6.0" } }, -<<<<<<< HEAD "node_modules/fast-glob/node_modules/glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -18468,8 +15325,6 @@ "node": ">= 6" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/fast-json-parse": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz", @@ -18481,40 +15336,28 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/fast-uri": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "reusify": "^1.0.4" @@ -18524,10 +15367,7 @@ "version": "0.11.4", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "websocket-driver": ">=0.5.1" @@ -18540,10 +15380,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" @@ -18563,10 +15400,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" @@ -18579,10 +15413,7 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "loader-utils": "^2.0.0", @@ -18599,48 +15430,11 @@ "webpack": "^4.0.0 || ^5.0.0" } }, - "node_modules/file-loader/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/file-loader/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/file-loader/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, "node_modules/file-loader/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", @@ -18659,10 +15453,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "minimatch": "^5.0.1" @@ -18672,10 +15463,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -18685,10 +15473,7 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" @@ -18723,10 +15508,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "debug": "2.6.9", @@ -18745,10 +15527,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -18758,20 +15537,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/find-cache-dir": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "commondir": "^1.0.1", @@ -18795,10 +15568,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "locate-path": "^6.0.0", @@ -18815,10 +15585,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "flatted": "^3.2.9", @@ -18833,16 +15600,13 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/flow-parser": { - "version": "0.239.1", - "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.239.1.tgz", - "integrity": "sha512-topOrETNxJ6T2gAnQiWqAlzGPj8uI2wtmNOlDIMNB+qyvGJZ6R++STbUOTAYmvPhOMz2gXnXPH0hOvURYmrBow==", + "version": "0.242.1", + "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.242.1.tgz", + "integrity": "sha512-E3ml21Q1S5cMAyPbtYslkvI6yZO5oCS/S2EoteeFH8Kx9iKOv/YOJ+dGd/yMf+H3YKfhMKjnOpyNwrO7NdddWA==", "dev": true, "license": "MIT", "engines": { @@ -18879,54 +15643,23 @@ } }, "node_modules/foreground-child": { -<<<<<<< HEAD - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", -======= "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^3.0.2" }, "engines": { -<<<<<<< HEAD - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=8.0.0" } }, "node_modules/fork-ts-checker-webpack-plugin": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz", "integrity": "sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==", -======= - "node": ">=8.0.0" - } - }, - "node_modules/fork-ts-checker-webpack-plugin": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz", - "integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dev": true, "license": "MIT", "dependencies": { @@ -18952,33 +15685,6 @@ "webpack": "^5.11.0" } }, - "node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -19012,34 +15718,10 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, -<<<<<<< HEAD "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.1.0", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.7.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dev": true, "license": "MIT", "dependencies": { @@ -19061,23 +15743,10 @@ "node": ">=8" } }, - "node_modules/fork-ts-checker-webpack-plugin/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": { -<<<<<<< HEAD "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", -======= - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dev": true, "license": "MIT", "dependencies": { @@ -19094,9 +15763,9 @@ } }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "bin": { @@ -19119,19 +15788,6 @@ "node": ">=8" } }, -<<<<<<< HEAD -======= - "node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/form-data": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", @@ -19150,10 +15806,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -19163,10 +15816,7 @@ "version": "4.3.7", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "*" @@ -19180,10 +15830,7 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -19241,20 +15888,14 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz", "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Unlicense" }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/fsevents": { @@ -19285,10 +15926,7 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.2", @@ -19316,10 +15954,7 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6.9.0" @@ -19329,10 +15964,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" @@ -19371,20 +16003,14 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/get-package-type": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8.0.0" @@ -19394,10 +16020,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -19410,10 +16033,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.5", @@ -19459,10 +16079,7 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -19480,42 +16097,30 @@ } }, "node_modules/glob-parent": { -<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", -======= - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause" }, "node_modules/global-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "global-prefix": "^3.0.0" @@ -19528,10 +16133,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ini": "^1.3.5", @@ -19546,10 +16148,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -19559,9 +16158,9 @@ } }, "node_modules/globals": { - "version": "15.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.8.0.tgz", - "integrity": "sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw==", + "version": "15.9.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz", + "integrity": "sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==", "dev": true, "license": "MIT", "engines": { @@ -19575,10 +16174,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "define-properties": "^1.2.1", @@ -19595,10 +16191,7 @@ "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "array-union": "^2.1.0", @@ -19637,20 +16230,14 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "duplexer": "^0.1.2" @@ -19666,20 +16253,14 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/harmony-reflect": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz", "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "(Apache-2.0 OR MPL-1.1)" }, "node_modules/has-bigints": { @@ -19809,10 +16390,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "he": "bin/he" @@ -19837,10 +16415,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 6.0.0" @@ -19850,10 +16425,7 @@ "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "inherits": "^2.0.1", @@ -19866,20 +16438,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/hpack.js/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", @@ -19895,20 +16461,14 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/hpack.js/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" @@ -19918,10 +16478,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "whatwg-encoding": "^1.0.5" @@ -19951,20 +16508,14 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/html-minifier-terser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "camel-case": "^4.1.2", @@ -19982,15 +16533,6 @@ "node": ">=12" } }, - "node_modules/html-parse-stringify": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz", - "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==", - "license": "MIT", - "dependencies": { - "void-elements": "3.1.0" - } - }, "node_modules/html-tags": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", @@ -20008,10 +16550,7 @@ "version": "5.6.0", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz", "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/html-minifier-terser": "^6.0.0", @@ -20064,20 +16603,14 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "depd": "2.0.0", @@ -20094,20 +16627,14 @@ "version": "0.5.8", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/http-proxy": { "version": "1.18.1", "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "eventemitter3": "^4.0.0", @@ -20122,10 +16649,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@tootallnate/once": "1", @@ -20140,10 +16664,7 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/http-proxy": "^1.17.8", @@ -20168,10 +16689,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "agent-base": "6", @@ -20182,70 +16700,20 @@ } }, "node_modules/human-signals": { -<<<<<<< HEAD "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", -======= - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", - "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "engines": { - "node": ">=16.17.0" - } - }, - "node_modules/i18next": { - "version": "23.12.1", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.1.tgz", - "integrity": "sha512-l4y291ZGRgUhKuqVSiqyuU2DDzxKStlIWSaoNBR4grYmh0X+pRYbFpTMs3CnJ5ECKbOI8sQcJ3PbTUfLgPRaMA==", - "funding": [ - { - "type": "individual", - "url": "https://locize.com" - }, - { - "type": "individual", - "url": "https://locize.com/i18next.html" - }, - { - "type": "individual", - "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" - } - ], - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.2" - } - }, - "node_modules/i18next-browser-languagedetector": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.0.tgz", - "integrity": "sha512-zhXdJXTTCoG39QsrOCiOabnWj2jecouOqbchu3EfhtSHxIB5Uugnm9JaizenOy39h7ne3+fLikIjeW88+rgszw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.2" - } - }, - "node_modules/i18next-http-backend": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.2.tgz", - "integrity": "sha512-+K8HbDfrvc1/2X8jpb7RLhI9ZxBDpx3xogYkQwGKlWAUXLSEGXzgdt3EcUjLlBCdMwdQY+K+EUF6oh8oB6rwHw==", - "license": "MIT", - "dependencies": { - "cross-fetch": "4.0.0" + "node": ">=10.17.0" } }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" @@ -20258,10 +16726,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" @@ -20274,20 +16739,14 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/identity-obj-proxy": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz", "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "harmony-reflect": "^1.4.6" @@ -20321,23 +16780,16 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/immer": { - "version": "9.0.21", - "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz", - "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz", + "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==", "license": "MIT", "funding": { "type": "opencollective", @@ -20345,14 +16797,10 @@ } }, "node_modules/immutable": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz", - "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==", -<<<<<<< HEAD - "devOptional": true, -======= + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/import-fresh": { @@ -20372,13 +16820,10 @@ } }, "node_modules/import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", -<<<<<<< HEAD -======= + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", @@ -20398,10 +16843,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.8.19" @@ -20421,10 +16863,7 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "once": "^1.3.0", @@ -20435,20 +16874,14 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/internal-slot": { @@ -20465,26 +16898,11 @@ "node": ">= 0.4" } }, -<<<<<<< HEAD -======= - "node_modules/intl-messageformat": { - "version": "10.5.14", - "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.5.14.tgz", - "integrity": "sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==", - "license": "BSD-3-Clause", - "dependencies": { - "@formatjs/ecma402-abstract": "2.0.0", - "@formatjs/fast-memoize": "2.2.0", - "@formatjs/icu-messageformat-parser": "2.7.8", - "tslib": "^2.4.0" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", -<<<<<<< HEAD + "dev": true, "license": "MIT", "engines": { "node": ">= 0.10" @@ -20494,12 +16912,13 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz", "integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==", -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dev": true, "license": "MIT", "engines": { - "node": ">= 0.10" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-arguments": { @@ -20544,10 +16963,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" @@ -20575,10 +16991,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -20616,9 +17029,9 @@ } }, "node_modules/is-core-module": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", - "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -20634,10 +17047,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "is-typed-array": "^1.1.13" @@ -20668,10 +17078,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "is-docker": "cli.js" @@ -20687,10 +17094,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -20700,10 +17104,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.2" @@ -20716,10 +17117,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -20729,10 +17127,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -20742,10 +17137,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" @@ -20761,10 +17153,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -20799,20 +17188,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/is-negative-zero": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.4" @@ -20849,35 +17232,27 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" } }, -<<<<<<< HEAD "node_modules/is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/is-plain-obj": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -20900,10 +17275,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/is-regex": { @@ -20926,10 +17298,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -20939,10 +17308,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz", "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -20979,10 +17345,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -21025,10 +17388,7 @@ "version": "1.1.13", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "which-typed-array": "^1.1.14" @@ -21044,10 +17404,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/is-unicode-supported": { @@ -21079,10 +17436,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.2" @@ -21111,10 +17465,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "is-docker": "^2.0.0" @@ -21133,10 +17484,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/isobject": { @@ -21153,10 +17501,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=8" @@ -21166,10 +17511,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.12.3", @@ -21186,10 +17528,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", @@ -21204,10 +17543,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -21217,10 +17553,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "semver": "^7.5.3" @@ -21233,13 +17566,10 @@ } }, "node_modules/istanbul-lib-report/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -21252,10 +17582,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -21268,10 +17595,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "debug": "^4.1.1", @@ -21286,10 +17610,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -21299,10 +17620,7 @@ "version": "3.1.7", "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", @@ -21316,10 +17634,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "define-properties": "^1.2.1", @@ -21333,10 +17648,7 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -21349,13 +17661,10 @@ } }, "node_modules/jake": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz", - "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==", -<<<<<<< HEAD -======= + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "async": "^3.2.3", @@ -21374,10 +17683,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -21393,10 +17699,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -21413,10 +17716,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -21426,10 +17726,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -21442,10 +17739,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/core": "^27.5.1", @@ -21471,10 +17765,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz", "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -21489,10 +17780,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -21509,10 +17797,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -21522,10 +17807,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -21541,10 +17823,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -21561,10 +17840,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -21574,10 +17850,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -21590,10 +17863,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz", "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/environment": "^27.5.1", @@ -21624,10 +17894,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -21644,10 +17911,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -21657,10 +17921,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -21676,10 +17937,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -21696,10 +17954,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -21709,10 +17964,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz", "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -21728,10 +17980,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -21741,10 +17990,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -21760,10 +18006,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -21773,10 +18016,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -21792,10 +18032,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -21816,10 +18053,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -21837,10 +18071,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -21853,10 +18084,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz", "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/core": "^27.5.1", @@ -21891,10 +18119,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -21911,10 +18136,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -21924,10 +18146,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -21943,10 +18162,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -21963,10 +18179,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -21976,10 +18189,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -21997,10 +18207,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -22013,10 +18220,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz", "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.8.0", @@ -22060,10 +18264,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -22080,10 +18281,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -22093,10 +18291,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -22112,10 +18307,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -22132,10 +18324,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -22145,10 +18334,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -22158,10 +18344,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -22179,10 +18362,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -22288,10 +18468,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz", "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "detect-newline": "^3.0.0" @@ -22304,10 +18481,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz", "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -22324,10 +18498,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -22344,10 +18515,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -22357,10 +18525,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -22376,10 +18541,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -22396,10 +18558,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -22409,10 +18568,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -22422,10 +18578,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -22443,10 +18596,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -22459,10 +18609,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz", "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/environment": "^27.5.1", @@ -22481,10 +18628,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -22501,10 +18645,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -22514,10 +18655,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -22533,10 +18671,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -22553,10 +18688,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -22566,10 +18698,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -22587,10 +18716,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -22603,10 +18729,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz", "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/environment": "^27.5.1", @@ -22624,10 +18747,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -22644,10 +18764,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -22657,10 +18774,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -22676,10 +18790,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -22696,10 +18807,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -22709,10 +18817,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -22730,10 +18835,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -22755,10 +18857,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz", "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -22785,10 +18884,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -22805,10 +18901,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -22818,10 +18911,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -22837,10 +18927,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -22857,10 +18944,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -22870,10 +18954,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -22891,10 +18972,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -22907,10 +18985,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz", "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/environment": "^27.5.1", @@ -22939,10 +19014,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -22959,10 +19031,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -22972,10 +19041,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -22991,10 +19057,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -23011,10 +19074,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -23024,10 +19084,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz", "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -23043,10 +19100,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -23056,10 +19110,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -23075,10 +19126,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -23088,10 +19136,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -23107,10 +19152,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -23131,10 +19173,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -23152,10 +19191,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -23168,10 +19204,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz", "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "jest-get-type": "^27.5.1", @@ -23185,10 +19218,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -23389,10 +19419,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz", "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -23406,10 +19433,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -23426,10 +19450,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -23439,10 +19460,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -23458,10 +19476,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -23478,10 +19493,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -23491,10 +19503,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -23507,10 +19516,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -23528,10 +19534,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz", "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -23541,10 +19544,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz", "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -23566,10 +19566,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz", "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -23584,10 +19581,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -23604,10 +19598,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -23617,10 +19608,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -23636,10 +19624,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -23656,10 +19641,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -23669,10 +19651,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -23685,10 +19664,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -23705,10 +19681,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -23718,10 +19691,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -23737,10 +19707,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -23757,10 +19724,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -23770,10 +19734,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -23791,10 +19752,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -23807,10 +19765,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz", "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/console": "^27.5.1", @@ -23843,10 +19798,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -23863,10 +19815,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -23876,10 +19825,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -23895,10 +19841,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -23915,10 +19858,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -23928,10 +19868,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -23952,10 +19889,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -23973,10 +19907,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -23989,10 +19920,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz", "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/environment": "^27.5.1", @@ -24026,10 +19954,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -24046,10 +19971,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -24059,10 +19981,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -24078,10 +19997,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -24096,61 +20012,9 @@ }, "node_modules/jest-runtime/node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-runtime/node_modules/jest-message-util": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", - "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.5.1", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^27.5.1", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-runtime/node_modules/jest-util": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", - "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^27.5.1", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-runtime/node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -24160,6 +20024,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -24180,6 +20045,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", + "dev": true, "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -24197,10 +20063,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -24213,10 +20076,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz", "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*", @@ -24230,10 +20090,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz", "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.7.2", @@ -24267,10 +20124,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -24287,10 +20141,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -24300,10 +20151,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -24319,10 +20167,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -24339,10 +20184,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -24352,10 +20194,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz", "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -24371,10 +20210,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -24384,10 +20220,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -24403,10 +20236,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -24416,10 +20246,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^4.0.0", @@ -24435,10 +20262,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -24459,10 +20283,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -24477,13 +20298,10 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -24496,10 +20314,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -24581,10 +20396,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz", "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -24602,10 +20414,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -24622,10 +20431,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -24635,10 +20441,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -24654,10 +20457,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -24674,10 +20474,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -24687,10 +20484,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -24700,10 +20494,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -24716,10 +20507,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz", "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-escapes": "^4.3.1", @@ -24741,10 +20529,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^28.1.3", @@ -24762,10 +20547,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -24775,10 +20557,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.24.1" @@ -24791,10 +20570,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/console": "^28.1.3", @@ -24810,10 +20586,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/schemas": "^28.1.3", @@ -24831,20 +20604,14 @@ "version": "0.24.51", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/jest-watch-typeahead/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -24860,10 +20627,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -24880,10 +20644,7 @@ "version": "0.10.2", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=12" @@ -24896,10 +20657,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -24909,10 +20667,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", @@ -24933,10 +20688,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -24946,10 +20698,7 @@ "version": "28.0.2", "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" @@ -24959,10 +20708,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^28.1.3", @@ -24980,10 +20726,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/test-result": "^28.1.3", @@ -25003,10 +20746,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "char-regex": "^1.0.2", @@ -25020,10 +20760,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -25036,10 +20773,7 @@ "version": "28.1.3", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/schemas": "^28.1.3", @@ -25055,10 +20789,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -25071,10 +20802,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=12" @@ -25087,10 +20815,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz", "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "char-regex": "^2.0.0", @@ -25107,10 +20832,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz", "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=12.20" @@ -25120,10 +20842,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -25136,10 +20855,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz", "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/test-result": "^27.5.1", @@ -25158,10 +20874,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -25178,10 +20891,7 @@ "version": "16.0.9", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -25191,10 +20901,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -25210,10 +20917,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -25230,10 +20934,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -25243,10 +20944,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jest/types": "^27.5.1", @@ -25264,10 +20962,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -25280,10 +20975,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*", @@ -25298,10 +20990,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -25311,10 +21000,7 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -25330,10 +21016,7 @@ "version": "1.21.6", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "jiti": "bin/jiti.js" @@ -25349,10 +21032,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -25457,7 +21137,6 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/jscodeshift/node_modules/write-file-atomic": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", @@ -25470,16 +21149,11 @@ "signal-exit": "^3.0.2" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/jsdom": { "version": "16.7.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "abab": "^2.0.5", @@ -25522,11 +21196,11 @@ } } }, -<<<<<<< HEAD "node_modules/jsdom/node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -25535,16 +21209,11 @@ "node": ">=0.4.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/jsdom/node_modules/form-data": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -25555,37 +21224,28 @@ "node": ">= 6" } }, -<<<<<<< HEAD -======= - "node_modules/jsdom/node_modules/tr46": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "node_modules/jsdom/node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", "dev": true, "license": "MIT", - "dependencies": { - "punycode": "^2.1.1" - }, "engines": { - "node": ">=8" - } - }, - "node_modules/jsdom/node_modules/whatwg-url": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "lodash": "^4.7.0", - "tr46": "^2.1.0", - "webidl-conversions": "^6.1.0" + "node": ">=8.3.0" }, - "engines": { - "node": ">=10" + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } } }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -25602,10 +21262,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/json-parse-even-better-errors": { @@ -25618,53 +21275,28 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", -<<<<<<< HEAD + "dev": true, "license": "(AFL-2.1 OR BSD-3-Clause)" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", -======= - "dev": true, - "license": "(AFL-2.1 OR BSD-3-Clause)" - }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", -<<<<<<< HEAD - "license": "MIT" -======= "dev": true, "license": "MIT" }, - "node_modules/json3": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz", - "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -25677,10 +21309,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "universalify": "^2.0.0" @@ -25693,10 +21322,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz", "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "esprima": "1.2.2", @@ -25721,10 +21347,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz", "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -25734,10 +21357,7 @@ "version": "3.3.5", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "array-includes": "^3.1.6", @@ -25753,10 +21373,7 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "json-buffer": "3.0.1" @@ -25766,10 +21383,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -25779,10 +21393,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -25792,10 +21403,7 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 8" @@ -25805,20 +21413,14 @@ "version": "0.3.23", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz", "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0" }, "node_modules/language-tags": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz", "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "language-subtag-registry": "^0.3.20" @@ -25831,10 +21433,7 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz", "integrity": "sha512-vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "picocolors": "^1.0.0", @@ -25845,10 +21444,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -25858,10 +21454,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", @@ -25875,10 +21468,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -25894,10 +21484,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6.11.5" @@ -25907,10 +21494,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "big.js": "^5.2.2", @@ -25925,10 +21509,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-locate": "^5.0.0" @@ -25950,50 +21531,35 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/log-symbols": { @@ -26095,10 +21661,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "tslib": "^2.0.3" @@ -26108,10 +21671,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "yallist": "^3.0.2" @@ -26127,23 +21687,20 @@ } }, "node_modules/magic-string": { - "version": "0.30.10", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", - "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", + "version": "0.30.11", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", + "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" + "@jridgewell/sourcemap-codec": "^1.5.0" } }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "semver": "^6.0.0" @@ -26159,10 +21716,7 @@ "version": "1.0.12", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "tmpl": "1.0.5" @@ -26192,20 +21746,14 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0" }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -26215,10 +21763,7 @@ "version": "3.5.3", "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Unlicense", "dependencies": { "fs-monkey": "^1.0.4" @@ -26241,30 +21786,21 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 8" @@ -26274,10 +21810,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -26300,10 +21833,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "mime": "cli.js" @@ -26337,10 +21867,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -26359,10 +21886,7 @@ "version": "2.9.0", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz", "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "schema-utils": "^4.0.0", @@ -26383,20 +21907,14 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -26409,10 +21927,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -26422,10 +21937,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": ">=8" @@ -26469,10 +21981,7 @@ "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "minimist": "^1.2.6" @@ -26494,7 +22003,6 @@ "ufo": "^1.5.3" } }, -<<<<<<< HEAD "node_modules/mlly/node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", @@ -26506,27 +22014,6 @@ }, "engines": { "node": ">=0.4.0" -======= - "node_modules/moment": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", - "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/moment-timezone": { - "version": "0.5.45", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz", - "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==", - "license": "MIT", - "dependencies": { - "moment": "^2.29.4" - }, - "engines": { - "node": "*" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/ms": { @@ -26539,10 +22026,7 @@ "version": "7.2.5", "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "dns-packet": "^5.2.2", @@ -26556,10 +22040,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "any-promise": "^1.0.0", @@ -26589,30 +22070,21 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/natural-compare-lite": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -26622,20 +22094,14 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/no-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "lower-case": "^2.0.2", @@ -26662,29 +22128,6 @@ "node": ">= 0.10.5" } }, -<<<<<<< HEAD -======= - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/node-fetch-native": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz", @@ -26696,10 +22139,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "(BSD-3-Clause OR GPL-2.0)", "engines": { "node": ">= 6.13.0" @@ -26709,30 +22149,21 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", -<<<<<<< HEAD -======= + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -26742,10 +22173,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -26755,10 +22183,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -26771,10 +22196,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "path-key": "^3.0.0" @@ -26787,10 +22209,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0" @@ -26803,10 +22222,7 @@ "version": "2.2.12", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/nypm": { @@ -26867,7 +22283,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD "node_modules/nypm/node_modules/human-signals": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", @@ -26878,8 +22293,6 @@ "node": ">=16.17.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/nypm/node_modules/is-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", @@ -26922,18 +22335,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/nypm/node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "node_modules/nypm/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, "license": "MIT", -<<<<<<< HEAD "dependencies": { "mimic-fn": "^4.0.0" }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "engines": { "node": ">=12" }, @@ -26941,18 +22351,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/nypm/node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "node_modules/nypm/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "dev": true, "license": "MIT", -<<<<<<< HEAD -======= - "dependencies": { - "mimic-fn": "^4.0.0" - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "engines": { "node": ">=12" }, @@ -26973,7 +22377,6 @@ "url": "https://github.com/sponsors/isaacs" } }, -<<<<<<< HEAD "node_modules/nypm/node_modules/strip-final-newline": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", @@ -26987,8 +22390,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -27002,10 +22403,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 6" @@ -27070,10 +22468,7 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -27088,10 +22483,7 @@ "version": "2.0.8", "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -27110,10 +22502,7 @@ "version": "2.1.8", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz", "integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "array.prototype.reduce": "^1.0.6", @@ -27135,10 +22524,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -27153,10 +22539,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -27181,10 +22564,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/ohash": { @@ -27198,10 +22578,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ee-first": "1.1.1" @@ -27214,10 +22591,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" @@ -27227,10 +22601,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "wrappy": "1" @@ -27240,10 +22611,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" @@ -27259,10 +22627,7 @@ "version": "8.4.2", "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "define-lazy-prop": "^2.0.0", @@ -27280,10 +22645,7 @@ "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "deep-is": "^0.1.3", @@ -27394,10 +22756,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" @@ -27413,10 +22772,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-limit": "^3.0.2" @@ -27432,10 +22788,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/retry": "0.12.0", @@ -27449,10 +22802,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -27462,20 +22812,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BlueOak-1.0.0" }, "node_modules/param-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "dot-case": "^3.0.4", @@ -27516,20 +22860,14 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" @@ -27539,10 +22877,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "no-case": "^3.0.4", @@ -27560,10 +22895,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -27573,10 +22905,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -27586,10 +22915,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -27605,10 +22931,7 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", @@ -27625,20 +22948,14 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/path-type": { @@ -27671,10 +22988,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/picocolors": { @@ -27696,29 +23010,20 @@ } }, "node_modules/pify": { -<<<<<<< HEAD "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", -======= - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { - "node": ">=6" + "node": ">=0.10.0" } }, "node_modules/pirates": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 6" @@ -27728,10 +23033,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "find-up": "^4.0.0" @@ -27744,10 +23046,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "locate-path": "^5.0.0", @@ -27761,10 +23060,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-locate": "^4.1.0" @@ -27777,10 +23073,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-try": "^2.0.0" @@ -27796,10 +23089,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-limit": "^2.2.0" @@ -27824,10 +23114,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "find-up": "^3.0.0" @@ -27840,10 +23127,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "locate-path": "^3.0.0" @@ -27856,10 +23140,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-locate": "^3.0.0", @@ -27873,10 +23154,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-try": "^2.0.0" @@ -27892,10 +23170,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "p-limit": "^2.0.0" @@ -27908,10 +23183,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4" @@ -27953,9 +23225,9 @@ } }, "node_modules/postcss": { - "version": "8.4.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", - "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", + "version": "8.4.40", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz", + "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==", "dev": true, "funding": [ { @@ -27985,10 +23257,7 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz", "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.10" @@ -28008,10 +23277,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz", "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "engines": { "node": ">=8" @@ -28025,10 +23291,7 @@ "version": "8.2.4", "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.9", @@ -28042,10 +23305,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz", "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28061,10 +23321,7 @@ "version": "4.2.4", "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz", "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28084,10 +23341,7 @@ "version": "8.0.4", "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz", "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28107,10 +23361,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz", "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28130,10 +23381,7 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz", "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.21.4", @@ -28152,10 +23400,7 @@ "version": "5.1.3", "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz", "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.21.4", @@ -28172,10 +23417,7 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz", "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28195,10 +23437,7 @@ "version": "12.1.11", "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28218,10 +23457,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz", "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.4" @@ -28241,10 +23477,7 @@ "version": "6.0.5", "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz", "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-selector-parser": "^6.0.10" @@ -28264,10 +23497,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" @@ -28280,10 +23510,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" @@ -28296,10 +23523,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" @@ -28312,10 +23536,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" @@ -28328,10 +23549,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz", "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/postcss-progressive-custom-properties": "^1.1.0", @@ -28352,10 +23570,7 @@ "version": "4.0.6", "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz", "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28371,10 +23586,7 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz", "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peerDependencies": { "postcss": "^8.1.4" @@ -28384,10 +23596,7 @@ "version": "6.0.4", "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz", "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-selector-parser": "^6.0.9" @@ -28403,10 +23612,7 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz", "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-selector-parser": "^6.0.9" @@ -28422,10 +23628,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz", "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peerDependencies": { "postcss": "^8.1.0" @@ -28435,10 +23638,7 @@ "version": "3.0.5", "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz", "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "engines": { "node": "^12 || ^14 || >=16" @@ -28455,10 +23655,7 @@ "version": "4.0.7", "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz", "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28478,10 +23675,7 @@ "version": "15.1.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.0.0", @@ -28499,10 +23693,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz", "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peerDependencies": { "postcss": "^8.0.0" @@ -28512,10 +23703,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "camelcase-css": "^2.0.1" @@ -28535,10 +23723,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz", "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/postcss-progressive-custom-properties": "^1.1.0", @@ -28595,10 +23780,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=14" @@ -28608,13 +23790,10 @@ } }, "node_modules/postcss-load-config/node_modules/yaml": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz", - "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==", -<<<<<<< HEAD -======= + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", + "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "yaml": "bin.mjs" @@ -28627,10 +23806,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz", "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cosmiconfig": "^7.0.0", @@ -28650,13 +23826,10 @@ } }, "node_modules/postcss-loader/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -28669,10 +23842,7 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz", "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "engines": { "node": "^12 || ^14 || >=16" @@ -28685,10 +23855,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz", "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10.0.0" @@ -28701,10 +23868,7 @@ "version": "5.1.7", "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz", "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", @@ -28721,10 +23885,7 @@ "version": "5.1.4", "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz", "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.21.4", @@ -28743,10 +23904,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -28762,10 +23920,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "colord": "^2.9.1", @@ -28783,10 +23938,7 @@ "version": "5.1.4", "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz", "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.21.4", @@ -28804,10 +23956,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz", "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.5" @@ -28823,10 +23972,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" @@ -28839,10 +23985,7 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "icss-utils": "^5.0.0", @@ -28860,10 +24003,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "postcss-selector-parser": "^6.0.4" @@ -28879,10 +24019,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "icss-utils": "^5.0.0" @@ -28895,24 +24032,27 @@ } }, "node_modules/postcss-nested": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", - "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", -<<<<<<< HEAD -======= + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz", + "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "license": "MIT", "dependencies": { - "postcss-selector-parser": "^6.0.11" + "postcss-selector-parser": "^6.1.1" }, "engines": { "node": ">=12.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, "peerDependencies": { "postcss": "^8.2.14" } @@ -28921,10 +24061,7 @@ "version": "10.2.0", "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz", "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/selector-specificity": "^2.0.0", @@ -28945,10 +24082,7 @@ "version": "10.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz", "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/normalize.css": "*", @@ -28967,10 +24101,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" @@ -28983,10 +24114,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29002,10 +24130,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz", "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29021,10 +24146,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz", "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29040,10 +24162,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29059,10 +24178,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29078,10 +24194,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz", "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.21.4", @@ -29098,10 +24211,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "normalize-url": "^6.0.1", @@ -29118,10 +24228,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29160,10 +24267,7 @@ "version": "5.1.3", "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz", "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cssnano-utils": "^3.1.0", @@ -29180,10 +24284,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz", "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29203,10 +24304,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz", "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peerDependencies": { "postcss": "^8" @@ -29216,10 +24314,7 @@ "version": "7.0.5", "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz", "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29239,10 +24334,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "@csstools/postcss-cascade-layers": "^1.1.1", @@ -29310,10 +24402,7 @@ "version": "7.1.6", "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz", "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0", "dependencies": { "postcss-selector-parser": "^6.0.10" @@ -29333,10 +24422,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz", "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.21.4", @@ -29353,10 +24439,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -29372,10 +24455,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz", "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peerDependencies": { "postcss": "^8.0.3" @@ -29385,10 +24465,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz", "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.10" @@ -29408,10 +24485,7 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz", "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -29425,10 +24499,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", @@ -29445,10 +24516,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 10" @@ -29458,10 +24526,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "mdn-data": "2.0.14", @@ -29475,20 +24540,14 @@ "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0" }, "node_modules/postcss-svgo/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -29498,10 +24557,7 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@trysound/sax": "0.2.0", @@ -29523,10 +24579,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.5" @@ -29548,10 +24601,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8.0" @@ -29577,10 +24627,7 @@ "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -29593,10 +24640,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "lodash": "^4.17.20", @@ -29649,20 +24693,14 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/promise": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz", "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "asap": "~2.0.6" @@ -29672,10 +24710,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "kleur": "^3.0.3", @@ -29706,10 +24741,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "forwarded": "0.2.0", @@ -29729,20 +24761,14 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -29772,10 +24798,7 @@ "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.6.0", @@ -29786,10 +24809,7 @@ "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.4" @@ -29805,10 +24825,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/queue-microtask": { @@ -29836,10 +24853,7 @@ "version": "3.4.1", "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "performance-now": "^2.1.0" @@ -29849,10 +24863,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" @@ -29862,10 +24873,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -29875,10 +24883,7 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "bytes": "3.1.2", @@ -29906,10 +24911,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz", "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "core-js": "^3.19.2", @@ -29927,10 +24929,7 @@ "version": "0.13.11", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/react-colorful": { @@ -29964,10 +24963,7 @@ "version": "12.0.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.16.0", @@ -30003,10 +24999,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -30022,10 +25015,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -30038,11 +25028,11 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, -<<<<<<< HEAD "node_modules/react-dev-utils/node_modules/cosmiconfig": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", + "dev": true, "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", @@ -30059,6 +25049,7 @@ "version": "8.0.7", "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz", "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==", + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">= 0.4.0" @@ -30068,6 +25059,7 @@ "version": "6.5.3", "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz", "integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.8.3", @@ -30107,6 +25099,7 @@ "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", @@ -30116,49 +25109,44 @@ }, "engines": { "node": ">=10" -======= - "node_modules/react-dev-utils/node_modules/filesize": { - "version": "8.0.7", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz", - "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">= 0.4.0" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/react-dev-utils/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" } }, + "node_modules/react-dev-utils/node_modules/immer": { + "version": "9.0.21", + "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz", + "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==", + "dev": true, + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/immer" + } + }, "node_modules/react-dev-utils/node_modules/loader-utils": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz", "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 12.13.0" } }, -<<<<<<< HEAD "node_modules/react-dev-utils/node_modules/schema-utils": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "dev": true, "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.4", @@ -30174,9 +25162,10 @@ } }, "node_modules/react-dev-utils/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -30185,16 +25174,6 @@ "node": ">=10" } }, - "node_modules/react-dev-utils/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { -======= "node_modules/react-dev-utils/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -30205,7 +25184,6 @@ "ansi-regex": "^5.0.1" }, "engines": { ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node": ">=8" } }, @@ -30213,10 +25191,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -30229,6 +25204,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -30266,22 +25242,6 @@ "typescript": ">= 4.3.x" } }, -<<<<<<< HEAD -======= - "node_modules/react-docgen/node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/react-dom": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", @@ -30322,62 +25282,9 @@ "version": "6.0.11", "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==", -<<<<<<< HEAD - "license": "MIT" -======= "dev": true, "license": "MIT" }, - "node_modules/react-i18next": { - "version": "14.1.3", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.1.3.tgz", - "integrity": "sha512-wZnpfunU6UIAiJ+bxwOiTmBOAaB14ha97MjOEnLGac2RJ+h/maIYXZuTHlmyqQVX1UVHmU1YDTQ5vxLmwfXTjw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.9", - "html-parse-stringify": "^3.0.1" - }, - "peerDependencies": { - "i18next": ">= 23.2.3", - "react": ">= 16.8.0" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - }, - "react-native": { - "optional": true - } - } - }, - "node_modules/react-intl": { - "version": "6.6.8", - "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.6.8.tgz", - "integrity": "sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==", - "license": "BSD-3-Clause", - "dependencies": { - "@formatjs/ecma402-abstract": "2.0.0", - "@formatjs/icu-messageformat-parser": "2.7.8", - "@formatjs/intl": "2.10.4", - "@formatjs/intl-displaynames": "6.6.8", - "@formatjs/intl-listformat": "7.5.7", - "@types/hoist-non-react-statics": "^3.3.1", - "@types/react": "16 || 17 || 18", - "hoist-non-react-statics": "^3.3.2", - "intl-messageformat": "10.5.14", - "tslib": "^2.4.0" - }, - "peerDependencies": { - "react": "^16.6.0 || 17 || 18", - "typescript": "^4.7 || 5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", @@ -30411,10 +25318,7 @@ "version": "0.14.2", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "peer": true, "engines": { @@ -30422,12 +25326,12 @@ } }, "node_modules/react-router": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.24.1.tgz", - "integrity": "sha512-PTXFXGK2pyXpHzVo3rR9H7ip4lSPZZc0bHG5CARmj65fTT6qG7sTngmb6lcYu1gf3y/8KxORoy9yn59pGpCnpg==", + "version": "6.25.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.25.1.tgz", + "integrity": "sha512-u8ELFr5Z6g02nUtpPAggP73Jigj1mRePSwhS/2nkTrlPU5yEkH1vYzWNyvSnSzeeE2DNqWdH+P8OhIh9wuXhTw==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.17.1" + "@remix-run/router": "1.18.0" }, "engines": { "node": ">=14.0.0" @@ -30437,13 +25341,13 @@ } }, "node_modules/react-router-dom": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.24.1.tgz", - "integrity": "sha512-U19KtXqooqw967Vw0Qcn5cOvrX5Ejo9ORmOtJMzYWtCT4/WOfFLIZGGsVLxcd9UkBO0mSTZtXqhZBsWlHr7+Sg==", + "version": "6.25.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.25.1.tgz", + "integrity": "sha512-0tUDpbFvk35iv+N89dWNrJp+afLgd+y4VtorJZuOCXK0kkCWjEvb3vTJM++SYvMEpbVwXKf3FjeVveVEb6JpDQ==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.17.1", - "react-router": "6.24.1" + "@remix-run/router": "1.18.0", + "react-router": "6.25.1" }, "engines": { "node": ">=14.0.0" @@ -30457,10 +25361,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/core": "^7.16.0", @@ -30530,27 +25431,11 @@ } } }, -<<<<<<< HEAD -======= - "node_modules/react-scripts/node_modules/dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=10" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/react-scripts/node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", @@ -30565,23 +25450,17 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/react-scripts/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", -<<<<<<< HEAD -======= + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -30610,36 +25489,17 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "pify": "^2.3.0" } }, -<<<<<<< HEAD -======= - "node_modules/read-cache/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "inherits": "^2.0.3", @@ -30654,10 +25514,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -30710,10 +25567,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "minimatch": "^3.0.5" @@ -30747,7 +25601,6 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/redux": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", @@ -30763,16 +25616,11 @@ "redux": "^5.0.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/reflect.getprototypeof": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -30794,20 +25642,14 @@ "version": "1.4.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/regenerate-unicode-properties": { "version": "10.1.1", "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "regenerate": "^1.4.2" @@ -30826,10 +25668,7 @@ "version": "0.15.2", "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.4" @@ -30839,10 +25678,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz", "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/regexp.prototype.flags": { @@ -30867,10 +25703,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/regjsgen": "^0.8.0", @@ -30888,10 +25721,7 @@ "version": "0.9.1", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "jsesc": "~0.5.0" @@ -30928,19 +25758,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/rehype-external-links/node_modules/is-absolute-url": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz", - "integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/rehype-slug": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/rehype-slug/-/rehype-slug-6.0.0.tgz", @@ -30963,10 +25780,7 @@ "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.10" @@ -30976,10 +25790,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "css-select": "^4.1.3", @@ -30993,10 +25804,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -31009,10 +25817,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -31022,10 +25827,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -31045,10 +25847,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/reselect": { @@ -31078,10 +25877,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" @@ -31094,10 +25890,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -31116,10 +25909,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz", "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "adjust-sourcemap-loader": "^4.0.0", @@ -31144,24 +25934,25 @@ } } }, + "node_modules/resolve-url-loader/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true, + "license": "MIT" + }, "node_modules/resolve-url-loader/node_modules/picocolors": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/resolve-url-loader/node_modules/postcss": { "version": "7.0.39", "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "picocolors": "^0.2.1", @@ -31179,10 +25970,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -31192,10 +25980,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" @@ -31219,10 +26004,7 @@ "version": "0.13.1", "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 4" @@ -31232,10 +26014,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "iojs": ">=1.0.0", @@ -31247,10 +26026,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "deprecated": "Rimraf versions prior to v4 are no longer supported", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "glob": "^7.1.3" @@ -31266,10 +26042,7 @@ "version": "2.79.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "rollup": "dist/bin/rollup" @@ -31286,10 +26059,7 @@ "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz", "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==", "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@babel/code-frame": "^7.10.4", @@ -31305,10 +26075,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -31318,10 +26085,7 @@ "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node": "*", @@ -31336,10 +26100,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" @@ -31349,10 +26110,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -31389,10 +26147,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -31432,10 +26187,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.6", @@ -31453,31 +26205,21 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/sanitize.css": { "version": "13.0.0", "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz", "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "CC0-1.0" }, "node_modules/sass": { "version": "1.77.8", "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", -<<<<<<< HEAD - "devOptional": true, -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -31495,10 +26237,7 @@ "version": "12.6.0", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "klona": "^2.0.4", @@ -31537,20 +26276,14 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/saxes": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "xmlchars": "^2.2.0" @@ -31572,10 +26305,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.9", @@ -31591,11 +26321,11 @@ "url": "https://opencollective.com/webpack" } }, -<<<<<<< HEAD "node_modules/schema-utils/node_modules/ajv": { "version": "8.17.1", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -31612,6 +26342,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3" @@ -31624,28 +26355,21 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, "license": "MIT" }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/selfsigned": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz", "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/node-forge": "^1.3.0", @@ -31659,10 +26383,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -31672,10 +26393,7 @@ "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "debug": "2.6.9", @@ -31700,10 +26418,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -31713,30 +26428,21 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" @@ -31746,10 +26452,7 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "accepts": "~1.3.4", @@ -31768,10 +26471,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -31781,10 +26481,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -31794,10 +26491,7 @@ "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "depd": "~1.1.2", @@ -31813,40 +26507,28 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/serve-index/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/serve-index/node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.6" @@ -31856,10 +26538,7 @@ "version": "1.15.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "encodeurl": "~1.0.2", @@ -31907,7 +26586,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", -<<<<<<< HEAD + "dev": true, "license": "ISC" }, "node_modules/shallow-clone": { @@ -31922,10 +26601,6 @@ "engines": { "node": ">=8" } -======= - "dev": true, - "license": "ISC" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 }, "node_modules/shallowequal": { "version": "1.1.0", @@ -31937,10 +26612,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" @@ -31953,10 +26625,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -31966,10 +26635,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -31997,20 +26663,14 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/slash": { @@ -32025,58 +26685,20 @@ "node_modules/sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", - "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "dependencies": { - "faye-websocket": "^0.11.3", - "uuid": "^8.3.2", - "websocket-driver": "^0.7.4" - } - }, -<<<<<<< HEAD -======= - "node_modules/sockjs-client": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", - "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" - } - }, - "node_modules/sockjs-client/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, "license": "MIT", - "optional": true, - "peer": true, "dependencies": { - "ms": "^2.1.1" + "faye-websocket": "^0.11.3", + "uuid": "^8.3.2", + "websocket-driver": "^0.7.4" } }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/sockjs/node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "bin": { "uuid": "dist/bin/uuid" @@ -32086,10 +26708,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/source-map": { @@ -32114,10 +26733,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz", "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "abab": "^2.0.5", @@ -32139,10 +26755,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -32155,10 +26768,7 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", @@ -32169,10 +26779,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -32183,10 +26790,7 @@ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", "deprecated": "Please use @jridgewell/sourcemap-codec instead", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/space-separated-tokens": { @@ -32204,10 +26808,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "debug": "^4.1.0", @@ -32224,10 +26825,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "debug": "^4.1.0", @@ -32242,10 +26840,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause" }, "node_modules/stable": { @@ -32253,10 +26848,7 @@ "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/stack-utils": { @@ -32284,20 +26876,14 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/static-eval": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz", "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "escodegen": "^1.8.1" @@ -32307,10 +26893,7 @@ "version": "1.14.3", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "esprima": "^4.0.1", @@ -32333,10 +26916,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -32346,10 +26926,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "prelude-ls": "~1.1.2", @@ -32363,10 +26940,7 @@ "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "deep-is": "~0.1.3", @@ -32393,10 +26967,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "optional": true, "engines": { @@ -32407,10 +26978,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "prelude-ls": "~1.1.2" @@ -32423,10 +26991,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" @@ -32445,16 +27010,16 @@ } }, "node_modules/storybook": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.2.4.tgz", - "integrity": "sha512-ASavW8vIHiWpFY+4M6ngeqK5oL4OkxqdpmQYxvRqH0gA1G1hfq/vmDw4YC4GnqKwyWPQh2kaV5JFurKZVaeaDQ==", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.2.7.tgz", + "integrity": "sha512-Jb9DXue1sr3tKkpuq66VP5ItOKTpxL6t99ze1wXDbjCvPiInTdPA5AyFEjBuKjOBIh28bayYoOZa6/xbMJV+Wg==", "dev": true, "license": "MIT", "dependencies": { "@babel/core": "^7.24.4", "@babel/types": "^7.24.0", - "@storybook/codemod": "8.2.4", - "@storybook/core": "8.2.4", + "@storybook/codemod": "8.2.7", + "@storybook/core": "8.2.7", "@types/semver": "^7.3.4", "@yarnpkg/fslib": "2.10.3", "@yarnpkg/libzip": "2.3.0", @@ -32578,9 +27143,9 @@ } }, "node_modules/storybook/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "bin": { @@ -32620,10 +27185,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" @@ -32633,10 +27195,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "char-regex": "^1.0.2", @@ -32650,10 +27209,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -32666,20 +27222,14 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz", "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -32695,10 +27245,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -32713,20 +27260,14 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/string-width-cjs/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -32739,20 +27280,14 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/string-width/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -32765,10 +27300,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.0.tgz", "integrity": "sha512-E34CkBgyeqNDcrbU76cDjL5JLcVrtSdYq0MEh/B10r17pRP4ciHLwTgnuLV8Ay6cgEMLkcBkFCKyFZ43YldYzg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -32779,10 +27311,7 @@ "version": "4.0.11", "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -32809,10 +27338,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -32823,10 +27349,7 @@ "version": "1.2.9", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -32845,10 +27368,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -32863,10 +27383,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -32884,10 +27401,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "get-own-enumerable-property-symbols": "^3.0.0", @@ -32902,10 +27416,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -32922,10 +27433,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -32938,7 +27446,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", -<<<<<<< HEAD + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -32951,57 +27459,30 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, "license": "MIT", "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/strip-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz", "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/strip-final-newline": { -<<<<<<< HEAD "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", -======= - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=6" } }, "node_modules/strip-indent": { @@ -33024,10 +27505,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -33040,10 +27518,7 @@ "version": "3.3.4", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz", "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 12.13.0" @@ -33057,9 +27532,9 @@ } }, "node_modules/styled-components": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.11.tgz", - "integrity": "sha512-Ui0jXPzbp1phYij90h12ksljKGqF8ncGx+pjrNPsSPhbUUjWT2tD1FwGo2LF6USCnbrsIhNngDfodhxbegfEOA==", + "version": "6.1.12", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.12.tgz", + "integrity": "sha512-n/O4PzRPhbYI0k1vKKayfti3C/IGcPf+DqcrOB7O/ab9x4u/zjqraneT5N45+sIe87cxrCApXM8Bna7NYxwoTA==", "license": "MIT", "dependencies": { "@emotion/is-prop-valid": "1.2.2", @@ -33084,6 +27559,27 @@ "react-dom": ">= 16.8.0" } }, + "node_modules/styled-components/node_modules/@emotion/is-prop-valid": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", + "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", + "license": "MIT", + "dependencies": { + "@emotion/memoize": "^0.8.1" + } + }, + "node_modules/styled-components/node_modules/@emotion/memoize": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", + "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==", + "license": "MIT" + }, + "node_modules/styled-components/node_modules/@emotion/unitless": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", + "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==", + "license": "MIT" + }, "node_modules/styled-components/node_modules/postcss": { "version": "8.4.38", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", @@ -33128,10 +27624,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browserslist": "^4.21.4", @@ -33154,10 +27647,7 @@ "version": "3.35.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", @@ -33180,10 +27670,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -33193,10 +27680,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 6" @@ -33223,10 +27707,7 @@ "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", @@ -33247,10 +27728,7 @@ "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" @@ -33266,17 +27744,12 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/sucrase/node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -33290,7 +27763,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -33307,10 +27779,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0", @@ -33324,10 +27793,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -33337,10 +27803,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -33365,10 +27828,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/svgo": { @@ -33376,10 +27836,7 @@ "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "chalk": "^2.4.1", @@ -33407,10 +27864,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" @@ -33420,10 +27874,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", @@ -33436,10 +27887,7 @@ "version": "3.4.2", "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "engines": { "node": ">= 6" @@ -33452,10 +27900,7 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", @@ -33466,10 +27911,7 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "0", @@ -33480,20 +27922,14 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause" }, "node_modules/svgo/node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "argparse": "^1.0.7", @@ -33507,10 +27943,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "boolbase": "~1.0.0" @@ -33520,20 +27953,14 @@ "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/tailwindcss": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.5.tgz", - "integrity": "sha512-DlTxttYcogpDfx3tf/8jfnma1nfAYi2cBUYV2YNoPPecwmO3YGiFlOX9D8tGAu+EDF38ryBzvrDKU/BLMsUwbw==", -<<<<<<< HEAD -======= + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.7.tgz", + "integrity": "sha512-rxWZbe87YJb4OcSopb7up2Ba4U82BoiSGUdoDr3Ydrg9ckxFS/YWsvhN323GMcddgU65QRy7JndC7ahhInhvlQ==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -33567,27 +27994,11 @@ "node": ">=14.0.0" } }, - "node_modules/tailwindcss/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=6" @@ -33714,10 +28125,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-escapes": "^4.2.1", @@ -33731,13 +28139,10 @@ } }, "node_modules/terser": { - "version": "5.31.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.2.tgz", - "integrity": "sha512-LGyRZVFm/QElZHy/CPr/O4eNZOZIzsrQ92y4v9UJe/pFJjypje2yI3C2FmPtvUEnhadlSbmG2nXtdcjHOjCfxw==", -<<<<<<< HEAD -======= + "version": "5.31.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz", + "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -33756,10 +28161,7 @@ "version": "5.3.10", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.20", @@ -33790,48 +28192,11 @@ } } }, - "node_modules/terser-webpack-plugin/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", @@ -33850,6 +28215,7 @@ "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -33862,20 +28228,14 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", @@ -33890,20 +28250,14 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/thenify": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "any-promise": "^1.0.0" @@ -33913,10 +28267,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "thenify": ">= 3.1.0 < 4" @@ -33929,20 +28280,14 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz", "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/thunky": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/tiny-invariant": { @@ -33966,10 +28311,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause" }, "node_modules/to-fast-properties": { @@ -33997,10 +28339,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.6" @@ -34010,10 +28349,7 @@ "version": "4.1.4", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "psl": "^1.1.33", @@ -34029,20 +28365,17 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 4.0.0" } }, "node_modules/tr46": { -<<<<<<< HEAD "version": "2.1.0", "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, "license": "MIT", "dependencies": { "punycode": "^2.1.1" @@ -34050,21 +28383,12 @@ "engines": { "node": ">=8" } -======= - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 }, "node_modules/tryer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/ts-dedent": { @@ -34081,10 +28405,7 @@ "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0" }, "node_modules/ts-pnp": { @@ -34113,7 +28434,6 @@ "minimist": "^1.2.6", "strip-bom": "^3.0.0" }, -<<<<<<< HEAD "engines": { "node": ">=6" } @@ -34124,26 +28444,22 @@ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, "license": "MIT", -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "engines": { - "node": ">=6" + "node": ">=4" } }, "node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + "dev": true, "license": "0BSD" }, "node_modules/tsutils": { "version": "3.21.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "tslib": "^1.8.1" @@ -34159,10 +28475,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "0BSD" }, "node_modules/tween-functions": { @@ -34176,10 +28489,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" @@ -34189,13 +28499,10 @@ } }, "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", -<<<<<<< HEAD -======= + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4" @@ -34205,11 +28512,7 @@ "version": "2.19.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", -<<<<<<< HEAD - "devOptional": true, -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=12.20" @@ -34222,10 +28525,7 @@ "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "media-typer": "0.3.0", @@ -34239,10 +28539,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -34257,10 +28554,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -34280,10 +28574,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", @@ -34304,10 +28595,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -34328,10 +28616,7 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "is-typedarray": "^1.0.0" @@ -34341,10 +28626,7 @@ "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", -<<<<<<< HEAD -======= - "devOptional": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "dev": true, "license": "Apache-2.0", "peer": true, "bin": { @@ -34356,9 +28638,9 @@ } }, "node_modules/ufo": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz", - "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", + "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", "dev": true, "license": "MIT" }, @@ -34366,10 +28648,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "call-bind": "^1.0.2", @@ -34385,10 +28664,7 @@ "version": "1.12.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz", "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/undici-types": { @@ -34401,10 +28677,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4" @@ -34414,10 +28687,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "unicode-canonical-property-names-ecmascript": "^2.0.0", @@ -34431,10 +28701,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4" @@ -34444,10 +28711,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4" @@ -34531,10 +28795,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 10.0.0" @@ -34544,32 +28805,28 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/unplugin": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.11.0.tgz", - "integrity": "sha512-3r7VWZ/webh0SGgJScpWl2/MRCZK5d3ZYFcNaeci/GQ7Teop7zf0Nl2pUuz7G21BwPd9pcUPOC5KmJ2L3WgC5g==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.12.0.tgz", + "integrity": "sha512-KeczzHl2sATPQUx1gzo+EnUkmN4VmGBYRRVOZSGvGITE9rGHRDGqft6ONceP3vgXcyJ2XjX5axG5jMWUwNCYLw==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.11.3", + "acorn": "^8.12.1", "chokidar": "^3.6.0", "webpack-sources": "^3.2.3", - "webpack-virtual-modules": "^0.6.1" + "webpack-virtual-modules": "^0.6.2" }, "engines": { "node": ">=14.0.0" } }, -<<<<<<< HEAD "node_modules/unplugin/node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", @@ -34583,26 +28840,18 @@ "node": ">=0.4.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/unquote": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/upath": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=4", @@ -34644,34 +28893,31 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } }, "node_modules/url": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz", - "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz", + "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==", "dev": true, "license": "MIT", "dependencies": { "punycode": "^1.4.1", - "qs": "^6.11.2" + "qs": "^6.12.3" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/url-parse": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "querystringify": "^2.1.1", @@ -34728,20 +28974,14 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/util.promisify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -34757,20 +28997,14 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.4.0" @@ -34791,75 +29025,53 @@ } }, "node_modules/v8-to-istanbul": { -<<<<<<< HEAD "version": "8.1.1", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz", "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==", -======= - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", - "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^2.0.0" + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" }, "engines": { "node": ">=10.12.0" } }, -<<<<<<< HEAD + "node_modules/v8-to-istanbul/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true, + "license": "MIT" + }, "node_modules/v8-to-istanbul/node_modules/source-map": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">= 8" } -======= - "node_modules/v8-to-istanbul/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 0.8" } }, - "node_modules/void-elements": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", - "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/w3c-hr-time": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "browser-process-hrtime": "^1.0.0" @@ -34869,10 +29081,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "xml-name-validator": "^3.0.0" @@ -34892,10 +29101,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "makeerror": "1.0.12" @@ -34905,10 +29111,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", @@ -34922,10 +29125,7 @@ "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "minimalistic-assert": "^1.0.0" @@ -34951,10 +29151,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause", "engines": { "node": ">=10.4" @@ -34964,10 +29161,7 @@ "version": "5.93.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz", "integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -35012,15 +29206,9 @@ } }, "node_modules/webpack-dev-middleware": { -<<<<<<< HEAD "version": "6.1.3", "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.3.tgz", "integrity": "sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==", -======= - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", - "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "dev": true, "license": "MIT", "dependencies": { @@ -35050,10 +29238,7 @@ "version": "4.15.2", "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz", "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/bonjour": "^3.5.9", @@ -35113,20 +29298,17 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz", "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">= 10" } }, -<<<<<<< HEAD "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": { "version": "5.3.4", "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", + "dev": true, "license": "MIT", "dependencies": { "colorette": "^2.0.10", @@ -35146,42 +29328,11 @@ "webpack": "^4.0.0 || ^5.0.0" } }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/webpack-hot-middleware": { "version": "2.26.1", "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.26.1.tgz", "integrity": "sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A==", -<<<<<<< HEAD - "devOptional": true, -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-html-community": "0.0.8", @@ -35193,11 +29344,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD - "devOptional": true, -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -35210,10 +29357,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz", "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "tapable": "^2.0.0", @@ -35230,10 +29374,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -35243,10 +29384,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz", "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "source-list-map": "^2.0.1", @@ -35260,10 +29398,7 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10.13.0" @@ -35280,13 +29415,14 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", -<<<<<<< HEAD + "dev": true, "license": "MIT" }, "node_modules/webpack/node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -35299,6 +29435,7 @@ "version": "1.9.5", "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", + "dev": true, "license": "MIT", "peerDependencies": { "acorn": "^8" @@ -35308,6 +29445,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -35321,57 +29459,17 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } -======= - "dev": true, - "license": "MIT" - }, - "node_modules/webpack/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/webpack/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/webpack/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 }, "node_modules/webpack/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", @@ -35390,10 +29488,7 @@ "version": "0.7.4", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "dependencies": { "http-parser-js": ">=0.5.1", @@ -35408,10 +29503,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0", "engines": { "node": ">=0.8.0" @@ -35421,10 +29513,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "iconv-lite": "0.4.24" @@ -35434,52 +29523,36 @@ "version": "3.6.20", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz", "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", -<<<<<<< HEAD + "dev": true, "license": "MIT" }, "node_modules/whatwg-url": { "version": "8.7.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", -======= "dev": true, - "license": "MIT" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" } }, - "node_modules/whatwg-url/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -35508,17 +29581,14 @@ } }, "node_modules/which-builtin-type": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", - "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", -<<<<<<< HEAD -======= + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", + "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { - "function.prototype.name": "^1.1.5", - "has-tostringtag": "^1.0.0", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", "is-date-object": "^1.0.5", "is-finalizationregistry": "^1.0.2", @@ -35527,8 +29597,8 @@ "is-weakref": "^1.0.2", "isarray": "^2.0.5", "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.15" }, "engines": { "node": ">= 0.4" @@ -35578,10 +29648,7 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=0.10.0" @@ -35591,10 +29658,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz", "integrity": "sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "idb": "^7.0.1", @@ -35605,10 +29669,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.6.0.tgz", "integrity": "sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0" @@ -35618,10 +29679,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.6.0.tgz", "integrity": "sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@apideck/better-ajv-errors": "^0.3.1", @@ -35666,11 +29724,11 @@ "node": ">=10.0.0" } }, -<<<<<<< HEAD "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz", "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==", + "dev": true, "license": "MIT", "dependencies": { "json-schema": "^0.4.0", @@ -35688,6 +29746,7 @@ "version": "8.17.1", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -35698,22 +29757,13 @@ "funding": { "type": "github", "url": "https://github.com/sponsors/epoberezkin" -======= - "node_modules/workbox-build/node_modules/crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 } }, "node_modules/workbox-build/node_modules/crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -35723,10 +29773,7 @@ "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", @@ -35738,23 +29785,18 @@ "node": ">=10" } }, -<<<<<<< HEAD "node_modules/workbox-build/node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, "license": "MIT" }, -======= ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "node_modules/workbox-build/node_modules/source-map": { "version": "0.8.0-beta.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "dependencies": { "whatwg-url": "^7.0.0" @@ -35767,10 +29809,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=8" @@ -35780,10 +29819,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz", "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "is-stream": "^2.0.0", @@ -35802,10 +29838,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "punycode": "^2.1.0" @@ -35815,10 +29848,7 @@ "version": "0.16.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz", "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" @@ -35831,10 +29861,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "crypto-random-string": "^2.0.0" @@ -35847,20 +29874,14 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-2-Clause" }, "node_modules/workbox-build/node_modules/whatwg-url": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "lodash.sortby": "^4.7.0", @@ -35873,10 +29894,7 @@ "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.6.0.tgz", "integrity": "sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==", "deprecated": "workbox-background-sync@6.6.0", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0" @@ -35886,20 +29904,14 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz", "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/workbox-expiration": { "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.6.0.tgz", "integrity": "sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "idb": "^7.0.1", @@ -35911,10 +29923,7 @@ "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz", "integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==", "deprecated": "It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-background-sync": "6.6.0", @@ -35927,10 +29936,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.6.0.tgz", "integrity": "sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0" @@ -35940,10 +29946,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.6.0.tgz", "integrity": "sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0", @@ -35955,10 +29958,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.6.0.tgz", "integrity": "sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0" @@ -35968,10 +29968,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.6.0.tgz", "integrity": "sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-cacheable-response": "6.6.0", @@ -35986,10 +29983,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz", "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0" @@ -35999,10 +29993,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz", "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0" @@ -36012,10 +30003,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.6.0.tgz", "integrity": "sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "workbox-core": "6.6.0", @@ -36026,20 +30014,14 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.6.0.tgz", "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/workbox-webpack-plugin": { "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.0.tgz", "integrity": "sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "fast-json-stable-stringify": "^2.1.0", @@ -36059,10 +30041,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -36072,10 +30051,7 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "source-list-map": "^2.0.0", @@ -36086,10 +30062,7 @@ "version": "6.6.0", "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.6.0.tgz", "integrity": "sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "@types/trusted-types": "^2.0.2", @@ -36100,10 +30073,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -36122,10 +30092,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -36143,10 +30110,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -36162,10 +30126,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -36178,10 +30139,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -36197,10 +30155,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -36213,45 +30168,33 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", -<<<<<<< HEAD + "dev": true, "license": "ISC" }, "node_modules/write-file-atomic": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", -======= - "dev": true, - "license": "ISC" - }, - "node_modules/write-file-atomic": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz", - "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==", "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "dependencies": { - "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } }, "node_modules/ws": { - "version": "7.5.10", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", - "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", -<<<<<<< HEAD -======= - "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "license": "MIT", "engines": { - "node": ">=8.3.0" + "node": ">=10.0.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" + "utf-8-validate": ">=5.0.2" }, "peerDependenciesMeta": { "bufferutil": { @@ -36266,30 +30209,21 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "Apache-2.0" }, "node_modules/xmlchars": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": ">=10" @@ -36299,10 +30233,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC" }, "node_modules/yaml": { @@ -36318,10 +30249,7 @@ "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "dependencies": { "cliui": "^7.0.2", @@ -36340,10 +30268,7 @@ "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "ISC", "engines": { "node": ">=10" @@ -36353,10 +30278,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", -<<<<<<< HEAD -======= "dev": true, ->>>>>>> 7244f8ba3281e2b5bb52570c5fbb858a70192cc8 "license": "MIT", "engines": { "node": ">=10" diff --git a/client-side/package.json b/client-side/package.json index 5087dc405..17e5979aa 100644 --- a/client-side/package.json +++ b/client-side/package.json @@ -23,7 +23,8 @@ "react-scripts": "5.0.1", "redux": "^5.0.1", "styled-components": "^6.1.11", - "web-vitals": "^2.1.4" + "web-vitals": "^2.1.4", + "ws": "^8.18.0" }, "scripts": { "start": "react-scripts start", diff --git a/client-side/src/App.jsx b/client-side/src/App.jsx index 2f9915bc6..0b5ac8d79 100644 --- a/client-side/src/App.jsx +++ b/client-side/src/App.jsx @@ -3,16 +3,51 @@ import { RouterProvider } from 'react-router-dom'; import Footer from './stories/footer/FooterComponent'; import { router } from './router/router.jsx'; import { store } from './redux/store.jsx'; +import React, { useEffect, useState } from 'react'; import './App.scss'; function App() { + const [messages, setMessages] = useState([]); + const [socket, setSocket] = useState(null); + + useEffect(() => { + const ws = new WebSocket('ws://localhost:8080'); + + ws.onopen = () => { + console.log('Connected to WebSocket server'); + }; + + ws.onmessage = (event) => { + const response = event.data; + console.log(`Received from server: ${response}`); + setMessages((prevMessages) => [...prevMessages, response]); + }; + + ws.onclose = () => { + console.log('Disconnected from WebSocket server'); + }; + + setSocket(ws); + + return () => { + ws.close(); + }; + }, []); + + + return ( - <> - - -