From b1ad548f808bb0e555d5eccdf1b2a60cc98d71c0 Mon Sep 17 00:00:00 2001
From: Philipp Berger <philipp.berger@nexenio.com>
Date: Fri, 1 Oct 2021 12:46:31 +0200
Subject: [PATCH] chore: release v2.1.0
---
CHANGELOG.md | 36 +-
docker-compose.yml | 2 +
e2e/.gitignore | 3 +-
e2e/cypress.json | 16 +-
e2e/package.json | 2 +-
.../login/firstTimeLogin.spec.js | 14 +-
.../authentication/login/keyScenarios.spec.js | 16 +-
.../login/secondTimeLogin.spec.js | 30 +-
.../authentication/logout/logout.spec.js | 2 +-
.../locations/downloadPDF/downloadPDF.spec.js | 29 +-
.../group/change/changeGroup.spec.js | 60 +-
.../group/create/createHotelAndBase.spec.js | 120 +-
.../group/create/createNursingHome.spec.js | 57 +-
.../group/create/createRestaurant.spec.js | 73 +-
.../createWithManuelAddressInput.spec.js | 62 +-
.../locations/helpers/createGroup.helper.js | 93 ++
.../helpers/createLocation.helper.js | 40 +
e2e/specs/locations/helpers/functions.js | 12 +
e2e/specs/locations/helpers/locations.js | 2 +-
.../location/create/createBase.spec.js | 69 +-
.../location/create/createBuilding.spec.js | 66 +-
.../location/create/createRestaurant.spec.js | 107 +-
.../location/create/createRoom.spec.js | 69 +-
.../webapp/checkin/checkinByLinkFlow.spec.js | 8 +-
package.json | 5 +-
.../config/custom-environment-variables.js | 2 +
services/backend/config/default.js | 4 +-
services/backend/package.json | 5 +-
services/backend/src/@types/express.d.ts | 1 +
...21.08.05-0823-addSignedLocationTransfer.js | 28 +
...ageCheckinTimeAttributeToLocationsTable.js | 12 +
...veExpireAtAttributeFromTestRedeemsTable.js | 11 +
...29-updateNotificationMessagesConstraint.js | 33 +
.../backend/src/database/models/location.js | 5 +
.../src/database/models/locationTransfer.js | 5 +
.../src/database/models/testRedeems.js | 3 -
services/backend/src/routes/internal/jobs.js | 20 +-
.../backend/src/routes/v3/locationGroups.js | 2 +
.../src/routes/v3/locationGroups.openapi.yaml | 4 +
.../src/routes/v3/locationGroups.schemas.js | 8 +
.../src/routes/v3/locationTransfers.js | 218 +--
.../routes/v3/locationTransfers.openapi.yaml | 2 +-
.../routes/v3/locationTransfers.schemas.js | 4 +-
services/backend/src/routes/v3/operators.js | 33 +-
.../src/routes/v3/operators.schemas.js | 7 +
.../routes/v3/operators/locations.helper.js | 1 +
.../src/routes/v3/operators/locations.js | 2 +
.../v3/operators/locations.openapi.yaml | 4 +
.../routes/v3/operators/locations.schemas.js | 16 +
services/backend/src/routes/v3/tests.js | 17 -
.../backend/src/routes/v3/tests.openapi.yaml | 2 -
services/backend/src/routes/v4.js | 2 +
.../src/routes/v4/healthDepartments.test.js | 108 ++
.../routes/v4/locationTransfers.schemas.ts | 21 +
.../src/routes/v4/locationTransfers.ts | 269 ++++
services/backend/src/utils/apiError.js | 20 +
.../backend/src/utils/mailClient.helper.js | 8 +
services/backend/src/utils/mailClient.js | 11 +
.../utils/{signedKeys.js => signedKeys.ts} | 91 +-
services/backend/src/utils/validation.ts | 9 +-
services/backend/yarn.lock | 578 ++++----
services/contact-form/craco.config.js | 6 +
services/contact-form/jest.setup.js | 3 -
services/contact-form/nginx.conf | 1 +
services/contact-form/package.json | 4 +-
.../src/components/general/Buttons.styled.js | 6 +-
services/contact-form/yarn.lock | 1173 +++++----------
services/health-department/craco.config.js | 6 +
services/health-department/nginx.conf | 1 +
services/health-department/package.json | 7 +-
services/health-department/src/ant.css | 11 +
.../src/assets/MenuActive.svg | 9 +
.../src/assets/MenuInactive.svg | 9 +
.../health-department/src/assets/menu.svg | 12 -
.../App/Header/LinkMenu/LinkMenu.react.js | 31 +-
.../App/Header/Profile/Profile.styled.js | 2 +-
.../HeaderRow/HeaderRow.react.js | 11 +-
.../NotificationTrigger.helper.js | 26 +
.../NotificationTrigger.react.js | 37 +-
.../Note/NoteProcess/NoteProcess.helper.js | 2 +-
.../ManualSearchButton.react.js | 2 +-
.../NewTrackingButton.react.js | 2 +-
.../ListFilters/Filter/Filter.react.js | 20 +-
.../ListFilters/Filter/Filter.styled.js | 15 +
.../SelectAssignee/SelectAssignee.react.js | 7 +-
.../SelectAssignee/SelectAssignee.styled.js | 17 +-
.../UserNameDisplay/UserNameDisplay.react.js | 2 +-
.../AddEmployeeButton.react.js | 2 +-
.../EmployeeList/EmployeeList.react.js | 7 +-
.../EmployeeName/EmployeeName.react.js | 6 +
.../EmployeePhone/EmployeePhone.react.js | 10 +-
.../EmployeePhone/EmployeePhone.styled.js | 6 +
.../AddEmployeeForm/AddEmployeeForm.react.js | 5 +-
.../AddEmployeeModal.helper.js | 42 -
.../modals/AddEmployeeModal/useAddEmployee.js | 24 +
.../ContactPersons/ContactPersons.react.js | 9 +-
.../ContactPersons/Export/Export.styled.js | 1 +
.../ContactPersonsModal.react.js | 12 +-
.../DataRequestModal.react.js | 16 +-
.../GroupSearchModal.react.js | 2 +-
.../NotificationModal.helper.js | 8 +-
.../NotificationModal.react.js | 19 +-
.../src/components/Login/Login.react.js | 2 +-
.../src/components/general/Buttons.styled.js | 8 +-
.../components/hooks/useLocationTransfers.js | 1 -
.../health-department/src/constants/sormas.js | 1 +
.../health-department/src/messages/de.json | 6 +-
.../health-department/src/messages/en.json | 16 +-
services/health-department/src/network/api.js | 2 +-
.../src/utils/cryptoKeyOperations.js | 38 +-
.../src/utils/cryptoOperations.js | 24 +-
.../health-department/src/utils/jest.setup.js | 3 -
.../health-department/src/utils/keyHandler.js | 4 +-
services/health-department/yarn.lock | 1313 ++++++-----------
services/locations/craco.config.js | 6 +
services/locations/nginx.conf | 1 +
services/locations/package.json | 4 +-
.../src/assets/documents/AVV_Luca.pdf | 4 +-
.../assets/documents/DSE_Luca_mandatory.pdf | 4 +-
.../assets/documents/DSE_Luca_optional.pdf | 4 +-
services/locations/src/assets/external.svg | 7 +
.../locations/src/components/App/App.react.js | 5 +
.../CheckInQuery/CheckInQuery.react.js | 2 +-
.../AverageCheckinTime.helper.js | 11 +
.../AverageCheckinTime.react.js | 106 ++
.../AverageCheckinTime.styled.js | 8 +
.../Checkout/AverageCheckinTime/index.js | 1 +
.../Location/Checkout/Checkout.react.js | 88 +-
.../App/Dashboard/Location/Location.react.js | 2 +-
.../DetailsDropdown/DetailsDropdown.react.js | 95 ++
.../DetailsDropdown/DetailsDropdown.styled.js | 11 +
.../App/Header/DetailsDropdown/index.js | 1 +
.../src/components/App/Header/Header.react.js | 6 +-
.../App/Header/HelpCenter/HelpCenter.react.js | 95 +-
.../Header/HelpCenter/HelpCenter.styled.js | 10 -
.../App/Header/LinkMenu/LinkMenu.react.js | 43 -
.../App/Header/LinkMenu/LinkMenu.styled.js | 6 -
.../Header/LinkMenu/Logout/Logout.react.js | 62 -
.../App/Header/LinkMenu/Logout/index.js | 1 -
.../Header/LinkMenu/Profile/Profile.react.js | 23 -
.../App/Header/LinkMenu/Profile/index.js | 1 -
.../components/App/Header/LinkMenu/index.js | 1 -
.../SelectGroup/GroupMenu/GroupMenu.react.js | 98 +-
.../SelectGroup/GroupMenu/GroupMenu.styled.js | 61 +
.../Header/SelectGroup/SelectGroup.react.js | 23 +-
.../Header/SelectGroup/SelectGroup.styled.js | 36 +-
.../ContactSection/ContactSection.helper.js} | 2 +-
.../ContactSection/ContactSection.react.js | 17 +
.../ContactSection/ContactSection.styled.js | 13 +
.../MailSection/MailSection.react.js | 37 +
.../MailSection/MailSection.styled.js | 30 +
.../ContactSection/MailSection/index.js | 1 +
.../PhoneSection/PhoneSection.react.js | 32 +
.../PhoneSection/PhoneSection.styled.js | 22 +
.../ContactSection/PhoneSection/index.js | 1 +
.../App/HelpCenter/ContactSection/index.js | 1 +
.../App/HelpCenter/HelpCenter.react.js | 42 +
.../App/HelpCenter/HelpCenter.styled.js | 31 +
.../App/HelpCenter/Links/Links.react.js | 31 +
.../App/HelpCenter/Links/Links.styled.js | 27 +
.../components/App/HelpCenter/Links/index.js | 1 +
.../NavigationButton.react.js | 21 +
.../NavigationButton.styled.js | 18 +
.../App/HelpCenter/NavigationButton/index.js | 1 +
.../src/components/App/HelpCenter/index.js | 1 +
.../App/Profile/Services/Services.helper.js | 59 +
.../App/Profile/Services/Services.react.js | 88 +-
.../ContactFormModal.helper.js | 2 +
.../ContactFormModal.react.js | 49 +
.../ContactFormModal.styled.js | 44 +
.../App/modals/ContactFormModal/index.js | 1 +
.../steps/FinishStep/FinishStep.react.js | 27 +
.../steps/FinishStep/FinishStep.styled.js | 28 +
.../steps/FinishStep/index.js | 1 +
.../steps/RequestStep/RequestStep.react.js | 125 ++
.../steps/RequestStep/RequestStep.styled.js | 57 +
.../steps/RequestStep/index.js | 1 +
.../CreateGroupModal.helper.js | 16 +-
.../CreateGroupModal.react.js | 44 +-
.../steps/AddressInput/AddressInput.react.js | 72 +-
.../steps/Complete/Complete.react.js | 4 +-
.../GooglePlacesInput.react.js | 61 +
.../steps/GooglePlacesInput/index.js | 1 +
.../steps/PatientInput/PatientInput.react.js | 2 +-
.../CreateLocationModal.helper.js | 11 +-
.../CreateLocationModal.react.js | 24 +-
.../steps/AddressInput/AddressInput.react.js | 2 +-
.../steps/Complete/Complete.react.js | 4 +-
.../GuestListModal/GuestListModal.react.js | 2 +-
.../VerifyPrivateKey.helper.js | 1 +
.../WhatsNewModal/WhatsNewModal.react.js | 2 +-
.../AverageCheckinTime.react.js | 85 ++
.../AverageCheckinTime/index.js | 1 +
.../GooglePlacesWrapper.react.js | 15 +
.../GooglePlacesWrapper/index.js | 1 +
.../YesNoSelection/YesNoSelection.react.js | 2 +-
.../ConfirmRegistrationStep.react.js | 2 +-
.../steps/EmailStep/EmailStep.react.js | 2 +-
.../FinishRegisterStep.react.js | 2 +-
.../LegalTermsStep/LegalTermsStep.react.js | 2 +-
.../NameInputStep/NameInputStep.react.js | 2 +-
.../steps/PasswordStep/PasswordStep.react.js | 2 +-
.../SetPasswordStep/SetPasswordStep.react.js | 2 +-
.../ForgotPassword/ForgotPassword.react.js | 2 +-
.../ResetPassword/ResetPassword.react.js | 2 +-
.../DataRequests/DataRequests.react.js | 2 +-
.../src/components/general/Buttons.styled.js | 6 +-
.../Success/Success.react.js | 0
.../Success/Success.styled.js | 0
.../Success/index.js | 0
.../locations/src/components/general/index.js | 13 +-
.../src/components/hooks/useValidators.js | 18 +
services/locations/src/constants/checkout.js | 3 +
services/locations/src/constants/links.js | 3 +
services/locations/src/constants/routes.js | 1 +
services/locations/src/messages/de.json | 56 +-
services/locations/src/messages/en.json | 128 +-
services/locations/src/network/api.js | 8 +
.../locations/src/utils/checkCharacter.js | 3 +
services/locations/src/utils/downloadPDF.js | 8 +-
services/locations/src/utils/jest.setup.js | 3 -
services/locations/src/utils/sanitizer.js | 6 +-
services/locations/src/utils/time.js | 8 +
.../src/utils/validatorRules.helper.js | 9 +-
.../locations/src/utils/validatorRules.js | 6 +
services/locations/yarn.lock | 89 +-
services/scanner/craco.config.js | 6 +
services/scanner/nginx.conf | 1 +
services/scanner/package.json | 6 +-
services/scanner/scripts/updateLocales.sh | 23 +
.../scanner/src/general/Buttons.styled.js | 6 +-
services/scanner/src/messages/de.js | 77 -
services/scanner/src/messages/de.json | 49 +
services/scanner/src/messages/en.js | 72 -
services/scanner/src/messages/en.json | 49 +
services/scanner/src/messages/index.js | 4 +-
services/scanner/yarn.lock | 1147 +++++++-------
services/webapp/craco.config.js | 6 +
services/webapp/nginx.conf | 1 +
services/webapp/package.json | 3 +-
.../src/components/History/History.react.js | 21 +-
.../webapp/src/components/Home/Home.styled.js | 2 +-
services/webapp/src/messages/de.json | 21 +-
services/webapp/src/messages/en.json | 13 +-
services/webapp/yarn.lock | 1147 +++++++-------
yarn.lock | 5 -
246 files changed, 5804 insertions(+), 4798 deletions(-)
create mode 100644 e2e/specs/locations/helpers/createGroup.helper.js
create mode 100644 e2e/specs/locations/helpers/createLocation.helper.js
create mode 100644 services/backend/src/database/migrations/2021.08.05-0823-addSignedLocationTransfer.js
create mode 100644 services/backend/src/database/migrations/2021.08.26-1527-addAverageCheckinTimeAttributeToLocationsTable.js
create mode 100644 services/backend/src/database/migrations/2021.09.02-1934-removeExpireAtAttributeFromTestRedeemsTable.js
create mode 100644 services/backend/src/database/migrations/2021.09.22-1629-updateNotificationMessagesConstraint.js
create mode 100644 services/backend/src/routes/v4/healthDepartments.test.js
create mode 100644 services/backend/src/routes/v4/locationTransfers.schemas.ts
create mode 100644 services/backend/src/routes/v4/locationTransfers.ts
rename services/backend/src/utils/{signedKeys.js => signedKeys.ts} (53%)
create mode 100644 services/health-department/src/assets/MenuActive.svg
create mode 100644 services/health-department/src/assets/MenuInactive.svg
delete mode 100644 services/health-department/src/assets/menu.svg
create mode 100644 services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.helper.js
create mode 100644 services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.styled.js
delete mode 100644 services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeModal.helper.js
create mode 100644 services/health-department/src/components/App/modals/AddEmployeeModal/useAddEmployee.js
create mode 100644 services/locations/src/assets/external.svg
create mode 100644 services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.helper.js
create mode 100644 services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.react.js
create mode 100644 services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.styled.js
create mode 100644 services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/index.js
create mode 100644 services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.react.js
create mode 100644 services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.styled.js
create mode 100644 services/locations/src/components/App/Header/DetailsDropdown/index.js
delete mode 100644 services/locations/src/components/App/Header/LinkMenu/LinkMenu.react.js
delete mode 100644 services/locations/src/components/App/Header/LinkMenu/LinkMenu.styled.js
delete mode 100644 services/locations/src/components/App/Header/LinkMenu/Logout/Logout.react.js
delete mode 100644 services/locations/src/components/App/Header/LinkMenu/Logout/index.js
delete mode 100644 services/locations/src/components/App/Header/LinkMenu/Profile/Profile.react.js
delete mode 100644 services/locations/src/components/App/Header/LinkMenu/Profile/index.js
delete mode 100644 services/locations/src/components/App/Header/LinkMenu/index.js
create mode 100644 services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.styled.js
rename services/locations/src/components/App/{Header/HelpCenter/HelpCenter.helper.js => HelpCenter/ContactSection/ContactSection.helper.js} (67%)
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.react.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.styled.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.react.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.styled.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/MailSection/index.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.react.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.styled.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/index.js
create mode 100644 services/locations/src/components/App/HelpCenter/ContactSection/index.js
create mode 100644 services/locations/src/components/App/HelpCenter/HelpCenter.react.js
create mode 100644 services/locations/src/components/App/HelpCenter/HelpCenter.styled.js
create mode 100644 services/locations/src/components/App/HelpCenter/Links/Links.react.js
create mode 100644 services/locations/src/components/App/HelpCenter/Links/Links.styled.js
create mode 100644 services/locations/src/components/App/HelpCenter/Links/index.js
create mode 100644 services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.react.js
create mode 100644 services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.styled.js
create mode 100644 services/locations/src/components/App/HelpCenter/NavigationButton/index.js
create mode 100644 services/locations/src/components/App/HelpCenter/index.js
create mode 100644 services/locations/src/components/App/Profile/Services/Services.helper.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.helper.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.react.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.styled.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/index.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.react.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.styled.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/index.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.react.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.styled.js
create mode 100644 services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/index.js
create mode 100644 services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/GooglePlacesInput.react.js
create mode 100644 services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/index.js
create mode 100644 services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/AverageCheckinTime.react.js
create mode 100644 services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/index.js
create mode 100644 services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/GooglePlacesWrapper.react.js
create mode 100644 services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/index.js
rename services/locations/src/components/{App/modals/generalOnboarding => general}/Success/Success.react.js (100%)
rename services/locations/src/components/{App/modals/generalOnboarding => general}/Success/Success.styled.js (100%)
rename services/locations/src/components/{App/modals/generalOnboarding => general}/Success/index.js (100%)
create mode 100755 services/scanner/scripts/updateLocales.sh
delete mode 100644 services/scanner/src/messages/de.js
create mode 100644 services/scanner/src/messages/de.json
delete mode 100644 services/scanner/src/messages/en.js
create mode 100644 services/scanner/src/messages/en.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20a47d8..786a3f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
# Changelog
+### 2.1.0 (2021-10-01)
+* **backend** feat: add signed location transfer support
+* **backend** feat: add average checkin time
+* **backend** feat: add support route
+* **backend** feat: delete redeemed vaccination certificates after 72 hours
+* **backend:** fix: extend unique constraint for notification messages
+* **backend:** fix: deletion of notification chunks
+* **health-department** fix: check public HDSKP when uploading private key
+* **health-department** fix: cursor did not change on hovering download options in contact person view
+* **health-department** fix: update contact list when value changes for location tranfers
+* **health-department** fix: warning in console concerning button properties
+* **health-department** fix: remove default icon tooltip for notification
+* **health-department** feat: sign share data requests to locations with HDSKP
+* **health-department** feat: improve edit employee fields
+* **health-department** feat: change menu button
+* **health-department** feat: add 1.63.1 to supported SORMAS versions
+* **locations** fix: timestamp in email for share data requests
+* **locations** fix: limit traceId in guest list to seven characters
+* **locations** fix: QR-Print instructions text and alignment
+* **locations** fix: wrong time format in share data modal
+* **locations** fix: make whole entry in dropdown menu clickable
+* **locations** feat: venue owners can declare an average visit duration for their venue
+* **locations** feat: new help center
+* **locations** feat: user can choose to not load the Google Places API when creating locations
+* **locations** feat: update privacy policy documents
+* **locations** feat: update data processing agreement document
+* **locations** feat: improve usablity of the dropdown to switch between locations
+* **scanner** chore: integrate PO editor
+* chore: enable static compression
+
### 2.0.2 (2021-09-15)
* **backend:** perf: add bloomfilter generation metrics
* **backend:** fix: set timezone via config
@@ -194,7 +224,7 @@
* **health-department:** fix: order of locations changed after contacting venues
* **health-department:** feat: add hover effect to process list for better usability
* **health-department:** feat: new designs for location search
-* **health-department:** feat: locations can be search by zip code as additional parameter to the location name
+* **health-department:** feat: locations can be search by zip code as additional parameter to the location name
* **health-department:** feat: new designs for profile view
* **health-department:** feat: select profile view got moved from tab to header
* **health-department:** feat: improved locales
@@ -281,7 +311,7 @@
* **health-department:** feat: include address information directly in contact person view and not only in the download files
* **health-department:** fix: dependency tree
* **scanner:** fix: update check ins counter after scanning badges
-* **scanner:** fix: refocus after outbounds clicks in hardware scanner
+* **scanner:** fix: refocus after outbounds clicks in hardware scanner
* **webapp:** feat: support international phone numbers
* **webapp:** feat: handle unsupported deeplinks
@@ -294,7 +324,7 @@
* **health-department:** fix: add more error handling in csv generation
### 1.1.13 (2021-05-26)
-* **health-department:** fix: whitlisted special characters for csv
+* **health-department:** fix: whitlisted special characters for csv
### 1.1.12 (2021-05-26)
* **health-department:** fix: csv sanitization
diff --git a/docker-compose.yml b/docker-compose.yml
index 34a98d4..cbc9f8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,8 @@ services:
image: lucaapp/elb:${IMAGE_TAG}
build:
context: "services/elb"
+ args:
+ ENABLED_MODULES: brotli
ports:
- 80:8080
- 443:8443
diff --git a/e2e/.gitignore b/e2e/.gitignore
index 3707aeb..87eb719 100644
--- a/e2e/.gitignore
+++ b/e2e/.gitignore
@@ -15,11 +15,12 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
-/downloads/
+/downloads
tsconfig.json
cypress/fixtures
cypress/screenshots
+cypress/plugins/downloads
# certificates
certs/*.pfx
\ No newline at end of file
diff --git a/e2e/cypress.json b/e2e/cypress.json
index da5fef4..f51ae94 100644
--- a/e2e/cypress.json
+++ b/e2e/cypress.json
@@ -1,7 +1,21 @@
{
"baseUrl": "https://localhost",
"projectId": "9qr32w",
- "testFiles": "**/*.spec.js",
+ "testFiles": [
+ "workflow/**/*.spec.js",
+ "webapp/**/*.spec.js",
+ "locations/downloadPDF/downloadPDF.spec.js",
+ "health-department/**/*.spec.js",
+ "scanner/**/*.spec.js",
+ "locations/authentication/**/*.spec.js",
+ "locations/checkinOptions/**/*.spec.js",
+ "locations/group/**/*.spec.js",
+ "locations/location/**/*.spec.js",
+ "locations/locationOverview/*.spec.js",
+ "locations/locationSettings/*.spec.js",
+ "locations/navigation/*.spec.js",
+ "locations/profile/*.spec.js"
+ ],
"integrationFolder": "./specs",
"video": false,
"supportFile": "./support",
diff --git a/e2e/package.json b/e2e/package.json
index 523012b..e9b7a6d 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
{
"name": "e2e",
- "version": "2.0.2",
+ "version": "2.1.0",
"main": "index.js",
"private": true,
"engines": {
diff --git a/e2e/specs/health-department/authentication/login/firstTimeLogin.spec.js b/e2e/specs/health-department/authentication/login/firstTimeLogin.spec.js
index 043648c..734c559 100644
--- a/e2e/specs/health-department/authentication/login/firstTimeLogin.spec.js
+++ b/e2e/specs/health-department/authentication/login/firstTimeLogin.spec.js
@@ -28,7 +28,7 @@ describe('Autentication', () => {
);
cy.contains('Wrong Email or password').should('not.exist');
cy.url().should('include', '/app/tracking');
- cy.get('.ant-modal').within($modal => {
+ cy.get('.ant-modal').within(() => {
cy.contains('Setup').should('exist');
cy.contains(
'The key file for this health department was generated. Please make sure to download the file and not to lose it. You will need it to decrypt the data from requested locations.'
@@ -36,11 +36,13 @@ describe('Autentication', () => {
cy.getByCy('downloadPrivateKey').should('exist').should('be.enabled');
});
downloadHealthDepartmentPrivateKey();
- cy.getByCy('header').within($header => {
- cy.contains('Health-Department').should('exist').should('be.visible');
- cy.get('.ant-dropdown-trigger').should('exist').should('be.enabled');
- cy.get('button').contains('LOG OUT').should('exist');
- });
+ cy.getByCy('header')
+ .contains('Health-Department')
+ .should('exist')
+ .should('be.visible');
+ cy.getByCy('linkMenu').should('exist').should('be.visible');
+ cy.get('button').contains('LOG OUT').should('exist');
+
cy.get('.ant-menu-horizontal').should('exist').should('be.visible');
cy.getByCy('navigation').should('exist').should('be.visible');
});
diff --git a/e2e/specs/health-department/authentication/login/keyScenarios.spec.js b/e2e/specs/health-department/authentication/login/keyScenarios.spec.js
index 5b53ac0..5f001b3 100644
--- a/e2e/specs/health-department/authentication/login/keyScenarios.spec.js
+++ b/e2e/specs/health-department/authentication/login/keyScenarios.spec.js
@@ -62,15 +62,13 @@ describe('Authentication', () => {
it('it should reject the key upload and a notification should show stating that a wrong key has been uploaded, after that the correct private key is being uploaded and a notification occurs stating the the private key has been successfully uploaded as well the modal should close', () => {
testSetup();
uploadWrongHealthDepartmentPrivateKeyFileTypeReUploadCorrectFile();
- cy.getByCy('header').within($header => {
- cy.contains('Health-Department')
- .should('exist')
- .should('be.visible');
- cy.get('.ant-dropdown-trigger')
- .should('exist')
- .should('be.enabled');
- cy.get('button').contains('LOG OUT').should('exist');
- });
+ cy.getByCy('header')
+ .contains('Health-Department')
+ .should('exist')
+ .should('be.visible');
+ cy.getByCy('linkMenu').should('exist').should('be.visible');
+ cy.get('button').contains('LOG OUT').should('exist');
+
cy.get('.ant-menu-horizontal').should('exist').should('be.visible');
cy.getByCy('navigation').should('exist').should('be.visible');
logout();
diff --git a/e2e/specs/health-department/authentication/login/secondTimeLogin.spec.js b/e2e/specs/health-department/authentication/login/secondTimeLogin.spec.js
index 38a2de9..f58ed63 100644
--- a/e2e/specs/health-department/authentication/login/secondTimeLogin.spec.js
+++ b/e2e/specs/health-department/authentication/login/secondTimeLogin.spec.js
@@ -1,25 +1,37 @@
-import { E2E_HEALTH_DEPARTMENT_USERNAME, E2E_HEALTH_DEPARTMENT_PASSWORD } from '../../helper/user';
+import {
+ E2E_HEALTH_DEPARTMENT_USERNAME,
+ E2E_HEALTH_DEPARTMENT_PASSWORD,
+} from '../../helper/user';
import { logout } from '../../helper/api/auth.helper';
-import { loginToHD, openHDLoginPage, addHealthDepartmentPrivateKeyFile } from '../../helper/ui/login.helper';
+import {
+ loginToHD,
+ openHDLoginPage,
+ addHealthDepartmentPrivateKeyFile,
+} from '../../helper/ui/login.helper';
describe('Autentication', () => {
describe('Health Department / Authentication / Login', () => {
describe('when a user login for the second time', () => {
it('ask to upload private key and redirect to tracking page', () => {
openHDLoginPage();
- loginToHD(E2E_HEALTH_DEPARTMENT_USERNAME, E2E_HEALTH_DEPARTMENT_PASSWORD);
+ loginToHD(
+ E2E_HEALTH_DEPARTMENT_USERNAME,
+ E2E_HEALTH_DEPARTMENT_PASSWORD
+ );
cy.contains('Wrong Email or password').should('not.exist');
cy.url().should('include', '/app/tracking');
addHealthDepartmentPrivateKeyFile();
- cy.getByCy('header').within(($header) => {
- cy.contains('Health-Department').should('exist').should('be.visible');
- cy.get('.ant-dropdown-trigger').should('exist').should('be.enabled');
- cy.get('button').contains('LOG OUT').should('exist');
- });
+ cy.getByCy('header')
+ .contains('Health-Department')
+ .should('exist')
+ .should('be.visible');
+ cy.getByCy('linkMenu').should('exist').should('be.visible');
+ cy.get('button').contains('LOG OUT').should('exist');
+
cy.get('.ant-menu-horizontal').should('exist').should('be.visible');
cy.getByCy('navigation').should('exist').should('be.visible');
logout();
});
});
});
-})
+});
diff --git a/e2e/specs/locations/authentication/logout/logout.spec.js b/e2e/specs/locations/authentication/logout/logout.spec.js
index ca6de4a..b8f81f2 100644
--- a/e2e/specs/locations/authentication/logout/logout.spec.js
+++ b/e2e/specs/locations/authentication/logout/logout.spec.js
@@ -5,7 +5,7 @@ describe('Logout', () => {
it('logs the user out', () => {
cy.getByCy('createGroup').should('exist');
cy.getByCy('dropdownMenuTrigger').click();
- cy.getByCy('dropdownMenu').contains('Log out').click({ force: true });
+ cy.getByCy('logout').click();
cy.getByCy('loginPage').should('exist');
cy.get('#email').should('exist');
});
diff --git a/e2e/specs/locations/downloadPDF/downloadPDF.spec.js b/e2e/specs/locations/downloadPDF/downloadPDF.spec.js
index 9cb9fee..1a29295 100644
--- a/e2e/specs/locations/downloadPDF/downloadPDF.spec.js
+++ b/e2e/specs/locations/downloadPDF/downloadPDF.spec.js
@@ -1,4 +1,14 @@
import { login } from '../helpers/functions';
+
+import {
+ openCreateGroupModal,
+ selectGroupType,
+ setGroupName,
+ setGroupAddress,
+ setGroupPhone,
+ setGroupIndoorSelection,
+} from '../helpers/createGroup.helper';
+
import {
RESTAURANT_ADDRESS,
RESTAURANT_NAME,
@@ -16,16 +26,16 @@ describe('Download QR Codes PDF', { retries: 3 }, () => {
describe('On Group creation', () => {
it('downloads the Group PDF', () => {
- cy.getByCy('createGroup').click();
- cy.getByCy('restaurant').click();
- cy.get('#groupName', { timeout: 20000 }).type(RESTAURANT_NAME);
- cy.get('form').submit();
- cy.get('#locationSearch').type(RESTAURANT_ADDRESS);
- cy.get('.pac-container > div:first-of-type').click({ force: true });
+ openCreateGroupModal();
+ selectGroupType('restaurant');
+ setGroupName(RESTAURANT_NAME);
+ setGroupAddress(RESTAURANT_ADDRESS);
+ // Proceed
cy.getByCy('proceed').click();
- cy.get('#phone').type(RESTAURANT_PHONE);
- cy.get('form').submit();
- cy.get('form').submit();
+ setGroupPhone(RESTAURANT_PHONE);
+ // Proceed by skipping average checkin time
+ cy.getByCy('nextStep').click();
+ setGroupIndoorSelection();
cy.getByCy('no').click();
cy.getByCy('no').click();
cy.getByCy('finishGroupCreation').click();
@@ -52,6 +62,7 @@ describe('Download QR Codes PDF', { retries: 3 }, () => {
cy.getByCy('yes').click();
cy.get('#phone').type(RESTAURANT_PHONE);
cy.getByCy('nextStep').click();
+ cy.getByCy('nextStep').click();
cy.getByCy('indoorSelection').click();
cy.getByCy('selectIndoor').click();
cy.get('button[type=submit]').click();
diff --git a/e2e/specs/locations/group/change/changeGroup.spec.js b/e2e/specs/locations/group/change/changeGroup.spec.js
index 77ec2d7..aed67e1 100644
--- a/e2e/specs/locations/group/change/changeGroup.spec.js
+++ b/e2e/specs/locations/group/change/changeGroup.spec.js
@@ -1,20 +1,74 @@
-import { login } from '../../helpers/functions';
+import {
+ createGroup,
+ deleteGroup,
+ login,
+ logout,
+ resetGroups,
+} from '../../helpers/functions';
import {
E2E_DEFAULT_LOCATION_GROUP,
- E2E_LOCATION_GROUP_2,
+ E2E_DEFAULT_LOCATION_GROUP_2,
E2E_DEFAULT_GROUP_NAME,
E2E_GROUP_NAME_2,
} from '../../helpers/locations';
+import { createGroupPayload } from '../../helpers/functions.helper';
+
+const GROUPS = [
+ 'Nexenio_3 e2e',
+ 'Nexenio_4 e2e',
+];
+const GROUP_IDS = [];
describe('Change groups', () => {
+ before(() => {
+ login();
+ resetGroups();
+ logout();
+ });
beforeEach(() => login());
+
it('can change groups', () => {
cy.getByCy('groupName').should('contain', E2E_DEFAULT_GROUP_NAME);
cy.getByCy('selectGroupDropdown').click();
- cy.getByCy(`groupItem-${E2E_LOCATION_GROUP_2}`).click();
+ cy.getByCy(`groupItem-${E2E_DEFAULT_LOCATION_GROUP_2}`).click();
cy.getByCy('groupName').should('contain', E2E_GROUP_NAME_2);
cy.getByCy('selectGroupDropdown').click();
cy.getByCy(`groupItem-${E2E_DEFAULT_LOCATION_GROUP}`).click();
cy.getByCy('groupName').should('contain', E2E_DEFAULT_GROUP_NAME);
});
+
+ describe('when searchable select is present', () => {
+ before(() => {
+ login();
+ GROUPS.forEach(group => {
+ createGroup({ ...createGroupPayload, name: group });
+ cy.get('@groupId').then(groupId => {
+ GROUP_IDS.push(groupId);
+ });
+ });
+ logout();
+ });
+ after(() => {
+ login();
+ GROUP_IDS.forEach(id => deleteGroup(id));
+ });
+
+ it('can change groups in select', () => {
+ cy.getByCy('groupName').should('contain', E2E_DEFAULT_GROUP_NAME);
+ cy.getByCy('selectGroupDropdown').click();
+ cy.getByCy('groupSelect').click();
+ cy.getByCy(`groupItem-${E2E_DEFAULT_LOCATION_GROUP_2}`).click();
+ cy.getByCy('groupName').should('contain', E2E_GROUP_NAME_2);
+ cy.getByCy('selectGroupDropdown').click();
+ cy.getByCy('groupSelect').click();
+ cy.getByCy(`groupItem-${E2E_DEFAULT_LOCATION_GROUP}`).click();
+ cy.getByCy('groupName').should('contain', E2E_DEFAULT_GROUP_NAME);
+ });
+
+ it('can search for groups', () => {
+ cy.getByCy('selectGroupDropdown').click();
+ cy.getByCy('groupSelect').type(`${E2E_GROUP_NAME_2}{enter}`);
+ cy.getByCy('groupName').should('contain', E2E_GROUP_NAME_2);
+ });
+ });
});
diff --git a/e2e/specs/locations/group/create/createHotelAndBase.spec.js b/e2e/specs/locations/group/create/createHotelAndBase.spec.js
index 935e982..0881103 100644
--- a/e2e/specs/locations/group/create/createHotelAndBase.spec.js
+++ b/e2e/specs/locations/group/create/createHotelAndBase.spec.js
@@ -1,5 +1,17 @@
import { login } from '../../helpers/functions';
-import { checkRadiusInput } from '../../helpers/inputValidation.helper';
+
+import {
+ openCreateGroupModal,
+ selectGroupType,
+ setGroupName,
+ setGroupAddress,
+ setGroupPhone,
+ setGroupArea,
+ setGroupRadius,
+ checkForExistingFields,
+ checkForDisabledFields,
+ addressFields,
+} from '../../helpers/createGroup.helper';
const HOTEL_NAME = 'Test Hotel';
const HOTEL_ADDRESS = 'Nexenio';
@@ -14,51 +26,19 @@ describe('Group creation', () => {
beforeEach(() => login());
describe('Create hotel or base type', () => {
it('creates group of type hotel', { retries: 3 }, () => {
- // Modal create group modal
- cy.getByCy('createGroup').should('exist');
- cy.getByCy('createGroup').click();
- // Select hotel
- cy.getByCy('hotel').click();
- // Enter name
- cy.get('#groupName').type(HOTEL_NAME);
- // Proceed
- cy.get('button[type=submit]').click();
- // Enter location
- cy.get('#locationSearch').type(HOTEL_ADDRESS);
- // Select from googleApi
- cy.get('.pac-container > div:first-of-type', { timeout: 6000 }).should(
- 'be.visible'
- );
- cy.get('.pac-container > div:first-of-type').click();
- // Expect fields to be filled out and disabled
- cy.get('#streetName').should('exist');
- cy.get('#streetNr').should('exist');
- cy.get('#zipCode').should('exist');
- cy.get('#city').should('exist');
- cy.get('#streetName').should('be.disabled');
- cy.get('#streetNr').should('be.disabled');
- cy.get('#zipCode').should('be.disabled');
- cy.get('#city').should('be.disabled');
+ openCreateGroupModal();
+ selectGroupType('hotel');
+ setGroupName(HOTEL_NAME);
+ setGroupAddress(HOTEL_ADDRESS);
+ checkForExistingFields(addressFields);
+ checkForDisabledFields(addressFields);
// Proceed
cy.getByCy('proceed').click();
- // Enter phone
- cy.get('#phone').type(HOTEL_PHONE);
- // Proceed
- cy.get('button[type=submit]').click();
- // Select more areas
- cy.getByCy('yes').click();
- cy.getByCy('areaNameInput').type(HOTEL_AREA);
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- // Proceed
- cy.get('button[type=submit]').click();
- // Select automatic checkout
- cy.getByCy('yes').click();
- // Enter radius
- checkRadiusInput();
- cy.get('#radius').clear().type(HOTEL_RADIUS);
- // Proceed
- cy.get('button[type=submit]').click();
+ setGroupPhone(HOTEL_PHONE);
+ // Proceed by skipping average checkin time
+ cy.getByCy('nextStep').click();
+ setGroupArea(HOTEL_AREA);
+ setGroupRadius(HOTEL_RADIUS);
// Create group
cy.getByCy('finishGroupCreation').click();
// No qr download
@@ -70,49 +50,19 @@ describe('Group creation', () => {
cy.contains('#groupList', HOTEL_AREA);
});
it('creates group of type base', { retries: 3 }, () => {
- // Modal create group modal
- cy.getByCy('createGroup').should('exist');
- cy.getByCy('createGroup').click();
- // Select base
- cy.getByCy('base').click();
- // Enter name
- cy.get('#groupName').type(BASE_NAME);
- // Proceed
- cy.get('button[type=submit]').click();
- // Enter location
- cy.get('#locationSearch').type(HOTEL_ADDRESS);
- // Select from googleApi
- cy.get('.pac-container > div:first-of-type').should('be.visible');
- cy.get('.pac-container > div:first-of-type').click();
- // Expect fields to be filled out and disabled
- cy.get('#streetName').should('exist');
- cy.get('#streetNr').should('exist');
- cy.get('#zipCode').should('exist');
- cy.get('#city').should('exist');
- cy.get('#streetName').should('be.disabled');
- cy.get('#streetNr').should('be.disabled');
- cy.get('#zipCode').should('be.disabled');
- cy.get('#city').should('be.disabled');
+ openCreateGroupModal();
+ selectGroupType('base');
+ setGroupName(BASE_NAME);
+ setGroupAddress(HOTEL_ADDRESS);
+ checkForExistingFields(addressFields);
+ checkForDisabledFields(addressFields);
// Proceed
cy.getByCy('proceed').click();
- // Enter phone
- cy.get('#phone').type(HOTEL_PHONE);
- // Proceed
- cy.get('button[type=submit]').click();
- // Select more areas
- cy.getByCy('yes').click();
- cy.getByCy('areaNameInput').type(BASE_AREA);
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- // Proceed
- cy.get('button[type=submit]').click();
- // Select automatic checkout
- cy.getByCy('yes').click();
- // Enter radius
- checkRadiusInput();
- cy.get('#radius').clear().type(HOTEL_RADIUS);
- // Proceed
- cy.get('button[type=submit]').click();
+ setGroupPhone(HOTEL_PHONE);
+ // Proceed by skipping average checkin time
+ cy.getByCy('nextStep').click();
+ setGroupArea(BASE_AREA);
+ setGroupRadius(HOTEL_RADIUS);
// Create group
cy.getByCy('finishGroupCreation').click();
// No qr download
diff --git a/e2e/specs/locations/group/create/createNursingHome.spec.js b/e2e/specs/locations/group/create/createNursingHome.spec.js
index 72f7b47..d5122f0 100644
--- a/e2e/specs/locations/group/create/createNursingHome.spec.js
+++ b/e2e/specs/locations/group/create/createNursingHome.spec.js
@@ -1,5 +1,16 @@
import { login } from '../../helpers/functions';
-import { checkRadiusInput } from '../../helpers/inputValidation.helper';
+
+import {
+ openCreateGroupModal,
+ selectGroupType,
+ setGroupName,
+ setGroupAddress,
+ setGroupPhone,
+ setGroupRadius,
+ checkForExistingFields,
+ checkForDisabledFields,
+ addressFields,
+} from '../../helpers/createGroup.helper';
const NURSING_HOME_NAME = 'Test Nursing Home';
const NURSING_HOME_ADDRESS = 'Nexenio';
@@ -9,44 +20,20 @@ describe('Group creation', () => {
beforeEach(() => login());
describe('Create Nursing Home', () => {
it('creates group of type nursing_home', { retries: 3 }, () => {
- // Modal create group modal
- cy.getByCy('createGroup').should('exist');
- cy.getByCy('createGroup').click();
- // Select nursing home
- cy.getByCy('nursing_home').click();
- // Enter name
- cy.get('#groupName').type(NURSING_HOME_NAME);
- // Proceed
- cy.get('button[type=submit]').click();
- // Enter location
- cy.get('#locationSearch').type(NURSING_HOME_ADDRESS);
- // Select from googleApi
- cy.get('.pac-container > div:first-of-type').should('be.visible');
- cy.get('.pac-container > div:first-of-type').click();
- // Expect fields to be filled out and disabled
- cy.get('#streetName').should('exist');
- cy.get('#streetNr').should('exist');
- cy.get('#zipCode').should('exist');
- cy.get('#city').should('exist');
- cy.get('#streetName').should('be.disabled');
- cy.get('#streetNr').should('be.disabled');
- cy.get('#zipCode').should('be.disabled');
- cy.get('#city').should('be.disabled');
+ openCreateGroupModal();
+ selectGroupType('nursing_home');
+ setGroupName(NURSING_HOME_NAME);
+ setGroupAddress(NURSING_HOME_ADDRESS);
+ checkForExistingFields(addressFields);
+ checkForDisabledFields(addressFields);
// Proceed
cy.getByCy('proceed').click();
- // Enter phone
- cy.get('#phone').type(NURSING_HOME_PHONE);
- // Proceed
- cy.get('button[type=submit]').click();
+ setGroupPhone(NURSING_HOME_PHONE);
+ // Proceed by skipping average checkin time
+ cy.getByCy('nextStep').click();
// Select post checkin questions
cy.getByCy('yes').click();
- // Select automatic checkout
- cy.getByCy('yes').click();
- // Enter radius
- checkRadiusInput();
- cy.get('#radius').clear().type(NURSING_HOME_RADIUS);
- // Proceed
- cy.get('button[type=submit]').click();
+ setGroupRadius(NURSING_HOME_RADIUS);
// Create group
cy.getByCy('finishGroupCreation').click();
// No qr download
diff --git a/e2e/specs/locations/group/create/createRestaurant.spec.js b/e2e/specs/locations/group/create/createRestaurant.spec.js
index 6b17576..1fa8f86 100644
--- a/e2e/specs/locations/group/create/createRestaurant.spec.js
+++ b/e2e/specs/locations/group/create/createRestaurant.spec.js
@@ -1,5 +1,18 @@
import { login } from '../../helpers/functions';
-import { checkRadiusInput } from '../../helpers/inputValidation.helper';
+import {
+ openCreateGroupModal,
+ selectGroupType,
+ setGroupName,
+ setGroupAddress,
+ setGroupPhone,
+ setGroupTables,
+ setGroupRadius,
+ setGroupIndoorSelection,
+ checkForExistingFields,
+ checkForDisabledFields,
+ addressFields,
+} from '../../helpers/createGroup.helper';
+
import {
RESTAURANT_NAME,
RESTAURANT_ADDRESS,
@@ -12,54 +25,20 @@ describe('Group creation', () => {
describe('Create Restaurant', () => {
beforeEach(() => login());
it('creates group of type restaurant', { retries: 3 }, () => {
- // Modal create group modal
- cy.getByCy('createGroup').should('exist');
- cy.getByCy('createGroup').click();
- // Select restaurant
- cy.getByCy('restaurant').click();
- // Enter name
- cy.get('#groupName').type(RESTAURANT_NAME);
- // Proceed
- cy.get('button[type=submit]').click();
- // Enter location
- cy.get('#locationSearch').type(RESTAURANT_ADDRESS);
- // Select from googleApi
- cy.get('.pac-container > div:first-of-type', { timeout: 4000 }).should(
- 'be.visible'
- );
- cy.get('.pac-container > div:first-of-type').click();
- // Expect fields to be filled out and disabled
- cy.get('#streetName').should('exist');
- cy.get('#streetNr').should('exist');
- cy.get('#zipCode').should('exist');
- cy.get('#city').should('exist');
- cy.get('#streetName').should('be.disabled');
- cy.get('#streetNr').should('be.disabled');
- cy.get('#zipCode').should('be.disabled');
- cy.get('#city').should('be.disabled');
+ openCreateGroupModal();
+ selectGroupType('restaurant');
+ setGroupName(RESTAURANT_NAME);
+ setGroupAddress(RESTAURANT_ADDRESS);
+ checkForExistingFields(addressFields);
+ checkForDisabledFields(addressFields);
// Proceed
cy.getByCy('proceed').click();
- // Enter phone
- cy.get('#phone').type(RESTAURANT_PHONE);
- // Proceed
- cy.get('button[type=submit]').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
- // Select tables
- cy.getByCy('yes').click();
- // Enter tables
- cy.get('#tableCount').type(RESTAURANT_TABLE_COUNT);
- // Proceed
- cy.get('button[type=submit]').click();
- // Select automatic checkout
- cy.getByCy('yes').click();
- // Enter radius
- checkRadiusInput();
- cy.get('#radius').clear().type(RESTAURANT_RADIUS);
- // Proceed
- cy.get('button[type=submit]').click();
+ setGroupPhone(RESTAURANT_PHONE);
+ // Proceed by skipping average checkin time
+ cy.getByCy('nextStep').click();
+ setGroupIndoorSelection();
+ setGroupTables(RESTAURANT_TABLE_COUNT);
+ setGroupRadius(RESTAURANT_RADIUS);
// Create group
cy.getByCy('finishGroupCreation').click();
// No qr download
diff --git a/e2e/specs/locations/group/create/createWithManuelAddressInput.spec.js b/e2e/specs/locations/group/create/createWithManuelAddressInput.spec.js
index 1965bd2..741584d 100644
--- a/e2e/specs/locations/group/create/createWithManuelAddressInput.spec.js
+++ b/e2e/specs/locations/group/create/createWithManuelAddressInput.spec.js
@@ -1,5 +1,17 @@
import { login } from '../../helpers/functions';
+import {
+ openCreateGroupModal,
+ selectGroupType,
+ setGroupName,
+ setGroupArea,
+ setGroupPhone,
+ setGroupManualAddress,
+ checkForExistingFields,
+ checkForNonDisabledFields,
+ addressFields,
+} from '../../helpers/createGroup.helper';
+
const HOTEL_PHONE = '+4917612345678';
const BASE_NAME = 'Test Group';
@@ -13,44 +25,18 @@ const STATE = 'Berlin';
describe('Group creation with manuell input', () => {
beforeEach(() => login());
it('creates group of type base', () => {
- // Modal create group modal
- cy.getByCy('createGroup').should('exist');
- cy.getByCy('createGroup').click();
- // Select base
- cy.getByCy('base').click();
- // Enter name
- cy.get('#groupName').type(BASE_NAME);
- // Proceed
- cy.get('button[type=submit]').click();
- // Select manuell search
- cy.getByCy('manuellSearch').click();
- // Expect fields to be not disabled
- cy.get('#streetName').should('exist');
- cy.get('#streetNr').should('exist');
- cy.get('#zipCode').should('exist');
- cy.get('#city').should('exist');
- cy.get('#streetName').should('not.be.disabled');
- cy.get('#streetNr').should('not.be.disabled');
- cy.get('#zipCode').should('not.be.disabled');
- cy.get('#city').should('not.be.disabled');
- // Type address
- cy.get('#streetName').type(STREET);
- cy.get('#streetNr').type(STREET_NR);
- cy.get('#zipCode').type(ZIP);
- cy.get('#city').type(STATE);
- // Proceed
- cy.getByCy('proceed').click();
- // Enter phone
- cy.get('#phone').type(HOTEL_PHONE);
- // Proceed
- cy.get('button[type=submit]').click();
- // Select more areas
- cy.getByCy('yes').click();
- cy.getByCy('areaNameInput').type(BASE_AREA);
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- // Proceed
- cy.get('button[type=submit]').click();
+ openCreateGroupModal();
+ selectGroupType('base');
+ setGroupName(BASE_NAME);
+ // Decline Google API
+ cy.getByCy('no').click();
+ checkForExistingFields(addressFields);
+ checkForNonDisabledFields(addressFields);
+ setGroupManualAddress(STREET, STREET_NR, ZIP, STATE);
+ setGroupPhone(HOTEL_PHONE);
+ // Proceed by skipping average checkin time
+ cy.getByCy('nextStep').click();
+ setGroupArea(BASE_AREA);
// Create group
cy.getByCy('finishGroupCreation').click();
// No qr download
diff --git a/e2e/specs/locations/helpers/createGroup.helper.js b/e2e/specs/locations/helpers/createGroup.helper.js
new file mode 100644
index 0000000..d8fde84
--- /dev/null
+++ b/e2e/specs/locations/helpers/createGroup.helper.js
@@ -0,0 +1,93 @@
+import { checkRadiusInput } from './inputValidation.helper';
+
+export const addressFields = ['#streetName', '#streetNr', '#zipCode', '#city'];
+
+export const openCreateGroupModal = () => {
+ // Modal create group modal
+ cy.getByCy('createGroup').should('exist');
+ cy.getByCy('createGroup').click();
+};
+
+export const selectGroupType = type => {
+ // Select hotel
+ cy.getByCy(type).click();
+};
+
+export const setGroupName = name => {
+ // Enter name
+ cy.get('#groupName').type(name);
+ // Proceed
+ cy.get('button[type=submit]').click();
+};
+
+export const setGroupAddress = address => {
+ // Accept Google API
+ cy.getByCy('yes').click();
+ // Enter location
+ cy.get('#locationSearch').type(address);
+ // Select from googleApi
+ cy.get('.pac-container > div:first-of-type', { timeout: 6000 }).should(
+ 'be.visible'
+ );
+ cy.get('.pac-container > div:first-of-type').click();
+};
+
+export const setGroupTables = tableCount => {
+ // Select tables
+ cy.getByCy('yes').click();
+ // Enter tables
+ cy.get('#tableCount').type(tableCount);
+ // Proceed
+ cy.get('button[type=submit]').click();
+};
+
+export const checkForExistingFields = fields =>
+ fields.map(field => cy.get(field).should('exist'));
+
+export const checkForDisabledFields = fields =>
+ fields.map(field => cy.get(field).should('be.disabled'));
+
+export const checkForNonDisabledFields = fields =>
+ fields.map(field => cy.get(field).should('not.be.disabled'));
+
+export const setGroupPhone = number => {
+ // Enter phone
+ cy.get('#phone').type(number);
+ // Proceed
+ cy.get('button[type=submit]').click();
+};
+
+export const setGroupIndoorSelection = () => {
+ // Select indoor
+ cy.getByCy('indoorSelection').click();
+ cy.getByCy('selectIndoor').click();
+ // Proceed
+ cy.get('button[type=submit]').click();
+};
+
+export const setGroupArea = areaName => {
+ // Select more areas
+ cy.getByCy('yes').click();
+ cy.getByCy('areaNameInput').type(areaName);
+ setGroupIndoorSelection();
+};
+
+export const setGroupRadius = radius => {
+ // Select automatic checkout
+ cy.getByCy('yes').click();
+ // Enter radius
+ checkRadiusInput();
+ cy.get('#radius').clear().type(radius);
+ // Proceed
+ cy.get('button[type=submit]').click();
+};
+
+export const setGroupManualAddress = (street, streetNr, zip, state) => {
+ // Type address
+ cy.get('#streetName').type(street);
+ cy.get('#streetNr').type(streetNr);
+ cy.get('#zipCode').type(zip);
+ cy.get('#city').type(state);
+ // Proceed
+ cy.getByCy('proceed').click();
+};
diff --git a/e2e/specs/locations/helpers/createLocation.helper.js b/e2e/specs/locations/helpers/createLocation.helper.js
new file mode 100644
index 0000000..a374b73
--- /dev/null
+++ b/e2e/specs/locations/helpers/createLocation.helper.js
@@ -0,0 +1,40 @@
+import { checkRadiusInput } from './inputValidation.helper';
+
+export const openCreateLocationModal = group => {
+ // Modal create location modal
+ cy.getByCy(`createLocation-${group}`).click();
+};
+
+export const selectLocationType = type => {
+ cy.getByCy(type).click();
+};
+
+export const setLocationName = name => {
+ cy.get('#locationName').type(name);
+ cy.getByCy('nextStep').click();
+};
+
+export const setLocationPhone = phone => {
+ cy.get('#phone').type(phone);
+ cy.getByCy('nextStep').click();
+};
+
+export const setLocationIndoorSelection = () => {
+ // Select indoor
+ cy.getByCy('indoorSelection').click();
+ cy.getByCy('selectIndoor').click();
+ cy.get('button[type=submit]').click();
+};
+
+export const setLocationTableCount = count => {
+ cy.get('#tableCount').type(count);
+ cy.getByCy('nextStep').click();
+};
+
+export const setLocationRadius = radius => {
+ // Invalid radius input: empty, under 50 or over 5000
+ checkRadiusInput();
+ // Valid radius input
+ cy.get('#radius').clear().type(radius);
+ cy.getByCy('nextStep').click();
+};
diff --git a/e2e/specs/locations/helpers/functions.js b/e2e/specs/locations/helpers/functions.js
index caa0e63..8831e86 100644
--- a/e2e/specs/locations/helpers/functions.js
+++ b/e2e/specs/locations/helpers/functions.js
@@ -3,6 +3,7 @@ import { E2E_EMAIL, E2E_PASSWORD, E2E_LASTNAME, E2E_FIRSTNAME } from './users';
import {
E2E_DEFAULT_LOCATION_GROUP,
E2E_DEFAULT_GROUP_NAME,
+ E2E_DEFAULT_LOCATION_GROUP_2,
} from './locations';
import {
createGroupPayload,
@@ -105,6 +106,17 @@ export const createGroup = (group = createGroupPayload, redirect = true) => {
);
};
+export const resetGroups = () => {
+ cy.request('GET', `${LOCATION_GROUPS_ROUTE}/`).then(async response => {
+ const deletableGroups = response.body.filter(
+ group =>
+ group.groupId !== E2E_DEFAULT_LOCATION_GROUP &&
+ group.groupId !== E2E_DEFAULT_LOCATION_GROUP_2
+ );
+ deletableGroups.forEach(group => deleteGroup(group.groupId));
+ });
+};
+
export const deleteGroup = groupId => {
return cy.request('DELETE', `api/v3/locationGroups/${groupId}`);
};
diff --git a/e2e/specs/locations/helpers/locations.js b/e2e/specs/locations/helpers/locations.js
index 023dd9d..00fc9dd 100644
--- a/e2e/specs/locations/helpers/locations.js
+++ b/e2e/specs/locations/helpers/locations.js
@@ -1,6 +1,6 @@
export const E2E_DEFAULT_LOCATION_GROUP =
'c951f526-f792-498b-838f-7d1312a792a1';
-export const E2E_LOCATION_GROUP_2 = 'c951f526-f792-498b-838f-7d1312a792a2';
+export const E2E_DEFAULT_LOCATION_GROUP_2 = 'c951f526-f792-498b-838f-7d1312a792a2';
export const E2E_DEFAULT_GROUP_NAME = 'Nexenio_1 e2e';
export const E2E_GROUP_NAME_2 = 'Nexenio_2 e2e';
diff --git a/e2e/specs/locations/location/create/createBase.spec.js b/e2e/specs/locations/location/create/createBase.spec.js
index dd8fcd5..e0e76c4 100644
--- a/e2e/specs/locations/location/create/createBase.spec.js
+++ b/e2e/specs/locations/location/create/createBase.spec.js
@@ -7,22 +7,29 @@ import {
BASE_TYPE,
} from '../../helpers/locations';
import {
- checkRadiusInput,
defaultLocationNameShouldBeRejected,
checkLocationNameIsUnique,
} from '../../helpers/inputValidation.helper';
+import {
+ openCreateLocationModal,
+ selectLocationType,
+ setLocationName,
+ setLocationPhone,
+ setLocationIndoorSelection,
+ setLocationRadius,
+} from '../../helpers/createLocation.helper';
context('Create base location', () => {
describe('Location name validation', () => {
beforeEach(() => login());
it('checks if the location name is the default name', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BASE_TYPE);
defaultLocationNameShouldBeRejected();
});
it('checks if the location name is unique', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BASE_TYPE);
checkLocationNameIsUnique();
});
});
@@ -32,47 +39,45 @@ context('Create base location', () => {
afterEach(() => removeLocation(NEW_BASE_LOCATION));
describe('Without extra information', () => {
it('generate location without auto checkout', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
- cy.get('#locationName').type(NEW_BASE_LOCATION);
- cy.getByCy('nextStep').click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BASE_TYPE);
+ setLocationName(NEW_BASE_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
+ setLocationIndoorSelection();
+ // Disable auto checkout
cy.getByCy('no').click();
+ // Create location
cy.getByCy('done').click();
- cy.getByCy('yes').click();
- cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_BASE_LOCATION}`);
});
});
describe('With auto checkout', () => {
it('generate new location', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
- cy.get('#locationName').type(NEW_BASE_LOCATION);
- cy.getByCy('nextStep').click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BASE_TYPE);
+ setLocationName(NEW_BASE_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
- cy.getByCy('yes').click();
- // Invalid radius input: empty, under 50 or over 5000
- checkRadiusInput();
- // Valid radius input
- cy.get('#radius').clear().type(100);
- cy.getByCy('nextStep').click();
- cy.getByCy('done').click();
+ setLocationIndoorSelection();
+ // Enable auto checkout
cy.getByCy('yes').click();
+ setLocationRadius(100);
+ // Create location
cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_BASE_LOCATION}`);
});
});
diff --git a/e2e/specs/locations/location/create/createBuilding.spec.js b/e2e/specs/locations/location/create/createBuilding.spec.js
index 224a8cc..3ea7745 100644
--- a/e2e/specs/locations/location/create/createBuilding.spec.js
+++ b/e2e/specs/locations/location/create/createBuilding.spec.js
@@ -3,27 +3,34 @@ import { removeLocation } from '../location.helper';
import { E2E_PHONE_NUMBER } from '../../helpers/users';
import {
E2E_DEFAULT_LOCATION_GROUP,
- BASE_TYPE,
NEW_BUILDING_LOCATION,
BUILDING_TYPE,
} from '../../helpers/locations';
import {
- checkRadiusInput,
defaultLocationNameShouldBeRejected,
checkLocationNameIsUnique,
} from '../../helpers/inputValidation.helper';
+import {
+ openCreateLocationModal,
+ selectLocationType,
+ setLocationName,
+ setLocationPhone,
+ setLocationIndoorSelection,
+ setLocationRadius,
+} from '../../helpers/createLocation.helper';
+
context('Create building location', () => {
describe('Location name validation', () => {
beforeEach(() => login());
it('checks if the location name is the default name', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BUILDING_TYPE);
defaultLocationNameShouldBeRejected();
});
it('checks if the location name is unique', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BUILDING_TYPE);
checkLocationNameIsUnique();
});
});
@@ -36,45 +43,44 @@ context('Create building location', () => {
it('generate location without auto checkout', () => {
cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
cy.getByCy(BUILDING_TYPE).click();
- cy.get('#locationName').type(NEW_BUILDING_LOCATION);
- cy.getByCy('nextStep').click();
+ setLocationName(NEW_BUILDING_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
+ setLocationIndoorSelection();
+ // Disable auto checkout
cy.getByCy('no').click();
+ // Create location
cy.getByCy('done').click();
- cy.getByCy('yes').click();
- cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_BUILDING_LOCATION}`);
});
});
describe('With auto checkout', () => {
it('generate new location', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
- cy.get('#locationName').type(NEW_BUILDING_LOCATION);
- cy.getByCy('nextStep').click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BUILDING_TYPE);
+ setLocationName(NEW_BUILDING_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
// Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
- cy.getByCy('yes').click();
- // Invalid radius input: empty, under 50 or over 5000
- checkRadiusInput();
- // Valid radius input
- cy.get('#radius').clear().type(100);
- cy.getByCy('nextStep').click();
- cy.getByCy('done').click();
+ setLocationIndoorSelection();
+ // Enable auto checkout
cy.getByCy('yes').click();
+ setLocationRadius(100);
+ // Create location
cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_BUILDING_LOCATION}`);
});
});
diff --git a/e2e/specs/locations/location/create/createRestaurant.spec.js b/e2e/specs/locations/location/create/createRestaurant.spec.js
index 913045b..7632c80 100644
--- a/e2e/specs/locations/location/create/createRestaurant.spec.js
+++ b/e2e/specs/locations/location/create/createRestaurant.spec.js
@@ -7,22 +7,30 @@ import {
NEW_RESTAURANT_LOCATION,
} from '../../helpers/locations';
import {
- checkRadiusInput,
defaultLocationNameShouldBeRejected,
checkLocationNameIsUnique,
} from '../../helpers/inputValidation.helper';
+import {
+ openCreateLocationModal,
+ selectLocationType,
+ setLocationName,
+ setLocationPhone,
+ setLocationIndoorSelection,
+ setLocationTableCount,
+ setLocationRadius,
+} from '../../helpers/createLocation.helper';
context('Create restaurant location', () => {
describe('Location name validation', () => {
beforeEach(() => login());
it('checks if the location name is the default name', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(RESTAURANT_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(RESTAURANT_TYPE);
defaultLocationNameShouldBeRejected();
});
it('checks if the location name is unique', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(RESTAURANT_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(RESTAURANT_TYPE);
checkLocationNameIsUnique();
});
});
@@ -32,80 +40,73 @@ context('Create restaurant location', () => {
afterEach(() => removeLocation(NEW_RESTAURANT_LOCATION));
describe('Without extra information', () => {
it('generate location without tables and auto checkout', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- // Select type
- cy.getByCy(RESTAURANT_TYPE).click();
- // Enter name
- cy.get('#locationName').type(NEW_RESTAURANT_LOCATION);
- cy.getByCy('nextStep').click();
- // Same address
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(RESTAURANT_TYPE);
+ setLocationName(NEW_RESTAURANT_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- //Enter phone
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
- // Select tables
+ setLocationIndoorSelection();
+ // No tables
cy.getByCy('no').click();
- // Select automatic checkout
+ // Disable auto checkout
cy.getByCy('no').click();
- // Submit
- cy.getByCy('done').click();
- cy.getByCy('yes').click();
+ // Create location
cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_RESTAURANT_LOCATION}`);
});
});
describe('With tables', () => {
it('with tables', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(RESTAURANT_TYPE).click();
- cy.get('#locationName').type(NEW_RESTAURANT_LOCATION);
- cy.getByCy('nextStep').click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(RESTAURANT_TYPE);
+ setLocationName(NEW_RESTAURANT_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
+ setLocationIndoorSelection();
+ // Enable tables
cy.getByCy('yes').click();
- cy.get('#tableCount').type('10');
- cy.getByCy('nextStep').click();
+ setLocationTableCount('10');
+ // Disable auto checkout
cy.getByCy('no').click();
+ // Create location
cy.getByCy('done').click();
- cy.getByCy('yes').click();
- cy.getByCy('nextStep').click();
- cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_RESTAURANT_LOCATION}`);
});
});
describe('With auto checkout', () => {
it('generate location with auto checkout', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(RESTAURANT_TYPE).click();
- cy.get('#locationName').type(NEW_RESTAURANT_LOCATION);
- cy.getByCy('nextStep').click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(RESTAURANT_TYPE);
+ setLocationName(NEW_RESTAURANT_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
+ setLocationIndoorSelection();
+ // No tables
cy.getByCy('no').click();
+ // Enable auto checkout
cy.getByCy('yes').click();
- // Invalid radius input: empty, under 50 or over 5000
- checkRadiusInput();
- // Valid radius input
- cy.get('#radius').clear().type(100);
- cy.getByCy('nextStep').click();
- cy.getByCy('done').click();
- cy.getByCy('yes').click();
+ setLocationRadius(100);
+ // Create location
cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_RESTAURANT_LOCATION}`);
});
});
diff --git a/e2e/specs/locations/location/create/createRoom.spec.js b/e2e/specs/locations/location/create/createRoom.spec.js
index 19c6710..adbc47b 100644
--- a/e2e/specs/locations/location/create/createRoom.spec.js
+++ b/e2e/specs/locations/location/create/createRoom.spec.js
@@ -8,22 +8,29 @@ import {
ROOM_TYPE,
} from '../../helpers/locations';
import {
- checkRadiusInput,
defaultLocationNameShouldBeRejected,
checkLocationNameIsUnique,
} from '../../helpers/inputValidation.helper';
+import {
+ openCreateLocationModal,
+ selectLocationType,
+ setLocationName,
+ setLocationPhone,
+ setLocationIndoorSelection,
+ setLocationRadius,
+} from '../../helpers/createLocation.helper';
context('Create room location', () => {
describe('Location name validation', () => {
beforeEach(() => login());
it('checks if the location name is the default name', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BASE_TYPE);
defaultLocationNameShouldBeRejected();
});
it('checks if the location name is unique', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(BASE_TYPE);
checkLocationNameIsUnique();
});
});
@@ -34,47 +41,45 @@ context('Create room location', () => {
describe('Without extra information', () => {
it('generate location without auto checkout', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(ROOM_TYPE).click();
- cy.get('#locationName').type(NEW_ROOM_LOCATION);
- cy.getByCy('nextStep').click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(ROOM_TYPE);
+ setLocationName(NEW_ROOM_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
+ setLocationIndoorSelection();
+ // Disable auto checkout
cy.getByCy('no').click();
+ // Create location
cy.getByCy('done').click();
- cy.getByCy('yes').click();
- cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_ROOM_LOCATION}`);
});
});
describe('With auto checkout', () => {
it('generate new location', () => {
- cy.getByCy(`createLocation-${E2E_DEFAULT_LOCATION_GROUP}`).click();
- cy.getByCy(BASE_TYPE).click();
- cy.get('#locationName').type(NEW_ROOM_LOCATION);
- cy.getByCy('nextStep').click();
+ openCreateLocationModal(E2E_DEFAULT_LOCATION_GROUP);
+ selectLocationType(ROOM_TYPE);
+ setLocationName(NEW_ROOM_LOCATION);
+ // Keep address
cy.getByCy('yes').click();
- cy.get('#phone').type(E2E_PHONE_NUMBER);
+ setLocationPhone(E2E_PHONE_NUMBER);
+ // Proceed by skipping average checkin time
cy.getByCy('nextStep').click();
- // Select indoor
- cy.getByCy('indoorSelection').click();
- cy.getByCy('selectIndoor').click();
- cy.get('button[type=submit]').click();
- cy.getByCy('yes').click();
- // Invalid radius input: empty, under 50 or over 5000
- checkRadiusInput();
- // Valid radius input
- cy.get('#radius').clear().type(100);
- cy.getByCy('nextStep').click();
- cy.getByCy('done').click();
+ setLocationIndoorSelection();
+ // Enable auto checkout
cy.getByCy('yes').click();
+ setLocationRadius(100);
+ // Create location
cy.getByCy('done').click();
+ // No qr codes
+ cy.getByCy('no').click();
+ // Check if location got created
cy.getByCy(`location-${NEW_ROOM_LOCATION}`);
});
});
diff --git a/e2e/specs/webapp/checkin/checkinByLinkFlow.spec.js b/e2e/specs/webapp/checkin/checkinByLinkFlow.spec.js
index 5e9ec81..d6973a2 100644
--- a/e2e/specs/webapp/checkin/checkinByLinkFlow.spec.js
+++ b/e2e/specs/webapp/checkin/checkinByLinkFlow.spec.js
@@ -29,7 +29,7 @@ describe('WebApp / CheckIn', { retries: 3 }, () => {
});
after(() => {
basicLocationLogin(E2E_EMAIL, E2E_PASSWORD, false);
- cy.get('@groupId').then(groupId => {
+ cy.get('@groupId', { timeout: 10000 }).then(groupId => {
deleteGroup(groupId);
});
logout();
@@ -38,10 +38,10 @@ describe('WebApp / CheckIn', { retries: 3 }, () => {
describe('when an user checks in by link', () => {
it('opens the checkout screen', () => {
cy.visit(LOCATIONS_ROUTE);
- cy.get('@scannerId').then(scannerId => {
+ cy.get('@scannerId', { timeout: 10000 }).then(scannerId => {
cy.visit(`${WEBAPP_ROUTE}/${scannerId}`);
});
- cy.url({ timeout: 4000 }).should('contain', '/checkout');
+ cy.url({ timeout: 10000 }).should('contain', '/checkout');
cy.getByCy('locationName').should('contain', createGroupPayload.name);
// Simulate clock
@@ -60,7 +60,7 @@ describe('WebApp / CheckIn', { retries: 3 }, () => {
}
cy.getByCy('clockMinutes').should('contain', '02');
cy.getByCy('checkout').click().tick(1000);
- cy.url().should('not.contain', '/checkout');
+ cy.url({ timeout: 10000 }).should('not.contain', '/checkout');
cy.clock().then(clock => clock.restore());
});
});
diff --git a/package.json b/package.json
index 206a64d..2c4a817 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
- "version": "2.0.2",
"name": "@lucaapp/web",
+ "version": "2.1.0",
"private": true,
"license": "Apache-2.0",
"author": "Culture4Life <hello@luca-app.de> (https://www.luca-app.de/)",
@@ -43,8 +43,5 @@
"devDependencies": {
"husky": "6.0.0",
"lint-staged": "11.0.0"
- },
- "dependencies": {
- "@types/lodash": "4.14.172"
}
}
diff --git a/services/backend/config/custom-environment-variables.js b/services/backend/config/custom-environment-variables.js
index 0f3d822..7b18556 100644
--- a/services/backend/config/custom-environment-variables.js
+++ b/services/backend/config/custom-environment-variables.js
@@ -102,6 +102,8 @@ module.exports = {
'LOCATIONS_PRIVATE_POST_RATELIMIT_DAY',
locations_delete_ratelimit_day: 'LOCATIONS_DELETE_RATELIMIT_DAY',
operators_post_ratelimit_day: 'OPERATORS_POST_RATELIMIT_DAY',
+ operators_support_email_post_ratelimit_day:
+ 'OPERATORS_SUPPORT_MAIL_POSTRATELIMIT_DAY',
dummy_max_tracings: 'DUMMY_MAX_TRACINGS',
dummy_max_traces: 'DUMMY_MAX_TRACES',
badges_post_ratelimit_hour: 'BADGES_POST_RATELIMIT_HOUR',
diff --git a/services/backend/config/default.js b/services/backend/config/default.js
index 23d24a3..6096eb8 100644
--- a/services/backend/config/default.js
+++ b/services/backend/config/default.js
@@ -98,8 +98,7 @@ module.exports = {
maxRiskLevel: 2,
},
testRedeems: {
- defaultMaxAge: moment.duration(72, 'hours').as('hours'),
- maxAge: moment.duration(1, 'years').as('hours'),
+ maxAge: moment.duration(72, 'hours').as('hours'),
},
notificationChunks: {
initialChunkCoverage: moment.duration(14, 'days').as('hours'),
@@ -183,6 +182,7 @@ module.exports = {
locations_private_post_ratelimit_day: 100,
locations_delete_ratelimit_day: 1000,
operators_post_ratelimit_day: 10,
+ operators_support_email_post_ratelimit_day: 5,
dummy_max_tracings: 10,
dummy_max_traces: 20,
tests_redeem_post_ratelimit_minute: 50,
diff --git a/services/backend/package.json b/services/backend/package.json
index d95469b..97e91c1 100644
--- a/services/backend/package.json
+++ b/services/backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@lucaapp/backend",
- "version": "2.0.2",
+ "version": "2.1.0",
"private": true,
"license": "Apache-2.0",
"author": "Culture4Life <hello@luca-app.de> (https://www.luca-app.de/)",
@@ -31,6 +31,8 @@
"@types/etag": "1.8.1",
"@types/express": "4.17.13",
"@types/lodash": "4.14.172",
+ "@types/jsonwebtoken": "8.5.4",
+ "@types/node-forge": "0.10.3",
"@types/validator": "13.6.3",
"axios": "0.21.4",
"bloomit": "1.1.1",
@@ -66,6 +68,7 @@
"passport-local": "1.0.0",
"pg": "8.7.1",
"prom-client": "13.2.0",
+ "proxyquire": "2.1.3",
"rate-limit-redis": "2.1.0",
"redis": "3.1.2",
"response-time": "2.3.2",
diff --git a/services/backend/src/@types/express.d.ts b/services/backend/src/@types/express.d.ts
index 39dff8f..a6ad51c 100644
--- a/services/backend/src/@types/express.d.ts
+++ b/services/backend/src/@types/express.d.ts
@@ -7,6 +7,7 @@ interface IOperator extends IUser {
}
interface IHealthDepartmentEmployee extends IUser {
+ HealthDepartment: unknown;
departmentId: string;
isAdmin: boolean;
type: 'HealthDepartmentEmployeee';
diff --git a/services/backend/src/database/migrations/2021.08.05-0823-addSignedLocationTransfer.js b/services/backend/src/database/migrations/2021.08.05-0823-addSignedLocationTransfer.js
new file mode 100644
index 0000000..7a0ae21
--- /dev/null
+++ b/services/backend/src/database/migrations/2021.08.05-0823-addSignedLocationTransfer.js
@@ -0,0 +1,28 @@
+module.exports = {
+ up: async (queryInterface, Sequelize) => {
+ await queryInterface.sequelize.transaction(async transaction => {
+ await queryInterface.addColumn(
+ 'LocationTransfers',
+ 'signedLocationTransfer',
+ {
+ type: Sequelize.STRING(1024),
+ allowNull: true,
+ defaultValue: null,
+ },
+ { transaction }
+ );
+ });
+ },
+
+ down: async queryInterface => {
+ await queryInterface.sequelize.transaction(async transaction => {
+ await queryInterface.removeColumn(
+ 'LocationTransfers',
+ 'signedLocationTransfer',
+ {
+ transaction,
+ }
+ );
+ });
+ },
+};
diff --git a/services/backend/src/database/migrations/2021.08.26-1527-addAverageCheckinTimeAttributeToLocationsTable.js b/services/backend/src/database/migrations/2021.08.26-1527-addAverageCheckinTimeAttributeToLocationsTable.js
new file mode 100644
index 0000000..fc57fb9
--- /dev/null
+++ b/services/backend/src/database/migrations/2021.08.26-1527-addAverageCheckinTimeAttributeToLocationsTable.js
@@ -0,0 +1,12 @@
+module.exports = {
+ up: async (queryInterface, DataTypes) => {
+ await queryInterface.addColumn('Locations', 'averageCheckinTime', {
+ type: DataTypes.INTEGER,
+ defaultValue: null,
+ allowNull: true,
+ });
+ },
+ down: async queryInterface => {
+ return queryInterface.removeColumn('Locations', 'averageCheckinTime');
+ },
+};
diff --git a/services/backend/src/database/migrations/2021.09.02-1934-removeExpireAtAttributeFromTestRedeemsTable.js b/services/backend/src/database/migrations/2021.09.02-1934-removeExpireAtAttributeFromTestRedeemsTable.js
new file mode 100644
index 0000000..03eb3bd
--- /dev/null
+++ b/services/backend/src/database/migrations/2021.09.02-1934-removeExpireAtAttributeFromTestRedeemsTable.js
@@ -0,0 +1,11 @@
+module.exports = {
+ up: async queryInterface => {
+ await queryInterface.removeColumn('TestRedeems', 'expireAt');
+ },
+
+ down: async (queryInterface, Sequelize) => {
+ await queryInterface.addColumn('TestRedeems', 'expireAt', {
+ type: Sequelize.DATE,
+ });
+ },
+};
diff --git a/services/backend/src/database/migrations/2021.09.22-1629-updateNotificationMessagesConstraint.js b/services/backend/src/database/migrations/2021.09.22-1629-updateNotificationMessagesConstraint.js
new file mode 100644
index 0000000..ab2f760
--- /dev/null
+++ b/services/backend/src/database/migrations/2021.09.22-1629-updateNotificationMessagesConstraint.js
@@ -0,0 +1,33 @@
+module.exports = {
+ up: async queryInterface => {
+ await queryInterface.sequelize.transaction(async transaction => {
+ await queryInterface.removeConstraint(
+ 'NotificationMessages',
+ 'departmentId_level_language_unique',
+ { transaction }
+ );
+
+ await queryInterface.addConstraint('NotificationMessages', {
+ fields: ['departmentId', 'level', 'language', 'key'],
+ type: 'unique',
+ name: 'departmentId_level_language_unique',
+ transaction,
+ });
+ });
+ },
+ down: async queryInterface => {
+ await queryInterface.sequelize.transaction(async transaction => {
+ await queryInterface.removeConstraint(
+ 'NotificationMessages',
+ 'departmentId_level_language_unique',
+ { transaction }
+ );
+ await queryInterface.addConstraint('NotificationMessages', {
+ fields: ['departmentId', 'level', 'language'],
+ type: 'unique',
+ name: 'departmentId_level_language_unique',
+ transaction,
+ });
+ });
+ },
+};
diff --git a/services/backend/src/database/models/location.js b/services/backend/src/database/models/location.js
index 548c996..823759c 100644
--- a/services/backend/src/database/models/location.js
+++ b/services/backend/src/database/models/location.js
@@ -104,6 +104,11 @@ module.exports = (Sequelize, DataTypes) => {
allowNull: true,
defaultValue: 'other',
},
+ averageCheckinTime: {
+ type: DataTypes.INTEGER,
+ allowNull: true,
+ defaultValue: null,
+ },
},
{
paranoid: true,
diff --git a/services/backend/src/database/models/locationTransfer.js b/services/backend/src/database/models/locationTransfer.js
index 90dd320..2446037 100644
--- a/services/backend/src/database/models/locationTransfer.js
+++ b/services/backend/src/database/models/locationTransfer.js
@@ -34,6 +34,11 @@ module.exports = (Sequelize, DataTypes) => {
allowNull: true,
defaultValue: null,
},
+ signedLocationTransfer: {
+ type: DataTypes.STRING(1024),
+ allowNull: true,
+ defaultValue: null,
+ },
approvedAt: {
type: DataTypes.DATE,
allowNull: true,
diff --git a/services/backend/src/database/models/testRedeems.js b/services/backend/src/database/models/testRedeems.js
index bce8f5e..ff01847 100644
--- a/services/backend/src/database/models/testRedeems.js
+++ b/services/backend/src/database/models/testRedeems.js
@@ -9,8 +9,5 @@ module.exports = (Sequelize, DataTypes) => {
type: DataTypes.STRING(24),
allowNull: false,
},
- expireAt: {
- type: DataTypes.DATE,
- },
});
};
diff --git a/services/backend/src/routes/internal/jobs.js b/services/backend/src/routes/internal/jobs.js
index b0b3048..ab22ece 100644
--- a/services/backend/src/routes/internal/jobs.js
+++ b/services/backend/src/routes/internal/jobs.js
@@ -239,22 +239,12 @@ router.post('/addDummyTraces', async (request, response) => {
router.post('/deleteOldTestRedeems', async (request, response) => {
const t0 = performance.now();
- const defaultMaxAge = config.get('luca.testRedeems.defaultMaxAge');
+ const maxAge = config.get('luca.testRedeems.maxAge');
const affectedRows = await database.TestRedeem.destroy({
where: {
- [Op.or]: [
- {
- expireAt: {
- [Op.lt]: moment(),
- },
- },
- {
- expireAt: null,
- createdAt: {
- [Op.lt]: moment().subtract(defaultMaxAge, 'hours'),
- },
- },
- ],
+ createdAt: {
+ [Op.lt]: moment().subtract(maxAge, 'hours'),
+ },
},
});
response.send({ affectedRows, time: performance.now() - t0 });
@@ -299,7 +289,7 @@ router.post('/deleteOldV4NotificationChunks', async (request, response) => {
config.get('luca.notificationChunks.maxAge'),
'hours'
);
- const affectedRows = await database.NotificationsChunk.destroy({
+ const affectedRows = await database.NotificationChunk.destroy({
where: {
createdAt: {
[Op.lt]: earliestTimeToKeep,
diff --git a/services/backend/src/routes/v3/locationGroups.js b/services/backend/src/routes/v3/locationGroups.js
index d9e3f76..6447cf1 100644
--- a/services/backend/src/routes/v3/locationGroups.js
+++ b/services/backend/src/routes/v3/locationGroups.js
@@ -158,6 +158,7 @@ router.post(
tableCount: request.body.tableCount,
type: request.body.type,
isIndoor: request.body.isIndoor,
+ averageCheckinTime: request.body.averageCheckinTime || null,
},
{ transaction }
);
@@ -199,6 +200,7 @@ router.post(
shouldProvideGeoLocation: request.body.radius > 0,
isIndoor: area.isIndoor,
type: request.body.type,
+ averageCheckinTime: request.body.averageCheckinTime || null,
},
{ transaction }
)
diff --git a/services/backend/src/routes/v3/locationGroups.openapi.yaml b/services/backend/src/routes/v3/locationGroups.openapi.yaml
index 76d65d9..9f51060 100644
--- a/services/backend/src/routes/v3/locationGroups.openapi.yaml
+++ b/services/backend/src/routes/v3/locationGroups.openapi.yaml
@@ -159,6 +159,10 @@ paths:
radius:
type: integer
minimum: 0
+ averageCheckinTime:
+ type: integer
+ minimum: 15
+ maximum: 1440
tableCount:
type: integer
additionalData:
diff --git a/services/backend/src/routes/v3/locationGroups.schemas.js b/services/backend/src/routes/v3/locationGroups.schemas.js
index 10ea406..bbaa8ec 100644
--- a/services/backend/src/routes/v3/locationGroups.schemas.js
+++ b/services/backend/src/routes/v3/locationGroups.schemas.js
@@ -34,6 +34,14 @@ const createSchema = z.object({
.max(20)
.optional(),
isIndoor: z.boolean(),
+ averageCheckinTime: z
+ .number()
+ .int()
+ .positive()
+ .max(1440)
+ .min(15)
+ .optional()
+ .nullable(),
});
const searchSchema = z.object({
diff --git a/services/backend/src/routes/v3/locationTransfers.js b/services/backend/src/routes/v3/locationTransfers.js
index 5b73fce..da458e5 100644
--- a/services/backend/src/routes/v3/locationTransfers.js
+++ b/services/backend/src/routes/v3/locationTransfers.js
@@ -22,14 +22,12 @@ const {
isUserOfType,
UserTypes,
} = require('../../middlewares/requireUser');
-const { limitRequestsByUserPerHour } = require('../../middlewares/rateLimit');
const logger = require('../../utils/logger');
const { formatLocationName } = require('../../utils/format');
const { AuditLogEvents, AuditStatusType } = require('../../constants/auditLog');
const { logEvent } = require('../../utils/hdAuditLog');
const {
- createSchema,
getSchema,
sendSchema,
transferIdParametersSchema,
@@ -47,171 +45,8 @@ const mapTraceEncryptedData = trace => ({
: trace.data,
});
-/**
- * Create a transfer request for venues traced by an infected guest. Preceded
- * by a user transfer of check-in history, this will check for venues an
- * infected guest has checked-in to in order to determine potential contact persons
- * @see https://www.luca-app.de/securityoverview/processes/tracing_find_contacts.html#process
- * @see https://www.luca-app.de/securityoverview/processes/tracing_access_to_history.html
- */
-router.post(
- '/',
- requireHealthDepartmentEmployee,
- limitRequestsByUserPerHour('location_transfer_post_ratelimit_hour'),
- validateSchema(createSchema),
- async (request, response) => {
- const transaction = await database.transaction();
- const maxLocations = config.get('luca.locationTransfers.maxLocations');
-
- const isUserTransfer = !!request.body.userTransferId;
-
- if (request.body.locations.length > maxLocations) {
- logEvent(request.user, {
- type: AuditLogEvents.CREATE_TRACING_PROCESS,
- status: AuditStatusType.ERROR_LIMIT_EXCEEDED,
- meta: {
- viaTan: isUserTransfer,
- },
- });
-
- return response.sendStatus(status.REQUEST_ENTITY_TOO_LARGE);
- }
-
- try {
- const tracingProcess = await database.TracingProcess.create(
- {
- departmentId: request.user.departmentId,
- userTransferId: request.body.userTransferId,
- },
- { transaction }
- );
-
- if (isUserTransfer) {
- const userTransfer = await database.UserTransfer.findByPk(
- request.body.userTransferId,
- { transaction }
- );
-
- if (!userTransfer) {
- await transaction.rollback();
-
- logEvent(request.user, {
- type: AuditLogEvents.CREATE_TRACING_PROCESS,
- status: AuditStatusType.ERROR_INVALID_USER,
- meta: {
- viaTan: isUserTransfer,
- },
- });
-
- return response.sendStatus(status.NOT_FOUND);
- }
-
- await userTransfer.update(
- {
- departmentId: request.user.departmentId,
- tan: null,
- },
- { transaction }
- );
- }
-
- await Promise.all(
- request.body.locations.map(async locationRequest => {
- const location = await database.Location.findByPk(
- locationRequest.locationId,
- {
- include: {
- required: true,
- model: database.Operator,
- paranoid: false,
- },
- paranoid: false,
- }
- );
-
- if (!locationRequest || !location) {
- logger.error({
- message: 'Missing location for location transfer',
- locations: request.body.locations,
- });
-
- logEvent(request.user, {
- type: AuditLogEvents.CREATE_TRACING_PROCESS,
- status: AuditStatusType.ERROR_TARGET_NOT_FOUND,
- meta: {
- locationId: locationRequest?.locationId || location?.uuid,
- viaTan: isUserTransfer,
- },
- });
- return null;
- }
-
- const locationTransfer = await database.LocationTransfer.create(
- {
- departmentId: request.user.departmentId,
- tracingProcessId: tracingProcess.uuid,
- locationId: location.uuid,
- time: [
- moment.unix(locationRequest.time[0]),
- moment.unix(locationRequest.time[1]),
- ],
- },
- { transaction }
- );
-
- const traces = await database.Trace.findAll({
- where: {
- locationId: location.uuid,
- time: {
- [Op.overlap]: [
- moment.unix(locationRequest.time[0]),
- moment.unix(locationRequest.time[1]),
- ],
- },
- },
- });
-
- await database.LocationTransferTrace.bulkCreate(
- traces.map(trace => ({
- locationTransferId: locationTransfer.uuid,
- traceId: trace.traceId,
- time: trace.time,
- deviceType: trace.deviceType,
- })),
- { transaction }
- );
-
- logEvent(request.user, {
- type: AuditLogEvents.CREATE_TRACING_PROCESS,
- status: AuditStatusType.SUCCESS,
- meta: {
- transferId: locationTransfer.uuid,
- viaTan: isUserTransfer,
- },
- });
-
- return { location, locationTransfer };
- })
- );
-
- await transaction.commit();
-
- return response.send({ tracingProcessId: tracingProcess.uuid });
- } catch (error) {
- await transaction.rollback();
-
- logEvent(request.user, {
- type: AuditLogEvents.CREATE_TRACING_PROCESS,
- status: AuditStatusType.ERROR_UNKNOWN_SERVER_ERROR,
- meta: {
- viaTan: isUserTransfer,
- },
- });
-
- throw error;
- }
- }
-);
+const logEmailError = error =>
+ logger.error({ message: 'failed to send email', error });
/**
* Get all location transfers of the currently logged-in operator.
@@ -577,7 +412,7 @@ router.post(
);
transfer.update({ contactedAt: moment() });
} catch (error) {
- logger.error({ message: 'failed to send email', error });
+ logEmailError(error);
}
return response.sendStatus(status.NO_CONTENT);
}
@@ -775,9 +610,29 @@ router.post(
await Promise.all(updatePromises);
+ await transfer.update({
+ isCompleted: true,
+ approvedAt: moment(),
+ });
+
+ logEvent(
+ {
+ uuid: transfer.HealthDepartment.uuid,
+ departmentId: transfer.HealthDepartment.uuid,
+ },
+ {
+ type: AuditLogEvents.RECEIVE_DATA,
+ status: AuditStatusType.SUCCESS,
+ meta: {
+ transferId: transfer.uuid,
+ locationId: transfer.Location.uuid,
+ },
+ }
+ );
+
try {
const dateFormat = 'DD.MM.YYYY HH:mm';
- locationTransferApprovalNotification(
+ await locationTransferApprovalNotification(
transfer.Location.Operator.email,
`${transfer.Location.Operator.firstName} ${transfer.Location.Operator.lastName}`,
null,
@@ -786,7 +641,9 @@ router.post(
createdAt: moment(transfer.contactedAt)
.tz(config.get('tz'))
.format(dateFormat),
- updatedAt: moment().tz(config.get('tz')).format(dateFormat),
+ updatedAt: moment(transfer.approvedAt)
+ .tz(config.get('tz'))
+ .format(dateFormat),
departmentName: transfer.HealthDepartment.name,
timeFrameFrom: moment(transfer.time[0].value)
.tz(config.get('tz'))
@@ -799,27 +656,8 @@ router.post(
}
);
} catch (error) {
- logger.error({ message: 'failed to send email', error });
+ logEmailError(error);
}
- await transfer.update({
- isCompleted: true,
- approvedAt: moment(),
- });
-
- logEvent(
- {
- uuid: transfer.HealthDepartment.uuid,
- departmentId: transfer.HealthDepartment.uuid,
- },
- {
- type: AuditLogEvents.RECEIVE_DATA,
- status: AuditStatusType.SUCCESS,
- meta: {
- transferId: transfer.uuid,
- locationId: transfer.Location.uuid,
- },
- }
- );
return response.sendStatus(status.NO_CONTENT);
}
diff --git a/services/backend/src/routes/v3/locationTransfers.openapi.yaml b/services/backend/src/routes/v3/locationTransfers.openapi.yaml
index 5e1e3c8..20277bb 100644
--- a/services/backend/src/routes/v3/locationTransfers.openapi.yaml
+++ b/services/backend/src/routes/v3/locationTransfers.openapi.yaml
@@ -424,4 +424,4 @@ paths:
'200':
description: OK
'401':
- $ref: '#/components/schemas/RequiredUserOfTypeOperator'
+ $ref: '#/components/schemas/RequiredUserOfTypeOperator'
\ No newline at end of file
diff --git a/services/backend/src/routes/v3/locationTransfers.schemas.js b/services/backend/src/routes/v3/locationTransfers.schemas.js
index 5beb425..4c41bfc 100644
--- a/services/backend/src/routes/v3/locationTransfers.schemas.js
+++ b/services/backend/src/routes/v3/locationTransfers.schemas.js
@@ -1,3 +1,4 @@
+const config = require('config');
const { z } = require('../../utils/validation');
const getSchema = z.object({
@@ -13,7 +14,8 @@ const createSchema = z.object({
locationId: z.uuid(),
})
)
- .nonempty(),
+ .nonempty()
+ .max(config.get('luca.locationTransfers.maxLocations')),
userTransferId: z.uuid().optional(),
lang: z.supportedLanguage(),
});
diff --git a/services/backend/src/routes/v3/operators.js b/services/backend/src/routes/v3/operators.js
index 27bdea9..faddeca 100644
--- a/services/backend/src/routes/v3/operators.js
+++ b/services/backend/src/routes/v3/operators.js
@@ -3,7 +3,7 @@
const crypto = require('crypto');
const router = require('express').Router();
const status = require('http-status');
-const moment = require('moment');
+const moment = require('moment-timezone');
const config = require('config');
const database = require('../../database');
@@ -30,6 +30,7 @@ const {
activationSchema,
storePublicKeySchema,
updateOperatorSchema,
+ supportSchema,
} = require('./operators.schemas');
// create operator
@@ -228,6 +229,36 @@ router.delete('/', requireOperator, async (request, response) => {
});
});
+// support
+router.post(
+ '/support',
+ requireOperator,
+ limitRequestsPerDay('operators_support_email_post_ratelimit_day'),
+ validateSchema(supportSchema),
+ async (request, response) => {
+ const { phone, requestText } = request.body;
+
+ const requestTime = moment()
+ .tz(config.get('tz'))
+ .format('DD.MM.YYYY HH:mm');
+ mailClient.sendLocationsSupportMail(
+ 'locations@luca-app.de',
+ 'Locations Support Mail',
+ null,
+ {
+ userPhone: phone,
+ userEmail: request.user.email,
+ userName: request.user.fullName,
+ requestText,
+ requestTime,
+ supportCode: request.user.supportCode,
+ }
+ );
+
+ return response.sendStatus(status.NO_CONTENT);
+ }
+);
+
// undo account deactivation
router.post('/restore', requireOperator, async (request, response) => {
const operator = request.user;
diff --git a/services/backend/src/routes/v3/operators.schemas.js b/services/backend/src/routes/v3/operators.schemas.js
index 1e11711..7af8027 100644
--- a/services/backend/src/routes/v3/operators.schemas.js
+++ b/services/backend/src/routes/v3/operators.schemas.js
@@ -26,9 +26,16 @@ const updateOperatorSchema = z.object({
avvAccepted: z.boolean().optional(),
lastVersionSeen: z.string().max(32).optional(),
});
+
+const supportSchema = z.object({
+ requestText: z.safeText().max(3000),
+ phone: z.safeString().max(255).optional(),
+});
+
module.exports = {
createSchema,
activationSchema,
storePublicKeySchema,
updateOperatorSchema,
+ supportSchema,
};
diff --git a/services/backend/src/routes/v3/operators/locations.helper.js b/services/backend/src/routes/v3/operators/locations.helper.js
index d7eef55..ba2dbff 100644
--- a/services/backend/src/routes/v3/operators/locations.helper.js
+++ b/services/backend/src/routes/v3/operators/locations.helper.js
@@ -26,6 +26,7 @@ const getOperatorLocationDTO = location => ({
operator: location.operator,
groupId: location.groupId,
groupName: location.LocationGroup?.name,
+ averageCheckinTime: location.averageCheckinTime,
});
module.exports = { getOperatorLocationDTO };
diff --git a/services/backend/src/routes/v3/operators/locations.js b/services/backend/src/routes/v3/operators/locations.js
index f6a5c85..7d8307a 100644
--- a/services/backend/src/routes/v3/operators/locations.js
+++ b/services/backend/src/routes/v3/operators/locations.js
@@ -128,6 +128,7 @@ router.post(
tableCount: request.body.tableCount,
isIndoor: request.body.isIndoor,
type: request.body.type,
+ averageCheckinTime: request.body.averageCheckinTime || null,
},
{ transaction }
);
@@ -200,6 +201,7 @@ router.patch(
radius: request.body.radius || 0,
shouldProvideGeoLocation: request.body.radius > 0,
isIndoor: request.body.isIndoor,
+ averageCheckinTime: request.body.averageCheckinTime,
});
return response.send(getOperatorLocationDTO(location));
diff --git a/services/backend/src/routes/v3/operators/locations.openapi.yaml b/services/backend/src/routes/v3/operators/locations.openapi.yaml
index 5f35508..0d188bf 100644
--- a/services/backend/src/routes/v3/operators/locations.openapi.yaml
+++ b/services/backend/src/routes/v3/operators/locations.openapi.yaml
@@ -161,6 +161,10 @@ paths:
type: number
isIndoor:
type: boolean
+ averageCheckinTime:
+ type: integer
+ minimum: 15
+ maximum: 1440
tags:
- Operators
delete:
diff --git a/services/backend/src/routes/v3/operators/locations.schemas.js b/services/backend/src/routes/v3/operators/locations.schemas.js
index 32ec12a..2aeda25 100644
--- a/services/backend/src/routes/v3/operators/locations.schemas.js
+++ b/services/backend/src/routes/v3/operators/locations.schemas.js
@@ -26,6 +26,14 @@ const createSchema = z.object({
.optional(),
isIndoor: z.boolean().optional(),
type: z.safeString().max(128),
+ averageCheckinTime: z
+ .number()
+ .int()
+ .positive()
+ .max(1440)
+ .min(15)
+ .optional()
+ .nullable(),
});
const updateSchema = z.object({
@@ -36,6 +44,14 @@ const updateSchema = z.object({
tableCount: z.number().int().positive().optional().nullable(),
radius: z.number().int().nonnegative().max(5000).optional().nullable(),
isIndoor: z.boolean().optional(),
+ averageCheckinTime: z
+ .number()
+ .int()
+ .positive()
+ .max(1440)
+ .min(15)
+ .optional()
+ .nullable(),
});
const locationIdParametersSchema = z.object({
diff --git a/services/backend/src/routes/v3/tests.js b/services/backend/src/routes/v3/tests.js
index f8f8a1a..5d4dd59 100644
--- a/services/backend/src/routes/v3/tests.js
+++ b/services/backend/src/routes/v3/tests.js
@@ -1,7 +1,5 @@
const router = require('express').Router();
const status = require('http-status');
-const moment = require('moment');
-const config = require('config');
const database = require('../../database');
const { validateSchema } = require('../../middlewares/validateSchema');
@@ -9,15 +7,6 @@ const { limitRequestsPerMinute } = require('../../middlewares/rateLimit');
const { redeemSchema, redeemDeleteSchema } = require('./tests.schemas');
-const REDEEM_MAX_EXPIRY = moment.duration(
- config.get('luca.testRedeems.maxAge'),
- 'hours'
-);
-const REDEEM_DEFAULT_EXPIRY = moment.duration(
- config.get('luca.testRedeems.defaultMaxAge'),
- 'hours'
-);
-
// Redeem a test
router.post(
'/redeem',
@@ -30,12 +19,6 @@ router.post(
await database.TestRedeem.create({
hash: request.body.hash,
tag: request.body.tag,
- expireAt: request.body.expireAt
- ? Math.min(
- moment.unix(request.body.expireAt),
- moment().add(REDEEM_MAX_EXPIRY)
- )
- : moment().add(REDEEM_DEFAULT_EXPIRY),
});
return response.sendStatus(status.NO_CONTENT);
}
diff --git a/services/backend/src/routes/v3/tests.openapi.yaml b/services/backend/src/routes/v3/tests.openapi.yaml
index b7a030b..704531e 100644
--- a/services/backend/src/routes/v3/tests.openapi.yaml
+++ b/services/backend/src/routes/v3/tests.openapi.yaml
@@ -18,8 +18,6 @@ paths:
type: string
tag:
type: string
- expireAt:
- type: number
required:
- hash
- tag
diff --git a/services/backend/src/routes/v4.js b/services/backend/src/routes/v4.js
index 2e30621..5130eb7 100644
--- a/services/backend/src/routes/v4.js
+++ b/services/backend/src/routes/v4.js
@@ -6,6 +6,7 @@ const timeRouter = require('./v4/time');
const healthDepartmentsRouter = require('./v4/healthDepartments');
const healthDepartmentEmployeesRouter = require('./v4/healthDepartmentEmployees');
const signingToolRouter = require('./v4/signingToolDownload');
+const locationTransfersRouter = require('./v4/locationTransfers');
const notificationsRouter = require('./v4/notifications');
const riskLevelsRouter = require('./v4/riskLevels');
@@ -15,6 +16,7 @@ router.use('/time', timeRouter);
router.use('/healthDepartments', healthDepartmentsRouter);
router.use('/healthDepartmentEmployees', healthDepartmentEmployeesRouter);
router.use('/signingTool', signingToolRouter);
+router.use('/locationTransfers', locationTransfersRouter);
router.use('/notifications', notificationsRouter);
router.use('/riskLevels', riskLevelsRouter);
diff --git a/services/backend/src/routes/v4/healthDepartments.test.js b/services/backend/src/routes/v4/healthDepartments.test.js
new file mode 100644
index 0000000..a3568aa
--- /dev/null
+++ b/services/backend/src/routes/v4/healthDepartments.test.js
@@ -0,0 +1,108 @@
+const express = require('express');
+const chai = require('chai');
+const chaiHttp = require('chai-http');
+const proxyquire = require('proxyquire');
+
+const { expect } = chai;
+chai.use(chaiHttp);
+
+const POST_URL = '/healthDepartments/signedKeys';
+
+const voidMiddleware = (request, response, next) => {
+ request.user = { departmentId: '9ba590bb-6f0b-4bf1-a035-4fdedfded758' };
+ next();
+};
+
+const fakeParameters = {
+ publicCertificate: 'a'.repeat(8192),
+ signedPublicHDEKP: 'a'.repeat(2048),
+ signedPublicHDSKP: 'a'.repeat(2048),
+};
+
+const voidPromise = () => Promise.resolve(true);
+
+const requireProxies = {
+ '../../middlewares/requireUser': {
+ requireHealthDepartmentEmployee: voidMiddleware,
+ requireHealthDepartmentAdmin: voidMiddleware,
+ },
+ '../../database': {
+ HealthDepartment: {
+ findByPk: voidPromise,
+ },
+ },
+ '../../utils/signedKeys': {
+ verifySignedPublicKeys() {
+ // I do nothing
+ },
+ },
+};
+
+const getResponse = app =>
+ chai.request(app).post(POST_URL).send(fakeParameters);
+
+describe('HealthDepartment router', () => {
+ describe('POST route', () => {
+ it('should reject keys if keys already exist', async () => {
+ const app = express();
+
+ app.use(
+ '/healthDepartments',
+ proxyquire('./healthDepartments', {
+ ...requireProxies,
+ '../../database': {
+ HealthDepartment: {
+ findByPk: () =>
+ Promise.resolve({
+ signedPublicHDEKP: 'a'.repeat(2048),
+ signedPublicHDSKP: 'a'.repeat(2048),
+ }),
+ },
+ },
+ })
+ );
+
+ const response = await getResponse(app);
+ expect(response.status).to.equal(409);
+ });
+ it('should reject invalid signatures', async () => {
+ const app = express();
+
+ app.use(
+ '/healthDepartments',
+ proxyquire('./healthDepartments', {
+ ...requireProxies,
+ '../../utils/signedKeys': {
+ verifySignedPublicKeys() {
+ throw new Error('invalid signatures');
+ },
+ },
+ })
+ );
+
+ const response = await getResponse(app);
+ expect(response.status).to.equal(400);
+ });
+ it('should accept valid keys', async () => {
+ const app = express();
+
+ app.use(
+ '/healthDepartments',
+ proxyquire('./healthDepartments', {
+ ...requireProxies,
+ '../../database': {
+ HealthDepartment: {
+ findByPk: () =>
+ Promise.resolve({
+ update: voidPromise,
+ }),
+ },
+ },
+ })
+ );
+
+ const response = await getResponse(app);
+ expect(response.status).to.equal(204);
+ });
+ });
+});
diff --git a/services/backend/src/routes/v4/locationTransfers.schemas.ts b/services/backend/src/routes/v4/locationTransfers.schemas.ts
new file mode 100644
index 0000000..7169a52
--- /dev/null
+++ b/services/backend/src/routes/v4/locationTransfers.schemas.ts
@@ -0,0 +1,21 @@
+import config from 'config';
+import { z } from 'utils/validation';
+
+export const createSchema = z.object({
+ locations: z
+ .array(
+ z.object({
+ time: z.array(z.unixTimestamp()).length(2),
+ locationId: z.uuid(),
+ signedLocationTransfer: z.string().max(1024),
+ })
+ )
+ .nonempty()
+ .max(config.get('luca.locationTransfers.maxLocations')),
+ userTransferId: z.uuid().optional(),
+ lang: z.supportedLanguage(),
+});
+
+export const transferIdParametersSchema = z.object({
+ transferId: z.uuid(),
+});
diff --git a/services/backend/src/routes/v4/locationTransfers.ts b/services/backend/src/routes/v4/locationTransfers.ts
new file mode 100644
index 0000000..54cabd9
--- /dev/null
+++ b/services/backend/src/routes/v4/locationTransfers.ts
@@ -0,0 +1,269 @@
+import { Router } from 'express';
+import moment from 'moment';
+import Sequelize, { Op } from 'sequelize';
+import { z } from 'zod';
+import config from 'config';
+import logger from 'utils/logger';
+import {
+ isUserOfType,
+ requireHealthDepartmentEmployee,
+} from 'middlewares/requireUser';
+import {
+ validateParametersSchema,
+ validateSchema,
+} from 'middlewares/validateSchema';
+import { limitRequestsByUserPerHour } from 'middlewares/rateLimit';
+import database from 'database/models';
+import { extractAndVerifyLocationTransfer } from 'utils/signedKeys';
+import ApiError from 'utils/apiError';
+import { AuditLogEvents, AuditStatusType } from 'constants/auditLog';
+import { logEvent } from 'utils/hdAuditLog';
+import {
+ createSchema,
+ transferIdParametersSchema,
+} from './locationTransfers.schemas';
+
+const router = Router();
+
+/**
+ * Get a single location transfer by ID, containing issuing health department,
+ * involved locations and associated traces
+ */
+router.get(
+ '/:transferId',
+ validateParametersSchema(transferIdParametersSchema),
+ async (request, response) => {
+ const transfer = await database.LocationTransfer.findByPk(
+ request.params.transferId
+ );
+
+ if (!transfer || !request.user) {
+ // @ts-ignore - ApiError fields are added dynamically
+ throw new ApiError(ApiError.LOCATION_TRANSFER_NOT_FOUND);
+ }
+
+ if (
+ isUserOfType('HealthDepartmentEmployee', request) &&
+ transfer.departmentId !==
+ (request.user as IHealthDepartmentEmployee).departmentId
+ ) {
+ // @ts-ignore - ApiError fields are added dynamically
+ throw new ApiError(ApiError.FORBIDDEN);
+ }
+
+ const location = await database.Location.findByPk(transfer.locationId, {
+ include: {
+ model: database.LocationGroup,
+ attributes: ['uuid', 'name'],
+ paranoid: false,
+ },
+ paranoid: false,
+ });
+
+ if (
+ isUserOfType('Operator', request) &&
+ location.operator !== request.user.uuid
+ ) {
+ // @ts-ignore - ApiError fields are added dynamically
+ throw new ApiError(ApiError.FORBIDDEN);
+ }
+
+ return {
+ transfer: transfer.signedLocationTransfer,
+ };
+ }
+);
+
+/**
+ * Create a transfer request for venues traced by an infected guest. Preceded
+ * by a user transfer of check-in history, this will check for venues an
+ * infected guest has checked-in to in order to determine potential contact persons
+ * @see https://www.luca-app.de/securityoverview/processes/tracing_find_contacts.html#process
+ * @see https://www.luca-app.de/securityoverview/processes/tracing_access_to_history.html
+ */
+router.post<unknown, unknown, z.infer<typeof createSchema>>(
+ '/',
+ requireHealthDepartmentEmployee,
+ limitRequestsByUserPerHour('location_transfer_post_ratelimit_hour'),
+ validateSchema(createSchema),
+ async (request, response) => {
+ const { user, body } = request;
+ const {
+ HealthDepartment,
+ departmentId,
+ } = user as IHealthDepartmentEmployee;
+ const { userTransferId, locations } = body;
+
+ const isUserTransfer = !!userTransferId;
+
+ const maxLocations: number = config.get(
+ 'luca.locationTransfers.maxLocations'
+ );
+
+ if (locations.length > maxLocations) {
+ logEvent(user, {
+ type: AuditLogEvents.CREATE_TRACING_PROCESS,
+ status: AuditStatusType.ERROR_LIMIT_EXCEEDED,
+ meta: {
+ viaTan: isUserTransfer,
+ },
+ });
+
+ // @ts-ignore - ApiError fields are added dynamically
+ throw new ApiError(ApiError.TOO_MANY_LOCATIONS);
+ }
+
+ const tracingProcessId = await database
+ .transaction(async (transaction: Sequelize.Transaction) => {
+ const tracingProcess = await database.TracingProcess.create(
+ {
+ departmentId,
+ userTransferId,
+ },
+ { transaction }
+ );
+
+ if (isUserTransfer) {
+ const userTransfer = await database.UserTransfer.findByPk(
+ userTransferId,
+ { transaction }
+ );
+
+ if (!userTransfer) {
+ logEvent(user, {
+ type: AuditLogEvents.CREATE_TRACING_PROCESS,
+ status: AuditStatusType.ERROR_INVALID_USER,
+ meta: {
+ viaTan: isUserTransfer,
+ },
+ });
+
+ // @ts-ignore - ApiError fields are added dynamically
+ throw new ApiError(ApiError.USER_TRANSFER_NOT_FOUND);
+ }
+
+ await userTransfer.update(
+ {
+ departmentId,
+ tan: null,
+ },
+ { transaction }
+ );
+ }
+
+ let locationData;
+
+ try {
+ locationData = locations.map(
+ ({ signedLocationTransfer, locationId, time }) => ({
+ ...extractAndVerifyLocationTransfer({
+ signedLocationTransfer,
+ locationId,
+ time,
+ healthDepartment: HealthDepartment,
+ }),
+ signedLocationTransfer,
+ })
+ );
+ } catch (error) {
+ // @ts-ignore - ApiError fields are added dynamically
+ throw new ApiError(ApiError.INVALID_SIGNATURE, error.message);
+ }
+
+ await Promise.all(
+ locationData.map(async data => {
+ const location = await database.Location.findByPk(data.locationId, {
+ include: {
+ required: true,
+ model: database.Operator,
+ paranoid: false,
+ },
+ paranoid: false,
+ });
+
+ if (!location) {
+ logger.error({
+ message: 'Missing location for location transfer',
+ locations,
+ });
+ logEvent(user, {
+ type: AuditLogEvents.CREATE_TRACING_PROCESS,
+ status: AuditStatusType.ERROR_TARGET_NOT_FOUND,
+ meta: {
+ locationId: data?.locationId || location?.uuid,
+ viaTan: isUserTransfer,
+ },
+ });
+ return null;
+ }
+
+ const locationTransfer = await database.LocationTransfer.create(
+ {
+ departmentId,
+ tracingProcessId: tracingProcess.uuid,
+ locationId: location.uuid,
+ time: [
+ moment.unix(data.time[0]).toDate(),
+ moment.unix(data.time[1]).toDate(),
+ ],
+ signedLocationTransfer: data.signedLocationTransfer,
+ },
+ { transaction }
+ );
+
+ const traces = await database.Trace.findAll({
+ where: {
+ locationId: location.uuid,
+ time: {
+ [Op.overlap]: [
+ moment.unix(data.time[0]).toDate(),
+ moment.unix(data.time[1]).toDate(),
+ ],
+ },
+ },
+ });
+
+ await database.LocationTransferTrace.bulkCreate(
+ // @ts-ignore - any until models are typed
+ traces.map(trace => ({
+ locationTransferId: locationTransfer.uuid,
+ traceId: trace.traceId,
+ time: trace.time,
+ deviceType: trace.deviceType,
+ })),
+ { transaction }
+ );
+
+ logEvent(user, {
+ type: AuditLogEvents.CREATE_TRACING_PROCESS,
+ status: AuditStatusType.SUCCESS,
+ meta: {
+ transferId: locationTransfer.uuid,
+ viaTan: isUserTransfer,
+ },
+ });
+
+ return locationTransfer.uuid;
+ })
+ );
+ return tracingProcess.uuid;
+ })
+ .catch((error: Error) => {
+ logEvent(user, {
+ type: AuditLogEvents.CREATE_TRACING_PROCESS,
+ status: AuditStatusType.ERROR_UNKNOWN_SERVER_ERROR,
+ meta: {
+ viaTan: isUserTransfer,
+ },
+ });
+
+ if (error instanceof ApiError) throw error;
+ // @ts-ignore - ApiError fields are added dynamically
+ throw new ApiError(ApiError.UNKNOWN_API_ERROR);
+ });
+
+ return response.send({ tracingProcessId });
+ }
+);
+
+module.exports = router;
diff --git a/services/backend/src/utils/apiError.js b/services/backend/src/utils/apiError.js
index 56f1b1b..3adaf3d 100644
--- a/services/backend/src/utils/apiError.js
+++ b/services/backend/src/utils/apiError.js
@@ -19,6 +19,10 @@ const API_ERRORS = {
status: status.NOT_FOUND,
message: 'Health department not found.',
},
+ LOCATION_TRANSFER_NOT_FOUND: {
+ status: status.NOT_FOUND,
+ message: 'Location transfer not found.',
+ },
SIGNED_KEYS_ALREADY_EXIST: {
status: status.CONFLICT,
message: 'Signed keys already exist.',
@@ -27,6 +31,22 @@ const API_ERRORS = {
status: status.BAD_REQUEST,
message: 'Invalid signed keys.',
},
+ INVALID_SIGNATURE: {
+ status: status.BAD_REQUEST,
+ message: 'Signature invalid.',
+ },
+ FORBIDDEN: {
+ status: status.FORBIDDEN,
+ message: 'User not authorized to perform this action',
+ },
+ TOO_MANY_LOCATIONS: {
+ status: status.REQUEST_ENTITY_TOO_LARGE,
+ message: 'There are too many locations attatched to this request',
+ },
+ USER_TRANSFER_NOT_FOUND: {
+ status: status.NOT_FOUND,
+ message: 'User transfer not found.',
+ },
};
class ApiError extends Error {
diff --git a/services/backend/src/utils/mailClient.helper.js b/services/backend/src/utils/mailClient.helper.js
index 3ec7e66..35d6309 100644
--- a/services/backend/src/utils/mailClient.helper.js
+++ b/services/backend/src/utils/mailClient.helper.js
@@ -35,6 +35,10 @@ const MAIL_TEMPLATE_IDS = {
de: 3040874,
en: 3041093,
},
+ locationsSupport: {
+ de: 3148836,
+ en: 3148836,
+ },
};
const MAIL_TEMPLATE_TITLES = {
@@ -66,6 +70,10 @@ const MAIL_TEMPLATE_TITLES = {
de: 'Passwort erfolgreich geändert',
en: 'Password successfully changed',
},
+ locationsSupport: {
+ de: 'Neue Support Anfrage eines Betreibers',
+ en: 'Neue Support Anfrage eines Betreibers',
+ },
hdUpdatePasswordNotification: {
de: 'Passwort erfolgreich geändert',
en: 'Password successfully changed',
diff --git a/services/backend/src/utils/mailClient.js b/services/backend/src/utils/mailClient.js
index 58d2433..7e72bff 100644
--- a/services/backend/src/utils/mailClient.js
+++ b/services/backend/src/utils/mailClient.js
@@ -108,6 +108,16 @@ const sendForgotPasswordMail = (toEmail, toName, lang, variables) => {
);
};
+const sendLocationsSupportMail = (toEmail, toName, lang = 'de', variables) => {
+ return sendTemplate(
+ getMailId('locationsSupport', lang),
+ getMailTitle('locationsSupport', lang),
+ toEmail,
+ toName,
+ variables
+ );
+};
+
const sendActivationMail = (toEmail, toName, lang, variables) => {
return sendTemplate(
getMailId('activateAccount', lang),
@@ -186,6 +196,7 @@ module.exports = {
sendRegistrationConfirmation,
sendForgotPasswordMail,
sendActivationMail,
+ sendLocationsSupportMail,
updateEmail,
updateEmailNotification,
operatorUpdatePasswordNotification,
diff --git a/services/backend/src/utils/signedKeys.js b/services/backend/src/utils/signedKeys.ts
similarity index 53%
rename from services/backend/src/utils/signedKeys.js
rename to services/backend/src/utils/signedKeys.ts
index 96b50b2..4adbd3a 100644
--- a/services/backend/src/utils/signedKeys.js
+++ b/services/backend/src/utils/signedKeys.ts
@@ -1,13 +1,14 @@
-const forge = require('node-forge');
-const jwt = require('jsonwebtoken');
-const assert = require('assert');
-const config = require('config');
-const { z } = require('./validation');
+import forge from 'node-forge';
+import jwt from 'jsonwebtoken';
+import assert from 'assert';
+import config from 'config';
+import { publicKeyToECPublicKeyPEM, base64ToHex } from '@lucaapp/crypto';
+import { z } from './validation';
-let ROOT_CA_STORE;
-let D_TRUST_BASIC_CA;
+let ROOT_CA_STORE: forge.pki.CAStore;
+let D_TRUST_BASIC_CA: forge.pki.Certificate;
-const loadCertificates = () => {
+export const loadCertificates = () => {
const D_TRUST_ROOT_CA = forge.pki.certificateFromPem(
config.get('certs.dtrust.root')
);
@@ -19,7 +20,7 @@ const loadCertificates = () => {
ROOT_CA_STORE = forge.pki.createCaStore([D_TRUST_ROOT_CA]);
};
-const jwtSchema = z
+const signedKeySchema = z
.object({
sub: z.uuid(),
iss: z.string().length(40),
@@ -30,14 +31,16 @@ const jwtSchema = z
})
.strict();
-const getFingerprint = certificate => {
+const getFingerprint = (certificate: forge.pki.Certificate) => {
const certDer = forge.asn1.toDer(forge.pki.certificateToAsn1(certificate));
const md = forge.md.sha1.create();
md.update(certDer.data);
return md.digest().toHex();
};
-const verifyCertificateAgainstDTrustChain = certificate => {
+export const verifyCertificateAgainstDTrustChain = (
+ certificate: forge.pki.Certificate
+) => {
return forge.pki.verifyCertificateChain(ROOT_CA_STORE, [
certificate,
D_TRUST_BASIC_CA,
@@ -52,6 +55,14 @@ const verifySignedJwt = ({
name,
type,
key,
+}: {
+ token: string;
+ publicKeyPem: string;
+ issuer: string;
+ subject: string;
+ name: string;
+ type: string;
+ key: string;
}) => {
const content = jwt.verify(token, publicKeyPem, {
algorithms: ['RS512'],
@@ -60,7 +71,7 @@ const verifySignedJwt = ({
maxAge: '10 minutes',
});
- const validatedContent = jwtSchema.parse(content);
+ const validatedContent = signedKeySchema.parse(content);
assert.equal(validatedContent.iss, issuer, 'Invalid issuer.');
assert.equal(validatedContent.sub, subject, 'Invalid subject.');
assert.equal(validatedContent.name, name, 'Invalid name.');
@@ -68,11 +79,12 @@ const verifySignedJwt = ({
assert.equal(validatedContent.key, key, 'Invalid key.');
};
-const verifySignedPublicKeys = (
- healthDepartment,
- certificatePem,
- signedPublicHDSKP,
- signedPublicHDEKP
+export const verifySignedPublicKeys = (
+ /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+ healthDepartment: any,
+ certificatePem: string,
+ signedPublicHDSKP: string,
+ signedPublicHDEKP: string
) => {
const certificate = forge.pki.certificateFromPem(certificatePem);
const publicKeyPem = forge.pki.publicKeyToPem(certificate.publicKey);
@@ -81,7 +93,9 @@ const verifySignedPublicKeys = (
// verify against D-Trust Chain
const isChainValid = verifyCertificateAgainstDTrustChain(certificate);
+
assert.ok(isChainValid, 'Certificate chain is invalid.');
+
assert.equal(
commonName,
healthDepartment.commonName,
@@ -111,8 +125,43 @@ const verifySignedPublicKeys = (
});
};
-module.exports = {
- loadCertificates,
- verifySignedPublicKeys,
- verifyCertificateAgainstDTrustChain,
+const locationTransferSigningSchema = z
+ .object({
+ iss: z.uuid(),
+ type: z.literal('locationTransfer'),
+ locationId: z.uuid(),
+ time: z.array(z.unixTimestamp()).length(2),
+ iat: z.unixTimestamp(),
+ })
+ .strict();
+
+export const extractAndVerifyLocationTransfer = ({
+ signedLocationTransfer,
+ healthDepartment,
+ locationId,
+ time,
+}: {
+ signedLocationTransfer: string;
+ locationId: string;
+ time: number[];
+ /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+ healthDepartment: any;
+}) => {
+ const content = jwt.verify(
+ signedLocationTransfer,
+ publicKeyToECPublicKeyPEM(base64ToHex(healthDepartment.publicHDSKP)),
+ {
+ algorithms: ['ES256'],
+ issuer: healthDepartment.uuid,
+ }
+ );
+
+ const validatedContent = locationTransferSigningSchema.parse(content);
+
+ assert.equal(validatedContent.iss, healthDepartment.uuid, 'Invalid issuer.');
+ assert.equal(validatedContent.locationId, locationId, 'Invalid location.');
+ assert.equal(validatedContent.type, 'locationTransfer', 'Invalid type.');
+ assert.deepEqual(validatedContent.time, time, 'Invalid timeframe.');
+
+ return validatedContent;
};
diff --git a/services/backend/src/utils/validation.ts b/services/backend/src/utils/validation.ts
index 35dd2ba..d0d446e 100644
--- a/services/backend/src/utils/validation.ts
+++ b/services/backend/src/utils/validation.ts
@@ -13,6 +13,7 @@ import {
const SAFE_CHARACTERS_REGEX = /^[\w !&()+,./:@`|£À-ÿÄăąćĉċÄđēėęěÄğģĥħĩīįİıĵķĸĺļłńņÅőœŗřśÅşšţŦũūÅůűųŵŷźżžơưếệ–-]*$/i;
const NO_HTTP_REGEX = /^((?!http).)*$/i;
+const NO_FTP_REGEX = /^((?!ftp).)*$/i;
const PASSWORD_REQUIREMENTS = {
minLength: 9,
@@ -26,7 +27,13 @@ export const z = {
...zod,
safeString: () =>
- z.string().regex(SAFE_CHARACTERS_REGEX).regex(NO_HTTP_REGEX),
+ z
+ .string()
+ .regex(SAFE_CHARACTERS_REGEX)
+ .regex(NO_HTTP_REGEX)
+ .regex(NO_FTP_REGEX),
+
+ safeText: () => z.string().regex(NO_HTTP_REGEX).regex(NO_FTP_REGEX),
phoneNumber: () =>
zod
diff --git a/services/backend/yarn.lock b/services/backend/yarn.lock
index 0fe6dca..f096347 100644
--- a/services/backend/yarn.lock
+++ b/services/backend/yarn.lock
@@ -66,19 +66,19 @@
integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
"@babel/core@^7.12.16", "@babel/core@^7.7.5":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
- integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
+ version "7.15.5"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
+ integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helpers" "^7.14.8"
- "@babel/parser" "^7.15.0"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-compilation-targets" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
+ "@babel/helpers" "^7.15.4"
+ "@babel/parser" "^7.15.5"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -87,114 +87,114 @@
source-map "^0.5.0"
"@babel/eslint-parser@^7.12.16":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz#b54f06e04d0e93aebcba99f89251e3bf0ee39f21"
- integrity sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.4.tgz#46385943726291fb3e8db99522c8099b15684387"
+ integrity sha512-hPMIAmGNbmQzXJIo2P43Zj9UhRmGev5f9nqdBFOWNGDGh6XKmjby79woBvg6y0Jur6yRfQBneDbUQ8ZVc1krFw==
dependencies:
eslint-scope "^5.1.1"
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
- integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==
+"@babel/generator@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
+ integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.4"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-compilation-targets@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818"
- integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==
+"@babel/helper-compilation-targets@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+ integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
dependencies:
"@babel/compat-data" "^7.15.0"
"@babel/helper-validator-option" "^7.14.5"
browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-function-name@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
- integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+"@babel/helper-function-name@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+ integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
dependencies:
- "@babel/helper-get-function-arity" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-get-function-arity" "^7.15.4"
+ "@babel/template" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-get-function-arity@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
- integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
+"@babel/helper-get-function-arity@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+ integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-hoist-variables@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
- integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+"@babel/helper-hoist-variables@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+ integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-member-expression-to-functions@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b"
- integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==
+"@babel/helper-member-expression-to-functions@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+ integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-imports@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
- integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+"@babel/helper-module-imports@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+ integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-transforms@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08"
- integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==
+"@babel/helper-module-transforms@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz#962cc629a7f7f9a082dd62d0307fa75fe8788d7c"
+ integrity sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==
dependencies:
- "@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-simple-access" "^7.14.8"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-module-imports" "^7.15.4"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-simple-access" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
"@babel/helper-validator-identifier" "^7.14.9"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-optimise-call-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
- integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+"@babel/helper-optimise-call-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+ integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-replace-supers@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4"
- integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==
+"@babel/helper-replace-supers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+ integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/helper-member-expression-to-functions" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-simple-access@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
- integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
+"@babel/helper-simple-access@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+ integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
dependencies:
- "@babel/types" "^7.14.8"
+ "@babel/types" "^7.15.4"
-"@babel/helper-split-export-declaration@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
- integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+"@babel/helper-split-export-declaration@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+ integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9":
version "7.14.9"
@@ -206,14 +206,14 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-"@babel/helpers@^7.14.8":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357"
- integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==
+"@babel/helpers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+ integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
dependencies:
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
version "7.14.5"
@@ -224,39 +224,39 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.14.5", "@babel/parser@^7.15.0":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
- integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
+"@babel/parser@^7.15.4", "@babel/parser@^7.15.5":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
+ integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
-"@babel/template@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
- integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+"@babel/template@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+ integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/traverse@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
- integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
+"@babel/traverse@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+ integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-hoist-variables" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
- integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
+"@babel/types@^7.15.4":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+ integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
dependencies:
"@babel/helper-validator-identifier" "^7.14.9"
to-fast-properties "^2.0.0"
@@ -327,10 +327,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-"@jest/types@^27.0.6":
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz#9a992bc517e0c49f035938b8549719c2de40706b"
- integrity sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==
+"@jest/types@^27.1.1":
+ version "27.1.1"
+ resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.1.1.tgz#77a3fc014f906c65752d12123a0134359707c0ad"
+ integrity sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==
dependencies:
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/istanbul-reports" "^3.0.0"
@@ -529,6 +529,13 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/jsonwebtoken@8.5.4":
+ version "8.5.4"
+ resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.4.tgz#50ccaf0aa6f5d7b9956e70fe323b76e582991913"
+ integrity sha512-4L8msWK31oXwdtC81RmRBAULd0ShnAHjBuKT9MRQpjP0piNrZdXyTRcKY9/UIfhGeKIT4PvF5amOOUbbT/9Wpg==
+ dependencies:
+ "@types/node" "*"
+
"@types/lodash@4.14.172":
version "4.14.172"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
@@ -549,10 +556,17 @@
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.3.tgz#bbeb55fbc73f28ea6de601fbfa4613f58d785323"
integrity sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==
+"@types/node-forge@0.10.3":
+ version "0.10.3"
+ resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-0.10.3.tgz#f3a83c1c679cde85ca1bd58e61331f16cb56a035"
+ integrity sha512-zgyZap9yq+mmonmFsuozDOVl5WGx3Uk9zYbueWgudIL7tbj1AL/8o47LplmCtuUAJfVUZ4l9l/DWDjcVUxi8Zw==
+ dependencies:
+ "@types/node" "*"
+
"@types/node@*":
- version "16.6.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.0.tgz#0d5685f85066f94e97f19e8a67fe003c5fadacc4"
- integrity sha512-OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ==
+ version "16.9.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9"
+ integrity sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==
"@types/node@16.9.1":
version "16.9.1"
@@ -755,9 +769,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
uri-js "^4.2.2"
ajv@^8.0.1:
- version "8.6.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
- integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
+ version "8.6.3"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+ integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -785,9 +799,9 @@ ansi-regex@^4.1.0:
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
ansi-regex@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
- integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+ integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1"
@@ -839,9 +853,9 @@ archy@^1.0.0:
integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
are-we-there-yet@~1.1.2:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
- integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+ integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
dependencies:
delegates "^1.0.0"
readable-stream "^2.0.6"
@@ -945,11 +959,6 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-available-typed-arrays@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9"
- integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==
-
available-typed-arrays@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -1077,15 +1086,15 @@ browser-stdout@1.3.1:
integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
browserslist@^4.16.6:
- version "4.16.7"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.7.tgz#108b0d1ef33c4af1b587c54f390e7041178e4335"
- integrity sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==
+ version "4.17.0"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c"
+ integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==
dependencies:
- caniuse-lite "^1.0.30001248"
- colorette "^1.2.2"
- electron-to-chromium "^1.3.793"
+ caniuse-lite "^1.0.30001254"
+ colorette "^1.3.0"
+ electron-to-chromium "^1.3.830"
escalade "^3.1.1"
- node-releases "^1.1.73"
+ node-releases "^1.1.75"
buffer-equal-constant-time@1.0.1:
version "1.0.1"
@@ -1145,10 +1154,10 @@ camelcase@^6.0.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
-caniuse-lite@^1.0.30001248:
- version "1.0.30001255"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"
- integrity sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==
+caniuse-lite@^1.0.30001254:
+ version "1.0.30001258"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz#b604eed80cc54a578e4bf5a02ae3ed49f869d252"
+ integrity sha512-RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA==
caseless@~0.12.0:
version "0.12.0"
@@ -1345,10 +1354,10 @@ color@3.0.x:
color-convert "^1.9.1"
color-string "^1.5.2"
-colorette@^1.2.2:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
- integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
+colorette@^1.3.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+ integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
colors@1.4.0, colors@^1.2.1:
version "1.4.0"
@@ -1475,11 +1484,16 @@ cookiejar@^2.1.0, cookiejar@^2.1.1:
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+core-util-is@~1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
cors@2.8.5:
version "2.8.5"
resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
@@ -1594,9 +1608,9 @@ deep-extend@^0.6.0:
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
deep-is@^0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
- integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+ integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
default-require-extensions@^3.0.0:
version "3.0.0"
@@ -1630,9 +1644,9 @@ delegates@^1.0.0:
integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
denque@^1.5.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de"
- integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
+ integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
depd@~1.1.0, depd@~1.1.2:
version "1.1.2"
@@ -1737,10 +1751,10 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.3.793:
- version "1.3.803"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.803.tgz#78993a991d096500f21a77e91cd2a44295fe3cbe"
- integrity sha512-tmRK9qB8Zs8eLMtTBp+w2zVS9MUe62gQQQHjYdAc5Zljam3ZIokNb+vZLPRz9RCREp6EFRwyhOFwbt1fEriQ2Q==
+electron-to-chromium@^1.3.830:
+ version "1.3.842"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f"
+ integrity sha512-P/nDMPIYdb2PyqCQwhTXNi5JFjX1AsDVR0y6FrHw752izJIAJ+Pn5lugqyBq4tXeRSZBMBb2ZGvRGB1djtELEQ==
elliptic@6.5.4:
version "6.5.4"
@@ -1790,21 +1804,22 @@ error-ex@^1.3.1:
is-arrayish "^0.2.1"
es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5:
- version "1.18.5"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19"
- integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==
+ version "1.18.6"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
+ integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
dependencies:
call-bind "^1.0.2"
es-to-primitive "^1.2.1"
function-bind "^1.1.1"
get-intrinsic "^1.1.1"
+ get-symbol-description "^1.0.0"
has "^1.0.3"
has-symbols "^1.0.2"
internal-slot "^1.0.3"
- is-callable "^1.2.3"
+ is-callable "^1.2.4"
is-negative-zero "^2.0.1"
- is-regex "^1.1.3"
- is-string "^1.0.6"
+ is-regex "^1.1.4"
+ is-string "^1.0.7"
object-inspect "^1.11.0"
object-keys "^1.1.1"
object.assign "^4.1.2"
@@ -2185,15 +2200,15 @@ event-emitter@^0.3.5:
es5-ext "~0.10.14"
expect@*:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz#a4d74fbe27222c718fff68ef49d78e26a8fd4c05"
- integrity sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==
+ version "27.2.0"
+ resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.0.tgz#40eb89a492afb726a3929ccf3611ee0799ab976f"
+ integrity sha512-oOTbawMQv7AK1FZURbPTgGSzmhxkjFzoARSvDjOMnOpeWuYQx1tP6rXu9MIX5mrACmyCAM7fSNP8IJO2f1p0CQ==
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.1.1"
ansi-styles "^5.0.0"
jest-get-type "^27.0.6"
- jest-matcher-utils "^27.0.6"
- jest-message-util "^27.0.6"
+ jest-matcher-utils "^27.2.0"
+ jest-message-util "^27.2.0"
jest-regex-util "^27.0.6"
express-async-errors@3.1.1:
@@ -2265,11 +2280,11 @@ express@4.17.1:
vary "~1.1.2"
ext@^1.1.2:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
- integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
+ integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
dependencies:
- type "^2.0.0"
+ type "^2.5.0"
extend@^3.0.0, extend@~3.0.2:
version "3.0.2"
@@ -2323,9 +2338,9 @@ fast-levenshtein@^2.0.6:
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
fast-safe-stringify@^2.0.4:
- version "2.0.8"
- resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f"
- integrity sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
+ integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
fast-sha256@1.3.0:
version "1.3.0"
@@ -2333,9 +2348,9 @@ fast-sha256@1.3.0:
integrity sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==
fastq@^1.6.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
- integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+ integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
dependencies:
reusify "^1.0.4"
@@ -2351,6 +2366,14 @@ file-entry-cache@^6.0.1:
dependencies:
flat-cache "^3.0.4"
+fill-keys@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/fill-keys/-/fill-keys-1.0.2.tgz#9a8fa36f4e8ad634e3bf6b4f3c8882551452eb20"
+ integrity sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=
+ dependencies:
+ is-object "~1.0.1"
+ merge-descriptors "~1.0.0"
+
fill-range@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -2372,9 +2395,9 @@ finalhandler@~1.1.2:
unpipe "~1.0.0"
find-cache-dir@^3.2.0:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
- integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+ integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
@@ -2583,6 +2606,14 @@ get-package-type@^0.1.0:
resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+get-symbol-description@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+ integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+ dependencies:
+ call-bind "^1.0.2"
+ get-intrinsic "^1.1.1"
+
getpass@^0.1.1:
version "0.1.7"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2627,9 +2658,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.6.0, globals@^13.9.0:
- version "13.10.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676"
- integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==
+ version "13.11.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
+ integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
dependencies:
type-fest "^0.20.2"
@@ -2978,19 +3009,12 @@ is-boolean-object@^1.1.0:
call-bind "^1.0.2"
has-tostringtag "^1.0.0"
-is-callable@^1.1.4, is-callable@^1.2.3:
+is-callable@^1.1.4, is-callable@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-is-core-module@^2.2.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
- integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
- dependencies:
- has "^1.0.3"
-
-is-core-module@^2.6.0:
+is-core-module@^2.2.0, is-core-module@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
@@ -3077,6 +3101,11 @@ is-number@^7.0.0:
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+is-object@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
+ integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
+
is-plain-obj@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -3087,7 +3116,7 @@ is-promise@^2.2.2:
resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-is-regex@^1.1.1, is-regex@^1.1.3:
+is-regex@^1.1.1, is-regex@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -3105,7 +3134,7 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-is-string@^1.0.5, is-string@^1.0.6:
+is-string@^1.0.5, is-string@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
@@ -3119,7 +3148,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
dependencies:
has-symbols "^1.0.2"
-is-typed-array@^1.1.3:
+is-typed-array@^1.1.3, is-typed-array@^1.1.7:
version "1.1.8"
resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79"
integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==
@@ -3130,17 +3159,6 @@ is-typed-array@^1.1.3:
foreach "^2.0.5"
has-tostringtag "^1.0.0"
-is-typed-array@^1.1.6:
- version "1.1.7"
- resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.7.tgz#881ddc660b13cb8423b2090fa88c0fe37a83eb2f"
- integrity sha512-VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA==
- dependencies:
- available-typed-arrays "^1.0.4"
- call-bind "^1.0.2"
- es-abstract "^1.18.5"
- foreach "^2.0.5"
- has-tostringtag "^1.0.0"
-
is-typedarray@^1.0.0, is-typedarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -3252,43 +3270,43 @@ istanbul-reports@^3.0.2:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"
-jest-diff@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz#4a7a19ee6f04ad70e0e3388f35829394a44c7b5e"
- integrity sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==
+jest-diff@^27.2.0:
+ version "27.2.0"
+ resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.2.0.tgz#bda761c360f751bab1e7a2fe2fc2b0a35ce8518c"
+ integrity sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==
dependencies:
chalk "^4.0.0"
diff-sequences "^27.0.6"
jest-get-type "^27.0.6"
- pretty-format "^27.0.6"
+ pretty-format "^27.2.0"
jest-get-type@^27.0.6:
version "27.0.6"
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe"
integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==
-jest-matcher-utils@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz#2a8da1e86c620b39459f4352eaa255f0d43e39a9"
- integrity sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==
+jest-matcher-utils@^27.2.0:
+ version "27.2.0"
+ resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.0.tgz#b4d224ab88655d5fab64b96b989ac349e2f5da43"
+ integrity sha512-F+LG3iTwJ0gPjxBX6HCyrARFXq6jjiqhwBQeskkJQgSLeF1j6ui1RTV08SR7O51XTUhtc8zqpDj8iCG4RGmdKw==
dependencies:
chalk "^4.0.0"
- jest-diff "^27.0.6"
+ jest-diff "^27.2.0"
jest-get-type "^27.0.6"
- pretty-format "^27.0.6"
+ pretty-format "^27.2.0"
-jest-message-util@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz#158bcdf4785706492d164a39abca6a14da5ab8b5"
- integrity sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==
+jest-message-util@^27.2.0:
+ version "27.2.0"
+ resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.2.0.tgz#2f65c71df55267208686b1d7514e18106c91ceaf"
+ integrity sha512-y+sfT/94CiP8rKXgwCOzO1mUazIEdEhrLjuiu+RKmCP+8O/TJTSne9dqQRbFIHBtlR2+q7cddJlWGir8UATu5w==
dependencies:
"@babel/code-frame" "^7.12.13"
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.1.1"
"@types/stack-utils" "^2.0.0"
chalk "^4.0.0"
graceful-fs "^4.2.4"
micromatch "^4.0.4"
- pretty-format "^27.0.6"
+ pretty-format "^27.2.0"
slash "^3.0.0"
stack-utils "^2.0.3"
@@ -3391,7 +3409,7 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
-json5@^2.1.1, json5@^2.1.2, json5@^2.2.0:
+json5@^2.1.1, json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -3683,7 +3701,7 @@ memoizee@^0.4.14:
next-tick "^1.1.0"
timers-ext "^0.1.7"
-merge-descriptors@1.0.1:
+merge-descriptors@1.0.1, merge-descriptors@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
@@ -3803,6 +3821,11 @@ mocha@9.1.1:
yargs-parser "20.2.4"
yargs-unparser "2.0.0"
+module-not-found-error@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
+ integrity sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=
+
moment-timezone@0.5.33, moment-timezone@^0.5.31:
version "0.5.33"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
@@ -3851,9 +3874,9 @@ natural-compare@^1.4.0:
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
needle@^2.2.1:
- version "2.8.0"
- resolved "https://registry.yarnpkg.com/needle/-/needle-2.8.0.tgz#1c8ef9c1a2c29dcc1e83d73809d7bc681c80a048"
- integrity sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==
+ version "2.9.1"
+ resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684"
+ integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
dependencies:
debug "^3.2.6"
iconv-lite "^0.4.4"
@@ -3948,10 +3971,10 @@ node-preload@^0.2.1:
dependencies:
process-on-spawn "^1.0.0"
-node-releases@^1.1.73:
- version "1.1.74"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e"
- integrity sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw==
+node-releases@^1.1.75:
+ version "1.1.75"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+ integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
"nopt@2 || 3":
version "3.0.6"
@@ -4499,12 +4522,12 @@ prettier@2.2.1:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
-pretty-format@^27.0.6:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f"
- integrity sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==
+pretty-format@^27.2.0:
+ version "27.2.0"
+ resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.0.tgz#ee37a94ce2a79765791a8649ae374d468c18ef19"
+ integrity sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==
dependencies:
- "@jest/types" "^27.0.6"
+ "@jest/types" "^27.1.1"
ansi-regex "^5.0.0"
ansi-styles "^5.0.0"
react-is "^17.0.1"
@@ -4546,6 +4569,15 @@ proxy-addr@~2.0.5:
forwarded "0.2.0"
ipaddr.js "1.9.1"
+proxyquire@2.1.3:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/proxyquire/-/proxyquire-2.1.3.tgz#2049a7eefa10a9a953346a18e54aab2b4268df39"
+ integrity sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==
+ dependencies:
+ fill-keys "^1.0.2"
+ module-not-found-error "^1.0.1"
+ resolve "^1.11.1"
+
pseudomap@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -4811,7 +4843,7 @@ resolve-from@^5.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-resolve@^1.0.0, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.20.0, resolve@^1.5.0:
+resolve@^1.0.0, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.20.0, resolve@^1.5.0:
version "1.20.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -5041,9 +5073,9 @@ sigmund@^1.0.1:
integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
signal-exit@^3.0.0, signal-exit@^3.0.2:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7"
+ integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==
simple-swizzle@^0.2.2:
version "0.2.2"
@@ -5078,10 +5110,10 @@ slice-ansi@^4.0.0:
astral-regex "^2.0.0"
is-fullwidth-code-point "^3.0.0"
-source-map-support@^0.5.12, source-map-support@^0.5.17, source-map-support@^0.5.6:
- version "0.5.19"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
- integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@^0.5.12, source-map-support@^0.5.17, source-map-support@^0.5.20, source-map-support@^0.5.6:
+ version "0.5.20"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+ integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
@@ -5182,11 +5214,12 @@ stack-trace@0.0.x:
integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
stack-utils@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
- integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.4.tgz#bf967ae2813d3d2d1e1f59a4408676495c8112ab"
+ integrity sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==
dependencies:
escape-string-regexp "^2.0.0"
+ source-map-support "^0.5.20"
"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
version "1.5.0"
@@ -5363,9 +5396,9 @@ swagger-parser@10.0.2:
"@apidevtools/swagger-parser" "10.0.2"
swagger-ui-dist@^3.18.1:
- version "3.52.0"
- resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.52.0.tgz#cb16ec6dcdf134ff47cbfe57cba7be7748429142"
- integrity sha512-SGfhW8FCih00QG59PphdeAUtTNw7HS5k3iPqDZowerPw9mcbhKchUb12kbROk99c1X6RTWW1gB1kqgfnYGuCSg==
+ version "3.52.2"
+ resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.52.2.tgz#30ed9cfa64043651b62f7662681181e21abf0fe2"
+ integrity sha512-k6QsJqDxfkMlelFUobIKRggR9y5BPvhr/ok9IUPlpnAQsytCx8SSKtNOFkf+W5yZi1Zh6X8GAz2picmmvZBSIw==
swagger-ui-express@4.1.6:
version "4.1.6"
@@ -5396,9 +5429,9 @@ tar@^2.0.0:
inherits "2"
tar@^4:
- version "4.4.17"
- resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.17.tgz#44be5e3fa8353ee1d11db3b1401561223a5c3985"
- integrity sha512-q7OwXq6NTdcYIa+k58nEMV3j1euhDhGCs/VRw9ymx/PbH0jtIM2+VTgDE/BW3rbLkrBUXs5fzEKgic5oUciu7g==
+ version "4.4.19"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
+ integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
dependencies:
chownr "^1.1.4"
fs-minipass "^1.2.7"
@@ -5556,7 +5589,7 @@ ts-node@^9.0.0:
source-map-support "^0.5.17"
yn "3.1.1"
-tsconfig-paths@3.11.0, tsconfig-paths@^3.11.0:
+tsconfig-paths@3.11.0, tsconfig-paths@^3.11.0, tsconfig-paths@^3.5.0, tsconfig-paths@^3.9.0:
version "3.11.0"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
@@ -5566,15 +5599,6 @@ tsconfig-paths@3.11.0, tsconfig-paths@^3.11.0:
minimist "^1.2.0"
strip-bom "^3.0.0"
-tsconfig-paths@^3.5.0, tsconfig-paths@^3.9.0:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
- integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
- dependencies:
- json5 "^2.2.0"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
-
tsconfig-replace-paths@0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/tsconfig-replace-paths/-/tsconfig-replace-paths-0.0.5.tgz#a9bf058604c50de5cab285c0eb0ed9b7d944d5ac"
@@ -5657,7 +5681,7 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-type@^2.0.0:
+type@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
@@ -5806,16 +5830,16 @@ which-module@^2.0.0:
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
which-typed-array@^1.1.2:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.6.tgz#f3713d801da0720a7f26f50c596980a9f5c8b383"
- integrity sha512-DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q==
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793"
+ integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==
dependencies:
- available-typed-arrays "^1.0.4"
+ available-typed-arrays "^1.0.5"
call-bind "^1.0.2"
es-abstract "^1.18.5"
foreach "^2.0.5"
has-tostringtag "^1.0.0"
- is-typed-array "^1.1.6"
+ is-typed-array "^1.1.7"
which@1:
version "1.3.1"
diff --git a/services/contact-form/craco.config.js b/services/contact-form/craco.config.js
index 78ee2bd..7a9ce4f 100644
--- a/services/contact-form/craco.config.js
+++ b/services/contact-form/craco.config.js
@@ -1,6 +1,7 @@
const CracoLessPlugin = require('craco-less');
const GenerateJsonPlugin = require('generate-json-webpack-plugin');
const { LicenseWebpackPlugin } = require('license-webpack-plugin');
+const CompressionPlugin = require('compression-webpack-plugin');
const { THEME } = require('./ant.theme');
@@ -22,6 +23,11 @@ module.exports = {
webpack: {
plugins: {
add: [
+ new CompressionPlugin({
+ algorithm: 'gzip',
+ test: /\.(js|css|html|svg|json|ico|eot|otf|ttf)$/,
+ deleteOriginalAssets: false,
+ }),
new LicenseWebpackPlugin({
perChunkOutput: false,
outputFilename: 'licenses.json',
diff --git a/services/contact-form/jest.setup.js b/services/contact-form/jest.setup.js
index f9b7287..7b0828b 100644
--- a/services/contact-form/jest.setup.js
+++ b/services/contact-form/jest.setup.js
@@ -1,4 +1 @@
import '@testing-library/jest-dom';
-import replaceAllInserter from 'string.prototype.replaceall';
-
-replaceAllInserter.shim();
diff --git a/services/contact-form/nginx.conf b/services/contact-form/nginx.conf
index 8fae192..e98cca4 100644
--- a/services/contact-form/nginx.conf
+++ b/services/contact-form/nginx.conf
@@ -41,6 +41,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload";
location /contact-form {
+ gzip_static on;
rewrite ^/contact-form/(.*)$ /$1 break;
try_files $uri /index.html;
}
diff --git a/services/contact-form/package.json b/services/contact-form/package.json
index 52b4781..aeb1ac8 100644
--- a/services/contact-form/package.json
+++ b/services/contact-form/package.json
@@ -1,6 +1,6 @@
{
"name": "@lucaapp/contact-form",
- "version": "2.0.2",
+ "version": "2.1.0",
"private": true,
"license": "Apache-2.0",
"author": "Culture4Life <hello@luca-app.de> (https://www.luca-app.de/)",
@@ -21,6 +21,7 @@
"@lucaapp/crypto": "2.1.2",
"antd": "4.16.13",
"base64-loader": "1.0.0",
+ "compression-webpack-plugin": "6.1.1",
"connected-react-router": "6.9.1",
"craco-less": "1.20.0",
"generate-json-webpack-plugin": "1.0.0",
@@ -65,7 +66,6 @@
"jest-runner": "27.2.0",
"postcss": "8.3.6",
"prettier": "2.2.1",
- "string.prototype.replaceall": "1.0.5",
"stylelint": "13.13.1",
"stylelint-config-prettier": "8.0.2",
"stylelint-config-recommended": "4.0.0",
diff --git a/services/contact-form/src/components/general/Buttons.styled.js b/services/contact-form/src/components/general/Buttons.styled.js
index dcbcd16..adf38ff 100644
--- a/services/contact-form/src/components/general/Buttons.styled.js
+++ b/services/contact-form/src/components/general/Buttons.styled.js
@@ -18,10 +18,10 @@ const ButtonGeneral = {
export const PrimaryButton = styled(Button)`
${{ ...ButtonGeneral }}
- background: ${({ isButtonWhite }) =>
- isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
+ background: ${({ $isButtonWhite }) =>
+ $isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
border: 2px solid
- ${({ isButtonWhite }) => (isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
+ ${({ $isButtonWhite }) => ($isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
border-radius: 24px;
color: rgba(0, 0, 0, 0.87);
cursor: pointer;
diff --git a/services/contact-form/yarn.lock b/services/contact-form/yarn.lock
index c3bf0d7..2155189 100644
--- a/services/contact-form/yarn.lock
+++ b/services/contact-form/yarn.lock
@@ -26,9 +26,9 @@
rc-util "^5.9.4"
"@ant-design/react-slick@~0.28.1":
- version "0.28.3"
- resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.3.tgz#ad5cf1cf50363c1a3842874d69d0ce1f26696e71"
- integrity sha512-u3onF2VevGRbkGbgpldVX/nzd7LFtLeZJE0x2xIFT2qYHKkJZ6QT/jQ7KqYK4UpeTndoyrbMqLN4DiJza4BVBg==
+ version "0.28.4"
+ resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.4.tgz#8b296b87ad7c7ae877f2a527b81b7eebd9dd29a9"
+ integrity sha512-j9eAHTn7GxbXUFNknJoHS2ceAsqrQi2j8XykjZE1IXCD8kJF+t28EvhBLniDpbOsBk/3kjalnhriTfZcjBHNqg==
dependencies:
"@babel/runtime" "^7.10.4"
classnames "^2.2.5"
@@ -57,7 +57,7 @@
dependencies:
"@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0":
+"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
@@ -85,19 +85,19 @@
source-map "^0.5.0"
"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
- integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
+ version "7.15.5"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
+ integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helpers" "^7.14.8"
- "@babel/parser" "^7.15.0"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-compilation-targets" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
+ "@babel/helpers" "^7.15.4"
+ "@babel/parser" "^7.15.5"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -106,24 +106,15 @@
source-map "^0.5.0"
"@babel/eslint-parser@^7.12.16":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz#b54f06e04d0e93aebcba99f89251e3bf0ee39f21"
- integrity sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.4.tgz#46385943726291fb3e8db99522c8099b15684387"
+ integrity sha512-hPMIAmGNbmQzXJIo2P43Zj9UhRmGev5f9nqdBFOWNGDGh6XKmjby79woBvg6y0Jur6yRfQBneDbUQ8ZVc1krFw==
dependencies:
eslint-scope "^5.1.1"
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.12.1", "@babel/generator@^7.15.0", "@babel/generator@^7.7.2":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
- integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==
- dependencies:
- "@babel/types" "^7.15.0"
- jsesc "^2.5.1"
- source-map "^0.5.0"
-
-"@babel/generator@^7.15.4":
+"@babel/generator@^7.12.1", "@babel/generator@^7.15.4", "@babel/generator@^7.7.2":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
@@ -132,14 +123,7 @@
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
- integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-annotate-as-pure@^7.15.4":
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
@@ -147,24 +131,14 @@
"@babel/types" "^7.15.4"
"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
- integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
- dependencies:
- "@babel/helper-explode-assignable-expression" "^7.14.5"
- "@babel/types" "^7.14.5"
-
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818"
- integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+ integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
dependencies:
- "@babel/compat-data" "^7.15.0"
- "@babel/helper-validator-option" "^7.14.5"
- browserslist "^4.16.6"
- semver "^6.3.0"
+ "@babel/helper-explode-assignable-expression" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-compilation-targets@^7.15.4":
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
@@ -174,19 +148,7 @@
browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7"
- integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-split-export-declaration" "^7.14.5"
-
-"@babel/helper-create-class-features-plugin@^7.15.4":
+"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
@@ -220,23 +182,14 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
- integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-function-name@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
- integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+"@babel/helper-explode-assignable-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+ integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
dependencies:
- "@babel/helper-get-function-arity" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-function-name@^7.15.4":
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
@@ -245,13 +198,6 @@
"@babel/template" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-get-function-arity@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
- integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-get-function-arity@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
@@ -259,13 +205,6 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-hoist-variables@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
- integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-hoist-variables@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
@@ -273,13 +212,6 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-member-expression-to-functions@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b"
- integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==
- dependencies:
- "@babel/types" "^7.15.0"
-
"@babel/helper-member-expression-to-functions@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
@@ -287,35 +219,14 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
- integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-module-imports@^7.15.4":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08"
- integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==
- dependencies:
- "@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-simple-access" "^7.14.8"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.9"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
-
-"@babel/helper-module-transforms@^7.15.4":
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz#962cc629a7f7f9a082dd62d0307fa75fe8788d7c"
integrity sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==
@@ -329,13 +240,6 @@
"@babel/traverse" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-optimise-call-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
- integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-optimise-call-expression@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
@@ -348,16 +252,7 @@
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-"@babel/helper-remap-async-to-generator@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
- integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-wrap-function" "^7.14.5"
- "@babel/types" "^7.14.5"
-
-"@babel/helper-remap-async-to-generator@^7.15.4":
+"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
@@ -366,17 +261,7 @@
"@babel/helper-wrap-function" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4"
- integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==
- dependencies:
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
-
-"@babel/helper-replace-supers@^7.15.4":
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
@@ -386,13 +271,6 @@
"@babel/traverse" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-simple-access@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
- integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
- dependencies:
- "@babel/types" "^7.14.8"
-
"@babel/helper-simple-access@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
@@ -400,27 +278,13 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
- integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-split-export-declaration@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
- integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-split-export-declaration@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
@@ -438,16 +302,6 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-"@babel/helper-wrap-function@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
- integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
- dependencies:
- "@babel/helper-function-name" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
-
"@babel/helper-wrap-function@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
@@ -458,14 +312,14 @@
"@babel/traverse" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.8":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357"
- integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+ integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
dependencies:
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
version "7.14.5"
@@ -476,25 +330,11 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.8.3":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
- integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
-
-"@babel/parser@^7.15.4":
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.15.4", "@babel/parser@^7.15.5", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.8.3":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
- integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
- "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
@@ -504,16 +344,7 @@
"@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a"
- integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-remap-async-to-generator" "^7.14.5"
- "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-async-generator-functions@^7.15.4":
+"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
@@ -538,15 +369,6 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-class-static-block@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
- integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
- dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
"@babel/plugin-proposal-class-static-block@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
@@ -629,18 +451,7 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
- integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
- dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.14.5"
-
-"@babel/plugin-proposal-object-rest-spread@^7.15.6":
+"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.15.6":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
@@ -685,16 +496,6 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-private-property-in-object@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
- integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-create-class-features-plugin" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
"@babel/plugin-proposal-private-property-in-object@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
@@ -876,27 +677,14 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.5", "@babel/plugin-transform-block-scoping@^7.15.3":
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.15.3":
version "7.15.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f"
- integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- globals "^11.1.0"
-
-"@babel/plugin-transform-classes@^7.15.4":
+"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
@@ -954,14 +742,7 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-flow" "^7.12.1"
-"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
- integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-for-of@^7.15.4":
+"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
@@ -999,17 +780,7 @@
"@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281"
- integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==
- dependencies:
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.8"
- babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.15.4":
+"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
@@ -1019,18 +790,7 @@
"@babel/helper-simple-access" "^7.15.4"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
- integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
- dependencies:
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.5"
- babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.15.4":
+"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
@@ -1071,14 +831,7 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-replace-supers" "^7.14.5"
-"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
- integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-parameters@^7.15.4":
+"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
@@ -1214,11 +967,11 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-typescript@^7.12.1":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e"
- integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
+ integrity sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.15.0"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript" "^7.14.5"
@@ -1309,7 +1062,7 @@
core-js-compat "^3.6.2"
semver "^5.5.0"
-"@babel/preset-env@7.15.6":
+"@babel/preset-env@7.15.6", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
@@ -1388,85 +1141,6 @@
core-js-compat "^3.16.0"
semver "^6.3.0"
-"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464"
- integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==
- dependencies:
- "@babel/compat-data" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-async-generator-functions" "^7.14.9"
- "@babel/plugin-proposal-class-properties" "^7.14.5"
- "@babel/plugin-proposal-class-static-block" "^7.14.5"
- "@babel/plugin-proposal-dynamic-import" "^7.14.5"
- "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
- "@babel/plugin-proposal-json-strings" "^7.14.5"
- "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
- "@babel/plugin-proposal-numeric-separator" "^7.14.5"
- "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
- "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
- "@babel/plugin-proposal-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-private-methods" "^7.14.5"
- "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
- "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
- "@babel/plugin-syntax-async-generators" "^7.8.4"
- "@babel/plugin-syntax-class-properties" "^7.12.13"
- "@babel/plugin-syntax-class-static-block" "^7.14.5"
- "@babel/plugin-syntax-dynamic-import" "^7.8.3"
- "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
- "@babel/plugin-syntax-json-strings" "^7.8.3"
- "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
- "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
- "@babel/plugin-syntax-numeric-separator" "^7.10.4"
- "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
- "@babel/plugin-syntax-optional-chaining" "^7.8.3"
- "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
- "@babel/plugin-syntax-top-level-await" "^7.14.5"
- "@babel/plugin-transform-arrow-functions" "^7.14.5"
- "@babel/plugin-transform-async-to-generator" "^7.14.5"
- "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
- "@babel/plugin-transform-block-scoping" "^7.14.5"
- "@babel/plugin-transform-classes" "^7.14.9"
- "@babel/plugin-transform-computed-properties" "^7.14.5"
- "@babel/plugin-transform-destructuring" "^7.14.7"
- "@babel/plugin-transform-dotall-regex" "^7.14.5"
- "@babel/plugin-transform-duplicate-keys" "^7.14.5"
- "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
- "@babel/plugin-transform-for-of" "^7.14.5"
- "@babel/plugin-transform-function-name" "^7.14.5"
- "@babel/plugin-transform-literals" "^7.14.5"
- "@babel/plugin-transform-member-expression-literals" "^7.14.5"
- "@babel/plugin-transform-modules-amd" "^7.14.5"
- "@babel/plugin-transform-modules-commonjs" "^7.15.0"
- "@babel/plugin-transform-modules-systemjs" "^7.14.5"
- "@babel/plugin-transform-modules-umd" "^7.14.5"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
- "@babel/plugin-transform-new-target" "^7.14.5"
- "@babel/plugin-transform-object-super" "^7.14.5"
- "@babel/plugin-transform-parameters" "^7.14.5"
- "@babel/plugin-transform-property-literals" "^7.14.5"
- "@babel/plugin-transform-regenerator" "^7.14.5"
- "@babel/plugin-transform-reserved-words" "^7.14.5"
- "@babel/plugin-transform-shorthand-properties" "^7.14.5"
- "@babel/plugin-transform-spread" "^7.14.6"
- "@babel/plugin-transform-sticky-regex" "^7.14.5"
- "@babel/plugin-transform-template-literals" "^7.14.5"
- "@babel/plugin-transform-typeof-symbol" "^7.14.5"
- "@babel/plugin-transform-unicode-escapes" "^7.14.5"
- "@babel/plugin-transform-unicode-regex" "^7.14.5"
- "@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.15.0"
- babel-plugin-polyfill-corejs2 "^0.2.2"
- babel-plugin-polyfill-corejs3 "^0.2.2"
- babel-plugin-polyfill-regenerator "^0.2.2"
- core-js-compat "^3.16.0"
- semver "^6.3.0"
-
"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
@@ -1512,9 +1186,9 @@
"@babel/plugin-transform-typescript" "^7.12.1"
"@babel/runtime-corejs3@^7.10.2":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d"
- integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz#403139af262b9a6e8f9ba04a6fdcebf8de692bf1"
+ integrity sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==
dependencies:
core-js-pure "^3.16.0"
regenerator-runtime "^0.13.4"
@@ -1526,30 +1200,14 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
- integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
- dependencies:
- regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.12.13":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.10.4", "@babel/template@^7.14.5", "@babel/template@^7.3.3":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
- integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.14.5"
- "@babel/types" "^7.14.5"
-
-"@babel/template@^7.15.4":
+"@babel/template@^7.10.4", "@babel/template@^7.15.4", "@babel/template@^7.3.3":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
@@ -1558,22 +1216,7 @@
"@babel/parser" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
- integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.15.0"
- "@babel/types" "^7.15.0"
- debug "^4.1.0"
- globals "^11.1.0"
-
-"@babel/traverse@^7.15.4":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
@@ -1588,15 +1231,7 @@
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
- integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
- dependencies:
- "@babel/helper-validator-identifier" "^7.14.9"
- to-fast-properties "^2.0.0"
-
-"@babel/types@^7.15.4", "@babel/types@^7.15.6":
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
@@ -1749,6 +1384,11 @@
intl-messageformat "9.9.1"
tslib "^2.1.0"
+"@gar/promisify@^1.0.1":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
+ integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+
"@hapi/address@2.x.x":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -2114,6 +1754,14 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
+"@npmcli/fs@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f"
+ integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==
+ dependencies:
+ "@gar/promisify" "^1.0.1"
+ semver "^7.3.5"
+
"@npmcli/move-file@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -2330,9 +1978,9 @@
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
- version "7.1.15"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024"
- integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==
+ version "7.1.16"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
+ integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
@@ -2428,12 +2076,12 @@
"@types/istanbul-lib-report" "*"
"@types/jest@*":
- version "27.0.0"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.0.tgz#f1c28f741371739c7cd0e8edb5ed8e67acfa6c35"
- integrity sha512-IlpQZVpxufe+3qPaAqEoSPHVSxnJh1cf0BqqWHJeKiAUbwnHdmNzjP3ZCWSZSTbmAGXQPNk9QmM3Bif0pR54rg==
+ version "27.0.1"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.1.tgz#fafcc997da0135865311bb1215ba16dba6bdf4ca"
+ integrity sha512-HTLpVXHrY69556ozYkcq47TtQJXpcWAWfkoqz+ZGz2JnmZhzlRjprCIyFnetSy8gpDWwTTGBcRVv1J1I1vBrHw==
dependencies:
- jest-diff "^26.0.0"
- pretty-format "^26.0.0"
+ jest-diff "^27.0.0"
+ pretty-format "^27.0.0"
"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
version "7.0.9"
@@ -2446,9 +2094,9 @@
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
"@types/mdast@^3.0.0":
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.7.tgz#cba63d0cc11eb1605cea5c0ad76e02684394166b"
- integrity sha512-YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg==
+ version "3.0.10"
+ resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+ integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
dependencies:
"@types/unist" "*"
@@ -2463,9 +2111,9 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/node@*":
- version "16.4.13"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d"
- integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==
+ version "16.9.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9"
+ integrity sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@@ -2502,16 +2150,7 @@
hoist-non-react-statics "^3.3.0"
redux "^4.0.0"
-"@types/react@*":
- version "17.0.17"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.17.tgz#1772d3d5425128e0635a716f49ef57c2955df055"
- integrity sha512-nrfi7I13cAmrd0wje8czYpf5SFbryczCtPzFc6ijqvdjKcyA3tCvGxwchOUlxb2ucBPuJ9Y3oUqKrRqZvrz0lw==
- dependencies:
- "@types/prop-types" "*"
- "@types/scheduler" "*"
- csstype "^3.0.2"
-
-"@types/react@17":
+"@types/react@*", "@types/react@17":
version "17.0.21"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.21.tgz#069c43177cd419afaab5ce26bb4e9056549f7ea6"
integrity sha512-GzzXCpOthOjXvrAUFQwU/svyxu658cwu00Q9ugujS4qc1zXgLFaO0kS2SLOaMWLt2Jik781yuHCWB7UcYdGAeQ==
@@ -2585,9 +2224,9 @@
source-map "^0.6.1"
"@types/webpack@^4.41.8":
- version "4.41.30"
- resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc"
- integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==
+ version "4.41.31"
+ resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa"
+ integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==
dependencies:
"@types/node" "*"
"@types/tapable" "^1"
@@ -2616,27 +2255,27 @@
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz#808d206e2278e809292b5de752a91105da85860b"
- integrity sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz#e938603a136f01dcabeece069da5fb2e331d4498"
+ integrity sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==
dependencies:
- "@typescript-eslint/experimental-utils" "4.29.1"
- "@typescript-eslint/scope-manager" "4.29.1"
+ "@typescript-eslint/experimental-utils" "4.31.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
debug "^4.3.1"
functional-red-black-tree "^1.0.1"
regexpp "^3.1.0"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@4.29.1", "@typescript-eslint/experimental-utils@^4.0.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz#0af2b17b0296b60c6b207f11062119fa9c5a8994"
- integrity sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==
+"@typescript-eslint/experimental-utils@4.31.1", "@typescript-eslint/experimental-utils@^4.0.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz#0c900f832f270b88e13e51753647b02d08371ce5"
+ integrity sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==
dependencies:
"@types/json-schema" "^7.0.7"
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
@@ -2652,32 +2291,32 @@
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d"
- integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.1.tgz#8f9a2672033e6f6d33b1c0260eebdc0ddf539064"
+ integrity sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==
dependencies:
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
debug "^4.3.1"
-"@typescript-eslint/scope-manager@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358"
- integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==
+"@typescript-eslint/scope-manager@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz#0c21e8501f608d6a25c842fcf59541ef4f1ab561"
+ integrity sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
"@typescript-eslint/types@3.10.1":
version "3.10.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
-"@typescript-eslint/types@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
- integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
+"@typescript-eslint/types@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.1.tgz#5f255b695627a13401d2fdba5f7138bc79450d66"
+ integrity sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==
"@typescript-eslint/typescript-estree@3.10.1":
version "3.10.1"
@@ -2693,13 +2332,13 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f"
- integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==
+"@typescript-eslint/typescript-estree@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz#4a04d5232cf1031232b7124a9c0310b577a62d17"
+ integrity sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
debug "^4.3.1"
globby "^11.0.3"
is-glob "^4.0.1"
@@ -2713,12 +2352,12 @@
dependencies:
eslint-visitor-keys "^1.1.0"
-"@typescript-eslint/visitor-keys@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d"
- integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==
+"@typescript-eslint/visitor-keys@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz#f2e7a14c7f20c4ae07d7fc3c5878c4441a1da9cc"
+ integrity sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
eslint-visitor-keys "^2.0.0"
"@webassemblyjs/ast@1.9.0":
@@ -2918,9 +2557,9 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.2.4:
- version "8.4.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
- integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+ integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
address@1.1.2, address@^1.0.1:
version "1.1.2"
@@ -2971,9 +2610,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^8.0.1:
- version "8.6.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
- integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
+ version "8.6.3"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+ integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -3018,9 +2657,9 @@ ansi-regex@^4.1.0:
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
ansi-regex@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
- integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+ integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1"
@@ -3154,7 +2793,7 @@ array-flatten@^2.1.0:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.1.1, array-includes@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -3330,9 +2969,9 @@ available-typed-arrays@^1.0.5:
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
axe-core@^4.0.2:
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.2.tgz#fcf8777b82c62cfc69c7e9f32c0d2226287680e7"
- integrity sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg==
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.3.tgz#b55cd8e8ddf659fe89b064680e1c6a4dceab0325"
+ integrity sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==
axobject-query@^2.2.0:
version "2.2.0"
@@ -3608,9 +3247,9 @@ bfj@^7.0.2:
tryer "^1.0.1"
big-integer@^1.6.16:
- version "1.6.48"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
- integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
+ version "1.6.49"
+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.49.tgz#f6817d3ea5d4f3fb19e24df9f4b1b4471a8328ce"
+ integrity sha512-KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw==
big.js@^5.2.2:
version "5.2.2"
@@ -3798,7 +3437,7 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.16.7, browserslist@^4.6.2, browserslist@^4.6.4:
+browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.0, browserslist@^4.6.2, browserslist@^4.6.4:
version "4.16.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -3887,10 +3526,11 @@ cacache@^12.0.2:
y18n "^4.0.0"
cacache@^15.0.5:
- version "15.2.0"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389"
- integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==
+ version "15.3.0"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+ integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
dependencies:
+ "@npmcli/fs" "^1.0.0"
"@npmcli/move-file" "^1.0.1"
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -3999,9 +3639,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001255"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"
- integrity sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==
+ version "1.0.30001258"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz#b604eed80cc54a578e4bf5a02ae3ed49f869d252"
+ integrity sha512-RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA==
capture-exit@^2.0.0:
version "2.0.0"
@@ -4278,9 +3918,9 @@ color@^3.0.0:
color-string "^1.6.0"
colorette@^1.2.1, colorette@^1.2.2:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
- integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+ integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
combined-stream@^1.0.8:
version "1.0.8"
@@ -4328,6 +3968,17 @@ compressible@~2.0.16:
dependencies:
mime-db ">= 1.43.0 < 2"
+compression-webpack-plugin@6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz#ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"
+ integrity sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==
+ dependencies:
+ cacache "^15.0.5"
+ find-cache-dir "^3.3.1"
+ schema-utils "^3.0.0"
+ serialize-javascript "^5.0.1"
+ webpack-sources "^1.4.3"
+
compression@^1.7.4:
version "1.7.4"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
@@ -4465,17 +4116,17 @@ copy-to-clipboard@^3.2.0:
toggle-selection "^1.0.6"
core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.2:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d"
- integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.17.3.tgz#b39c8e4dec71ecdc735c653ce5233466e561324e"
+ integrity sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==
dependencies:
- browserslist "^4.16.7"
+ browserslist "^4.17.0"
semver "7.0.0"
core-js-pure@^3.16.0:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e"
- integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.17.3.tgz#98ea3587188ab7ef4695db6518eeb71aec42604a"
+ integrity sha512-YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ==
core-js@^2.4.0:
version "2.6.12"
@@ -4483,14 +4134,14 @@ core-js@^2.4.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.5:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249"
- integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e"
+ integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==
core-util-is@~1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
- integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
cosmiconfig@^5.0.0:
version "5.2.1"
@@ -4514,9 +4165,9 @@ cosmiconfig@^6.0.0:
yaml "^1.7.2"
cosmiconfig@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
- integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
dependencies:
"@types/parse-json" "^4.0.0"
import-fresh "^3.2.1"
@@ -4856,9 +4507,9 @@ cssstyle@^2.3.0:
cssom "~0.3.6"
csstype@^3.0.2:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
- integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b"
+ integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==
cyclist@^1.0.1:
version "1.0.1"
@@ -4888,14 +4539,14 @@ data-urls@^2.0.0:
whatwg-url "^8.0.0"
date-fns@2.x:
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
- integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
+ version "2.24.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d"
+ integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==
dayjs@1.x:
- version "1.10.6"
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
- integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==
+ version "1.10.7"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
+ integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
@@ -4959,9 +4610,9 @@ deep-equal@^1.0.1:
regexp.prototype.flags "^1.2.0"
deep-is@^0.1.3, deep-is@~0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
- integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+ integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
deepmerge@^4.2.2:
version "4.2.2"
@@ -5183,9 +4834,9 @@ domhandler@^2.3.0:
domelementtype "1"
domhandler@^4.0.0, domhandler@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
- integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
+ integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
dependencies:
domelementtype "^2.2.0"
@@ -5198,9 +4849,9 @@ domutils@^1.5.1, domutils@^1.7.0:
domelementtype "1"
domutils@^2.5.2, domutils@^2.6.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
- integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+ integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
dependencies:
dom-serializer "^1.0.1"
domelementtype "^2.2.0"
@@ -5264,9 +4915,9 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.723:
- version "1.3.802"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz#0afa989321de3e904ac653ee79e0d642883731a1"
- integrity sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg==
+ version "1.3.842"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f"
+ integrity sha512-P/nDMPIYdb2PyqCQwhTXNi5JFjX1AsDVR0y6FrHw752izJIAJ+Pn5lugqyBq4tXeRSZBMBb2ZGvRGB1djtELEQ==
elliptic@6.5.4, elliptic@^6.5.3:
version "6.5.4"
@@ -5375,30 +5026,7 @@ error-stack-parser@^2.0.6:
dependencies:
stackframe "^1.1.1"
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
- version "1.18.5"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19"
- integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==
- dependencies:
- call-bind "^1.0.2"
- es-to-primitive "^1.2.1"
- function-bind "^1.1.1"
- get-intrinsic "^1.1.1"
- has "^1.0.3"
- has-symbols "^1.0.2"
- internal-slot "^1.0.3"
- is-callable "^1.2.3"
- is-negative-zero "^2.0.1"
- is-regex "^1.1.3"
- is-string "^1.0.6"
- object-inspect "^1.11.0"
- object-keys "^1.1.1"
- object.assign "^4.1.2"
- string.prototype.trimend "^1.0.4"
- string.prototype.trimstart "^1.0.4"
- unbox-primitive "^1.0.1"
-
-es-abstract@^1.18.5:
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5:
version "1.18.6"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
@@ -5529,14 +5157,6 @@ eslint-config-react-app@^6.0.0:
dependencies:
confusing-browser-globals "^1.0.10"
-eslint-import-resolver-node@^0.3.5:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.5.tgz#939bbb0f74e179e757ca87f7a4a890dabed18ac4"
- integrity sha512-XMoPKjSpXbkeJ7ZZ9icLnJMTY5Mc1kZbCakHquaFsXPpyWOwK0TK6CODO+0ca54UoM9LKOxyUNnoVZRl8TeaAg==
- dependencies:
- debug "^3.2.7"
- resolve "^1.20.0"
-
eslint-import-resolver-node@^0.3.6:
version "0.3.6"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
@@ -5554,14 +5174,14 @@ eslint-module-utils@^2.6.2:
pkg-dir "^2.0.0"
eslint-plugin-flowtype@^5.2.0:
- version "5.9.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.9.0.tgz#8d2d81d3d79bb53470ed62b97409b31684757e30"
- integrity sha512-aBUVPA5Wt0XyuV3Wg8flfVqYJR6yR2nRLuyPwoTjCg5VTk4G1X1zQpInr39tUGgRxqrA+d+B9GYK4+/d1i0Rfw==
+ version "5.10.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz#7764cc63940f215bf3f0bd2d9a1293b2b9b2b4bb"
+ integrity sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==
dependencies:
lodash "^4.17.15"
string-natural-compare "^3.0.1"
-eslint-plugin-import@2.24.2:
+eslint-plugin-import@2.24.2, eslint-plugin-import@^2.22.1:
version "2.24.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
@@ -5582,31 +5202,10 @@ eslint-plugin-import@2.24.2:
resolve "^1.20.0"
tsconfig-paths "^3.11.0"
-eslint-plugin-import@^2.22.1:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz#697ffd263e24da5e84e03b282f5fb62251777177"
- integrity sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg==
- dependencies:
- array-includes "^3.1.3"
- array.prototype.flat "^1.2.4"
- debug "^2.6.9"
- doctrine "^2.1.0"
- eslint-import-resolver-node "^0.3.5"
- eslint-module-utils "^2.6.2"
- find-up "^2.0.0"
- has "^1.0.3"
- is-core-module "^2.4.0"
- minimatch "^3.0.4"
- object.values "^1.1.3"
- pkg-up "^2.0.0"
- read-pkg-up "^3.0.0"
- resolve "^1.20.0"
- tsconfig-paths "^3.9.0"
-
eslint-plugin-jest@^24.1.0:
- version "24.4.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262"
- integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==
+ version "24.4.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.2.tgz#9e8cf05ee6a0e3025e6149df2f36950abfa8d5bf"
+ integrity sha512-jNMnqwX75z0RXRMXkxwb/+9ylKJYJLJ8nT8nBT0XFM5qx4IQGxP4edMawa0qGkSbHae0BDPBmi8I2QF0/F04XQ==
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
@@ -5664,13 +5263,14 @@ eslint-plugin-react@7.25.1:
string.prototype.matchall "^4.0.5"
eslint-plugin-react@^7.21.5:
- version "7.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
- integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
+ version "7.25.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.2.tgz#d567a217d306b76dd110561f28074e2328ae38f8"
+ integrity sha512-elx4585wgmryanJK4C5IoSKQyVZ+e7H0t2JOOtJNBql0cuercvSShvRReuLBbfx8687yW5yv+UL7pXwMsd6adQ==
dependencies:
array-includes "^3.1.3"
array.prototype.flatmap "^1.2.4"
doctrine "^2.1.0"
+ estraverse "^5.2.0"
has "^1.0.3"
jsx-ast-utils "^2.4.1 || ^3.0.0"
minimatch "^3.0.4"
@@ -6038,11 +5638,11 @@ express@^4.17.1:
vary "~1.1.2"
ext@^1.1.2:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
- integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
+ integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
dependencies:
- type "^2.0.0"
+ type "^2.5.0"
extend-shallow@^2.0.1:
version "2.0.1"
@@ -6120,9 +5720,9 @@ fastest-levenshtein@^1.0.12:
integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
fastq@^1.6.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
- integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+ integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
dependencies:
reusify "^1.0.4"
@@ -6210,9 +5810,9 @@ find-cache-dir@^2.1.0:
pkg-dir "^3.0.0"
find-cache-dir@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
- integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+ integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
@@ -6267,9 +5867,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
- integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+ version "1.14.4"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+ integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
for-in@^1.0.2:
version "1.0.2"
@@ -6513,9 +6113,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.6.0, globals@^13.9.0:
- version "13.10.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676"
- integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==
+ version "13.11.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
+ integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
dependencies:
type-fest "^0.20.2"
@@ -6980,9 +6580,9 @@ immer@8.0.1:
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
"immutable@^3.8.1 || ^4.0.0-rc.1":
- version "4.0.0-rc.14"
- resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.14.tgz#29ba96631ec10867d1348515ac4e6bdba462f071"
- integrity sha512-pfkvmRKJSoW7JFx0QeYlAmT+kNYvn5j0u7bnpNq4N2RCvHSTlLT208G8jgaquNe+Q8kCPHKOSpxJkyvLDpYq0w==
+ version "4.0.0-rc.15"
+ resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.15.tgz#c30056f05eaaf5650fd15230586688fdd15c54bc"
+ integrity sha512-v8+A3sNyaieoP9dHegl3tEYnIZa7vqNiSv0U6D7YddiZi34VjKy4GsIxrRHj2d8+CS3MeiVja5QyNe4JO/aEXA==
import-cwd@^2.0.0:
version "2.1.0"
@@ -7190,9 +6790,11 @@ is-arrayish@^0.3.1:
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-bigint@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.3.tgz#fc9d9e364210480675653ddaea0518528d49a581"
- integrity sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+ integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+ dependencies:
+ has-bigints "^1.0.1"
is-binary-path@^1.0.0:
version "1.0.1"
@@ -7226,7 +6828,7 @@ is-buffer@^2.0.0:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-is-callable@^1.1.4, is-callable@^1.2.3, is-callable@^1.2.4:
+is-callable@^1.1.4, is-callable@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
@@ -7257,14 +6859,7 @@ is-color-stop@^1.0.0:
rgb-regex "^1.0.1"
rgba-regex "^1.0.0"
-is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.4.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
- integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
- dependencies:
- has "^1.0.3"
-
-is-core-module@^2.6.0:
+is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
@@ -7464,7 +7059,7 @@ is-potential-custom-element-name@^1.0.1:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-is-regex@^1.0.4, is-regex@^1.1.2, is-regex@^1.1.3, is-regex@^1.1.4:
+is-regex@^1.0.4, is-regex@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -7502,7 +7097,7 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-is-string@^1.0.5, is-string@^1.0.6, is-string@^1.0.7:
+is-string@^1.0.5, is-string@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
@@ -7706,7 +7301,7 @@ jest-config@^26.6.3:
micromatch "^4.0.2"
pretty-format "^26.6.2"
-jest-diff@^26.0.0, jest-diff@^26.6.2:
+jest-diff@^26.6.2:
version "26.6.2"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
@@ -7716,7 +7311,7 @@ jest-diff@^26.0.0, jest-diff@^26.6.2:
jest-get-type "^26.3.0"
pretty-format "^26.6.2"
-jest-diff@^27.2.0:
+jest-diff@^27.0.0, jest-diff@^27.2.0:
version "27.2.0"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.2.0.tgz#bda761c360f751bab1e7a2fe2fc2b0a35ce8518c"
integrity sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==
@@ -8433,7 +8028,7 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
-json5@^2.1.2, json5@^2.2.0:
+json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -8473,11 +8068,11 @@ jsonwebtoken@8.5.1:
semver "^5.6.0"
"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
- integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+ integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
dependencies:
- array-includes "^3.1.2"
+ array-includes "^3.1.3"
object.assign "^4.1.2"
jwa@^1.4.1:
@@ -8884,9 +8479,9 @@ map-visit@^1.0.0:
object-visit "^1.0.0"
match-sorter@^6.0.2:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.0.tgz#454a1b31ed218cddbce6231a0ecb5fdc549fed01"
- integrity sha512-efYOf/wUpNb8FgNY+cOD2EIJI1S5I7YPKsw0LBp7wqPh5pmMS6i/wr3ZWwfwrAw1NvqTA2KUReVRWDX84lUcOQ==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda"
+ integrity sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==
dependencies:
"@babel/runtime" "^7.12.5"
remove-accents "0.4.2"
@@ -9055,11 +8650,16 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.49.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.49.0:
version "1.49.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
+"mime-db@>= 1.43.0 < 2":
+ version "1.50.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+ integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
version "2.1.32"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
@@ -9158,9 +8758,9 @@ minipass-pipeline@^1.2.2:
minipass "^3.0.0"
minipass@^3.0.0, minipass@^3.1.1:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
- integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732"
+ integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==
dependencies:
yallist "^4.0.0"
@@ -9276,9 +8876,9 @@ nano-time@1.0.0:
big-integer "^1.6.16"
nanoid@^3.1.23:
- version "3.1.23"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
- integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+ version "3.1.25"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+ integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
nanomatch@^1.2.9:
version "1.2.13"
@@ -9403,9 +9003,9 @@ node-notifier@^8.0.0:
which "^2.0.2"
node-releases@^1.1.71:
- version "1.1.74"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e"
- integrity sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw==
+ version "1.1.75"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+ integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
@@ -9418,12 +9018,12 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
validate-npm-package-license "^3.0.1"
normalize-package-data@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
- integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+ integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
dependencies:
hosted-git-info "^4.0.1"
- resolve "^1.20.0"
+ is-core-module "^2.5.0"
semver "^7.3.4"
validate-npm-package-license "^3.0.1"
@@ -9486,9 +9086,9 @@ nth-check@^1.0.2:
boolbase "~1.0.0"
nth-check@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
- integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+ integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
dependencies:
boolbase "^1.0.0"
@@ -9586,7 +9186,7 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.0, object.values@^1.1.3, object.values@^1.1.4:
+object.values@^1.1.0, object.values@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
@@ -10798,7 +10398,7 @@ pretty-error@^2.1.1:
lodash "^4.17.20"
renderkid "^2.0.4"
-pretty-format@^26.0.0, pretty-format@^26.6.0, pretty-format@^26.6.2:
+pretty-format@^26.6.0, pretty-format@^26.6.2:
version "26.6.2"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
@@ -10808,7 +10408,7 @@ pretty-format@^26.0.0, pretty-format@^26.6.0, pretty-format@^26.6.2:
ansi-styles "^4.0.0"
react-is "^17.0.1"
-pretty-format@^27.2.0:
+pretty-format@^27.0.0, pretty-format@^27.2.0:
version "27.2.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.0.tgz#ee37a94ce2a79765791a8649ae374d468c18ef19"
integrity sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==
@@ -11057,9 +10657,9 @@ rc-checkbox@~2.3.0:
classnames "^2.2.1"
rc-collapse@~3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.1.tgz#2421d454e85781d1cf2f04f906918e0677d779e6"
- integrity sha512-/oetKApTHzGGeR8Q8vD168EXkCs2MpEIrURGyy2D+LrrJd29LY/huuIMvOiJoSV6W3bcGhJqIdgHtg1Dxn1smA==
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.2.tgz#76028a811b845d03d9460ccc409c7ea8ad09db14"
+ integrity sha512-HujcKq7mghk/gVKeI6EjzTbb8e19XUZpakrYazu1MblEZ3Hu3WBMSN4A3QmvbF6n1g7x6lUlZvsHZ5shABWYOQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
@@ -11217,9 +10817,9 @@ rc-rate@~2.9.0:
rc-util "^5.0.1"
rc-resize-observer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.0.tgz#97fb89856f62fec32ab6e40933935cf58e2e102d"
- integrity sha512-RgKGukg1mlzyGdvzF7o/LGFC8AeoMH9aGzXTUdp6m+OApvmRdUuOscq/Y2O45cJA+rXt1ApWlpFoOIioXL3AGg==
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.1.tgz#ccd0986543ff1bf49f8a581e8ac4bb714ed24dcd"
+ integrity sha512-OxO2mJI9e8610CAWBFfm52SPvWib0eNKjaSsRbbKHmLaJIxw944P+D61DlLJ/w2vuOjGNcalJu8VdqyNm/XCRg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -11292,9 +10892,9 @@ rc-tabs@~11.10.0:
rc-util "^5.5.0"
rc-textarea@^0.3.0, rc-textarea@~0.3.0:
- version "0.3.4"
- resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.4.tgz#1408a64c87b5e76db5c847699ef9ab5ee97dd6f9"
- integrity sha512-ILUYx831ZukQPv3m7R4RGRtVVWmL1LV4ME03L22mvT56US0DGCJJaRTHs4vmpcSjFHItph5OTmhodY4BOwy81A==
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.5.tgz#07ed445dddb94e5ae6764676923a49bddad9b2ec"
+ integrity sha512-qa+k5vDn9ct65qr+SgD2KwJ9Xz6P84lG2z+TDht/RBr71WnM/K61PqHUAcUyU6YqTJD26IXgjPuuhZR7HMw7eA==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -11351,16 +10951,7 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
-rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.9.4, rc-util@^5.9.8:
- version "5.13.2"
- resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.13.2.tgz#a8a0bb77743351841ba8bed6393e03b8d2f685c8"
- integrity sha512-eYc71XXGlp96RMzg01Mhq/T3BL6OOVTDSS0urFEuvpi+e7slhJRhaHGCKy2hqJm18m9ff7VoRoptplKu60dYog==
- dependencies:
- "@babel/runtime" "^7.12.5"
- react-is "^16.12.0"
- shallowequal "^1.1.0"
-
-rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
+rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
version "5.14.0"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.14.0.tgz#52c650e27570c2c47f7936c7d32eaec5212492a8"
integrity sha512-2vy6/Z1BJUcwLjm/UEJb/htjUTQPigITUIemCcFEo1fQevAumc9sA32x2z5qyWoa9uhrXbiAjSDpPIUqyg65sA==
@@ -11370,9 +10961,9 @@ rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
shallowequal "^1.1.0"
rc-virtual-list@^3.0.1, rc-virtual-list@^3.2.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.3.0.tgz#2f95a6ddbbf63d78b28662b57f1e69f7472762fe"
- integrity sha512-lVXpGWC6yMdwV2SHo6kc63WlqjCnb3eO72V726KA2/wh9KA6wi/swcdR3zAowuA8hJxG/lRANmY5kpLZ+Pz3iQ==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz#1f3b41391acf033a6c7e84c2f4e8a4ee0dc72807"
+ integrity sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==
dependencies:
classnames "^2.2.6"
rc-resize-observer "^1.0.0"
@@ -11715,14 +11306,14 @@ redux@4.1.1, redux@^4.0.0:
dependencies:
"@babel/runtime" "^7.9.2"
-regenerate-unicode-properties@^8.2.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
- integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+ integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
dependencies:
- regenerate "^1.4.0"
+ regenerate "^1.4.2"
-regenerate@^1.4.0:
+regenerate@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
@@ -11776,26 +11367,26 @@ regexpp@^3.1.0:
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
regexpu-core@^4.7.1:
- version "4.7.1"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
- integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
- dependencies:
- regenerate "^1.4.0"
- regenerate-unicode-properties "^8.2.0"
- regjsgen "^0.5.1"
- regjsparser "^0.6.4"
- unicode-match-property-ecmascript "^1.0.4"
- unicode-match-property-value-ecmascript "^1.2.0"
-
-regjsgen@^0.5.1:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+ integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+ dependencies:
+ regenerate "^1.4.2"
+ regenerate-unicode-properties "^9.0.0"
+ regjsgen "^0.5.2"
+ regjsparser "^0.7.0"
+ unicode-match-property-ecmascript "^2.0.0"
+ unicode-match-property-value-ecmascript "^2.0.0"
+
+regjsgen@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-regjsparser@^0.6.4:
- version "0.6.9"
- resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
- integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+regjsparser@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+ integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
dependencies:
jsesc "~0.5.0"
@@ -12387,9 +11978,9 @@ side-channel@^1.0.4:
object-inspect "^1.9.0"
signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7"
+ integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==
simple-swizzle@^0.2.2:
version "0.2.2"
@@ -12448,16 +12039,16 @@ snapdragon@^0.8.1:
use "^3.1.0"
sockjs-client@^1.5.0:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6"
- integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
+ integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
dependencies:
debug "^3.2.6"
eventsource "^1.0.7"
faye-websocket "^0.11.3"
inherits "^2.0.4"
json3 "^3.3.3"
- url-parse "^1.5.1"
+ url-parse "^1.5.3"
sockjs@^0.3.21:
version "0.3.21"
@@ -12504,10 +12095,10 @@ source-map-resolve@^0.6.0:
atob "^2.1.2"
decode-uri-component "^0.2.0"
-source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
- version "0.5.19"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
- integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@^0.5.20, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+ version "0.5.20"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+ integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
@@ -12623,11 +12214,12 @@ stable@^0.1.8:
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
stack-utils@^2.0.2, stack-utils@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
- integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.4.tgz#bf967ae2813d3d2d1e1f59a4408676495c8112ab"
+ integrity sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==
dependencies:
escape-string-regexp "^2.0.0"
+ source-map-support "^0.5.20"
stackframe@^1.1.1:
version "1.2.0"
@@ -12734,18 +12326,6 @@ string.prototype.matchall@^4.0.5:
regexp.prototype.flags "^1.3.1"
side-channel "^1.0.4"
-string.prototype.replaceall@1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/string.prototype.replaceall/-/string.prototype.replaceall-1.0.5.tgz#3eae8b115c588ece949b14fa2993d86fc8ec87b1"
- integrity sha512-YUjdWElI9pgKo7mrPOMKHFZxcAa0v1uqoJkMHtlJW63rMkPLkQH71ao2XNkKY2ksHKHC8ZUFwNjN9Vry+QyCvg==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.18.0-next.2"
- get-intrinsic "^1.1.1"
- has-symbols "^1.0.1"
- is-regex "^1.1.2"
-
string.prototype.trimend@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -13065,9 +12645,9 @@ tapable@^1.0.0, tapable@^1.1.3:
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^6.0.2:
- version "6.1.7"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.7.tgz#c566d1107d38b09e92983a68db5534fc7f6cab42"
- integrity sha512-PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA==
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -13138,13 +12718,13 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
source-map-support "~0.5.12"
terser@^5.3.4:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
- integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
+ version "5.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.8.0.tgz#c6d352f91aed85cc6171ccb5e84655b77521d947"
+ integrity sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==
dependencies:
commander "^2.20.0"
source-map "~0.7.2"
- source-map-support "~0.5.19"
+ source-map-support "~0.5.20"
test-exclude@^6.0.0:
version "6.0.0"
@@ -13206,9 +12786,9 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3:
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
tmpl@1.0.x:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
- integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+ integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
to-arraybuffer@^1.0.0:
version "1.0.1"
@@ -13313,24 +12893,15 @@ tsconfig-paths@^3.11.0:
minimist "^1.2.0"
strip-bom "^3.0.0"
-tsconfig-paths@^3.9.0:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
- integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
- dependencies:
- json5 "^2.2.0"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
-
tslib@^1.10.0, tslib@^1.8.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.3, tslib@^2.1.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
- integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+ integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
tsutils@^3.17.1, tsutils@^3.21.0:
version "3.21.0"
@@ -13406,7 +12977,7 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-type@^2.0.0:
+type@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
@@ -13433,28 +13004,28 @@ unbox-primitive@^1.0.1:
has-symbols "^1.0.2"
which-boxed-primitive "^1.0.2"
-unicode-canonical-property-names-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
- integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+ integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-unicode-match-property-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
- integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+ integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.4"
- unicode-property-aliases-ecmascript "^1.0.4"
+ unicode-canonical-property-names-ecmascript "^2.0.0"
+ unicode-property-aliases-ecmascript "^2.0.0"
-unicode-match-property-value-ecmascript@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
- integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+ integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
-unicode-property-aliases-ecmascript@^1.0.4:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
- integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+ integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
unified@^9.1.0:
version "9.2.2"
@@ -13590,7 +13161,7 @@ url-loader@4.1.1:
mime-types "^2.1.27"
schema-utils "^3.0.0"
-url-parse@^1.4.3, url-parse@^1.5.1:
+url-parse@^1.4.3, url-parse@^1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
@@ -14224,9 +13795,9 @@ ws@^6.2.1:
async-limiter "~1.0.0"
ws@^7.4.6:
- version "7.4.6"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
- integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ version "7.5.5"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+ integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
xml-name-validator@^3.0.0:
version "3.0.0"
diff --git a/services/health-department/craco.config.js b/services/health-department/craco.config.js
index 92c3414..9d8db42 100644
--- a/services/health-department/craco.config.js
+++ b/services/health-department/craco.config.js
@@ -1,6 +1,7 @@
const CracoLessPlugin = require('craco-less');
const { LicenseWebpackPlugin } = require('license-webpack-plugin');
const GenerateJsonPlugin = require('generate-json-webpack-plugin');
+const CompressionPlugin = require('compression-webpack-plugin');
const { THEME } = require('./ant.theme');
@@ -33,6 +34,11 @@ module.exports = {
webpack: {
plugins: {
add: [
+ new CompressionPlugin({
+ algorithm: 'gzip',
+ test: /\.(js|css|html|svg|json|ico|eot|otf|ttf)$/,
+ deleteOriginalAssets: false,
+ }),
new LicenseWebpackPlugin({
perChunkOutput: false,
outputFilename: 'licenses.json',
diff --git a/services/health-department/nginx.conf b/services/health-department/nginx.conf
index 6814307..09aea29 100644
--- a/services/health-department/nginx.conf
+++ b/services/health-department/nginx.conf
@@ -41,6 +41,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload";
location /health-department {
+ gzip_static on;
rewrite ^/health-department/(.*)$ /$1 break;
try_files $uri /index.html;
}
diff --git a/services/health-department/package.json b/services/health-department/package.json
index 9f1a48f..bbb088c 100644
--- a/services/health-department/package.json
+++ b/services/health-department/package.json
@@ -1,6 +1,6 @@
{
"name": "@lucaapp/health-department",
- "version": "2.0.2",
+ "version": "2.1.0",
"private": true,
"license": "Apache-2.0",
"author": "Culture4Life <hello@luca-app.de> (https://www.luca-app.de/)",
@@ -24,11 +24,15 @@
"argon2-browser": "1.18.0",
"base32-decode": "1.0.0",
"base64-loader": "1.0.0",
+ "compression-webpack-plugin": "6.1.1",
+ "browserslist": "4.17.1",
"connected-react-router": "6.9.1",
"craco-less": "1.20.0",
+ "csp-html-webpack-plugin": "5.1.0",
"file-saver": "2.0.5",
"generate-json-webpack-plugin": "1.0.0",
"history": "4.10.1",
+ "jsonwebtoken": "8.5.1",
"libphonenumber-js": "1.9.34",
"license-webpack-plugin": "2.3.21",
"lodash": "4.17.21",
@@ -81,7 +85,6 @@
"jest-svg-transformer": "1.0.0",
"postcss": "8.3.6",
"prettier": "2.2.1",
- "string.prototype.replaceall": "1.0.5",
"stylelint": "13.13.1",
"stylelint-config-prettier": "8.0.2",
"stylelint-config-recommended": "4.0.0",
diff --git a/services/health-department/src/ant.css b/services/health-department/src/ant.css
index e1c774d..34db274 100644
--- a/services/health-department/src/ant.css
+++ b/services/health-department/src/ant.css
@@ -6,6 +6,13 @@
display: none !important;
}
+.ant-form-item-explain.ant-form-item-explain-error {
+ white-space: pre-wrap; /* CSS3 */
+ white-space: -moz-pre-wrap; /* Firefox */
+ white-space: -o-pre-wrap; /* Opera 7 */
+ word-wrap: break-word; /* IE */
+}
+
.ant-input-password input,
.ant-input-password input:focus {
background-color: transparent !important;
@@ -222,6 +229,10 @@ input:-webkit-autofill:active {
line-height: 24px;
}
+.ant-dropdown-trigger {
+ height: 30px;
+}
+
.ant-modal-header {
border: none;
}
diff --git a/services/health-department/src/assets/MenuActive.svg b/services/health-department/src/assets/MenuActive.svg
new file mode 100644
index 0000000..7475fa1
--- /dev/null
+++ b/services/health-department/src/assets/MenuActive.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g id="Icon-/-32-px-/-Round-/-Menu-/-Aktive" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <circle id="Oval" fill="#000000" cx="16" cy="16" r="16"></circle>
+ <circle id="Oval" fill="#FFFFFF" cx="16" cy="22" r="2"></circle>
+ <circle id="Oval-Copy" fill="#FFFFFF" cx="16" cy="16" r="2"></circle>
+ <circle id="Oval-Copy-2" fill="#FFFFFF" cx="16" cy="10" r="2"></circle>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/services/health-department/src/assets/MenuInactive.svg b/services/health-department/src/assets/MenuInactive.svg
new file mode 100644
index 0000000..dcbae5e
--- /dev/null
+++ b/services/health-department/src/assets/MenuInactive.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g id="Icon-/-32-px-/-Round-/-Menu-/-Inactive" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <circle id="Oval" stroke="#000000" stroke-width="2" cx="16" cy="16" r="15"></circle>
+ <circle id="Oval" fill="#000000" cx="16" cy="22" r="2"></circle>
+ <circle id="Oval-Copy" fill="#000000" cx="16" cy="16" r="2"></circle>
+ <circle id="Oval-Copy-2" fill="#000000" cx="16" cy="10" r="2"></circle>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/services/health-department/src/assets/menu.svg b/services/health-department/src/assets/menu.svg
deleted file mode 100644
index b50b9b2..0000000
--- a/services/health-department/src/assets/menu.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="4px" height="16px" viewBox="0 0 4 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <g id="Ant" stroke="none" stroke-width="1" fill="currentColor" fill-rule="evenodd">
- <g id="Ant_Location" transform="translate(-1092.000000, -78.000000)" fill="currentColor">
- <g id="Submenu" transform="translate(1092.000000, 78.000000)">
- <circle id="Oval" cx="2" cy="2" r="2"></circle>
- <circle id="Oval-Copy-7" cx="2" cy="8" r="2"></circle>
- <circle id="Oval-Copy-8" cx="2" cy="14" r="2"></circle>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/services/health-department/src/components/App/Header/LinkMenu/LinkMenu.react.js b/services/health-department/src/components/App/Header/LinkMenu/LinkMenu.react.js
index a3d07e0..e733c96 100644
--- a/services/health-department/src/components/App/Header/LinkMenu/LinkMenu.react.js
+++ b/services/health-department/src/components/App/Header/LinkMenu/LinkMenu.react.js
@@ -1,16 +1,24 @@
-import React from 'react';
+import React, { useState } from 'react';
import { useIntl } from 'react-intl';
-import { Button, Menu, Dropdown } from 'antd';
+import { Menu, Dropdown } from 'antd';
import Icon from '@ant-design/icons';
import { LICENSES_ROUTE } from 'constants/routes';
-import { ReactComponent as MenuSvg } from 'assets/menu.svg';
+import { ReactComponent as MenuActiveSvg } from 'assets/MenuActive.svg';
+import { ReactComponent as MenuInactiveSvg } from 'assets/MenuInactive.svg';
-const MenuIcon = () => <Icon component={MenuSvg} style={{ color: 'black' }} />;
+const MenuIcon = active => (
+ <Icon
+ data-cy="linkMenu"
+ component={active ? MenuActiveSvg : MenuInactiveSvg}
+ style={{ fontSize: 32, marginRight: 24 }}
+ />
+);
export const LinkMenu = () => {
const intl = useIntl();
+ const [isOpen, setIsOpen] = useState(false);
const menu = (
<Menu>
<Menu.Item>
@@ -37,15 +45,12 @@ export const LinkMenu = () => {
);
return (
- <Dropdown overlay={menu} placement="bottomCenter">
- <Button
- icon={<MenuIcon />}
- style={{
- marginRight: 24,
- backgroundColor: 'transparent',
- border: '1px solid #b8c0ca',
- }}
- />
+ <Dropdown
+ onVisibleChange={() => setIsOpen(!isOpen)}
+ overlay={menu}
+ placement="bottomCenter"
+ >
+ {MenuIcon(isOpen)}
</Dropdown>
);
};
diff --git a/services/health-department/src/components/App/Header/Profile/Profile.styled.js b/services/health-department/src/components/App/Header/Profile/Profile.styled.js
index 9a21650..406c56e 100644
--- a/services/health-department/src/components/App/Header/Profile/Profile.styled.js
+++ b/services/health-department/src/components/App/Header/Profile/Profile.styled.js
@@ -1,7 +1,7 @@
import styled from 'styled-components';
export const IconWrapper = styled.div`
- margin-right: 16px;
+ margin-right: 24px;
cursor: pointer;
`;
export const badgeStyle = {
diff --git a/services/health-department/src/components/App/ProcessDetails/HeaderRow/HeaderRow.react.js b/services/health-department/src/components/App/ProcessDetails/HeaderRow/HeaderRow.react.js
index ca2d4bb..f971ffe 100644
--- a/services/health-department/src/components/App/ProcessDetails/HeaderRow/HeaderRow.react.js
+++ b/services/health-department/src/components/App/ProcessDetails/HeaderRow/HeaderRow.react.js
@@ -18,10 +18,13 @@ export const HeaderRow = ({ process }) => {
error: userError,
data: userData,
} = useQuery(
- `userTransfer${process.userTransferId}`,
- () =>
- process.userTransferId ? decryptUserTransfer(process.userTransferId) : {},
- { retry: false, staleTime: Number.POSITIVE_INFINITY }
+ ['userTransfer', { userTransferId: process.userTransferId }],
+ () => decryptUserTransfer(process.userTransferId),
+ {
+ retry: false,
+ staleTime: Number.POSITIVE_INFINITY,
+ enabled: !!process.userTransferId,
+ }
);
if (isUserLoading || !locations) return null;
diff --git a/services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.helper.js b/services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.helper.js
new file mode 100644
index 0000000..c0efa6d
--- /dev/null
+++ b/services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.helper.js
@@ -0,0 +1,26 @@
+import { NOTIFIEABLE_DEVICE_TYPES } from 'constants/deviceTypes';
+import { RISK_LEVEL_2, RISK_LEVEL_3 } from 'constants/riskLevels';
+
+export const checkIfAnyContactPersonsAreNotifyable = (
+ contactPersons,
+ riskLevels
+) => {
+ const allowedDeviceTypes = new Set([
+ NOTIFIEABLE_DEVICE_TYPES.IOS,
+ NOTIFIEABLE_DEVICE_TYPES.ANDROID,
+ ]);
+ const riskLevelsToCheck = [RISK_LEVEL_2, RISK_LEVEL_3];
+
+ const tracesOfNotifyableDevices = contactPersons.traces.filter(
+ contactPerson => allowedDeviceTypes.has(contactPerson.deviceType)
+ );
+ return tracesOfNotifyableDevices.some(({ traceId }) => {
+ const riskLevelsForTrace = riskLevels.find(
+ riskLevel => riskLevel.traceId === traceId
+ );
+ if (!riskLevelsForTrace.riskLevels.length) return true;
+ return riskLevelsToCheck.some(
+ level => !riskLevelsForTrace.riskLevels.includes(level)
+ );
+ });
+};
diff --git a/services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.react.js b/services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.react.js
index 7622dec..7eb57cd 100644
--- a/services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.react.js
+++ b/services/health-department/src/components/App/ProcessDetails/History/HistoryTable/ContactConfirmationButton/NotificationTrigger/NotificationTrigger.react.js
@@ -3,9 +3,6 @@ import { useIntl } from 'react-intl';
import { Tooltip } from 'antd';
import { useQuery } from 'react-query';
-import { RISK_LEVEL_2, RISK_LEVEL_3 } from 'constants/riskLevels';
-import { NOTIFIEABLE_DEVICE_TYPES } from 'constants/deviceTypes';
-
import {
getWarningLevelsForLocationTransfer,
getContactPersons,
@@ -16,27 +13,7 @@ import { useModal } from 'components/hooks/useModal';
import { NotificationModal } from 'components/App/modals/NotificationModal';
import { BellIcon, ButtonWrapper } from './NotificationTrigger.styled';
-
-const checkIfAnyContactPersonsAreNotifyable = (contactPersons, riskLevels) => {
- const allowedDeviceTypes = new Set([
- NOTIFIEABLE_DEVICE_TYPES.IOS,
- NOTIFIEABLE_DEVICE_TYPES.ANDROID,
- ]);
- const riskLevelsToCheck = [RISK_LEVEL_2, RISK_LEVEL_3];
-
- const tracesOfNotifyableDevices = contactPersons.traces.filter(
- contactPerson => allowedDeviceTypes.has(contactPerson.deviceType)
- );
- return tracesOfNotifyableDevices.some(({ traceId }) => {
- const riskLevelsForTrace = riskLevels.find(
- riskLevel => riskLevel.traceId === traceId
- );
- if (!riskLevelsForTrace.riskLevels.length) return true;
- return riskLevelsToCheck.some(
- level => !riskLevelsForTrace.riskLevels.includes(level)
- );
- });
-};
+import { checkIfAnyContactPersonsAreNotifyable } from './NotificationTrigger.helper';
export const NotificationTrigger = ({ location }) => {
const intl = useIntl();
@@ -48,18 +25,14 @@ export const NotificationTrigger = ({ location }) => {
time,
} = location;
- const {
- data: riskLevels,
- } = useQuery(
- `getWarningLevelsForLocationTransfer${locationTransferId}`,
+ const { data: riskLevels } = useQuery(
+ ['getWarningLevelsForLocationTransfer', { locationTransferId }],
() => getWarningLevelsForLocationTransfer(locationTransferId),
{ refetchOnWindowFocus: false }
);
- const {
- data: contactPersons,
- } = useQuery(
- `contactPersons${locationTransferId}`,
+ const { data: contactPersons } = useQuery(
+ ['contactPersons', { locationTransferId }],
() => getContactPersons(locationTransferId),
{ refetchOnWindowFocus: false }
);
diff --git a/services/health-department/src/components/App/ProcessDetails/Note/NoteProcess/NoteProcess.helper.js b/services/health-department/src/components/App/ProcessDetails/Note/NoteProcess/NoteProcess.helper.js
index 7fadfa4..91529ac 100644
--- a/services/health-department/src/components/App/ProcessDetails/Note/NoteProcess/NoteProcess.helper.js
+++ b/services/health-department/src/components/App/ProcessDetails/Note/NoteProcess/NoteProcess.helper.js
@@ -25,7 +25,7 @@ function updateProcessHandler(keys, note) {
};
}
- const encodedNote = bytesToHex(encodeUtf8(note));
+ const encodedNote = encodeUtf8(bytesToHex(note));
const { publicKey, data: encryptedData, iv, mac } = ENCRYPT_DLIES(
base64ToHex(keys.publicHDEKP),
encodedNote
diff --git a/services/health-department/src/components/App/Tracking/ManualSearchButton/ManualSearchButton.react.js b/services/health-department/src/components/App/Tracking/ManualSearchButton/ManualSearchButton.react.js
index 76c14b4..fa97a83 100644
--- a/services/health-department/src/components/App/Tracking/ManualSearchButton/ManualSearchButton.react.js
+++ b/services/health-department/src/components/App/Tracking/ManualSearchButton/ManualSearchButton.react.js
@@ -21,7 +21,7 @@ export const ManualSearchButton = () => {
return (
<PrimaryButton
data-cy="searchGroup"
- isButtonWhite
+ $isButtonWhite
style={{ marginRight: 24 }}
onClick={searchLocations}
>
diff --git a/services/health-department/src/components/App/Tracking/NewTrackingButton/NewTrackingButton.react.js b/services/health-department/src/components/App/Tracking/NewTrackingButton/NewTrackingButton.react.js
index 8d1edc5..d3785eb 100644
--- a/services/health-department/src/components/App/Tracking/NewTrackingButton/NewTrackingButton.react.js
+++ b/services/health-department/src/components/App/Tracking/NewTrackingButton/NewTrackingButton.react.js
@@ -22,7 +22,7 @@ export const NewTrackingButton = () => {
};
return (
- <PrimaryButton isButtonWhite onClick={trackInfection}>
+ <PrimaryButton $isButtonWhite onClick={trackInfection}>
{intl.formatMessage({ id: 'startTracking.button' })}
</PrimaryButton>
);
diff --git a/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.react.js b/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.react.js
index 43825b6..c0fd39d 100644
--- a/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.react.js
+++ b/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.react.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { Select, Checkbox, Tag } from 'antd';
+import { Checkbox } from 'antd';
import { useIntl } from 'react-intl';
import { truncateString } from 'utils/string';
@@ -8,13 +8,11 @@ import {
StyledFilterTitle,
StyledOptionTitle,
StyledOptionContainer,
+ StyledSelect,
+ StyledTag,
} from './Filter.styled';
-const SelectStyles = {
- marginBottom: 24,
-};
-
-const { Option } = Select;
+const { Option } = StyledSelect;
function FilterTagRender({ label, closable, onClose }) {
const onPreventMouseDown = event => {
@@ -22,15 +20,14 @@ function FilterTagRender({ label, closable, onClose }) {
event.stopPropagation();
};
return (
- <Tag
+ <StyledTag
color="#4e6180"
onMouseDown={onPreventMouseDown}
closable={closable}
onClose={onClose}
- style={{ display: 'inline-flex', alignItems: 'center', marginRight: 3 }}
>
{label}
- </Tag>
+ </StyledTag>
);
}
export const Filter = ({
@@ -47,11 +44,10 @@ export const Filter = ({
return (
<StyledContainer>
<StyledFilterTitle>{title}</StyledFilterTitle>
- <Select
+ <StyledSelect
showArrow
value={active}
onChange={onChange}
- style={SelectStyles}
showSearch={showSearch}
optionFilterProp={optionFilterProp}
filterOption={filterOption}
@@ -79,7 +75,7 @@ export const Filter = ({
</StyledOptionContainer>
</Option>
))}
- </Select>
+ </StyledSelect>
</StyledContainer>
);
};
diff --git a/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.styled.js b/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.styled.js
index f0ccfb2..b1e01fc 100644
--- a/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.styled.js
+++ b/services/health-department/src/components/App/Tracking/TrackingList/ListFilters/Filter/Filter.styled.js
@@ -1,4 +1,19 @@
import styled from 'styled-components';
+import { Select, Tag } from 'antd';
+
+export const StyledTag = styled(Tag)`
+ display: inline-flex;
+ align-items: center;
+ margin-right: 3px;
+`;
+
+export const StyledSelect = styled(Select)`
+ margin-bottom: 24px;
+
+ & .ant-select-selector {
+ cursor: pointer !important;
+ }
+`;
export const StyledContainer = styled.div`
margin-right: 16px;
diff --git a/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.react.js b/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.react.js
index 3c0ddd9..f0b9242 100644
--- a/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.react.js
+++ b/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.react.js
@@ -5,7 +5,7 @@ import { Select, notification } from 'antd';
import { useIntl } from 'react-intl';
import { getEmployees, updateProcess } from 'network/api';
-import { selectStyle } from './SelectAssignee.styled';
+import { StyledSelect } from './SelectAssignee.styled';
const { Option } = Select;
@@ -73,11 +73,10 @@ export const SelectAssignee = ({ process }) => {
}
return (
- <Select
+ <StyledSelect
showSearch
labelInValue
value={{ value: currentAssignee }}
- style={selectStyle}
optionFilterProp="children"
onSelect={handleSelectAssignee}
onClick={event => event.stopPropagation()}
@@ -94,6 +93,6 @@ export const SelectAssignee = ({ process }) => {
{`${employee.firstName} ${employee.lastName}`}
</Option>
))}
- </Select>
+ </StyledSelect>
);
};
diff --git a/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.styled.js b/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.styled.js
index d703f88..2046035 100644
--- a/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.styled.js
+++ b/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/SelectAssignee/SelectAssignee.styled.js
@@ -1,5 +1,12 @@
-export const selectStyle = {
- width: 180,
- display: 'flex',
- alignSelf: 'baseline',
-};
+import styled from 'styled-components';
+import { Select } from 'antd';
+
+export const StyledSelect = styled(Select)`
+ width: 180px;
+ display: flex;
+ align-self: baseline;
+
+ & .ant-select-selector {
+ cursor: pointer !important;
+ }
+`;
diff --git a/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/UserNameDisplay/UserNameDisplay.react.js b/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/UserNameDisplay/UserNameDisplay.react.js
index aad46e2..12e43ed 100644
--- a/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/UserNameDisplay/UserNameDisplay.react.js
+++ b/services/health-department/src/components/App/Tracking/TrackingList/Table/Entry/UserNameDisplay/UserNameDisplay.react.js
@@ -8,7 +8,7 @@ import { IncompleteDataError } from 'errors/incompleteDataError';
export const UserNameDisplay = ({ userTransferId, onProcessName }) => {
const intl = useIntl();
const { isLoading, error, data } = useQuery(
- `userTransfer${userTransferId}`,
+ ['userTransfer', { userTransferId }],
() =>
decryptUserTransfer(userTransferId).then(processData => {
onProcessName(userTransferId, processData?.fn + processData?.ln);
diff --git a/services/health-department/src/components/App/UserManagement/AddEmployeeButton/AddEmployeeButton.react.js b/services/health-department/src/components/App/UserManagement/AddEmployeeButton/AddEmployeeButton.react.js
index 7f9d9b1..3e5dc8d 100644
--- a/services/health-department/src/components/App/UserManagement/AddEmployeeButton/AddEmployeeButton.react.js
+++ b/services/health-department/src/components/App/UserManagement/AddEmployeeButton/AddEmployeeButton.react.js
@@ -25,7 +25,7 @@ export const AddEmployeeButton = () => {
};
return (
- <PrimaryButton isButtonWhite data-cy="addEmployee" onClick={addEmployee}>
+ <PrimaryButton $isButtonWhite data-cy="addEmployee" onClick={addEmployee}>
{intl.formatMessage({
id: 'modal.addEmployee.button',
})}
diff --git a/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeList.react.js b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeList.react.js
index 7268d58..621d14d 100644
--- a/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeList.react.js
+++ b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeList.react.js
@@ -10,6 +10,7 @@ import { Form, notification } from 'antd';
import { getEmployees, updateEmployee } from 'network/api';
// Components
+import { getFormattedPhoneNumber } from 'utils/checkPhoneNumber';
import { AddEmployeeButton } from '../AddEmployeeButton';
import { EmployeeSearch } from '../EmployeeSearch';
import { EmptyEmployeeList } from './EmptyEmployeeList';
@@ -27,6 +28,7 @@ import {
export const EmployeeList = ({ profileData }) => {
const intl = useIntl();
+ const [form] = Form.useForm();
const [searchTerm, setSearchTerm] = useState('');
const [editing, setEditing] = useState(null);
const [filteredEmployees, setFilteredEmployees] = useState(null);
@@ -74,12 +76,14 @@ export const EmployeeList = ({ profileData }) => {
}, [employees, searchTerm, profileData.employeeId]);
const onEdit = ({ firstName, lastName, phone }) => {
+ const formattedPhone = getFormattedPhoneNumber(phone);
updateEmployee({
employeeId: editing,
- data: { firstName, lastName, phone },
+ data: { firstName, lastName, phone: formattedPhone },
})
.then(() => {
refetch();
+ form.setFieldsValue({ phone: formattedPhone });
setEditing(null);
notification.success({
message: intl.formatMessage({
@@ -150,6 +154,7 @@ export const EmployeeList = ({ profileData }) => {
lastName: employee.lastName,
phone: employee.phone,
}}
+ form={form}
>
<Row>
<Column flex="25%">
diff --git a/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeName/EmployeeName.react.js b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeName/EmployeeName.react.js
index 121be0b..20e8c23 100644
--- a/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeName/EmployeeName.react.js
+++ b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeeName/EmployeeName.react.js
@@ -1,9 +1,13 @@
import React from 'react';
import { Input, Form } from 'antd';
import { useIntl } from 'react-intl';
+import { usePersonNameValidator } from 'components/hooks/useValidators';
export const EmployeeName = ({ editing, employee }) => {
const intl = useIntl();
+ const firstNameValidator = usePersonNameValidator('firstName');
+ const lastNameValidator = usePersonNameValidator('lastName');
+
return (
<>
{editing ? (
@@ -11,12 +15,14 @@ export const EmployeeName = ({ editing, employee }) => {
<Form.Item
name="firstName"
label={intl.formatMessage({ id: 'profile.firstname' })}
+ rules={firstNameValidator}
>
<Input />
</Form.Item>
<Form.Item
name="lastName"
label={intl.formatMessage({ id: 'profile.lastname' })}
+ rules={lastNameValidator}
>
<Input />
</Form.Item>
diff --git a/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.react.js b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.react.js
index a21fdbe..4f43fb5 100644
--- a/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.react.js
+++ b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.react.js
@@ -1,13 +1,17 @@
import React from 'react';
-import { Input, Form } from 'antd';
+import { usePhoneValidator } from 'components/hooks/useValidators';
+import { Input } from 'antd';
+import { StyledFormItem } from './EmployeePhone.styled';
export const EmployeePhone = ({ editing, employee }) => {
+ const phoneValidator = usePhoneValidator('phone');
+
return (
<>
{editing ? (
- <Form.Item name="phone">
+ <StyledFormItem name="phone" rules={phoneValidator}>
<Input />
- </Form.Item>
+ </StyledFormItem>
) : (
<>{employee.phone}</>
)}
diff --git a/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.styled.js b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.styled.js
new file mode 100644
index 0000000..a0faf49
--- /dev/null
+++ b/services/health-department/src/components/App/UserManagement/EmployeeList/EmployeePhone/EmployeePhone.styled.js
@@ -0,0 +1,6 @@
+import styled from 'styled-components';
+import { Form } from 'antd';
+
+export const StyledFormItem = styled(Form.Item)`
+ width: 220px;
+`;
diff --git a/services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeForm/AddEmployeeForm.react.js b/services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeForm/AddEmployeeForm.react.js
index 5c095a8..d065daa 100644
--- a/services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeForm/AddEmployeeForm.react.js
+++ b/services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeForm/AddEmployeeForm.react.js
@@ -9,10 +9,11 @@ import { createEmployee } from 'network/api';
import { getFormattedPhoneNumber } from 'utils/checkPhoneNumber';
import { Wrapper, ButtonRow, Info } from '../AddEmployeeModal.styled';
-import { getFormElements } from '../AddEmployeeModal.helper';
+import { useFormElements } from '../useAddEmployee';
export const AddEmployeeForm = ({ setNewUserPassword }) => {
const intl = useIntl();
+ const formElements = useFormElements();
const [, closeModal] = useModal();
const handleServerError = () =>
@@ -47,7 +48,7 @@ export const AddEmployeeForm = ({ setNewUserPassword }) => {
})}
</Info>
<Form onFinish={onFinish}>
- {getFormElements(intl).map(element => (
+ {formElements.map(element => (
<Form.Item
key={element.key}
rules={element.rules}
diff --git a/services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeModal.helper.js b/services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeModal.helper.js
deleted file mode 100644
index d42762d..0000000
--- a/services/health-department/src/components/App/modals/AddEmployeeModal/AddEmployeeModal.helper.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
- getMaxLengthRule,
- getRequiredRule,
- getPhoneRule,
- getEmailRule,
- getSafeStringRule,
- getNoNumericRule,
-} from 'utils/validatorRules';
-import { MAX_EMAIL_LENGTH, MAX_NAME_LENGTH } from 'constants/valueLength';
-
-export const getFormElements = intl => [
- {
- key: 'firstName',
- rules: [
- getRequiredRule(intl, 'firstName'),
- getSafeStringRule(intl, 'firstName'),
- getNoNumericRule(intl, 'firstName'),
- getMaxLengthRule(intl, MAX_NAME_LENGTH),
- ],
- },
- {
- key: 'lastName',
- rules: [
- getRequiredRule(intl, 'lastName'),
- getSafeStringRule(intl, 'lastName'),
- getNoNumericRule(intl, 'lastName'),
- getMaxLengthRule(intl, MAX_NAME_LENGTH),
- ],
- },
- {
- key: 'phone',
- rules: [getRequiredRule(intl, 'phone'), getPhoneRule(intl)],
- },
- {
- key: 'email',
- rules: [
- getRequiredRule(intl, 'email'),
- getEmailRule(intl),
- getMaxLengthRule(intl, MAX_EMAIL_LENGTH),
- ],
- },
-];
diff --git a/services/health-department/src/components/App/modals/AddEmployeeModal/useAddEmployee.js b/services/health-department/src/components/App/modals/AddEmployeeModal/useAddEmployee.js
new file mode 100644
index 0000000..560976b
--- /dev/null
+++ b/services/health-department/src/components/App/modals/AddEmployeeModal/useAddEmployee.js
@@ -0,0 +1,24 @@
+import {
+ usePersonNameValidator,
+ usePhoneValidator,
+ useEmailValidator,
+} from 'components/hooks/useValidators';
+
+export const useFormElements = () => [
+ {
+ key: 'firstName',
+ rules: usePersonNameValidator('firstName'),
+ },
+ {
+ key: 'lastName',
+ rules: usePersonNameValidator('lastName'),
+ },
+ {
+ key: 'phone',
+ rules: usePhoneValidator('phone'),
+ },
+ {
+ key: 'email',
+ rules: useEmailValidator('email'),
+ },
+];
diff --git a/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/ContactPersons.react.js b/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/ContactPersons.react.js
index 1ab4481..7343e5d 100644
--- a/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/ContactPersons.react.js
+++ b/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/ContactPersons.react.js
@@ -14,12 +14,9 @@ import { ContactPersonsWrapper, FlexWrapper } from './ContactPersons.styled';
export const ContactPersons = ({ location, indexPersonData }) => {
const [selectedTraces, setSelectedTraces] = useState(null);
const [decryptedTraces, setDecryptedTraces] = useState([]);
- const {
- isLoading,
- error,
- data: contactPersons,
- } = useQuery(
- `contactPersons${location.transferId}`,
+
+ const { isLoading, error, data: contactPersons } = useQuery(
+ ['contactPersons', { transferId: location.transferId }],
() => getContactPersons(location.transferId),
{ refetchOnWindowFocus: false }
);
diff --git a/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/Export/Export.styled.js b/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/Export/Export.styled.js
index 8ba4c0d..4976c3b 100644
--- a/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/Export/Export.styled.js
+++ b/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersons/Export/Export.styled.js
@@ -27,6 +27,7 @@ export const DownloadButton = styled.button`
padding: 5px 12px;
color: rgb(0, 0, 0);
font-family: Montserrat-Medium, sans-serif;
+ cursor: pointer;
`;
export const ExportButton = styled(DownloadButton)``;
diff --git a/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersonsModal.react.js b/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersonsModal.react.js
index 56de5a7..cf6a5ab 100644
--- a/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersonsModal.react.js
+++ b/services/health-department/src/components/App/modals/ContactPersonsModal/ContactPersonsModal.react.js
@@ -10,12 +10,8 @@ import { ModalWrapper } from './ContactPersonsModal.styled';
import { ContactPersons } from './ContactPersons';
export const ContactPersonsModal = ({ process, location }) => {
- const {
- isLoading,
- error,
- data: userData,
- } = useQuery(
- `userTransfer${process.userTransferId}`,
+ const { isLoading, error, data: indexPersonData } = useQuery(
+ ['userTransfer', { userTransferId: process.userTransferId }],
() =>
process.userTransferId ? decryptUserTransfer(process.userTransferId) : {},
{ retry: false, staleTime: Number.POSITIVE_INFINITY }
@@ -30,7 +26,9 @@ export const ContactPersonsModal = ({ process, location }) => {
<ContactPersons
location={location}
indexPersonData={
- Object.keys(userData || {}).length > 0 && !error ? userData : null
+ Object.keys(indexPersonData || {}).length > 0 && !error
+ ? indexPersonData
+ : null
}
/>
</ModalWrapper>
diff --git a/services/health-department/src/components/App/modals/GroupSearchModal/DataRequestModal/DataRequestModal.react.js b/services/health-department/src/components/App/modals/GroupSearchModal/DataRequestModal/DataRequestModal.react.js
index d455a08..6bfa4ee 100644
--- a/services/health-department/src/components/App/modals/GroupSearchModal/DataRequestModal/DataRequestModal.react.js
+++ b/services/health-department/src/components/App/modals/GroupSearchModal/DataRequestModal/DataRequestModal.react.js
@@ -4,8 +4,9 @@ import { useIntl } from 'react-intl';
import { useQueryClient } from 'react-query';
import { Form, DatePicker, TimePicker, notification } from 'antd';
import { PrimaryButton, SecondaryButton } from 'components/general';
-import { createLocationTransfer } from 'network/api';
+import { createLocationTransfer, getMe } from 'network/api';
import { mergeTimeAndDateObject } from 'utils/moment';
+import { signLocationTransfer } from 'utils/cryptoKeyOperations';
import { useModal } from 'components/hooks/useModal';
import {
@@ -30,7 +31,7 @@ export const DataRequestModal = ({ group, back }) => {
id: 'modal.dataRequest.form.error.required',
});
- const onFinish = values => {
+ const onFinish = async values => {
const startTime = mergeTimeAndDateObject(
moment(values.startDate),
moment(values.startTime)
@@ -51,10 +52,19 @@ export const DataRequestModal = ({ group, back }) => {
const time = [startTime.unix(), endTime.unix()];
+ const healthDepartmentUUID = await getMe().then(
+ response => response.departmentId
+ );
+
createLocationTransfer({
locations: group.locations.map(locationId => ({
- time,
locationId,
+ time,
+ signedLocationTransfer: signLocationTransfer({
+ locationId,
+ time,
+ iss: healthDepartmentUUID,
+ }),
})),
lang: intl.locale,
})
diff --git a/services/health-department/src/components/App/modals/GroupSearchModal/GroupSearchModal.react.js b/services/health-department/src/components/App/modals/GroupSearchModal/GroupSearchModal.react.js
index 52dcddd..149f33b 100644
--- a/services/health-department/src/components/App/modals/GroupSearchModal/GroupSearchModal.react.js
+++ b/services/health-department/src/components/App/modals/GroupSearchModal/GroupSearchModal.react.js
@@ -130,7 +130,7 @@ export const GroupSearchModal = () => {
<PrimaryButton
data-cy="startGroupSearch"
htmlType="submit"
- floatRight
+ $floatRight
disabled={!inputValid.zipCode || !inputValid.groupName}
>
{intl.formatMessage({
diff --git a/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.helper.js b/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.helper.js
index 8a1ab91..d4b060e 100644
--- a/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.helper.js
+++ b/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.helper.js
@@ -29,10 +29,10 @@ export const getLocaleObject = (localeConfig, departmentId, level, intl) => {
for (const [key, value] of Object.entries(localizeddepartmentMessages)) {
localizeddepartmentMessages[key] = value
- .replaceAll('((', '{')
- .replaceAll('))', '}')
- .replaceAll(/^\s*\n/gm, '{br}')
- .replaceAll('\n', '{br}');
+ .replace(/\(\(/g, '{')
+ .replace(/\)\)/g, '}')
+ .replace(/^\s*\n/gm, '{br}')
+ .replace(/\n/g, '{br}');
}
return {
messages: localizeddepartmentMessages,
diff --git a/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.react.js b/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.react.js
index cdbcf29..58598ab 100644
--- a/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.react.js
+++ b/services/health-department/src/components/App/modals/NotificationModal/NotificationModal.react.js
@@ -55,18 +55,14 @@ export const NotificationModal = ({
}
);
- const {
- data: contactPersons,
- } = useQuery(
- `contactPersons${locationTransferId}`,
+ const { data: contactPersons } = useQuery(
+ ['contactPersons', { locationTransferId }],
() => getContactPersons(locationTransferId),
{ refetchOnWindowFocus: false }
);
- const {
- data: riskLevels,
- } = useQuery(
- `getWarningLevelsForLocationTransfer${locationTransferId}`,
+ const { data: riskLevels } = useQuery(
+ ['getWarningLevelsForLocationTransfer', { locationTransferId }],
() => getWarningLevelsForLocationTransfer(locationTransferId),
{ refetchOnWindowFocus: false }
);
@@ -112,9 +108,10 @@ export const NotificationModal = ({
id: 'notification.notification.success',
}),
});
- queryClient.invalidateQueries(
- `getWarningLevelsForLocationTransfer${locationTransferId}`
- );
+ queryClient.invalidateQueries([
+ 'getWarningLevelsForLocationTransfer',
+ { locationTransferId },
+ ]);
closeModal();
return;
}
diff --git a/services/health-department/src/components/Login/Login.react.js b/services/health-department/src/components/Login/Login.react.js
index e380ca7..5bcc226 100644
--- a/services/health-department/src/components/Login/Login.react.js
+++ b/services/health-department/src/components/Login/Login.react.js
@@ -134,7 +134,7 @@ export const Login = () => {
>
<PrimaryButton
htmlType="submit"
- isButtonWhite
+ $isButtonWhite
style={{
marginTop: '24px',
}}
diff --git a/services/health-department/src/components/general/Buttons.styled.js b/services/health-department/src/components/general/Buttons.styled.js
index 2e49913..4ae867b 100644
--- a/services/health-department/src/components/general/Buttons.styled.js
+++ b/services/health-department/src/components/general/Buttons.styled.js
@@ -18,15 +18,15 @@ const ButtonGeneral = {
export const PrimaryButton = styled(Button)`
${{ ...ButtonGeneral }}
- background: ${({ isButtonWhite }) =>
- isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
+ background: ${({ $isButtonWhite }) =>
+ $isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
border: 2px solid
- ${({ isButtonWhite }) => (isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
+ ${({ $isButtonWhite }) => ($isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
border-radius: 24px;
color: rgba(0, 0, 0, 0.87);
cursor: pointer;
transition: 0.1s ease-in-out all;
- ${({ floatRight }) => (floatRight ? 'float:right' : '')};
+ ${({ $floatRight }) => ($floatRight ? 'float:right' : '')};
&:hover,
&:focus {
diff --git a/services/health-department/src/components/hooks/useLocationTransfers.js b/services/health-department/src/components/hooks/useLocationTransfers.js
index bd36b05..15f5b63 100644
--- a/services/health-department/src/components/hooks/useLocationTransfers.js
+++ b/services/health-department/src/components/hooks/useLocationTransfers.js
@@ -1,6 +1,5 @@
import { useState, useEffect } from 'react';
import { useQuery, useQueries } from 'react-query';
-
import { getLocation, getLocationTransfers } from 'network/api';
/**
diff --git a/services/health-department/src/constants/sormas.js b/services/health-department/src/constants/sormas.js
index 4be7d07..9c2d75f 100644
--- a/services/health-department/src/constants/sormas.js
+++ b/services/health-department/src/constants/sormas.js
@@ -4,4 +4,5 @@ export const SUPPORTED_SORMAS_VERSIONS = {
'"1.59.2"': true,
'"1.61.1"': true,
'"1.62.3"': true,
+ '"1.63.1"': true,
};
diff --git a/services/health-department/src/messages/de.json b/services/health-department/src/messages/de.json
index e721a71..5372c25 100644
--- a/services/health-department/src/messages/de.json
+++ b/services/health-department/src/messages/de.json
@@ -391,6 +391,8 @@
"modal.notification.selection.elevatedInfectionRisk": "Erhöhtes Infektionsrisiko",
"modal.notification.button.alreadyNotified": "Bereits benachrichtigt",
"contactperson.notified": "Hinweis ausgelöst",
- "modal.notification.selectionWarning": "Wichtige Information: Der Hinweis \"Mögliches Infektionsrisiko\" wird an alle Personen ausgespielt, die im jeweiligen Zeitrahmen in der Location eingecheckt waren. Ihre Auswahl aus dem vorherigen Schritt ist nicht mehr gültig.",
- "modal.notification.selection.countNoNotification": "{amount} Personen werden nicht benachrichtigt, da der Check-in via Schlüsselanhänger, Kontaktformular oder Web App erfolgte oder weil diese Person bereits benachrichtigt wurde."
+ "modal.notification.selectionWarning": "Wichtige Information: Der Hinweis \"Mögliches Infektionsrisiko\" wird an alle Personen ausgespielt, die im jeweiligen Zeitrahmen im Standort eingecheckt waren. Ihre Auswahl aus dem vorherigen Schritt ist nicht mehr gültig.",
+ "modal.notification.selection.countNoNotification": "{amount} Personen werden nicht benachrichtigt, da der Check-in via Schlüsselanhänger, Kontaktformular oder Web App erfolgte oder weil diese Person bereits benachrichtigt wurde.",
+ "unsignedWarning.title": "Verifizierung Ihres Gesundheitsamts notwendig",
+ "unsignedWarning.description": "Um die Sicherheit des luca-Systems zu erhöhen, können nur noch verifizierte Gesundheitsämter Anfragen an luca Standorte stellen und Kontaktdaten abrufen. Gesundheitsämter werden verifiziert indem sie ihre Schlüssel mit dem Zertifikat der Bundesdruckerei signieren. {br} {br} \nDie Signierung kann nur von Admins von luca Gesundheitsamt vorgenommen werden. Sollten Sie Hilfe benötigen, steht Ihnen der Support unter {email} und unter {phone} gern zur Verfügung!"
}
\ No newline at end of file
diff --git a/services/health-department/src/messages/en.json b/services/health-department/src/messages/en.json
index 1825577..a6499da 100644
--- a/services/health-department/src/messages/en.json
+++ b/services/health-department/src/messages/en.json
@@ -51,8 +51,8 @@
"modal.trackInfection.button": "Track",
"modal.trackInfection.tan.error.required": "Please enter the users TAN",
"modal.trackInfection.tan.error.min": "This part of the user TAN can't be under 4 character",
- "modal.trackInfection.error.staticTracing": "An error occured while processing static tan",
- "modal.trackInfection.error.userTracing": "An error occured while processing user tan",
+ "modal.trackInfection.error.staticTracing": "An error occurred while processing static tan",
+ "modal.trackInfection.error.userTracing": "An error occurred while processing user tan",
"modal.trackInfection.error.emptyUserTracing": "User history is empty. The process was not created.",
"modal.trackInfection.error.invalidVersion": "The transfer version is invalid.",
"modal.trackInfection.error.decryptionFailed": "The transfer could not be decrypted.",
@@ -134,7 +134,7 @@
"processTable.description": "Type",
"processTable.name": "Process name",
"processTable.status": "Process status",
- "processTable.location": "Location",
+ "processTable.location": "Locations",
"processTable.person": "Person",
"processTable.done": "Approved",
"processTable.open": "Open",
@@ -292,7 +292,7 @@
"modal.dataRequest.back": "back",
"modal.dataRequest.from": "From:",
"modal.dataRequest.to": "To:",
- "groupSearch.info.search": "Search a location by the location name and optionally narrow the search with a ZIP code.",
+ "groupSearch.info.search": "Search a location by name and optionally narrow the search with a ZIP code.",
"groupSearch.form.button.chooseTimeframe": "choose time frame",
"modal.dataRequest.time.clock": " ",
"processTable.deleteConfirm": "Do you really want to delete this process?",
@@ -365,7 +365,7 @@
"modal.notification.section1.title": "Notify guests of {locationName} via the luca app",
"modal.notification.section1": "If you trigger a notification, the luca app users who were checked in during the selected time period will be informed via their luca app, that they attended a location at the same time as an infected person.",
"modal.notification.section2.title": "The notification contains the following text:",
- "modal.notification.section2.part1": "Notification: Potential infection risk\n{br}\n{br}\nYou were checked into a Luca place at the same time as a person who tested positive for coronavirus (SARS-CoV-2).\n{br}\n{br}\nPlease act responsibly, reduce your contacts and contact your local health department – especially, if you experience any symptoms. The health department also advises doing a rapid test.",
+ "modal.notification.section2.part1": "Notification: Potential infection risk\n{br}\n{br}\nYou were checked into a luca location at the same time as a person who tested positive for coronavirus (SARS-CoV-2).\n{br}\n{br}\nPlease act responsibly, reduce your contacts and contact your local health department – especially, if you experience any symptoms. The health department also advises doing a rapid test.",
"modal.notification.section4.title": "{guestCount} persons will receive this notification.",
"modal.notification.confirmation": "Do you want to trigger the notification? {guestCount} persons will receive the notification via their luca app. This action cannot be undone.",
"modal.notification.button": "Trigger notification",
@@ -375,7 +375,7 @@
"profile.contactInformation.phone": "Phone number:",
"profile.contactInformation.email": "Email address:",
"profile.contactInformation.headline": "Provide public phone number and mail address",
- "profile.contactInformation.description": "Please provide a phone number and/or an email address that can be used by users in the luca system to get in touch with you. This may be necessary, for example, if you've asked users of the luca app to contact you via notification or when a luca place receives an unusual request from a health department and would like to check its authenticity.",
+ "profile.contactInformation.description": "Please provide a phone number and/or an email address that can be used by users in the luca system to get in touch with you. This may be necessary, for example, if you've asked users of the luca app to contact you via notification or when a luca location receives an unusual request from a health department and would like to check its authenticity.",
"notification.profile.contactInformation.success": "Saved successfully.",
"notification.profile.contactInformation.error": "Error while updating the contact information.",
"navigation.comprehensiveInformation": "Comprehensive information",
@@ -392,5 +392,7 @@
"modal.notification.button.alreadyNotified": "Already notified",
"contactperson.notified": "Notification sent",
"modal.notification.selectionWarning": "This warning can only be triggered for all contact persons.",
- "modal.notification.selection.countNoNotification": "{amount} persons won't receive this notification as the check-in occured via badge, contact form or web app or because they have already been notified."
+ "modal.notification.selection.countNoNotification": "{amount} persons won't receive this notification as the check-in occurred via badge, contact form or web app or because they have already been notified.",
+ "unsignedWarning.title": "Verification of your health department necessary",
+ "unsignedWarning.description": "To increase the security of the luca system, unverified health departments can no longer request data from locations and access contact data. Health departments are verified by signing their keys with the certificate of the Bundesdruckerei. {br} {br} \nThis signature can only be made by luca health department admins. If you require assistance, contact our support under {email} or {phone}!"
}
\ No newline at end of file
diff --git a/services/health-department/src/network/api.js b/services/health-department/src/network/api.js
index 46b57b7..1329126 100644
--- a/services/health-department/src/network/api.js
+++ b/services/health-department/src/network/api.js
@@ -154,7 +154,7 @@ export const findGroups = searchParameters => {
};
export const createLocationTransfer = data => {
- return fetch(`${API_PATH}/v3/locationTransfers/`, {
+ return fetch(`${API_PATH}/v4/locationTransfers/`, {
method: 'POST',
body: JSON.stringify(data),
headers,
diff --git a/services/health-department/src/utils/cryptoKeyOperations.js b/services/health-department/src/utils/cryptoKeyOperations.js
index 031d7e9..15e739c 100644
--- a/services/health-department/src/utils/cryptoKeyOperations.js
+++ b/services/health-department/src/utils/cryptoKeyOperations.js
@@ -1,4 +1,17 @@
import moment from 'moment';
+import jwt from 'jsonwebtoken';
+import {
+ VERIFY_EC_SHA256_DER_SIGNATURE,
+ SIGN_EC_SHA256_DER,
+ EC_KEYPAIR_FROM_PRIVATE_KEY,
+ EC_KEYPAIR_GENERATE,
+ ENCRYPT_DLIES,
+ DECRYPT_DLIES,
+ int32ToHex,
+ base64ToHex,
+ hexToBase64,
+ privateKeyToECPrivateKeyPEM,
+} from '@lucaapp/crypto';
import {
getCurrentDailyKey,
@@ -17,18 +30,6 @@ import {
getEncryptedBadgePrivateKey,
} from 'network/api';
-import {
- VERIFY_EC_SHA256_DER_SIGNATURE,
- EC_KEYPAIR_FROM_PRIVATE_KEY,
- EC_KEYPAIR_GENERATE,
- SIGN_EC_SHA256_DER,
- ENCRYPT_DLIES,
- DECRYPT_DLIES,
- int32ToHex,
- base64ToHex,
- hexToBase64,
-} from '@lucaapp/crypto';
-
import { InvalidNoteSignatureError } from 'errors/InvalidNoteSignatureError';
const MIN_DAILY_KEY_AGE_BEFORE_ROTATION_DAYS = 1;
@@ -77,9 +78,8 @@ export const getBadgePrivateKey = async keyId => {
);
};
-export const DECRYPT_DLIES_USING_HDEKP = (publicKey, data, iv, mac) => {
- return DECRYPT_DLIES(hdekp, publicKey, data, iv, mac);
-};
+export const DECRYPT_DLIES_USING_HDEKP = (publicKey, data, iv, mac) =>
+ DECRYPT_DLIES(hdekp, publicKey, data, iv, mac);
/**
* Checks if the daily keypair needs to be refreshed and if so, generates it,
@@ -356,6 +356,14 @@ export const rekeyBadgeKeypairs = async () => {
sendRekeyBadgeKeys(serverPayload);
};
+export const signLocationTransfer = payload =>
+ jwt.sign(
+ { ...payload, type: 'locationTransfer' },
+ privateKeyToECPrivateKeyPEM(hdskp),
+ {
+ algorithm: 'ES256',
+ }
+ );
export const generateSignature = data => SIGN_EC_SHA256_DER(hdskp, data);
export const verifyNoteSignature = (encryptedData, iv, mac, signature) => {
diff --git a/services/health-department/src/utils/cryptoOperations.js b/services/health-department/src/utils/cryptoOperations.js
index 31e4673..35c958f 100644
--- a/services/health-department/src/utils/cryptoOperations.js
+++ b/services/health-department/src/utils/cryptoOperations.js
@@ -9,6 +9,7 @@ import {
getUserTraces,
getUserTransferById,
getUserTransferByTan,
+ getMe,
} from 'network/api';
import {
@@ -28,7 +29,10 @@ import {
KDF_SHA256,
} from '@lucaapp/crypto';
-import { getDailyPrivateKey } from './cryptoKeyOperations';
+import {
+ getDailyPrivateKey,
+ signLocationTransfer,
+} from './cryptoKeyOperations';
import {
decryptAdditionalData,
decryptDynamicDeviceTrace,
@@ -112,7 +116,7 @@ export const decryptTrace = async encryptedTrace => {
: await decryptDynamicDeviceTrace(encryptedTrace);
const additionalData = decryptAdditionalData(encryptedTrace, isInvalid);
- // santize data here
+ // sanitize data here
return {
traceId: encryptedTrace.traceId,
@@ -213,7 +217,7 @@ export const initiateUserTracingProcess = async (tan, lang) => {
}
let userTraces;
- const userId = userSecrets.uid.replaceAll('-', '');
+ const userId = userSecrets.uid.replace(/-/g, '');
switch (userSecrets.v) {
case 2:
userTraces = await getUserTracesV2(userSecrets, userId);
@@ -229,8 +233,20 @@ export const initiateUserTracingProcess = async (tan, lang) => {
return EMPTY_HISTORY;
}
+ const healthDepartmentUUID = await getMe().then(
+ response => response.departmentId
+ );
+
+ const userTracesWithSignature = userTraces.map(userTrace => ({
+ ...userTrace,
+ signedLocationTransfer: signLocationTransfer({
+ locationId: userTrace.locationId,
+ time: userTrace.time,
+ iss: healthDepartmentUUID,
+ }),
+ }));
const { tracingProcessId } = await createLocationTransfer({
- locations: userTraces,
+ locations: userTracesWithSignature,
userTransferId: userDataTransferObject.uuid,
lang,
});
diff --git a/services/health-department/src/utils/jest.setup.js b/services/health-department/src/utils/jest.setup.js
index f9b7287..7b0828b 100644
--- a/services/health-department/src/utils/jest.setup.js
+++ b/services/health-department/src/utils/jest.setup.js
@@ -1,4 +1 @@
import '@testing-library/jest-dom';
-import replaceAllInserter from 'string.prototype.replaceall';
-
-replaceAllInserter.shim();
diff --git a/services/health-department/src/utils/keyHandler.js b/services/health-department/src/utils/keyHandler.js
index 148e8af..3357fad 100644
--- a/services/health-department/src/utils/keyHandler.js
+++ b/services/health-department/src/utils/keyHandler.js
@@ -14,7 +14,9 @@ function loadKeyFile(string, keysData) {
const keys = JSON.parse(string);
if (
base64ToHex(keysData.publicHDEKP) !==
- EC_KEYPAIR_FROM_PRIVATE_KEY(keys.hdekp).publicKey
+ EC_KEYPAIR_FROM_PRIVATE_KEY(keys.hdekp).publicKey ||
+ base64ToHex(keysData.publicHDSKP) !==
+ EC_KEYPAIR_FROM_PRIVATE_KEY(keys.hdskp).publicKey
) {
throw new Error('invalid key');
}
diff --git a/services/health-department/yarn.lock b/services/health-department/yarn.lock
index 138aeae..253088a 100644
--- a/services/health-department/yarn.lock
+++ b/services/health-department/yarn.lock
@@ -26,9 +26,9 @@
rc-util "^5.9.4"
"@ant-design/react-slick@~0.28.1":
- version "0.28.3"
- resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.3.tgz#ad5cf1cf50363c1a3842874d69d0ce1f26696e71"
- integrity sha512-u3onF2VevGRbkGbgpldVX/nzd7LFtLeZJE0x2xIFT2qYHKkJZ6QT/jQ7KqYK4UpeTndoyrbMqLN4DiJza4BVBg==
+ version "0.28.4"
+ resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.4.tgz#8b296b87ad7c7ae877f2a527b81b7eebd9dd29a9"
+ integrity sha512-j9eAHTn7GxbXUFNknJoHS2ceAsqrQi2j8XykjZE1IXCD8kJF+t28EvhBLniDpbOsBk/3kjalnhriTfZcjBHNqg==
dependencies:
"@babel/runtime" "^7.10.4"
classnames "^2.2.5"
@@ -57,7 +57,7 @@
dependencies:
"@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0":
+"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
@@ -85,19 +85,19 @@
source-map "^0.5.0"
"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
- integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
+ version "7.15.5"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
+ integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helpers" "^7.14.8"
- "@babel/parser" "^7.15.0"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-compilation-targets" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
+ "@babel/helpers" "^7.15.4"
+ "@babel/parser" "^7.15.5"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -106,24 +106,15 @@
source-map "^0.5.0"
"@babel/eslint-parser@^7.12.16":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz#b54f06e04d0e93aebcba99f89251e3bf0ee39f21"
- integrity sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.4.tgz#46385943726291fb3e8db99522c8099b15684387"
+ integrity sha512-hPMIAmGNbmQzXJIo2P43Zj9UhRmGev5f9nqdBFOWNGDGh6XKmjby79woBvg6y0Jur6yRfQBneDbUQ8ZVc1krFw==
dependencies:
eslint-scope "^5.1.1"
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.12.1", "@babel/generator@^7.15.0", "@babel/generator@^7.7.2":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
- integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==
- dependencies:
- "@babel/types" "^7.15.0"
- jsesc "^2.5.1"
- source-map "^0.5.0"
-
-"@babel/generator@^7.15.4":
+"@babel/generator@^7.12.1", "@babel/generator@^7.15.4", "@babel/generator@^7.7.2":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
@@ -132,14 +123,7 @@
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
- integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-annotate-as-pure@^7.15.4":
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
@@ -147,24 +131,14 @@
"@babel/types" "^7.15.4"
"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
- integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
- dependencies:
- "@babel/helper-explode-assignable-expression" "^7.14.5"
- "@babel/types" "^7.14.5"
-
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818"
- integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+ integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
dependencies:
- "@babel/compat-data" "^7.15.0"
- "@babel/helper-validator-option" "^7.14.5"
- browserslist "^4.16.6"
- semver "^6.3.0"
+ "@babel/helper-explode-assignable-expression" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-compilation-targets@^7.15.4":
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
@@ -174,19 +148,7 @@
browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7"
- integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-split-export-declaration" "^7.14.5"
-
-"@babel/helper-create-class-features-plugin@^7.15.4":
+"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
@@ -220,23 +182,14 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
- integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-function-name@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
- integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+"@babel/helper-explode-assignable-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+ integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
dependencies:
- "@babel/helper-get-function-arity" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-function-name@^7.15.4":
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
@@ -245,13 +198,6 @@
"@babel/template" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-get-function-arity@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
- integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-get-function-arity@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
@@ -259,13 +205,6 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-hoist-variables@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
- integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-hoist-variables@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
@@ -273,13 +212,6 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-member-expression-to-functions@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b"
- integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==
- dependencies:
- "@babel/types" "^7.15.0"
-
"@babel/helper-member-expression-to-functions@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
@@ -287,35 +219,14 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
- integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-module-imports@^7.15.4":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08"
- integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==
- dependencies:
- "@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-simple-access" "^7.14.8"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.9"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
-
-"@babel/helper-module-transforms@^7.15.4":
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz#962cc629a7f7f9a082dd62d0307fa75fe8788d7c"
integrity sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==
@@ -329,13 +240,6 @@
"@babel/traverse" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-optimise-call-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
- integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-optimise-call-expression@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
@@ -348,16 +252,7 @@
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-"@babel/helper-remap-async-to-generator@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
- integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-wrap-function" "^7.14.5"
- "@babel/types" "^7.14.5"
-
-"@babel/helper-remap-async-to-generator@^7.15.4":
+"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
@@ -366,17 +261,7 @@
"@babel/helper-wrap-function" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4"
- integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==
- dependencies:
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
-
-"@babel/helper-replace-supers@^7.15.4":
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
@@ -386,13 +271,6 @@
"@babel/traverse" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helper-simple-access@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
- integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
- dependencies:
- "@babel/types" "^7.14.8"
-
"@babel/helper-simple-access@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
@@ -400,27 +278,13 @@
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
- integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
- dependencies:
- "@babel/types" "^7.14.5"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
dependencies:
"@babel/types" "^7.15.4"
-"@babel/helper-split-export-declaration@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
- integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
- dependencies:
- "@babel/types" "^7.14.5"
-
"@babel/helper-split-export-declaration@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
@@ -438,16 +302,6 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-"@babel/helper-wrap-function@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
- integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
- dependencies:
- "@babel/helper-function-name" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
-
"@babel/helper-wrap-function@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
@@ -458,14 +312,14 @@
"@babel/traverse" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.8":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357"
- integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+ integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
dependencies:
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
version "7.14.5"
@@ -476,25 +330,11 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.8.3":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
- integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
-
-"@babel/parser@^7.15.4":
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.15.4", "@babel/parser@^7.15.5", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.8.3":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
- integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
- "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
@@ -504,16 +344,7 @@
"@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a"
- integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-remap-async-to-generator" "^7.14.5"
- "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-async-generator-functions@^7.15.4":
+"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
@@ -538,15 +369,6 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-class-static-block@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
- integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
- dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
"@babel/plugin-proposal-class-static-block@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
@@ -629,18 +451,7 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
- integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
- dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.14.5"
-
-"@babel/plugin-proposal-object-rest-spread@^7.15.6":
+"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.15.6":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
@@ -685,16 +496,6 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-private-property-in-object@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
- integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-create-class-features-plugin" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
"@babel/plugin-proposal-private-property-in-object@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
@@ -876,27 +677,14 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.5", "@babel/plugin-transform-block-scoping@^7.15.3":
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.15.3":
version "7.15.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f"
- integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- globals "^11.1.0"
-
-"@babel/plugin-transform-classes@^7.15.4":
+"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
@@ -954,14 +742,7 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-flow" "^7.12.1"
-"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
- integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-for-of@^7.15.4":
+"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
@@ -999,17 +780,7 @@
"@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281"
- integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==
- dependencies:
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.8"
- babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.15.4":
+"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
@@ -1019,18 +790,7 @@
"@babel/helper-simple-access" "^7.15.4"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
- integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
- dependencies:
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.5"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.5"
- babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.15.4":
+"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
@@ -1071,14 +831,7 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-replace-supers" "^7.14.5"
-"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
- integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
- dependencies:
- "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-parameters@^7.15.4":
+"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.15.4":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
@@ -1214,11 +967,11 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-typescript@^7.12.1":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e"
- integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
+ integrity sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.15.0"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript" "^7.14.5"
@@ -1309,7 +1062,7 @@
core-js-compat "^3.6.2"
semver "^5.5.0"
-"@babel/preset-env@7.15.6":
+"@babel/preset-env@7.15.6", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
@@ -1388,85 +1141,6 @@
core-js-compat "^3.16.0"
semver "^6.3.0"
-"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464"
- integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==
- dependencies:
- "@babel/compat-data" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-async-generator-functions" "^7.14.9"
- "@babel/plugin-proposal-class-properties" "^7.14.5"
- "@babel/plugin-proposal-class-static-block" "^7.14.5"
- "@babel/plugin-proposal-dynamic-import" "^7.14.5"
- "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
- "@babel/plugin-proposal-json-strings" "^7.14.5"
- "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
- "@babel/plugin-proposal-numeric-separator" "^7.14.5"
- "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
- "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
- "@babel/plugin-proposal-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-private-methods" "^7.14.5"
- "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
- "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
- "@babel/plugin-syntax-async-generators" "^7.8.4"
- "@babel/plugin-syntax-class-properties" "^7.12.13"
- "@babel/plugin-syntax-class-static-block" "^7.14.5"
- "@babel/plugin-syntax-dynamic-import" "^7.8.3"
- "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
- "@babel/plugin-syntax-json-strings" "^7.8.3"
- "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
- "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
- "@babel/plugin-syntax-numeric-separator" "^7.10.4"
- "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
- "@babel/plugin-syntax-optional-chaining" "^7.8.3"
- "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
- "@babel/plugin-syntax-top-level-await" "^7.14.5"
- "@babel/plugin-transform-arrow-functions" "^7.14.5"
- "@babel/plugin-transform-async-to-generator" "^7.14.5"
- "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
- "@babel/plugin-transform-block-scoping" "^7.14.5"
- "@babel/plugin-transform-classes" "^7.14.9"
- "@babel/plugin-transform-computed-properties" "^7.14.5"
- "@babel/plugin-transform-destructuring" "^7.14.7"
- "@babel/plugin-transform-dotall-regex" "^7.14.5"
- "@babel/plugin-transform-duplicate-keys" "^7.14.5"
- "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
- "@babel/plugin-transform-for-of" "^7.14.5"
- "@babel/plugin-transform-function-name" "^7.14.5"
- "@babel/plugin-transform-literals" "^7.14.5"
- "@babel/plugin-transform-member-expression-literals" "^7.14.5"
- "@babel/plugin-transform-modules-amd" "^7.14.5"
- "@babel/plugin-transform-modules-commonjs" "^7.15.0"
- "@babel/plugin-transform-modules-systemjs" "^7.14.5"
- "@babel/plugin-transform-modules-umd" "^7.14.5"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
- "@babel/plugin-transform-new-target" "^7.14.5"
- "@babel/plugin-transform-object-super" "^7.14.5"
- "@babel/plugin-transform-parameters" "^7.14.5"
- "@babel/plugin-transform-property-literals" "^7.14.5"
- "@babel/plugin-transform-regenerator" "^7.14.5"
- "@babel/plugin-transform-reserved-words" "^7.14.5"
- "@babel/plugin-transform-shorthand-properties" "^7.14.5"
- "@babel/plugin-transform-spread" "^7.14.6"
- "@babel/plugin-transform-sticky-regex" "^7.14.5"
- "@babel/plugin-transform-template-literals" "^7.14.5"
- "@babel/plugin-transform-typeof-symbol" "^7.14.5"
- "@babel/plugin-transform-unicode-escapes" "^7.14.5"
- "@babel/plugin-transform-unicode-regex" "^7.14.5"
- "@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.15.0"
- babel-plugin-polyfill-corejs2 "^0.2.2"
- babel-plugin-polyfill-corejs3 "^0.2.2"
- babel-plugin-polyfill-regenerator "^0.2.2"
- core-js-compat "^3.16.0"
- semver "^6.3.0"
-
"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
@@ -1512,9 +1186,9 @@
"@babel/plugin-transform-typescript" "^7.12.1"
"@babel/runtime-corejs3@^7.10.2":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d"
- integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz#403139af262b9a6e8f9ba04a6fdcebf8de692bf1"
+ integrity sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==
dependencies:
core-js-pure "^3.16.0"
regenerator-runtime "^0.13.4"
@@ -1526,30 +1200,14 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
- integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
- dependencies:
- regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.12.13":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.10.4", "@babel/template@^7.14.5", "@babel/template@^7.3.3":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
- integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.14.5"
- "@babel/types" "^7.14.5"
-
-"@babel/template@^7.15.4":
+"@babel/template@^7.10.4", "@babel/template@^7.15.4", "@babel/template@^7.3.3":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
@@ -1558,22 +1216,7 @@
"@babel/parser" "^7.15.4"
"@babel/types" "^7.15.4"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
- integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.15.0"
- "@babel/types" "^7.15.0"
- debug "^4.1.0"
- globals "^11.1.0"
-
-"@babel/traverse@^7.15.4":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
@@ -1588,15 +1231,7 @@
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
- integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
- dependencies:
- "@babel/helper-validator-identifier" "^7.14.9"
- to-fast-properties "^2.0.0"
-
-"@babel/types@^7.15.4", "@babel/types@^7.15.6":
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
version "7.15.6"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
@@ -1749,6 +1384,11 @@
intl-messageformat "9.9.1"
tslib "^2.1.0"
+"@gar/promisify@^1.0.1":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
+ integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+
"@hapi/address@2.x.x":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -2065,17 +1705,6 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"
-"@jest/types@^27.0.6":
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz#9a992bc517e0c49f035938b8549719c2de40706b"
- integrity sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==
- dependencies:
- "@types/istanbul-lib-coverage" "^2.0.0"
- "@types/istanbul-reports" "^3.0.0"
- "@types/node" "*"
- "@types/yargs" "^16.0.0"
- chalk "^4.0.0"
-
"@jest/types@^27.1.1":
version "27.1.1"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.1.1.tgz#77a3fc014f906c65752d12123a0134359707c0ad"
@@ -2125,6 +1754,14 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
+"@npmcli/fs@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f"
+ integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==
+ dependencies:
+ "@gar/promisify" "^1.0.1"
+ semver "^7.3.5"
+
"@npmcli/move-file@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -2321,9 +1958,9 @@
loader-utils "^2.0.0"
"@testing-library/dom@^8.0.0":
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.1.0.tgz#f8358b1883844ea569ba76b7e94582168df5370d"
- integrity sha512-kmW9alndr19qd6DABzQ978zKQ+J65gU2Rzkl8hriIetPnwpesRaK4//jEQyYh8fEALmGhomD/LBQqt+o+DL95Q==
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.5.0.tgz#56e31331015f943a68c6ec27e259fdf16c69ab7d"
+ integrity sha512-O0fmHFaPlqaYCpa/cBL0cvroMridb9vZsMLacgIqrlxj+fd+bGF8UfAgwsLCHRF84KLBafWlm9CuOvxeNTlodw==
dependencies:
"@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5"
@@ -2368,9 +2005,9 @@
integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
- version "7.1.15"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024"
- integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==
+ version "7.1.16"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
+ integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
@@ -2466,12 +2103,12 @@
"@types/istanbul-lib-report" "*"
"@types/jest@*":
- version "27.0.0"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.0.tgz#f1c28f741371739c7cd0e8edb5ed8e67acfa6c35"
- integrity sha512-IlpQZVpxufe+3qPaAqEoSPHVSxnJh1cf0BqqWHJeKiAUbwnHdmNzjP3ZCWSZSTbmAGXQPNk9QmM3Bif0pR54rg==
+ version "27.0.1"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.1.tgz#fafcc997da0135865311bb1215ba16dba6bdf4ca"
+ integrity sha512-HTLpVXHrY69556ozYkcq47TtQJXpcWAWfkoqz+ZGz2JnmZhzlRjprCIyFnetSy8gpDWwTTGBcRVv1J1I1vBrHw==
dependencies:
- jest-diff "^26.0.0"
- pretty-format "^26.0.0"
+ jest-diff "^27.0.0"
+ pretty-format "^27.0.0"
"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
version "7.0.9"
@@ -2484,9 +2121,9 @@
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
"@types/mdast@^3.0.0":
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.7.tgz#cba63d0cc11eb1605cea5c0ad76e02684394166b"
- integrity sha512-YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg==
+ version "3.0.10"
+ resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+ integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
dependencies:
"@types/unist" "*"
@@ -2501,9 +2138,9 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/node@*":
- version "16.4.13"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d"
- integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==
+ version "16.9.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9"
+ integrity sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@@ -2540,16 +2177,7 @@
hoist-non-react-statics "^3.3.0"
redux "^4.0.0"
-"@types/react@*":
- version "17.0.17"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.17.tgz#1772d3d5425128e0635a716f49ef57c2955df055"
- integrity sha512-nrfi7I13cAmrd0wje8czYpf5SFbryczCtPzFc6ijqvdjKcyA3tCvGxwchOUlxb2ucBPuJ9Y3oUqKrRqZvrz0lw==
- dependencies:
- "@types/prop-types" "*"
- "@types/scheduler" "*"
- csstype "^3.0.2"
-
-"@types/react@17":
+"@types/react@*", "@types/react@17":
version "17.0.21"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.21.tgz#069c43177cd419afaab5ce26bb4e9056549f7ea6"
integrity sha512-GzzXCpOthOjXvrAUFQwU/svyxu658cwu00Q9ugujS4qc1zXgLFaO0kS2SLOaMWLt2Jik781yuHCWB7UcYdGAeQ==
@@ -2623,9 +2251,9 @@
source-map "^0.6.1"
"@types/webpack@^4.41.8":
- version "4.41.30"
- resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc"
- integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==
+ version "4.41.31"
+ resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa"
+ integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==
dependencies:
"@types/node" "*"
"@types/tapable" "^1"
@@ -2654,27 +2282,27 @@
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz#808d206e2278e809292b5de752a91105da85860b"
- integrity sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz#e938603a136f01dcabeece069da5fb2e331d4498"
+ integrity sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==
dependencies:
- "@typescript-eslint/experimental-utils" "4.29.1"
- "@typescript-eslint/scope-manager" "4.29.1"
+ "@typescript-eslint/experimental-utils" "4.31.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
debug "^4.3.1"
functional-red-black-tree "^1.0.1"
regexpp "^3.1.0"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@4.29.1", "@typescript-eslint/experimental-utils@^4.0.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz#0af2b17b0296b60c6b207f11062119fa9c5a8994"
- integrity sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==
+"@typescript-eslint/experimental-utils@4.31.1", "@typescript-eslint/experimental-utils@^4.0.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz#0c900f832f270b88e13e51753647b02d08371ce5"
+ integrity sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==
dependencies:
"@types/json-schema" "^7.0.7"
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
@@ -2690,32 +2318,32 @@
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d"
- integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.1.tgz#8f9a2672033e6f6d33b1c0260eebdc0ddf539064"
+ integrity sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==
dependencies:
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
debug "^4.3.1"
-"@typescript-eslint/scope-manager@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358"
- integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==
+"@typescript-eslint/scope-manager@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz#0c21e8501f608d6a25c842fcf59541ef4f1ab561"
+ integrity sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
"@typescript-eslint/types@3.10.1":
version "3.10.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
-"@typescript-eslint/types@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
- integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
+"@typescript-eslint/types@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.1.tgz#5f255b695627a13401d2fdba5f7138bc79450d66"
+ integrity sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==
"@typescript-eslint/typescript-estree@3.10.1":
version "3.10.1"
@@ -2731,13 +2359,13 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f"
- integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==
+"@typescript-eslint/typescript-estree@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz#4a04d5232cf1031232b7124a9c0310b577a62d17"
+ integrity sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
debug "^4.3.1"
globby "^11.0.3"
is-glob "^4.0.1"
@@ -2751,12 +2379,12 @@
dependencies:
eslint-visitor-keys "^1.1.0"
-"@typescript-eslint/visitor-keys@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d"
- integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==
+"@typescript-eslint/visitor-keys@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz#f2e7a14c7f20c4ae07d7fc3c5878c4441a1da9cc"
+ integrity sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
eslint-visitor-keys "^2.0.0"
"@webassemblyjs/ast@1.9.0":
@@ -2956,9 +2584,9 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.2.4:
- version "8.4.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
- integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+ integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
address@1.1.2, address@^1.0.1:
version "1.1.2"
@@ -2973,7 +2601,7 @@ adjust-sourcemap-loader@3.0.0:
loader-utils "^2.0.0"
regex-parser "^2.2.11"
-adler-32@:
+adler-32@, adler-32@~1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.3.0.tgz#3cad1b71cdfa69f6c8a91f3e3615d31a4fdedc72"
integrity sha512-f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==
@@ -3024,9 +2652,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^8.0.1:
- version "8.6.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
- integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
+ version "8.6.3"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+ integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -3071,9 +2699,9 @@ ansi-regex@^4.1.0:
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
ansi-regex@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
- integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+ integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1"
@@ -3217,7 +2845,7 @@ array-flatten@^2.1.0:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.1.1, array-includes@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -3393,9 +3021,9 @@ available-typed-arrays@^1.0.5:
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
axe-core@^4.0.2:
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.2.tgz#fcf8777b82c62cfc69c7e9f32c0d2226287680e7"
- integrity sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg==
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.3.tgz#b55cd8e8ddf659fe89b064680e1c6a4dceab0325"
+ integrity sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==
axobject-query@^2.2.0:
version "2.2.0"
@@ -3671,9 +3299,9 @@ bfj@^7.0.2:
tryer "^1.0.1"
big-integer@^1.6.16:
- version "1.6.48"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
- integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
+ version "1.6.49"
+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.49.tgz#f6817d3ea5d4f3fb19e24df9f4b1b4471a8328ce"
+ integrity sha512-KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw==
big.js@^5.2.2:
version "5.2.2"
@@ -3861,7 +3489,7 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.16.7, browserslist@^4.6.2, browserslist@^4.6.4:
+browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.0, browserslist@^4.6.2, browserslist@^4.6.4:
version "4.16.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -3872,6 +3500,17 @@ browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.1
escalade "^3.1.1"
node-releases "^1.1.71"
+browserslist@4.17.1:
+ version "4.17.1"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.1.tgz#a98d104f54af441290b7d592626dd541fa642eb9"
+ integrity sha512-aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ==
+ dependencies:
+ caniuse-lite "^1.0.30001259"
+ electron-to-chromium "^1.3.846"
+ escalade "^3.1.1"
+ nanocolors "^0.1.5"
+ node-releases "^1.1.76"
+
bser@2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -3950,10 +3589,11 @@ cacache@^12.0.2:
y18n "^4.0.0"
cacache@^15.0.5:
- version "15.2.0"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389"
- integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==
+ version "15.3.0"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+ integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
dependencies:
+ "@npmcli/fs" "^1.0.0"
"@npmcli/move-file" "^1.0.1"
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -4062,9 +3702,16 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001255"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"
- integrity sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==
+ version "1.0.30001258"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz#b604eed80cc54a578e4bf5a02ae3ed49f869d252"
+ integrity sha512-RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA==
+
+caniuse-lite@^1.0.30001259:
+ version "1.0.30001260"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz#e3be3f34ddad735ca4a2736fa9e768ef34316270"
+ integrity sha512-Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg==
+ dependencies:
+ nanocolors "^0.1.0"
capture-exit@^2.0.0:
version "2.0.0"
@@ -4079,13 +3726,13 @@ case-sensitive-paths-webpack-plugin@2.3.0:
integrity sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==
cfb@>=0.10.0, cfb@^1.1.4:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.0.tgz#6a4d0872b525ed60349e1ef51fb4b0bf73eca9a8"
- integrity sha512-sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ==
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.1.tgz#209429e4c68efd30641f6fc74b2d6028bd202402"
+ integrity sha512-wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ==
dependencies:
- adler-32 "~1.2.0"
+ adler-32 "~1.3.0"
crc-32 "~1.2.0"
- printj "~1.1.2"
+ printj "~1.3.0"
chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
@@ -4137,6 +3784,30 @@ check-types@^11.1.1:
resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f"
integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ==
+cheerio-select@^1.5.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823"
+ integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==
+ dependencies:
+ css-select "^4.1.3"
+ css-what "^5.0.1"
+ domelementtype "^2.2.0"
+ domhandler "^4.2.0"
+ domutils "^2.7.0"
+
+cheerio@^1.0.0-rc.5:
+ version "1.0.0-rc.10"
+ resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
+ integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
+ dependencies:
+ cheerio-select "^1.5.0"
+ dom-serializer "^1.3.2"
+ domhandler "^4.2.0"
+ htmlparser2 "^6.1.0"
+ parse5 "^6.0.1"
+ parse5-htmlparser2-tree-adapter "^6.0.1"
+ tslib "^2.2.0"
+
chokidar@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -4364,9 +4035,9 @@ color@^3.0.0:
color-string "^1.6.0"
colorette@^1.2.1, colorette@^1.2.2:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
- integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+ integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
colors@0.6.2:
version "0.6.2"
@@ -4381,9 +4052,9 @@ combined-stream@^1.0.8:
delayed-stream "~1.0.0"
commander@:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-8.1.0.tgz#db36e3e66edf24ff591d639862c6ab2c52664362"
- integrity sha512-mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA==
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz#37fe2bde301d87d47a53adeff8b5915db1381ca8"
+ integrity sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==
commander@^2.20.0:
version "2.20.3"
@@ -4429,6 +4100,17 @@ compressible@~2.0.16:
dependencies:
mime-db ">= 1.43.0 < 2"
+compression-webpack-plugin@6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz#ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"
+ integrity sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==
+ dependencies:
+ cacache "^15.0.5"
+ find-cache-dir "^3.3.1"
+ schema-utils "^3.0.0"
+ serialize-javascript "^5.0.1"
+ webpack-sources "^1.4.3"
+
compression@^1.7.4:
version "1.7.4"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
@@ -4576,17 +4258,17 @@ copy-to-clipboard@^3.2.0:
toggle-selection "^1.0.6"
core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.2:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d"
- integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.17.3.tgz#b39c8e4dec71ecdc735c653ce5233466e561324e"
+ integrity sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==
dependencies:
- browserslist "^4.16.7"
+ browserslist "^4.17.0"
semver "7.0.0"
core-js-pure@^3.16.0:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e"
- integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.17.3.tgz#98ea3587188ab7ef4695db6518eeb71aec42604a"
+ integrity sha512-YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ==
core-js@^2.4.0:
version "2.6.12"
@@ -4594,14 +4276,14 @@ core-js@^2.4.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.5:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249"
- integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e"
+ integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==
core-util-is@~1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
- integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
cosmiconfig@^5.0.0:
version "5.2.1"
@@ -4625,9 +4307,9 @@ cosmiconfig@^6.0.0:
yaml "^1.7.2"
cosmiconfig@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
- integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
dependencies:
"@types/parse-json" "^4.0.0"
import-fresh "^3.2.1"
@@ -4724,6 +4406,14 @@ crypto-random-string@^1.0.0:
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+csp-html-webpack-plugin@5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/csp-html-webpack-plugin/-/csp-html-webpack-plugin-5.1.0.tgz#b3bfa5a50d207fe5b6bb4839dc33aa59621a35a0"
+ integrity sha512-6l/s6hACE+UA01PLReNKZfgLZWM98f7ewWmE79maDWIbEXiPcIWQGB3LQR/Zw+hPBj4XPZZ5zNrrO+aygqaLaQ==
+ dependencies:
+ cheerio "^1.0.0-rc.5"
+ lodash "^4.17.20"
+
css-blank-pseudo@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
@@ -4838,7 +4528,7 @@ css-what@^3.2.1:
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
-css-what@^5.0.0:
+css-what@^5.0.0, css-what@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
@@ -4975,9 +4665,9 @@ cssstyle@^2.3.0:
cssom "~0.3.6"
csstype@^3.0.2:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
- integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b"
+ integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==
cyclist@^1.0.1:
version "1.0.1"
@@ -5007,14 +4697,14 @@ data-urls@^2.0.0:
whatwg-url "^8.0.0"
date-fns@2.x:
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
- integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
+ version "2.24.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d"
+ integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==
dayjs@1.x:
- version "1.10.6"
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
- integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==
+ version "1.10.7"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
+ integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
@@ -5078,9 +4768,9 @@ deep-equal@^1.0.1:
regexp.prototype.flags "^1.2.0"
deep-is@^0.1.3, deep-is@~0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
- integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+ integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
deepmerge@^4.2.2:
version "4.2.2"
@@ -5263,7 +4953,7 @@ dom-serializer@0:
domelementtype "^2.0.1"
entities "^2.0.0"
-dom-serializer@^1.0.1:
+dom-serializer@^1.0.1, dom-serializer@^1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
@@ -5302,9 +4992,9 @@ domhandler@^2.3.0:
domelementtype "1"
domhandler@^4.0.0, domhandler@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
- integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
+ integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
dependencies:
domelementtype "^2.2.0"
@@ -5316,10 +5006,10 @@ domutils@^1.5.1, domutils@^1.7.0:
dom-serializer "0"
domelementtype "1"
-domutils@^2.5.2, domutils@^2.6.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
- integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
+domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0:
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+ integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
dependencies:
dom-serializer "^1.0.1"
domelementtype "^2.2.0"
@@ -5383,9 +5073,14 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.723:
- version "1.3.802"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz#0afa989321de3e904ac653ee79e0d642883731a1"
- integrity sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg==
+ version "1.3.842"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f"
+ integrity sha512-P/nDMPIYdb2PyqCQwhTXNi5JFjX1AsDVR0y6FrHw752izJIAJ+Pn5lugqyBq4tXeRSZBMBb2ZGvRGB1djtELEQ==
+
+electron-to-chromium@^1.3.846:
+ version "1.3.849"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.849.tgz#45a65a392565abc5b864624b9753393336426f4b"
+ integrity sha512-RweyW60HPOqIcxoKTGr38Yvtf2aliSUqX8dB3e9geJ0Bno0YLjcOX5F7/DPVloBkJWaPZ7xOM1A0Yme2T1A34w==
elliptic@6.5.4, elliptic@^6.5.3:
version "6.5.4"
@@ -5503,30 +5198,7 @@ error-stack-parser@^2.0.6:
dependencies:
stackframe "^1.1.1"
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
- version "1.18.5"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19"
- integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==
- dependencies:
- call-bind "^1.0.2"
- es-to-primitive "^1.2.1"
- function-bind "^1.1.1"
- get-intrinsic "^1.1.1"
- has "^1.0.3"
- has-symbols "^1.0.2"
- internal-slot "^1.0.3"
- is-callable "^1.2.3"
- is-negative-zero "^2.0.1"
- is-regex "^1.1.3"
- is-string "^1.0.6"
- object-inspect "^1.11.0"
- object-keys "^1.1.1"
- object.assign "^4.1.2"
- string.prototype.trimend "^1.0.4"
- string.prototype.trimstart "^1.0.4"
- unbox-primitive "^1.0.1"
-
-es-abstract@^1.18.5:
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5:
version "1.18.6"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
@@ -5657,14 +5329,6 @@ eslint-config-react-app@^6.0.0:
dependencies:
confusing-browser-globals "^1.0.10"
-eslint-import-resolver-node@^0.3.5:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.5.tgz#939bbb0f74e179e757ca87f7a4a890dabed18ac4"
- integrity sha512-XMoPKjSpXbkeJ7ZZ9icLnJMTY5Mc1kZbCakHquaFsXPpyWOwK0TK6CODO+0ca54UoM9LKOxyUNnoVZRl8TeaAg==
- dependencies:
- debug "^3.2.7"
- resolve "^1.20.0"
-
eslint-import-resolver-node@^0.3.6:
version "0.3.6"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
@@ -5699,14 +5363,14 @@ eslint-module-utils@^2.6.2:
pkg-dir "^2.0.0"
eslint-plugin-flowtype@^5.2.0:
- version "5.9.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.9.0.tgz#8d2d81d3d79bb53470ed62b97409b31684757e30"
- integrity sha512-aBUVPA5Wt0XyuV3Wg8flfVqYJR6yR2nRLuyPwoTjCg5VTk4G1X1zQpInr39tUGgRxqrA+d+B9GYK4+/d1i0Rfw==
+ version "5.10.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz#7764cc63940f215bf3f0bd2d9a1293b2b9b2b4bb"
+ integrity sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==
dependencies:
lodash "^4.17.15"
string-natural-compare "^3.0.1"
-eslint-plugin-import@2.24.2:
+eslint-plugin-import@2.24.2, eslint-plugin-import@^2.22.1:
version "2.24.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
@@ -5727,31 +5391,10 @@ eslint-plugin-import@2.24.2:
resolve "^1.20.0"
tsconfig-paths "^3.11.0"
-eslint-plugin-import@^2.22.1:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz#697ffd263e24da5e84e03b282f5fb62251777177"
- integrity sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg==
- dependencies:
- array-includes "^3.1.3"
- array.prototype.flat "^1.2.4"
- debug "^2.6.9"
- doctrine "^2.1.0"
- eslint-import-resolver-node "^0.3.5"
- eslint-module-utils "^2.6.2"
- find-up "^2.0.0"
- has "^1.0.3"
- is-core-module "^2.4.0"
- minimatch "^3.0.4"
- object.values "^1.1.3"
- pkg-up "^2.0.0"
- read-pkg-up "^3.0.0"
- resolve "^1.20.0"
- tsconfig-paths "^3.9.0"
-
eslint-plugin-jest@^24.1.0:
- version "24.4.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262"
- integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==
+ version "24.4.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.2.tgz#9e8cf05ee6a0e3025e6149df2f36950abfa8d5bf"
+ integrity sha512-jNMnqwX75z0RXRMXkxwb/+9ylKJYJLJ8nT8nBT0XFM5qx4IQGxP4edMawa0qGkSbHae0BDPBmi8I2QF0/F04XQ==
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
@@ -5809,13 +5452,14 @@ eslint-plugin-react@7.25.1:
string.prototype.matchall "^4.0.5"
eslint-plugin-react@^7.21.5:
- version "7.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
- integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
+ version "7.25.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.2.tgz#d567a217d306b76dd110561f28074e2328ae38f8"
+ integrity sha512-elx4585wgmryanJK4C5IoSKQyVZ+e7H0t2JOOtJNBql0cuercvSShvRReuLBbfx8687yW5yv+UL7pXwMsd6adQ==
dependencies:
array-includes "^3.1.3"
array.prototype.flatmap "^1.2.4"
doctrine "^2.1.0"
+ estraverse "^5.2.0"
has "^1.0.3"
jsx-ast-utils "^2.4.1 || ^3.0.0"
minimatch "^3.0.4"
@@ -6188,11 +5832,11 @@ express@^4.17.1:
vary "~1.1.2"
ext@^1.1.2:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
- integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
+ integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
dependencies:
- type "^2.0.0"
+ type "^2.5.0"
extend-shallow@^2.0.1:
version "2.0.1"
@@ -6270,9 +5914,9 @@ fastest-levenshtein@^1.0.12:
integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
fastq@^1.6.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
- integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+ integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
dependencies:
reusify "^1.0.4"
@@ -6375,9 +6019,9 @@ find-cache-dir@^2.1.0:
pkg-dir "^3.0.0"
find-cache-dir@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
- integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+ integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
@@ -6437,9 +6081,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
- integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+ version "1.14.4"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+ integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
for-in@^1.0.2:
version "1.0.2"
@@ -6693,9 +6337,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.6.0, globals@^13.9.0:
- version "13.10.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676"
- integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==
+ version "13.11.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
+ integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
dependencies:
type-fest "^0.20.2"
@@ -7153,9 +6797,9 @@ immer@8.0.1:
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
"immutable@^3.8.1 || ^4.0.0-rc.1":
- version "4.0.0-rc.14"
- resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.14.tgz#29ba96631ec10867d1348515ac4e6bdba462f071"
- integrity sha512-pfkvmRKJSoW7JFx0QeYlAmT+kNYvn5j0u7bnpNq4N2RCvHSTlLT208G8jgaquNe+Q8kCPHKOSpxJkyvLDpYq0w==
+ version "4.0.0-rc.15"
+ resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.15.tgz#c30056f05eaaf5650fd15230586688fdd15c54bc"
+ integrity sha512-v8+A3sNyaieoP9dHegl3tEYnIZa7vqNiSv0U6D7YddiZi34VjKy4GsIxrRHj2d8+CS3MeiVja5QyNe4JO/aEXA==
import-cwd@^2.0.0:
version "2.1.0"
@@ -7368,9 +7012,11 @@ is-arrayish@^0.3.1:
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-bigint@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.3.tgz#fc9d9e364210480675653ddaea0518528d49a581"
- integrity sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+ integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+ dependencies:
+ has-bigints "^1.0.1"
is-binary-path@^1.0.0:
version "1.0.1"
@@ -7404,7 +7050,7 @@ is-buffer@^2.0.0:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-is-callable@^1.1.4, is-callable@^1.2.3, is-callable@^1.2.4:
+is-callable@^1.1.4, is-callable@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
@@ -7435,14 +7081,7 @@ is-color-stop@^1.0.0:
rgb-regex "^1.0.1"
rgba-regex "^1.0.0"
-is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.4.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
- integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
- dependencies:
- has "^1.0.3"
-
-is-core-module@^2.6.0:
+is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.4.0, is-core-module@^2.5.0, is-core-module@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
@@ -7642,7 +7281,7 @@ is-potential-custom-element-name@^1.0.1:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-is-regex@^1.0.4, is-regex@^1.1.2, is-regex@^1.1.3, is-regex@^1.1.4:
+is-regex@^1.0.4, is-regex@^1.1.3, is-regex@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -7680,7 +7319,7 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-is-string@^1.0.5, is-string@^1.0.6, is-string@^1.0.7:
+is-string@^1.0.5, is-string@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
@@ -7884,7 +7523,7 @@ jest-config@^26.6.3:
micromatch "^4.0.2"
pretty-format "^26.6.2"
-jest-diff@^26.0.0, jest-diff@^26.6.2:
+jest-diff@^26.6.2:
version "26.6.2"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
@@ -7894,7 +7533,7 @@ jest-diff@^26.0.0, jest-diff@^26.6.2:
jest-get-type "^26.3.0"
pretty-format "^26.6.2"
-jest-diff@^27.2.0:
+jest-diff@^27.0.0, jest-diff@^27.2.0:
version "27.2.0"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.2.0.tgz#bda761c360f751bab1e7a2fe2fc2b0a35ce8518c"
integrity sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==
@@ -8616,7 +8255,7 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
-json5@^2.1.2, json5@^2.2.0:
+json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -8656,11 +8295,11 @@ jsonwebtoken@8.5.1:
semver "^5.6.0"
"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
- integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+ integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
dependencies:
- array-includes "^3.1.2"
+ array-includes "^3.1.3"
object.assign "^4.1.2"
jszip@2.4.0:
@@ -9084,9 +8723,9 @@ mark.js@8.11.1:
integrity sha1-GA8fnr74sOY45BZq1S24eb6y/8U=
match-sorter@^6.0.2:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.0.tgz#454a1b31ed218cddbce6231a0ecb5fdc549fed01"
- integrity sha512-efYOf/wUpNb8FgNY+cOD2EIJI1S5I7YPKsw0LBp7wqPh5pmMS6i/wr3ZWwfwrAw1NvqTA2KUReVRWDX84lUcOQ==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda"
+ integrity sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==
dependencies:
"@babel/runtime" "^7.12.5"
remove-accents "0.4.2"
@@ -9260,11 +8899,16 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.49.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.49.0:
version "1.49.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
+"mime-db@>= 1.43.0 < 2":
+ version "1.50.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+ integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
version "2.1.32"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
@@ -9363,9 +9007,9 @@ minipass-pipeline@^1.2.2:
minipass "^3.0.0"
minipass@^3.0.0, minipass@^3.1.1:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
- integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732"
+ integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==
dependencies:
yallist "^4.0.0"
@@ -9480,10 +9124,15 @@ nano-time@1.0.0:
dependencies:
big-integer "^1.6.16"
+nanocolors@^0.1.0, nanocolors@^0.1.5:
+ version "0.1.12"
+ resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
+ integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
+
nanoid@^3.1.23:
- version "3.1.23"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
- integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+ version "3.1.25"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+ integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
nanomatch@^1.2.9:
version "1.2.13"
@@ -9608,9 +9257,14 @@ node-notifier@^8.0.0:
which "^2.0.2"
node-releases@^1.1.71:
- version "1.1.74"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e"
- integrity sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw==
+ version "1.1.75"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+ integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
+
+node-releases@^1.1.76:
+ version "1.1.76"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e"
+ integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
@@ -9623,12 +9277,12 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
validate-npm-package-license "^3.0.1"
normalize-package-data@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
- integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+ integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
dependencies:
hosted-git-info "^4.0.1"
- resolve "^1.20.0"
+ is-core-module "^2.5.0"
semver "^7.3.4"
validate-npm-package-license "^3.0.1"
@@ -9691,9 +9345,9 @@ nth-check@^1.0.2:
boolbase "~1.0.0"
nth-check@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
- integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+ integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
dependencies:
boolbase "^1.0.0"
@@ -9791,7 +9445,7 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.0, object.values@^1.1.3, object.values@^1.1.4:
+object.values@^1.1.0, object.values@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
@@ -10061,7 +9715,14 @@ parse-node-version@^1.0.1:
resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-parse5@6.0.1:
+parse5-htmlparser2-tree-adapter@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+ integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+ dependencies:
+ parse5 "^6.0.1"
+
+parse5@6.0.1, parse5@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
@@ -11013,7 +10674,7 @@ pretty-error@^2.1.1:
lodash "^4.17.20"
renderkid "^2.0.4"
-pretty-format@^26.0.0, pretty-format@^26.6.0, pretty-format@^26.6.2:
+pretty-format@^26.6.0, pretty-format@^26.6.2:
version "26.6.2"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
@@ -11023,17 +10684,7 @@ pretty-format@^26.0.0, pretty-format@^26.6.0, pretty-format@^26.6.2:
ansi-styles "^4.0.0"
react-is "^17.0.1"
-pretty-format@^27.0.2:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f"
- integrity sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==
- dependencies:
- "@jest/types" "^27.0.6"
- ansi-regex "^5.0.0"
- ansi-styles "^5.0.0"
- react-is "^17.0.1"
-
-pretty-format@^27.2.0:
+pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.0:
version "27.2.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.0.tgz#ee37a94ce2a79765791a8649ae374d468c18ef19"
integrity sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==
@@ -11043,15 +10694,20 @@ pretty-format@^27.2.0:
ansi-styles "^5.0.0"
react-is "^17.0.1"
-printj@~1.1.0, printj@~1.1.2:
+printj@~1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
printj@~1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/printj/-/printj-1.2.2.tgz#620eb0f07509394545fe82f97fe73baa8ad86992"
- integrity sha512-dx9nIry0Z12s5oebhenDCFQjj/IMVotLMbvFP6OJ+C3v+EV30mtYoj6QtaulFo+DbWCbpEeaqcLYMh6CRuVjsA==
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/printj/-/printj-1.2.3.tgz#2cfb2b192a1e5385dbbe5b46658ac34aa828508a"
+ integrity sha512-sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA==
+
+printj@~1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/printj/-/printj-1.3.0.tgz#9018a918a790e43707f10625d6e10187a367cff6"
+ integrity sha512-017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg==
process-nextick-args@~2.0.0:
version "2.0.1"
@@ -11292,9 +10948,9 @@ rc-checkbox@~2.3.0:
classnames "^2.2.1"
rc-collapse@~3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.1.tgz#2421d454e85781d1cf2f04f906918e0677d779e6"
- integrity sha512-/oetKApTHzGGeR8Q8vD168EXkCs2MpEIrURGyy2D+LrrJd29LY/huuIMvOiJoSV6W3bcGhJqIdgHtg1Dxn1smA==
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.2.tgz#76028a811b845d03d9460ccc409c7ea8ad09db14"
+ integrity sha512-HujcKq7mghk/gVKeI6EjzTbb8e19XUZpakrYazu1MblEZ3Hu3WBMSN4A3QmvbF6n1g7x6lUlZvsHZ5shABWYOQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
@@ -11452,9 +11108,9 @@ rc-rate@~2.9.0:
rc-util "^5.0.1"
rc-resize-observer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.0.tgz#97fb89856f62fec32ab6e40933935cf58e2e102d"
- integrity sha512-RgKGukg1mlzyGdvzF7o/LGFC8AeoMH9aGzXTUdp6m+OApvmRdUuOscq/Y2O45cJA+rXt1ApWlpFoOIioXL3AGg==
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.1.tgz#ccd0986543ff1bf49f8a581e8ac4bb714ed24dcd"
+ integrity sha512-OxO2mJI9e8610CAWBFfm52SPvWib0eNKjaSsRbbKHmLaJIxw944P+D61DlLJ/w2vuOjGNcalJu8VdqyNm/XCRg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -11527,9 +11183,9 @@ rc-tabs@~11.10.0:
rc-util "^5.5.0"
rc-textarea@^0.3.0, rc-textarea@~0.3.0:
- version "0.3.4"
- resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.4.tgz#1408a64c87b5e76db5c847699ef9ab5ee97dd6f9"
- integrity sha512-ILUYx831ZukQPv3m7R4RGRtVVWmL1LV4ME03L22mvT56US0DGCJJaRTHs4vmpcSjFHItph5OTmhodY4BOwy81A==
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.5.tgz#07ed445dddb94e5ae6764676923a49bddad9b2ec"
+ integrity sha512-qa+k5vDn9ct65qr+SgD2KwJ9Xz6P84lG2z+TDht/RBr71WnM/K61PqHUAcUyU6YqTJD26IXgjPuuhZR7HMw7eA==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -11586,16 +11242,7 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
-rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.9.4, rc-util@^5.9.8:
- version "5.13.2"
- resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.13.2.tgz#a8a0bb77743351841ba8bed6393e03b8d2f685c8"
- integrity sha512-eYc71XXGlp96RMzg01Mhq/T3BL6OOVTDSS0urFEuvpi+e7slhJRhaHGCKy2hqJm18m9ff7VoRoptplKu60dYog==
- dependencies:
- "@babel/runtime" "^7.12.5"
- react-is "^16.12.0"
- shallowequal "^1.1.0"
-
-rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
+rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
version "5.14.0"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.14.0.tgz#52c650e27570c2c47f7936c7d32eaec5212492a8"
integrity sha512-2vy6/Z1BJUcwLjm/UEJb/htjUTQPigITUIemCcFEo1fQevAumc9sA32x2z5qyWoa9uhrXbiAjSDpPIUqyg65sA==
@@ -11605,9 +11252,9 @@ rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
shallowequal "^1.1.0"
rc-virtual-list@^3.0.1, rc-virtual-list@^3.2.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.3.0.tgz#2f95a6ddbbf63d78b28662b57f1e69f7472762fe"
- integrity sha512-lVXpGWC6yMdwV2SHo6kc63WlqjCnb3eO72V726KA2/wh9KA6wi/swcdR3zAowuA8hJxG/lRANmY5kpLZ+Pz3iQ==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz#1f3b41391acf033a6c7e84c2f4e8a4ee0dc72807"
+ integrity sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==
dependencies:
classnames "^2.2.6"
rc-resize-observer "^1.0.0"
@@ -11958,14 +11605,14 @@ redux@4.1.1, redux@^4.0.0:
dependencies:
"@babel/runtime" "^7.9.2"
-regenerate-unicode-properties@^8.2.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
- integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+ integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
dependencies:
- regenerate "^1.4.0"
+ regenerate "^1.4.2"
-regenerate@^1.4.0:
+regenerate@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
@@ -12019,26 +11666,26 @@ regexpp@^3.1.0:
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
regexpu-core@^4.7.1:
- version "4.7.1"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
- integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
- dependencies:
- regenerate "^1.4.0"
- regenerate-unicode-properties "^8.2.0"
- regjsgen "^0.5.1"
- regjsparser "^0.6.4"
- unicode-match-property-ecmascript "^1.0.4"
- unicode-match-property-value-ecmascript "^1.2.0"
-
-regjsgen@^0.5.1:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+ integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+ dependencies:
+ regenerate "^1.4.2"
+ regenerate-unicode-properties "^9.0.0"
+ regjsgen "^0.5.2"
+ regjsparser "^0.7.0"
+ unicode-match-property-ecmascript "^2.0.0"
+ unicode-match-property-value-ecmascript "^2.0.0"
+
+regjsgen@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-regjsparser@^0.6.4:
- version "0.6.9"
- resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
- integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+regjsparser@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+ integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
dependencies:
jsesc "~0.5.0"
@@ -12642,9 +12289,9 @@ side-channel@^1.0.4:
object-inspect "^1.9.0"
signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7"
+ integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==
simple-swizzle@^0.2.2:
version "0.2.2"
@@ -12703,16 +12350,16 @@ snapdragon@^0.8.1:
use "^3.1.0"
sockjs-client@^1.5.0:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6"
- integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
+ integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
dependencies:
debug "^3.2.6"
eventsource "^1.0.7"
faye-websocket "^0.11.3"
inherits "^2.0.4"
json3 "^3.3.3"
- url-parse "^1.5.1"
+ url-parse "^1.5.3"
sockjs@^0.3.21:
version "0.3.21"
@@ -12759,10 +12406,10 @@ source-map-resolve@^0.6.0:
atob "^2.1.2"
decode-uri-component "^0.2.0"
-source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
- version "0.5.19"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
- integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@^0.5.20, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+ version "0.5.20"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+ integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
@@ -12894,11 +12541,12 @@ stable@^0.1.8:
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
stack-utils@^2.0.2, stack-utils@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
- integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.4.tgz#bf967ae2813d3d2d1e1f59a4408676495c8112ab"
+ integrity sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==
dependencies:
escape-string-regexp "^2.0.0"
+ source-map-support "^0.5.20"
stackframe@^1.1.1:
version "1.2.0"
@@ -13005,18 +12653,6 @@ string.prototype.matchall@^4.0.5:
regexp.prototype.flags "^1.3.1"
side-channel "^1.0.4"
-string.prototype.replaceall@1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/string.prototype.replaceall/-/string.prototype.replaceall-1.0.5.tgz#3eae8b115c588ece949b14fa2993d86fc8ec87b1"
- integrity sha512-YUjdWElI9pgKo7mrPOMKHFZxcAa0v1uqoJkMHtlJW63rMkPLkQH71ao2XNkKY2ksHKHC8ZUFwNjN9Vry+QyCvg==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.18.0-next.2"
- get-intrinsic "^1.1.1"
- has-symbols "^1.0.1"
- is-regex "^1.1.2"
-
string.prototype.trimend@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -13341,9 +12977,9 @@ tapable@^1.0.0, tapable@^1.1.3:
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^6.0.2:
- version "6.1.7"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.7.tgz#c566d1107d38b09e92983a68db5534fc7f6cab42"
- integrity sha512-PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA==
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -13427,13 +13063,13 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
source-map-support "~0.5.12"
terser@^5.3.4:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
- integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
+ version "5.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.8.0.tgz#c6d352f91aed85cc6171ccb5e84655b77521d947"
+ integrity sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==
dependencies:
commander "^2.20.0"
source-map "~0.7.2"
- source-map-support "~0.5.19"
+ source-map-support "~0.5.20"
test-exclude@^6.0.0:
version "6.0.0"
@@ -13495,9 +13131,9 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3:
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
tmpl@1.0.x:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
- integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+ integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
to-arraybuffer@^1.0.0:
version "1.0.1"
@@ -13609,24 +13245,15 @@ tsconfig-paths@^3.11.0:
minimist "^1.2.0"
strip-bom "^3.0.0"
-tsconfig-paths@^3.9.0:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
- integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
- dependencies:
- json5 "^2.2.0"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
-
tslib@^1.10.0, tslib@^1.8.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-tslib@^2.0.3, tslib@^2.1.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
- integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+ integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
tsutils@^3.17.1, tsutils@^3.21.0:
version "3.21.0"
@@ -13702,7 +13329,7 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-type@^2.0.0:
+type@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
@@ -13734,28 +13361,28 @@ unbox-primitive@^1.0.1:
has-symbols "^1.0.2"
which-boxed-primitive "^1.0.2"
-unicode-canonical-property-names-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
- integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+ integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-unicode-match-property-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
- integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+ integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.4"
- unicode-property-aliases-ecmascript "^1.0.4"
+ unicode-canonical-property-names-ecmascript "^2.0.0"
+ unicode-property-aliases-ecmascript "^2.0.0"
-unicode-match-property-value-ecmascript@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
- integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+ integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
-unicode-property-aliases-ecmascript@^1.0.4:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
- integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+ integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
unified@^9.1.0:
version "9.2.2"
@@ -13891,7 +13518,7 @@ url-loader@4.1.1:
mime-types "^2.1.27"
schema-utils "^3.0.0"
-url-parse@^1.4.3, url-parse@^1.5.1:
+url-parse@^1.4.3, url-parse@^1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
@@ -14545,9 +14172,9 @@ ws@^6.2.1:
async-limiter "~1.0.0"
ws@^7.4.6:
- version "7.4.6"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
- integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ version "7.5.5"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+ integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
xlsx@0.17.1:
version "0.17.1"
diff --git a/services/locations/craco.config.js b/services/locations/craco.config.js
index 04f48bb..3bb4c5f 100644
--- a/services/locations/craco.config.js
+++ b/services/locations/craco.config.js
@@ -1,6 +1,7 @@
const CracoLessPlugin = require('craco-less');
const { LicenseWebpackPlugin } = require('license-webpack-plugin');
const GenerateJsonPlugin = require('generate-json-webpack-plugin');
+const CompressionPlugin = require('compression-webpack-plugin');
const { DefinePlugin } = require('webpack');
const WorkerPlugin = require('worker-plugin');
@@ -38,6 +39,11 @@ module.exports = {
webpack: {
plugins: {
add: [
+ new CompressionPlugin({
+ algorithm: 'gzip',
+ test: /\.(js|css|html|svg|json|ico|eot|otf|ttf)$/,
+ deleteOriginalAssets: false,
+ }),
new DefinePlugin({
'process.env.REACT_APP_VERSION': JSON.stringify(
require('./package.json').version
diff --git a/services/locations/nginx.conf b/services/locations/nginx.conf
index 73b65a0..c3a2e07 100644
--- a/services/locations/nginx.conf
+++ b/services/locations/nginx.conf
@@ -41,6 +41,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload";
location / {
+ gzip_static on;
try_files $uri /index.html;
}
}
diff --git a/services/locations/package.json b/services/locations/package.json
index 9b8a59a..b54ce32 100644
--- a/services/locations/package.json
+++ b/services/locations/package.json
@@ -1,6 +1,6 @@
{
"name": "@lucaapp/locations",
- "version": "2.0.2",
+ "version": "2.1.0",
"private": true,
"license": "Apache-2.0",
"author": "Culture4Life <hello@luca-app.de> (https://www.luca-app.de/)",
@@ -29,6 +29,7 @@
"ascii85": "1.0.2",
"base64-loader": "1.0.0",
"comlink": "4.3.1",
+ "compression-webpack-plugin": "6.1.1",
"connected-react-router": "6.9.1",
"craco-less": "1.17.1",
"es6-promisify": "6.1.1",
@@ -92,7 +93,6 @@
"jest-svg-transformer": "1.0.0",
"postcss": "8.2.15",
"prettier": "2.2.1",
- "string.prototype.replaceall": "1.0.5",
"stylelint": "13.12.0",
"stylelint-config-prettier": "8.0.2",
"stylelint-config-recommended": "4.0.0",
diff --git a/services/locations/src/assets/documents/AVV_Luca.pdf b/services/locations/src/assets/documents/AVV_Luca.pdf
index 961e3fd..af67f5c 100644
--- a/services/locations/src/assets/documents/AVV_Luca.pdf
+++ b/services/locations/src/assets/documents/AVV_Luca.pdf
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8500ad73a0fb608cf325ab94259f673281972a1e8e477b60309e41e4932656cd
-size 247955
+oid sha256:05f8c3b986db5914016f2136eb0262a54b436cff6c296bdfba93856d8a1d0715
+size 267688
diff --git a/services/locations/src/assets/documents/DSE_Luca_mandatory.pdf b/services/locations/src/assets/documents/DSE_Luca_mandatory.pdf
index 84b00e2..d6705fa 100644
--- a/services/locations/src/assets/documents/DSE_Luca_mandatory.pdf
+++ b/services/locations/src/assets/documents/DSE_Luca_mandatory.pdf
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:606bf1efb62990d04e8c7ce51609b3acd6f649f2c69bffac01e5088072ca4460
-size 70679
+oid sha256:814360c47fe99db7f191383d7c100f1c3727219db1f5efc2b0d1b33906a87d95
+size 78297
diff --git a/services/locations/src/assets/documents/DSE_Luca_optional.pdf b/services/locations/src/assets/documents/DSE_Luca_optional.pdf
index 104025a..70961a3 100644
--- a/services/locations/src/assets/documents/DSE_Luca_optional.pdf
+++ b/services/locations/src/assets/documents/DSE_Luca_optional.pdf
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a9050288b4418f30f3576dc8a7c714dc498055c38cdafbc75e689c52c7cee641
-size 68819
+oid sha256:622dc5b60d911fd051131eb843388b057be71caeacec1701eedce063e4cd8248
+size 78294
diff --git a/services/locations/src/assets/external.svg b/services/locations/src/assets/external.svg
new file mode 100644
index 0000000..616f29b
--- /dev/null
+++ b/services/locations/src/assets/external.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" fill-rule="evenodd">
+ <path d="M6 0v2H2v12h12v-4h2v5a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V1a1 1 0 0 1 1-1h5Z" fill="#50667C" fill-rule="nonzero"/>
+ <path stroke="#50667C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M11 1h4v4"/>
+ <path stroke="#50667C" stroke-width="2" stroke-linecap="round" d="m7 9 8-8"/>
+ </g>
+</svg>
diff --git a/services/locations/src/components/App/App.react.js b/services/locations/src/components/App/App.react.js
index 36b3957..a5882e5 100644
--- a/services/locations/src/components/App/App.react.js
+++ b/services/locations/src/components/App/App.react.js
@@ -14,6 +14,7 @@ import { clearHasSeenPrivateKeyModal } from 'utils/storage';
import {
AUTHENTICATION_ROUTE,
PROFILE_ROUTE,
+ HELP_CENTER_ROUTE,
APP_ROUTE,
GROUP_SETTINGS_ROUTE,
LOCATION_SETTINGS_ROUTE,
@@ -24,6 +25,7 @@ import {
import { ModalArea } from 'components/App/modals/ModalArea';
import { Header } from './Header';
import { Profile } from './Profile';
+import { HelpCenter } from './HelpCenter';
import { Dashboard } from './Dashboard';
import { GroupSettings } from './GroupSettings';
import { DataTransfers } from './DataTransfers';
@@ -76,6 +78,9 @@ export const App = () => {
<Route path={PROFILE_ROUTE}>
<Profile operator={operator} refetch={refetch} />
</Route>
+ <Route path={HELP_CENTER_ROUTE}>
+ <HelpCenter operator={operator} />
+ </Route>
<Route path={GROUP_SETTINGS_ROUTE}>
<GroupSettings />
</Route>
diff --git a/services/locations/src/components/App/Dashboard/Location/CheckInQuery/CheckInQuery.react.js b/services/locations/src/components/App/Dashboard/Location/CheckInQuery/CheckInQuery.react.js
index d2004b7..51e7253 100644
--- a/services/locations/src/components/App/Dashboard/Location/CheckInQuery/CheckInQuery.react.js
+++ b/services/locations/src/components/App/Dashboard/Location/CheckInQuery/CheckInQuery.react.js
@@ -136,7 +136,7 @@ export const CheckInQuery = ({ location }) => {
{isAdditionalDataEnabled && (
<PrimaryButton
onClick={addAdditionalData}
- isButtonWhite
+ $isButtonWhite
style={{ marginTop: 24 }}
data-cy="addRequestButton"
>
diff --git a/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.helper.js b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.helper.js
new file mode 100644
index 0000000..960d835
--- /dev/null
+++ b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.helper.js
@@ -0,0 +1,11 @@
+import moment from 'moment';
+
+import { DEFAULT_AVERAGE_CHECKIN_TIME } from 'constants/checkout';
+
+export const getTimeStringFromMinutes = location =>
+ moment
+ .utc()
+ .startOf('day')
+ .add({
+ minutes: location.averageCheckinTime || DEFAULT_AVERAGE_CHECKIN_TIME,
+ });
diff --git a/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.react.js b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.react.js
new file mode 100644
index 0000000..b1564ed
--- /dev/null
+++ b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.react.js
@@ -0,0 +1,106 @@
+import React, { useState, useCallback } from 'react';
+import { useIntl } from 'react-intl';
+import { useQueryClient } from 'react-query';
+import { TimePicker, notification } from 'antd';
+
+import { updateLocation } from 'network/api';
+
+import {
+ DEFAULT_AVERAGE_CHECKIN_TIME,
+ MAX_AVERAGE_CHECKIN_TIME,
+ MIN_AVERAGE_CHECKIN_TIME,
+} from 'constants/checkout';
+import { getMinutesFromTimeString } from 'utils/time';
+
+import { Wrapper, PickerWrapper } from './AverageCheckinTime.styled';
+import { getTimeStringFromMinutes } from './AverageCheckinTime.helper';
+
+import { CardSectionDescription, CardSectionTitle } from '../../LocationCard';
+import { Switch } from '../../../Switch';
+
+import { StyledSwitchContainer } from '../../GenerateQRCodes/GenerateQRCodes.styled';
+
+export const AverageCheckinTime = ({ location }) => {
+ const intl = useIntl();
+ const queryClient = useQueryClient();
+ const [isAverageTimeActive, setIsAverageTimeActive] = useState(
+ !!location.averageCheckinTime
+ );
+
+ const refetch = useCallback(() => {
+ queryClient.invalidateQueries(`location/${location.uuid}`);
+ }, [location, queryClient]);
+
+ const updateAverageCheckinTime = averageCheckinTime => {
+ updateLocation({
+ locationId: location.uuid,
+ data: { averageCheckinTime },
+ })
+ .then(refetch)
+ .catch(() => {
+ notification.error({
+ message: intl.formatMessage({
+ id: 'notification.updateAverageCheckinTime.error',
+ }),
+ });
+ refetch();
+ });
+ };
+
+ const toggleAverageTime = () => {
+ setIsAverageTimeActive(!isAverageTimeActive);
+ if (isAverageTimeActive) {
+ updateAverageCheckinTime(null);
+ } else {
+ updateAverageCheckinTime(DEFAULT_AVERAGE_CHECKIN_TIME);
+ }
+ };
+
+ const onChangeAverageCheckinTime = (_, timeString) => {
+ const averageCheckinTimeMinutes = getMinutesFromTimeString(timeString);
+
+ if (
+ averageCheckinTimeMinutes >= MAX_AVERAGE_CHECKIN_TIME ||
+ averageCheckinTimeMinutes <= MIN_AVERAGE_CHECKIN_TIME
+ ) {
+ notification.error({
+ message: intl.formatMessage({
+ id: 'notification.updateAverageCheckinTime.constraint.error',
+ }),
+ });
+ return;
+ }
+ updateAverageCheckinTime(getMinutesFromTimeString(timeString));
+ };
+
+ return (
+ <Wrapper>
+ <CardSectionTitle>
+ {intl.formatMessage({ id: 'settings.location.checkout.average.title' })}
+ <StyledSwitchContainer>
+ <Switch checked={isAverageTimeActive} onChange={toggleAverageTime} />
+ </StyledSwitchContainer>
+ </CardSectionTitle>
+ <CardSectionDescription>
+ {intl.formatMessage({
+ id: 'settings.location.checkout.average.description',
+ })}
+ </CardSectionDescription>
+ {isAverageTimeActive && (
+ <PickerWrapper>
+ <TimePicker
+ style={{ width: 150 }}
+ onChange={onChangeAverageCheckinTime}
+ showNow={false}
+ format="HH:mm"
+ minuteStep={15}
+ value={getTimeStringFromMinutes(location)}
+ placeholder={intl.formatMessage({
+ id: 'settings.location.checkout.average.placeholder',
+ })}
+ />
+ </PickerWrapper>
+ )}
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.styled.js b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.styled.js
new file mode 100644
index 0000000..a5b6367
--- /dev/null
+++ b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/AverageCheckinTime.styled.js
@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+ padding: 24px 32px 0 32px;
+ border-top: 1px solid rgb(151, 151, 151);
+`;
+
+export const PickerWrapper = styled.div``;
diff --git a/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/index.js b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/index.js
new file mode 100644
index 0000000..956bf08
--- /dev/null
+++ b/services/locations/src/components/App/Dashboard/Location/Checkout/AverageCheckinTime/index.js
@@ -0,0 +1 @@
+export { AverageCheckinTime } from './AverageCheckinTime.react';
diff --git a/services/locations/src/components/App/Dashboard/Location/Checkout/Checkout.react.js b/services/locations/src/components/App/Dashboard/Location/Checkout/Checkout.react.js
index 0582c54..fc629a6 100644
--- a/services/locations/src/components/App/Dashboard/Location/Checkout/Checkout.react.js
+++ b/services/locations/src/components/App/Dashboard/Location/Checkout/Checkout.react.js
@@ -11,6 +11,7 @@ import {
} from 'constants/checkout';
import { updateLocation } from 'network/api';
+import { AverageCheckinTime } from './AverageCheckinTime';
import {
CardSection,
LocationCard,
@@ -55,49 +56,52 @@ export const Checkout = ({ location }) => {
title={intl.formatMessage({ id: 'settings.location.checkout.headline' })}
testId="checkoutRadius"
>
- <CardSection isLast>
- <CardSectionTitle>
- {intl.formatMessage({ id: 'settings.location.checkout.title' })}
- <StyledSwitchContainer>
- <Switch
- data-cy="activateCheckoutRadius"
- checked={isAutoCheckoutActive}
- onChange={onIsAutoCheckoutChanged}
- />
- </StyledSwitchContainer>
- </CardSectionTitle>
- <CardSectionDescription>
- {intl.formatMessage({
- id: 'settings.location.checkout.automatic.description',
- })}
- </CardSectionDescription>
- {isAutoCheckoutActive && location.radius > 0 && (
- <Form
- step={1}
- style={{ width: '100%' }}
- initialValues={location}
- onValuesChange={({ radius }) =>
- updateLocation({
- locationId: location.uuid,
- data: { radius },
- })
- }
- >
- <Form.Item
- name="radius"
- label={intl.formatMessage({
- id: 'settings.location.checkout.automatic.radius',
- })}
- rules={checkoutRadiusValidator}
- >
- <InputNumber
- min={DEFAULT_CHECKOUT_RADIUS}
- max={MAX_CHECKOUT_RADIUS}
+ {location.lat && location.lng && (
+ <CardSection isLast>
+ <CardSectionTitle>
+ {intl.formatMessage({ id: 'settings.location.checkout.title' })}
+ <StyledSwitchContainer>
+ <Switch
+ data-cy="activateCheckoutRadius"
+ checked={isAutoCheckoutActive}
+ onChange={onIsAutoCheckoutChanged}
/>
- </Form.Item>
- </Form>
- )}
- </CardSection>
+ </StyledSwitchContainer>
+ </CardSectionTitle>
+ <CardSectionDescription>
+ {intl.formatMessage({
+ id: 'settings.location.checkout.automatic.description',
+ })}
+ </CardSectionDescription>
+ {isAutoCheckoutActive && location.radius > 0 && (
+ <Form
+ step={1}
+ style={{ width: '100%' }}
+ initialValues={location}
+ onValuesChange={({ radius }) =>
+ updateLocation({
+ locationId: location.uuid,
+ data: { radius },
+ })
+ }
+ >
+ <Form.Item
+ name="radius"
+ label={intl.formatMessage({
+ id: 'settings.location.checkout.automatic.radius',
+ })}
+ rules={checkoutRadiusValidator}
+ >
+ <InputNumber
+ min={DEFAULT_CHECKOUT_RADIUS}
+ max={MAX_CHECKOUT_RADIUS}
+ />
+ </Form.Item>
+ </Form>
+ )}
+ </CardSection>
+ )}
+ <AverageCheckinTime location={location} />
</LocationCard>
);
};
diff --git a/services/locations/src/components/App/Dashboard/Location/Location.react.js b/services/locations/src/components/App/Dashboard/Location/Location.react.js
index 0189b26..1c52319 100644
--- a/services/locations/src/components/App/Dashboard/Location/Location.react.js
+++ b/services/locations/src/components/App/Dashboard/Location/Location.react.js
@@ -78,7 +78,7 @@ export const Location = ({ isOperatorTrusted }) => {
<IndoorSelection location={location} />
<TableSubdivision location={location} />
<GenerateQRCodes location={location} />
- {location.lat && location.lng && <Checkout location={location} />}
+ <Checkout location={location} />
<LocationFooter />
{/* We need to pre load the Luca logo for QR-Code generation */}
<HiddenImage src={LucaLogo} />
diff --git a/services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.react.js b/services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.react.js
new file mode 100644
index 0000000..3d3dee7
--- /dev/null
+++ b/services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.react.js
@@ -0,0 +1,95 @@
+import React, { useState } from 'react';
+import { Menu, Dropdown, notification } from 'antd';
+import { useQueryClient } from 'react-query';
+import { useIntl } from 'react-intl';
+import { push } from 'connected-react-router';
+import { useHistory } from 'react-router';
+import { useDispatch } from 'react-redux';
+
+import { AUTHENTICATION_ROUTE, PROFILE_ROUTE } from 'constants/routes';
+
+import { usePrivateKey } from 'utils/privateKey';
+import { clearHasSeenPrivateKeyModal } from 'utils/storage';
+
+import { logout } from 'network/api';
+
+import { ReactComponent as MenuDefaultSvg } from 'assets/MenuDefault.svg';
+import { ReactComponent as MenuActiveSvg } from 'assets/MenuActive.svg';
+import { StyledIcon, StyledMenuItem } from './DetailsDropdown.styled';
+
+const DetailsMenu = properties => {
+ const intl = useIntl();
+ const history = useHistory();
+ const queryClient = useQueryClient();
+ const dispatch = useDispatch();
+ const [, clearPrivateKey] = usePrivateKey(null);
+
+ const openProfile = () => {
+ history.push(PROFILE_ROUTE);
+ };
+
+ const handleLogout = () => {
+ logout()
+ .then(response => {
+ if (response.status >= 400) {
+ notification.error({
+ message: intl.formatMessage({
+ id: 'notification.logout.error',
+ }),
+ });
+ return;
+ }
+
+ dispatch(push(AUTHENTICATION_ROUTE));
+ queryClient.clear();
+ clearPrivateKey(null);
+ clearHasSeenPrivateKeyModal();
+ notification.success({
+ message: intl.formatMessage({
+ id: 'notification.logout.success',
+ }),
+ });
+ })
+ .catch(() =>
+ notification.error({
+ message: intl.formatMessage({
+ id: 'notification.logout.error',
+ }),
+ })
+ );
+ };
+
+ return (
+ // eslint-disable-next-line react/jsx-props-no-spreading
+ <Menu {...properties}>
+ <StyledMenuItem onClick={openProfile}>
+ {intl.formatMessage({
+ id: 'header.profile',
+ })}
+ </StyledMenuItem>
+ <Menu.Divider />
+ <StyledMenuItem data-cy="logout" onClick={handleLogout}>
+ {intl.formatMessage({
+ id: 'header.logout',
+ })}
+ </StyledMenuItem>
+ </Menu>
+ );
+};
+
+export const DetailsDropdown = () => {
+ const [dropdownVisibility, setDropdownVisibility] = useState(false);
+
+ return (
+ <Dropdown
+ overlay={<DetailsMenu />}
+ placement="bottomRight"
+ onVisibleChange={setDropdownVisibility}
+ >
+ <StyledIcon
+ component={dropdownVisibility ? MenuActiveSvg : MenuDefaultSvg}
+ data-cy="dropdownMenuTrigger"
+ />
+ </Dropdown>
+ );
+};
diff --git a/services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.styled.js b/services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.styled.js
new file mode 100644
index 0000000..c1f72b5
--- /dev/null
+++ b/services/locations/src/components/App/Header/DetailsDropdown/DetailsDropdown.styled.js
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+import { Menu } from 'antd';
+import Icon from '@ant-design/icons';
+
+export const StyledMenuItem = styled(Menu.Item)`
+ padding: 12px 32px;
+`;
+
+export const StyledIcon = styled(Icon)`
+ font-size: 32px;
+`;
diff --git a/services/locations/src/components/App/Header/DetailsDropdown/index.js b/services/locations/src/components/App/Header/DetailsDropdown/index.js
new file mode 100644
index 0000000..7944398
--- /dev/null
+++ b/services/locations/src/components/App/Header/DetailsDropdown/index.js
@@ -0,0 +1 @@
+export { DetailsDropdown } from './DetailsDropdown.react';
diff --git a/services/locations/src/components/App/Header/Header.react.js b/services/locations/src/components/App/Header/Header.react.js
index 9be0bb9..1e11ef4 100644
--- a/services/locations/src/components/App/Header/Header.react.js
+++ b/services/locations/src/components/App/Header/Header.react.js
@@ -12,7 +12,7 @@ import { useTabletSize } from 'components/hooks/media';
// Assets
import LucaLogo from 'assets/LucaLogoWhite.svg';
-import { LinkMenu } from './LinkMenu';
+import { DetailsDropdown } from './DetailsDropdown';
import { CreateGroup } from './CreateGroup';
import { SelectGroup } from './SelectGroup';
import { GroupDisplay } from './GroupDisplay';
@@ -57,8 +57,8 @@ export const Header = ({ operator }) => {
{isActiveAccount && groupId && <SelectGroup groupId={groupId} />}
{isActiveAccount && !isTablet && <CreateGroup />}
<DataRequests />
- <HelpCenter supportCode={operator.supportCode} />
- <LinkMenu />
+ <HelpCenter />
+ <DetailsDropdown />
</MenuWrapper>
</HeaderWrapper>
);
diff --git a/services/locations/src/components/App/Header/HelpCenter/HelpCenter.react.js b/services/locations/src/components/App/Header/HelpCenter/HelpCenter.react.js
index ad3278b..c41c7a7 100644
--- a/services/locations/src/components/App/Header/HelpCenter/HelpCenter.react.js
+++ b/services/locations/src/components/App/Header/HelpCenter/HelpCenter.react.js
@@ -1,22 +1,16 @@
-import React, { useState } from 'react';
+import React from 'react';
-import { Menu, Dropdown, notification, Tooltip } from 'antd';
-import Icon, {
- CopyOutlined,
- PhoneOutlined,
- MailOutlined,
- QuestionCircleOutlined,
- KeyOutlined,
-} from '@ant-design/icons';
+import { useIntl } from 'react-intl';
+import { useHistory, useLocation } from 'react-router';
+import Icon from '@ant-design/icons';
+
+// CONSTANTS
+import { HELP_CENTER_ROUTE } from 'constants/routes';
import { ReactComponent as HelpCenterDefaultSvg } from 'assets/HelpDefault.svg';
import { ReactComponent as HelpCenterActiveSvg } from 'assets/HelpActive.svg';
-import { FAQ_LINK } from 'constants/links';
-import { useIntl } from 'react-intl';
-
-import { HelpCenterComp, MenuText, iconStyle } from './HelpCenter.styled';
-import { HELPCENTER } from './HelpCenter.helper';
+import { HelpCenterComp } from './HelpCenter.styled';
const HelpCenterIcon = isActive => (
<Icon
@@ -25,72 +19,21 @@ const HelpCenterIcon = isActive => (
/>
);
-export const HelpCenter = ({ supportCode }) => {
+export const HelpCenter = () => {
const intl = useIntl();
- const [dropdownVisibility, setDropdownVisibility] = useState(false);
- const onCopy = link => {
- navigator.clipboard.writeText(link);
- notification.success({
- message: intl.formatMessage({ id: 'tooltip.copy' }),
- });
- };
- const copyTooltipTitle = intl.formatMessage({
- id: 'helpCenter.tooltip.copy',
- });
+ const history = useHistory();
+ const currentRoute = useLocation();
- const menu = (
- <Menu data-cy="dropdownMenu">
- <Menu.ItemGroup
- title={intl.formatMessage({ id: 'profile.services.support' })}
- >
- <Menu.Item onClick={() => onCopy(HELPCENTER.mail)}>
- <MailOutlined style={iconStyle} />
- <MenuText>{HELPCENTER.mail}</MenuText>
- <Tooltip title={copyTooltipTitle}>
- <CopyOutlined style={{ ...iconStyle, float: 'right' }} />
- </Tooltip>
- </Menu.Item>
- <Menu.Item onClick={() => onCopy(HELPCENTER.phone)}>
- <PhoneOutlined style={iconStyle} />
- <MenuText>{HELPCENTER.phone}</MenuText>
- <Tooltip title={copyTooltipTitle}>
- <CopyOutlined style={{ ...iconStyle, float: 'right' }} />
- </Tooltip>
- </Menu.Item>
- <Menu.Item onClick={() => onCopy(supportCode)}>
- <KeyOutlined style={iconStyle} />
- <Tooltip
- title={intl.formatMessage({
- id: 'helpCenter.tooltip.supportCode',
- })}
- >
- <MenuText>{supportCode}</MenuText>
- </Tooltip>
- <Tooltip title={copyTooltipTitle}>
- <CopyOutlined style={{ ...iconStyle, float: 'right' }} />
- </Tooltip>
- </Menu.Item>
- </Menu.ItemGroup>
- <Menu.ItemGroup title={intl.formatMessage({ id: 'general.information' })}>
- <Menu.Item onClick={() => window.open(FAQ_LINK, '_blank')}>
- <QuestionCircleOutlined style={iconStyle} />
- <MenuText>
- {intl.formatMessage({ id: 'profile.services.faq' })}
- </MenuText>
- </Menu.Item>
- </Menu.ItemGroup>
- </Menu>
- );
+ const isHelpCenterRoute = currentRoute.pathname === HELP_CENTER_ROUTE;
+
+ const handleClick = () => history.push(HELP_CENTER_ROUTE);
return (
- <HelpCenterComp>
- <Dropdown
- overlay={menu}
- placement="bottomRight"
- onVisibleChange={setDropdownVisibility}
- >
- {HelpCenterIcon(dropdownVisibility)}
- </Dropdown>
+ <HelpCenterComp
+ onClick={handleClick}
+ title={intl.formatMessage({ id: 'helpCenter.title' })}
+ >
+ {HelpCenterIcon(isHelpCenterRoute)}
</HelpCenterComp>
);
};
diff --git a/services/locations/src/components/App/Header/HelpCenter/HelpCenter.styled.js b/services/locations/src/components/App/Header/HelpCenter/HelpCenter.styled.js
index d825ccb..74c60d3 100644
--- a/services/locations/src/components/App/Header/HelpCenter/HelpCenter.styled.js
+++ b/services/locations/src/components/App/Header/HelpCenter/HelpCenter.styled.js
@@ -1,17 +1,7 @@
import styled from 'styled-components';
-export const iconStyle = {
- fontSize: 16,
- color: '#50667c',
- alignSelf: 'flex-end',
-};
-
export const HelpCenterComp = styled.div`
margin-right: 24px;
cursor: pointer;
display: inline-block;
`;
-
-export const MenuText = styled.span`
- padding: 0 16px;
-`;
diff --git a/services/locations/src/components/App/Header/LinkMenu/LinkMenu.react.js b/services/locations/src/components/App/Header/LinkMenu/LinkMenu.react.js
deleted file mode 100644
index a6fe9f5..0000000
--- a/services/locations/src/components/App/Header/LinkMenu/LinkMenu.react.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useState } from 'react';
-import { Menu, Dropdown } from 'antd';
-import Icon from '@ant-design/icons';
-
-import { ReactComponent as MenuDefaultSvg } from 'assets/MenuDefault.svg';
-import { ReactComponent as MenuActiveSvg } from 'assets/MenuActive.svg';
-
-import { Logout } from './Logout';
-import { Profile } from './Profile';
-
-import { linkStyles, logoutStyles } from './LinkMenu.styled';
-
-const MenuIcon = dropdownVisibility => (
- <Icon
- component={dropdownVisibility ? MenuActiveSvg : MenuDefaultSvg}
- style={{ fontSize: 32 }}
- data-cy="dropdownMenuTrigger"
- />
-);
-
-export const LinkMenu = () => {
- const [dropdownVisibility, setDropdownVisibility] = useState(false);
- const menu = (
- <Menu data-cy="dropdownMenu">
- <Menu.Item style={linkStyles}>
- <Profile />
- </Menu.Item>
- <Menu.Item style={logoutStyles}>
- <Logout />
- </Menu.Item>
- </Menu>
- );
-
- return (
- <Dropdown
- overlay={menu}
- placement="bottomRight"
- onVisibleChange={setDropdownVisibility}
- >
- {MenuIcon(dropdownVisibility)}
- </Dropdown>
- );
-};
diff --git a/services/locations/src/components/App/Header/LinkMenu/LinkMenu.styled.js b/services/locations/src/components/App/Header/LinkMenu/LinkMenu.styled.js
deleted file mode 100644
index 0df5245..0000000
--- a/services/locations/src/components/App/Header/LinkMenu/LinkMenu.styled.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const linkStyles = { padding: '12px 32px' };
-
-export const logoutStyles = {
- ...linkStyles,
- borderTop: '1px solid rgb(151, 151, 151)',
-};
diff --git a/services/locations/src/components/App/Header/LinkMenu/Logout/Logout.react.js b/services/locations/src/components/App/Header/LinkMenu/Logout/Logout.react.js
deleted file mode 100644
index 791b29e..0000000
--- a/services/locations/src/components/App/Header/LinkMenu/Logout/Logout.react.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react';
-import { useIntl } from 'react-intl';
-import { useQueryClient } from 'react-query';
-import { useDispatch } from 'react-redux';
-import { push } from 'connected-react-router';
-import { notification } from 'antd';
-
-// API
-import { logout } from 'network/api';
-
-// UTILS
-import { usePrivateKey } from 'utils/privateKey';
-import { clearHasSeenPrivateKeyModal } from 'utils/storage';
-
-// CONSTANTS
-import { AUTHENTICATION_ROUTE } from 'constants/routes';
-
-export const Logout = () => {
- const intl = useIntl();
- const queryClient = useQueryClient();
- const dispatch = useDispatch();
-
- const [, clearPrivateKey] = usePrivateKey(null);
- const handleClick = () => {
- logout()
- .then(response => {
- if (response.status >= 400) {
- notification.error({
- message: intl.formatMessage({
- id: 'notification.logout.error',
- }),
- });
- return;
- }
-
- dispatch(push(AUTHENTICATION_ROUTE));
- queryClient.clear();
- clearPrivateKey(null);
- clearHasSeenPrivateKeyModal();
- notification.success({
- message: intl.formatMessage({
- id: 'notification.logout.success',
- }),
- });
- })
- .catch(() =>
- notification.error({
- message: intl.formatMessage({
- id: 'notification.logout.error',
- }),
- })
- );
- };
-
- return (
- <div aria-hidden="true" onClick={handleClick}>
- {intl.formatMessage({
- id: 'header.logout',
- })}
- </div>
- );
-};
diff --git a/services/locations/src/components/App/Header/LinkMenu/Logout/index.js b/services/locations/src/components/App/Header/LinkMenu/Logout/index.js
deleted file mode 100644
index 375cfee..0000000
--- a/services/locations/src/components/App/Header/LinkMenu/Logout/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { Logout } from './Logout.react';
diff --git a/services/locations/src/components/App/Header/LinkMenu/Profile/Profile.react.js b/services/locations/src/components/App/Header/LinkMenu/Profile/Profile.react.js
deleted file mode 100644
index 137005f..0000000
--- a/services/locations/src/components/App/Header/LinkMenu/Profile/Profile.react.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { useIntl } from 'react-intl';
-import { useHistory } from 'react-router';
-
-// CONSTANTS
-import { PROFILE_ROUTE } from 'constants/routes';
-
-export const Profile = () => {
- const intl = useIntl();
- const history = useHistory();
-
- const handleClick = () => {
- history.push(PROFILE_ROUTE);
- };
-
- return (
- <div aria-hidden="true" onClick={handleClick}>
- {intl.formatMessage({
- id: 'header.profile',
- })}
- </div>
- );
-};
diff --git a/services/locations/src/components/App/Header/LinkMenu/Profile/index.js b/services/locations/src/components/App/Header/LinkMenu/Profile/index.js
deleted file mode 100644
index 42b4cd6..0000000
--- a/services/locations/src/components/App/Header/LinkMenu/Profile/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { Profile } from './Profile.react';
diff --git a/services/locations/src/components/App/Header/LinkMenu/index.js b/services/locations/src/components/App/Header/LinkMenu/index.js
deleted file mode 100644
index d33dfc2..0000000
--- a/services/locations/src/components/App/Header/LinkMenu/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LinkMenu } from './LinkMenu.react';
diff --git a/services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.react.js b/services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.react.js
index a448309..daced37 100644
--- a/services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.react.js
+++ b/services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.react.js
@@ -1,6 +1,7 @@
import React, { useMemo } from 'react';
-import { Menu } from 'antd';
+import { useHistory } from 'react-router-dom';
+import { Menu, Select } from 'antd';
import { useIntl } from 'react-intl';
import { PlusOutlined } from '@ant-design/icons';
@@ -9,11 +10,17 @@ import { useTabletSize } from 'components/hooks/media';
import { useModal } from 'components/hooks/useModal';
import { CreateGroupModal } from 'components/App/modals/CreateGroupModal';
-
-import { StyledLink } from '../SelectGroup.styled';
+import {
+ StyledMenu,
+ StyledButtonLink,
+ StyledMenuItem,
+ StyledSelect,
+ StyledLink,
+} from './GroupMenu.styled';
export const GroupMenu = ({ groups, groupId, onClose }) => {
const intl = useIntl();
+ const history = useHistory();
const [openModal] = useModal();
const isTablet = useTabletSize();
const sortGroupsByName = useMemo(() => {
@@ -28,37 +35,66 @@ export const GroupMenu = ({ groups, groupId, onClose }) => {
});
};
+ const handleSelectedGroupId = id => {
+ onClose();
+ history.push(`${BASE_GROUP_ROUTE}${id}`);
+ };
+
return (
- <Menu
- style={{
- padding: '16px 0',
- maxHeight: '260px',
- overflow: 'auto',
- }}
- >
+ <StyledMenu>
{isTablet && (
- <Menu.Item key="create" onClick={onCreate}>
- <StyledLink to="#">
- <PlusOutlined style={{ color: 'rgb(0,0,0)' }} />
- {intl.formatMessage({ id: 'header.createGroup' })}
- </StyledLink>
- </Menu.Item>
+ <>
+ <Menu.Item key="create">
+ <StyledButtonLink
+ type="link"
+ icon={<PlusOutlined />}
+ onClick={onCreate}
+ >
+ {intl.formatMessage({ id: 'header.createGroup' })}
+ </StyledButtonLink>
+ </Menu.Item>
+ <Menu.Divider />
+ </>
)}
- {sortGroupsByName.map(group => (
- <Menu.Item
- data-cy={`groupItem-${group.groupId}`}
- key={group.groupId}
- style={
- group.groupId === groupId
- ? { backgroundColor: 'rgb(195, 206, 217)' }
- : {}
- }
- >
- <StyledLink to={`${BASE_GROUP_ROUTE}${group.groupId}`}>
- {group.name}
- </StyledLink>
+ {groups.length < 3 && !isTablet ? (
+ sortGroupsByName.map(group => (
+ <StyledMenuItem
+ data-cy={`groupItem-${group.groupId}`}
+ key={group.groupId}
+ $activeGroup={group.groupId === groupId}
+ >
+ <StyledLink to={`${BASE_GROUP_ROUTE}${group.groupId}`}>
+ {group.name}
+ </StyledLink>
+ </StyledMenuItem>
+ ))
+ ) : (
+ <Menu.Item>
+ <StyledSelect
+ showSearch
+ placeholder={intl.formatMessage({
+ id: 'header.changeGroup.dropdown.searchLocation',
+ })}
+ defaultValue={groupId}
+ optionFilterProp="children"
+ filterOption={(input, option) =>
+ option.children.toLowerCase().includes(input.toLowerCase())
+ }
+ data-cy="groupSelect"
+ onChange={handleSelectedGroupId}
+ >
+ {sortGroupsByName.map(group => (
+ <Select.Option
+ data-cy={`groupItem-${group.groupId}`}
+ key={group.groupId}
+ value={group.groupId}
+ >
+ {group.name}
+ </Select.Option>
+ ))}
+ </StyledSelect>
</Menu.Item>
- ))}
- </Menu>
+ )}
+ </StyledMenu>
);
};
diff --git a/services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.styled.js b/services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.styled.js
new file mode 100644
index 0000000..3a4eb3a
--- /dev/null
+++ b/services/locations/src/components/App/Header/SelectGroup/GroupMenu/GroupMenu.styled.js
@@ -0,0 +1,61 @@
+import styled from 'styled-components';
+import { Select, Menu, Button } from 'antd';
+import { Link } from 'react-router-dom';
+
+export const StyledMenu = styled(Menu)`
+ box-sizing: border-box;
+ padding: 0 4px;
+ border-radius: 4px;
+
+ &.ant-menu-vertical {
+ box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%),
+ 0 9px 28px 8px rgb(0 0 0 / 5%);
+ }
+
+ &.ant-menu .ant-menu-item-selected {
+ background-color: #fff;
+ }
+`;
+
+export const StyledMenuItem = styled(Menu.Item)`
+ color: #000;
+ background-color: ${properties =>
+ properties.$activeGroup ? 'rgb(195, 206, 217)' : '#fff'};
+
+ &:active,
+ &:focus,
+ &:hover {
+ background-color: #f5f5f5;
+
+ a {
+ color: #000;
+ }
+ }
+`;
+
+export const StyledSelect = styled(Select)`
+ width: 200px;
+`;
+
+export const StyledLink = styled(Link)`
+ text-decoration: none;
+ padding: 8px;
+ color: #000;
+
+ &:active,
+ &:focus,
+ &:hover {
+ color: #000;
+ }
+`;
+
+export const StyledButtonLink = styled(Button)`
+ color: rgba(0, 0, 0, 0.87);
+
+ &:active,
+ &:focus,
+ &:hover {
+ color: rgba(0, 0, 0, 0.87);
+ background-color: #f5f5f5;
+ }
+`;
diff --git a/services/locations/src/components/App/Header/SelectGroup/SelectGroup.react.js b/services/locations/src/components/App/Header/SelectGroup/SelectGroup.react.js
index 52b865b..cd611f5 100644
--- a/services/locations/src/components/App/Header/SelectGroup/SelectGroup.react.js
+++ b/services/locations/src/components/App/Header/SelectGroup/SelectGroup.react.js
@@ -1,27 +1,26 @@
import React, { useState } from 'react';
import { useIntl } from 'react-intl';
-import { Dropdown, Button } from 'antd';
-import { DownOutlined } from '@ant-design/icons';
+import { Dropdown } from 'antd';
import { useQuery } from 'react-query';
-
import { getGroups } from 'network/api';
-import { useTabletSize } from 'components/hooks/media';
+import { useTabletSize } from 'components/hooks/media';
+import { DownOutlined } from '@ant-design/icons';
import { GroupMenu } from './GroupMenu';
-import { buttonStyle, iconStyle } from './SelectGroup.styled';
+import { StyledButton } from './SelectGroup.styled';
+import { CreateGroup } from '../CreateGroup';
export const SelectGroup = ({ groupId }) => {
const intl = useIntl();
const [isDropdownOpen, setDropdownOpen] = useState();
const isTablet = useTabletSize();
- const { isLoading, error, data: groups } = useQuery('groups', () =>
- getGroups()
- );
+ const { isLoading, error, data: groups } = useQuery('groups', getGroups);
if (isLoading || error || (groups.length <= 1 && !isTablet)) return null;
+ if (groups.length <= 1 && isTablet) return <CreateGroup />;
return (
<Dropdown
@@ -35,13 +34,13 @@ export const SelectGroup = ({ groupId }) => {
/>
}
>
- <Button
- style={buttonStyle}
+ <StyledButton
onClick={() => setDropdownOpen(!isDropdownOpen)}
+ data-cy="selectGroupDropdown"
>
{intl.formatMessage({ id: 'header.changeGroup.dropdown' })}
- <DownOutlined style={iconStyle} data-cy="selectGroupDropdown" />
- </Button>
+ <DownOutlined />
+ </StyledButton>
</Dropdown>
);
};
diff --git a/services/locations/src/components/App/Header/SelectGroup/SelectGroup.styled.js b/services/locations/src/components/App/Header/SelectGroup/SelectGroup.styled.js
index c1f8ea3..8d2c96d 100644
--- a/services/locations/src/components/App/Header/SelectGroup/SelectGroup.styled.js
+++ b/services/locations/src/components/App/Header/SelectGroup/SelectGroup.styled.js
@@ -1,26 +1,22 @@
import styled from 'styled-components';
-import { Link } from 'react-router-dom';
+import { Button } from 'antd';
-export const StyledLink = styled(Link)`
- text-decoration: none;
- padding: 8px;
- color: #000000 !important;
+export const StyledButton = styled(Button)`
+ border-radius: 24px;
+ border: 2px solid #fff;
+ color: #fff;
+ background: transparent;
+ margin-right: 24px;
&:active,
- &:focus,
- &:hover {
- color: #000000 !important;
+ &:hover,
+ &:focus {
+ color: #000;
+ background: #fff;
+ border-color: #fff;
+
+ .anticon {
+ color: #000;
+ }
}
`;
-
-export const buttonStyle = {
- borderRadius: 24,
- border: '2px solid rgb(255, 255, 255)',
- color: 'rgb(255, 255, 255)',
- background: 'transparent',
- marginRight: 24,
-};
-
-export const iconStyle = {
- color: 'rgb(255, 255, 255)',
-};
diff --git a/services/locations/src/components/App/Header/HelpCenter/HelpCenter.helper.js b/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.helper.js
similarity index 67%
rename from services/locations/src/components/App/Header/HelpCenter/HelpCenter.helper.js
rename to services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.helper.js
index 4eb7c5b..8e22c6c 100644
--- a/services/locations/src/components/App/Header/HelpCenter/HelpCenter.helper.js
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.helper.js
@@ -1,4 +1,4 @@
export const HELPCENTER = {
- phone: '+49 30340608090',
+ phone: '+49 303 406 080 90',
mail: 'locations@luca-app.de',
};
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.react.js b/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.react.js
new file mode 100644
index 0000000..c11e0dd
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.react.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+
+import { MailSection } from './MailSection';
+import { PhoneSection } from './PhoneSection';
+import { Wrapper, Heading } from './ContactSection.styled';
+
+export const ContactSection = ({ operator }) => {
+ const intl = useIntl();
+ return (
+ <Wrapper>
+ <Heading>{intl.formatMessage({ id: 'helpCenter.heading' })}</Heading>
+ <MailSection operator={operator} />
+ <PhoneSection operator={operator} />
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.styled.js b/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.styled.js
new file mode 100644
index 0000000..41ac0f2
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/ContactSection.styled.js
@@ -0,0 +1,13 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+ margin-top: 24px;
+`;
+
+export const Heading = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Medium, sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ margin-bottom: 24px;
+`;
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.react.js b/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.react.js
new file mode 100644
index 0000000..a70f863
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.react.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+
+import { useModal } from 'components/hooks/useModal';
+
+import { ContactFormModal } from 'components/App/modals/ContactFormModal';
+import { SecondaryButton } from 'components/general';
+import { ArrowRightOutlined } from '@ant-design/icons';
+
+import {
+ Wrapper,
+ Heading,
+ Text,
+ StyledMailOutlined,
+} from './MailSection.styled';
+
+export const MailSection = ({ operator }) => {
+ const intl = useIntl();
+ const [openModal] = useModal();
+
+ const openContactForm = () => {
+ openModal({
+ content: <ContactFormModal operator={operator} />,
+ });
+ };
+ return (
+ <Wrapper>
+ <StyledMailOutlined />
+ <Heading>{intl.formatMessage({ id: 'helpCenter.mail.heading' })}</Heading>
+ <Text>{intl.formatMessage({ id: 'helpCenter.mail.text' })}</Text>
+ <SecondaryButton onClick={openContactForm}>
+ {intl.formatMessage({ id: 'helpCenter.mail.buttonText' })}
+ <ArrowRightOutlined />
+ </SecondaryButton>
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.styled.js b/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.styled.js
new file mode 100644
index 0000000..bde4ae2
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/MailSection.styled.js
@@ -0,0 +1,30 @@
+import styled from 'styled-components';
+import { MailOutlined } from '@ant-design/icons';
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ margin-bottom: 42px;
+`;
+
+export const Heading = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+ margin-bottom: 8px;
+`;
+
+export const Text = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Medium, sans-serif;
+ font-size: 14px;
+ font-weight: 500;
+ margin-bottom: 24px;
+`;
+
+export const StyledMailOutlined = styled(MailOutlined)`
+ font-size: 32px;
+ margin-bottom: 20px;
+`;
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/index.js b/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/index.js
new file mode 100644
index 0000000..ae19e07
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/MailSection/index.js
@@ -0,0 +1 @@
+export { MailSection } from './MailSection.react';
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.react.js b/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.react.js
new file mode 100644
index 0000000..d709481
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.react.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { Tooltip } from 'antd';
+
+import { HELPCENTER } from '../ContactSection.helper';
+import {
+ Wrapper,
+ SupportCode,
+ StyledPhoneOutlined,
+} from './PhoneSection.styled';
+import { Heading, Text } from '../MailSection/MailSection.styled';
+
+export const PhoneSection = ({ operator }) => {
+ const intl = useIntl();
+ return (
+ <Wrapper>
+ <StyledPhoneOutlined rotate={90} />
+ <Heading>
+ {intl.formatMessage({ id: 'helpCenter.phone.heading' })}
+ </Heading>
+ <Text>
+ {intl.formatMessage({ id: 'helpCenter.phone.text' }, { br: <br /> })}
+ </Text>
+ <Tooltip placement="top" title={operator.supportCode}>
+ <SupportCode>
+ {intl.formatMessage({ id: 'helpCenter.phone.showSupportCode' })}
+ </SupportCode>
+ </Tooltip>
+ <Heading>{HELPCENTER.phone}</Heading>
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.styled.js b/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.styled.js
new file mode 100644
index 0000000..5cf4783
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/PhoneSection.styled.js
@@ -0,0 +1,22 @@
+import styled from 'styled-components';
+import { PhoneOutlined } from '@ant-design/icons';
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+`;
+
+export const SupportCode = styled.div`
+ color: rgb(80, 102, 124);
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+ cursor: pointer;
+ margin-bottom: 24px;
+`;
+
+export const StyledPhoneOutlined = styled(PhoneOutlined)`
+ font-size: 32px;
+ margin-bottom: 20px;
+`;
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/index.js b/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/index.js
new file mode 100644
index 0000000..8eec697
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/PhoneSection/index.js
@@ -0,0 +1 @@
+export { PhoneSection } from './PhoneSection.react';
diff --git a/services/locations/src/components/App/HelpCenter/ContactSection/index.js b/services/locations/src/components/App/HelpCenter/ContactSection/index.js
new file mode 100644
index 0000000..6101ae4
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/ContactSection/index.js
@@ -0,0 +1 @@
+export { ContactSection } from './ContactSection.react';
diff --git a/services/locations/src/components/App/HelpCenter/HelpCenter.react.js b/services/locations/src/components/App/HelpCenter/HelpCenter.react.js
new file mode 100644
index 0000000..bef15e2
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/HelpCenter.react.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { Layout } from 'antd';
+
+import { LocationFooter } from 'components/App/LocationFooter';
+
+import { NavigationButton } from './NavigationButton';
+import { Links } from './Links';
+import { ContactSection } from './ContactSection';
+
+import {
+ contentStyles,
+ sliderStyles,
+ Wrapper,
+ Header,
+ CardWrapper,
+} from './HelpCenter.styled';
+
+const { Content, Sider } = Layout;
+
+export const HelpCenter = ({ operator }) => {
+ const intl = useIntl();
+ return (
+ <Layout>
+ <Sider style={sliderStyles}>
+ <NavigationButton />
+ </Sider>
+ <Layout>
+ <Content style={contentStyles}>
+ <Wrapper>
+ <Header>{intl.formatMessage({ id: 'helpCenter.title' })}</Header>
+ <CardWrapper>
+ <Links />
+ <ContactSection operator={operator} />
+ </CardWrapper>
+ <LocationFooter />
+ </Wrapper>
+ </Content>
+ </Layout>
+ </Layout>
+ );
+};
diff --git a/services/locations/src/components/App/HelpCenter/HelpCenter.styled.js b/services/locations/src/components/App/HelpCenter/HelpCenter.styled.js
new file mode 100644
index 0000000..352b03b
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/HelpCenter.styled.js
@@ -0,0 +1,31 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+ margin: 40px;
+`;
+
+export const Header = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-SemiBold, sans-serif;
+ font-size: 34px;
+ font-weight: 600;
+ margin-bottom: 48px;
+`;
+
+export const CardWrapper = styled.div`
+ background: rgb(255, 255, 255);
+ border-radius: 8px;
+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.15);
+ padding: 32px;
+`;
+
+export const contentStyles = {
+ backgroundColor: '#f3f5f7',
+};
+
+export const sliderStyles = {
+ ...contentStyles,
+ borderRight: '1px solid rgb(151, 151, 151)',
+};
diff --git a/services/locations/src/components/App/HelpCenter/Links/Links.react.js b/services/locations/src/components/App/HelpCenter/Links/Links.react.js
new file mode 100644
index 0000000..62f3b3f
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/Links/Links.react.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { FAQ_LINK, VIDEOS_LINK, TOOLKIT_LINK } from 'constants/links';
+
+import { ReactComponent as ExternalSvg } from 'assets/external.svg';
+import { Wrapper, LinkWrapper, LinkText, StyledIcon } from './Links.styled';
+
+export const Links = () => {
+ const intl = useIntl();
+ const links = [
+ { url: VIDEOS_LINK, intlId: 'profile.services.videos' },
+ { url: FAQ_LINK, intlId: 'profile.services.faq' },
+ { url: TOOLKIT_LINK, intlId: 'profile.services.toolkit' },
+ ];
+
+ const openInNewTab = url => {
+ window.open(url, '_blank').focus();
+ };
+ return (
+ <Wrapper>
+ {links.map(link => (
+ <LinkWrapper key={link.intlId}>
+ <LinkText onClick={() => openInNewTab(link.url)}>
+ {intl.formatMessage({ id: link.intlId })}
+ <StyledIcon component={ExternalSvg} />
+ </LinkText>
+ </LinkWrapper>
+ ))}
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/HelpCenter/Links/Links.styled.js b/services/locations/src/components/App/HelpCenter/Links/Links.styled.js
new file mode 100644
index 0000000..b389f5c
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/Links/Links.styled.js
@@ -0,0 +1,27 @@
+import styled from 'styled-components';
+import Icon from '@ant-design/icons';
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+ border-bottom: 1px solid rgb(151, 151, 151);
+ margin: 0 -32px;
+`;
+
+export const LinkWrapper = styled.div`
+ display: flex;
+ margin-bottom: 24px;
+ padding: 0 32px;
+`;
+
+export const LinkText = styled.div`
+ color: rgb(80, 102, 124);
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+ cursor: pointer;
+`;
+
+export const StyledIcon = styled(Icon)`
+ margin-left: 8px;
+`;
diff --git a/services/locations/src/components/App/HelpCenter/Links/index.js b/services/locations/src/components/App/HelpCenter/Links/index.js
new file mode 100644
index 0000000..19fe9c4
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/Links/index.js
@@ -0,0 +1 @@
+export { Links } from './Links.react';
diff --git a/services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.react.js b/services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.react.js
new file mode 100644
index 0000000..badc868
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.react.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { useHistory } from 'react-router';
+
+import { Navigation, StyledLeftOutlined } from './NavigationButton.styled';
+
+export const NavigationButton = () => {
+ const intl = useIntl();
+ const history = useHistory();
+
+ const navigate = () => history.goBack();
+
+ return (
+ <Navigation onClick={navigate}>
+ <StyledLeftOutlined />
+ {intl.formatMessage({
+ id: 'header.profile.back',
+ })}
+ </Navigation>
+ );
+};
diff --git a/services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.styled.js b/services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.styled.js
new file mode 100644
index 0000000..84d35f3
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/NavigationButton/NavigationButton.styled.js
@@ -0,0 +1,18 @@
+import styled from 'styled-components';
+import { LeftOutlined } from '@ant-design/icons';
+
+export const Navigation = styled.div`
+ display: flex;
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+ align-items: center;
+ cursor: pointer;
+ margin-top: 40px;
+ margin-left: 42px;
+`;
+
+export const StyledLeftOutlined = styled(LeftOutlined)`
+ margin-right: 14px;
+ font-size: 10px;
+`;
diff --git a/services/locations/src/components/App/HelpCenter/NavigationButton/index.js b/services/locations/src/components/App/HelpCenter/NavigationButton/index.js
new file mode 100644
index 0000000..909d391
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/NavigationButton/index.js
@@ -0,0 +1 @@
+export { NavigationButton } from './NavigationButton.react';
diff --git a/services/locations/src/components/App/HelpCenter/index.js b/services/locations/src/components/App/HelpCenter/index.js
new file mode 100644
index 0000000..da822f9
--- /dev/null
+++ b/services/locations/src/components/App/HelpCenter/index.js
@@ -0,0 +1 @@
+export { HelpCenter } from './HelpCenter.react';
diff --git a/services/locations/src/components/App/Profile/Services/Services.helper.js b/services/locations/src/components/App/Profile/Services/Services.helper.js
new file mode 100644
index 0000000..248b7d3
--- /dev/null
+++ b/services/locations/src/components/App/Profile/Services/Services.helper.js
@@ -0,0 +1,59 @@
+import { TERMS_CONDITIONS_LINK, FAQ_LINK } from 'constants/links';
+import { LICENSES_ROUTE } from 'constants/routes';
+import AVV from 'assets/documents/AVV_Luca.pdf';
+import TOMS from 'assets/documents/TOMS_Luca.pdf';
+import PRIVACY_MANDATORY from 'assets/documents/DSE_Luca_mandatory.pdf';
+import PRIVACY_OPTIONAL from 'assets/documents/DSE_Luca_optional.pdf';
+
+export const getDownloadLinks = intl => [
+ {
+ dataCy: 'privacyLinkMandatory',
+ download: intl.formatMessage({
+ id: 'downloadFile.profile.privacy',
+ }),
+ href: PRIVACY_MANDATORY,
+ intlId: intl.formatMessage({
+ id: 'profile.services.download.dataPrivacyMandatory',
+ }),
+ },
+ {
+ dataCy: 'privacyLinkOptional',
+ download: intl.formatMessage({
+ id: 'downloadFile.profile.privacy',
+ }),
+ href: PRIVACY_OPTIONAL,
+ intlId: intl.formatMessage({
+ id: 'profile.services.download.dataPrivacyOptional',
+ }),
+ },
+ {
+ dataCy: 'dpaLink',
+ download: intl.formatMessage({ id: 'downloadFile.profile.avv' }),
+ href: AVV,
+ intlId: intl.formatMessage({ id: 'profile.services.download.avv' }),
+ },
+ {
+ dataCy: 'tomsLink',
+ download: intl.formatMessage({ id: 'downloadFile.profile.toms' }),
+ href: TOMS,
+ intlId: intl.formatMessage({ id: 'profile.services.download.toms' }),
+ },
+];
+
+export const getExternalLinks = intl => [
+ {
+ dataCy: 'termsLink',
+ href: TERMS_CONDITIONS_LINK,
+ intlId: intl.formatMessage({ id: 'profile.services.agb' }),
+ },
+ {
+ dataCy: 'licensesLink',
+ href: LICENSES_ROUTE,
+ intlId: intl.formatMessage({ id: 'license.license' }),
+ },
+ {
+ dataCy: 'faqLink',
+ href: FAQ_LINK,
+ intlId: intl.formatMessage({ id: 'profile.services.faq' }),
+ },
+];
diff --git a/services/locations/src/components/App/Profile/Services/Services.react.js b/services/locations/src/components/App/Profile/Services/Services.react.js
index a941f23..5001e3a 100644
--- a/services/locations/src/components/App/Profile/Services/Services.react.js
+++ b/services/locations/src/components/App/Profile/Services/Services.react.js
@@ -2,84 +2,48 @@ import React from 'react';
import { useIntl } from 'react-intl';
import { Tooltip } from 'antd';
-import { TERMS_CONDITIONS_LINK, FAQ_LINK } from 'constants/links';
-import { LICENSES_ROUTE } from 'constants/routes';
-import AVV from 'assets/documents/AVV_Luca.pdf';
-import TOMS from 'assets/documents/TOMS_Luca.pdf';
-import PRIVACY_MANDATORY from 'assets/documents/DSE_Luca_mandatory.pdf';
-import PRIVACY_OPTIONAL from 'assets/documents/DSE_Luca_optional.pdf';
-
+import { getDownloadLinks, getExternalLinks } from './Services.helper';
import { Content, Heading, Wrapper, Link, Text } from './Services.styled';
export const Services = ({ supportCode }) => {
const intl = useIntl();
+ const downloadLinks = getDownloadLinks(intl);
+
+ const externalLinks = getExternalLinks(intl);
+
return (
<Content>
<Heading>
{intl.formatMessage({ id: 'profile.services.overview' })}
</Heading>
<Wrapper>
- <Link
- data-cy="privacyLinkMandatory"
- download={intl.formatMessage({
- id: 'downloadFile.profile.privacy',
- })}
- href={PRIVACY_MANDATORY}
- >
- {intl.formatMessage({
- id: 'profile.services.download.dataPrivacyMandatory',
- })}
- </Link>
- <Link
- data-cy="privacyLinkOptional"
- download={intl.formatMessage({
- id: 'downloadFile.profile.privacy',
- })}
- href={PRIVACY_OPTIONAL}
- >
- {intl.formatMessage({
- id: 'profile.services.download.dataPrivacyOptional',
- })}
- </Link>
- <Link
- download={intl.formatMessage({ id: 'downloadFile.profile.avv' })}
- href={AVV}
- data-cy="dpaLink"
- >
- {intl.formatMessage({ id: 'profile.services.download.avv' })}
- </Link>
- <Link
- download={intl.formatMessage({ id: 'downloadFile.profile.toms' })}
- href={TOMS}
- data-cy="tomsLink"
- >
- {intl.formatMessage({ id: 'profile.services.download.toms' })}
- </Link>
- <Link
- data-cy="termsLink"
- target="_blank"
- rel="noopener noreferrer"
- href={TERMS_CONDITIONS_LINK}
- >
- {intl.formatMessage({ id: 'profile.services.agb' })}
- </Link>
- <Link target="_blank" rel="noopener noreferrer" href={LICENSES_ROUTE}>
- {intl.formatMessage({ id: 'license.license' })}
- </Link>
+ {downloadLinks.map(downloadLink => (
+ <Link
+ key={downloadLink.intlId}
+ data-cy={downloadLink.dataCy}
+ download={downloadLink.download}
+ href={downloadLink.href}
+ >
+ {downloadLink.intlId}
+ </Link>
+ ))}
+ {externalLinks.map(externalLink => (
+ <Link
+ key={externalLink.intlId}
+ data-cy={externalLink.dataCy}
+ target="_blank"
+ rel="noopener noreferrer"
+ href={externalLink.href}
+ >
+ {externalLink.intlId}
+ </Link>
+ ))}
<Tooltip placement="topLeft" title={supportCode}>
<Text>
{intl.formatMessage({ id: 'profile.services.supportCode' })}
</Text>
</Tooltip>
- <Link
- data-cy="faqLink"
- target="_blank"
- rel="noopener noreferrer"
- href={FAQ_LINK}
- >
- {intl.formatMessage({ id: 'profile.services.faq' })}
- </Link>
</Wrapper>
</Content>
);
diff --git a/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.helper.js b/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.helper.js
new file mode 100644
index 0000000..2f5e828
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.helper.js
@@ -0,0 +1,2 @@
+export const REQUEST_STEP = 'REQUEST_STEP';
+export const FINISH_STEP = 'FINISH_STEP';
diff --git a/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.react.js b/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.react.js
new file mode 100644
index 0000000..a4b36ee
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.react.js
@@ -0,0 +1,49 @@
+import React, { useState } from 'react';
+import { Steps } from 'antd';
+
+// hooks
+import { useModal } from 'components/hooks/useModal';
+
+import { REQUEST_STEP, FINISH_STEP } from './ContactFormModal.helper';
+
+import { RequestStep } from './steps/RequestStep';
+import { FinishStep } from './steps/FinishStep';
+
+export const ContactFormModal = ({ operator }) => {
+ const [, closeModal] = useModal();
+ const [currentStep, setCurrentStep] = useState(0);
+
+ const nextStep = () => setCurrentStep(currentStep + 1);
+
+ const steps = [
+ {
+ id: REQUEST_STEP,
+ content: (
+ <RequestStep
+ operator={operator}
+ next={nextStep}
+ closeModal={closeModal}
+ />
+ ),
+ },
+ {
+ id: FINISH_STEP,
+ content: <FinishStep done={closeModal} />,
+ },
+ ];
+
+ return (
+ <>
+ <Steps
+ progressDot={() => null}
+ current={currentStep}
+ style={{ display: 'none' }}
+ >
+ {steps.map(step => (
+ <Steps.Step key={step.id} />
+ ))}
+ </Steps>
+ {steps[currentStep].content}
+ </>
+ );
+};
diff --git a/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.styled.js b/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.styled.js
new file mode 100644
index 0000000..548c626
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/ContactFormModal.styled.js
@@ -0,0 +1,44 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+`;
+
+export const Text = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Medium, sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ margin-bottom: 24px;
+`;
+
+export const ContactDataWrapper = styled.div`
+ display: flex;
+ margin-bottom: 16px;
+ justify-content: space-between;
+ width: 60%;
+`;
+
+export const Name = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Medium, sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ width: 50%;
+`;
+
+export const Value = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 16px;
+ font-weight: bold;
+ width: 50%;
+`;
+
+export const ButtonWrapper = styled.div`
+ display: flex;
+ justify-content: ${({ multipleButtons }) =>
+ multipleButtons ? 'space-between' : 'flex-end'};
+ margin-top: 32px;
+`;
diff --git a/services/locations/src/components/App/modals/ContactFormModal/index.js b/services/locations/src/components/App/modals/ContactFormModal/index.js
new file mode 100644
index 0000000..3a4a9b2
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/index.js
@@ -0,0 +1 @@
+export { ContactFormModal } from './ContactFormModal.react';
diff --git a/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.react.js b/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.react.js
new file mode 100644
index 0000000..c3af655
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.react.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+
+import { Success, PrimaryButton } from 'components/general';
+
+import { Wrapper, Heading, Text, ButtonWrapper } from './FinishStep.styled';
+
+export const FinishStep = ({ done }) => {
+ const intl = useIntl();
+
+ return (
+ <Wrapper>
+ <Success />
+ <Heading>
+ {intl.formatMessage({ id: 'contactForm.modal.success.heading' })}
+ </Heading>
+ <Text>
+ {intl.formatMessage({ id: 'contactForm.modal.success.text' })}
+ </Text>
+ <ButtonWrapper>
+ <PrimaryButton onClick={done}>
+ {intl.formatMessage({ id: 'contactForm.modal.success.button' })}
+ </PrimaryButton>
+ </ButtonWrapper>
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.styled.js b/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.styled.js
new file mode 100644
index 0000000..9a3c580
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/FinishStep.styled.js
@@ -0,0 +1,28 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+ text-align: center;
+`;
+
+export const Heading = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 20px;
+ font-weight: bold;
+ margin-bottom: 24px;
+`;
+
+export const Text = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Medium, sans-serif;
+ font-size: 14px;
+ font-weight: 500;
+ margin-bottom: 24px;
+`;
+
+export const ButtonWrapper = styled.div`
+ display: flex;
+ justify-content: flex-end;
+`;
diff --git a/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/index.js b/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/index.js
new file mode 100644
index 0000000..e0bbc5f
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/steps/FinishStep/index.js
@@ -0,0 +1 @@
+export { FinishStep } from './FinishStep.react';
diff --git a/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.react.js b/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.react.js
new file mode 100644
index 0000000..a8bba92
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.react.js
@@ -0,0 +1,125 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { Form, Input, notification } from 'antd';
+
+import { PrimaryButton, SecondaryButton } from 'components/general';
+
+import { sendSupportMail } from 'network/api';
+
+import {
+ useOptionalPhoneValidator,
+ useTextAreaValidator,
+} from 'components/hooks/useValidators';
+import { getFormattedPhoneNumber } from 'utils/parsePhoneNumber';
+
+import {
+ Wrapper,
+ Text,
+ ContactDataWrapper,
+ Name,
+ Value,
+ ButtonWrapper,
+ Title,
+ StyledFormItem,
+} from './RequestStep.styled';
+
+export const RequestStep = ({ operator, next, closeModal }) => {
+ const intl = useIntl();
+
+ const phoneValidator = useOptionalPhoneValidator();
+ const requestTextValidator = useTextAreaValidator('requestText', 3000);
+
+ const contactData = [
+ { intlId: 'contactForm.modal.supportCode', value: operator.supportCode },
+ {
+ intlId: 'contactForm.modal.name',
+ value: `${operator.firstName} ${operator.lastName}`,
+ },
+ { intlId: 'contactForm.modal.email', value: operator.email },
+ ];
+
+ const onFinish = values => {
+ const { phone, requestText } = values;
+ const formattedPhone = phone ? getFormattedPhoneNumber(phone) : undefined;
+ const formattedRequestText = requestText?.split('\n').join(' ').trim();
+
+ sendSupportMail({
+ phone: formattedPhone,
+ requestText: formattedRequestText,
+ })
+ .then(response => {
+ if (response.status === 204) {
+ next();
+ return;
+ }
+ notification.error({
+ message: intl.formatMessage({
+ id: 'contactForm.modal.notification.error',
+ }),
+ });
+ })
+ .catch(() =>
+ notification.error({
+ message: intl.formatMessage({
+ id: 'contactForm.modal.notification.error',
+ }),
+ })
+ );
+ };
+
+ return (
+ <Wrapper>
+ <Title>
+ {intl.formatMessage({
+ id: 'contactForm.modal.title',
+ })}
+ </Title>
+ <Text>{intl.formatMessage({ id: 'contactForm.modal.text' })}</Text>
+ {contactData.map(entry => (
+ <ContactDataWrapper key={entry.intlId}>
+ <Name>{`${intl.formatMessage({ id: entry.intlId })}:`}</Name>
+ <Value>{entry.value}</Value>
+ </ContactDataWrapper>
+ ))}
+ <Form onFinish={onFinish}>
+ <StyledFormItem
+ colon={false}
+ rules={phoneValidator}
+ label={intl.formatMessage({
+ id: 'contactForm.modal.phone',
+ })}
+ name="phone"
+ >
+ <Input />
+ </StyledFormItem>
+ <Form.Item
+ colon={false}
+ label={intl.formatMessage({
+ id: 'contactForm.modal.request',
+ })}
+ name="requestText"
+ rules={requestTextValidator}
+ required
+ >
+ <Input.TextArea
+ maxLength={3000}
+ autoSize={{ minRows: 2, maxRows: 6 }}
+ showCount
+ />
+ </Form.Item>
+ <ButtonWrapper multipleButtons>
+ <SecondaryButton onClick={closeModal}>
+ {intl.formatMessage({
+ id: 'contactForm.modal.cancel',
+ })}
+ </SecondaryButton>
+ <PrimaryButton htmlType="submit">
+ {intl.formatMessage({
+ id: 'contactForm.modal.submit',
+ })}
+ </PrimaryButton>
+ </ButtonWrapper>
+ </Form>
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.styled.js b/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.styled.js
new file mode 100644
index 0000000..8aafcec
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/RequestStep.styled.js
@@ -0,0 +1,57 @@
+import styled from 'styled-components';
+import { Form } from 'antd';
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+`;
+
+export const StyledFormItem = styled(Form.Item)`
+ width: 50%;
+`;
+
+export const Text = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Medium, sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ margin-bottom: 24px;
+`;
+
+export const Title = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 20px;
+ font-weight: bold;
+ margin-bottom: 24px;
+`;
+
+export const ContactDataWrapper = styled.div`
+ display: flex;
+ margin-bottom: 16px;
+ justify-content: space-between;
+ width: 60%;
+`;
+
+export const Name = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Medium, sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ width: 50%;
+`;
+
+export const Value = styled.div`
+ color: rgba(0, 0, 0, 0.87);
+ font-family: Montserrat-Bold, sans-serif;
+ font-size: 16px;
+ font-weight: bold;
+ width: 50%;
+`;
+
+export const ButtonWrapper = styled.div`
+ display: flex;
+ justify-content: ${({ multipleButtons }) =>
+ multipleButtons ? 'space-between' : 'flex-end'};
+ margin-top: 32px;
+`;
diff --git a/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/index.js b/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/index.js
new file mode 100644
index 0000000..30229b0
--- /dev/null
+++ b/services/locations/src/components/App/modals/ContactFormModal/steps/RequestStep/index.js
@@ -0,0 +1 @@
+export { RequestStep } from './RequestStep.react';
diff --git a/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.helper.js b/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.helper.js
index 39a4b97..b19a802 100644
--- a/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.helper.js
+++ b/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.helper.js
@@ -1,3 +1,5 @@
+import { getMinutesFromTimeString } from 'utils/time';
+
export const RESTAURANT_TYPE = 'restaurant';
export const NURSING_HOME_TYPE = 'nursing_home';
export const HOTEL_TYPE = 'hotel';
@@ -6,10 +8,12 @@ export const BASE_TYPE = 'base';
export const SELECT_GROUP_STEP = 'SELECT_GROUP_STEP';
export const NAME_INPUT_STEP = 'NAME_INPUT_STEP';
+export const GOOGLE_PLACES_OPT_IN_STEP = 'GOOGLE_PLACES_OPT_IN_STEP';
export const ADDRESS_INPUT_STEP = 'ADDRESS_INPUT_STEP';
export const PHONE_INPUT_STEP = 'PHONE_INPUT_STEP';
export const TABLE_INPUT_STEP = 'TABLE_INPUT_STEP';
export const AUTOMATIC_CHECKOUT_STEP = 'AUTOMATIC_CHECKOUT_STEP';
+export const AVERAGE_CHECKIN_TIME_STEP = 'AVERAGE_CHECKIN_TIME_STEP';
export const COMPLETE_STEP = 'COMPLETE_STEP';
export const QR_CODES_STEP = 'QR_CODES_STEP';
export const PATIENT_STEP = 'PATIENT_STEP';
@@ -23,7 +27,8 @@ export const getRestaurantGroupPayload = (
radius,
tableCount,
groupType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
) => ({
type: groupType,
name: groupName,
@@ -38,6 +43,7 @@ export const getRestaurantGroupPayload = (
radius: radius ? parseInt(radius, 10) : 0,
tableCount: tableCount ? parseInt(tableCount, 10) : null,
isIndoor,
+ averageCheckinTime: getMinutesFromTimeString(averageCheckinTime),
});
export const getNursingHomeGroupPayload = (
@@ -48,7 +54,8 @@ export const getNursingHomeGroupPayload = (
radius,
patientRequired,
groupType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
) => ({
type: groupType,
name: groupName,
@@ -71,6 +78,7 @@ export const getNursingHomeGroupPayload = (
]
: [],
isIndoor,
+ averageCheckinTime: getMinutesFromTimeString(averageCheckinTime),
});
export const getBaseGroupPayload = (
@@ -80,7 +88,8 @@ export const getBaseGroupPayload = (
radius,
areas,
groupType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
) => ({
type: groupType,
name: groupName,
@@ -95,4 +104,5 @@ export const getBaseGroupPayload = (
radius: radius ? parseInt(radius, 10) : 0,
areas,
isIndoor,
+ averageCheckinTime: getMinutesFromTimeString(averageCheckinTime),
});
diff --git a/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.react.js b/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.react.js
index 702210b..b43d48c 100644
--- a/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.react.js
+++ b/services/locations/src/components/App/modals/CreateGroupModal/CreateGroupModal.react.js
@@ -9,8 +9,10 @@ import { BASE_GROUP_ROUTE, BASE_LOCATION_ROUTE } from 'constants/routes';
import { createGroup as createGroupRequest } from 'network/api';
import { useModal } from 'components/hooks/useModal';
-import { AutomaticCheckout } from '../generalOnboarding/AutomaticCheckout';
-import { TableInput } from '../generalOnboarding/TableInput';
+import { AutomaticCheckout } from 'components/App/modals/generalOnboarding/AutomaticCheckout';
+import { TableInput } from 'components/App/modals/generalOnboarding/TableInput';
+import { IndoorInput } from 'components/App/modals/generalOnboarding/IndoorInput';
+import { AverageCheckinTime } from 'components/App/modals/generalOnboarding/AverageCheckinTime';
import {
RESTAURANT_TYPE,
NURSING_HOME_TYPE,
@@ -23,6 +25,7 @@ import {
PHONE_INPUT_STEP,
TABLE_INPUT_STEP,
AUTOMATIC_CHECKOUT_STEP,
+ AVERAGE_CHECKIN_TIME_STEP,
COMPLETE_STEP,
QR_CODES_STEP,
PATIENT_STEP,
@@ -31,6 +34,7 @@ import {
getRestaurantGroupPayload,
getBaseGroupPayload,
IS_INDOOR_STEP,
+ GOOGLE_PLACES_OPT_IN_STEP,
} from './CreateGroupModal.helper';
import { SelectGroupType } from './steps/SelectGroupType';
@@ -41,7 +45,7 @@ import { PatientInput } from './steps/PatientInput';
import { AreaSelection } from './steps/AreaSelection';
import { Complete } from './steps/Complete';
import { QRDownload } from './steps/QRDownload';
-import { IndoorInput } from '../generalOnboarding/IndoorInput';
+import { GooglePlacesInput } from './steps/GooglePlacesInput';
export const CreateGroupModal = () => {
const intl = useIntl();
@@ -51,8 +55,10 @@ export const CreateGroupModal = () => {
const [currentStep, setCurrentStep] = useState(0);
const [groupType, setGroupType] = useState(null);
const [groupName, setGroupName] = useState(null);
+ const [googlePlaces, setGooglePlaces] = useState(true);
const [address, setAddress] = useState(null);
const [phone, setPhone] = useState(null);
+ const [averageCheckinTime, setAverageCheckinTime] = useState(null);
const [isIndoor, setIsIndoor] = useState(true);
const [tableCount, setTableCount] = useState(null);
const [patientRequired, setPatientRequired] = useState(null);
@@ -100,7 +106,8 @@ export const CreateGroupModal = () => {
radius,
areas,
groupType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
);
createGroupRequest(createBaseGroupPayload)
@@ -121,7 +128,8 @@ export const CreateGroupModal = () => {
radius,
patientRequired,
groupType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
);
createGroupRequest(createNursingHomeGroupPayload)
@@ -141,8 +149,10 @@ export const CreateGroupModal = () => {
radius,
tableCount,
groupType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
);
+
createGroupRequest(createRestaurantGroupPayload)
.then(response => {
handleResponse(response);
@@ -271,6 +281,16 @@ export const CreateGroupModal = () => {
/>
),
},
+ {
+ id: GOOGLE_PLACES_OPT_IN_STEP,
+ content: (
+ <GooglePlacesInput
+ setEnabled={setGooglePlaces}
+ next={nextStep}
+ back={previousStep}
+ />
+ ),
+ },
{
id: ADDRESS_INPUT_STEP,
content: (
@@ -278,6 +298,7 @@ export const CreateGroupModal = () => {
groupType={groupType}
address={address}
setAddress={setAddress}
+ googleEnabled={googlePlaces}
next={nextStep}
back={previousStep}
/>
@@ -294,6 +315,17 @@ export const CreateGroupModal = () => {
/>
),
},
+ {
+ id: AVERAGE_CHECKIN_TIME_STEP,
+ content: (
+ <AverageCheckinTime
+ averageCheckinTime={averageCheckinTime}
+ setAverageCheckinTime={setAverageCheckinTime}
+ next={nextStep}
+ back={previousStep}
+ />
+ ),
+ },
];
const getSteps = () => {
diff --git a/services/locations/src/components/App/modals/CreateGroupModal/steps/AddressInput/AddressInput.react.js b/services/locations/src/components/App/modals/CreateGroupModal/steps/AddressInput/AddressInput.react.js
index 4ce0ea0..f81812f 100644
--- a/services/locations/src/components/App/modals/CreateGroupModal/steps/AddressInput/AddressInput.react.js
+++ b/services/locations/src/components/App/modals/CreateGroupModal/steps/AddressInput/AddressInput.react.js
@@ -1,23 +1,21 @@
-import React, { useState, useRef } from 'react';
+import React, { useRef, useState } from 'react';
import { useIntl } from 'react-intl';
import { Form } from 'antd';
import {
PrimaryButton,
SecondaryButton,
} from 'components/general/Buttons.styled';
-import { LoadScript } from '@react-google-maps/api';
-
-import { GOOGLE_LIBRARIES, GOOGLE_MAPS_API_KEY } from 'constants/googleApi';
-import { LocationSearch } from './LocationSearch';
-import { FormFields } from './FormFields';
-import { ManualAddressText } from '../../../generalOnboarding/ManualAddressText';
+import { ManualAddressText } from 'components/App/modals/generalOnboarding/ManualAddressText';
+import { GooglePlacesWrapper } from 'components/App/modals/generalOnboarding/GooglePlacesWrapper';
import {
+ ButtonWrapper,
+ Description,
+ Header,
ManualInputButton,
Wrapper,
- Header,
- Description,
- ButtonWrapper,
-} from '../../../generalOnboarding/Onboarding.styled';
+} from 'components/App/modals/generalOnboarding/Onboarding.styled';
+import { LocationSearch } from './LocationSearch';
+import { FormFields } from './FormFields';
export const AddressInput = ({
address: currentAddress,
@@ -25,14 +23,15 @@ export const AddressInput = ({
groupType,
back,
next,
+ googleEnabled,
}) => {
const intl = useIntl();
const formReference = useRef(null);
- const [showManualInput, setShowManualInput] = useState(false);
+ const [showManualInput, setShowManualInput] = useState(!googleEnabled);
const [temporaryAddress, setTemporaryAddress] = useState(currentAddress);
const [isError, setIsError] = useState(false);
const [filled, setFilled] = useState(!!temporaryAddress);
- const [disabled, setDisabled] = useState(true);
+ const [disabled, setDisabled] = useState(googleEnabled);
const onFinish = values => {
setTemporaryAddress(values);
@@ -59,32 +58,35 @@ export const AddressInput = ({
id: 'modal.addressInput.help.description',
})}
</Description>
- <LoadScript
- googleMapsApiKey={GOOGLE_MAPS_API_KEY}
- libraries={GOOGLE_LIBRARIES}
- >
+ <GooglePlacesWrapper enabled={googleEnabled}>
<Form
ref={formReference}
onFinish={onFinish}
initialValues={temporaryAddress}
>
- <LocationSearch
- formReference={formReference}
- setFilled={setFilled}
- setDisabled={setDisabled}
- isError={isError}
- setIsError={setIsError}
- />
- <ManualInputButton
- data-cy="manuellSearch"
- onClick={() => {
- setDisabled(false);
- setShowManualInput(true);
- }}
- >
- {intl.formatMessage({ id: 'addressInput.manualInputTitle' })}
- </ManualInputButton>
- {showManualInput && <ManualAddressText />}
+ {googleEnabled ? (
+ <>
+ <LocationSearch
+ formReference={formReference}
+ setFilled={setFilled}
+ setDisabled={setDisabled}
+ isError={isError}
+ setIsError={setIsError}
+ />
+ <ManualInputButton
+ data-cy="manuellSearch"
+ onClick={() => {
+ setDisabled(false);
+ setShowManualInput(true);
+ }}
+ >
+ {intl.formatMessage({ id: 'addressInput.manualInputTitle' })}
+ </ManualInputButton>
+ </>
+ ) : (
+ <ManualAddressText />
+ )}
+
<FormFields show={filled || showManualInput} disabled={disabled} />
<ButtonWrapper multipleButtons>
<SecondaryButton onClick={back}>
@@ -103,7 +105,7 @@ export const AddressInput = ({
</PrimaryButton>
</ButtonWrapper>
</Form>
- </LoadScript>
+ </GooglePlacesWrapper>
</Wrapper>
);
};
diff --git a/services/locations/src/components/App/modals/CreateGroupModal/steps/Complete/Complete.react.js b/services/locations/src/components/App/modals/CreateGroupModal/steps/Complete/Complete.react.js
index 0728af5..28e0d78 100644
--- a/services/locations/src/components/App/modals/CreateGroupModal/steps/Complete/Complete.react.js
+++ b/services/locations/src/components/App/modals/CreateGroupModal/steps/Complete/Complete.react.js
@@ -5,7 +5,7 @@ import {
SecondaryButton,
} from 'components/general/Buttons.styled';
-import { Success } from '../../../generalOnboarding/Success';
+import { Success } from 'components/general';
import {
Wrapper,
Header,
@@ -54,7 +54,7 @@ export const Complete = ({ back, next, group, createGroup, done }) => {
<ButtonWrapper multipleButtons style={{ justifyContent: 'flex-end' }}>
<PrimaryButton
data-cy="no"
- isButtonWhite
+ $isButtonWhite
style={{ marginRight: 24 }}
onClick={done}
>
diff --git a/services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/GooglePlacesInput.react.js b/services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/GooglePlacesInput.react.js
new file mode 100644
index 0000000..1525a35
--- /dev/null
+++ b/services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/GooglePlacesInput.react.js
@@ -0,0 +1,61 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { PrimaryButton, SecondaryButton } from 'components/general';
+import {
+ ButtonWrapper,
+ Description,
+ Header,
+ Wrapper,
+} from 'components/App/modals/generalOnboarding/Onboarding.styled';
+
+export const GooglePlacesInput = ({ setEnabled, back, next }) => {
+ const intl = useIntl();
+
+ return (
+ <Wrapper>
+ <Header>
+ {intl.formatMessage({
+ id: 'modal.createGroup.googlePlacesInput.title',
+ })}
+ </Header>
+ <Description>
+ {intl.formatMessage({
+ id: 'modal.createGroup.googlePlacesInput.description',
+ })}
+ </Description>
+ <ButtonWrapper multipleButtons>
+ <SecondaryButton onClick={back}>
+ {intl.formatMessage({
+ id: 'authentication.form.button.back',
+ })}
+ </SecondaryButton>
+ <div>
+ <PrimaryButton
+ data-cy="no"
+ style={{ marginRight: 24 }}
+ onClick={() => {
+ setEnabled(false);
+ next();
+ }}
+ isButtonWhite
+ >
+ {intl.formatMessage({
+ id: 'no',
+ })}
+ </PrimaryButton>
+ <PrimaryButton
+ data-cy="yes"
+ onClick={() => {
+ setEnabled(true);
+ next();
+ }}
+ >
+ {intl.formatMessage({
+ id: 'yes',
+ })}
+ </PrimaryButton>
+ </div>
+ </ButtonWrapper>
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/index.js b/services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/index.js
new file mode 100644
index 0000000..4135cdd
--- /dev/null
+++ b/services/locations/src/components/App/modals/CreateGroupModal/steps/GooglePlacesInput/index.js
@@ -0,0 +1 @@
+export { GooglePlacesInput } from './GooglePlacesInput.react';
diff --git a/services/locations/src/components/App/modals/CreateGroupModal/steps/PatientInput/PatientInput.react.js b/services/locations/src/components/App/modals/CreateGroupModal/steps/PatientInput/PatientInput.react.js
index f570753..a15ba1e 100644
--- a/services/locations/src/components/App/modals/CreateGroupModal/steps/PatientInput/PatientInput.react.js
+++ b/services/locations/src/components/App/modals/CreateGroupModal/steps/PatientInput/PatientInput.react.js
@@ -41,7 +41,7 @@ export const PatientInput = ({ setPatientRequired, next, back }) => {
<div>
<PrimaryButton
style={{ marginRight: 24 }}
- isButtonWhite
+ $isButtonWhite
onClick={next}
>
{intl.formatMessage({
diff --git a/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.helper.js b/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.helper.js
index 3e47078..fefb88d 100644
--- a/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.helper.js
+++ b/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.helper.js
@@ -1,3 +1,5 @@
+import { getMinutesFromTimeString } from 'utils/time';
+
export const RESTAURANT_TYPE = 'restaurant';
export const ROOM_TYPE = 'room';
export const BUILDING_TYPE = 'building';
@@ -9,6 +11,7 @@ export const ADDRESS_INPUT_STEP = 'ADDRESS_INPUT_STEP';
export const PHONE_INPUT_STEP = 'PHONE_INPUT_STEP';
export const TABLE_INPUT_STEP = 'TABLE_INPUT_STEP';
export const AUTOMATIC_CHECKOUT_STEP = 'AUTOMATIC_CHECKOUT_STEP';
+export const AVERAGE_CHECKIN_TIME_STEP = 'AVERAGE_CHECKIN_TIME_STEP';
export const COMPLETE_STEP = 'COMPLETE_STEP';
export const QR_CODES_STEP = 'QR_CODES_STEP';
export const IS_INDOOR_STEP = 'IS_INDOOR_STEP';
@@ -24,7 +27,8 @@ export const getRestaurantLocationPayload = (
radius,
tableCount,
locationType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
) => {
const isSameAddress = address === BASE_ADDRESS_INDICATOR;
@@ -43,6 +47,7 @@ export const getRestaurantLocationPayload = (
tableCount: tableCount ? parseInt(tableCount, 10) : null,
type: locationType,
isIndoor,
+ averageCheckinTime: getMinutesFromTimeString(averageCheckinTime),
};
};
@@ -54,7 +59,8 @@ export const getBaseLocationPayload = (
baseLocation,
radius,
locationType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
) => {
const isSameAddress = address === BASE_ADDRESS_INDICATOR;
@@ -73,5 +79,6 @@ export const getBaseLocationPayload = (
tableCount: null,
type: locationType,
isIndoor,
+ averageCheckinTime: getMinutesFromTimeString(averageCheckinTime),
};
};
diff --git a/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.react.js b/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.react.js
index 4225f14..ccba233 100644
--- a/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.react.js
+++ b/services/locations/src/components/App/modals/CreateLocationModal/CreateLocationModal.react.js
@@ -11,8 +11,9 @@ import { getBaseLocationFromGroup } from 'utils/group';
import { createLocation as createLocationRequest, getGroup } from 'network/api';
-import { AutomaticCheckout } from '../generalOnboarding/AutomaticCheckout';
-import { TableInput } from '../generalOnboarding/TableInput';
+import { AutomaticCheckout } from 'components/App/modals/generalOnboarding/AutomaticCheckout';
+import { TableInput } from 'components/App/modals/generalOnboarding/TableInput';
+import { AverageCheckinTime } from 'components/App/modals/generalOnboarding/AverageCheckinTime';
import {
ADDRESS_INPUT_STEP,
AUTOMATIC_CHECKOUT_STEP,
@@ -23,6 +24,7 @@ import {
getBaseLocationPayload,
getRestaurantLocationPayload,
IS_INDOOR_STEP,
+ AVERAGE_CHECKIN_TIME_STEP,
NAME_INPUT_STEP,
PHONE_INPUT_STEP,
QR_CODES_STEP,
@@ -51,6 +53,7 @@ export const CreateLocationModal = ({ groupId }) => {
const [address, setAddress] = useState(null);
const [phone, setPhone] = useState(null);
const [isIndoor, setIsIndoor] = useState(true);
+ const [averageCheckinTime, setAverageCheckinTime] = useState(null);
const [tableCount, setTableCount] = useState(null);
const [radius, setRadius] = useState(null);
const [location, setLocation] = useState(null);
@@ -101,7 +104,8 @@ export const CreateLocationModal = ({ groupId }) => {
baseLocation,
radius,
locationType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
);
createLocationRequest(createBaseLocationPayload)
.then(response => {
@@ -122,7 +126,8 @@ export const CreateLocationModal = ({ groupId }) => {
radius,
tableCount,
locationType,
- isIndoor
+ isIndoor,
+ averageCheckinTime
);
createLocationRequest(createRestaurantLocationPayload)
@@ -243,6 +248,17 @@ export const CreateLocationModal = ({ groupId }) => {
/>
),
},
+ {
+ id: AVERAGE_CHECKIN_TIME_STEP,
+ content: (
+ <AverageCheckinTime
+ averageCheckinTime={averageCheckinTime}
+ setAverageCheckinTime={setAverageCheckinTime}
+ next={nextStep}
+ back={previousStep}
+ />
+ ),
+ },
{
id: IS_INDOOR_STEP,
content: (
diff --git a/services/locations/src/components/App/modals/CreateLocationModal/steps/AddressInput/AddressInput.react.js b/services/locations/src/components/App/modals/CreateLocationModal/steps/AddressInput/AddressInput.react.js
index 338d2cd..c3f7f2e 100644
--- a/services/locations/src/components/App/modals/CreateLocationModal/steps/AddressInput/AddressInput.react.js
+++ b/services/locations/src/components/App/modals/CreateLocationModal/steps/AddressInput/AddressInput.react.js
@@ -84,7 +84,7 @@ export const AddressInput = ({
<div>
<PrimaryButton
data-cy="no"
- isButtonWhite
+ $isButtonWhite
style={{ marginRight: 24 }}
onClick={() => setIsNewAddress(true)}
>
diff --git a/services/locations/src/components/App/modals/CreateLocationModal/steps/Complete/Complete.react.js b/services/locations/src/components/App/modals/CreateLocationModal/steps/Complete/Complete.react.js
index 3a0e438..bf2804e 100644
--- a/services/locations/src/components/App/modals/CreateLocationModal/steps/Complete/Complete.react.js
+++ b/services/locations/src/components/App/modals/CreateLocationModal/steps/Complete/Complete.react.js
@@ -5,7 +5,7 @@ import {
SecondaryButton,
} from 'components/general/Buttons.styled';
-import { Success } from '../../../generalOnboarding/Success';
+import { Success } from 'components/general';
import {
Wrapper,
Header,
@@ -55,7 +55,7 @@ export const Complete = ({ back, next, location, createLocation, done }) => {
<PrimaryButton
style={{ marginRight: 24 }}
onClick={done}
- isButtonWhite
+ $isButtonWhite
data-cy="no"
>
{intl.formatMessage({
diff --git a/services/locations/src/components/App/modals/GuestListModal/GuestListModal.react.js b/services/locations/src/components/App/modals/GuestListModal/GuestListModal.react.js
index fa7c4cc..1c5110a 100644
--- a/services/locations/src/components/App/modals/GuestListModal/GuestListModal.react.js
+++ b/services/locations/src/components/App/modals/GuestListModal/GuestListModal.react.js
@@ -122,7 +122,7 @@ export const GuestListModal = ({ location }) => {
title: intl.formatMessage({ id: 'modal.guestList.guest' }),
key: 'guest',
render: function renderCheckin(trace) {
- return <>{base64ToHex(trace.traceId)}</>;
+ return <>{base64ToHex(trace.traceId).slice(0, 7)}</>;
},
},
{
diff --git a/services/locations/src/components/App/modals/RegisterOperatorModal/steps/VerifyPrivateKey/VerifyPrivateKey.helper.js b/services/locations/src/components/App/modals/RegisterOperatorModal/steps/VerifyPrivateKey/VerifyPrivateKey.helper.js
index 1c930c1..9f824df 100644
--- a/services/locations/src/components/App/modals/RegisterOperatorModal/steps/VerifyPrivateKey/VerifyPrivateKey.helper.js
+++ b/services/locations/src/components/App/modals/RegisterOperatorModal/steps/VerifyPrivateKey/VerifyPrivateKey.helper.js
@@ -1,6 +1,7 @@
export const uploadMessages = {
initial: 'shareData.privateKey.uploadMessage',
inProgress: 'shareData.privateKey.uploadAction',
+ size: 'shareData.privateKey.keySize',
error: 'shareData.privateKey.errorMessage',
done: 'shareData.privateKey.done',
};
diff --git a/services/locations/src/components/App/modals/WhatsNewModal/WhatsNewModal.react.js b/services/locations/src/components/App/modals/WhatsNewModal/WhatsNewModal.react.js
index 9f17dd3..82566ae 100644
--- a/services/locations/src/components/App/modals/WhatsNewModal/WhatsNewModal.react.js
+++ b/services/locations/src/components/App/modals/WhatsNewModal/WhatsNewModal.react.js
@@ -18,7 +18,7 @@ export const WhatsNewModal = ({ headline, content, onAccept }) => {
<Headline>{headline}</Headline>
<Content>{content}</Content>
<PrimaryButton
- isButtonWhite
+ $isButtonWhite
style={{ float: 'right' }}
onClick={onAccept}
>
diff --git a/services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/AverageCheckinTime.react.js b/services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/AverageCheckinTime.react.js
new file mode 100644
index 0000000..39f0b12
--- /dev/null
+++ b/services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/AverageCheckinTime.react.js
@@ -0,0 +1,85 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { Form, TimePicker } from 'antd';
+
+import {
+ PrimaryButton,
+ SecondaryButton,
+} from 'components/general/Buttons.styled';
+
+import {
+ Wrapper,
+ Header,
+ ButtonWrapper,
+ Description,
+} from '../Onboarding.styled';
+
+export const AverageCheckinTime = ({
+ averageCheckinTime: currentAverageCheckinTime,
+ setAverageCheckinTime,
+ back,
+ next,
+}) => {
+ const intl = useIntl();
+
+ const onFinish = ({ averageCheckinTime }) => {
+ setAverageCheckinTime(averageCheckinTime);
+ next();
+ };
+
+ return (
+ <Wrapper>
+ <Header>
+ {intl.formatMessage({
+ id: 'modal.createGroup.averageCheckinTime.title',
+ })}
+ </Header>
+ <Description>
+ {intl.formatMessage(
+ {
+ id: 'modal.createGroup.averageCheckinTime.description',
+ },
+ { br: <br /> }
+ )}
+ </Description>
+
+ <Form
+ onFinish={onFinish}
+ initialValues={{
+ averageCheckinTime: currentAverageCheckinTime || null,
+ }}
+ style={{ marginTop: 40 }}
+ >
+ <Form.Item
+ colon={false}
+ label={intl.formatMessage({
+ id: 'createGroup.averageCheckinTime',
+ })}
+ name="averageCheckinTime"
+ >
+ <TimePicker
+ style={{ width: 200 }}
+ showNow={false}
+ format="HH:mm"
+ minuteStep={15}
+ placeholder={intl.formatMessage({
+ id: 'settings.location.checkout.average.placeholder',
+ })}
+ />
+ </Form.Item>
+ <ButtonWrapper multipleButtons>
+ <SecondaryButton onClick={back}>
+ {intl.formatMessage({
+ id: 'authentication.form.button.back',
+ })}
+ </SecondaryButton>
+ <PrimaryButton data-cy="nextStep" htmlType="submit">
+ {intl.formatMessage({
+ id: 'authentication.form.button.next',
+ })}
+ </PrimaryButton>
+ </ButtonWrapper>
+ </Form>
+ </Wrapper>
+ );
+};
diff --git a/services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/index.js b/services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/index.js
new file mode 100644
index 0000000..956bf08
--- /dev/null
+++ b/services/locations/src/components/App/modals/generalOnboarding/AverageCheckinTime/index.js
@@ -0,0 +1 @@
+export { AverageCheckinTime } from './AverageCheckinTime.react';
diff --git a/services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/GooglePlacesWrapper.react.js b/services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/GooglePlacesWrapper.react.js
new file mode 100644
index 0000000..7c7c903
--- /dev/null
+++ b/services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/GooglePlacesWrapper.react.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { LoadScript } from '@react-google-maps/api';
+import { GOOGLE_LIBRARIES, GOOGLE_MAPS_API_KEY } from 'constants/googleApi';
+
+export const GooglePlacesWrapper = ({ enabled, children }) =>
+ enabled ? (
+ <LoadScript
+ googleMapsApiKey={GOOGLE_MAPS_API_KEY}
+ libraries={GOOGLE_LIBRARIES}
+ >
+ {children}
+ </LoadScript>
+ ) : (
+ children
+ );
diff --git a/services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/index.js b/services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/index.js
new file mode 100644
index 0000000..81851e6
--- /dev/null
+++ b/services/locations/src/components/App/modals/generalOnboarding/GooglePlacesWrapper/index.js
@@ -0,0 +1 @@
+export { GooglePlacesWrapper } from './GooglePlacesWrapper.react';
diff --git a/services/locations/src/components/App/modals/generalOnboarding/YesNoSelection/YesNoSelection.react.js b/services/locations/src/components/App/modals/generalOnboarding/YesNoSelection/YesNoSelection.react.js
index ab7c7b0..dedcb87 100644
--- a/services/locations/src/components/App/modals/generalOnboarding/YesNoSelection/YesNoSelection.react.js
+++ b/services/locations/src/components/App/modals/generalOnboarding/YesNoSelection/YesNoSelection.react.js
@@ -20,7 +20,7 @@ export const YesNoSelection = ({ onYes, onNo, onBack }) => {
<div>
<PrimaryButton
data-cy="no"
- isButtonWhite
+ $isButtonWhite
style={{ marginRight: 24 }}
onClick={onNo}
>
diff --git a/services/locations/src/components/Authentication/steps/ConfirmRegistrationStep/ConfirmRegistrationStep.react.js b/services/locations/src/components/Authentication/steps/ConfirmRegistrationStep/ConfirmRegistrationStep.react.js
index 6ffba2b..9820594 100644
--- a/services/locations/src/components/Authentication/steps/ConfirmRegistrationStep/ConfirmRegistrationStep.react.js
+++ b/services/locations/src/components/Authentication/steps/ConfirmRegistrationStep/ConfirmRegistrationStep.react.js
@@ -78,7 +78,7 @@ export const ConfirmRegistrationStep = ({
id: 'authentication.form.button.back',
})}
</SecondaryButton>
- <PrimaryButton isButtonWhite htmlType="submit">
+ <PrimaryButton $isButtonWhite htmlType="submit">
{intl.formatMessage({
id: 'authentication.form.button.next',
})}
diff --git a/services/locations/src/components/Authentication/steps/EmailStep/EmailStep.react.js b/services/locations/src/components/Authentication/steps/EmailStep/EmailStep.react.js
index 9a12a0c..12db523 100644
--- a/services/locations/src/components/Authentication/steps/EmailStep/EmailStep.react.js
+++ b/services/locations/src/components/Authentication/steps/EmailStep/EmailStep.react.js
@@ -91,7 +91,7 @@ export const EmailStep = ({
</Form.Item>
<ButtonWrapper>
- <PrimaryButton isButtonWhite htmlType="submit">
+ <PrimaryButton $isButtonWhite htmlType="submit">
{intl.formatMessage({
id: 'authentication.form.button.next',
})}
diff --git a/services/locations/src/components/Authentication/steps/FinishRegisterStep/FinishRegisterStep.react.js b/services/locations/src/components/Authentication/steps/FinishRegisterStep/FinishRegisterStep.react.js
index 5474dff..da26a60 100644
--- a/services/locations/src/components/Authentication/steps/FinishRegisterStep/FinishRegisterStep.react.js
+++ b/services/locations/src/components/Authentication/steps/FinishRegisterStep/FinishRegisterStep.react.js
@@ -27,7 +27,7 @@ export const FinishRegisterStep = ({ next, navigation }) => {
</CardSubTitle>
<ButtonWrapper>
- <PrimaryButton isButtonWhite onClick={next}>
+ <PrimaryButton $isButtonWhite onClick={next}>
{intl.formatMessage({
id: 'authentication.button.ok',
})}
diff --git a/services/locations/src/components/Authentication/steps/LegalTermsStep/LegalTermsStep.react.js b/services/locations/src/components/Authentication/steps/LegalTermsStep/LegalTermsStep.react.js
index deb88cf..bd7b988 100644
--- a/services/locations/src/components/Authentication/steps/LegalTermsStep/LegalTermsStep.react.js
+++ b/services/locations/src/components/Authentication/steps/LegalTermsStep/LegalTermsStep.react.js
@@ -116,7 +116,7 @@ export const LegalTermsStep = ({ next, back, navigation }) => {
id: 'authentication.form.button.back',
})}
</SecondaryButton>
- <PrimaryButton isButtonWhite htmlType="submit">
+ <PrimaryButton $isButtonWhite htmlType="submit">
{intl.formatMessage({
id: 'authentication.form.button.next',
})}
diff --git a/services/locations/src/components/Authentication/steps/NameInputStep/NameInputStep.react.js b/services/locations/src/components/Authentication/steps/NameInputStep/NameInputStep.react.js
index 33f714f..a72d404 100644
--- a/services/locations/src/components/Authentication/steps/NameInputStep/NameInputStep.react.js
+++ b/services/locations/src/components/Authentication/steps/NameInputStep/NameInputStep.react.js
@@ -72,7 +72,7 @@ export const NameInputStep = ({ name, setName, next, back, navigation }) => {
id: 'authentication.form.button.back',
})}
</SecondaryButton>
- <PrimaryButton isButtonWhite htmlType="submit">
+ <PrimaryButton $isButtonWhite htmlType="submit">
{intl.formatMessage({
id: 'authentication.form.button.next',
})}
diff --git a/services/locations/src/components/Authentication/steps/PasswordStep/PasswordStep.react.js b/services/locations/src/components/Authentication/steps/PasswordStep/PasswordStep.react.js
index 2a5d1e4..d0d4f63 100644
--- a/services/locations/src/components/Authentication/steps/PasswordStep/PasswordStep.react.js
+++ b/services/locations/src/components/Authentication/steps/PasswordStep/PasswordStep.react.js
@@ -140,7 +140,7 @@ export const PasswordStep = ({ email, back }) => {
id: 'authentication.form.button.back',
})}
</SecondaryButton>
- <PrimaryButton isButtonWhite htmlType="submit">
+ <PrimaryButton $isButtonWhite htmlType="submit">
{intl.formatMessage({
id: 'authentication.form.button.login',
})}
diff --git a/services/locations/src/components/Authentication/steps/SetPasswordStep/SetPasswordStep.react.js b/services/locations/src/components/Authentication/steps/SetPasswordStep/SetPasswordStep.react.js
index e171ba0..a5d187c 100644
--- a/services/locations/src/components/Authentication/steps/SetPasswordStep/SetPasswordStep.react.js
+++ b/services/locations/src/components/Authentication/steps/SetPasswordStep/SetPasswordStep.react.js
@@ -166,7 +166,7 @@ export const SetPasswordStep = ({
id: 'authentication.form.button.back',
})}
</SecondaryButton>
- <PrimaryButton isButtonWhite htmlType="submit">
+ <PrimaryButton $isButtonWhite htmlType="submit">
{intl.formatMessage({
id: 'authentication.form.button.next',
})}
diff --git a/services/locations/src/components/ForgotPassword/ForgotPassword.react.js b/services/locations/src/components/ForgotPassword/ForgotPassword.react.js
index 895d062..c7bb0bf 100644
--- a/services/locations/src/components/ForgotPassword/ForgotPassword.react.js
+++ b/services/locations/src/components/ForgotPassword/ForgotPassword.react.js
@@ -119,7 +119,7 @@ export const ForgotPassword = ({ location }) => {
<ButtonWrapper>
<PrimaryButton
htmlType="submit"
- isButtonWhite
+ $isButtonWhite
data-cy="sentResetLinkSubmit"
>
{intl.formatMessage({
diff --git a/services/locations/src/components/ResetPassword/ResetPassword.react.js b/services/locations/src/components/ResetPassword/ResetPassword.react.js
index d004550..dc94dd8 100644
--- a/services/locations/src/components/ResetPassword/ResetPassword.react.js
+++ b/services/locations/src/components/ResetPassword/ResetPassword.react.js
@@ -178,7 +178,7 @@ export const ResetPassword = () => {
<Input.Password style={inputStyle} />
</Form.Item>
<ButtonWrapper>
- <PrimaryButton isButtonWhite htmlType="submit">
+ <PrimaryButton $isButtonWhite htmlType="submit">
{intl.formatMessage({
id: 'resetPassword.form.button',
})}
diff --git a/services/locations/src/components/ShareData/ShareDataStep/DataRequests/DataRequests.react.js b/services/locations/src/components/ShareData/ShareDataStep/DataRequests/DataRequests.react.js
index 2827386..6f05d2e 100644
--- a/services/locations/src/components/ShareData/ShareDataStep/DataRequests/DataRequests.react.js
+++ b/services/locations/src/components/ShareData/ShareDataStep/DataRequests/DataRequests.react.js
@@ -17,7 +17,7 @@ const REQUEST_TIME_WARINING = 72;
export const DataRequests = ({ transfers }) => {
const intl = useIntl();
- const timestampFormat = 'DD.MM.YYYY hh:mm';
+ const timestampFormat = 'DD.MM.YYYY HH:mm';
const formatTimeStamp = timestamp =>
`${moment.unix(timestamp).format(timestampFormat)} ${intl.formatMessage({
diff --git a/services/locations/src/components/general/Buttons.styled.js b/services/locations/src/components/general/Buttons.styled.js
index d55a2cc..1bc901f 100644
--- a/services/locations/src/components/general/Buttons.styled.js
+++ b/services/locations/src/components/general/Buttons.styled.js
@@ -18,10 +18,10 @@ const ButtonGeneral = {
export const PrimaryButton = styled(Button)`
${{ ...ButtonGeneral }}
- background: ${({ isButtonWhite }) =>
- isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
+ background: ${({ $isButtonWhite }) =>
+ $isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
border: 2px solid
- ${({ isButtonWhite }) => (isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
+ ${({ $isButtonWhite }) => ($isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
border-radius: 24px;
color: rgba(0, 0, 0, 0.87);
cursor: pointer;
diff --git a/services/locations/src/components/App/modals/generalOnboarding/Success/Success.react.js b/services/locations/src/components/general/Success/Success.react.js
similarity index 100%
rename from services/locations/src/components/App/modals/generalOnboarding/Success/Success.react.js
rename to services/locations/src/components/general/Success/Success.react.js
diff --git a/services/locations/src/components/App/modals/generalOnboarding/Success/Success.styled.js b/services/locations/src/components/general/Success/Success.styled.js
similarity index 100%
rename from services/locations/src/components/App/modals/generalOnboarding/Success/Success.styled.js
rename to services/locations/src/components/general/Success/Success.styled.js
diff --git a/services/locations/src/components/App/modals/generalOnboarding/Success/index.js b/services/locations/src/components/general/Success/index.js
similarity index 100%
rename from services/locations/src/components/App/modals/generalOnboarding/Success/index.js
rename to services/locations/src/components/general/Success/index.js
diff --git a/services/locations/src/components/general/index.js b/services/locations/src/components/general/index.js
index d29ee9e..267fc71 100644
--- a/services/locations/src/components/general/index.js
+++ b/services/locations/src/components/general/index.js
@@ -1,7 +1,18 @@
-export {
+import {
PrimaryButton,
SecondaryButton,
WarningButton,
DangerButton,
SuccessButton,
} from './Buttons.styled';
+
+import { Success } from './Success';
+
+export {
+ PrimaryButton,
+ SecondaryButton,
+ WarningButton,
+ DangerButton,
+ SuccessButton,
+ Success,
+};
diff --git a/services/locations/src/components/hooks/useValidators.js b/services/locations/src/components/hooks/useValidators.js
index 5badfff..945ed8a 100644
--- a/services/locations/src/components/hooks/useValidators.js
+++ b/services/locations/src/components/hooks/useValidators.js
@@ -15,6 +15,7 @@ import {
getPhoneRule,
getEmailRule,
getSafeStringRule,
+ getTextSafeStringRule,
getMaxLengthRule,
getTableNoRule,
getCheckoutRadiusRule,
@@ -117,3 +118,20 @@ export const useCheckoutRadiusValidator = () => {
const intl = useIntl();
return useMemo(() => [getCheckoutRadiusRule(intl)], [intl]);
};
+
+export const useOptionalPhoneValidator = () => {
+ const intl = useIntl();
+ return useMemo(() => [getPhoneRule(intl)], [intl]);
+};
+
+export const useTextAreaValidator = (fieldName, maxValue) => {
+ const intl = useIntl();
+ return useMemo(
+ () => [
+ getRequiredRule(intl, fieldName),
+ getTextSafeStringRule(intl, fieldName),
+ getMaxLengthRule(intl, maxValue),
+ ],
+ [intl, fieldName, maxValue]
+ );
+};
diff --git a/services/locations/src/constants/checkout.js b/services/locations/src/constants/checkout.js
index 51be8d5..ad5b9f4 100644
--- a/services/locations/src/constants/checkout.js
+++ b/services/locations/src/constants/checkout.js
@@ -1,2 +1,5 @@
export const DEFAULT_CHECKOUT_RADIUS = 50;
export const MAX_CHECKOUT_RADIUS = 5000;
+export const DEFAULT_AVERAGE_CHECKIN_TIME = 90;
+export const MAX_AVERAGE_CHECKIN_TIME = 1440;
+export const MIN_AVERAGE_CHECKIN_TIME = 15;
diff --git a/services/locations/src/constants/links.js b/services/locations/src/constants/links.js
index 2f6ceb0..732dd8c 100644
--- a/services/locations/src/constants/links.js
+++ b/services/locations/src/constants/links.js
@@ -2,6 +2,9 @@ export const TERMS_CONDITIONS_LINK =
'https://www.luca-app.de/operator-terms-and-conditions/';
export const FAQ_LINK = 'https://www.luca-app.de/faq/';
+export const VIDEOS_LINK = 'https://youtu.be/aYj9hyldumM';
+export const TOOLKIT_LINK = 'https://www.luca-app.de/download/';
+
export const QR_PRINT_LINK = 'https://www.qr-print.de/luca';
export const GITLAB_LINK =
'https://gitlab.com/lucaapp/web/-/tree/master/services/locations';
diff --git a/services/locations/src/constants/routes.js b/services/locations/src/constants/routes.js
index 4d3b885..d3e0a38 100644
--- a/services/locations/src/constants/routes.js
+++ b/services/locations/src/constants/routes.js
@@ -21,6 +21,7 @@ export const BASE_SHARE_DATA_ROUTE = `/shareData/`;
export const SHARE_ALL_DATA_ROUTE = `${BASE_SHARE_DATA_ROUTE}all`;
export const SHARE_DATA_ROUTE = `${BASE_SHARE_DATA_ROUTE}:transferId`;
export const PROFILE_ROUTE = `${APP_ROUTE}/profile`;
+export const HELP_CENTER_ROUTE = `${APP_ROUTE}/help`;
export const LOCATIONS_ROUTE = `${APP_ROUTE}/locations`;
export const BASE_DATA_TRANSFER_ROUTE = `${APP_ROUTE}/dataTransfers/`;
export const ACTIVATION_BASE = '/activation/';
diff --git a/services/locations/src/messages/de.json b/services/locations/src/messages/de.json
index 9be6913..327e979 100644
--- a/services/locations/src/messages/de.json
+++ b/services/locations/src/messages/de.json
@@ -2,7 +2,7 @@
"locations.site.title": "luca Locations",
"locations.site.meta": "luca Locations hilft dir dabei, die Kontaktinformationen deiner Gäste einfach zu erfassen und sie gleichzeitig sicher zu speichern.",
"shareData.site.title": "luca Datenfreigabe",
- "shareData.site.meta": "Bitte bestätige hier, dass das Gesundheitsamt Daten entschlüsseln darf, die deine Location betreffen.",
+ "shareData.site.meta": "Bitte bestätige hier, dass das Gesundheitsamt Daten entschlüsseln darf, die deinen Standort betreffen.",
"forgotPassword.site.title": "luca Passwort vergessen",
"forgotPassword.site.meta": "Hier kannst du das Passwort zu deinem luca Locations Account zurückzusetzen.",
"resetPassword.site.title": "luca Passwort zurücksetzen",
@@ -20,11 +20,11 @@
"registration.server.error.msg": "Verbindungsfehler",
"registration.server.error.desc": "Wir arbeiten an einer Lösung, bitte versuche es später erneut.",
"registration.acceptPrivacy": "Ich bin mit der <a>Datenschutzerklärung</a> einverstanden.",
- "registration.error.generic": "Die Location konnte nicht registriert werden. Ein unbekannter Fehler ist aufgetreten. Bitte versuche es später erneut.",
+ "registration.error.generic": "Der Standort konnte nicht registriert werden. Ein unbekannter Fehler ist aufgetreten. Bitte versuche es später erneut.",
"login.form.button": "Einloggen",
"login.registrationLink": "Ein neues Konto erstellen",
"login.forgotPasswordLink": "Passwort vergessen?",
- "login.error": "Das von dir eingegebene Passwort ist falsch.",
+ "login.error": "Das von dir eingegebene Passwort oder die E-Mail ist falsch.",
"createGroup.phone": "Telefonnummer",
"card.form.email": "E-Mail",
"card.form.streetName": "Straße",
@@ -35,7 +35,7 @@
"card.form.lat": "Latitude",
"card.form.lng": "Longitude",
"card.form.googlePlaceId": "PlaceId",
- "card.form.radius": "~Location Radius in m",
+ "card.form.radius": "~ Standort Radius in m",
"card.form.registerTables": "Anzahl der Tische",
"profile.email": "E-Mail",
"profile.changePassword": "Passwort ändern",
@@ -53,13 +53,13 @@
"profile.changeEmailProgress": "Deine E-Mail wird gerade aktualisiert. Bitte überprüfe dein E-Mail-Postfach, um die neue Adresse zu bestätigen.",
"location.edit": "Bearbeiten",
"location.edit.moreDataHeader": "Beim Check-in zusätzliche Informationen abfragen",
- "location.edit.moreDataHeader.tooltip": "Deine Gäste übermitteln beim Check-in standardmäßig ihre Kontaktdaten. Du kannst jedoch noch weitere Informationen abfragen, wenn das bei deiner Location notwendig sein sollte. Hier kannst du beliebig viele zusätzliche Informationsabfragen festlegen.",
+ "location.edit.moreDataHeader.tooltip": "Deine Gäste übermitteln beim Check-in standardmäßig ihre Kontaktdaten. Du kannst jedoch noch weitere Informationen abfragen, wenn das bei deinem Standort notwendig sein sollte. Hier kannst du beliebig viele zusätzliche Informationsabfragen festlegen.",
"location.edit.moreDataInfo": "Information",
"location.edit.moreDataDescription": "Beschreibung",
"location.edit.moreDataLabel": "Bezeichnung",
"location.edit.moreDataCount": "Anzahl",
"location.edit.isRequired": "Pflichtfeld",
- "location.delete": "Location löschen",
+ "location.delete": "Standort löschen",
"location.delete.confirmText": "Möchtest du diesen Bereich wirklich löschen?",
"location.delete.confirmButton": "Löschen",
"location.delete.declineButton": "Abbrechen",
@@ -71,13 +71,13 @@
"location.count.error": "Check-in-Daten konnten nicht geladen werden.",
"location.edit.address": "Adresse",
"location.edit.info": "Information",
- "location.edit.moreData.tooltip": "Deine Gäste übermitteln beim Check-in standardmäßig ihre verschlüsselten Kontaktdaten. Du kannst jedoch noch weitere Informationen abfragen, wenn das bei deiner Location notwendig sein sollte. Hier kannst du beliebig viele zusätzliche Informationsabfragen festlegen.",
- "location.edit.registerTables.tooltip": "Wenn in deiner Location ein Check-in nach Tischen notwendig ist, können sich Gäste mit der luca App direkt am Tisch selbst einchecken. Bitte gib hier die Anzahl deiner Tische an. Wenn diese Funktion aktiviert ist, bekommst du über das Check-in-Menü einen QR-Code pro Tisch. Gäste ohne App musst du weiterhin selbst einchecken, aber auch dann ist die Angabe einer Tischnummer möglich.",
+ "location.edit.moreData.tooltip": "Deine Gäste übermitteln beim Check-in standardmäßig ihre verschlüsselten Kontaktdaten. Du kannst jedoch noch weitere Informationen abfragen, wenn das bei deinem Standort notwendig sein sollte. Hier kannst du beliebig viele zusätzliche Informationsabfragen festlegen.",
+ "location.edit.registerTables.tooltip": "Wenn in deinem Standort ein Check-in nach Tischen notwendig ist, können sich Gäste mit der luca App direkt am Tisch selbst einchecken. Bitte gib hier die Anzahl deiner Tische an. Wenn diese Funktion aktiviert ist, bekommst du über das Check-in-Menü einen QR-Code pro Tisch. Gäste ohne App musst du weiterhin selbst einchecken, aber auch dann ist die Angabe einer Tischnummer möglich.",
"location.edit.enableGeoLocation": "Gäste automatisch auschecken (optional)",
- "location.edit.enableGeoLocation.tooltip": "Wenn du diese Funktion aktivierst, werden deine Gäste automatisch ausgecheckt, sobald sie deine Location verlassen. luca nutzt dafür Geofencing.",
+ "location.edit.enableGeoLocation.tooltip": "Wenn du diese Funktion aktivierst, werden deine Gäste automatisch ausgecheckt, sobald sie deinen Standort verlassen. luca nutzt dafür Geofencing.",
"location.edit.createQRCode": "QR-Codes erstellen",
"location.save": "Speichern",
- "location.firstEvent": "Schön, dass du hier bist. Erstelle <i>jetzt</i> deine erste Location.",
+ "location.firstEvent": "Schön, dass du hier bist. Erstelle <i>jetzt</i> deinen ersten Standort.",
"location.openContactForm": "Kontaktformular",
"location.openScanner": "Scanner",
"location.openCamScanner": "Cam-Scanner",
@@ -95,7 +95,7 @@
"modal.registerOperator.downloadButton": "DOWNLOADEN",
"modal.registerOperator.kopieButton": "Kopieren",
"modal.registerOperator.finish": "FERTIG",
- "modal.createLocation.title": "Neue Location hinzufügen",
+ "modal.createLocation.title": "Neuen Standort hinzufügen",
"modal.qrCodeDocument.tableTitle": "QR-Codes für Tische",
"modal.qrCodeDocument.table": "Tisch",
"modal.qrCodeDocument.download": "Als PDF herunterladen",
@@ -171,10 +171,10 @@
"notification.privat.success": "Event erstellt!",
"notification.createGroup.error": "Fehler beim Erstellen des Standorts!",
"notification.createGroup.success": "Neuer Standort erstellt!",
- "notification.deleteLocation.error": "Fehler beim Löschen der Location!",
- "notification.deleteLocation.success": "Deine Location wurde gelöscht!",
- "notification.updateLocation.error": "Fehler beim Aktualisieren der Location!",
- "notification.updateLocation.success": "Deine Location wurde aktualisiert!",
+ "notification.deleteLocation.error": "Fehler beim Löschen des Standorts!",
+ "notification.deleteLocation.success": "Dein Standort wurde gelöscht!",
+ "notification.updateLocation.error": "Fehler beim Aktualisieren des Standorts!",
+ "notification.updateLocation.success": "Dein Standort wurde erfolgreich aktualisiert!",
"notification.logout.error": "Fehler beim Ausloggen.",
"notification.logout.success": "Erfolgreich abgemeldet",
"notification.checkOut.error": "Fehler beim Check-out!",
@@ -222,7 +222,7 @@
"registerBadge.tan": "TAN",
"registerBadge.finish": "Dein Schlüsselanhänger wurde erfolgreich registriert. Du kannst ihn spätestens in 90 Minuten für den Check-in bei luca-Standorten nutzen.",
"registerBadge.end": "Neuen Schlüsselanhänger registrieren",
- "dataTransfer.locationName": "Location",
+ "dataTransfer.locationName": "Standort",
"dataTransfer.requestTime": "Angefragte Zeit",
"dataTransfer.departmentName": "Gesundheitsamt",
"dataTransfer.status": "Status",
@@ -428,7 +428,7 @@
"navigation.location": "Locations",
"navigation.profile": "Profil",
"navigation.dataTransfer": "Datenanfragen",
- "card.form.locationName": "Locationname",
+ "card.form.locationName": "Standortname",
"card.form.firstName": "Kontaktperson Vorname",
"card.form.lastName": "Kontaktperson Nachname",
"card.form.phone": "Telefonnummer",
@@ -573,7 +573,7 @@
"location.csv.content": "QR Code Inhalt",
"qrPrint.info": "QR-Codes können bei unserem Partner QR-PRINT professionell gedruckt werden.",
"qrPrint.link": "QR-CODES DRUCKEN LASSEN",
- "notification.updateLocation.error.exist": "Fehler beim Aktualisieren der Location! Bitte achte darauf, dass der Bereichsname eindeutig ist und nicht \"Allgemein\" heißt.",
+ "notification.updateLocation.error.exist": "Fehler beim Aktualisieren des Standorts! Bitte achte darauf, dass der Standortname eindeutig ist und nicht \"Allgemein\" heißt.",
"notification.forgotPassword.inactiveUser": "Dieser Benutzer ist nicht aktiviert, bitte aktivieren Sie zuerst Ihr Konto.",
"qrPrint.step1": "1. CSV/PDF Datei downloaden.",
"qrPrint.step2": "2. Klick rechts auf {link}.",
@@ -641,7 +641,7 @@
"shareData.privateKey.keySize": "Die importierte Datei war zu groß.",
"profile.services.support": "Hilfe",
"shareData.note": "HINWEIS",
- "shareData.dataRequest": "Location und Anfragezeitraum",
+ "shareData.dataRequest": "Standort und Anfragezeitraum",
"verificationTag.info": "Dieses Gesundheitsamt ist verifiziert",
"requestWarning.info": "Achtung, der angefragte Zeitraum ist ungewöhnlich lang. In der Regel fragen Gesundheitsämter nicht mehr als 72 Stunden an Check-in Daten an. Bitte prüfe die Anfrage.",
"modal.registerOperator.keyTest": "Schlüssel testen",
@@ -657,7 +657,7 @@
"location.checkout.confirmSingleCheckoutText": "Möchtest du diesen Gast wirklich aus diesem Bereich auschecken? Diese Aktion kann nicht rückgängig gemacht werden.",
"location.checkout.confirmTableCheckoutText": "Möchtest du wirklich alle Gäste von diesem Tisch auschecken? Diese Aktion kann nicht rückgängig gemacht werden.",
"shareData.finish.closeTab": "Du kannst diesen Tab jetzt schließen.",
- "settings.location.editAddressLink": "Addresse ändern",
+ "settings.location.editAddressLink": "Adresse ändern",
"browserWarning.headline": "Fehler!",
"browserWarning.description1": "Dieser Browser wird leider nicht unterstützt.",
"browserWarning.description2": "Am besten funktionieren Chrome oder Safari.",
@@ -672,7 +672,7 @@
"notification.updateAverageCheckinTime.constraint.error": "Die angegebene durchschnittliche Aufenthaltszeit ist ungültig. Sie muss mindestens 15 Minuten und darf höchstens 24 Stunden betragen.",
"notification.updateAverageCheckinTime.error": "Fehler beim bearbeiten der durchschnittlichen Aufenthaltszeit.",
"device.noDevices": "Kein Gerät gefunden",
- "device.noDevices.info": "Bitte laden Sie die \"Location App\" von Ihrem AppStore oder Google PlayStore herunter und folgen Sie der Anleitung.",
+ "device.noDevices.info": "Bitte laden Sie die \"luca Locations – Die Betreiber:innen App\" aus dem Apple App Store oder Google Play Store herunter und folgen Sie der Anleitung.",
"modal.createGroup.averageCheckinTime.title": "Check-out Erinnerung",
"modal.createGroup.averageCheckinTime.description": "Wie lange halten sich deine Gäste durchschnittlich in deinem Standort auf?{br}\nDeine Gäste werden nach der angegebenen Zeit erinnert, sich auszuchecken, um zu vermeiden, dass sie es vergessen. \n{br}\n{br}\nDurchschnittliche Aufenthaltsdauer, um eine Auschecken-Erinnerung zu erhalten.",
"createGroup.averageCheckinTime": "Durchschnittliche Aufenthaltsdauer",
@@ -711,12 +711,12 @@
"device.role.employee": "Mitarbeiter:in",
"device.role.manager": "Administrator:in",
"profile.services.videos": "Erklärvideos",
- "helpCenter.heading": "Du findest die passende Antwort nicht auf unserer Website oder den FAQ´s ?",
+ "helpCenter.heading": "Du findest die passende Antwort nicht auf unserer Website oder den FAQs?",
"helpCenter.mail.heading": "Schreib uns per Kontaktformular",
"helpCenter.mail.text": "Wir werden deine Anfrage schnellstmöglich beantworten.",
"helpCenter.mail.buttonText": "Schreib uns",
"helpCenter.phone.heading": "Ruf uns an",
- "helpCenter.phone.text": "Wir sind 24/7 für dich erreichbar. Kostenfrei für Deutschland. {br} \u2028Bitte halte deinen Support Code bereit.",
+ "helpCenter.phone.text": "Wir sind 24/7 für dich erreichbar. KosÂtenÂfrei aus dem deutÂschen FestÂnetz. Für Anrufe aus dem Mobilfunknetz können Kosten entstehen. {br} \u2028Bitte halte deinen Support Code bereit.",
"helpCenter.phone.showSupportCode": "Support Code anzeigen",
"contactForm.modal.title": "Kontaktformular",
"contactForm.modal.text": "Hast du Fragen oder Probleme? Melde dich gerne bei uns. Deine Anfrage wird schnellstmöglich von unserem luca-Team bearbeitet.",
@@ -733,5 +733,13 @@
"contactForm.modal.notification.error": "Fehler beim senden der Nachricht. Bitte versuche es später erneut.",
"profile.services.toolkit": "Betreiber Toolkit",
"error.requestText.invalid": "Bitte gib einen gültigen Wert ein.",
- "error.requestText": "Bitte gib deine Nachricht ein."
+ "error.requestText": "Bitte gib deine Nachricht ein.",
+ "settings.location.checkin.additionalData.notification.maxReachedError.title": "Maximale Anzahl erreicht!",
+ "settings.location.checkin.additionalData.notification.maxReachedError.desc": "Um eine neue Check-in Frage anzulegen musst du eine alte löschen oder ändern.",
+ "loginCard.title": "Anmeldung",
+ "authentication.register.title": "Neues Konto erstellen",
+ "authentication.register.emailInUse": "Diese E-Mail ist bereits vergeben.",
+ "notification.updateArea.success": "Dein Bereich wurde erfolgreich aktualisiert!",
+ "notification.updateArea.error": "Fehler beim Aktualisieren des Bereichs!",
+ "notification.updateArea.error.exist": "Fehler beim Aktualisieren des Bereichs! Bitte achte darauf, dass der Bereichsname eindeutig ist und nicht \"Allgemein\" heißt."
}
\ No newline at end of file
diff --git a/services/locations/src/messages/en.json b/services/locations/src/messages/en.json
index 8a6ce45..ba9685d 100644
--- a/services/locations/src/messages/en.json
+++ b/services/locations/src/messages/en.json
@@ -4,7 +4,7 @@
"shareData.site.title": "luca Share Data",
"shareData.site.meta": "Please allow the health department to decrypt data concerning your location.",
"forgotPassword.site.title": "luca Forgot Password",
- "forgotPassword.site.meta": "Change the password of your luca locations account here.",
+ "forgotPassword.site.meta": "Change the password of your luca Locations account here.",
"resetPassword.site.title": "luca Reset Password",
"resetPassword.site.meta": "Reset the password of your luca Locations account here.",
"registerBadge.site.title": "luca Register key chain",
@@ -24,7 +24,7 @@
"login.form.button": "Log in",
"login.registrationLink": "Create new account",
"login.forgotPasswordLink": "Forgot password?",
- "login.error": "The password you entered is incorrect.",
+ "login.error": "The email or password you entered is incorrect.",
"createGroup.phone": "Phone number",
"card.form.email": "Email",
"card.form.streetName": "Street",
@@ -75,7 +75,7 @@
"location.edit.registerTables.tooltip": "If your location requires a check-in by table, guests can check themselves in with the app directly at the table. Please enter the total number of tables here. If this function is activated, you will get one QR code per table via the check-in menu. Guests without the app need to be checked in by your team, but it’s still possible to enter a table number for those guests.",
"location.edit.enableGeoLocation": "Check out guests automatically (optional)",
"location.edit.enableGeoLocation.tooltip": "If this feature is activated, your guests will be checked out automatically when they leave your location. This feature works via geofencing.",
- "location.edit.createQRCode": "Create QR-codes",
+ "location.edit.createQRCode": "Create QR codes",
"location.save": "Save",
"location.firstEvent": "Nice to have you on board. Create your first location <i>now</i>.",
"location.openContactForm": "Contact form",
@@ -91,7 +91,7 @@
"sort.nameUp": "Name up",
"sort.nameDown": "Name down",
"modal.registerOperator.title": "Get key",
- "modal.registerOperator.explain": "This is your private key. You will need it incase a health department requests data on your place. Please download it and make sure to save it securely. If you lose your private key it can't be restored and it will not be possible to decrypt your data anymore.",
+ "modal.registerOperator.explain": "This is your private key. You will need it in case a health department requests data from your location. Please download it and make sure to save it securely. If you lose your private key it can't be restored and it will not be possible to decrypt your data anymore.",
"modal.registerOperator.downloadButton": "DOWNLOAD",
"modal.registerOperator.kopieButton": "Copy",
"modal.registerOperator.finish": "DONE",
@@ -100,7 +100,7 @@
"modal.qrCodeDocument.table": "Table",
"modal.qrCodeDocument.download": "Download as PDF",
"modal.qrCodeDocument.message": "Scan and check in",
- "modal.qrCodeDocument.create": "Generate QR-Codes",
+ "modal.qrCodeDocument.create": "Generate QR codes",
"modal.guestList.count": "Total check-in count: {count}",
"modal.guestList.title": "Guestlist",
"modal.guestList.date": "Date",
@@ -111,7 +111,7 @@
"modal.checkInOptions.copyLink": "Copy link",
"modal.checkInOptions.openService": "Open",
"modal.checkInOptions.info": "Information",
- "modal.checkInOptions.scanner": "QR Code Reader Tool",
+ "modal.checkInOptions.scanner": "QR code reader tool",
"modal.checkInOptions.camScanner": "QR code reader (for tablet or smartphone)",
"modal.checkInOptions.contactForm": "Contact form",
"modal.checkInOptions.webApp": "luca Apps and luca Web App",
@@ -120,7 +120,7 @@
"modal.checkInOptions.info.contactForm": "If guests don’t want to use the luca App to check in, they can use this contact form instead.",
"modal.checkInOptions.info.webApp": "Guests can find the luca Apps and the Web App on luca-app.de. Once they’ve entered their contact details, you can scan their luca QR code and check them in.",
"createLocation.form.find": "Search...",
- "createLocation.form.find.info": "luca Places are bound to a location. Please enter the name of your place here to find it. If your place does not show up or doesn't have a name, please try again with its street and number.",
+ "createLocation.form.find.info": "luca locations are bound to a physical location. Please enter the name of your location here to find it. If doesn't show up or has a name, please try again with its street and number.",
"createLocation.form.button": "Add location",
"createLocation.form.registerTables": "Enable check-in at the table (optional)",
"tooltip.copy": "Copied!",
@@ -145,8 +145,8 @@
"error.tan": "Please provide a valid tan",
"error.registerBadge.serialNumber": "The entered serial number is incorrect!",
"error.registerBadge.serialNumber.tooShort": "The entered serial number is too short!",
- "error.registerBadge.serverError": "Something went wrong when registering your QR-Code!",
- "error.registerBadge.invalidRegistratorId": "You are trying to register a QR-Code for someone else but the link you are using is incorrect. Please verify that you have the right link or contact hello@luca-app.de!",
+ "error.registerBadge.serverError": "Something went wrong when registering your QR code!",
+ "error.registerBadge.invalidRegistratorId": "You are trying to register a QR code for someone else but the link you are using is incorrect. Please verify that you have the right link or contact hello@luca-app.de!",
"shareData.header.title": "Share data",
"shareData.noData": "There are no requests from the health department",
"shareData.mainTitle": "Share data with health department {healthDepartment}",
@@ -174,7 +174,7 @@
"notification.deleteLocation.error": "Location delete failed!",
"notification.deleteLocation.success": "Your area was deleted!",
"notification.updateLocation.error": "Location could not be updated!",
- "notification.updateLocation.success": "Your area was updated!",
+ "notification.updateLocation.success": "Your location has been updated successfully!",
"notification.logout.error": "Error while logging out!",
"notification.logout.success": "Logout successful!",
"notification.checkOut.error": "Checkout failed!",
@@ -220,7 +220,7 @@
"registerBadge.email": "Email",
"registerBadge.step4.title": "Verify your phone number",
"registerBadge.tan": "Tan",
- "registerBadge.finish": "Your key chain is successfully registered! You can start using it for checking in at luca places in 90 minutes.",
+ "registerBadge.finish": "Your key chain is successfully registered! You can start using it for checking in at luca locations in 90 minutes.",
"registerBadge.end": "Register another badge",
"dataTransfer.locationName": "Location",
"dataTransfer.requestTime": "Requested timeslot",
@@ -267,7 +267,7 @@
"authentication.setPassword.criteria.upperCase": "At least one upper case character",
"authentication.setPassword.criteria.lowerCase": "At least one lower case character",
"authentication.setPassword.criteria.specialChar": "At least one special character",
- "group.noGroup": "No place has been created yet.",
+ "group.noGroup": "No location has been created yet.",
"header.profile": "Profile",
"profile.overview": "Overview",
"profile.overview.submit": "SAVE CHANGES",
@@ -275,17 +275,17 @@
"notification.profile.updateEmail.error": "Error while updating the email address",
"modal.registerOperator.explainCopy": "Do you want to save the key or send it to other devices?",
"modal.registerOperator.copyButton": "COPY",
- "profile.groups.overview": "My places",
+ "profile.groups.overview": "My location",
"group.settings": "Overview",
- "settings.group.name": "Name of the place",
- "settings.group.delete": "Delete place",
- "settings.group.delete.info": "Your place will be archived for four weeks. This way it's still possible to share details with a health department if you have to. After four weeks your place will be deleted for good.",
- "settings.group.delete.submit": "DELETE PLACE",
- "notification.updateGroup.error": "Error while updating the place.",
- "notification.deleteGroup.error": "Error while deleting the place.",
- "group.delete.confirmText": "Do you really want to delete this place?",
+ "settings.group.name": "Name of the location",
+ "settings.group.delete": "Delete location",
+ "settings.group.delete.info": "Your location will be archived for four weeks. This way it's still possible to share details with a health department if you have to. After four weeks your location will be deleted for good.",
+ "settings.group.delete.submit": "DELETE LOCATION",
+ "notification.updateGroup.error": "Error while updating the location.",
+ "notification.deleteGroup.error": "Error while deleting the location.",
+ "group.delete.confirmText": "Do you really want to delete this location?",
"scanner.startScanner": "START MANUAL CHECK-IN",
- "modal.checkInOptions.info.tooltip": "Here are all the links you can use to check in your guests by scanning their QR codes. \n\nYou can use the contact form for guests who don't have a smartphone. \n\nAdditionally, you can display QR codes in areas for guests to check themselves in. These codes can be created in your place's settings.",
+ "modal.checkInOptions.info.tooltip": "Here are all the links you can use to check in your guests by scanning their QR codes. \n\nYou can use the contact form for guests who don't have a smartphone. \n\nAdditionally, you can display QR codes in areas for guests to check themselves in. These codes can be created in your locations's settings.",
"group.view.overview": "Overview",
"group.view.overview.guests": "Number of guests",
"group.view.overview.guestList": "Show guestlist",
@@ -301,8 +301,8 @@
"group.shareData": "SHARE DATA REQUESTS",
"shareData.title": "Share data requests",
"groupList.createGroup": "New group",
- "modal.createGroup.selectType.title": "Type of place",
- "modal.createGroup.selectType.description": "Please select the type of your place.",
+ "modal.createGroup.selectType.title": "Type of location",
+ "modal.createGroup.selectType.description": "Please select the type of your location.",
"modal.createGroup.selectType.restaurant": "RESTAURANT",
"modal.createGroup.nameInput.restaurant.title": "What's the name of your restaurant?",
"createGroup.restaurant.groupName": "Name of the restaurant",
@@ -322,16 +322,16 @@
"modal.createGroup.automaticCheckout.title": "Automatic checkout",
"modal.createGroup.automaticCheckout.description": "Should your guest be checked out automatically?",
"createGroup.radius": "Radius in m",
- "modal.createGroup.automaticCheckout.radiusDescription": "Please provide the approximate radius of your place. If automatic checkout is activated, your guests will be checked out as soon as they leave your specified radius.",
+ "modal.createGroup.automaticCheckout.radiusDescription": "Please provide the approximate radius of your location. If automatic checkout is activated, your guests will be checked out as soon as they leave your specified radius.",
"modal.createGroup.complete.title": "Complete!",
- "modal.createGroup.complete.description": "The configuration for your place is complete. Your guests can start checking in as soon as the place is created. In your place's profile you can add or update settings at any time.",
+ "modal.createGroup.complete.description": "The configuration for your location is complete. Your guests can start checking in as soon as the location is created. In your location's profile, you can add or update the settings at any time.",
"createGroup.button.done": "CREATE",
"modal.createGroup.complete.showCodes": "Generate QR codes now?",
"downloadFile.locations.generalQrCode": "luca_QRCode_{fileName}.pdf",
- "modal.createGroup.singleQRDownload.description": "This is the QR code for your place. Your guest can check in by scanning it with their app.",
- "modal.createGroup.tableQRDownload.description": "Here are the QR codes for every table of your place. If you display them, guests can check in right at their table by scanning the code with their app.",
+ "modal.createGroup.singleQRDownload.description": "This is the QR code for your location. Your guest can check in by scanning it with their app.",
+ "modal.createGroup.tableQRDownload.description": "Here are the QR codes for every table of your location. If you display them, guests can check in right at their table by scanning the code with their app.",
"done": "DONE",
- "modal.createGroup.complete.created": "Your place was successfully set up",
+ "modal.createGroup.complete.created": "Your location was successfully set up",
"modal.createGroup.selectType.nursing_home": "NURSING HOME",
"modal.createGroup.nameInput.nursing_home.title": "What's the name of your nursing home?",
"createGroup.nursing_home.groupName": "Name of the nursing home",
@@ -343,23 +343,23 @@
"modal.createGroup.selectType.hotel": "HOTEL",
"modal.createGroup.selectType.base": "OTHER",
"modal.createGroup.areaSelection.hotel.title": "Do you want to divide your hotel into different areas?",
- "modal.createGroup.areaSelection.hotel.description": "If you would like to divide your restaurant, for example, from other areas of your place, you can manage this here.",
+ "modal.createGroup.areaSelection.hotel.description": "If you would like to divide your restaurant, for example, from other areas of your location, you can manage this here.",
"area": "Area {key}",
"modal.createGroup.addArea": "Add more areas",
"modal.createGroup.nameInput.hotel.title": "What's the name of your hotel?",
"createGroup.hotel.groupName": "Name of the hotel",
"modal.createGroup.addressInput.hotel.title": "Address of your hotel",
"modal.createGroup.addressInput.hotel.description": "Please search your hotel's address in the search field.",
- "modal.createGroup.nameInput.base.title": "What's the name of your place?",
- "createGroup.base.groupName": "Place name",
- "modal.createGroup.addressInput.base.title": "Address of your place",
- "modal.createGroup.addressInput.base.description": "Please search the address of your place in the searchfield.",
- "modal.createGroup.areaSelection.base.title": "Do you want to divide your place into different areas?",
- "modal.createGroup.areaSelection.base.description": "If you would like to divide your conference room, for example, from other areas of your place, you can manage this here.",
+ "modal.createGroup.nameInput.base.title": "What's the name of your location?",
+ "createGroup.base.groupName": "Location name",
+ "modal.createGroup.addressInput.base.title": "Address of your location",
+ "modal.createGroup.addressInput.base.description": "Please search the address of your location in the search field.",
+ "modal.createGroup.areaSelection.base.title": "Do you want to divide your location into different areas?",
+ "modal.createGroup.areaSelection.base.description": "If you would like to divide your conference room, for example, from other areas of your location, you can manage this here.",
"modal.registerOperator.titleCopy": "Copy key",
"groupList.createLocation": "New area",
"location.defaultName": "General",
- "settings.location.checkin.headline": "Checkin questions",
+ "settings.location.checkin.headline": "Check-in questions",
"settings.location.checkin.additionalData.headline": "Enter further information manually",
"settings.location.checkin.additionalData.description": "What additional information would you like your guests to enter? You must add the requests manually.",
"settings.location.checkin.additionalData.input": "Name",
@@ -367,7 +367,7 @@
"settings.location.qrcode.headline": "Generate QR codes",
"settings.location.qrcode.generate": "CREATE QR-CODES",
"settings.location.qrcode.location.headline": "One QR code for the entire area",
- "settings.location.qrcode.tables.headline": "QR codes for divisions within your place",
+ "settings.location.qrcode.tables.headline": "QR codes for divisions within your location",
"settings.location.qrcode.tables.label": "Name",
"settings.location.qrcode.tables.number": "Number",
"settings.location.checkout.headline": "Customize checkout",
@@ -375,17 +375,17 @@
"settings.location.checkout.automatic.description": "If automatic checkout is activated, your guests will be automatically checked out as soon as they move outside your specified radius. This feature is optional for your guests. Please enter the radius of your location here. Minimum radius is 50 meters. ",
"settings.location.checkout.automatic.radius": "Radius in m",
"groupList.create": "Create",
- "modal.createLoction.selectType.title": "Type of place",
- "modal.createLocation.selectType.description": "Choose the type of your place.",
+ "modal.createLoction.selectType.title": "Type of location",
+ "modal.createLocation.selectType.description": "Choose the type of your location.",
"modal.createLocation.nameInput.restaurant.title": "Name of your restaurant",
"createLocation.restaurant.locationName": "Name of the restaurant",
"modal.createLocation.addressInput.restaurant.title": "Address of your restaurant",
- "modal.createLocation.addressInput.restaurant.sameAddress.description": "Does your restaurant have the same address as your place?",
+ "modal.createLocation.addressInput.restaurant.sameAddress.description": "Does your restaurant have the same address as your location?",
"modal.createLocation.phoneInput.title": "How can your area been contacted?",
"modal.createLocation.phoneInput.description": "Please provide a phone number that can be used by health authorities to contact you if they have to.",
- "notification.createLocation.success": "Place created!",
- "notification.createLocation.error": "Error while creating the place!",
- "modal.createLocation.complete.created": "Place created!",
+ "notification.createLocation.success": "Location created!",
+ "notification.createLocation.error": "Error while creating the location!",
+ "modal.createLocation.complete.created": "Location created!",
"modal.createLocation.selectType.room": "ROOM",
"modal.createLocation.selectType.building": "BUILDING",
"modal.createLocation.nameInput.room.title": "Name of the room",
@@ -396,26 +396,26 @@
"createLocation.base.locationName": "Area name",
"modal.createLocation.addressInput.room.title": "Address of the room",
"modal.createLocation.addressInput.building.title": "Address of your building",
- "modal.createLocation.addressInput.base.title": "Address of your place",
- "modal.createLocation.addressInput.room.sameAddress.description": "Does the room have the same address as the place?",
- "modal.createLocation.addressInput.building.sameAddress.description": "Does the building have the same address as the place?",
- "modal.createLocation.addressInput.base.sameAddress.description": "Does the area have the same address as the place?",
+ "modal.createLocation.addressInput.base.title": "Address of your location",
+ "modal.createLocation.addressInput.room.sameAddress.description": "Does the room have the same address as the location?",
+ "modal.createLocation.addressInput.building.sameAddress.description": "Does the building have the same address as the location?",
+ "modal.createLocation.addressInput.base.sameAddress.description": "Does the area have the same address as the location?",
"modal.createLocation.addressInput.restaurant.description": "Please search the address of your restaurant in the search field.",
"modal.createLocation.addressInput.room.description": "Please search the address of your room in the search field.",
"modal.createLocation.addressInput.building.description": "Please search the address of your building in the search field.",
- "modal.createLocation.addressInput.base.description": "Please search the address of your place in the search field.",
+ "modal.createLocation.addressInput.base.description": "Please search the address of your location in the search field.",
"switch.active": "Active",
"switch.inactive": "Inactive",
"dataTransfers.list.inComplete.header": "Open data requests",
"dataTransfers.list.complete.header": "Past data requests",
- "dataTransfers.transfer.location": "Place",
+ "dataTransfers.transfer.location": "Location",
"dataTransfers.transfer.timeFrom": "Time from",
"dataTransfers.transfer.completeRequest": "SHARE DATA",
"dataTransfers.transfer.timeUntil": "Time until",
"dataTransfers.list.complete.table.header.date": "Date",
"dataTransfers.list.complete.table.header.timeFrom": "Time from",
"dataTransfers.list.complete.table.header.timeUntil": "Time until",
- "dataTransfers.list.complete.table.header.location": "Place",
+ "dataTransfers.list.complete.table.header.location": "Location",
"dataTransfers.list.complete.table.header.healthDepartment": "Health department",
"settings.location.checkout.title": "Automatic checkout",
"settings.location.checkin.additionalData.headline.main": "Ask for additional information AFTER check-in",
@@ -434,7 +434,7 @@
"card.form.phone": "Phone number",
"modal.registerOperator.step0.title": "Get key",
"modal.registerOperator.step1.title": "Complete",
- "modal.registerOperator.step0.explain": "This is your private key. You will need it incase a health department requests data on your place.\n\nPlease download it and make sure to save it securely. If you lose your private key it can't be restored and it will not be possible to decrypt your data anymore.",
+ "modal.registerOperator.step0.explain": "This is your private key. You will need it in case a health department requests data from your location.\n\nPlease download it and make sure to save it securely. If you lose your private key it can't be restored and it will not be possible to decrypt your data anymore.",
"modal.registerOperator.step0.downloadButton": "Download",
"modal.registerOperator.step0.nextButton": "Next",
"modal.registerOperator.step1.explain": "That's it. You can start manage your locations now.",
@@ -486,8 +486,8 @@
"settings.location.checkout.automatic.range": "The radius cannot be under 50m and over 5000m.",
"error.headline": "This didn't work!",
"error.description": "Something went wrong. Please try reloading the page or come back later. If the error still occurs, please get in touch with locations@luca-app.de.",
- "notification.updateGroup.success": "Your place was updated.",
- "notification.deleteGroup.success": "Your place was deleted.",
+ "notification.updateGroup.success": "Your location was updated.",
+ "notification.deleteGroup.success": "Your location was deleted.",
"error.registerBadge.invalidAddress": "Please check the provided address.",
"error.registerBadge.invalidContactInfo": "Please check the provided contact information.",
"error.registerBadge.invalidNameInfo": "Please check the provided name.",
@@ -573,7 +573,7 @@
"location.csv.content": "Qr code content",
"qrPrint.info": "QR codes can be printed professionally with our partner QR-PRINT.",
"qrPrint.link": "PRINT QR-CODES VIA QR-PRINT",
- "notification.updateLocation.error.exist": "Location could not be updated! Please make sure the area name is unique and not called \"General\".",
+ "notification.updateLocation.error.exist": "Location could not be updated! Please make sure that the location name is unique and not called \"General\".",
"notification.forgotPassword.inactiveUser": "This user is not activated, please activate your account first.",
"qrPrint.step1": "1. Download the CSV/PDF file.",
"qrPrint.step2": "2. Click on {link}.",
@@ -711,15 +711,15 @@
"device.role.employee": "Employee",
"device.role.manager": "Admin",
"profile.services.videos": "Support videos",
- "helpCenter.heading": "Your question is not answered on our website or in the faq's?",
- "helpCenter.mail.heading": "Write us via contact form",
+ "helpCenter.heading": "Your question is not answered on our website or in the FAQs?",
+ "helpCenter.mail.heading": "Send a message via contact form",
"helpCenter.mail.text": "We will answer your questions as soon as possible.",
- "helpCenter.mail.buttonText": "Write us",
+ "helpCenter.mail.buttonText": "Send message",
"helpCenter.phone.heading": "Call us",
- "helpCenter.phone.text": "You can reach out to us 24/7. Free for Germany. {br} Please have your support code at hand.",
+ "helpCenter.phone.text": "We are available 24/7. Toll-free when calling from a German landline. Prices for calls from mobile phones may differ.{br} Please have your support code at hand.",
"helpCenter.phone.showSupportCode": "Show support code",
"contactForm.modal.title": "Contact form",
- "contactForm.modal.text": "You have questions or problems? Feel free to contact us. Your request will be answered as soon as possible bx our team.",
+ "contactForm.modal.text": "You have questions or problems? Feel free to contact us. Your request will be answered as soon as possible by our team.",
"contactForm.modal.supportCode": "Support code",
"contactForm.modal.name": "Name",
"contactForm.modal.email": "Email",
@@ -733,5 +733,13 @@
"contactForm.modal.notification.error": "Error while sending the request. Please try again later.",
"profile.services.toolkit": "Operator toolkit",
"error.requestText.invalid": "Please enter a valid value.",
- "error.requestText": "Please provide your Request."
+ "error.requestText": "Please provide your Request.",
+ "settings.location.checkin.additionalData.notification.maxReachedError.title": "Maximum amount reached!",
+ "settings.location.checkin.additionalData.notification.maxReachedError.desc": "To create another check-in question you need to either delete or modify an old one.",
+ "loginCard.title": "Login",
+ "authentication.register.title": "Create new account",
+ "authentication.register.emailInUse": "This email is already in use.",
+ "notification.updateArea.success": "Your area has been updated sucessfully!",
+ "notification.updateArea.error": "Area could not be updated!",
+ "notification.updateArea.error.exist": "Area could not be updated! Please make sure that the area name is unique and not called \"General\"."
}
\ No newline at end of file
diff --git a/services/locations/src/network/api.js b/services/locations/src/network/api.js
index 0a44678..da2bee0 100644
--- a/services/locations/src/network/api.js
+++ b/services/locations/src/network/api.js
@@ -133,6 +133,14 @@ export const registerOperator = data => {
});
};
+export const sendSupportMail = data => {
+ return fetch(`${API_PATH}/v3/operators/support`, {
+ method: 'POST',
+ body: JSON.stringify(data),
+ headers,
+ });
+};
+
export const storePublicKey = data => {
return fetch(`${API_PATH}/v3/operators/publicKey`, {
method: 'POST',
diff --git a/services/locations/src/utils/checkCharacter.js b/services/locations/src/utils/checkCharacter.js
index def01b3..93c9600 100644
--- a/services/locations/src/utils/checkCharacter.js
+++ b/services/locations/src/utils/checkCharacter.js
@@ -6,3 +6,6 @@ export const isValidCharacter = value =>
SAFE_CHARACTERS_REGEX.test(value) &&
NO_HTTP_REGEX.test(value) &&
NO_FTP_REGEX.test(value);
+
+export const isValidTextCharacter = value =>
+ NO_HTTP_REGEX.test(value) && NO_FTP_REGEX.test(value);
diff --git a/services/locations/src/utils/downloadPDF.js b/services/locations/src/utils/downloadPDF.js
index edeea93..5b7347a 100644
--- a/services/locations/src/utils/downloadPDF.js
+++ b/services/locations/src/utils/downloadPDF.js
@@ -16,14 +16,14 @@ export const downloadPDF = async ({
isCWAEventEnabled,
}) => {
const messageText = intl.formatMessage({ id: 'message.generatingPDF' });
- const showLoadingProgress = percentage =>
- openLoadingMessage(percentage, messageText);
- setIsDownloading(true);
- showLoadingProgress(0);
const locationName = `_${location.name}`;
const fileName = `${location.groupName.replace(' ', '_')}${
location.name ? locationName.replace(' ', '_') : ''
}`;
+ const showLoadingProgress = percentage =>
+ openLoadingMessage(percentage, messageText);
+ setIsDownloading(true);
+ showLoadingProgress(0);
const { getPDF } = pdfWorkerApiReference.current;
const pdf = await getPDF(
location,
diff --git a/services/locations/src/utils/jest.setup.js b/services/locations/src/utils/jest.setup.js
index f9b7287..7b0828b 100644
--- a/services/locations/src/utils/jest.setup.js
+++ b/services/locations/src/utils/jest.setup.js
@@ -1,4 +1 @@
import '@testing-library/jest-dom';
-import replaceAllInserter from 'string.prototype.replaceall';
-
-replaceAllInserter.shim();
diff --git a/services/locations/src/utils/sanitizer.js b/services/locations/src/utils/sanitizer.js
index 702a07c..ed4566b 100644
--- a/services/locations/src/utils/sanitizer.js
+++ b/services/locations/src/utils/sanitizer.js
@@ -13,17 +13,17 @@ export const sanitizeForCSV = value => {
// sanitze general
const sanitizedStringGeneral = value
// limit to standard characters
- .replaceAll(
+ .replace(
/[^0-9A-Za-zç朌ßäëïöüÿãñõâêîôûáéÃóúýà èìòùÄËÃÖÜŸÃÑÕÂÊÎÔÛÃÉÃÓÚÃÀÈÌÒÙÇÆŒŒ.\-@+:]+/gi,
' '
)
// remove new lines
- .replaceAll(/[\n\r]/g, ' ')
+ .replace(/[\n\r]/g, ' ')
// replace leading + with 00 for phone numbers
.replace(/^\+/, '00');
// remove leading special characters to avoid formulars
- return sanitizedStringGeneral.replaceAll(/^[\t\r"'+=@`-\s]+/g, '_');
+ return sanitizedStringGeneral.replace(/^[\t\r"'+=@`-\s]+/g, '_');
};
export const sanitizeObject = object => mapValues(object, sanitizeForCSV);
diff --git a/services/locations/src/utils/time.js b/services/locations/src/utils/time.js
index 4dc4551..9184e5d 100644
--- a/services/locations/src/utils/time.js
+++ b/services/locations/src/utils/time.js
@@ -1,7 +1,15 @@
import moment from 'moment';
+const HOUR_IN_MINUTES = 60;
+
export const getFormattedDate = timestamp =>
timestamp ? moment.unix(timestamp).format('DD.MM.YYYY') : '';
export const getFormattedTime = timestamp =>
timestamp ? moment.unix(timestamp).format('HH:mm') : '';
+
+export const getMinutesFromTimeString = timeString => {
+ const hours = moment(timeString, 'HH:mm').hours();
+ const minutes = moment(timeString, 'HH:mm').minutes();
+ return hours * HOUR_IN_MINUTES + minutes;
+};
diff --git a/services/locations/src/utils/validatorRules.helper.js b/services/locations/src/utils/validatorRules.helper.js
index a28a538..16336db 100644
--- a/services/locations/src/utils/validatorRules.helper.js
+++ b/services/locations/src/utils/validatorRules.helper.js
@@ -6,7 +6,7 @@ import {
} from 'constants/locations';
import { isValidPhoneNumber } from './parsePhoneNumber';
-import { isValidCharacter } from './checkCharacter';
+import { isValidCharacter, isValidTextCharacter } from './checkCharacter';
export const validateSafeString = (_, value) => {
if (!isValidCharacter(value?.trim())) {
@@ -15,6 +15,13 @@ export const validateSafeString = (_, value) => {
return Promise.resolve();
};
+export const validateTextSafeString = (_, value) => {
+ if (!isValidTextCharacter(value?.split('\n').join(' ').trim())) {
+ return Promise.reject();
+ }
+ return Promise.resolve();
+};
+
export const validateNoNumeric = (_, value) => {
if (value?.trim() && validator.isNumeric(value.replace(/\s/g, ''))) {
return Promise.reject();
diff --git a/services/locations/src/utils/validatorRules.js b/services/locations/src/utils/validatorRules.js
index b29155f..23e80e7 100644
--- a/services/locations/src/utils/validatorRules.js
+++ b/services/locations/src/utils/validatorRules.js
@@ -8,6 +8,7 @@ import {
checkExistingLocation,
validatePhoneNumber,
validateSafeString,
+ validateTextSafeString,
validateZipCode,
validateEmail,
validateNoNumeric,
@@ -25,6 +26,11 @@ export const getSafeStringRule = (intl, fieldName) => ({
message: intl.formatMessage({ id: `error.${fieldName}.invalid` }),
});
+export const getTextSafeStringRule = (intl, fieldName) => ({
+ validator: validateTextSafeString,
+ message: intl.formatMessage({ id: `error.${fieldName}.invalid` }),
+});
+
export const getNoNumericRule = (intl, fieldName) => ({
validator: validateNoNumeric,
message: intl.formatMessage({ id: `error.${fieldName}.invalid` }),
diff --git a/services/locations/yarn.lock b/services/locations/yarn.lock
index c89c6c8..860e234 100644
--- a/services/locations/yarn.lock
+++ b/services/locations/yarn.lock
@@ -2257,9 +2257,9 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/node@*":
- version "16.9.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
- integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==
+ version "16.9.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9"
+ integrity sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@@ -2950,7 +2950,7 @@ array-flatten@^2.1.0:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.1.1, array-includes@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -3436,9 +3436,9 @@ bfj@^7.0.2:
tryer "^1.0.1"
big-integer@^1.6.16:
- version "1.6.48"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
- integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
+ version "1.6.49"
+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.49.tgz#f6817d3ea5d4f3fb19e24df9f4b1b4471a8328ce"
+ integrity sha512-KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw==
big.js@^5.2.2:
version "5.2.2"
@@ -3833,9 +3833,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001257"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz#150aaf649a48bee531104cfeda57f92ce587f6e5"
- integrity sha512-JN49KplOgHSXpIsVSF+LUyhD8PUp6xPpAXeRrrcBh4KBeP7W864jHn6RvzJgDlrReyeVjMFJL3PLpPvKIxlIHA==
+ version "1.0.30001258"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz#b604eed80cc54a578e4bf5a02ae3ed49f869d252"
+ integrity sha512-RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA==
canvg@^3.0.6:
version "3.0.8"
@@ -4186,6 +4186,17 @@ compressible@~2.0.16:
dependencies:
mime-db ">= 1.43.0 < 2"
+compression-webpack-plugin@6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz#ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"
+ integrity sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==
+ dependencies:
+ cacache "^15.0.5"
+ find-cache-dir "^3.3.1"
+ schema-utils "^3.0.0"
+ serialize-javascript "^5.0.1"
+ webpack-sources "^1.4.3"
+
compression@^1.7.4:
version "1.7.4"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
@@ -4765,9 +4776,9 @@ data-urls@^2.0.0:
whatwg-url "^8.0.0"
date-fns@2.x:
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
- integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
+ version "2.24.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d"
+ integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==
dayjs@1.x:
version "1.10.7"
@@ -5153,9 +5164,9 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.723:
- version "1.3.840"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.840.tgz#3f2a1df97015d9b1db5d86a4c6bd4cdb920adcbb"
- integrity sha512-yRoUmTLDJnkIJx23xLY7GbSvnmDCq++NSuxHDQ0jiyDJ9YZBUGJcrdUqm+ZwZFzMbCciVzfem2N2AWiHJcWlbw==
+ version "1.3.842"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f"
+ integrity sha512-P/nDMPIYdb2PyqCQwhTXNi5JFjX1AsDVR0y6FrHw752izJIAJ+Pn5lugqyBq4tXeRSZBMBb2ZGvRGB1djtELEQ==
elliptic@6.5.4, elliptic@^6.5.3:
version "6.5.4"
@@ -5465,9 +5476,9 @@ eslint-plugin-import@^2.22.1:
tsconfig-paths "^3.11.0"
eslint-plugin-jest@^24.1.0:
- version "24.4.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262"
- integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==
+ version "24.4.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.2.tgz#9e8cf05ee6a0e3025e6149df2f36950abfa8d5bf"
+ integrity sha512-jNMnqwX75z0RXRMXkxwb/+9ylKJYJLJ8nT8nBT0XFM5qx4IQGxP4edMawa0qGkSbHae0BDPBmi8I2QF0/F04XQ==
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
@@ -5523,9 +5534,9 @@ eslint-plugin-react@7.22.0:
string.prototype.matchall "^4.0.2"
eslint-plugin-react@^7.21.5:
- version "7.25.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz#9286b7cd9bf917d40309760f403e53016eda8331"
- integrity sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==
+ version "7.25.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.2.tgz#d567a217d306b76dd110561f28074e2328ae38f8"
+ integrity sha512-elx4585wgmryanJK4C5IoSKQyVZ+e7H0t2JOOtJNBql0cuercvSShvRReuLBbfx8687yW5yv+UL7pXwMsd6adQ==
dependencies:
array-includes "^3.1.3"
array.prototype.flatmap "^1.2.4"
@@ -6868,9 +6879,9 @@ immer@8.0.1:
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
"immutable@^3.8.1 || ^4.0.0-rc.1":
- version "4.0.0-rc.14"
- resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.14.tgz#29ba96631ec10867d1348515ac4e6bdba462f071"
- integrity sha512-pfkvmRKJSoW7JFx0QeYlAmT+kNYvn5j0u7bnpNq4N2RCvHSTlLT208G8jgaquNe+Q8kCPHKOSpxJkyvLDpYq0w==
+ version "4.0.0-rc.15"
+ resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.15.tgz#c30056f05eaaf5650fd15230586688fdd15c54bc"
+ integrity sha512-v8+A3sNyaieoP9dHegl3tEYnIZa7vqNiSv0U6D7YddiZi34VjKy4GsIxrRHj2d8+CS3MeiVja5QyNe4JO/aEXA==
import-cwd@^2.0.0:
version "2.1.0"
@@ -7367,7 +7378,7 @@ is-potential-custom-element-name@^1.0.1:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-is-regex@^1.0.4, is-regex@^1.1.2, is-regex@^1.1.4:
+is-regex@^1.0.4, is-regex@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -8522,11 +8533,11 @@ jspdf@2.3.1:
html2canvas "^1.0.0-rc.5"
"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
- integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+ integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
dependencies:
- array-includes "^3.1.2"
+ array-includes "^3.1.3"
object.assign "^4.1.2"
jwa@^1.4.1:
@@ -9566,9 +9577,9 @@ nth-check@^1.0.2:
boolbase "~1.0.0"
nth-check@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
- integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+ integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
dependencies:
boolbase "^1.0.0"
@@ -12940,18 +12951,6 @@ string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.5:
regexp.prototype.flags "^1.3.1"
side-channel "^1.0.4"
-string.prototype.replaceall@1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/string.prototype.replaceall/-/string.prototype.replaceall-1.0.5.tgz#3eae8b115c588ece949b14fa2993d86fc8ec87b1"
- integrity sha512-YUjdWElI9pgKo7mrPOMKHFZxcAa0v1uqoJkMHtlJW63rMkPLkQH71ao2XNkKY2ksHKHC8ZUFwNjN9Vry+QyCvg==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.18.0-next.2"
- get-intrinsic "^1.1.1"
- has-symbols "^1.0.1"
- is-regex "^1.1.2"
-
string.prototype.trimend@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
diff --git a/services/scanner/craco.config.js b/services/scanner/craco.config.js
index ce1f17d..7b9640f 100644
--- a/services/scanner/craco.config.js
+++ b/services/scanner/craco.config.js
@@ -1,6 +1,7 @@
const CracoLessPlugin = require('craco-less');
const { LicenseWebpackPlugin } = require('license-webpack-plugin');
const GenerateJsonPlugin = require('generate-json-webpack-plugin');
+const CompressionPlugin = require('compression-webpack-plugin');
const { THEME } = require('./ant.theme');
@@ -15,6 +16,11 @@ module.exports = {
webpack: {
plugins: {
add: [
+ new CompressionPlugin({
+ algorithm: 'gzip',
+ test: /\.(js|css|html|svg|json|ico|eot|otf|ttf)$/,
+ deleteOriginalAssets: false,
+ }),
new LicenseWebpackPlugin({
perChunkOutput: false,
outputFilename: 'licenses.json',
diff --git a/services/scanner/nginx.conf b/services/scanner/nginx.conf
index 8446e65..79765d0 100644
--- a/services/scanner/nginx.conf
+++ b/services/scanner/nginx.conf
@@ -41,6 +41,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload";
location /scanner {
+ gzip_static on;
rewrite ^/scanner/(.*)$ /$1 break;
try_files $uri /index.html;
}
diff --git a/services/scanner/package.json b/services/scanner/package.json
index 14ce5c4..f8ee528 100644
--- a/services/scanner/package.json
+++ b/services/scanner/package.json
@@ -1,6 +1,6 @@
{
"name": "@lucaapp/scanner",
- "version": "2.0.2",
+ "version": "2.1.0",
"private": true,
"license": "Apache-2.0",
"author": "Culture4Life <hello@luca-app.de> (https://www.luca-app.de/)",
@@ -12,7 +12,8 @@
"build": "GENERATE_SOURCEMAP=false craco build",
"lint": "yarn eslint && yarn stylelint",
"eslint": "eslint src",
- "stylelint": "stylelint 'src/**/*.js'"
+ "stylelint": "stylelint 'src/**/*.js'",
+ "update:locales": "./scripts/updateLocales.sh"
},
"dependencies": {
"@ant-design/icons": "4.6.4",
@@ -20,6 +21,7 @@
"@lucaapp/crypto": "2.1.2",
"antd": "4.16.13",
"bloomit": "1.1.1",
+ "compression-webpack-plugin": "6.1.1",
"connected-react-router": "6.9.1",
"craco-less": "1.20.0",
"dexie": "3.0.3",
diff --git a/services/scanner/scripts/updateLocales.sh b/services/scanner/scripts/updateLocales.sh
new file mode 100755
index 0000000..8ca2aa5
--- /dev/null
+++ b/services/scanner/scripts/updateLocales.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# load .env file
+set -a
+[ -f ../../.env ] && . ../../.env
+set +a
+
+if [ -z "$POEDITOR_API_TOKEN" ]; then
+read -rsp 'Enter your API key:
+' POEDITOR_API_TOKEN
+fi
+
+downloadJSON() {
+ echo "downloading $3"
+ curl -s -X POST https://api.poeditor.com/v2/projects/export \
+ -d api_token="$POEDITOR_API_TOKEN" \
+ -d id="$1" \
+ -d language="$2" \
+ -d type="key_value_json" | jq -r '.result.url' | xargs curl -s > "$3"
+}
+
+downloadJSON 471983 de ./src/messages/de.json
+downloadJSON 471983 en ./src/messages/en.json
diff --git a/services/scanner/src/general/Buttons.styled.js b/services/scanner/src/general/Buttons.styled.js
index e00ba7c..1d88325 100644
--- a/services/scanner/src/general/Buttons.styled.js
+++ b/services/scanner/src/general/Buttons.styled.js
@@ -18,10 +18,10 @@ export const PrimaryButton = styled(Button)`
width: auto;
padding-left: 40px;
padding-right: 40px;
- background: ${({ isButtonWhite }) =>
- isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
+ background: ${({ $isButtonWhite }) =>
+ $isButtonWhite ? '#fff' : 'rgb(195, 206, 217)'};
border: 2px solid
- ${({ isButtonWhite }) => (isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
+ ${({ $isButtonWhite }) => ($isButtonWhite ? '#fff' : 'rgb(195, 206, 217)')};
border-radius: 24px;
color: rgba(0, 0, 0, 0.87);
align-self: flex-end;
diff --git a/services/scanner/src/messages/de.js b/services/scanner/src/messages/de.js
deleted file mode 100644
index df19aeb..0000000
--- a/services/scanner/src/messages/de.js
+++ /dev/null
@@ -1,77 +0,0 @@
-export const de = {
- // SITE
- 'scanner.site.config.setupScanner': 'Scanner testen',
- 'scanner.site.config.dontShowAgain':
- 'Diese Nachricht das nächste Mal nicht mehr anzeigen.',
- 'scanner.site.config.success': 'Der Scanner ist richtig konfiguriert',
- 'scanner.site.config.error': 'Der Scanner ist falsch konfiguriert',
- 'scanner.site.title': 'luca QR-Code Lesegerät',
- 'scanner.site.meta':
- 'Dieses Tool erfasst Check-ins, die mit einem externen QR-Code Lesegerät durchgeführt werden.',
- 'camScanner.site.title': 'luca Scanner',
- 'camScanner.site.meta':
- 'Dieser QR-Code-Scanner kann mit einem Smartphone oder einem Tablet mit Kamerafunktion verwendet werden, um Gäste bei deiner Location einzuchecken.',
- // HEADER
- 'header.subtitle': 'Scanner',
- // FORM
- 'form.checkins': 'Anzahl der erfolgreichen Check-ins bei ',
- 'form.checkinsSuffix': '(aktuell/gesamt):',
- // ERRORS
- 'error.decodeFailed':
- 'Es ist ein Fehler beim Lesen des QR-Codes aufgetreten!',
- 'error.versionNotSupported':
- 'Dieser QR-Code wird nicht mehr unterstützt. Bitte aktualisiere deine App!',
- 'error.duplicateCheckin': 'Bereits eingecheckt!',
- 'error.timeUp': 'Dein Event ist vorbei.',
- 'error.getScannerWrapper': 'Der Scanner konnte nicht gefunden werden.',
- 'error.browserNotSupported':
- 'Bitte benutze Safari. Dieser Browser wird auf iOS nicht unterstützt.',
- 'error.timestampOutdated': 'Der QR-Code ist abgelaufen.',
- 'error.genericScanner':
- 'Der Scanner hatte ein Problem. Bitte versuche es erneut.',
- 'error.noUserData':
- 'Es scheint, als ob du noch keine Kontaktdaten hinterlegt hast. Wenn du dies erst kürzlich getan hast, warte bitte einige Minuten und versuche es noch einmal.',
- 'error.noBloomFilter':
- 'Es kann nicht überprüft werden, ob schon Kontaktdaten hinterlegt wurden.',
- 'error.wrongLocalTime':
- 'Dein System scheint eine falsche Zeit zu haben. Bitte überprüfe deine Zeiteinstellungen.',
- 'error.accountDeleted':
- 'Dein Account wurde gelöscht. Du kannst keine Gäste mehr einchecken.',
- 'error.badgeV3Unsupported':
- 'Dieser Schlüsselanhänger (v3) wird ab dem 1.9.21 nicht mehr unterstützt. Es muss ein neuer Schlüsselanhänger angefordert werden. Bitte teile es dem Gast mit.',
- // ADDITIONAL DATA
- 'additionalData.isRequired':
- 'Dieses Feld wird benötigt, um einen Gast einzuchecken.',
- 'additionalData.info':
- 'Diese Location benötigt zusätzliche Informationen, um Gäste einzuchecken. Bitte gib folgende Information an.',
- // MODALS
- 'modal.additionalData.table': 'Tischnummer',
- 'modal.additionalData.button': 'Senden',
- 'modal.additionalData.error':
- 'Hinzufügen der zusätzlichen Informationen fehlgeschlagen',
- 'modal.additionalData.success': 'Zusätzliche Informationen hinzugefügt',
- 'modal.additionalData.title': 'Zusätzliche Informationsabfrage',
- // LOADING
- loading: 'Lädt...',
- 'location.defaultName': 'Allgemein',
- // ERROR SCREEN
- 'error.headline': 'Das hat nicht geklappt!',
- 'error.description':
- 'Da ist leider etwas schiefgelaufen. Bitte versuche, die Seite neu zu laden oder probiere es später noch einmal. Wenn es weiterhin nicht klappt, wende dich bitte an locations@luca-app.de.',
- 'authentication.background.legal.agb': 'AGB',
- // LICENSES
- 'license.name': 'Name',
- 'license.version': 'Version',
- 'license.license': 'Lizenz',
- 'license.license.full': 'Alle Lizenzen ansehen',
- // Countdown
- 'countdown.info':
- 'Die Anzahl der Check-ins kann von der tatsächlichen Anzahl der Gäste abweichen, wenn Gäste über unterschiedliche Geräte eingecheckt werden. Nach einem Scan wird die Anzahl automatisch aktualisiert. Ohne Scan aktualisiert sich die Anzahl nach fünf Minuten.',
- 'countdown.text': 'Zuletzt aktualisiert:',
- 'countdown.button': 'AKTUALISIEREN',
- // Footer
- 'location.footer.faq': 'FAQ',
- 'location.footer.repository': 'GitLab',
- // Modal
- 'location.modal.okay': 'Ok',
-};
diff --git a/services/scanner/src/messages/de.json b/services/scanner/src/messages/de.json
new file mode 100644
index 0000000..6f2050f
--- /dev/null
+++ b/services/scanner/src/messages/de.json
@@ -0,0 +1,49 @@
+{
+ "scanner.site.config.setupScanner": "Scanner testen",
+ "scanner.site.config.dontShowAgain": "Diese Nachricht das nächste Mal nicht mehr anzeigen.",
+ "scanner.site.config.success": "Der Scanner ist richtig konfiguriert",
+ "scanner.site.config.error": "Der Scanner ist falsch konfiguriert",
+ "scanner.site.title": "luca QR-Code Lesegerät",
+ "scanner.site.meta": "Dieses Tool erfasst Check-ins, die mit einem externen QR-Code Lesegerät durchgeführt werden.",
+ "camScanner.site.title": "luca Scanner",
+ "camScanner.site.meta": "Dieser QR-Code-Scanner kann mit einem Smartphone oder einem Tablet mit Kamerafunktion verwendet werden, um Gäste bei deinem Standort einzuchecken.",
+ "header.subtitle": "Scanner",
+ "form.checkins": "Anzahl der erfolgreichen Check-ins bei ",
+ "form.checkinsSuffix": "(aktuell/gesamt):",
+ "error.decodeFailed": "Es ist ein Fehler beim Lesen des QR-Codes aufgetreten!",
+ "error.versionNotSupported": "Dieser QR-Code wird nicht mehr unterstützt. Bitte aktualisiere deine App!",
+ "error.duplicateCheckin": "Bereits eingecheckt!",
+ "error.timeUp": "Dein Event ist vorbei.",
+ "error.getScannerWrapper": "Der Scanner konnte nicht gefunden werden.",
+ "error.browserNotSupported": "Bitte benutze Safari. Dieser Browser wird auf iOS nicht unterstützt.",
+ "error.timestampOutdated": "Der QR-Code ist abgelaufen.",
+ "error.genericScanner": "Der Scanner hatte ein Problem. Bitte versuche es erneut.",
+ "error.noUserData": "Es scheint, als ob du noch keine Kontaktdaten hinterlegt hast. Wenn du dies erst kürzlich getan hast, warte bitte einige Minuten und versuche es noch einmal.",
+ "error.noBloomFilter": "Es kann nicht überprüft werden, ob schon Kontaktdaten hinterlegt wurden.",
+ "error.wrongLocalTime": "Dein System scheint eine falsche Zeit zu haben. Bitte überprüfe deine Zeiteinstellungen.",
+ "error.accountDeleted": "Dein Account wurde gelöscht. Du kannst keine Gäste mehr einchecken.",
+ "error.badgeV3Unsupported": "Dieser Schlüsselanhänger (v3) wird ab dem 1.9.21 nicht mehr unterstützt. Es muss ein neuer Schlüsselanhänger angefordert werden. Bitte teile es dem Gast mit.",
+ "additionalData.isRequired": "Dieses Feld wird benötigt, um einen Gast einzuchecken.",
+ "additionalData.info": "Dieser Standort benötigt zusätzliche Informationen, um Gäste einzuchecken. Bitte gib folgende Information an.",
+ "modal.additionalData.table": "Tischnummer",
+ "modal.additionalData.button": "Senden",
+ "modal.additionalData.error": "Hinzufügen der zusätzlichen Informationen fehlgeschlagen",
+ "modal.additionalData.success": "Zusätzliche Informationen hinzugefügt",
+ "modal.additionalData.title": "Zusätzliche Informationsabfrage",
+ "loading": "Lädt...",
+ "location.defaultName": "Allgemein",
+ "error.headline": "Das hat nicht geklappt!",
+ "error.description": "Da ist leider etwas schiefgelaufen. Bitte versuche, die Seite neu zu laden oder probiere es später noch einmal. Wenn es weiterhin nicht klappt, wende dich bitte an locations@luca-app.de.",
+ "authentication.background.legal.agb": "AGB",
+ "license.name": "Name",
+ "license.version": "Version",
+ "license.license": "Lizenz",
+ "license.license.full": "Alle Lizenzen ansehen",
+ "countdown.info": "Die Anzahl der Check-ins kann von der tatsächlichen Anzahl der Gäste abweichen, wenn Gäste über unterschiedliche Geräte eingecheckt werden. Nach einem Scan wird die Anzahl automatisch aktualisiert. Ohne Scan aktualisiert sich die Anzahl nach fünf Minuten.",
+ "countdown.text": "Zuletzt aktualisiert:",
+ "countdown.button": "AKTUALISIEREN",
+ "location.footer.faq": "FAQ",
+ "location.footer.repository": "GitLab",
+ "location.modal.okay": "Ok",
+ "error.checkinError": "Es scheint, als hätte der Gast noch keine Kontaktdaten hinterlegt. Wenn er dies kürzlich bereits getan hat, warte kurz und versuche es dann noch einmal. Nach der Registrierung benötigt das System einige Zeit, bis es den Schlüsselanhänger erkennt."
+}
\ No newline at end of file
diff --git a/services/scanner/src/messages/en.js b/services/scanner/src/messages/en.js
deleted file mode 100644
index 36eb7f4..0000000
--- a/services/scanner/src/messages/en.js
+++ /dev/null
@@ -1,72 +0,0 @@
-export const en = {
- // SITE
- 'scanner.site.config.setupScanner': 'Test scanner',
- 'scanner.site.config.dontShowAgain': 'Don`t show this message again',
- 'scanner.site.config.success': 'The scanner is configured correctly',
- 'scanner.site.config.error': 'The scanner is not configured correctly',
- 'scanner.site.title': 'luca QR Code Reader',
- 'scanner.site.meta':
- 'This tool tracks check-ins if you use an external QR code reader. ',
- 'camScanner.site.title': 'luca Scanner',
- 'camScanner.site.meta':
- 'This QR code scanner is connected to your location and can be used on a smartphone or tablet that has a camera to check in your guests.',
- // HEADER
- 'header.subtitle': 'Scanner',
- // FORM
- 'form.checkins': 'Successful check-ins at ',
- 'form.checkinsSuffix': '(current/total):',
- // ERRORS
- 'error.decodeFailed': 'Error occured while reading the QR code!',
- 'error.versionNotSupported':
- 'This QR-Code version is no longer supported. Please update the app!',
- 'error.duplicateCheckin': 'Already checked in!',
- 'error.checkinError': 'Error occured during check-in!',
- 'error.timeUp': 'Your event is closed.',
- 'error.getScannerWrapper': 'Could not find the requested scanner.',
- 'error.browserNotSupported':
- 'Please use Safari. This browser is not supported on iOS.',
- 'error.timestampOutdated': 'The QR code is expired.',
- 'error.genericScanner': 'The scanner had a problem. Please try again.',
- 'error.noUserData':
- "It seems like you haven't registered your badge yet. If you've just registered you badge please wait a few minutes and try again.",
- 'error.noBloomFilter': 'Cannot verify whether the badge was registered.',
- 'error.wrongLocalTime':
- 'Your system clock seems to be out of sync. Please check your time settings.',
- 'error.accountDeleted':
- 'Your account has been deleted. You cannot check in any more guests.',
- 'error.badgeV3Unsupported':
- 'This badge (v3) is denied starting 09/01/2021. You can no longer use it for checkins. Please let your guest know.',
- // ADDITIONAL DATA
- 'additionalData.isRequired': 'This field is required for your check-in.',
- 'additionalData.info':
- 'The location requires additional information in order to check in guests. Please provide the following information.',
- // MODALS
- 'modal.additionalData.table': 'Table number',
- 'modal.additionalData.button': 'Send',
- 'modal.additionalData.error': 'Failed to add additional data',
- 'modal.additionalData.success': 'Additional data added',
- 'modal.additionalData.title': 'Add more additional information',
- // LOADING
- loading: 'Loading...',
- 'location.defaultName': 'General',
- // ERROR SCREEN
- 'error.headline': "This didn't work!",
- 'error.description':
- 'Something went wrong. Please try reloading the page or come back later. If the error still occurs, please get in touch with locations@luca-app.de.',
- 'authentication.background.legal.agb': 'Terms and conditions',
- // LICENSES
- 'license.name': 'Name',
- 'license.version': 'Version',
- 'license.license': 'License',
- 'license.license.full': 'View all licenses',
- // Countdown
- 'countdown.info':
- 'The check in count can differ to the real counts if guests check in via different methods and devices. After a scan the counter updates automatically. Otherwise the counter is updates every five minutes.',
- 'countdown.text': 'Latest update:',
- 'countdown.button': 'UPDATE',
- // Footer
- 'location.footer.faq': 'FAQ',
- 'location.footer.repository': 'GitLab',
- // Modal
- 'location.modal.okay': 'okay',
-};
diff --git a/services/scanner/src/messages/en.json b/services/scanner/src/messages/en.json
new file mode 100644
index 0000000..c2f8fec
--- /dev/null
+++ b/services/scanner/src/messages/en.json
@@ -0,0 +1,49 @@
+{
+ "scanner.site.config.setupScanner": "Test scanner",
+ "scanner.site.config.dontShowAgain": "Don`t show this message again",
+ "scanner.site.config.success": "The scanner is configured correctly",
+ "scanner.site.config.error": "The scanner is not configured correctly",
+ "scanner.site.title": "luca QR Code Reader",
+ "scanner.site.meta": "This tool tracks check-ins if you use an external QR code reader. ",
+ "camScanner.site.title": "luca Scanner",
+ "camScanner.site.meta": "This QR code scanner is connected to your location and can be used on a smartphone or tablet that has a camera to check in your guests.",
+ "header.subtitle": "Scanner",
+ "form.checkins": "Successful check-ins at ",
+ "form.checkinsSuffix": "(current/total):",
+ "error.decodeFailed": "Error occured while reading the QR code!",
+ "error.versionNotSupported": "This QR-Code version is no longer supported. Please update the app!",
+ "error.duplicateCheckin": "Already checked in!",
+ "error.timeUp": "Your event is closed.",
+ "error.getScannerWrapper": "Could not find the requested scanner.",
+ "error.browserNotSupported": "Please use Safari. This browser is not supported on iOS.",
+ "error.timestampOutdated": "The QR code is expired.",
+ "error.genericScanner": "The scanner had a problem. Please try again.",
+ "error.noUserData": "It seems like the guest hasn't registered their badge yet. If they did this recently, please wait a moment and then retry. After registration, it takes a little while until the system recognises badges.",
+ "error.noBloomFilter": "Cannot verify whether the badge was registered.",
+ "error.wrongLocalTime": "Your system clock seems to be out of sync. Please check your time settings.",
+ "error.accountDeleted": "Your account has been deleted. You cannot check in any more guests.",
+ "error.badgeV3Unsupported": "This badge (v3) is denied starting 09/01/2021. You can no longer use it for checkins. Please let your guest know.",
+ "additionalData.isRequired": "This field is required for your check-in.",
+ "additionalData.info": "The location requires additional information in order to check in guests. Please provide the following information.",
+ "modal.additionalData.table": "Table number",
+ "modal.additionalData.button": "Send",
+ "modal.additionalData.error": "Failed to add additional data",
+ "modal.additionalData.success": "Additional data added",
+ "modal.additionalData.title": "Add more additional information",
+ "loading": "Loading...",
+ "location.defaultName": "General",
+ "error.headline": "This didn't work!",
+ "error.description": "Something went wrong. Please try reloading the page or come back later. If the error still occurs, please get in touch with locations@luca-app.de.",
+ "authentication.background.legal.agb": "Terms and conditions",
+ "license.name": "Name",
+ "license.version": "Version",
+ "license.license": "License",
+ "license.license.full": "View all licenses",
+ "countdown.info": "The check in count can differ to the real counts if guests check in via different methods and devices. After a scan the counter updates automatically. Otherwise the counter is updates every five minutes.",
+ "countdown.text": "Latest update:",
+ "countdown.button": "UPDATE",
+ "location.footer.faq": "FAQ",
+ "location.footer.repository": "GitLab",
+ "location.modal.okay": "okay",
+ "error.checkinError": "Error occured during check-in!"
+}
\ No newline at end of file
diff --git a/services/scanner/src/messages/index.js b/services/scanner/src/messages/index.js
index b16fdd5..d3048ed 100644
--- a/services/scanner/src/messages/index.js
+++ b/services/scanner/src/messages/index.js
@@ -1,5 +1,5 @@
-import { en } from './en';
-import { de } from './de';
+import en from './en.json';
+import de from './de.json';
export const messages = {
en,
diff --git a/services/scanner/yarn.lock b/services/scanner/yarn.lock
index 4d9a19c..4c3a796 100644
--- a/services/scanner/yarn.lock
+++ b/services/scanner/yarn.lock
@@ -26,9 +26,9 @@
rc-util "^5.9.4"
"@ant-design/react-slick@~0.28.1":
- version "0.28.3"
- resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.3.tgz#ad5cf1cf50363c1a3842874d69d0ce1f26696e71"
- integrity sha512-u3onF2VevGRbkGbgpldVX/nzd7LFtLeZJE0x2xIFT2qYHKkJZ6QT/jQ7KqYK4UpeTndoyrbMqLN4DiJza4BVBg==
+ version "0.28.4"
+ resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.4.tgz#8b296b87ad7c7ae877f2a527b81b7eebd9dd29a9"
+ integrity sha512-j9eAHTn7GxbXUFNknJoHS2ceAsqrQi2j8XykjZE1IXCD8kJF+t28EvhBLniDpbOsBk/3kjalnhriTfZcjBHNqg==
dependencies:
"@babel/runtime" "^7.10.4"
classnames "^2.2.5"
@@ -57,7 +57,7 @@
dependencies:
"@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0":
+"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
@@ -85,19 +85,19 @@
source-map "^0.5.0"
"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
- integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
+ version "7.15.5"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
+ integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helpers" "^7.14.8"
- "@babel/parser" "^7.15.0"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-compilation-targets" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
+ "@babel/helpers" "^7.15.4"
+ "@babel/parser" "^7.15.5"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -106,59 +106,59 @@
source-map "^0.5.0"
"@babel/eslint-parser@^7.12.16":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz#b54f06e04d0e93aebcba99f89251e3bf0ee39f21"
- integrity sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.4.tgz#46385943726291fb3e8db99522c8099b15684387"
+ integrity sha512-hPMIAmGNbmQzXJIo2P43Zj9UhRmGev5f9nqdBFOWNGDGh6XKmjby79woBvg6y0Jur6yRfQBneDbUQ8ZVc1krFw==
dependencies:
eslint-scope "^5.1.1"
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.12.1", "@babel/generator@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
- integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==
+"@babel/generator@^7.12.1", "@babel/generator@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
+ integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.4"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
- integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
+ integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
- integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+ integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-explode-assignable-expression" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818"
- integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+ integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
dependencies:
"@babel/compat-data" "^7.15.0"
"@babel/helper-validator-option" "^7.14.5"
browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7"
- integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==
+"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
+ integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-member-expression-to-functions" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
"@babel/helper-create-regexp-features-plugin@^7.14.5":
version "7.14.5"
@@ -182,115 +182,115 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
- integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
+"@babel/helper-explode-assignable-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+ integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-function-name@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
- integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+ integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
dependencies:
- "@babel/helper-get-function-arity" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-get-function-arity" "^7.15.4"
+ "@babel/template" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-get-function-arity@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
- integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
+"@babel/helper-get-function-arity@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+ integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-hoist-variables@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
- integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+"@babel/helper-hoist-variables@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+ integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-member-expression-to-functions@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b"
- integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==
+"@babel/helper-member-expression-to-functions@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+ integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
- integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+ integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08"
- integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz#962cc629a7f7f9a082dd62d0307fa75fe8788d7c"
+ integrity sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==
dependencies:
- "@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-simple-access" "^7.14.8"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-module-imports" "^7.15.4"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-simple-access" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
"@babel/helper-validator-identifier" "^7.14.9"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-optimise-call-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
- integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+"@babel/helper-optimise-call-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+ integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-"@babel/helper-remap-async-to-generator@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
- integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
+"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
+ integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-wrap-function" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-wrap-function" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4"
- integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+ integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/helper-member-expression-to-functions" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-simple-access@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
- integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
+"@babel/helper-simple-access@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+ integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
dependencies:
- "@babel/types" "^7.14.8"
+ "@babel/types" "^7.15.4"
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
- integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
+ integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-split-export-declaration@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
- integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+"@babel/helper-split-export-declaration@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+ integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9":
version "7.14.9"
@@ -302,24 +302,24 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-"@babel/helper-wrap-function@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
- integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
+"@babel/helper-wrap-function@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
+ integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
dependencies:
- "@babel/helper-function-name" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.8":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357"
- integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+ integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
dependencies:
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
version "7.14.5"
@@ -330,27 +330,27 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0", "@babel/parser@^7.8.3":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
- integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.15.4", "@babel/parser@^7.15.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.3":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
+ integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
- integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
+ integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a"
- integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==
+"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
+ integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-remap-async-to-generator" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.15.4"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-proposal-class-properties@7.12.1":
@@ -369,12 +369,12 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-class-static-block@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
- integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
+"@babel/plugin-proposal-class-static-block@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
+ integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
@@ -451,16 +451,16 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
- integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
+"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.15.6":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
+ integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/compat-data" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.15.4"
"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.14.5":
version "7.14.5"
@@ -496,13 +496,13 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-private-property-in-object@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
- integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
+"@babel/plugin-proposal-private-property-in-object@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
+ integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
@@ -677,24 +677,24 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.5":
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.15.3":
version "7.15.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f"
- integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==
+"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
+ integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
globals "^11.1.0"
"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.14.5":
@@ -742,10 +742,10 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-flow" "^7.12.1"
-"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
- integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
+"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
+ integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -780,25 +780,25 @@
"@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281"
- integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==
+"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
+ integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
dependencies:
- "@babel/helper-module-transforms" "^7.15.0"
+ "@babel/helper-module-transforms" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.8"
+ "@babel/helper-simple-access" "^7.15.4"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
- integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
+"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
+ integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
dependencies:
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-hoist-variables" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.9"
babel-plugin-dynamic-import-node "^2.3.3"
"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.14.5":
@@ -831,10 +831,10 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-replace-supers" "^7.14.5"
-"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
- integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
+"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
+ integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -967,11 +967,11 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-typescript@^7.12.1":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e"
- integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
+ integrity sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.15.0"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript" "^7.14.5"
@@ -1063,29 +1063,29 @@
semver "^5.5.0"
"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464"
- integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
+ integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
dependencies:
"@babel/compat-data" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-async-generator-functions" "^7.14.9"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
+ "@babel/plugin-proposal-async-generator-functions" "^7.15.4"
"@babel/plugin-proposal-class-properties" "^7.14.5"
- "@babel/plugin-proposal-class-static-block" "^7.14.5"
+ "@babel/plugin-proposal-class-static-block" "^7.15.4"
"@babel/plugin-proposal-dynamic-import" "^7.14.5"
"@babel/plugin-proposal-export-namespace-from" "^7.14.5"
"@babel/plugin-proposal-json-strings" "^7.14.5"
"@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
"@babel/plugin-proposal-numeric-separator" "^7.14.5"
- "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
+ "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
"@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
"@babel/plugin-proposal-private-methods" "^7.14.5"
- "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
+ "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
"@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-class-properties" "^7.12.13"
@@ -1104,25 +1104,25 @@
"@babel/plugin-transform-arrow-functions" "^7.14.5"
"@babel/plugin-transform-async-to-generator" "^7.14.5"
"@babel/plugin-transform-block-scoped-functions" "^7.14.5"
- "@babel/plugin-transform-block-scoping" "^7.14.5"
- "@babel/plugin-transform-classes" "^7.14.9"
+ "@babel/plugin-transform-block-scoping" "^7.15.3"
+ "@babel/plugin-transform-classes" "^7.15.4"
"@babel/plugin-transform-computed-properties" "^7.14.5"
"@babel/plugin-transform-destructuring" "^7.14.7"
"@babel/plugin-transform-dotall-regex" "^7.14.5"
"@babel/plugin-transform-duplicate-keys" "^7.14.5"
"@babel/plugin-transform-exponentiation-operator" "^7.14.5"
- "@babel/plugin-transform-for-of" "^7.14.5"
+ "@babel/plugin-transform-for-of" "^7.15.4"
"@babel/plugin-transform-function-name" "^7.14.5"
"@babel/plugin-transform-literals" "^7.14.5"
"@babel/plugin-transform-member-expression-literals" "^7.14.5"
"@babel/plugin-transform-modules-amd" "^7.14.5"
- "@babel/plugin-transform-modules-commonjs" "^7.15.0"
- "@babel/plugin-transform-modules-systemjs" "^7.14.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.15.4"
+ "@babel/plugin-transform-modules-systemjs" "^7.15.4"
"@babel/plugin-transform-modules-umd" "^7.14.5"
"@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
"@babel/plugin-transform-new-target" "^7.14.5"
"@babel/plugin-transform-object-super" "^7.14.5"
- "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.15.4"
"@babel/plugin-transform-property-literals" "^7.14.5"
"@babel/plugin-transform-regenerator" "^7.14.5"
"@babel/plugin-transform-reserved-words" "^7.14.5"
@@ -1134,7 +1134,7 @@
"@babel/plugin-transform-unicode-escapes" "^7.14.5"
"@babel/plugin-transform-unicode-regex" "^7.14.5"
"@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.6"
babel-plugin-polyfill-corejs2 "^0.2.2"
babel-plugin-polyfill-corejs3 "^0.2.2"
babel-plugin-polyfill-regenerator "^0.2.2"
@@ -1186,9 +1186,9 @@
"@babel/plugin-transform-typescript" "^7.12.1"
"@babel/runtime-corejs3@^7.10.2":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d"
- integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz#403139af262b9a6e8f9ba04a6fdcebf8de692bf1"
+ integrity sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==
dependencies:
core-js-pure "^3.16.0"
regenerator-runtime "^0.13.4"
@@ -1200,48 +1200,41 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
- integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
- dependencies:
- regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.12.13", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.10.4", "@babel/template@^7.14.5", "@babel/template@^7.3.3":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
- integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+"@babel/template@^7.10.4", "@babel/template@^7.15.4", "@babel/template@^7.3.3":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+ integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
- integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+ integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-hoist-variables" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
- integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+ integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
dependencies:
"@babel/helper-validator-identifier" "^7.14.9"
to-fast-properties "^2.0.0"
@@ -1391,6 +1384,11 @@
intl-messageformat "9.9.1"
tslib "^2.1.0"
+"@gar/promisify@^1.0.1":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
+ integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+
"@hapi/address@2.x.x":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -1662,6 +1660,14 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
+"@npmcli/fs@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f"
+ integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==
+ dependencies:
+ "@gar/promisify" "^1.0.1"
+ semver "^7.3.5"
+
"@npmcli/move-file@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -1856,9 +1862,9 @@
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
- version "7.1.15"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024"
- integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==
+ version "7.1.16"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
+ integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
@@ -1964,9 +1970,9 @@
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
"@types/mdast@^3.0.0":
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.7.tgz#cba63d0cc11eb1605cea5c0ad76e02684394166b"
- integrity sha512-YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg==
+ version "3.0.10"
+ resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+ integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
dependencies:
"@types/unist" "*"
@@ -1981,9 +1987,9 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/node@*":
- version "16.4.13"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d"
- integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==
+ version "16.9.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9"
+ integrity sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@@ -2020,16 +2026,7 @@
hoist-non-react-statics "^3.3.0"
redux "^4.0.0"
-"@types/react@*":
- version "17.0.17"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.17.tgz#1772d3d5425128e0635a716f49ef57c2955df055"
- integrity sha512-nrfi7I13cAmrd0wje8czYpf5SFbryczCtPzFc6ijqvdjKcyA3tCvGxwchOUlxb2ucBPuJ9Y3oUqKrRqZvrz0lw==
- dependencies:
- "@types/prop-types" "*"
- "@types/scheduler" "*"
- csstype "^3.0.2"
-
-"@types/react@17":
+"@types/react@*", "@types/react@17":
version "17.0.21"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.21.tgz#069c43177cd419afaab5ce26bb4e9056549f7ea6"
integrity sha512-GzzXCpOthOjXvrAUFQwU/svyxu658cwu00Q9ugujS4qc1zXgLFaO0kS2SLOaMWLt2Jik781yuHCWB7UcYdGAeQ==
@@ -2096,9 +2093,9 @@
source-map "^0.6.1"
"@types/webpack@^4.41.8":
- version "4.41.30"
- resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc"
- integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==
+ version "4.41.31"
+ resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa"
+ integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==
dependencies:
"@types/node" "*"
"@types/tapable" "^1"
@@ -2120,27 +2117,27 @@
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz#808d206e2278e809292b5de752a91105da85860b"
- integrity sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz#e938603a136f01dcabeece069da5fb2e331d4498"
+ integrity sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==
dependencies:
- "@typescript-eslint/experimental-utils" "4.29.1"
- "@typescript-eslint/scope-manager" "4.29.1"
+ "@typescript-eslint/experimental-utils" "4.31.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
debug "^4.3.1"
functional-red-black-tree "^1.0.1"
regexpp "^3.1.0"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@4.29.1", "@typescript-eslint/experimental-utils@^4.0.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz#0af2b17b0296b60c6b207f11062119fa9c5a8994"
- integrity sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==
+"@typescript-eslint/experimental-utils@4.31.1", "@typescript-eslint/experimental-utils@^4.0.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz#0c900f832f270b88e13e51753647b02d08371ce5"
+ integrity sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==
dependencies:
"@types/json-schema" "^7.0.7"
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
@@ -2156,32 +2153,32 @@
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d"
- integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.1.tgz#8f9a2672033e6f6d33b1c0260eebdc0ddf539064"
+ integrity sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==
dependencies:
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
debug "^4.3.1"
-"@typescript-eslint/scope-manager@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358"
- integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==
+"@typescript-eslint/scope-manager@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz#0c21e8501f608d6a25c842fcf59541ef4f1ab561"
+ integrity sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
"@typescript-eslint/types@3.10.1":
version "3.10.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
-"@typescript-eslint/types@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
- integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
+"@typescript-eslint/types@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.1.tgz#5f255b695627a13401d2fdba5f7138bc79450d66"
+ integrity sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==
"@typescript-eslint/typescript-estree@3.10.1":
version "3.10.1"
@@ -2197,13 +2194,13 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f"
- integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==
+"@typescript-eslint/typescript-estree@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz#4a04d5232cf1031232b7124a9c0310b577a62d17"
+ integrity sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
debug "^4.3.1"
globby "^11.0.3"
is-glob "^4.0.1"
@@ -2217,12 +2214,12 @@
dependencies:
eslint-visitor-keys "^1.1.0"
-"@typescript-eslint/visitor-keys@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d"
- integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==
+"@typescript-eslint/visitor-keys@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz#f2e7a14c7f20c4ae07d7fc3c5878c4441a1da9cc"
+ integrity sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
eslint-visitor-keys "^2.0.0"
"@webassemblyjs/ast@1.9.0":
@@ -2422,9 +2419,9 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.2.4:
- version "8.4.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
- integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+ integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
address@1.1.2, address@^1.0.1:
version "1.1.2"
@@ -2475,9 +2472,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^8.0.1:
- version "8.6.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
- integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
+ version "8.6.3"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+ integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -2522,9 +2519,9 @@ ansi-regex@^4.1.0:
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
ansi-regex@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
- integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+ integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1"
@@ -2653,7 +2650,7 @@ array-flatten@^2.1.0:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.1.1, array-includes@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -2829,9 +2826,9 @@ available-typed-arrays@^1.0.5:
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
axe-core@^4.0.2:
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.2.tgz#fcf8777b82c62cfc69c7e9f32c0d2226287680e7"
- integrity sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg==
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.3.tgz#b55cd8e8ddf659fe89b064680e1c6a4dceab0325"
+ integrity sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==
axobject-query@^2.2.0:
version "2.2.0"
@@ -3102,9 +3099,9 @@ bfj@^7.0.2:
tryer "^1.0.1"
big-integer@^1.6.16:
- version "1.6.48"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
- integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
+ version "1.6.49"
+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.49.tgz#f6817d3ea5d4f3fb19e24df9f4b1b4471a8328ce"
+ integrity sha512-KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw==
big.js@^5.2.2:
version "5.2.2"
@@ -3299,7 +3296,7 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.16.7, browserslist@^4.6.2, browserslist@^4.6.4:
+browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.0, browserslist@^4.6.2, browserslist@^4.6.4:
version "4.16.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -3388,10 +3385,11 @@ cacache@^12.0.2:
y18n "^4.0.0"
cacache@^15.0.5:
- version "15.2.0"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389"
- integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==
+ version "15.3.0"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+ integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
dependencies:
+ "@npmcli/fs" "^1.0.0"
"@npmcli/move-file" "^1.0.1"
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -3500,9 +3498,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001255"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"
- integrity sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==
+ version "1.0.30001258"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz#b604eed80cc54a578e4bf5a02ae3ed49f869d252"
+ integrity sha512-RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA==
capture-exit@^2.0.0:
version "2.0.0"
@@ -3752,9 +3750,9 @@ color@^3.0.0:
color-string "^1.6.0"
colorette@^1.2.1, colorette@^1.2.2:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
- integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+ integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
combined-stream@^1.0.8:
version "1.0.8"
@@ -3802,6 +3800,17 @@ compressible@~2.0.16:
dependencies:
mime-db ">= 1.43.0 < 2"
+compression-webpack-plugin@6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz#ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"
+ integrity sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==
+ dependencies:
+ cacache "^15.0.5"
+ find-cache-dir "^3.3.1"
+ schema-utils "^3.0.0"
+ serialize-javascript "^5.0.1"
+ webpack-sources "^1.4.3"
+
compression@^1.7.4:
version "1.7.4"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
@@ -3939,17 +3948,17 @@ copy-to-clipboard@^3.2.0:
toggle-selection "^1.0.6"
core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.2:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d"
- integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.17.3.tgz#b39c8e4dec71ecdc735c653ce5233466e561324e"
+ integrity sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==
dependencies:
- browserslist "^4.16.7"
+ browserslist "^4.17.0"
semver "7.0.0"
core-js-pure@^3.16.0:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e"
- integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.17.3.tgz#98ea3587188ab7ef4695db6518eeb71aec42604a"
+ integrity sha512-YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ==
core-js@^2.4.0:
version "2.6.12"
@@ -3957,14 +3966,14 @@ core-js@^2.4.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.5:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249"
- integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e"
+ integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==
core-util-is@~1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
- integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
cosmiconfig@^5.0.0:
version "5.2.1"
@@ -3988,9 +3997,9 @@ cosmiconfig@^6.0.0:
yaml "^1.7.2"
cosmiconfig@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
- integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
dependencies:
"@types/parse-json" "^4.0.0"
import-fresh "^3.2.1"
@@ -4316,9 +4325,9 @@ cssstyle@^2.3.0:
cssom "~0.3.6"
csstype@^3.0.2:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
- integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b"
+ integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==
cuint@^0.2.2:
version "0.2.2"
@@ -4353,14 +4362,14 @@ data-urls@^2.0.0:
whatwg-url "^8.0.0"
date-fns@2.x:
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
- integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
+ version "2.24.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d"
+ integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==
dayjs@1.x:
- version "1.10.6"
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
- integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==
+ version "1.10.7"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
+ integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
@@ -4424,9 +4433,9 @@ deep-equal@^1.0.1:
regexp.prototype.flags "^1.2.0"
deep-is@^0.1.3, deep-is@~0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
- integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+ integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
deepmerge@^4.2.2:
version "4.2.2"
@@ -4643,9 +4652,9 @@ domhandler@^2.3.0:
domelementtype "1"
domhandler@^4.0.0, domhandler@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
- integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
+ integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
dependencies:
domelementtype "^2.2.0"
@@ -4658,9 +4667,9 @@ domutils@^1.5.1, domutils@^1.7.0:
domelementtype "1"
domutils@^2.5.2, domutils@^2.6.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
- integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+ integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
dependencies:
dom-serializer "^1.0.1"
domelementtype "^2.2.0"
@@ -4724,9 +4733,9 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.723:
- version "1.3.802"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz#0afa989321de3e904ac653ee79e0d642883731a1"
- integrity sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg==
+ version "1.3.842"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f"
+ integrity sha512-P/nDMPIYdb2PyqCQwhTXNi5JFjX1AsDVR0y6FrHw752izJIAJ+Pn5lugqyBq4tXeRSZBMBb2ZGvRGB1djtELEQ==
elliptic@6.5.4, elliptic@^6.5.3:
version "6.5.4"
@@ -4830,30 +4839,7 @@ error-stack-parser@^2.0.6:
dependencies:
stackframe "^1.1.1"
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
- version "1.18.5"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19"
- integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==
- dependencies:
- call-bind "^1.0.2"
- es-to-primitive "^1.2.1"
- function-bind "^1.1.1"
- get-intrinsic "^1.1.1"
- has "^1.0.3"
- has-symbols "^1.0.2"
- internal-slot "^1.0.3"
- is-callable "^1.2.3"
- is-negative-zero "^2.0.1"
- is-regex "^1.1.3"
- is-string "^1.0.6"
- object-inspect "^1.11.0"
- object-keys "^1.1.1"
- object.assign "^4.1.2"
- string.prototype.trimend "^1.0.4"
- string.prototype.trimstart "^1.0.4"
- unbox-primitive "^1.0.1"
-
-es-abstract@^1.18.5:
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5:
version "1.18.6"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
@@ -4984,14 +4970,6 @@ eslint-config-react-app@^6.0.0:
dependencies:
confusing-browser-globals "^1.0.10"
-eslint-import-resolver-node@^0.3.5:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.5.tgz#939bbb0f74e179e757ca87f7a4a890dabed18ac4"
- integrity sha512-XMoPKjSpXbkeJ7ZZ9icLnJMTY5Mc1kZbCakHquaFsXPpyWOwK0TK6CODO+0ca54UoM9LKOxyUNnoVZRl8TeaAg==
- dependencies:
- debug "^3.2.7"
- resolve "^1.20.0"
-
eslint-import-resolver-node@^0.3.6:
version "0.3.6"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
@@ -5009,14 +4987,14 @@ eslint-module-utils@^2.6.2:
pkg-dir "^2.0.0"
eslint-plugin-flowtype@^5.2.0:
- version "5.9.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.9.0.tgz#8d2d81d3d79bb53470ed62b97409b31684757e30"
- integrity sha512-aBUVPA5Wt0XyuV3Wg8flfVqYJR6yR2nRLuyPwoTjCg5VTk4G1X1zQpInr39tUGgRxqrA+d+B9GYK4+/d1i0Rfw==
+ version "5.10.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz#7764cc63940f215bf3f0bd2d9a1293b2b9b2b4bb"
+ integrity sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==
dependencies:
lodash "^4.17.15"
string-natural-compare "^3.0.1"
-eslint-plugin-import@2.24.2:
+eslint-plugin-import@2.24.2, eslint-plugin-import@^2.22.1:
version "2.24.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
@@ -5037,31 +5015,10 @@ eslint-plugin-import@2.24.2:
resolve "^1.20.0"
tsconfig-paths "^3.11.0"
-eslint-plugin-import@^2.22.1:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz#697ffd263e24da5e84e03b282f5fb62251777177"
- integrity sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg==
- dependencies:
- array-includes "^3.1.3"
- array.prototype.flat "^1.2.4"
- debug "^2.6.9"
- doctrine "^2.1.0"
- eslint-import-resolver-node "^0.3.5"
- eslint-module-utils "^2.6.2"
- find-up "^2.0.0"
- has "^1.0.3"
- is-core-module "^2.4.0"
- minimatch "^3.0.4"
- object.values "^1.1.3"
- pkg-up "^2.0.0"
- read-pkg-up "^3.0.0"
- resolve "^1.20.0"
- tsconfig-paths "^3.9.0"
-
eslint-plugin-jest@^24.1.0:
- version "24.4.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262"
- integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==
+ version "24.4.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.2.tgz#9e8cf05ee6a0e3025e6149df2f36950abfa8d5bf"
+ integrity sha512-jNMnqwX75z0RXRMXkxwb/+9ylKJYJLJ8nT8nBT0XFM5qx4IQGxP4edMawa0qGkSbHae0BDPBmi8I2QF0/F04XQ==
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
@@ -5119,13 +5076,14 @@ eslint-plugin-react@7.25.1:
string.prototype.matchall "^4.0.5"
eslint-plugin-react@^7.21.5:
- version "7.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
- integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
+ version "7.25.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.2.tgz#d567a217d306b76dd110561f28074e2328ae38f8"
+ integrity sha512-elx4585wgmryanJK4C5IoSKQyVZ+e7H0t2JOOtJNBql0cuercvSShvRReuLBbfx8687yW5yv+UL7pXwMsd6adQ==
dependencies:
array-includes "^3.1.3"
array.prototype.flatmap "^1.2.4"
doctrine "^2.1.0"
+ estraverse "^5.2.0"
has "^1.0.3"
jsx-ast-utils "^2.4.1 || ^3.0.0"
minimatch "^3.0.4"
@@ -5466,11 +5424,11 @@ express@^4.17.1:
vary "~1.1.2"
ext@^1.1.2:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
- integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
+ integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
dependencies:
- type "^2.0.0"
+ type "^2.5.0"
extend-shallow@^2.0.1:
version "2.0.1"
@@ -5548,9 +5506,9 @@ fastest-levenshtein@^1.0.12:
integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
fastq@^1.6.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
- integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+ integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
dependencies:
reusify "^1.0.4"
@@ -5638,9 +5596,9 @@ find-cache-dir@^2.1.0:
pkg-dir "^3.0.0"
find-cache-dir@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
- integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+ integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
@@ -5695,9 +5653,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
- integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+ version "1.14.4"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+ integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
for-in@^1.0.2:
version "1.0.2"
@@ -5936,9 +5894,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.6.0, globals@^13.9.0:
- version "13.10.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676"
- integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==
+ version "13.11.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
+ integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
dependencies:
type-fest "^0.20.2"
@@ -6398,9 +6356,9 @@ immer@8.0.1:
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
"immutable@^3.8.1 || ^4.0.0-rc.1":
- version "4.0.0-rc.14"
- resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.14.tgz#29ba96631ec10867d1348515ac4e6bdba462f071"
- integrity sha512-pfkvmRKJSoW7JFx0QeYlAmT+kNYvn5j0u7bnpNq4N2RCvHSTlLT208G8jgaquNe+Q8kCPHKOSpxJkyvLDpYq0w==
+ version "4.0.0-rc.15"
+ resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.15.tgz#c30056f05eaaf5650fd15230586688fdd15c54bc"
+ integrity sha512-v8+A3sNyaieoP9dHegl3tEYnIZa7vqNiSv0U6D7YddiZi34VjKy4GsIxrRHj2d8+CS3MeiVja5QyNe4JO/aEXA==
import-cwd@^2.0.0:
version "2.1.0"
@@ -6608,9 +6566,11 @@ is-arrayish@^0.3.1:
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-bigint@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.3.tgz#fc9d9e364210480675653ddaea0518528d49a581"
- integrity sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+ integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+ dependencies:
+ has-bigints "^1.0.1"
is-binary-path@^1.0.0:
version "1.0.1"
@@ -6644,7 +6604,7 @@ is-buffer@^2.0.0:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-is-callable@^1.1.4, is-callable@^1.2.3, is-callable@^1.2.4:
+is-callable@^1.1.4, is-callable@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
@@ -6668,14 +6628,7 @@ is-color-stop@^1.0.0:
rgb-regex "^1.0.1"
rgba-regex "^1.0.0"
-is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.4.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
- integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
- dependencies:
- has "^1.0.3"
-
-is-core-module@^2.6.0:
+is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
@@ -6875,7 +6828,7 @@ is-potential-custom-element-name@^1.0.1:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-is-regex@^1.0.4, is-regex@^1.1.3, is-regex@^1.1.4:
+is-regex@^1.0.4, is-regex@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -6913,7 +6866,7 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-is-string@^1.0.5, is-string@^1.0.6, is-string@^1.0.7:
+is-string@^1.0.5, is-string@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
@@ -7578,7 +7531,7 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
-json5@^2.1.2, json5@^2.2.0:
+json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -7623,11 +7576,11 @@ jsqr@^1.2.0:
integrity sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==
"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
- integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+ integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
dependencies:
- array-includes "^3.1.2"
+ array-includes "^3.1.3"
object.assign "^4.1.2"
jwa@^1.4.1:
@@ -8029,9 +7982,9 @@ map-visit@^1.0.0:
object-visit "^1.0.0"
match-sorter@^6.0.2:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.0.tgz#454a1b31ed218cddbce6231a0ecb5fdc549fed01"
- integrity sha512-efYOf/wUpNb8FgNY+cOD2EIJI1S5I7YPKsw0LBp7wqPh5pmMS6i/wr3ZWwfwrAw1NvqTA2KUReVRWDX84lUcOQ==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda"
+ integrity sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==
dependencies:
"@babel/runtime" "^7.12.5"
remove-accents "0.4.2"
@@ -8200,11 +8153,16 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.49.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.49.0:
version "1.49.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
+"mime-db@>= 1.43.0 < 2":
+ version "1.50.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+ integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
version "2.1.32"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
@@ -8303,9 +8261,9 @@ minipass-pipeline@^1.2.2:
minipass "^3.0.0"
minipass@^3.0.0, minipass@^3.1.1:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
- integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732"
+ integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==
dependencies:
yallist "^4.0.0"
@@ -8430,9 +8388,9 @@ nano-time@1.0.0:
big-integer "^1.6.16"
nanoid@^3.1.23:
- version "3.1.23"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
- integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+ version "3.1.25"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+ integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
nanomatch@^1.2.9:
version "1.2.13"
@@ -8557,9 +8515,9 @@ node-notifier@^8.0.0:
which "^2.0.2"
node-releases@^1.1.71:
- version "1.1.74"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e"
- integrity sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw==
+ version "1.1.75"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+ integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
@@ -8572,12 +8530,12 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
validate-npm-package-license "^3.0.1"
normalize-package-data@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
- integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+ integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
dependencies:
hosted-git-info "^4.0.1"
- resolve "^1.20.0"
+ is-core-module "^2.5.0"
semver "^7.3.4"
validate-npm-package-license "^3.0.1"
@@ -8640,9 +8598,9 @@ nth-check@^1.0.2:
boolbase "~1.0.0"
nth-check@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
- integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+ integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
dependencies:
boolbase "^1.0.0"
@@ -8740,7 +8698,7 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.0, object.values@^1.1.3, object.values@^1.1.4:
+object.values@^1.1.0, object.values@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
@@ -10201,9 +10159,9 @@ rc-checkbox@~2.3.0:
classnames "^2.2.1"
rc-collapse@~3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.1.tgz#2421d454e85781d1cf2f04f906918e0677d779e6"
- integrity sha512-/oetKApTHzGGeR8Q8vD168EXkCs2MpEIrURGyy2D+LrrJd29LY/huuIMvOiJoSV6W3bcGhJqIdgHtg1Dxn1smA==
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.2.tgz#76028a811b845d03d9460ccc409c7ea8ad09db14"
+ integrity sha512-HujcKq7mghk/gVKeI6EjzTbb8e19XUZpakrYazu1MblEZ3Hu3WBMSN4A3QmvbF6n1g7x6lUlZvsHZ5shABWYOQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
@@ -10361,9 +10319,9 @@ rc-rate@~2.9.0:
rc-util "^5.0.1"
rc-resize-observer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.0.tgz#97fb89856f62fec32ab6e40933935cf58e2e102d"
- integrity sha512-RgKGukg1mlzyGdvzF7o/LGFC8AeoMH9aGzXTUdp6m+OApvmRdUuOscq/Y2O45cJA+rXt1ApWlpFoOIioXL3AGg==
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.1.tgz#ccd0986543ff1bf49f8a581e8ac4bb714ed24dcd"
+ integrity sha512-OxO2mJI9e8610CAWBFfm52SPvWib0eNKjaSsRbbKHmLaJIxw944P+D61DlLJ/w2vuOjGNcalJu8VdqyNm/XCRg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -10436,9 +10394,9 @@ rc-tabs@~11.10.0:
rc-util "^5.5.0"
rc-textarea@^0.3.0, rc-textarea@~0.3.0:
- version "0.3.4"
- resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.4.tgz#1408a64c87b5e76db5c847699ef9ab5ee97dd6f9"
- integrity sha512-ILUYx831ZukQPv3m7R4RGRtVVWmL1LV4ME03L22mvT56US0DGCJJaRTHs4vmpcSjFHItph5OTmhodY4BOwy81A==
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.5.tgz#07ed445dddb94e5ae6764676923a49bddad9b2ec"
+ integrity sha512-qa+k5vDn9ct65qr+SgD2KwJ9Xz6P84lG2z+TDht/RBr71WnM/K61PqHUAcUyU6YqTJD26IXgjPuuhZR7HMw7eA==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -10495,16 +10453,7 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
-rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.9.4, rc-util@^5.9.8:
- version "5.13.2"
- resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.13.2.tgz#a8a0bb77743351841ba8bed6393e03b8d2f685c8"
- integrity sha512-eYc71XXGlp96RMzg01Mhq/T3BL6OOVTDSS0urFEuvpi+e7slhJRhaHGCKy2hqJm18m9ff7VoRoptplKu60dYog==
- dependencies:
- "@babel/runtime" "^7.12.5"
- react-is "^16.12.0"
- shallowequal "^1.1.0"
-
-rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
+rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
version "5.14.0"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.14.0.tgz#52c650e27570c2c47f7936c7d32eaec5212492a8"
integrity sha512-2vy6/Z1BJUcwLjm/UEJb/htjUTQPigITUIemCcFEo1fQevAumc9sA32x2z5qyWoa9uhrXbiAjSDpPIUqyg65sA==
@@ -10514,9 +10463,9 @@ rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
shallowequal "^1.1.0"
rc-virtual-list@^3.0.1, rc-virtual-list@^3.2.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.3.0.tgz#2f95a6ddbbf63d78b28662b57f1e69f7472762fe"
- integrity sha512-lVXpGWC6yMdwV2SHo6kc63WlqjCnb3eO72V726KA2/wh9KA6wi/swcdR3zAowuA8hJxG/lRANmY5kpLZ+Pz3iQ==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz#1f3b41391acf033a6c7e84c2f4e8a4ee0dc72807"
+ integrity sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==
dependencies:
classnames "^2.2.6"
rc-resize-observer "^1.0.0"
@@ -10866,14 +10815,14 @@ redux@4.1.1, redux@^4.0.0:
dependencies:
"@babel/runtime" "^7.9.2"
-regenerate-unicode-properties@^8.2.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
- integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+ integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
dependencies:
- regenerate "^1.4.0"
+ regenerate "^1.4.2"
-regenerate@^1.4.0:
+regenerate@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
@@ -10927,26 +10876,26 @@ regexpp@^3.1.0:
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
regexpu-core@^4.7.1:
- version "4.7.1"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
- integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
- dependencies:
- regenerate "^1.4.0"
- regenerate-unicode-properties "^8.2.0"
- regjsgen "^0.5.1"
- regjsparser "^0.6.4"
- unicode-match-property-ecmascript "^1.0.4"
- unicode-match-property-value-ecmascript "^1.2.0"
-
-regjsgen@^0.5.1:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+ integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+ dependencies:
+ regenerate "^1.4.2"
+ regenerate-unicode-properties "^9.0.0"
+ regjsgen "^0.5.2"
+ regjsparser "^0.7.0"
+ unicode-match-property-ecmascript "^2.0.0"
+ unicode-match-property-value-ecmascript "^2.0.0"
+
+regjsgen@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-regjsparser@^0.6.4:
- version "0.6.9"
- resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
- integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+regjsparser@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+ integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
dependencies:
jsesc "~0.5.0"
@@ -11550,9 +11499,9 @@ side-channel@^1.0.4:
object-inspect "^1.9.0"
signal-exit@^3.0.0, signal-exit@^3.0.2:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7"
+ integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==
simple-swizzle@^0.2.2:
version "0.2.2"
@@ -11611,16 +11560,16 @@ snapdragon@^0.8.1:
use "^3.1.0"
sockjs-client@^1.5.0:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6"
- integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
+ integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
dependencies:
debug "^3.2.6"
eventsource "^1.0.7"
faye-websocket "^0.11.3"
inherits "^2.0.4"
json3 "^3.3.3"
- url-parse "^1.5.1"
+ url-parse "^1.5.3"
sockjs@^0.3.21:
version "0.3.21"
@@ -11659,10 +11608,10 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
- version "0.5.19"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
- integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@^0.5.20, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+ version "0.5.20"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+ integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
@@ -11778,11 +11727,12 @@ stable@^0.1.8:
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
stack-utils@^2.0.2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
- integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.4.tgz#bf967ae2813d3d2d1e1f59a4408676495c8112ab"
+ integrity sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==
dependencies:
escape-string-regexp "^2.0.0"
+ source-map-support "^0.5.20"
stackframe@^1.1.1:
version "1.2.0"
@@ -12201,9 +12151,9 @@ tapable@^1.0.0, tapable@^1.1.3:
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^6.0.2:
- version "6.1.7"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.7.tgz#c566d1107d38b09e92983a68db5534fc7f6cab42"
- integrity sha512-PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA==
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -12274,13 +12224,13 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
source-map-support "~0.5.12"
terser@^5.3.4:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
- integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
+ version "5.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.8.0.tgz#c6d352f91aed85cc6171ccb5e84655b77521d947"
+ integrity sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==
dependencies:
commander "^2.20.0"
source-map "~0.7.2"
- source-map-support "~0.5.19"
+ source-map-support "~0.5.20"
test-exclude@^6.0.0:
version "6.0.0"
@@ -12337,9 +12287,9 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3:
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
tmpl@1.0.x:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
- integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+ integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
to-arraybuffer@^1.0.0:
version "1.0.1"
@@ -12444,24 +12394,15 @@ tsconfig-paths@^3.11.0:
minimist "^1.2.0"
strip-bom "^3.0.0"
-tsconfig-paths@^3.9.0:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
- integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
- dependencies:
- json5 "^2.2.0"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
-
tslib@^1.10.0, tslib@^1.8.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.3, tslib@^2.1.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
- integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+ integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
tsutils@^3.17.1, tsutils@^3.21.0:
version "3.21.0"
@@ -12537,7 +12478,7 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-type@^2.0.0:
+type@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
@@ -12569,28 +12510,28 @@ unbox-primitive@^1.0.1:
has-symbols "^1.0.2"
which-boxed-primitive "^1.0.2"
-unicode-canonical-property-names-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
- integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+ integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-unicode-match-property-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
- integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+ integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.4"
- unicode-property-aliases-ecmascript "^1.0.4"
+ unicode-canonical-property-names-ecmascript "^2.0.0"
+ unicode-property-aliases-ecmascript "^2.0.0"
-unicode-match-property-value-ecmascript@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
- integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+ integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
-unicode-property-aliases-ecmascript@^1.0.4:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
- integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+ integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
unified@^9.1.0:
version "9.2.2"
@@ -12726,7 +12667,7 @@ url-loader@4.1.1:
mime-types "^2.1.27"
schema-utils "^3.0.0"
-url-parse@^1.4.3, url-parse@^1.5.1:
+url-parse@^1.4.3, url-parse@^1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
@@ -13359,9 +13300,9 @@ ws@^6.2.1:
async-limiter "~1.0.0"
ws@^7.4.6:
- version "7.4.6"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
- integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ version "7.5.5"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+ integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
xml-name-validator@^3.0.0:
version "3.0.0"
diff --git a/services/webapp/craco.config.js b/services/webapp/craco.config.js
index 6411ec8..569d3b4 100644
--- a/services/webapp/craco.config.js
+++ b/services/webapp/craco.config.js
@@ -1,6 +1,7 @@
const CracoLessPlugin = require('craco-less');
const { LicenseWebpackPlugin } = require('license-webpack-plugin');
const GenerateJsonPlugin = require('generate-json-webpack-plugin');
+const CompressionPlugin = require('compression-webpack-plugin');
const { THEME } = require('./ant.theme');
@@ -22,6 +23,11 @@ module.exports = {
webpack: {
plugins: {
add: [
+ new CompressionPlugin({
+ algorithm: 'gzip',
+ test: /\.(js|css|html|svg|json|ico|eot|otf|ttf)$/,
+ deleteOriginalAssets: false,
+ }),
new LicenseWebpackPlugin({
perChunkOutput: false,
outputFilename: 'licenses.json',
diff --git a/services/webapp/nginx.conf b/services/webapp/nginx.conf
index 77b437a..96dcf79 100644
--- a/services/webapp/nginx.conf
+++ b/services/webapp/nginx.conf
@@ -42,6 +42,7 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload";
location /webapp {
+ gzip_static on;
rewrite ^/webapp/(.*)$ /$1 break;
try_files $uri /index.html;
}
diff --git a/services/webapp/package.json b/services/webapp/package.json
index 5d5fb67..c4a8974 100644
--- a/services/webapp/package.json
+++ b/services/webapp/package.json
@@ -1,6 +1,6 @@
{
"name": "@lucaapp/webapp",
- "version": "2.0.2",
+ "version": "2.1.0",
"private": true,
"license": "Apache-2.0",
"author": "Culture4Life <hello@luca-app.de> (https://www.luca-app.de/)",
@@ -21,6 +21,7 @@
"@craco/craco": "6.3.0",
"@lucaapp/crypto": "2.1.2",
"antd": "4.16.13",
+ "compression-webpack-plugin": "6.1.1",
"connected-react-router": "6.9.1",
"craco-less": "1.20.0",
"dexie": "3.0.3",
diff --git a/services/webapp/src/components/History/History.react.js b/services/webapp/src/components/History/History.react.js
index 7d6db55..84d6205 100644
--- a/services/webapp/src/components/History/History.react.js
+++ b/services/webapp/src/components/History/History.react.js
@@ -137,6 +137,19 @@ export function History() {
.catch(() => internalIndexedDBError());
}, [userHistory, internalIndexedDBError]);
+ const copyToClipboard = traceId => {
+ navigator.clipboard
+ .writeText(`Trace ID: ${traceId}`)
+ .then(() =>
+ alert(
+ `Trace ID: ${traceId}\n${formatMessage({
+ id: 'History.Timeline.CopyTraceId',
+ })}`
+ )
+ )
+ .catch(error => console.error('Error', error));
+ };
+
return (
<>
<Helmet>
@@ -212,7 +225,9 @@ export function History() {
<Step
key={historyEntry.traceId}
title={
- <StyledHistoryStepContainer>
+ <StyledHistoryStepContainer
+ onClick={() => copyToClipboard(historyEntry.traceId)}
+ >
<StyledHistoryInfoContainer>
{(entryType === PRIVATE_MEETING_HOST_TYPE ||
entryType === PRIVATE_MEETING_CHECK_IN_TYPE) && (
@@ -225,8 +240,8 @@ export function History() {
{historyEntry.type === PRIVATE_MEETING_HOST_TYPE && (
<InfoIcon
inverted
- id={`PrivateMeeting${title.replaceAll(
- ' ',
+ id={`PrivateMeeting${title.replace(
+ / /g,
'_'
)}Info`}
onClick={() =>
diff --git a/services/webapp/src/components/Home/Home.styled.js b/services/webapp/src/components/Home/Home.styled.js
index 04044c1..7cf2a31 100644
--- a/services/webapp/src/components/Home/Home.styled.js
+++ b/services/webapp/src/components/Home/Home.styled.js
@@ -24,7 +24,7 @@ export const StyledHeaderMenuIconContainer = styled.button`
background-color: transparent;
`;
export const StyledQRCodeWrapper = styled.div`
- padding: 8px;
+ padding: 8px 8px 2px 8px;
background-color: #ffffff;
`;
diff --git a/services/webapp/src/messages/de.json b/services/webapp/src/messages/de.json
index c333615..df3fffa 100644
--- a/services/webapp/src/messages/de.json
+++ b/services/webapp/src/messages/de.json
@@ -1,7 +1,7 @@
{
"OnBoarding.WelcomeStep.Headline": "Hallo",
"OnBoarding.WelcomeStep.Description": "luca hilft dir bei der anonymen und sicheren Angabe deiner Kontaktinformationen, sodass du dir keine Sorgen um deine Daten machen musst, wenn du Veranstaltungen, Kulturstätten, Restaurants, Cafés oder Bars besuchst.",
- "OnBoarding.WelcomeStep.Warning": "Hinweis: Die luca Webapp funktioniert auf iOS-Geräten am besten mit der neuesten Version von Safari. Bei anderen Browsern kann die Funktionalität eingeschränkt sein. ",
+ "OnBoarding.WelcomeStep.Warning": "Hinweis: Die luca Webapp funktioniert auf iOS-Geräten am besten mit der neuesten Version von Safari. Bei anderen Browsern kann die Funktionalität eingeschränkt sein.",
"OnBoarding.WelcomeStep.Submit": "Los geht's",
"OnBoarding.DataInformationStep.Headline": "Deine Daten",
"OnBoarding.DataInformationStep.Description1": "Bitte gib im nächsten Schritt deine Kontaktinformationen an.",
@@ -66,7 +66,7 @@
"Form.Street.Label": "* Straße",
"Form.HouseNumber.Label": "* Hausnummer",
"Form.Phone.Label": "* Telefonnummer",
- "Form.Email.Label": "Email",
+ "Form.Email.Label": "E-Mail",
"Form.Tan.Label": "* TAN",
"Form.Cancel": "Abbrechen",
"Form.Resend": "Erneut senden",
@@ -77,7 +77,7 @@
"Form.Validation.unsupportedFormat": "Die eingegebene Telefonnummer ist nicht im richtigem Format. Bitte gib sie in diesem Format an: +49 170 1234567",
"Form.Validation.email": "Die eingegebene E-Mail ist nicht im richtigem Format.",
"OnBoarding.acceptPrivacyAndTermAndCondition": "Hiermit stimme ich den {acceptPrivacy} und den {acceptTermAndConditions} zu.",
- "OnBoarding.acceptPrivacy": "Ich habe die <a>Datenschutzrichtlinien</a> zu Kenntnis genommen.",
+ "OnBoarding.acceptPrivacy": "Unter diesem Link kannst du unsere <a>Datenschutzrichtlinien</a> einsehen.",
"OnBoarding.acceptTermAndConditions": "<a>Nutzungsbedingungen</a>",
"OnBoarding.privacyLink": "https://luca-app.de/app-privacy-policy/",
"OnBoarding.termsAndConditionsLink": "https://luca-app.de/app-terms-and-conditions/",
@@ -89,8 +89,8 @@
"ResetModal.Submit": "App zurücksetzen",
"Settings.Reset": "App zurücksetzen",
"OnBoarding.FinishStep.Headline": "Fertig",
- "OnBoarding.FinishStep.Description1": "Du kannst jetzt deine Kontaktdaten verschlüsselt übermitteln. Zeige deinen QR-Code vor oder scanne einen Location-Code, der dir gezeigt wird.",
- "OnBoarding.FinishStep.Description2": "Check-ins sind bei luca Locations und bei luca Privat-Treffen möglich.",
+ "OnBoarding.FinishStep.Description1": "Du kannst jetzt deine Kontaktdaten verschlüsselt übermitteln. Zeige deinen QR-Code vor oder scanne einen luca Locations Standort-Code, der dir gezeigt wird.",
+ "OnBoarding.FinishStep.Description2": "Check-ins sind bei luca Standorten und bei luca Privat-Treffen möglich.",
"OnBoarding.FinishStep.Description3": "Übrigens: Beides kann nur an Orten erstellt werden, deren Gesundheitsämter an das luca-System angeschlossen sind.",
"OnBoarding.FinishStep.Submit": "Los geht's!",
"OnBoarding.acceptTermsAndConditions": "Ich stimme den <a>Nutzungsbedingungen</a> zu.",
@@ -121,7 +121,7 @@
"Data.DeleteAccount.Description": "Löschst du deinen Account, kannst du keine neuen Check-ins vornehmen und auf deine Historie zugreifen. \nDaten, die durch einen Check-in bei einem Betreiber verschlüsselt hinterlegt wurden, werden gemäß der Corona/COVID-19 Infektionsschutzverordnung nach 4 Wochen gelöscht.\nNach der Löschung des Accounts kannst du noch bis zu 4 Wochen nach dem letzten Check-in von dem Gesundheitsamt benachrichtigt werden.",
"Data.DeleteAccount.Confirm": "Löschen",
"Data.DeleteAccount.Cancel": "Abbrechen",
- "Home.Scanner.Description": "Scanne eine Luca QR-Code um dich in einer Location einzuchecken.",
+ "Home.Scanner.Description": "Scanne eine Luca QR-Code um dich in einem Standort einzuchecken.",
"Home.Scanner.Headline": "Einchecken",
"QRCodeGenerator.error.missingKey": "Fehlender öffentlicher Schlüssel",
"QRCodeScanner.error.accountDeleted": "Der Betreiber-Account für diesen Ort wurde gelöscht. Du kannst mit diesem QR-Code nicht einchecken.",
@@ -182,5 +182,10 @@
"UpdatedTermsAndConditions.PrivacyLink": "Datenschutzrichtlinien",
"UpdatedTermsAndConditions.Button": "ZUSTIMMEN",
"UpdatedTermsAndConditions.AriaDeleteAccountLabel": "Account löschen",
- "Form.Validation.invalidCharacter": "Bitte gib nur unterstützte Zeichen eingeben."
-}
+ "Form.Validation.invalidCharacter": "Bitte gib nur unterstützte Zeichen eingeben.",
+ "History.Timeline.CopyTraceId": "Die Trace ID wurde in deine Zwischenablage kopiert.",
+ "SelfCheckinConfirmationModal.Close": "Abbrechen",
+ "SelfCheckinConfirmationModal.Confirm": "Bestätigen",
+ "SelfCheckinConfirmationModal.notShowAgain": "Nicht mehr anzeigen",
+ "SelfCheckinConfirmationModal.Headline": "Du willst dich bei {locationName} einchecken?"
+}
\ No newline at end of file
diff --git a/services/webapp/src/messages/en.json b/services/webapp/src/messages/en.json
index a788357..c8fa578 100644
--- a/services/webapp/src/messages/en.json
+++ b/services/webapp/src/messages/en.json
@@ -1,7 +1,7 @@
{
"OnBoarding.WelcomeStep.Headline": "Hello",
"OnBoarding.WelcomeStep.Description": "luca helps you provide your contact information anonymously and securely, so you don't have to worry about your data when you visit events, cultural venues, restaurants, cafés or bars.",
- "OnBoarding.WelcomeStep.Warning": "Note: The luca web app works best on iOS with the latest version of Safari. Other browsers might have limited functionality",
+ "OnBoarding.WelcomeStep.Warning": "Note: The luca web app works best on iOS with the latest version of Safari. Other browsers might have limited functionality.",
"OnBoarding.WelcomeStep.Submit": "Get started!",
"OnBoarding.DataInformationStep.Headline": "Your Data",
"OnBoarding.DataInformationStep.Description1": "Please enter your contact information in the next step.",
@@ -77,7 +77,7 @@
"Form.Validation.unsupportedFormat": "The entered phone number is not in the correct format. Please use the following format: +49 170 1234567",
"Form.Validation.email": "Please provide an email address with a valid format.",
"OnBoarding.acceptPrivacyAndTermAndCondition": "I have read and agree with the {acceptTermAndConditions} and {acceptPrivacy}.",
- "OnBoarding.acceptPrivacy": "I accept the <a>privacy policy</a>.",
+ "OnBoarding.acceptPrivacy": "You can view our <a>privacy policy</a> at this link.",
"OnBoarding.acceptTermAndConditions": "<a>Terms of use</a>",
"OnBoarding.privacyLink": "https://luca-app.de/app-privacy-policy/",
"OnBoarding.termsAndConditionsLink": "https://luca-app.de/app-terms-and-conditions/",
@@ -182,5 +182,10 @@
"UpdatedTermsAndConditions.PrivacyLink": "privacy policy",
"UpdatedTermsAndConditions.Button": "AGREE",
"UpdatedTermsAndConditions.AriaDeleteAccountLabel": "Delete Account",
- "Form.Validation.invalidCharacter": "Please enter only supported characters."
-}
+ "Form.Validation.invalidCharacter": "Please enter only supported characters.",
+ "History.Timeline.CopyTraceId": "The trace ID was copied to your clipboard.",
+ "SelfCheckinConfirmationModal.Close": "Cancel",
+ "SelfCheckinConfirmationModal.Confirm": "Confirm",
+ "SelfCheckinConfirmationModal.notShowAgain": "Don't ask again",
+ "SelfCheckinConfirmationModal.Headline": "You want to check in at {locationName}?"
+}
\ No newline at end of file
diff --git a/services/webapp/yarn.lock b/services/webapp/yarn.lock
index e83c994..b815518 100644
--- a/services/webapp/yarn.lock
+++ b/services/webapp/yarn.lock
@@ -26,9 +26,9 @@
rc-util "^5.9.4"
"@ant-design/react-slick@~0.28.1":
- version "0.28.3"
- resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.3.tgz#ad5cf1cf50363c1a3842874d69d0ce1f26696e71"
- integrity sha512-u3onF2VevGRbkGbgpldVX/nzd7LFtLeZJE0x2xIFT2qYHKkJZ6QT/jQ7KqYK4UpeTndoyrbMqLN4DiJza4BVBg==
+ version "0.28.4"
+ resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.4.tgz#8b296b87ad7c7ae877f2a527b81b7eebd9dd29a9"
+ integrity sha512-j9eAHTn7GxbXUFNknJoHS2ceAsqrQi2j8XykjZE1IXCD8kJF+t28EvhBLniDpbOsBk/3kjalnhriTfZcjBHNqg==
dependencies:
"@babel/runtime" "^7.10.4"
classnames "^2.2.5"
@@ -57,7 +57,7 @@
dependencies:
"@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0":
+"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
@@ -85,19 +85,19 @@
source-map "^0.5.0"
"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
- integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
+ version "7.15.5"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
+ integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
- "@babel/helper-module-transforms" "^7.15.0"
- "@babel/helpers" "^7.14.8"
- "@babel/parser" "^7.15.0"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-compilation-targets" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
+ "@babel/helpers" "^7.15.4"
+ "@babel/parser" "^7.15.5"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -106,59 +106,59 @@
source-map "^0.5.0"
"@babel/eslint-parser@^7.12.16":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz#b54f06e04d0e93aebcba99f89251e3bf0ee39f21"
- integrity sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.4.tgz#46385943726291fb3e8db99522c8099b15684387"
+ integrity sha512-hPMIAmGNbmQzXJIo2P43Zj9UhRmGev5f9nqdBFOWNGDGh6XKmjby79woBvg6y0Jur6yRfQBneDbUQ8ZVc1krFw==
dependencies:
eslint-scope "^5.1.1"
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.12.1", "@babel/generator@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
- integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==
+"@babel/generator@^7.12.1", "@babel/generator@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
+ integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.4"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
- integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
+ integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
- integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+ integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-explode-assignable-expression" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818"
- integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+ integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
dependencies:
"@babel/compat-data" "^7.15.0"
"@babel/helper-validator-option" "^7.14.5"
browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7"
- integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==
+"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
+ integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-member-expression-to-functions" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
"@babel/helper-create-regexp-features-plugin@^7.14.5":
version "7.14.5"
@@ -182,115 +182,115 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
- integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
+"@babel/helper-explode-assignable-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+ integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-function-name@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
- integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+ integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
dependencies:
- "@babel/helper-get-function-arity" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-get-function-arity" "^7.15.4"
+ "@babel/template" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-get-function-arity@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
- integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
+"@babel/helper-get-function-arity@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+ integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-hoist-variables@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
- integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+"@babel/helper-hoist-variables@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+ integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-member-expression-to-functions@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b"
- integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==
+"@babel/helper-member-expression-to-functions@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+ integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
dependencies:
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
- integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+ integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08"
- integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz#962cc629a7f7f9a082dd62d0307fa75fe8788d7c"
+ integrity sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==
dependencies:
- "@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.15.0"
- "@babel/helper-simple-access" "^7.14.8"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-module-imports" "^7.15.4"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-simple-access" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
"@babel/helper-validator-identifier" "^7.14.9"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-optimise-call-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
- integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+"@babel/helper-optimise-call-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+ integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-"@babel/helper-remap-async-to-generator@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
- integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
+"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
+ integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-wrap-function" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-wrap-function" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4"
- integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+ integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.15.0"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/helper-member-expression-to-functions" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-simple-access@^7.14.8":
- version "7.14.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
- integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
+"@babel/helper-simple-access@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+ integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
dependencies:
- "@babel/types" "^7.14.8"
+ "@babel/types" "^7.15.4"
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
- integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
+ integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-split-export-declaration@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
- integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+"@babel/helper-split-export-declaration@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+ integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9":
version "7.14.9"
@@ -302,24 +302,24 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-"@babel/helper-wrap-function@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
- integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
+"@babel/helper-wrap-function@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
+ integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
dependencies:
- "@babel/helper-function-name" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.8":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357"
- integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+ integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
dependencies:
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
version "7.14.5"
@@ -330,27 +330,27 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0", "@babel/parser@^7.8.3":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
- integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.15.4", "@babel/parser@^7.15.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.3":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
+ integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
- integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
+ integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a"
- integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==
+"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
+ integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-remap-async-to-generator" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.15.4"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-proposal-class-properties@7.12.1":
@@ -369,12 +369,12 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-class-static-block@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
- integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
+"@babel/plugin-proposal-class-static-block@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
+ integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
@@ -451,16 +451,16 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
- integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
+"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.15.6":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
+ integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/compat-data" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.15.4"
"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.14.5":
version "7.14.5"
@@ -496,13 +496,13 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-private-property-in-object@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
- integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
+"@babel/plugin-proposal-private-property-in-object@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
+ integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
@@ -677,24 +677,24 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.5":
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.15.3":
version "7.15.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.9":
- version "7.14.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f"
- integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==
+"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
+ integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
globals "^11.1.0"
"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.14.5":
@@ -742,10 +742,10 @@
"@babel/helper-plugin-utils" "^7.10.4"
"@babel/plugin-syntax-flow" "^7.12.1"
-"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
- integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
+"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
+ integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -780,25 +780,25 @@
"@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281"
- integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==
+"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
+ integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
dependencies:
- "@babel/helper-module-transforms" "^7.15.0"
+ "@babel/helper-module-transforms" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.8"
+ "@babel/helper-simple-access" "^7.15.4"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
- integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
+"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
+ integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
dependencies:
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-hoist-variables" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.9"
babel-plugin-dynamic-import-node "^2.3.3"
"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.14.5":
@@ -831,10 +831,10 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-replace-supers" "^7.14.5"
-"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
- integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
+"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
+ integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -967,11 +967,11 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-typescript@^7.12.1":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e"
- integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
+ integrity sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.15.0"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript" "^7.14.5"
@@ -1063,29 +1063,29 @@
semver "^5.5.0"
"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464"
- integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
+ integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
dependencies:
"@babel/compat-data" "^7.15.0"
- "@babel/helper-compilation-targets" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-async-generator-functions" "^7.14.9"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
+ "@babel/plugin-proposal-async-generator-functions" "^7.15.4"
"@babel/plugin-proposal-class-properties" "^7.14.5"
- "@babel/plugin-proposal-class-static-block" "^7.14.5"
+ "@babel/plugin-proposal-class-static-block" "^7.15.4"
"@babel/plugin-proposal-dynamic-import" "^7.14.5"
"@babel/plugin-proposal-export-namespace-from" "^7.14.5"
"@babel/plugin-proposal-json-strings" "^7.14.5"
"@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
"@babel/plugin-proposal-numeric-separator" "^7.14.5"
- "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
+ "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
"@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
"@babel/plugin-proposal-private-methods" "^7.14.5"
- "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
+ "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
"@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-class-properties" "^7.12.13"
@@ -1104,25 +1104,25 @@
"@babel/plugin-transform-arrow-functions" "^7.14.5"
"@babel/plugin-transform-async-to-generator" "^7.14.5"
"@babel/plugin-transform-block-scoped-functions" "^7.14.5"
- "@babel/plugin-transform-block-scoping" "^7.14.5"
- "@babel/plugin-transform-classes" "^7.14.9"
+ "@babel/plugin-transform-block-scoping" "^7.15.3"
+ "@babel/plugin-transform-classes" "^7.15.4"
"@babel/plugin-transform-computed-properties" "^7.14.5"
"@babel/plugin-transform-destructuring" "^7.14.7"
"@babel/plugin-transform-dotall-regex" "^7.14.5"
"@babel/plugin-transform-duplicate-keys" "^7.14.5"
"@babel/plugin-transform-exponentiation-operator" "^7.14.5"
- "@babel/plugin-transform-for-of" "^7.14.5"
+ "@babel/plugin-transform-for-of" "^7.15.4"
"@babel/plugin-transform-function-name" "^7.14.5"
"@babel/plugin-transform-literals" "^7.14.5"
"@babel/plugin-transform-member-expression-literals" "^7.14.5"
"@babel/plugin-transform-modules-amd" "^7.14.5"
- "@babel/plugin-transform-modules-commonjs" "^7.15.0"
- "@babel/plugin-transform-modules-systemjs" "^7.14.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.15.4"
+ "@babel/plugin-transform-modules-systemjs" "^7.15.4"
"@babel/plugin-transform-modules-umd" "^7.14.5"
"@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
"@babel/plugin-transform-new-target" "^7.14.5"
"@babel/plugin-transform-object-super" "^7.14.5"
- "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.15.4"
"@babel/plugin-transform-property-literals" "^7.14.5"
"@babel/plugin-transform-regenerator" "^7.14.5"
"@babel/plugin-transform-reserved-words" "^7.14.5"
@@ -1134,7 +1134,7 @@
"@babel/plugin-transform-unicode-escapes" "^7.14.5"
"@babel/plugin-transform-unicode-regex" "^7.14.5"
"@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.15.0"
+ "@babel/types" "^7.15.6"
babel-plugin-polyfill-corejs2 "^0.2.2"
babel-plugin-polyfill-corejs3 "^0.2.2"
babel-plugin-polyfill-regenerator "^0.2.2"
@@ -1186,9 +1186,9 @@
"@babel/plugin-transform-typescript" "^7.12.1"
"@babel/runtime-corejs3@^7.10.2":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d"
- integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz#403139af262b9a6e8f9ba04a6fdcebf8de692bf1"
+ integrity sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==
dependencies:
core-js-pure "^3.16.0"
regenerator-runtime "^0.13.4"
@@ -1200,48 +1200,41 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
- version "7.15.3"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
- integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
- dependencies:
- regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.12.13", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.10.4", "@babel/template@^7.14.5", "@babel/template@^7.3.3":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
- integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+"@babel/template@^7.10.4", "@babel/template@^7.15.4", "@babel/template@^7.3.3":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+ integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
- integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+ integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.15.0"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.15.0"
- "@babel/types" "^7.15.0"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-hoist-variables" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
- version "7.15.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
- integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+ integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
dependencies:
"@babel/helper-validator-identifier" "^7.14.9"
to-fast-properties "^2.0.0"
@@ -1391,6 +1384,11 @@
intl-messageformat "9.9.1"
tslib "^2.1.0"
+"@gar/promisify@^1.0.1":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
+ integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+
"@hapi/address@2.x.x":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -1662,6 +1660,14 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
+"@npmcli/fs@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f"
+ integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==
+ dependencies:
+ "@gar/promisify" "^1.0.1"
+ semver "^7.3.5"
+
"@npmcli/move-file@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -1856,9 +1862,9 @@
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
- version "7.1.15"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024"
- integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==
+ version "7.1.16"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
+ integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
@@ -1964,9 +1970,9 @@
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
"@types/mdast@^3.0.0":
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.7.tgz#cba63d0cc11eb1605cea5c0ad76e02684394166b"
- integrity sha512-YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg==
+ version "3.0.10"
+ resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+ integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
dependencies:
"@types/unist" "*"
@@ -1981,9 +1987,9 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/node@*":
- version "16.4.13"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d"
- integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==
+ version "16.9.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9"
+ integrity sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@@ -2020,16 +2026,7 @@
hoist-non-react-statics "^3.3.0"
redux "^4.0.0"
-"@types/react@*":
- version "17.0.17"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.17.tgz#1772d3d5425128e0635a716f49ef57c2955df055"
- integrity sha512-nrfi7I13cAmrd0wje8czYpf5SFbryczCtPzFc6ijqvdjKcyA3tCvGxwchOUlxb2ucBPuJ9Y3oUqKrRqZvrz0lw==
- dependencies:
- "@types/prop-types" "*"
- "@types/scheduler" "*"
- csstype "^3.0.2"
-
-"@types/react@17":
+"@types/react@*", "@types/react@17":
version "17.0.21"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.21.tgz#069c43177cd419afaab5ce26bb4e9056549f7ea6"
integrity sha512-GzzXCpOthOjXvrAUFQwU/svyxu658cwu00Q9ugujS4qc1zXgLFaO0kS2SLOaMWLt2Jik781yuHCWB7UcYdGAeQ==
@@ -2096,9 +2093,9 @@
source-map "^0.6.1"
"@types/webpack@^4.41.8":
- version "4.41.30"
- resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc"
- integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==
+ version "4.41.31"
+ resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa"
+ integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==
dependencies:
"@types/node" "*"
"@types/tapable" "^1"
@@ -2120,27 +2117,27 @@
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz#808d206e2278e809292b5de752a91105da85860b"
- integrity sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz#e938603a136f01dcabeece069da5fb2e331d4498"
+ integrity sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==
dependencies:
- "@typescript-eslint/experimental-utils" "4.29.1"
- "@typescript-eslint/scope-manager" "4.29.1"
+ "@typescript-eslint/experimental-utils" "4.31.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
debug "^4.3.1"
functional-red-black-tree "^1.0.1"
regexpp "^3.1.0"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@4.29.1", "@typescript-eslint/experimental-utils@^4.0.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz#0af2b17b0296b60c6b207f11062119fa9c5a8994"
- integrity sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==
+"@typescript-eslint/experimental-utils@4.31.1", "@typescript-eslint/experimental-utils@^4.0.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz#0c900f832f270b88e13e51753647b02d08371ce5"
+ integrity sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==
dependencies:
"@types/json-schema" "^7.0.7"
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
@@ -2156,32 +2153,32 @@
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^4.5.0":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d"
- integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.1.tgz#8f9a2672033e6f6d33b1c0260eebdc0ddf539064"
+ integrity sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==
dependencies:
- "@typescript-eslint/scope-manager" "4.29.1"
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/typescript-estree" "4.29.1"
+ "@typescript-eslint/scope-manager" "4.31.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/typescript-estree" "4.31.1"
debug "^4.3.1"
-"@typescript-eslint/scope-manager@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358"
- integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==
+"@typescript-eslint/scope-manager@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz#0c21e8501f608d6a25c842fcf59541ef4f1ab561"
+ integrity sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
"@typescript-eslint/types@3.10.1":
version "3.10.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
-"@typescript-eslint/types@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
- integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
+"@typescript-eslint/types@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.1.tgz#5f255b695627a13401d2fdba5f7138bc79450d66"
+ integrity sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==
"@typescript-eslint/typescript-estree@3.10.1":
version "3.10.1"
@@ -2197,13 +2194,13 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f"
- integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==
+"@typescript-eslint/typescript-estree@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz#4a04d5232cf1031232b7124a9c0310b577a62d17"
+ integrity sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==
dependencies:
- "@typescript-eslint/types" "4.29.1"
- "@typescript-eslint/visitor-keys" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
+ "@typescript-eslint/visitor-keys" "4.31.1"
debug "^4.3.1"
globby "^11.0.3"
is-glob "^4.0.1"
@@ -2217,12 +2214,12 @@
dependencies:
eslint-visitor-keys "^1.1.0"
-"@typescript-eslint/visitor-keys@4.29.1":
- version "4.29.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d"
- integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==
+"@typescript-eslint/visitor-keys@4.31.1":
+ version "4.31.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz#f2e7a14c7f20c4ae07d7fc3c5878c4441a1da9cc"
+ integrity sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==
dependencies:
- "@typescript-eslint/types" "4.29.1"
+ "@typescript-eslint/types" "4.31.1"
eslint-visitor-keys "^2.0.0"
"@webassemblyjs/ast@1.9.0":
@@ -2422,9 +2419,9 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.2.4:
- version "8.4.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
- integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+ integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
address@1.1.2, address@^1.0.1:
version "1.1.2"
@@ -2475,9 +2472,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^8.0.1:
- version "8.6.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
- integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
+ version "8.6.3"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+ integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -2522,9 +2519,9 @@ ansi-regex@^4.1.0:
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
ansi-regex@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
- integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+ integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1"
@@ -2653,7 +2650,7 @@ array-flatten@^2.1.0:
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.1.1, array-includes@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -2829,9 +2826,9 @@ available-typed-arrays@^1.0.5:
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
axe-core@^4.0.2:
- version "4.3.2"
- resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.2.tgz#fcf8777b82c62cfc69c7e9f32c0d2226287680e7"
- integrity sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg==
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.3.tgz#b55cd8e8ddf659fe89b064680e1c6a4dceab0325"
+ integrity sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==
axobject-query@^2.2.0:
version "2.2.0"
@@ -3102,9 +3099,9 @@ bfj@^7.0.2:
tryer "^1.0.1"
big-integer@^1.6.16:
- version "1.6.48"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
- integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
+ version "1.6.49"
+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.49.tgz#f6817d3ea5d4f3fb19e24df9f4b1b4471a8328ce"
+ integrity sha512-KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw==
big.js@^5.2.2:
version "5.2.2"
@@ -3292,7 +3289,7 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.16.7, browserslist@^4.6.2, browserslist@^4.6.4:
+browserslist@4.14.2, browserslist@4.16.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.0, browserslist@^4.6.2, browserslist@^4.6.4:
version "4.16.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -3381,10 +3378,11 @@ cacache@^12.0.2:
y18n "^4.0.0"
cacache@^15.0.5:
- version "15.2.0"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389"
- integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==
+ version "15.3.0"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+ integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
dependencies:
+ "@npmcli/fs" "^1.0.0"
"@npmcli/move-file" "^1.0.1"
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -3493,9 +3491,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001255"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"
- integrity sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==
+ version "1.0.30001258"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz#b604eed80cc54a578e4bf5a02ae3ed49f869d252"
+ integrity sha512-RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA==
capture-exit@^2.0.0:
version "2.0.0"
@@ -3745,9 +3743,9 @@ color@^3.0.0:
color-string "^1.6.0"
colorette@^1.2.1, colorette@^1.2.2:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
- integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+ integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
combined-stream@^1.0.8:
version "1.0.8"
@@ -3795,6 +3793,17 @@ compressible@~2.0.16:
dependencies:
mime-db ">= 1.43.0 < 2"
+compression-webpack-plugin@6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz#ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"
+ integrity sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==
+ dependencies:
+ cacache "^15.0.5"
+ find-cache-dir "^3.3.1"
+ schema-utils "^3.0.0"
+ serialize-javascript "^5.0.1"
+ webpack-sources "^1.4.3"
+
compression@^1.7.4:
version "1.7.4"
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
@@ -3932,17 +3941,17 @@ copy-to-clipboard@^3.2.0:
toggle-selection "^1.0.6"
core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.2:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d"
- integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.17.3.tgz#b39c8e4dec71ecdc735c653ce5233466e561324e"
+ integrity sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==
dependencies:
- browserslist "^4.16.7"
+ browserslist "^4.17.0"
semver "7.0.0"
core-js-pure@^3.16.0:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e"
- integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.17.3.tgz#98ea3587188ab7ef4695db6518eeb71aec42604a"
+ integrity sha512-YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ==
core-js@^2.4.0:
version "2.6.12"
@@ -3950,14 +3959,14 @@ core-js@^2.4.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.5:
- version "3.16.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249"
- integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw==
+ version "3.17.3"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e"
+ integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==
core-util-is@~1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
- integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
cosmiconfig@^5.0.0:
version "5.2.1"
@@ -3981,9 +3990,9 @@ cosmiconfig@^6.0.0:
yaml "^1.7.2"
cosmiconfig@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
- integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
dependencies:
"@types/parse-json" "^4.0.0"
import-fresh "^3.2.1"
@@ -4309,9 +4318,9 @@ cssstyle@^2.3.0:
cssom "~0.3.6"
csstype@^3.0.2:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
- integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b"
+ integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==
cyclist@^1.0.1:
version "1.0.1"
@@ -4341,14 +4350,14 @@ data-urls@^2.0.0:
whatwg-url "^8.0.0"
date-fns@2.x:
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
- integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
+ version "2.24.0"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d"
+ integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==
dayjs@1.x:
- version "1.10.6"
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
- integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==
+ version "1.10.7"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
+ integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
@@ -4412,9 +4421,9 @@ deep-equal@^1.0.1:
regexp.prototype.flags "^1.2.0"
deep-is@^0.1.3, deep-is@~0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
- integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+ integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
deepmerge@^4.2.2:
version "4.2.2"
@@ -4631,9 +4640,9 @@ domhandler@^2.3.0:
domelementtype "1"
domhandler@^4.0.0, domhandler@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
- integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
+ integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
dependencies:
domelementtype "^2.2.0"
@@ -4646,9 +4655,9 @@ domutils@^1.5.1, domutils@^1.7.0:
domelementtype "1"
domutils@^2.5.2, domutils@^2.6.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
- integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+ integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
dependencies:
dom-serializer "^1.0.1"
domelementtype "^2.2.0"
@@ -4712,9 +4721,9 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.723:
- version "1.3.802"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz#0afa989321de3e904ac653ee79e0d642883731a1"
- integrity sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg==
+ version "1.3.842"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f"
+ integrity sha512-P/nDMPIYdb2PyqCQwhTXNi5JFjX1AsDVR0y6FrHw752izJIAJ+Pn5lugqyBq4tXeRSZBMBb2ZGvRGB1djtELEQ==
elliptic@6.5.4, elliptic@^6.5.3:
version "6.5.4"
@@ -4818,30 +4827,7 @@ error-stack-parser@^2.0.6:
dependencies:
stackframe "^1.1.1"
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
- version "1.18.5"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19"
- integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==
- dependencies:
- call-bind "^1.0.2"
- es-to-primitive "^1.2.1"
- function-bind "^1.1.1"
- get-intrinsic "^1.1.1"
- has "^1.0.3"
- has-symbols "^1.0.2"
- internal-slot "^1.0.3"
- is-callable "^1.2.3"
- is-negative-zero "^2.0.1"
- is-regex "^1.1.3"
- is-string "^1.0.6"
- object-inspect "^1.11.0"
- object-keys "^1.1.1"
- object.assign "^4.1.2"
- string.prototype.trimend "^1.0.4"
- string.prototype.trimstart "^1.0.4"
- unbox-primitive "^1.0.1"
-
-es-abstract@^1.18.5:
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5:
version "1.18.6"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
@@ -4972,14 +4958,6 @@ eslint-config-react-app@^6.0.0:
dependencies:
confusing-browser-globals "^1.0.10"
-eslint-import-resolver-node@^0.3.5:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.5.tgz#939bbb0f74e179e757ca87f7a4a890dabed18ac4"
- integrity sha512-XMoPKjSpXbkeJ7ZZ9icLnJMTY5Mc1kZbCakHquaFsXPpyWOwK0TK6CODO+0ca54UoM9LKOxyUNnoVZRl8TeaAg==
- dependencies:
- debug "^3.2.7"
- resolve "^1.20.0"
-
eslint-import-resolver-node@^0.3.6:
version "0.3.6"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
@@ -4997,14 +4975,14 @@ eslint-module-utils@^2.6.2:
pkg-dir "^2.0.0"
eslint-plugin-flowtype@^5.2.0:
- version "5.9.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.9.0.tgz#8d2d81d3d79bb53470ed62b97409b31684757e30"
- integrity sha512-aBUVPA5Wt0XyuV3Wg8flfVqYJR6yR2nRLuyPwoTjCg5VTk4G1X1zQpInr39tUGgRxqrA+d+B9GYK4+/d1i0Rfw==
+ version "5.10.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz#7764cc63940f215bf3f0bd2d9a1293b2b9b2b4bb"
+ integrity sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==
dependencies:
lodash "^4.17.15"
string-natural-compare "^3.0.1"
-eslint-plugin-import@2.24.2:
+eslint-plugin-import@2.24.2, eslint-plugin-import@^2.22.1:
version "2.24.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
@@ -5025,31 +5003,10 @@ eslint-plugin-import@2.24.2:
resolve "^1.20.0"
tsconfig-paths "^3.11.0"
-eslint-plugin-import@^2.22.1:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz#697ffd263e24da5e84e03b282f5fb62251777177"
- integrity sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg==
- dependencies:
- array-includes "^3.1.3"
- array.prototype.flat "^1.2.4"
- debug "^2.6.9"
- doctrine "^2.1.0"
- eslint-import-resolver-node "^0.3.5"
- eslint-module-utils "^2.6.2"
- find-up "^2.0.0"
- has "^1.0.3"
- is-core-module "^2.4.0"
- minimatch "^3.0.4"
- object.values "^1.1.3"
- pkg-up "^2.0.0"
- read-pkg-up "^3.0.0"
- resolve "^1.20.0"
- tsconfig-paths "^3.9.0"
-
eslint-plugin-jest@^24.1.0:
- version "24.4.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262"
- integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==
+ version "24.4.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.2.tgz#9e8cf05ee6a0e3025e6149df2f36950abfa8d5bf"
+ integrity sha512-jNMnqwX75z0RXRMXkxwb/+9ylKJYJLJ8nT8nBT0XFM5qx4IQGxP4edMawa0qGkSbHae0BDPBmi8I2QF0/F04XQ==
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
@@ -5107,13 +5064,14 @@ eslint-plugin-react@7.25.1:
string.prototype.matchall "^4.0.5"
eslint-plugin-react@^7.21.5:
- version "7.24.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
- integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
+ version "7.25.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.25.2.tgz#d567a217d306b76dd110561f28074e2328ae38f8"
+ integrity sha512-elx4585wgmryanJK4C5IoSKQyVZ+e7H0t2JOOtJNBql0cuercvSShvRReuLBbfx8687yW5yv+UL7pXwMsd6adQ==
dependencies:
array-includes "^3.1.3"
array.prototype.flatmap "^1.2.4"
doctrine "^2.1.0"
+ estraverse "^5.2.0"
has "^1.0.3"
jsx-ast-utils "^2.4.1 || ^3.0.0"
minimatch "^3.0.4"
@@ -5454,11 +5412,11 @@ express@^4.17.1:
vary "~1.1.2"
ext@^1.1.2:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
- integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
+ integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
dependencies:
- type "^2.0.0"
+ type "^2.5.0"
extend-shallow@^2.0.1:
version "2.0.1"
@@ -5536,9 +5494,9 @@ fastest-levenshtein@^1.0.12:
integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
fastq@^1.6.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
- integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+ integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
dependencies:
reusify "^1.0.4"
@@ -5626,9 +5584,9 @@ find-cache-dir@^2.1.0:
pkg-dir "^3.0.0"
find-cache-dir@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
- integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+ integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
@@ -5683,9 +5641,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
- integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+ version "1.14.4"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+ integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
for-in@^1.0.2:
version "1.0.2"
@@ -5924,9 +5882,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.6.0, globals@^13.9.0:
- version "13.10.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676"
- integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==
+ version "13.11.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
+ integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
dependencies:
type-fest "^0.20.2"
@@ -6379,9 +6337,9 @@ immer@8.0.1:
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
"immutable@^3.8.1 || ^4.0.0-rc.1":
- version "4.0.0-rc.14"
- resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.14.tgz#29ba96631ec10867d1348515ac4e6bdba462f071"
- integrity sha512-pfkvmRKJSoW7JFx0QeYlAmT+kNYvn5j0u7bnpNq4N2RCvHSTlLT208G8jgaquNe+Q8kCPHKOSpxJkyvLDpYq0w==
+ version "4.0.0-rc.15"
+ resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.15.tgz#c30056f05eaaf5650fd15230586688fdd15c54bc"
+ integrity sha512-v8+A3sNyaieoP9dHegl3tEYnIZa7vqNiSv0U6D7YddiZi34VjKy4GsIxrRHj2d8+CS3MeiVja5QyNe4JO/aEXA==
import-cwd@^2.0.0:
version "2.1.0"
@@ -6589,9 +6547,11 @@ is-arrayish@^0.3.1:
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-bigint@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.3.tgz#fc9d9e364210480675653ddaea0518528d49a581"
- integrity sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+ integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+ dependencies:
+ has-bigints "^1.0.1"
is-binary-path@^1.0.0:
version "1.0.1"
@@ -6625,7 +6585,7 @@ is-buffer@^2.0.0:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-is-callable@^1.1.4, is-callable@^1.2.3, is-callable@^1.2.4:
+is-callable@^1.1.4, is-callable@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
@@ -6649,14 +6609,7 @@ is-color-stop@^1.0.0:
rgb-regex "^1.0.1"
rgba-regex "^1.0.0"
-is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.4.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
- integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
- dependencies:
- has "^1.0.3"
-
-is-core-module@^2.6.0:
+is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
@@ -6856,7 +6809,7 @@ is-potential-custom-element-name@^1.0.1:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-is-regex@^1.0.4, is-regex@^1.1.3, is-regex@^1.1.4:
+is-regex@^1.0.4, is-regex@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -6894,7 +6847,7 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-is-string@^1.0.5, is-string@^1.0.6, is-string@^1.0.7:
+is-string@^1.0.5, is-string@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
@@ -7559,7 +7512,7 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
-json5@^2.1.2, json5@^2.2.0:
+json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -7604,11 +7557,11 @@ jsqr@^1.2.0:
integrity sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==
"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
- integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+ integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
dependencies:
- array-includes "^3.1.2"
+ array-includes "^3.1.3"
object.assign "^4.1.2"
jwa@^1.4.1:
@@ -8025,9 +7978,9 @@ map-visit@^1.0.0:
object-visit "^1.0.0"
match-sorter@^6.0.2:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.0.tgz#454a1b31ed218cddbce6231a0ecb5fdc549fed01"
- integrity sha512-efYOf/wUpNb8FgNY+cOD2EIJI1S5I7YPKsw0LBp7wqPh5pmMS6i/wr3ZWwfwrAw1NvqTA2KUReVRWDX84lUcOQ==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.1.tgz#98cc37fda756093424ddf3cbc62bfe9c75b92bda"
+ integrity sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==
dependencies:
"@babel/runtime" "^7.12.5"
remove-accents "0.4.2"
@@ -8196,11 +8149,16 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.49.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.49.0:
version "1.49.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
+"mime-db@>= 1.43.0 < 2":
+ version "1.50.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+ integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
version "2.1.32"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
@@ -8299,9 +8257,9 @@ minipass-pipeline@^1.2.2:
minipass "^3.0.0"
minipass@^3.0.0, minipass@^3.1.1:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
- integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+ version "3.1.5"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732"
+ integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==
dependencies:
yallist "^4.0.0"
@@ -8417,9 +8375,9 @@ nano-time@1.0.0:
big-integer "^1.6.16"
nanoid@^3.1.23:
- version "3.1.23"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
- integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+ version "3.1.25"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+ integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
nanomatch@^1.2.9:
version "1.2.13"
@@ -8544,9 +8502,9 @@ node-notifier@^8.0.0:
which "^2.0.2"
node-releases@^1.1.71:
- version "1.1.74"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e"
- integrity sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw==
+ version "1.1.75"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+ integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
@@ -8559,12 +8517,12 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
validate-npm-package-license "^3.0.1"
normalize-package-data@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
- integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+ integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
dependencies:
hosted-git-info "^4.0.1"
- resolve "^1.20.0"
+ is-core-module "^2.5.0"
semver "^7.3.4"
validate-npm-package-license "^3.0.1"
@@ -8627,9 +8585,9 @@ nth-check@^1.0.2:
boolbase "~1.0.0"
nth-check@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
- integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+ integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
dependencies:
boolbase "^1.0.0"
@@ -8727,7 +8685,7 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.0, object.values@^1.1.3, object.values@^1.1.4:
+object.values@^1.1.0, object.values@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
@@ -10207,9 +10165,9 @@ rc-checkbox@~2.3.0:
classnames "^2.2.1"
rc-collapse@~3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.1.tgz#2421d454e85781d1cf2f04f906918e0677d779e6"
- integrity sha512-/oetKApTHzGGeR8Q8vD168EXkCs2MpEIrURGyy2D+LrrJd29LY/huuIMvOiJoSV6W3bcGhJqIdgHtg1Dxn1smA==
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.2.tgz#76028a811b845d03d9460ccc409c7ea8ad09db14"
+ integrity sha512-HujcKq7mghk/gVKeI6EjzTbb8e19XUZpakrYazu1MblEZ3Hu3WBMSN4A3QmvbF6n1g7x6lUlZvsHZ5shABWYOQ==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
@@ -10367,9 +10325,9 @@ rc-rate@~2.9.0:
rc-util "^5.0.1"
rc-resize-observer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.0.tgz#97fb89856f62fec32ab6e40933935cf58e2e102d"
- integrity sha512-RgKGukg1mlzyGdvzF7o/LGFC8AeoMH9aGzXTUdp6m+OApvmRdUuOscq/Y2O45cJA+rXt1ApWlpFoOIioXL3AGg==
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.0.1.tgz#ccd0986543ff1bf49f8a581e8ac4bb714ed24dcd"
+ integrity sha512-OxO2mJI9e8610CAWBFfm52SPvWib0eNKjaSsRbbKHmLaJIxw944P+D61DlLJ/w2vuOjGNcalJu8VdqyNm/XCRg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -10442,9 +10400,9 @@ rc-tabs@~11.10.0:
rc-util "^5.5.0"
rc-textarea@^0.3.0, rc-textarea@~0.3.0:
- version "0.3.4"
- resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.4.tgz#1408a64c87b5e76db5c847699ef9ab5ee97dd6f9"
- integrity sha512-ILUYx831ZukQPv3m7R4RGRtVVWmL1LV4ME03L22mvT56US0DGCJJaRTHs4vmpcSjFHItph5OTmhodY4BOwy81A==
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.5.tgz#07ed445dddb94e5ae6764676923a49bddad9b2ec"
+ integrity sha512-qa+k5vDn9ct65qr+SgD2KwJ9Xz6P84lG2z+TDht/RBr71WnM/K61PqHUAcUyU6YqTJD26IXgjPuuhZR7HMw7eA==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -10501,16 +10459,7 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
-rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.9.4, rc-util@^5.9.8:
- version "5.13.2"
- resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.13.2.tgz#a8a0bb77743351841ba8bed6393e03b8d2f685c8"
- integrity sha512-eYc71XXGlp96RMzg01Mhq/T3BL6OOVTDSS0urFEuvpi+e7slhJRhaHGCKy2hqJm18m9ff7VoRoptplKu60dYog==
- dependencies:
- "@babel/runtime" "^7.12.5"
- react-is "^16.12.0"
- shallowequal "^1.1.0"
-
-rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
+rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
version "5.14.0"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.14.0.tgz#52c650e27570c2c47f7936c7d32eaec5212492a8"
integrity sha512-2vy6/Z1BJUcwLjm/UEJb/htjUTQPigITUIemCcFEo1fQevAumc9sA32x2z5qyWoa9uhrXbiAjSDpPIUqyg65sA==
@@ -10520,9 +10469,9 @@ rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1, rc-util@^5.8.0:
shallowequal "^1.1.0"
rc-virtual-list@^3.0.1, rc-virtual-list@^3.2.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.3.0.tgz#2f95a6ddbbf63d78b28662b57f1e69f7472762fe"
- integrity sha512-lVXpGWC6yMdwV2SHo6kc63WlqjCnb3eO72V726KA2/wh9KA6wi/swcdR3zAowuA8hJxG/lRANmY5kpLZ+Pz3iQ==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.1.tgz#1f3b41391acf033a6c7e84c2f4e8a4ee0dc72807"
+ integrity sha512-YexJy+Cx8qjnQdV8+0JBeM65VF2kvO9lnsfrIvHsL3lIH1adMZ85HqmePGUzKkKMZC+CRAJc2K4g2iJS1dOjPw==
dependencies:
classnames "^2.2.6"
rc-resize-observer "^1.0.0"
@@ -10891,14 +10840,14 @@ redux@4.1.1, redux@^4.0.0:
dependencies:
"@babel/runtime" "^7.9.2"
-regenerate-unicode-properties@^8.2.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
- integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+ integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
dependencies:
- regenerate "^1.4.0"
+ regenerate "^1.4.2"
-regenerate@^1.4.0:
+regenerate@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
@@ -10952,26 +10901,26 @@ regexpp@^3.1.0:
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
regexpu-core@^4.7.1:
- version "4.7.1"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
- integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
- dependencies:
- regenerate "^1.4.0"
- regenerate-unicode-properties "^8.2.0"
- regjsgen "^0.5.1"
- regjsparser "^0.6.4"
- unicode-match-property-ecmascript "^1.0.4"
- unicode-match-property-value-ecmascript "^1.2.0"
-
-regjsgen@^0.5.1:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+ integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+ dependencies:
+ regenerate "^1.4.2"
+ regenerate-unicode-properties "^9.0.0"
+ regjsgen "^0.5.2"
+ regjsparser "^0.7.0"
+ unicode-match-property-ecmascript "^2.0.0"
+ unicode-match-property-value-ecmascript "^2.0.0"
+
+regjsgen@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-regjsparser@^0.6.4:
- version "0.6.9"
- resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
- integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+regjsparser@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+ integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
dependencies:
jsesc "~0.5.0"
@@ -11575,9 +11524,9 @@ side-channel@^1.0.4:
object-inspect "^1.9.0"
signal-exit@^3.0.0, signal-exit@^3.0.2:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7"
+ integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==
simple-swizzle@^0.2.2:
version "0.2.2"
@@ -11636,16 +11585,16 @@ snapdragon@^0.8.1:
use "^3.1.0"
sockjs-client@^1.5.0:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6"
- integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
+ integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
dependencies:
debug "^3.2.6"
eventsource "^1.0.7"
faye-websocket "^0.11.3"
inherits "^2.0.4"
json3 "^3.3.3"
- url-parse "^1.5.1"
+ url-parse "^1.5.3"
sockjs@^0.3.21:
version "0.3.21"
@@ -11684,10 +11633,10 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
- version "0.5.19"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
- integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@^0.5.20, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+ version "0.5.20"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+ integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
@@ -11803,11 +11752,12 @@ stable@^0.1.8:
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
stack-utils@^2.0.2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
- integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.4.tgz#bf967ae2813d3d2d1e1f59a4408676495c8112ab"
+ integrity sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==
dependencies:
escape-string-regexp "^2.0.0"
+ source-map-support "^0.5.20"
stackframe@^1.1.1:
version "1.2.0"
@@ -12226,9 +12176,9 @@ tapable@^1.0.0, tapable@^1.1.3:
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^6.0.2:
- version "6.1.7"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.7.tgz#c566d1107d38b09e92983a68db5534fc7f6cab42"
- integrity sha512-PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA==
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -12299,13 +12249,13 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
source-map-support "~0.5.12"
terser@^5.3.4:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
- integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
+ version "5.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.8.0.tgz#c6d352f91aed85cc6171ccb5e84655b77521d947"
+ integrity sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==
dependencies:
commander "^2.20.0"
source-map "~0.7.2"
- source-map-support "~0.5.19"
+ source-map-support "~0.5.20"
test-exclude@^6.0.0:
version "6.0.0"
@@ -12362,9 +12312,9 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3:
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
tmpl@1.0.x:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
- integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+ integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
to-arraybuffer@^1.0.0:
version "1.0.1"
@@ -12469,24 +12419,15 @@ tsconfig-paths@^3.11.0:
minimist "^1.2.0"
strip-bom "^3.0.0"
-tsconfig-paths@^3.9.0:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
- integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
- dependencies:
- json5 "^2.2.0"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
-
tslib@^1.10.0, tslib@^1.8.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.3, tslib@^2.1.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
- integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+ integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
tsutils@^3.17.1, tsutils@^3.21.0:
version "3.21.0"
@@ -12562,7 +12503,7 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-type@^2.0.0:
+type@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
@@ -12594,28 +12535,28 @@ unbox-primitive@^1.0.1:
has-symbols "^1.0.2"
which-boxed-primitive "^1.0.2"
-unicode-canonical-property-names-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
- integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+ integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-unicode-match-property-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
- integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+ integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.4"
- unicode-property-aliases-ecmascript "^1.0.4"
+ unicode-canonical-property-names-ecmascript "^2.0.0"
+ unicode-property-aliases-ecmascript "^2.0.0"
-unicode-match-property-value-ecmascript@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
- integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+ integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
-unicode-property-aliases-ecmascript@^1.0.4:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
- integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+ integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
unified@^9.1.0:
version "9.2.2"
@@ -12751,7 +12692,7 @@ url-loader@4.1.1:
mime-types "^2.1.27"
schema-utils "^3.0.0"
-url-parse@^1.4.3, url-parse@^1.5.1:
+url-parse@^1.4.3, url-parse@^1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
@@ -13389,9 +13330,9 @@ ws@^6.2.1:
async-limiter "~1.0.0"
ws@^7.4.6:
- version "7.4.6"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
- integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+ version "7.5.5"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+ integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
xml-name-validator@^3.0.0:
version "3.0.0"
diff --git a/yarn.lock b/yarn.lock
index ab787d1..1f150a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,11 +23,6 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@types/lodash@4.14.172":
- version "4.14.172"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
- integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
-
"@types/parse-json@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
--
GitLab