From 8fb4a3a3ad41efe760103bf3ee92303b7702fcac Mon Sep 17 00:00:00 2001 From: Mikkel Jakobsen Date: Fri, 1 Dec 2023 10:20:38 +0100 Subject: [PATCH 01/19] Change useUrl hook to be able to ask for url AND importantly: fail if it is not present. We had to many incidents where this happened, that is the story behind this initiative. We should still consider having a validation step of the incoming props in the apps. The would highly improve the integrity of the apps. --- src/apps/create-patron-user-info/CreatePatron.tsx | 3 ++- src/apps/create-patron-user-info/UserInfo.tsx | 5 +++-- src/apps/dashboard/dashboard-fees/dashboard-fees.tsx | 4 +++- .../dashboard-notification-list.tsx | 5 ++++- .../FavoritesListMaterialComponent.tsx | 6 +++++- src/apps/fee-list/FeeList.tsx | 4 +++- src/apps/fee-list/modal/my-payment-overview-modal.tsx | 4 +++- src/apps/fee-list/stackable-fees/AcceptTermsCheckbox.tsx | 3 ++- src/apps/fee-list/stackable-fees/fee-details-content.tsx | 3 ++- src/apps/fee-list/stackable-fees/total-payment-pay.tsx | 4 +++- .../stackable-material/material-overdue-link.tsx | 4 +++- src/apps/loan-list/modal/material-details.tsx | 4 +++- src/apps/menu/menu-logged-in/MenuLoggedInContent.tsx | 9 ++++++--- src/apps/menu/menu-not-logged-in/menu-not-logged-in.tsx | 5 ++++- src/apps/patron-page/PatronPage.tsx | 4 +++- src/apps/patron-page/sections/StatusSection.tsx | 4 +++- .../modal/pause-reservation/pause-reservation.tsx | 4 +++- .../modal/reservation-details/reservation-details.tsx | 4 +++- src/apps/search-header/search-header.tsx | 9 +++++++-- src/components/GroupModal/StatusCircleModalHeader.tsx | 3 ++- .../availability-label/availability-labels.tsx | 3 ++- .../blocked-patron/blocked-modal/BlockedModal.tsx | 4 +++- .../card-item-list/card-list-item/card-list-item.tsx | 5 ++++- src/components/material/MaterialDescription.tsx | 4 +++- src/components/material/MaterialHeaderText.tsx | 4 +++- src/components/material/ReviewInfomedia.tsx | 7 +++++-- .../online/MaterialButtonOnlineDigitalArticle.tsx | 6 ++++-- .../online/MaterialButtonOnlineInfomediaArticle.tsx | 4 +++- .../material-buttons/physical/MaterialButtonPhysical.tsx | 4 +++- .../MaterialButtonReservableFromAnotherLibrary.tsx | 4 +++- src/components/simple-material/SimpleMaterial.tsx | 4 +++- src/core/adgangsplatformen/useUserInfo.ts | 6 ++---- src/core/utils/url.tsx | 9 ++++++++- 33 files changed, 113 insertions(+), 42 deletions(-) diff --git a/src/apps/create-patron-user-info/CreatePatron.tsx b/src/apps/create-patron-user-info/CreatePatron.tsx index 89925ef4cb..397394414c 100644 --- a/src/apps/create-patron-user-info/CreatePatron.tsx +++ b/src/apps/create-patron-user-info/CreatePatron.tsx @@ -10,7 +10,8 @@ const CreatePatron: FC = () => { const [cpr, setCpr] = useState(null); const config = useConfig(); const t = useText(); - const { dashboardUrl } = useUrls(); + const u = useUrls(); + const dashboardUrl = u("dashboardUrl"); const { id: agencyId } = config<{ id: `${number}`; diff --git a/src/apps/create-patron-user-info/UserInfo.tsx b/src/apps/create-patron-user-info/UserInfo.tsx index 6291f115a7..26c73fc2a0 100644 --- a/src/apps/create-patron-user-info/UserInfo.tsx +++ b/src/apps/create-patron-user-info/UserInfo.tsx @@ -17,10 +17,11 @@ export interface UserInfoProps { const UserInfo: FC = ({ cpr }) => { const t = useText(); - const { logoutUrl } = useUrls(); + const u = useUrls(); + const logoutUrl = u("logoutUrl"); + const redirectOnUserCreatedUrl = u("redirectOnUserCreatedUrl"); const config = useConfig(); const formRef = useRef(null); - const { redirectOnUserCreatedUrl } = useUrls(); const [pin, setPin] = useState(null); const minAge = parseInt(config("minAgeConfig"), 10); const [validCpr] = useState(patronAgeValid(cpr, minAge)); diff --git a/src/apps/dashboard/dashboard-fees/dashboard-fees.tsx b/src/apps/dashboard/dashboard-fees/dashboard-fees.tsx index ca1f10900c..6acb5fd783 100644 --- a/src/apps/dashboard/dashboard-fees/dashboard-fees.tsx +++ b/src/apps/dashboard/dashboard-fees/dashboard-fees.tsx @@ -8,7 +8,9 @@ import WarningBar from "../../loan-list/materials/utils/warning-bar"; const DashboardFees: FC = () => { const t = useText(); - const { feesPageUrl } = useUrls(); + const u = useUrls(); + + const feesPageUrl = u("feesPageUrl"); const { data: fbsFees } = useGetFeesV2(); const [feeCount, setFeeCount] = useState(); const [totalFeeAmount, setTotalFeeAmount] = useState("0"); diff --git a/src/apps/dashboard/dashboard-notification-list/dashboard-notification-list.tsx b/src/apps/dashboard/dashboard-notification-list/dashboard-notification-list.tsx index e25d71e6d3..25058585f6 100644 --- a/src/apps/dashboard/dashboard-notification-list/dashboard-notification-list.tsx +++ b/src/apps/dashboard/dashboard-notification-list/dashboard-notification-list.tsx @@ -38,6 +38,10 @@ const DashboardNotificationList: FC = ({ columns }) => { const t = useText(); + const u = useUrls(); + const physicalLoansUrl = u("physicalLoansUrl"); + const reservationsUrl = u("reservationsUrl"); + const { all: { reservations, @@ -80,7 +84,6 @@ const DashboardNotificationList: FC = ({ reservationsReady: reservationsReadyID, reservationsQueued: reservationsQueueID } = getModalIds(); - const { physicalLoansUrl, reservationsUrl } = useUrls(); const openLoanDetailsModal = useCallback( (loan: LoanType) => { diff --git a/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.tsx b/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.tsx index 0b4d2df1e1..d8d5279389 100644 --- a/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.tsx +++ b/src/apps/favorites-list-material-component/FavoritesListMaterialComponent.tsx @@ -9,7 +9,11 @@ import { useUrls } from "../../core/utils/url"; const FavoritesListMaterialComponent: FC = () => { const t = useText(); const [materials, setMaterials] = useState([]); - const { favoritesListMaterialComponentGoToListUrl } = useUrls(); + const u = useUrls(); + const favoritesListMaterialComponentGoToListUrl = u( + "favoritesListMaterialComponentGoToListUrl" + ); + const { data } = useGetList("default"); const { collections } = (data as { collections: Pid[] }) || []; diff --git a/src/apps/fee-list/FeeList.tsx b/src/apps/fee-list/FeeList.tsx index dcc50b4956..569005c9f2 100644 --- a/src/apps/fee-list/FeeList.tsx +++ b/src/apps/fee-list/FeeList.tsx @@ -20,6 +20,9 @@ import EmptyList from "../../components/empty-list/empty-list"; const FeeList: FC = () => { const t = useText(); + const u = useUrls(); + const viewFeesAndCompensationRatesUrl = u("viewFeesAndCompensationRatesUrl"); + const [feeDetailsModalId, setFeeDetailsModalId] = useState(""); const { open } = useModalButtonHandler(); const { modalIds } = useSelector((s: ModalIdsProps) => s.modal); @@ -34,7 +37,6 @@ const FeeList: FC = () => { >(null); const [totalFeePostPaymentChange, setTotalFeePostPaymentChange] = useState(0); - const { viewFeesAndCompensationRatesUrl } = useUrls(); const [feeDetailsData, setFeeDetailsData] = useState(); const openDetailsModalClickEvent = useCallback( diff --git a/src/apps/fee-list/modal/my-payment-overview-modal.tsx b/src/apps/fee-list/modal/my-payment-overview-modal.tsx index 3c3e778481..87390e7c86 100644 --- a/src/apps/fee-list/modal/my-payment-overview-modal.tsx +++ b/src/apps/fee-list/modal/my-payment-overview-modal.tsx @@ -7,8 +7,10 @@ import { useUrls } from "../../../core/utils/url"; const MyPaymentOverviewModal: FC = () => { const t = useText(); + const u = useUrls(); + const paymentOverviewUrl = u("paymentOverviewUrl"); const { close } = useModalButtonHandler(); - const { paymentOverviewUrl } = useUrls(); + const handleClick = () => { close("intermediate-payment-modal"); }; diff --git a/src/apps/fee-list/stackable-fees/AcceptTermsCheckbox.tsx b/src/apps/fee-list/stackable-fees/AcceptTermsCheckbox.tsx index 283abee965..885ec70c07 100644 --- a/src/apps/fee-list/stackable-fees/AcceptTermsCheckbox.tsx +++ b/src/apps/fee-list/stackable-fees/AcceptTermsCheckbox.tsx @@ -13,7 +13,8 @@ const AcceptTermsCheckbox: FC = ({ handleAcceptedTerms }) => { const t = useText(); - const { termsOfTradeUrl } = useUrls(); + const u = useUrls(); + const termsOfTradeUrl = u("termsOfTradeUrl"); return ( = ({ feeDetailsData }) => { const t = useText(); + const u = useUrls(); + const paymentOverviewUrl = u("paymentOverviewUrl"); const [check, setCheck] = useState(false); - const { paymentOverviewUrl } = useUrls(); const handleAcceptedTerms = () => { setCheck(!check); }; diff --git a/src/apps/fee-list/stackable-fees/total-payment-pay.tsx b/src/apps/fee-list/stackable-fees/total-payment-pay.tsx index 33c189574f..375b763808 100644 --- a/src/apps/fee-list/stackable-fees/total-payment-pay.tsx +++ b/src/apps/fee-list/stackable-fees/total-payment-pay.tsx @@ -17,8 +17,10 @@ const TotalPaymentPay: FC = ({ totalText, hideCheckbox }) => { - const { availablePaymentTypesUrl } = useUrls(); const t = useText(); + const u = useUrls(); + const availablePaymentTypesUrl = u("availablePaymentTypesUrl"); + const { open } = useModalButtonHandler(); const [check, setCheck] = useState(hideCheckbox); diff --git a/src/apps/loan-list/materials/stackable-material/material-overdue-link.tsx b/src/apps/loan-list/materials/stackable-material/material-overdue-link.tsx index 4132d3754f..1732a5bfbf 100644 --- a/src/apps/loan-list/materials/stackable-material/material-overdue-link.tsx +++ b/src/apps/loan-list/materials/stackable-material/material-overdue-link.tsx @@ -13,8 +13,10 @@ const MaterialOverdueLink: FC = ({ dueDate, showOn }) => { - const { viewFeesAndCompensationRatesUrl } = useUrls(); const t = useText(); + const u = useUrls(); + const viewFeesAndCompensationRatesUrl = u("viewFeesAndCompensationRatesUrl"); + if (!dueDate || (dueDate && !materialIsOverdue(dueDate))) return null; return ( diff --git a/src/apps/loan-list/modal/material-details.tsx b/src/apps/loan-list/modal/material-details.tsx index 9c19f2d675..6f757fec1e 100644 --- a/src/apps/loan-list/modal/material-details.tsx +++ b/src/apps/loan-list/modal/material-details.tsx @@ -39,7 +39,9 @@ const MaterialDetails: FC = ({ >(null); const t = useText(); - const { ereolenMyPageUrl, viewFeesAndCompensationRatesUrl } = useUrls(); + const u = useUrls(); + const ereolenMyPageUrl = u("ereolenMyPageUrl"); + const viewFeesAndCompensationRatesUrl = u("viewFeesAndCompensationRatesUrl"); if (!loan) { return null; diff --git a/src/apps/menu/menu-logged-in/MenuLoggedInContent.tsx b/src/apps/menu/menu-logged-in/MenuLoggedInContent.tsx index 83e2ff5f84..93f82c80c8 100644 --- a/src/apps/menu/menu-logged-in/MenuLoggedInContent.tsx +++ b/src/apps/menu/menu-logged-in/MenuLoggedInContent.tsx @@ -19,6 +19,12 @@ interface MenuLoggedInContentProps { } const MenuLoggedInContent: FC = ({ pageSize }) => { + const t = useText(); + const u = useUrls(); + const userProfileUrl = u("userProfileUrl"); + const logoutUrl = u("logoutUrl"); + const config = useConfig(); + const { all: { reservations } } = useReservations(); @@ -27,8 +33,6 @@ const MenuLoggedInContent: FC = ({ pageSize }) => { } = useLoans(); const { data: patronData } = usePatronData(); const { data: fbsFees } = useGetFeesV2(); - const t = useText(); - const config = useConfig(); // Get menu navigation data from config. const menuNavigationData = config( @@ -41,7 +45,6 @@ const MenuLoggedInContent: FC = ({ pageSize }) => { AuthenticatedPatronV6 | null | undefined >(); const [feeCount, setFeeCount] = useState(0); - const { userProfileUrl, logoutUrl } = useUrls(); // Set user data useEffect(() => { diff --git a/src/apps/menu/menu-not-logged-in/menu-not-logged-in.tsx b/src/apps/menu/menu-not-logged-in/menu-not-logged-in.tsx index 227cc28cf5..c2dbfd708f 100644 --- a/src/apps/menu/menu-not-logged-in/menu-not-logged-in.tsx +++ b/src/apps/menu/menu-not-logged-in/menu-not-logged-in.tsx @@ -8,7 +8,10 @@ import { getModalIds } from "../../../core/utils/helpers/modal-helpers"; const MenuNotLoggedInContent: FC = () => { const t = useText(); - const { menuLoginUrl, menuSignUpUrl } = useUrls(); + const u = useUrls(); + const menuLoginUrl = u("menuLoginUrl"); + const menuSignUpUrl = u("menuSignUpUrl"); + const { userMenuAnonymous: userMenuAnonymousModalId } = getModalIds(); return ( diff --git a/src/apps/patron-page/PatronPage.tsx b/src/apps/patron-page/PatronPage.tsx index 0bd0216b9c..09b38259c7 100644 --- a/src/apps/patron-page/PatronPage.tsx +++ b/src/apps/patron-page/PatronPage.tsx @@ -22,12 +22,14 @@ import { getModalIds } from "../../core/utils/helpers/modal-helpers"; const PatronPage: FC = () => { const queryClient = useQueryClient(); const t = useText(); + const u = useUrls(); + const deletePatronUrl = u("deletePatronUrl"); + const { mutate } = useUpdateV5(); const { pauseReservation } = getModalIds(); const { data: patronData } = usePatronData(); - const { deletePatronUrl } = useUrls(); const [patron, setPatron] = useState(null); const [pin, setPin] = useState(null); const [disableSubmitButton, setDisableSubmitButton] = useState(false); diff --git a/src/apps/patron-page/sections/StatusSection.tsx b/src/apps/patron-page/sections/StatusSection.tsx index f9271a49a8..90dece0454 100644 --- a/src/apps/patron-page/sections/StatusSection.tsx +++ b/src/apps/patron-page/sections/StatusSection.tsx @@ -10,7 +10,9 @@ import Link from "../../../components/atoms/links/Link"; const StatusSection: FC = () => { const t = useText(); - const { alwaysAvailableEreolenUrl } = useUrls(); + const u = useUrls(); + const alwaysAvailableEreolenUrl = u("alwaysAvailableEreolenUrl"); + const { data: libraryProfileFetched } = useGetV1LibraryProfile(); const { isSuccess, data } = useGetV1UserLoans(); const [libraryProfile, setLibraryProfile] = useState( diff --git a/src/apps/reservation-list/modal/pause-reservation/pause-reservation.tsx b/src/apps/reservation-list/modal/pause-reservation/pause-reservation.tsx index 40335121f7..673b67eb9e 100644 --- a/src/apps/reservation-list/modal/pause-reservation/pause-reservation.tsx +++ b/src/apps/reservation-list/modal/pause-reservation/pause-reservation.tsx @@ -20,7 +20,9 @@ interface PauseReservationProps { const PauseReservation: FC = ({ id, user }) => { const t = useText(); - const { pauseReservationInfoUrl } = useUrls(); + const u = useUrls(); + const pauseReservationInfoUrl = u("pauseReservationInfoUrl"); + const queryClient = useQueryClient(); const { mutate } = useUpdateV5(); const { close } = useModalButtonHandler(); diff --git a/src/apps/reservation-list/modal/reservation-details/reservation-details.tsx b/src/apps/reservation-list/modal/reservation-details/reservation-details.tsx index 22e6ff359c..41a5095da7 100644 --- a/src/apps/reservation-list/modal/reservation-details/reservation-details.tsx +++ b/src/apps/reservation-list/modal/reservation-details/reservation-details.tsx @@ -34,6 +34,9 @@ const ReservationDetails: FC = ({ openReservationDeleteModal }) => { const t = useText(); + const u = useUrls(); + const ereolenHomepageUrl = u("ereolenHomepageUrl"); + const config = useConfig(); const [externalUrl, setExternalUrl] = useState(null); const { state, identifier, numberInQueue } = reservation; @@ -54,7 +57,6 @@ const ReservationDetails: FC = ({ { cql: `term.isbn=${identifier}`, offset: 0, limit: 1, filters: {} }, { enabled: !!identifier } ); - const { ereolenHomepageUrl } = useUrls(); useEffect(() => { if (!complexSearchData || complexSearchData.complexSearch.hitcount === 0) { diff --git a/src/apps/search-header/search-header.tsx b/src/apps/search-header/search-header.tsx index a353c24376..1dcb4ef658 100644 --- a/src/apps/search-header/search-header.tsx +++ b/src/apps/search-header/search-header.tsx @@ -29,6 +29,12 @@ import { statistics } from "../../core/statistics/statistics"; import HeaderDropdown from "../../components/header-dropdown/HeaderDropdown"; const SearchHeader: React.FC = () => { + const t = useText(); + const u = useUrls(); + const searchUrl = u("searchUrl"); + const materialUrl = u("materialUrl"); + const advancedSearchUrl = u("advancedSearchUrl"); + const [q, setQ] = useState(""); const [qWithoutQuery, setQWithoutQuery] = useState(q); const [suggestItems, setSuggestItems] = useState< @@ -40,6 +46,7 @@ const SearchHeader: React.FC = () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any const [currentlySelectedItem, setCurrentlySelectedItem] = useState(""); const [isAutosuggestOpen, setIsAutosuggestOpen] = useState(false); + const { data, isLoading, @@ -54,8 +61,6 @@ const SearchHeader: React.FC = () => { ); const [isHeaderDropdownOpen, setIsHeaderDropdownOpen] = useState(false); - const { searchUrl, materialUrl, advancedSearchUrl } = useUrls(); - const t = useText(); const autosuggestCategoryList: AutosuggestCategoryList[] = [ { render: t("autosuggestBookCategoryText"), diff --git a/src/components/GroupModal/StatusCircleModalHeader.tsx b/src/components/GroupModal/StatusCircleModalHeader.tsx index b73876fb91..79d7953a94 100644 --- a/src/components/GroupModal/StatusCircleModalHeader.tsx +++ b/src/components/GroupModal/StatusCircleModalHeader.tsx @@ -18,7 +18,8 @@ const StatusCircleModalHeader: FC = ({ statusCircleComponent }) => { const t = useText(); - const { feesPageUrl } = useUrls(); + const u = useUrls(); + const feesPageUrl = u("feesPageUrl"); return ( <> diff --git a/src/components/availability-label/availability-labels.tsx b/src/components/availability-label/availability-labels.tsx index 3651e2d952..0f55b93681 100644 --- a/src/components/availability-label/availability-labels.tsx +++ b/src/components/availability-label/availability-labels.tsx @@ -30,7 +30,8 @@ export const AvailabilityLabels: React.FC = ({ setSelectedManifestations, cursorPointer = false }) => { - const { materialUrl } = useUrls(); + const u = useUrls(); + const materialUrl = u("materialUrl"); const allMaterialTypes = getMaterialTypes(manifestations); const manifestationsByMaterialType = divideManifestationsByMaterialType(manifestations); diff --git a/src/components/blocked-patron/blocked-modal/BlockedModal.tsx b/src/components/blocked-patron/blocked-modal/BlockedModal.tsx index 94516b1029..6d2cd58c88 100644 --- a/src/components/blocked-patron/blocked-modal/BlockedModal.tsx +++ b/src/components/blocked-patron/blocked-modal/BlockedModal.tsx @@ -12,7 +12,9 @@ interface BlockedModalProps { const BlockedModal: FC = ({ blockedStatus }) => { const t = useText(); - const { blockedPatronELinkUrl } = useUrls(); + const u = useUrls(); + const blockedPatronELinkUrl = u("blockedPatronELinkUrl"); + const { blockedModal } = getModalIds(); return ( diff --git a/src/components/card-item-list/card-list-item/card-list-item.tsx b/src/components/card-item-list/card-list-item/card-list-item.tsx index 0985da1a86..03652199ad 100644 --- a/src/components/card-item-list/card-list-item/card-list-item.tsx +++ b/src/components/card-item-list/card-list-item/card-list-item.tsx @@ -59,7 +59,10 @@ const CardListItem: React.FC = ({ }) => { const searchTitleId = useId(); const t = useText(); - const { materialUrl, searchUrl } = useUrls(); + const u = useUrls(); + const searchUrl = u("searchUrl"); + const materialUrl = u("materialUrl"); + const { filters } = useFilterHandler(); const materialTypeFromFilters = getFirstMaterialTypeFromFilters( filters, diff --git a/src/components/material/MaterialDescription.tsx b/src/components/material/MaterialDescription.tsx index 1e921a5485..06984f9538 100644 --- a/src/components/material/MaterialDescription.tsx +++ b/src/components/material/MaterialDescription.tsx @@ -24,7 +24,9 @@ export interface MaterialDescriptionProps { const MaterialDescription: React.FC = ({ work }) => { const { itemRef, hasBeenVisible: showItem } = useItemHasBeenVisible(); const t = useText(); - const { searchUrl, materialUrl } = useUrls(); + const u = useUrls(); + const searchUrl = u("searchUrl"); + const materialUrl = u("materialUrl"); const { fictionNonfiction, series, diff --git a/src/components/material/MaterialHeaderText.tsx b/src/components/material/MaterialHeaderText.tsx index f12d2613b3..f1e9dc3b5e 100644 --- a/src/components/material/MaterialHeaderText.tsx +++ b/src/components/material/MaterialHeaderText.tsx @@ -18,7 +18,9 @@ const MaterialHeaderText: React.FC = ({ materialTitleId }) => { const t = useText(); - const { searchUrl } = useUrls(); + const u = useUrls(); + const searchUrl = u("searchUrl"); + return ( <>

= ({ }, dataCy = "review-infomedia" }) => { + const t = useText(); + const u = useUrls(); + const authUrl = u("authUrl"); + const date = getReviewRelease(dateFirstEdition, workYear, edition); const authors = getAuthorNames(creators); const publication = getPublicationName(hostPublication); @@ -49,8 +53,7 @@ const ReviewInfomedia: React.FC = ({ const { data, error } = useGetInfomediaQuery({ id: infomediaId }); - const t = useText(); - const { authUrl } = useUrls(); + const onClick = (reviewId: string) => { const returnUrl = currentLocationWithParametersUrl({ disclosure: "disclosure-reviews" diff --git a/src/components/material/material-buttons/online/MaterialButtonOnlineDigitalArticle.tsx b/src/components/material/material-buttons/online/MaterialButtonOnlineDigitalArticle.tsx index 48c9b634c6..83b4b36636 100644 --- a/src/components/material/material-buttons/online/MaterialButtonOnlineDigitalArticle.tsx +++ b/src/components/material/material-buttons/online/MaterialButtonOnlineDigitalArticle.tsx @@ -20,11 +20,13 @@ export interface MaterialButtonOnlineDigitalArticleProps { const MaterialButtonOnlineDigitalArticle: FC< MaterialButtonOnlineDigitalArticleProps > = ({ pid, size, dataCy = "material-button-online-digital-article" }) => { + const t = useText(); + const u = useUrls(); + const authUrl = u("authUrl"); + const [isUserResident, setIsUserResident] = useState(null); const { isLoading, data: userData } = usePatronData(); const { openGuarded } = useModalButtonHandler(); - const t = useText(); - const { authUrl } = useUrls(); useDeepCompareEffect(() => { if (!userData || !userData.patron) { diff --git a/src/components/material/material-buttons/online/MaterialButtonOnlineInfomediaArticle.tsx b/src/components/material/material-buttons/online/MaterialButtonOnlineInfomediaArticle.tsx index 847a852571..b08bfa3cae 100644 --- a/src/components/material/material-buttons/online/MaterialButtonOnlineInfomediaArticle.tsx +++ b/src/components/material/material-buttons/online/MaterialButtonOnlineInfomediaArticle.tsx @@ -26,9 +26,11 @@ const MaterialButtonOnlineInfomediaArticle: FC< dataCy = "material-button-online-infomedia-article" }) => { const t = useText(); + const u = useUrls(); + const authUrl = u("authUrl"); + const { isLoading, data: userData } = usePatronData(); const { openGuarded } = useModalButtonHandler(); - const { authUrl } = useUrls(); const isUserResident = userData && userData?.patron ? isResident(userData.patron) : null; diff --git a/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx b/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx index ca7dc4cf86..d655f673cc 100644 --- a/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx +++ b/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx @@ -21,8 +21,10 @@ const MaterialButtonPhysical: FC = ({ dataCy = "material-button-physical" }) => { const t = useText(); + const u = useUrls(); + const authUrl = u("authUrl"); + const { openGuarded } = useModalButtonHandler(); - const { authUrl } = useUrls(); const onClick = () => { openGuarded({ diff --git a/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx b/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx index fd0cc09403..97241373b6 100644 --- a/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx +++ b/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx @@ -23,8 +23,10 @@ const MaterialButtonReservableFromAnotherLibrary: FC< dataCy = "material-button-reservable-on-another-library" }) => { const t = useText(); + const u = useUrls(); + const authUrl = u("authUrl"); + const { openGuarded } = useModalButtonHandler(); - const { authUrl } = useUrls(); const onClick = () => { openGuarded({ diff --git a/src/components/simple-material/SimpleMaterial.tsx b/src/components/simple-material/SimpleMaterial.tsx index 470507b4b9..d9f9c8cd4d 100644 --- a/src/components/simple-material/SimpleMaterial.tsx +++ b/src/components/simple-material/SimpleMaterial.tsx @@ -33,8 +33,10 @@ const SimpleMaterial: FC = ({ }, app }) => { + const u = useUrls(); + const materialUrl = u("materialUrl"); + const dispatch = useDispatch(); - const { materialUrl } = useUrls(); const materialFullUrl = constructMaterialUrl(materialUrl, workId); // Create authors string diff --git a/src/core/adgangsplatformen/useUserInfo.ts b/src/core/adgangsplatformen/useUserInfo.ts index 27cb3bc1fa..a29ac62eb9 100644 --- a/src/core/adgangsplatformen/useUserInfo.ts +++ b/src/core/adgangsplatformen/useUserInfo.ts @@ -45,10 +45,8 @@ const useUserInfo = < TData > ): UseQueryResult & { queryKey: QueryKey } => { - const { userinfoUrl } = useUrls(); - if (!userinfoUrl) { - throw new Error("userinfoUrl is not defined"); - } + const u = useUrls(); + const userinfoUrl = u("userinfoUrl"); const url = String(userinfoUrl); const queryKey = queryOptions?.queryKey ?? getUserInfoQueryKey(url); diff --git a/src/core/utils/url.tsx b/src/core/utils/url.tsx index 54984d1608..6359b86f6b 100644 --- a/src/core/utils/url.tsx +++ b/src/core/utils/url.tsx @@ -6,7 +6,14 @@ import withSuffix from "./withSuffix"; export const useUrls = () => { const { data } = useSelector((state: RootState) => state.url); - return useMemo(() => turnUrlStringsIntoObjects(data), [data]); + const urls = useMemo(() => turnUrlStringsIntoObjects(data), [data]); + + return (name: string) => { + if (!urls[name]) { + throw new Error(`The url ${name} is not defined`); + } + return urls[name]; + }; }; export const withUrls = (Component: React.ComponentType) => { return withSuffix(Component, "Url", addUrlEntries); From c8fcdda87efe5acf047619e4ae6313727e3b94b0 Mon Sep 17 00:00:00 2001 From: Mikkel Jakobsen Date: Fri, 1 Dec 2023 11:43:32 +0100 Subject: [PATCH 02/19] Add missing url storybook params Since an error is thrown when not passing url props to apps we catched that the menu story did not get the proper params --- src/apps/menu/menu.dev.tsx | 8 ++++++++ src/apps/menu/menu.entry.tsx | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/apps/menu/menu.dev.tsx b/src/apps/menu/menu.dev.tsx index 49e3cebaec..2fe1605d5e 100644 --- a/src/apps/menu/menu.dev.tsx +++ b/src/apps/menu/menu.dev.tsx @@ -128,6 +128,14 @@ export default { defaultValue: "/Logout", control: { type: "text" } }, + physicalLoansUrl: { + defaultValue: "/user/me/loans", + control: { type: "text" } + }, + reservationsUrl: { + defaultValue: "/user/me/reservations", + control: { type: "text" } + }, menuLoginText: { defaultValue: "Log in", control: { type: "text" } diff --git a/src/apps/menu/menu.entry.tsx b/src/apps/menu/menu.entry.tsx index b54997d5e1..7fd1f1c777 100644 --- a/src/apps/menu/menu.entry.tsx +++ b/src/apps/menu/menu.entry.tsx @@ -42,6 +42,8 @@ export interface MenuProps { menuAuthenticatedCloseButtonText: string; menuAuthenticatedModalDescriptionText: string; menuNotAuthenticatedModalDescriptionText: string; + physicalLoansUrl: string; + reservationsUrl: string; } export interface MenuEntryProps From 681d554af4f3e16267c3192b19d5267fd6bae8be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:30:57 +0000 Subject: [PATCH 03/19] Bump the babel group with 2 updates Bumps the babel group with 2 updates: [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) and [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env). Updates `@babel/core` from 7.23.3 to 7.23.5 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.5/packages/babel-core) Updates `@babel/preset-env` from 7.23.3 to 7.23.5 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.5/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: babel - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: babel ... Signed-off-by: dependabot[bot] --- package.json | 4 +- yarn.lock | 292 ++++++++++++++++++++++++--------------------------- 2 files changed, 140 insertions(+), 156 deletions(-) diff --git a/package.json b/package.json index f7821c790d..df3d38774e 100644 --- a/package.json +++ b/package.json @@ -45,10 +45,10 @@ "post-process-generated-graphql": "ts-node ./scripts/post-process-generated-graphql.ts" }, "devDependencies": { - "@babel/core": "^7.23.3", + "@babel/core": "^7.23.5", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-optional-chaining": "^7.21.0", - "@babel/preset-env": "^7.23.3", + "@babel/preset-env": "^7.23.5", "@babel/preset-react": "^7.23.3", "@babel/preset-typescript": "^7.23.3", "@csstools/postcss-sass": "^5.0.1", diff --git a/yarn.lock b/yarn.lock index 7713b0f8fa..91c149b832 100644 --- a/yarn.lock +++ b/yarn.lock @@ -52,18 +52,18 @@ resolved "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.14.0.tgz" integrity sha512-hHsYF6XsYNIKb1P2rXaooF4H+uKKQ4b/Ljxrk3rZ3riEDiSxMshMEfb1fUlw9Yj4V4OmJhjXwkNvw8W59AXv1A== -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" - integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" + integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== dependencies: - "@babel/highlight" "^7.22.13" + "@babel/highlight" "^7.23.4" chalk "^2.4.2" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.3.tgz#3febd552541e62b5e883a25eb3effd7c7379db11" - integrity sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" + integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== "@babel/core@7.12.9": version "7.12.9" @@ -87,33 +87,33 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.16.0", "@babel/core@^7.23.3", "@babel/core@^7.7.5": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9" - integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew== +"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.16.0", "@babel/core@^7.23.5", "@babel/core@^7.7.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7" + integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.23.3" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.5" "@babel/helper-compilation-targets" "^7.22.15" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.2" - "@babel/parser" "^7.23.3" + "@babel/helpers" "^7.23.5" + "@babel/parser" "^7.23.5" "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.3" - "@babel/types" "^7.23.3" + "@babel/traverse" "^7.23.5" + "@babel/types" "^7.23.5" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.14.0", "@babel/generator@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.3.tgz#86e6e83d95903fbe7613f448613b8b319f330a8e" - integrity sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg== +"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.14.0", "@babel/generator@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755" + integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA== dependencies: - "@babel/types" "^7.23.3" + "@babel/types" "^7.23.5" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -360,20 +360,20 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" - integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== +"@babel/helper-string-parser@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" + integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" - integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA== +"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" + integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== "@babel/helper-wrap-function@^7.22.20": version "7.22.20" @@ -384,28 +384,28 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.23.2": - version "7.23.2" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767" - integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.5.tgz#52f522840df8f1a848d06ea6a79b79eefa72401e" + integrity sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg== dependencies: "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.2" - "@babel/types" "^7.23.0" + "@babel/traverse" "^7.23.5" + "@babel/types" "^7.23.5" -"@babel/highlight@^7.22.13": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" - integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== +"@babel/highlight@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" + integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== dependencies: "@babel/helper-validator-identifier" "^7.22.20" chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.8", "@babel/parser@^7.22.15", "@babel/parser@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.3.tgz#0ce0be31a4ca4f1884b5786057cadcb6c3be58f9" - integrity sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.8", "@babel/parser@^7.22.15", "@babel/parser@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563" + integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3": version "7.23.3" @@ -694,10 +694,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-async-generator-functions@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz#9df2627bad7f434ed13eef3e61b2b65cafd4885b" - integrity sha512-59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ== +"@babel/plugin-transform-async-generator-functions@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz#93ac8e3531f347fba519b4703f9ff2a75c6ae27a" + integrity sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" @@ -720,10 +720,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz#e99a3ff08f58edd28a8ed82481df76925a4ffca7" - integrity sha512-QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw== +"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5" + integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" @@ -735,19 +735,19 @@ "@babel/helper-create-class-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-class-static-block@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz#56f2371c7e5bf6ff964d84c5dc4d4db5536b5159" - integrity sha512-PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ== +"@babel/plugin-transform-class-static-block@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5" + integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ== dependencies: "@babel/helper-create-class-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz#73380c632c095b03e8503c24fd38f95ad41ffacb" - integrity sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w== +"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz#e7a75f815e0c534cc4c9a39c56636c84fc0d64f2" + integrity sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-compilation-targets" "^7.22.15" @@ -789,10 +789,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-dynamic-import@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz#82625924da9ed5fb11a428efb02e43bc9a3ab13e" - integrity sha512-vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A== +"@babel/plugin-transform-dynamic-import@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143" + integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" @@ -805,10 +805,10 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-export-namespace-from@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz#dcd066d995f6ac6077e5a4ccb68322a01e23ac49" - integrity sha512-yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg== +"@babel/plugin-transform-export-namespace-from@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191" + integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" @@ -837,10 +837,10 @@ "@babel/helper-function-name" "^7.23.0" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-json-strings@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz#489724ab7d3918a4329afb4172b2fd2cf3c8d245" - integrity sha512-H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A== +"@babel/plugin-transform-json-strings@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d" + integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-json-strings" "^7.8.3" @@ -852,10 +852,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-logical-assignment-operators@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz#3a406d6083feb9487083bca6d2334a3c9b6c4808" - integrity sha512-+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A== +"@babel/plugin-transform-logical-assignment-operators@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5" + integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" @@ -917,26 +917,26 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-nullish-coalescing-operator@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz#8a613d514b521b640344ed7c56afeff52f9413f8" - integrity sha512-xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA== +"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e" + integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-transform-numeric-separator@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz#2f8da42b75ba89e5cfcd677afd0856d52c0c2e68" - integrity sha512-s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw== +"@babel/plugin-transform-numeric-separator@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29" + integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-object-rest-spread@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz#509373753b5f7202fe1940e92fd075bd7874955f" - integrity sha512-VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog== +"@babel/plugin-transform-object-rest-spread@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83" + integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g== dependencies: "@babel/compat-data" "^7.23.3" "@babel/helper-compilation-targets" "^7.22.15" @@ -952,18 +952,18 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-replace-supers" "^7.22.20" -"@babel/plugin-transform-optional-catch-binding@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz#362c0b545ee9e5b0fa9d9e6fe77acf9d4c480027" - integrity sha512-LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A== +"@babel/plugin-transform-optional-catch-binding@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017" + integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz#92fc83f54aa3adc34288933fa27e54c13113f4be" - integrity sha512-zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg== +"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017" + integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA== dependencies: "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" @@ -984,10 +984,10 @@ "@babel/helper-create-class-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-private-property-in-object@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz#5cd34a2ce6f2d008cc8f91d8dcc29e2c41466da6" - integrity sha512-a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA== +"@babel/plugin-transform-private-property-in-object@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5" + integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-create-class-features-plugin" "^7.22.15" @@ -1138,15 +1138,15 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.16.0", "@babel/preset-env@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.3.tgz#d299e0140a7650684b95c62be2db0ef8c975143e" - integrity sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q== +"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.16.0", "@babel/preset-env@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.5.tgz#350a3aedfa9f119ad045b068886457e895ba0ca1" + integrity sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A== dependencies: - "@babel/compat-data" "^7.23.3" + "@babel/compat-data" "^7.23.5" "@babel/helper-compilation-targets" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" + "@babel/helper-validator-option" "^7.23.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3" "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3" @@ -1170,25 +1170,25 @@ "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" "@babel/plugin-transform-arrow-functions" "^7.23.3" - "@babel/plugin-transform-async-generator-functions" "^7.23.3" + "@babel/plugin-transform-async-generator-functions" "^7.23.4" "@babel/plugin-transform-async-to-generator" "^7.23.3" "@babel/plugin-transform-block-scoped-functions" "^7.23.3" - "@babel/plugin-transform-block-scoping" "^7.23.3" + "@babel/plugin-transform-block-scoping" "^7.23.4" "@babel/plugin-transform-class-properties" "^7.23.3" - "@babel/plugin-transform-class-static-block" "^7.23.3" - "@babel/plugin-transform-classes" "^7.23.3" + "@babel/plugin-transform-class-static-block" "^7.23.4" + "@babel/plugin-transform-classes" "^7.23.5" "@babel/plugin-transform-computed-properties" "^7.23.3" "@babel/plugin-transform-destructuring" "^7.23.3" "@babel/plugin-transform-dotall-regex" "^7.23.3" "@babel/plugin-transform-duplicate-keys" "^7.23.3" - "@babel/plugin-transform-dynamic-import" "^7.23.3" + "@babel/plugin-transform-dynamic-import" "^7.23.4" "@babel/plugin-transform-exponentiation-operator" "^7.23.3" - "@babel/plugin-transform-export-namespace-from" "^7.23.3" + "@babel/plugin-transform-export-namespace-from" "^7.23.4" "@babel/plugin-transform-for-of" "^7.23.3" "@babel/plugin-transform-function-name" "^7.23.3" - "@babel/plugin-transform-json-strings" "^7.23.3" + "@babel/plugin-transform-json-strings" "^7.23.4" "@babel/plugin-transform-literals" "^7.23.3" - "@babel/plugin-transform-logical-assignment-operators" "^7.23.3" + "@babel/plugin-transform-logical-assignment-operators" "^7.23.4" "@babel/plugin-transform-member-expression-literals" "^7.23.3" "@babel/plugin-transform-modules-amd" "^7.23.3" "@babel/plugin-transform-modules-commonjs" "^7.23.3" @@ -1196,15 +1196,15 @@ "@babel/plugin-transform-modules-umd" "^7.23.3" "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" "@babel/plugin-transform-new-target" "^7.23.3" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.3" - "@babel/plugin-transform-numeric-separator" "^7.23.3" - "@babel/plugin-transform-object-rest-spread" "^7.23.3" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4" + "@babel/plugin-transform-numeric-separator" "^7.23.4" + "@babel/plugin-transform-object-rest-spread" "^7.23.4" "@babel/plugin-transform-object-super" "^7.23.3" - "@babel/plugin-transform-optional-catch-binding" "^7.23.3" - "@babel/plugin-transform-optional-chaining" "^7.23.3" + "@babel/plugin-transform-optional-catch-binding" "^7.23.4" + "@babel/plugin-transform-optional-chaining" "^7.23.4" "@babel/plugin-transform-parameters" "^7.23.3" "@babel/plugin-transform-private-methods" "^7.23.3" - "@babel/plugin-transform-private-property-in-object" "^7.23.3" + "@babel/plugin-transform-private-property-in-object" "^7.23.4" "@babel/plugin-transform-property-literals" "^7.23.3" "@babel/plugin-transform-regenerator" "^7.23.3" "@babel/plugin-transform-reserved-words" "^7.23.3" @@ -1305,28 +1305,28 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.23.2", "@babel/traverse@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b" - integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ== +"@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.5.tgz#f546bf9aba9ef2b042c0e00d245990c15508e7ec" + integrity sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w== dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.23.3" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.5" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.3" - "@babel/types" "^7.23.3" + "@babel/parser" "^7.23.5" + "@babel/types" "^7.23.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.3.0", "@babel/types@^7.4.4": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.3.tgz#d5ea892c07f2ec371ac704420f4dcdb07b5f9598" - integrity sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.5", "@babel/types@^7.3.0", "@babel/types@^7.4.4": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602" + integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w== dependencies: - "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-string-parser" "^7.23.4" "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" @@ -11727,7 +11727,7 @@ is-ci@^3.0.0: dependencies: ci-info "^3.2.0" -is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-module@^2.9.0: +is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0: version "2.13.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== @@ -12567,14 +12567,7 @@ json-to-pretty-yaml@^1.2.2: remedial "^1.0.7" remove-trailing-spaces "^1.0.6" -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - -json5@^1.0.2: +json5@^1.0.1, json5@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== @@ -16672,16 +16665,7 @@ resolve-url@^0.2.1: resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.4, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.22.1, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.9.0: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^1.22.4: +resolve@^1.1.4, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22.4, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.9.0: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== From a45e7f88f502438b4858a4b40df1898d9026919d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:32:24 +0000 Subject: [PATCH 04/19] Bump @types/node from 20.8.9 to 20.10.1 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.8.9 to 20.10.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f7821c790d..bed3839283 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@testing-library/react": "^14.1.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", - "@types/node": "^20.8.9", + "@types/node": "^20.10.1", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.7", "@types/react-redux": "^7.1.24", diff --git a/yarn.lock b/yarn.lock index 7713b0f8fa..9e8a3a57d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4570,10 +4570,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^20.8.9": - version "20.8.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.9.tgz#646390b4fab269abce59c308fc286dcd818a2b08" - integrity sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg== +"@types/node@*", "@types/node@^20.10.1": + version "20.10.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.1.tgz#d2c96f356c3125fedc983d74c424910c3767141c" + integrity sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg== dependencies: undici-types "~5.26.4" From 8dd63c4eed034955d409556143c148fa0eea544f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:33:26 +0000 Subject: [PATCH 05/19] Bump @cypress/code-coverage from 3.12.10 to 3.12.12 Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.10 to 3.12.12. - [Release notes](https://github.com/cypress-io/code-coverage/releases) - [Changelog](https://github.com/cypress-io/code-coverage/blob/master/.releaserc) - [Commits](https://github.com/cypress-io/code-coverage/compare/v3.12.10...v3.12.12) --- updated-dependencies: - dependency-name: "@cypress/code-coverage" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f7821c790d..9e2f02393b 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@babel/preset-typescript": "^7.23.3", "@csstools/postcss-sass": "^5.0.1", "@cypress/browserify-preprocessor": "^3.0.2", - "@cypress/code-coverage": "^3.12.10", + "@cypress/code-coverage": "^3.12.12", "@graphql-codegen/add": "^3.1.1", "@graphql-codegen/cli": "^2.6.2", "@graphql-codegen/introspection": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index 7713b0f8fa..a26b53b11b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1413,10 +1413,10 @@ through2 "^2.0.0" watchify "^4.0.0" -"@cypress/code-coverage@^3.12.10": - version "3.12.10" - resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.10.tgz#5d1c3091c92ce46836300b1c53c3a8a8fb0f5e1f" - integrity sha512-o7+/OD7K+brmzJn2MWQHQAyXxcKyOz8jG0nrny//KoWr2TC9PqQwHxZhuitSi0vcV3EYNqD4vDY683mPqMNtEg== +"@cypress/code-coverage@^3.12.12": + version "3.12.12" + resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.12.tgz#c10806466a8fcd200f5636319ad681a8adca8482" + integrity sha512-V/fWyg6E1xdf/HHHUAg9cfGGU4hzsBgXYCm0ouXW2lOQHeo2/730R+CdXnbhPvDdl6GrndZtXW8K9FZhFNZJbQ== dependencies: "@cypress/webpack-preprocessor" "^6.0.0" chalk "4.1.2" From 4791a7892b9bffc3026f09985b481d13ae0397c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:33:44 +0000 Subject: [PATCH 06/19] Bump @testing-library/dom from 9.3.0 to 9.3.3 Bumps [@testing-library/dom](https://github.com/testing-library/dom-testing-library) from 9.3.0 to 9.3.3. - [Release notes](https://github.com/testing-library/dom-testing-library/releases) - [Changelog](https://github.com/testing-library/dom-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/dom-testing-library/compare/v9.3.0...v9.3.3) --- updated-dependencies: - dependency-name: "@testing-library/dom" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 91 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 71 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index f7821c790d..8ca3fdee97 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@storybook/manager-webpack5": "^6.5.0-beta.7", "@storybook/preset-typescript": "^3.0.0", "@storybook/react": "^6.5.0-beta.7", - "@testing-library/dom": "^9.3.0", + "@testing-library/dom": "^9.3.3", "@testing-library/react": "^14.1.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index 7713b0f8fa..3d1c279d4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4251,15 +4251,15 @@ dependencies: defer-to-connect "^1.0.1" -"@testing-library/dom@^9.0.0", "@testing-library/dom@^9.3.0": - version "9.3.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.0.tgz#ed8ce10aa5e05eb6eaf0635b5b8975d889f66075" - integrity sha512-Dffe68pGwI6WlLRYR2I0piIkyole9cSBH5jGQKCGMRpHW5RHCqAUaqc2Kv0tUyd4dU4DLPKhJIjyKOnjv4tuUw== +"@testing-library/dom@^9.0.0", "@testing-library/dom@^9.3.3": + version "9.3.3" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.3.tgz#108c23a5b0ef51121c26ae92eb3179416b0434f5" + integrity sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" "@types/aria-query" "^5.0.1" - aria-query "^5.0.0" + aria-query "5.1.3" chalk "^4.1.0" dom-accessibility-api "^0.5.9" lz-string "^1.5.0" @@ -5593,6 +5593,13 @@ argparse@^2.0.1: resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== +aria-query@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e" + integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== + dependencies: + deep-equal "^2.0.5" + aria-query@^4.2.2: version "4.2.2" resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz" @@ -5601,13 +5608,6 @@ aria-query@^4.2.2: "@babel/runtime" "^7.10.2" "@babel/runtime-corejs3" "^7.10.2" -aria-query@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.2.1.tgz#bc285d9d654d1df121bcd0c134880d415ca67c15" - integrity sha512-7uFg4b+lETFgdaJyETnILsXgnnzVnkHcgRbwbPwevm5x/LmUlt3MjczMRe1zg824iBgXZNRPTBftNYyRSKLp2g== - dependencies: - dequal "^2.0.3" - arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz" @@ -8165,6 +8165,30 @@ deep-eql@^4.1.2: dependencies: type-detect "^4.0.0" +deep-equal@^2.0.5: + version "2.2.3" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz#af89dafb23a396c7da3e862abc0be27cf51d56e1" + integrity sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA== + dependencies: + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.5" + es-get-iterator "^1.1.3" + get-intrinsic "^1.2.2" + is-arguments "^1.1.1" + is-array-buffer "^3.0.2" + is-date-object "^1.0.5" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + isarray "^2.0.5" + object-is "^1.1.5" + object-keys "^1.1.1" + object.assign "^4.1.4" + regexp.prototype.flags "^1.5.1" + side-channel "^1.0.4" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.1" + which-typed-array "^1.1.13" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" @@ -8325,11 +8349,6 @@ deps-sort@^2.0.0, deps-sort@^2.0.1: subarg "^1.0.0" through2 "^2.0.0" -dequal@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" - integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== - des.js@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz" @@ -8905,6 +8924,21 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.13" +es-get-iterator@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" + integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + has-symbols "^1.0.3" + is-arguments "^1.1.1" + is-map "^2.0.2" + is-set "^2.0.2" + is-string "^1.0.7" + isarray "^2.0.5" + stop-iteration-iterator "^1.0.0" + es-iterator-helpers@^1.0.12: version "1.0.15" resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40" @@ -11554,7 +11588,7 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" -internal-slot@^1.0.5: +internal-slot@^1.0.4, internal-slot@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== @@ -11630,7 +11664,7 @@ is-alphanumerical@^1.0.0: is-alphabetical "^1.0.0" is-decimal "^1.0.0" -is-arguments@^1.0.4: +is-arguments@^1.0.4, is-arguments@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== @@ -11911,7 +11945,7 @@ is-lower-case@^2.0.2: dependencies: tslib "^2.0.3" -is-map@^2.0.1: +is-map@^2.0.1, is-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== @@ -12023,7 +12057,7 @@ is-relative@^1.0.0: dependencies: is-unc-path "^1.0.0" -is-set@^2.0.1: +is-set@^2.0.1, is-set@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== @@ -14274,6 +14308,14 @@ object-inspect@^1.6.0: resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz" integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ== +object-is@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" @@ -17617,6 +17659,13 @@ std-env@^3.3.1: resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.2.tgz#af27343b001616015534292178327b202b9ee955" integrity sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA== +stop-iteration-iterator@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" + integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ== + dependencies: + internal-slot "^1.0.4" + store2@^2.12.0: version "2.13.2" resolved "https://registry.npmjs.org/store2/-/store2-2.13.2.tgz" From 07dbae8582abf38209fbe710d4c40acc18a203be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:34:03 +0000 Subject: [PATCH 07/19] Bump @types/lodash from 4.14.201 to 4.14.202 Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.14.201 to 4.14.202. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash) --- updated-dependencies: - dependency-name: "@types/lodash" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f7821c790d..f71a46a57b 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "@reach/alert": "^0.17.0", "@reach/dialog": "^0.18.0", "@reduxjs/toolkit": "^1.9.7", - "@types/lodash": "^4.14.201", + "@types/lodash": "^4.14.202", "clsx": "^2.0.0", "dayjs": "^1.11.10", "downshift": "^6.1.7", diff --git a/yarn.lock b/yarn.lock index 7713b0f8fa..7ec3b5e5ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4540,10 +4540,10 @@ dependencies: "@types/node" "*" -"@types/lodash@^4.14.167", "@types/lodash@^4.14.201": - version "4.14.201" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.201.tgz#76f47cb63124e806824b6c18463daf3e1d480239" - integrity sha512-y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ== +"@types/lodash@^4.14.167", "@types/lodash@^4.14.202": + version "4.14.202" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" + integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ== "@types/mdast@^3.0.0": version "3.0.3" From e03d768531d9e4a23e45fbf53230708462f199b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:34:35 +0000 Subject: [PATCH 08/19] Bump react-use from 17.4.0 to 17.4.1 Bumps [react-use](https://github.com/streamich/react-use) from 17.4.0 to 17.4.1. - [Release notes](https://github.com/streamich/react-use/releases) - [Changelog](https://github.com/streamich/react-use/blob/master/CHANGELOG.md) - [Commits](https://github.com/streamich/react-use/compare/v17.4.0...v17.4.1) --- updated-dependencies: - dependency-name: react-use dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 103 ++++++++++++++++++++++++--------------------------- 2 files changed, 50 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index f7821c790d..8995ce1fc5 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "react-error-boundary": "^3.1.4", "react-query": "^3.39.3", "react-redux": "^8.1.3", - "react-use": "^17.4.0", + "react-use": "^17.4.1", "redux": "^4.2.1", "redux-persist": "^6.0.0", "unfetch": "^4.2.0" diff --git a/yarn.lock b/yarn.lock index 7713b0f8fa..902c6c08c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2259,7 +2259,7 @@ resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz" integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== -"@jridgewell/sourcemap-codec@^1.4.14": +"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== @@ -7782,13 +7782,12 @@ css-functions-list@^3.2.1: resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea" integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ== -css-in-js-utils@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99" - integrity sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA== +css-in-js-utils@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb" + integrity sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A== dependencies: - hyphenate-style-name "^1.0.2" - isobject "^3.0.1" + hyphenate-style-name "^1.0.3" css-loader@^3.6.0: version "3.6.0" @@ -7980,11 +7979,16 @@ csstype@^2.5.7: resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz" integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA== -csstype@^3.0.2, csstype@^3.0.6: +csstype@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== +csstype@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" + integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== + cuid@^2.1.8: version "2.1.8" resolved "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz" @@ -9758,6 +9762,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-loops@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75" + integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g== + fast-memoize@^2.5.2: version "2.5.2" resolved "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz" @@ -11266,7 +11275,7 @@ human-signals@^2.1.0: resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -hyphenate-style-name@^1.0.2: +hyphenate-style-name@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== @@ -11485,12 +11494,13 @@ inline-style-parser@0.1.1: resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz" integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== -inline-style-prefixer@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-6.0.1.tgz#c5c0e43ba8831707afc5f5bbfd97edf45c1fa7ae" - integrity sha512-AsqazZ8KcRzJ9YPN1wMH2aNM7lkWQ8tSPrW5uDk1ziYwiAPWSZnUsC7lfZq+BDqLqz0B4Pho5wscWcJzVvRzDQ== +inline-style-prefixer@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz#991d550735d42069f528ac1bcdacd378d1305442" + integrity sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ== dependencies: - css-in-js-utils "^2.0.0" + css-in-js-utils "^3.1.0" + fast-loops "^1.1.3" inquirer@^8.0.0, inquirer@^8.2.0: version "8.2.4" @@ -13850,19 +13860,19 @@ nan@^2.12.1: resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== -nano-css@^5.3.1: - version "5.3.5" - resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.3.5.tgz#3075ea29ffdeb0c7cb6d25edb21d8f7fa8e8fe8e" - integrity sha512-vSB9X12bbNu4ALBu7nigJgRViZ6ja3OU7CeuiV1zMIbXOdmkLahgtPmh3GBOlDxbKY0CitqlPdOReGlBLSp+yg== +nano-css@^5.6.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.6.1.tgz#964120cb1af6cccaa6d0717a473ccd876b34c197" + integrity sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw== dependencies: + "@jridgewell/sourcemap-codec" "^1.4.15" css-tree "^1.1.2" - csstype "^3.0.6" + csstype "^3.1.2" fastest-stable-stringify "^2.0.2" - inline-style-prefixer "^6.0.0" - rtl-css-js "^1.14.0" - sourcemap-codec "^1.4.8" + inline-style-prefixer "^7.0.0" + rtl-css-js "^1.16.1" stacktrace-js "^2.0.2" - stylis "^4.0.6" + stylis "^4.3.0" nano-time@1.0.0: version "1.0.0" @@ -16083,10 +16093,10 @@ react-universal-interface@^0.6.2: resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b" integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw== -react-use@^17.4.0: - version "17.4.0" - resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.0.tgz#cefef258b0a6c534a5c8021c2528ac6e1a4cdc6d" - integrity sha512-TgbNTCA33Wl7xzIJegn1HndB4qTS9u03QUwyNycUnXaweZkE4Kq2SB+Yoxx8qbshkZGYBDvUXbXWRUmQDcZZ/Q== +react-use@^17.4.1: + version "17.4.1" + resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.1.tgz#e486f14892c96fe2c3764270dfb2df922a69c5aa" + integrity sha512-f3EdGM5ea+2EEIkfgggE+Jhza7uEek8aEMTpd1TQnyqGAD4wew3CMVshiXEP6kstjBE4XUGoKVxttqio76ijNw== dependencies: "@types/js-cookie" "^2.2.6" "@xobotyi/scrollbar-width" "^1.9.5" @@ -16094,7 +16104,7 @@ react-use@^17.4.0: fast-deep-equal "^3.1.3" fast-shallow-equal "^1.0.0" js-cookie "^2.2.1" - nano-css "^5.3.1" + nano-css "^5.6.1" react-universal-interface "^0.6.2" resize-observer-polyfill "^1.5.1" screenfull "^5.1.0" @@ -16778,10 +16788,10 @@ rsvp@^4.8.4: resolved "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== -rtl-css-js@^1.14.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.0.tgz#e8d682982441aadb63cabcb2f7385f3fb78ff26e" - integrity sha512-Oc7PnzwIEU4M0K1J4h/7qUUaljXhQ0kCObRsZjxs2HjkpKsnoTMvSmvJ4sqgJZd0zBoEfAyTdnK/jMIYvrjySQ== +rtl-css-js@^1.16.1: + version "1.16.1" + resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80" + integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg== dependencies: "@babel/runtime" "^7.1.2" @@ -18104,10 +18114,10 @@ stylelint@^15.11.0: table "^6.8.1" write-file-atomic "^5.0.1" -stylis@^4.0.6: - version "4.1.3" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7" - integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA== +stylis@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c" + integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ== subarg@^1.0.0: version "1.0.0" @@ -18678,32 +18688,17 @@ tsconfig-paths@^3.14.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^1.0.0, tslib@^1.14.1, tslib@^1.8.1: +tslib@^1.0.0, tslib@^1.10.0, tslib@^1.14.1, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^1.10.0: - version "1.13.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz" - integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== - -tslib@^1.9.0: - version "1.10.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== - -tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1, tslib@~2.4.0: +tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@~2.4.0: version "2.4.0" resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== -tslib@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz" - integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ== - -tslib@^2.0.1, tslib@^2.3.0, tslib@~2.3.0: +tslib@~2.3.0: version "2.3.1" resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== From 26c550f2fa7f0828219b621a56add83f2ecf31a2 Mon Sep 17 00:00:00 2001 From: Mikkel Jakobsen Date: Tue, 28 Nov 2023 08:39:01 +0100 Subject: [PATCH 09/19] Set more precise types on requestsAndReservations `requests`was not inferred correctly. --- .../delete-reservation-modal.tsx | 31 +++++------------ .../modal/delete-reservation/helper.ts | 33 +++++++++++++++++-- src/core/utils/useRequestsWithStatus.tsx | 16 +++++++-- 3 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/apps/reservation-list/modal/delete-reservation/delete-reservation-modal.tsx b/src/apps/reservation-list/modal/delete-reservation/delete-reservation-modal.tsx index 41d8649474..a360fa0d22 100644 --- a/src/apps/reservation-list/modal/delete-reservation/delete-reservation-modal.tsx +++ b/src/apps/reservation-list/modal/delete-reservation/delete-reservation-modal.tsx @@ -1,5 +1,5 @@ import React, { FC, useMemo, useState } from "react"; -import { UseMutateFunction, useQueryClient } from "react-query"; +import { useQueryClient } from "react-query"; import Modal from "../../../../core/utils/modal"; import { useText } from "../../../../core/utils/text"; import DeleteReservationContent from "./delete-reservation-content"; @@ -9,9 +9,14 @@ import { useDeleteV1UserReservationsIdentifier } from "../../../../core/publizon/publizon"; import { useMultipleRequestsWithStatus } from "../../../../core/utils/useRequestsWithStatus"; -import { requestsAndReservations } from "./helper"; +import { + OperationDigital, + OperationPhysical, + ParamsDigital, + ParamsPhysical, + requestsAndReservations +} from "./helper"; import ModalMessage from "../../../../components/message/modal-message/ModalMessage"; -import { DeleteReservationsParams } from "../../../../core/fbs/model"; import { ApiResult } from "../../../../core/publizon/model"; import { reservationId, @@ -19,24 +24,6 @@ import { } from "../../../../core/utils/types/reservation-type"; import { getModalIds } from "../../../../core/utils/helpers/modal-helpers"; -type ParamsDigital = { - identifier: string; -}; -type ParamsPhysical = { - params?: DeleteReservationsParams; -}; -type OperationDigital = UseMutateFunction< - ApiResult | null, - unknown, - ParamsDigital, - unknown ->; -type OperationPhysical = UseMutateFunction< - void | null, - unknown, - ParamsPhysical, - unknown ->; interface DeleteReservationModalProps { modalId: string; reservations: ReservationType[]; @@ -64,7 +51,7 @@ const DeleteReservationModal: FC = ({ const { requests, reservationsPhysical, reservationsDigital } = useMemo( () => - requestsAndReservations({ + requestsAndReservations({ operations: { digital: deleteDigitalReservation, physical: deletePhysicalReservation diff --git a/src/apps/reservation-list/modal/delete-reservation/helper.ts b/src/apps/reservation-list/modal/delete-reservation/helper.ts index 19a507d4fd..d9124d0524 100644 --- a/src/apps/reservation-list/modal/delete-reservation/helper.ts +++ b/src/apps/reservation-list/modal/delete-reservation/helper.ts @@ -1,3 +1,6 @@ +import { useDeleteReservations } from "../../../../core/fbs/fbs"; +import { DeleteReservationsParams } from "../../../../core/fbs/model/deleteReservationsParams"; +import { useDeleteV1UserReservationsIdentifier } from "../../../../core/publizon/publizon"; import { UseTextFunction } from "../../../../core/utils/text"; import { RequestStatus } from "../../../../core/utils/types/request"; import { @@ -6,6 +9,26 @@ import { isPhysicalReservation } from "../../../../core/utils/types/reservation-type"; +export type OperationPhysical = ReturnType< + typeof useDeleteReservations +>["mutate"]; +export type OperationDigital = ReturnType< + typeof useDeleteV1UserReservationsIdentifier +>["mutate"]; + +export type ParamsPhysical = { params: DeleteReservationsParams }; +export type ParamsDigital = Parameters; + +type Request = + | { + params: ParamsPhysical; + operation: OperationPhysical; + } + | { + params: ParamsDigital; + operation: OperationDigital; + }; + export const getReservationsToDelete = (reservations: ReservationType[]) => { if (!reservations.length) { return { physical: [], digital: [] }; @@ -62,13 +85,17 @@ export const getDeleteButtonLabel = ({ }); }; -export const requestsAndReservations = ({ +export const requestsAndReservations = ({ reservations, operations }: { reservations: ReservationType[]; - operations: { physical: TOperationPhysical; digital: TOperationDigital }; -}) => { + operations: { physical: OperationPhysical; digital: OperationDigital }; +}): { + requests: Request[]; + reservationsPhysical: ReturnType["physical"]; + reservationsDigital: ReturnType["digital"]; +} => { const { physical: reservationsPhysical, digital: reservationsDigital } = getReservationsToDelete(reservations); diff --git a/src/core/utils/useRequestsWithStatus.tsx b/src/core/utils/useRequestsWithStatus.tsx index 4d1973a7eb..11ac460eaa 100644 --- a/src/core/utils/useRequestsWithStatus.tsx +++ b/src/core/utils/useRequestsWithStatus.tsx @@ -3,7 +3,13 @@ import { RequestStatus } from "./types/request"; // This is a hook for use cases where several requests are performed // and the status of the request is needed. -export const useMultipleRequestsWithStatus = ({ +export const useMultipleRequestsWithStatus = < + // We deliberately use Function because any function shape goes here. + // eslint-disable-next-line @typescript-eslint/ban-types + TRequest extends Function, + TParams, + TResponse +>({ requests, onError, onSuccess @@ -60,7 +66,13 @@ export const useMultipleRequestsWithStatus = ({ // This is a hook for use cases where one request is performed // and the status of the request is needed. -export const useSingleRequestWithStatus = ({ +export const useSingleRequestWithStatus = < + // We deliberately use Function because any function shape goes here. + // eslint-disable-next-line @typescript-eslint/ban-types + TRequest extends Function, + TParams, + TResponse +>({ request, onError, onSuccess From 472e8a7759c7813ae3d57550fd692976523a0368 Mon Sep 17 00:00:00 2001 From: Mikkel Jakobsen Date: Tue, 28 Nov 2023 11:57:52 +0100 Subject: [PATCH 10/19] Remove deprecated function By using Promises.all() we can control the overall request status --- .../modal/delete-reservation/helper.ts | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/apps/reservation-list/modal/delete-reservation/helper.ts b/src/apps/reservation-list/modal/delete-reservation/helper.ts index d9124d0524..ce0b002dfb 100644 --- a/src/apps/reservation-list/modal/delete-reservation/helper.ts +++ b/src/apps/reservation-list/modal/delete-reservation/helper.ts @@ -45,28 +45,6 @@ export const getReservationsToDelete = (reservations: ReservationType[]) => { return { physical, digital }; }; -export const getDeleteReservationStatus = ({ - physical, - digital -}: { - physical: RequestStatus; - digital: RequestStatus; -}) => { - if (physical === "pending" || digital === "pending") { - return "pending"; - } - - if (physical === "error" || digital === "error") { - return "error"; - } - - if (physical === "success" || digital === "success") { - return "success"; - } - - return "idle"; -}; - export const getDeleteButtonLabel = ({ reservationsCount, deletionStatus, From a82f746d1f94b07386ff422e700795d5a75db349 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Dec 2023 08:11:17 +0000 Subject: [PATCH 11/19] Bump @types/node from 20.8.9 to 20.10.2 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.8.9 to 20.10.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 73a25beefc..0de1ef6d29 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@testing-library/react": "^14.1.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", - "@types/node": "^20.10.1", + "@types/node": "^20.10.2", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.7", "@types/react-redux": "^7.1.24", diff --git a/yarn.lock b/yarn.lock index b1cfcf5647..585837be3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4570,10 +4570,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^20.10.1": - version "20.10.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.1.tgz#d2c96f356c3125fedc983d74c424910c3767141c" - integrity sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg== +"@types/node@*", "@types/node@^20.10.2": + version "20.10.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.2.tgz#32a5e8228357f57714ad28d52229ab04880c2814" + integrity sha512-37MXfxkb0vuIlRKHNxwCkb60PNBpR94u4efQuN4JgIAm66zfCDXGSAFCef9XUWFovX2R1ok6Z7MHhtdVXXkkIw== dependencies: undici-types "~5.26.4" From d3092cecab855bb5105229a495c6c0ab98deb465 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Dec 2023 08:11:19 +0000 Subject: [PATCH 12/19] Bump webpack-cli from 4.9.2 to 5.1.4 Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.9.2 to 5.1.4. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.9.2...webpack-cli@5.1.4) --- updated-dependencies: - dependency-name: webpack-cli dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 75 +++++++++++++++++++++++++++++----------------------- 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index 73a25beefc..e3257911b8 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "typescript": "^4.6.4", "vitest": "^0.28.5", "webpack": "^5.89.0", - "webpack-cli": "^4.9.2", + "webpack-cli": "^5.1.4", "webpack-version-file-plugin": "^0.4.0" }, "//dependencies": { diff --git a/yarn.lock b/yarn.lock index b1cfcf5647..59cd71a624 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5190,22 +5190,20 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.1": - version "1.1.1" - resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz" - integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^1.4.1": - version "1.4.1" - resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz" - integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== - dependencies: - envinfo "^7.7.3" +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^1.6.1": - version "1.6.1" - resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz" - integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xobotyi/scrollbar-width@^1.9.5": version "1.9.5" @@ -7362,6 +7360,11 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz" integrity sha512-Jrx3xsP4pPv4AwJUDWY9wOXGtwPXARej6Xd99h4TUGotmf8APuquKMpK+dnD3UgyxK7OEWaisjZz+3b5jtL6xQ== +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^2.19.0, commander@^2.20.0, commander@^2.20.3: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" @@ -7382,7 +7385,7 @@ commander@^6.2.1: resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.0.0, commander@^7.2.0: +commander@^7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -9592,7 +9595,7 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^5.0.0, execa@^5.1.1: +execa@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== @@ -11612,6 +11615,11 @@ interpret@^2.2.0: resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== + invariant@^2.2.3, invariant@^2.2.4: version "2.2.4" resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz" @@ -16303,12 +16311,12 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== dependencies: - resolve "^1.9.0" + resolve "^1.20.0" redent@^1.0.0: version "1.0.0" @@ -16717,7 +16725,7 @@ resolve-url@^0.2.1: resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.4, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22.4, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.9.0: +resolve@^1.1.4, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.4, resolve@^1.3.2, resolve@^1.4.0: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -19593,22 +19601,23 @@ webidl-conversions@^7.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== -webpack-cli@^4.9.2: - version "4.9.2" - resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz" - integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== +webpack-cli@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" - commander "^7.0.0" - execa "^5.0.0" + commander "^10.0.1" + cross-spawn "^7.0.3" + envinfo "^7.7.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" + interpret "^3.1.1" + rechoir "^0.8.0" webpack-merge "^5.7.3" webpack-dev-middleware@^3.7.3: From 0c8739d63c05ae017d667b3565ffa71f711cc4f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 02:48:52 +0000 Subject: [PATCH 13/19] Bump postcss from 8.4.31 to 8.4.32 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.31 to 8.4.32. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.31...8.4.32) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 7ef47d4d2c..301dc85cb2 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "mutationobserver-shim": "^0.3.7", "nyc": "^15.1.0", "orval": "^6.8.1", - "postcss": "^8.4.31", + "postcss": "^8.4.32", "postcss-cli": "^10.1.0", "postcss-loader": "^7.3.3", "postcss-scss": "^4.0.9", @@ -169,6 +169,6 @@ "unfetch": "^4.2.0" }, "peerDependencies": { - "postcss": "^8.4.31" + "postcss": "^8.4.32" } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index d97479d51d..dd0f8db9c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13916,10 +13916,10 @@ nano-time@1.0.0: dependencies: big-integer "^1.6.16" -nanoid@^3.3.1, nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== +nanoid@^3.3.1, nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== nanomatch@^1.2.9: version "1.2.13" @@ -15561,12 +15561,12 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0 picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.31: - version "8.4.31" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" - integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== +postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.32: + version "8.4.32" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9" + integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw== dependencies: - nanoid "^3.3.6" + nanoid "^3.3.7" picocolors "^1.0.0" source-map-js "^1.0.2" From 7d3c6eae4d7ad61e377e2dade91edc04b8df9962 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 02:49:30 +0000 Subject: [PATCH 14/19] Bump caniuse-lite from 1.0.30001563 to 1.0.30001566 Bumps [caniuse-lite](https://github.com/browserslist/caniuse-lite) from 1.0.30001563 to 1.0.30001566. - [Commits](https://github.com/browserslist/caniuse-lite/compare/1.0.30001563...1.0.30001566) --- updated-dependencies: - dependency-name: caniuse-lite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7ef47d4d2c..1796267189 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "babel-plugin-istanbul": "^6.1.1", "babel-plugin-lodash": "^3.3.4", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "caniuse-lite": "^1.0.30001563", + "caniuse-lite": "^1.0.30001566", "chokidar-cli": "^3.0.0", "concurrently": "^7.1.0", "core-js": "^3.33.3", diff --git a/yarn.lock b/yarn.lock index d97479d51d..696e3da1d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6872,10 +6872,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, caniuse-lite@^1.0.30001563: - version "1.0.30001563" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz#aa68a64188903e98f36eb9c56e48fba0c1fe2a32" - integrity sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, caniuse-lite@^1.0.30001566: + version "1.0.30001566" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz#61a8e17caf3752e3e426d4239c549ebbb37fef0d" + integrity sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA== capital-case@^1.0.4: version "1.0.4" From 77a4ddc6d07ed169346752e5fcdbac2229952c92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 02:49:45 +0000 Subject: [PATCH 15/19] Bump @types/node from 20.10.2 to 20.10.3 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.10.2 to 20.10.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7ef47d4d2c..a60a6f5113 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@testing-library/react": "^14.1.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", - "@types/node": "^20.10.2", + "@types/node": "^20.10.3", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.7", "@types/react-redux": "^7.1.24", diff --git a/yarn.lock b/yarn.lock index d97479d51d..41380c4ee0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4570,10 +4570,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^20.10.2": - version "20.10.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.2.tgz#32a5e8228357f57714ad28d52229ab04880c2814" - integrity sha512-37MXfxkb0vuIlRKHNxwCkb60PNBpR94u4efQuN4JgIAm66zfCDXGSAFCef9XUWFovX2R1ok6Z7MHhtdVXXkkIw== +"@types/node@*", "@types/node@^20.10.3": + version "20.10.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.3.tgz#4900adcc7fc189d5af5bb41da8f543cea6962030" + integrity sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg== dependencies: undici-types "~5.26.4" From 28fbed3cc1c2f0b3dc496e4e2200ea4d89e264e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 02:50:10 +0000 Subject: [PATCH 16/19] Bump @typescript-eslint/parser from 5.23.0 to 6.13.1 Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.23.0 to 6.13.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.1/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 58 ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 7ef47d4d2c..9d53de117a 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@types/react-dom": "^18.2.7", "@types/react-redux": "^7.1.24", "@typescript-eslint/eslint-plugin": "^5.23.0", - "@typescript-eslint/parser": "^5.23.0", + "@typescript-eslint/parser": "^6.13.1", "@vitest/coverage-istanbul": "^0.34.6", "autoprefixer": "^10.4.16", "babel-loader": "^9.1.3", diff --git a/yarn.lock b/yarn.lock index d97479d51d..58b03610a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4805,15 +4805,16 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.23.0": - version "5.23.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.23.0.tgz" - integrity sha512-V06cYUkqcGqpFjb8ttVgzNF53tgbB/KoQT/iB++DOIExKmzI9vBJKjZKt/6FuV9c+zrDsvJKbJ2DOCYwX91cbw== - dependencies: - "@typescript-eslint/scope-manager" "5.23.0" - "@typescript-eslint/types" "5.23.0" - "@typescript-eslint/typescript-estree" "5.23.0" - debug "^4.3.2" +"@typescript-eslint/parser@^6.13.1": + version "6.13.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.1.tgz#29d6d4e5fab4669e58bc15f6904b67da65567487" + integrity sha512-fs2XOhWCzRhqMmQf0eicLa/CWSaYss2feXsy7xBD/pLyWke/jCIVc2s1ikEAtSW7ina1HNhv7kONoEfVNEcdDQ== + dependencies: + "@typescript-eslint/scope-manager" "6.13.1" + "@typescript-eslint/types" "6.13.1" + "@typescript-eslint/typescript-estree" "6.13.1" + "@typescript-eslint/visitor-keys" "6.13.1" + debug "^4.3.4" "@typescript-eslint/scope-manager@5.23.0": version "5.23.0" @@ -4823,6 +4824,14 @@ "@typescript-eslint/types" "5.23.0" "@typescript-eslint/visitor-keys" "5.23.0" +"@typescript-eslint/scope-manager@6.13.1": + version "6.13.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz#58c7c37c6a957d3d9f59bc4f64c2888e0cac1d70" + integrity sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ== + dependencies: + "@typescript-eslint/types" "6.13.1" + "@typescript-eslint/visitor-keys" "6.13.1" + "@typescript-eslint/type-utils@5.23.0": version "5.23.0" resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.23.0.tgz" @@ -4837,6 +4846,11 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz" integrity sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw== +"@typescript-eslint/types@6.13.1": + version "6.13.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.1.tgz#b56f26130e7eb8fa1e429c75fb969cae6ad7bb5c" + integrity sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg== + "@typescript-eslint/typescript-estree@5.23.0": version "5.23.0" resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz" @@ -4850,6 +4864,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@6.13.1": + version "6.13.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz#d01dda78d2487434d1c503853fa00291c566efa4" + integrity sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ== + dependencies: + "@typescript-eslint/types" "6.13.1" + "@typescript-eslint/visitor-keys" "6.13.1" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + "@typescript-eslint/utils@5.23.0": version "5.23.0" resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz" @@ -4870,6 +4897,14 @@ "@typescript-eslint/types" "5.23.0" eslint-visitor-keys "^3.0.0" +"@typescript-eslint/visitor-keys@6.13.1": + version "6.13.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz#c4b692dcc23a4fc60685b718f10fde789d65a540" + integrity sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ== + dependencies: + "@typescript-eslint/types" "6.13.1" + eslint-visitor-keys "^3.4.1" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" @@ -18663,6 +18698,11 @@ trough@^1.0.0: resolved "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz" integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q== +ts-api-utils@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" + integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== + ts-dedent@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz" From 88336022bc39b4f73c23e0217f8f67ab65b8a409 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 02:50:45 +0000 Subject: [PATCH 17/19] Bump sass from 1.69.3 to 1.69.5 Bumps [sass](https://github.com/sass/dart-sass) from 1.69.3 to 1.69.5. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.69.3...1.69.5) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7ef47d4d2c..84dbd6eca9 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "postcss-scss": "^4.0.9", "prettier": "^2.6.2", "replace-in-file": "^6.3.2", - "sass": "^1.69.0", + "sass": "^1.69.5", "source-map-support": "^0.5.21", "style-loader": "^3.3.3", "stylelint": "^15.11.0", diff --git a/yarn.lock b/yarn.lock index d97479d51d..5f7ff199cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16931,10 +16931,10 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass@^1.49.7, sass@^1.69.0: - version "1.69.3" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.3.tgz#f8a0c488697e6419519834a13335e7b65a609c11" - integrity sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ== +sass@^1.49.7, sass@^1.69.5: + version "1.69.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde" + integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 959532850ea166823c4df19df809f30c2b32ed25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 05:39:00 +0000 Subject: [PATCH 18/19] Bump concurrently from 7.1.0 to 8.2.2 Bumps [concurrently](https://github.com/open-cli-tools/concurrently) from 7.1.0 to 8.2.2. - [Release notes](https://github.com/open-cli-tools/concurrently/releases) - [Commits](https://github.com/open-cli-tools/concurrently/compare/v7.1.0...v8.2.2) --- updated-dependencies: - dependency-name: concurrently dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 112 +++++++++++++++++++++++++++++---------------------- 2 files changed, 65 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index d5925320f9..217a54fc0e 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "caniuse-lite": "^1.0.30001566", "chokidar-cli": "^3.0.0", - "concurrently": "^7.1.0", + "concurrently": "^8.2.2", "core-js": "^3.33.3", "css-loader": "^6.8.1", "cssnano": "^6.0.1", diff --git a/yarn.lock b/yarn.lock index 6bc14b75d4..25130667bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1296,6 +1296,13 @@ dependencies: regenerator-runtime "^0.13.10" +"@babel/runtime@^7.21.0": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.5.tgz#11edb98f8aeec529b82b211028177679144242db" + integrity sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/template@^7.12.7", "@babel/template@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" @@ -7267,6 +7274,15 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz" @@ -7495,19 +7511,20 @@ concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@ readable-stream "^2.2.2" typedarray "^0.0.6" -concurrently@^7.1.0: - version "7.1.0" - resolved "https://registry.npmjs.org/concurrently/-/concurrently-7.1.0.tgz" - integrity sha512-Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw== +concurrently@^8.2.2: + version "8.2.2" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784" + integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg== dependencies: - chalk "^4.1.0" - date-fns "^2.16.1" + chalk "^4.1.2" + date-fns "^2.30.0" lodash "^4.17.21" - rxjs "^6.6.3" - spawn-command "^0.0.2-1" - supports-color "^8.1.0" + rxjs "^7.8.1" + shell-quote "^1.8.1" + spawn-command "0.0.2" + supports-color "^8.1.1" tree-kill "^1.2.2" - yargs "^16.2.0" + yargs "^17.7.2" configstore@^5.0.1: version "5.0.1" @@ -8124,10 +8141,12 @@ date-fns@^1.27.2: resolved "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== -date-fns@^2.16.1: - version "2.28.0" - resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz" - integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw== +date-fns@^2.30.0: + version "2.30.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" + integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== + dependencies: + "@babel/runtime" "^7.21.0" dayjs@1.11.10, dayjs@^1.10.4, dayjs@^1.11.10: version "1.11.10" @@ -16439,6 +16458,11 @@ regenerator-runtime@^0.13.4: resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz" integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== +regenerator-runtime@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + regenerator-transform@^0.15.2: version "0.15.2" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4" @@ -16881,17 +16905,17 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^6.3.3, rxjs@^6.6.3: +rxjs@^6.3.3: version "6.6.7" resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" -rxjs@^7.5.1, rxjs@^7.5.5: - version "7.5.5" - resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz" - integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw== +rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.1: + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" @@ -17235,10 +17259,10 @@ shebang-regex@^3.0.0: resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.4.2, shell-quote@^1.6.1: - version "1.7.2" - resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz" - integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== +shell-quote@^1.4.2, shell-quote@^1.6.1, shell-quote@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== should-equal@^2.0.0: version "2.0.0" @@ -17533,10 +17557,10 @@ space-separated-tokens@^1.0.0: resolved "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz" integrity sha512-UyhMSmeIqZrQn2UdjYpxEkwY9JUrn8pP+7L4f91zRzOQuI8MF1FGLfYU9DKCYeLdo7LXMxwrX5zKFy7eeeVHuA== -spawn-command@^0.0.2-1: - version "0.0.2-1" - resolved "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz" - integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= +spawn-command@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" + integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ== spawn-wrap@^2.0.0: version "2.0.0" @@ -18221,7 +18245,7 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-color@^8.0.0, supports-color@^8.1.0, supports-color@^8.1.1: +supports-color@^8.0.0, supports-color@^8.1.1: version "8.1.1" resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== @@ -20138,7 +20162,7 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.2, yargs-parser@^20.2.9: +yargs-parser@^20.2.9: version "20.2.9" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== @@ -20148,6 +20172,11 @@ yargs-parser@^21.0.0: resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz" integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + yargs@17.3.1: version "17.3.1" resolved "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz" @@ -20194,31 +20223,18 @@ yargs@^15.0.2, yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== +yargs@^17.0.0, yargs@^17.0.1, yargs@^17.2.1, yargs@^17.7.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^17.0.0, yargs@^17.0.1, yargs@^17.2.1: - version "17.5.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== - dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^21.0.0" + yargs-parser "^21.1.1" yauzl@^2.10.0: version "2.10.0" From 80c64827b77b8179aef4e22e09de1b0dd388abe0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 05:39:17 +0000 Subject: [PATCH 19/19] Bump @types/react from 18.2.37 to 18.2.41 Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.37 to 18.2.41. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d5925320f9..19e9e05c06 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", "@types/node": "^20.10.3", - "@types/react": "^18.2.37", + "@types/react": "^18.2.41", "@types/react-dom": "^18.2.7", "@types/react-redux": "^7.1.24", "@typescript-eslint/eslint-plugin": "^5.23.0", diff --git a/yarn.lock b/yarn.lock index 6bc14b75d4..89220c53e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4658,10 +4658,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.2.37": - version "18.2.37" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.37.tgz#0f03af69e463c0f19a356c2660dbca5d19c44cae" - integrity sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw== +"@types/react@*", "@types/react@^18.2.41": + version "18.2.41" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.41.tgz#9eea044246bdb10510df89ef7f8422a8b6ad8fb9" + integrity sha512-CwOGr/PiLiNBxEBqpJ7fO3kocP/2SSuC9fpH5K7tusrg4xPSRT/193rzolYwQnTN02We/ATXKnb6GqA5w4fRxw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -8017,12 +8017,7 @@ csstype@^2.5.7: resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz" integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA== -csstype@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" - integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== - -csstype@^3.1.2: +csstype@^3.0.2, csstype@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==