From 44510dce85dca7f6cd29a8e1a37175221e5c600a Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Fri, 14 Jun 2024 14:09:54 +0200 Subject: [PATCH 01/32] Add author name at the end of the find on shelf location string --- .../find-on-shelf/FindOnShelfManifestationList.tsx | 5 ++++- .../find-on-shelf/FindOnShelfManifestationListItem.tsx | 6 ++++-- src/components/find-on-shelf/FindOnShelfModalBody.tsx | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/find-on-shelf/FindOnShelfManifestationList.tsx b/src/components/find-on-shelf/FindOnShelfManifestationList.tsx index aa9cc943be..2da64b6125 100644 --- a/src/components/find-on-shelf/FindOnShelfManifestationList.tsx +++ b/src/components/find-on-shelf/FindOnShelfManifestationList.tsx @@ -8,10 +8,12 @@ import { getManifestationPublicationYear } from "../../core/utils/helpers/genera export interface FindOnShelfManifestationListProps { libraryBranchHoldings: ManifestationHoldings; + author: string; } const FindOnShelfManifestationList: FC = ({ - libraryBranchHoldings + libraryBranchHoldings, + author }) => { const t = useText(); @@ -55,6 +57,7 @@ const FindOnShelfManifestationList: FC = ({ branchHolding.holding.materials )} key={branchHolding.holding.branch.branchId} + author={author} /> ); })} diff --git a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx index 1841854b24..4738f2c8c7 100644 --- a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx +++ b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx @@ -11,6 +11,7 @@ export interface FindOnShelfManifestationListItemProps { title: string; publicationYear: string | null; numberAvailable: number; + author: string; } const FindOnShelfManifestationListItem: FC< @@ -22,7 +23,8 @@ const FindOnShelfManifestationListItem: FC< sublocation, title, publicationYear, - numberAvailable + numberAvailable, + author }) => { const t = useText(); @@ -45,7 +47,7 @@ const FindOnShelfManifestationListItem: FC< {locationArray.length - ? locationArray.join(" · ") + ? `${locationArray.join(" · ")} · ${author}` : t("findOnShelfModalNoLocationSpecifiedText")} diff --git a/src/components/find-on-shelf/FindOnShelfModalBody.tsx b/src/components/find-on-shelf/FindOnShelfModalBody.tsx index 91eb54cd10..55c59e66e9 100644 --- a/src/components/find-on-shelf/FindOnShelfModalBody.tsx +++ b/src/components/find-on-shelf/FindOnShelfModalBody.tsx @@ -215,6 +215,7 @@ const FindOnShelfModalBody: FC = ({ > ); From b17a379f8178dc7778a5e8447b1c7fadfb6678db Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 17 Jun 2024 11:27:15 +0200 Subject: [PATCH 02/32] Show "1 (item) home" in find-on-shelf modal on mobile instead of "1" --- .../find-on-shelf/FindOnShelfManifestationListItem.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx index 4738f2c8c7..d3ddaeadc1 100644 --- a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx +++ b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx @@ -51,7 +51,10 @@ const FindOnShelfManifestationListItem: FC< : t("findOnShelfModalNoLocationSpecifiedText")} - {numberAvailable} + {numberAvailable}{" "} + + {t("findOnShelfModalListItemCountText")} + ); From ff9fdd86a460c68deaa8fea751eeadd81126aee7 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 17 Jun 2024 13:33:06 +0200 Subject: [PATCH 03/32] Use the new find-on-shelf__location-header class in find on shelf list --- src/components/find-on-shelf/FindOnShelfManifestationList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/find-on-shelf/FindOnShelfManifestationList.tsx b/src/components/find-on-shelf/FindOnShelfManifestationList.tsx index 2da64b6125..4f1b2c0c05 100644 --- a/src/components/find-on-shelf/FindOnShelfManifestationList.tsx +++ b/src/components/find-on-shelf/FindOnShelfManifestationList.tsx @@ -32,7 +32,7 @@ const FindOnShelfManifestationList: FC = ({ {t("findOnShelfModalListMaterialText")} - + {t("findOnShelfModalListFindOnShelfText")} Date: Tue, 18 Jun 2024 15:24:00 +0200 Subject: [PATCH 04/32] Introduce creatorsToStringLastNameFirst helper to invert creator names Last names first, then first name last. --- src/core/utils/helpers/general.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/core/utils/helpers/general.ts b/src/core/utils/helpers/general.ts index c98f3ba5af..0493d069f7 100644 --- a/src/core/utils/helpers/general.ts +++ b/src/core/utils/helpers/general.ts @@ -64,6 +64,20 @@ export const creatorsToString = (creators: string[], t: UseTextFunction) => { return creators[0]; }; +export const creatorsToStringLastNameFirst = ( + creators: string[], + t: UseTextFunction +) => { + const invertedCreators = creators.map((creator) => { + const [firstName, ...rest] = creator.split(" "); + // We don't know whether last name is second, or last, and so just put all + // after first name in the beginning of the string, then add the first name. + return `${rest.join(" ")}, ${firstName}`; + }); + + return creatorsToString(invertedCreators, t); +}; + export const getCreatorTextFromManifestations = ( manifestations: Manifestation[], t: UseTextFunction From e0a0dce54c213f1167b96e7a93e9f908dc1f7de9 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 18 Jun 2024 15:24:36 +0200 Subject: [PATCH 05/32] Show first name in last place in find on shelf modal material locations --- src/components/find-on-shelf/FindOnShelfModalBody.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/find-on-shelf/FindOnShelfModalBody.tsx b/src/components/find-on-shelf/FindOnShelfModalBody.tsx index 55c59e66e9..12289c6eda 100644 --- a/src/components/find-on-shelf/FindOnShelfModalBody.tsx +++ b/src/components/find-on-shelf/FindOnShelfModalBody.tsx @@ -9,6 +9,7 @@ import { import { convertPostIdToFaustId, creatorsToString, + creatorsToStringLastNameFirst, flattenCreators, getManifestationsPids } from "../../core/utils/helpers/general"; @@ -55,6 +56,11 @@ const FindOnShelfModalBody: FC = ({ config }); const author = creatorsToString(flattenCreators(authors), t); + // Inverted author - last name, then first name is used in find on shelf modal. + const invertedAuthor = creatorsToStringLastNameFirst( + flattenCreators(authors), + t + ); const title = workTitles.join(", "); const isPeriodical = manifestations.some((manifestation) => { return manifestation.materialTypes.some((materialType) => { @@ -215,7 +221,7 @@ const FindOnShelfModalBody: FC = ({ > ); From cbdbc78d4c50e5b9e80378a4872f74db8fcac476 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Thu, 20 Jun 2024 09:28:43 +0200 Subject: [PATCH 06/32] Orevent showing "undefined" on find on shelf modal as location --- .../find-on-shelf/FindOnShelfManifestationListItem.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx index d3ddaeadc1..4c7ae12db1 100644 --- a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx +++ b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx @@ -47,7 +47,9 @@ const FindOnShelfManifestationListItem: FC< {locationArray.length - ? `${locationArray.join(" · ")} · ${author}` + ? `${locationArray.join(" · ")}${ + author && author !== "undefined" ? ` · ${author}` : "" + }` : t("findOnShelfModalNoLocationSpecifiedText")} From b6ea5c92b645e0d423f7347870f344af9390aa0b Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 5 Aug 2024 20:36:47 +0200 Subject: [PATCH 07/32] Add nameSort property on Creators in WorkMedium fragment This is used for sorting creators by their last name. --- src/core/dbc-gateway/fragments.graphql | 3 ++ .../dbc-gateway/generated/graphql.schema.json | 13 +++++++-- src/core/dbc-gateway/generated/graphql.tsx | 29 +++++++++++-------- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/core/dbc-gateway/fragments.graphql b/src/core/dbc-gateway/fragments.graphql index bb6d51177b..17e4a0f1ae 100644 --- a/src/core/dbc-gateway/fragments.graphql +++ b/src/core/dbc-gateway/fragments.graphql @@ -260,6 +260,9 @@ fragment WorkMedium on Work { display } } + creators { + nameSort + } mainLanguages { display isoCode diff --git a/src/core/dbc-gateway/generated/graphql.schema.json b/src/core/dbc-gateway/generated/graphql.schema.json index 812ee39eb8..e82d0b6682 100644 --- a/src/core/dbc-gateway/generated/graphql.schema.json +++ b/src/core/dbc-gateway/generated/graphql.schema.json @@ -15313,6 +15313,15 @@ } ] }, + { + "name": "oneOf", + "description": "Indicates exactly one field must be supplied and this field must not be `null`.", + "isRepeatable": false, + "locations": [ + "INPUT_OBJECT" + ], + "args": [] + }, { "name": "skip", "description": "Directs the executor to skip this field or fragment when the `if` argument is true.", @@ -15343,7 +15352,7 @@ }, { "name": "specifiedBy", - "description": "Exposes a URL that specifies the behaviour of this scalar.", + "description": "Exposes a URL that specifies the behavior of this scalar.", "isRepeatable": false, "locations": [ "SCALAR" @@ -15351,7 +15360,7 @@ "args": [ { "name": "url", - "description": "The URL that specifies the behaviour of this scalar.", + "description": "The URL that specifies the behavior of this scalar.", "type": { "kind": "NON_NULL", "name": null, diff --git a/src/core/dbc-gateway/generated/graphql.tsx b/src/core/dbc-gateway/generated/graphql.tsx index f488024022..1d1fec42a9 100644 --- a/src/core/dbc-gateway/generated/graphql.tsx +++ b/src/core/dbc-gateway/generated/graphql.tsx @@ -24,7 +24,9 @@ export type Scalars = { Boolean: boolean; Int: number; Float: number; + /** A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar. */ DateTime: unknown; + /** An integer in the range from 1 to 100 */ PaginationLimit: unknown; }; @@ -2607,6 +2609,10 @@ export type GetMaterialQuery = { display: string; }; }>; + creators: Array< + | { __typename: "Corporation"; nameSort: string; display: string } + | { __typename: "Person"; nameSort: string; display: string } + >; mainLanguages: Array<{ __typename?: "Language"; display: string; @@ -2659,10 +2665,6 @@ export type GetMaterialQuery = { full: Array; original?: Array | null; }; - creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } - >; series: Array<{ __typename?: "Series"; title: string; @@ -3073,6 +3075,10 @@ export type GetMaterialGloballyQuery = { display: string; }; }>; + creators: Array< + | { __typename: "Corporation"; nameSort: string; display: string } + | { __typename: "Person"; nameSort: string; display: string } + >; mainLanguages: Array<{ __typename?: "Language"; display: string; @@ -3125,10 +3131,6 @@ export type GetMaterialGloballyQuery = { full: Array; original?: Array | null; }; - creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } - >; series: Array<{ __typename?: "Series"; title: string; @@ -6073,6 +6075,10 @@ export type WorkMediumFragment = { display: string; }; }>; + creators: Array< + | { __typename: "Corporation"; nameSort: string; display: string } + | { __typename: "Person"; nameSort: string; display: string } + >; mainLanguages: Array<{ __typename?: "Language"; display: string; @@ -6125,10 +6131,6 @@ export type WorkMediumFragment = { full: Array; original?: Array | null; }; - creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } - >; series: Array<{ __typename?: "Series"; title: string; @@ -6842,6 +6844,9 @@ export const WorkMediumFragmentDoc = ` display } } + creators { + nameSort + } mainLanguages { display isoCode From 1e49604c4ebde7497cc24a0043657c60b3a7ecaa Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 5 Aug 2024 21:11:29 +0200 Subject: [PATCH 08/32] Add nameSort prop on ManifestationsSimpleFields fragment & adjust code ..around the apps - mocked data and Type definitions. --- .../material-search/MaterialSearchList.tsx | 3 +- src/apps/material/__vitest_data__/helper.ts | 12 +- .../autosuggest-material.tsx | 4 +- src/components/find-on-shelf/mocked-data.ts | 6 +- src/core/dbc-gateway/fragments.graphql | 1 + src/core/dbc-gateway/generated/graphql.tsx | 113 +++++++++--------- 6 files changed, 74 insertions(+), 65 deletions(-) diff --git a/src/apps/material-search/MaterialSearchList.tsx b/src/apps/material-search/MaterialSearchList.tsx index 7e1558cec3..55b61420c5 100644 --- a/src/apps/material-search/MaterialSearchList.tsx +++ b/src/apps/material-search/MaterialSearchList.tsx @@ -6,6 +6,7 @@ import { flattenCreators } from "../../core/utils/helpers/general"; import { useText } from "../../core/utils/text"; import useInfiniteScrollLoading from "./useInfiteScrollLoading"; import { SearchWithPaginationQuery } from "../../core/dbc-gateway/generated/graphql"; +import { Work } from "../../core/utils/types/entities"; type MaterialSearchListResultsProps = { data: SearchWithPaginationQuery["search"]["works"]; @@ -58,7 +59,7 @@ const MaterialSearchListResults: FC = ({
    {data.map((work, index) => { - const authors = flattenCreators(work.creators); + const authors = flattenCreators(work.creators as Work["creators"]); const isLastItem = index === data.length - 1; return ( diff --git a/src/apps/material/__vitest_data__/helper.ts b/src/apps/material/__vitest_data__/helper.ts index 83a31efdad..d2cae4cd8c 100644 --- a/src/apps/material/__vitest_data__/helper.ts +++ b/src/apps/material/__vitest_data__/helper.ts @@ -39,7 +39,8 @@ export default { creators: [ { display: "Isaac Asimov", - __typename: "Person" + __typename: "Person", + nameSort: "Asimov, Isaac" }, { display: "Tricia Reilly", @@ -138,7 +139,8 @@ export default { creators: [ { display: "Isaac Asimov", - __typename: "Person" + __typename: "Person", + nameSort: "Asimov, Isaac" } ], publisher: [], @@ -231,7 +233,8 @@ export default { creators: [ { display: "Isaac Asimov", - __typename: "Person" + __typename: "Person", + nameSort: "Asimov, Isaac" }, { display: "Scott Brick", @@ -324,7 +327,8 @@ export default { creators: [ { display: "Isaac Asimov", - __typename: "Person" + __typename: "Person", + nameSort: "Asimov, Isaac" } ], publisher: ["Oxford University Press"], diff --git a/src/components/autosuggest-material/autosuggest-material.tsx b/src/components/autosuggest-material/autosuggest-material.tsx index a61a3581f0..7f5ac7dd90 100644 --- a/src/components/autosuggest-material/autosuggest-material.tsx +++ b/src/components/autosuggest-material/autosuggest-material.tsx @@ -9,7 +9,7 @@ import { flattenCreators, getManifestationsPids } from "../../core/utils/helpers/general"; -import { WorkSmallFragment } from "../../core/dbc-gateway/generated/graphql"; +import { WorkMediumFragment } from "../../core/dbc-gateway/generated/graphql"; import { getManifestationLanguageIsoCode } from "../../apps/material/helper"; import { Manifestation } from "../../core/utils/types/entities"; @@ -49,7 +49,7 @@ const AutosuggestMaterial: React.FC = ({ manifestations: { all: allManifestations, bestRepresentation } } = work; const authors = flattenCreators( - creators as WorkSmallFragment["creators"] + creators as WorkMediumFragment["creators"] ); const manifestationLanguageIsoCode = diff --git a/src/components/find-on-shelf/mocked-data.ts b/src/components/find-on-shelf/mocked-data.ts index 30721f79f2..4b450ce5bc 100644 --- a/src/components/find-on-shelf/mocked-data.ts +++ b/src/components/find-on-shelf/mocked-data.ts @@ -27,7 +27,8 @@ export const mockedManifestationData: Manifestation[] = [ creators: [ { display: "Lucinda Riley", - __typename: "Person" + __typename: "Person", + nameSort: "Riley, Lucinda" } ], publisher: [""], @@ -112,7 +113,8 @@ export const mockedManifestationData: Manifestation[] = [ creators: [ { display: "Lucinda Riley", - __typename: "Person" + __typename: "Person", + nameSort: "Riley, Lucinda" } ], publisher: [""], diff --git a/src/core/dbc-gateway/fragments.graphql b/src/core/dbc-gateway/fragments.graphql index 17e4a0f1ae..c4ad4abfd1 100644 --- a/src/core/dbc-gateway/fragments.graphql +++ b/src/core/dbc-gateway/fragments.graphql @@ -62,6 +62,7 @@ fragment ManifestationsSimpleFields on Manifestation { } creators { display + nameSort __typename } publisher diff --git a/src/core/dbc-gateway/generated/graphql.tsx b/src/core/dbc-gateway/generated/graphql.tsx index 1d1fec42a9..9bdf6163af 100644 --- a/src/core/dbc-gateway/generated/graphql.tsx +++ b/src/core/dbc-gateway/generated/graphql.tsx @@ -2102,8 +2102,8 @@ export type GetSmallWorkQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -2223,8 +2223,8 @@ export type GetSmallWorkQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -2344,8 +2344,8 @@ export type GetSmallWorkQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -2714,8 +2714,8 @@ export type GetMaterialQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -2835,8 +2835,8 @@ export type GetMaterialQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -2956,8 +2956,8 @@ export type GetMaterialQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -3180,8 +3180,8 @@ export type GetMaterialGloballyQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -3301,8 +3301,8 @@ export type GetMaterialGloballyQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -3422,8 +3422,8 @@ export type GetMaterialGloballyQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -3690,8 +3690,8 @@ export type RecommendFromFaustQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -3814,8 +3814,8 @@ export type RecommendFromFaustQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -3938,8 +3938,8 @@ export type RecommendFromFaustQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -4122,8 +4122,8 @@ export type SearchWithPaginationQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -4246,8 +4246,8 @@ export type SearchWithPaginationQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -4370,8 +4370,8 @@ export type SearchWithPaginationQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -4601,8 +4601,8 @@ export type ComplexSearchWithPaginationQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -4725,8 +4725,8 @@ export type ComplexSearchWithPaginationQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -4849,8 +4849,8 @@ export type ComplexSearchWithPaginationQuery = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -5084,8 +5084,8 @@ export type ManifestationsSimpleFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -5202,8 +5202,8 @@ export type ManifestationsSimpleFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -5320,8 +5320,8 @@ export type ManifestationsSimpleFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -5470,8 +5470,8 @@ export type ManifestationsSimpleFieldsFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -5721,8 +5721,8 @@ export type WorkSmallFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -5842,8 +5842,8 @@ export type WorkSmallFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -5963,8 +5963,8 @@ export type WorkSmallFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -6180,8 +6180,8 @@ export type WorkMediumFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -6301,8 +6301,8 @@ export type WorkMediumFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -6422,8 +6422,8 @@ export type WorkMediumFragment = { }; }>; creators: Array< - | { __typename: "Corporation"; display: string } - | { __typename: "Person"; display: string } + | { __typename: "Corporation"; display: string; nameSort: string } + | { __typename: "Person"; display: string; nameSort: string } >; identifiers: Array<{ __typename?: "Identifier"; value: string }>; contributors: Array< @@ -6703,6 +6703,7 @@ export const ManifestationsSimpleFieldsFragmentDoc = ` } creators { display + nameSort __typename } publisher From f443233513c6cca9e0406386c39cba2733f7c6bf Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 5 Aug 2024 21:12:47 +0200 Subject: [PATCH 09/32] Introduce capitalizeFirstLetters helper function --- src/core/utils/helpers/general.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/utils/helpers/general.ts b/src/core/utils/helpers/general.ts index 0493d069f7..be23273049 100644 --- a/src/core/utils/helpers/general.ts +++ b/src/core/utils/helpers/general.ts @@ -22,6 +22,13 @@ import { store } from "../../store"; import { constructModalId } from "./modal-helpers"; import { formatCurrency } from "./currency"; +export const capitalizeFirstLetters = (str: string) => { + return str + .split(" ") + .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) + .join(" "); +}; + export const getManifestationPublicationYear = ( manifestation: Manifestation ): string | null => { From c5dfea0631ba5e58f9bb5c456a040e7c3929ea32 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 5 Aug 2024 21:13:20 +0200 Subject: [PATCH 10/32] Introduce flattenCreatorsLastNameFirst() helper & use in find on shelf This function utilizes the nameSort prop on Creators { } instead of manually splitting the words and guessing the last name to place first. --- .../find-on-shelf/FindOnShelfModalBody.tsx | 8 ++++---- src/core/utils/helpers/general.ts | 19 +++++-------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/components/find-on-shelf/FindOnShelfModalBody.tsx b/src/components/find-on-shelf/FindOnShelfModalBody.tsx index 12289c6eda..1e738e0cc9 100644 --- a/src/components/find-on-shelf/FindOnShelfModalBody.tsx +++ b/src/components/find-on-shelf/FindOnShelfModalBody.tsx @@ -7,10 +7,11 @@ import { useGetHoldings } from "../../apps/material/helper"; import { + capitalizeFirstLetters, convertPostIdToFaustId, creatorsToString, - creatorsToStringLastNameFirst, flattenCreators, + flattenCreatorsLastNameFirst, getManifestationsPids } from "../../core/utils/helpers/general"; import { useText } from "../../core/utils/text"; @@ -57,9 +58,8 @@ const FindOnShelfModalBody: FC = ({ }); const author = creatorsToString(flattenCreators(authors), t); // Inverted author - last name, then first name is used in find on shelf modal. - const invertedAuthor = creatorsToStringLastNameFirst( - flattenCreators(authors), - t + const invertedAuthor = capitalizeFirstLetters( + creatorsToString(flattenCreatorsLastNameFirst(authors), t) ); const title = workTitles.join(", "); const isPeriodical = manifestations.some((manifestation) => { diff --git a/src/core/utils/helpers/general.ts b/src/core/utils/helpers/general.ts index be23273049..8399a85c52 100644 --- a/src/core/utils/helpers/general.ts +++ b/src/core/utils/helpers/general.ts @@ -54,6 +54,11 @@ export const flattenCreators = (creators: Work["creators"]) => return creator.display; }); +export const flattenCreatorsLastNameFirst = (creators: Work["creators"]) => + creators.map((creator: Work["creators"][0]) => { + return creator.nameSort; + }); + const getCreatorsFromManifestations = (manifestations: Manifestation[]) => { const creators = manifestations.reduce((acc: string[], curr) => { return [...acc, ...flattenCreators(curr.creators)]; @@ -71,20 +76,6 @@ export const creatorsToString = (creators: string[], t: UseTextFunction) => { return creators[0]; }; -export const creatorsToStringLastNameFirst = ( - creators: string[], - t: UseTextFunction -) => { - const invertedCreators = creators.map((creator) => { - const [firstName, ...rest] = creator.split(" "); - // We don't know whether last name is second, or last, and so just put all - // after first name in the beginning of the string, then add the first name. - return `${rest.join(" ")}, ${firstName}`; - }); - - return creatorsToString(invertedCreators, t); -}; - export const getCreatorTextFromManifestations = ( manifestations: Manifestation[], t: UseTextFunction From b5b794021542266f234a293c8e6936d5ad6915df Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 5 Aug 2024 21:41:39 +0200 Subject: [PATCH 11/32] Update vitest snapshot with nameSort prop on "creators" entity --- src/apps/material/__snapshots__/helper.ts.snap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/apps/material/__snapshots__/helper.ts.snap b/src/apps/material/__snapshots__/helper.ts.snap index 845513b7b5..5bf8cfadc1 100644 --- a/src/apps/material/__snapshots__/helper.ts.snap +++ b/src/apps/material/__snapshots__/helper.ts.snap @@ -28,6 +28,7 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma { "__typename": "Person", "display": "Isaac Asimov", + "nameSort": "Asimov, Isaac", }, ], "dateFirstEdition": null, @@ -128,6 +129,7 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma { "__typename": "Person", "display": "Isaac Asimov", + "nameSort": "Asimov, Isaac", }, ], "dateFirstEdition": null, @@ -225,6 +227,7 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma { "__typename": "Person", "display": "Isaac Asimov", + "nameSort": "Asimov, Isaac", }, { "__typename": "Person", @@ -323,6 +326,7 @@ exports[`divideManifestationsByMaterialType > should divide manifestations by ma { "__typename": "Person", "display": "Isaac Asimov", + "nameSort": "Asimov, Isaac", }, { "__typename": "Person", From 736ad62a922c1a49c669f51a85ffd84fd5112ac1 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 27 Aug 2024 11:23:33 +0200 Subject: [PATCH 12/32] Don't infer type in flattenCreatorsLastNameFirst() unnecessarily --- src/core/utils/helpers/general.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/utils/helpers/general.ts b/src/core/utils/helpers/general.ts index 8399a85c52..0a9621e3af 100644 --- a/src/core/utils/helpers/general.ts +++ b/src/core/utils/helpers/general.ts @@ -55,7 +55,7 @@ export const flattenCreators = (creators: Work["creators"]) => }); export const flattenCreatorsLastNameFirst = (creators: Work["creators"]) => - creators.map((creator: Work["creators"][0]) => { + creators.map((creator) => { return creator.nameSort; }); From 8b7d177f3d2d8921fc80629ace4e5e681a5afcac Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 27 Aug 2024 11:24:12 +0200 Subject: [PATCH 13/32] Refactor MaterialSearchListResults component to use typed variable for data --- src/apps/material-search/MaterialSearchList.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/apps/material-search/MaterialSearchList.tsx b/src/apps/material-search/MaterialSearchList.tsx index 55b61420c5..7a2b979377 100644 --- a/src/apps/material-search/MaterialSearchList.tsx +++ b/src/apps/material-search/MaterialSearchList.tsx @@ -51,6 +51,7 @@ const MaterialSearchListResults: FC = ({ } if (!data || data.length === 0) return null; + const works = data as Work[]; return (
    @@ -58,8 +59,8 @@ const MaterialSearchListResults: FC = ({ {t("materialSearchAmountOfResultsText")}:{hitCount}
      - {data.map((work, index) => { - const authors = flattenCreators(work.creators as Work["creators"]); + {works.map((work, index) => { + const authors = flattenCreators(work.creators); const isLastItem = index === data.length - 1; return ( From 43e0a0367678e4530277474effc2d0c3dd2402bb Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 27 Aug 2024 11:24:56 +0200 Subject: [PATCH 14/32] feat: Add getFindOnShelfLocationText helper function This commit introduces the getFindOnShelfLocationText helper function in the FindOnShelfManifestationListItem component. This function is used to generate the location text for a manifestation item, taking into account the location array and author information. It improves code readability and reduces duplication by centralizing the logic for generating the location text. --- .../find-on-shelf/FindOnShelfManifestationListItem.tsx | 5 ++--- src/components/find-on-shelf/helper.tsx | 10 ++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 src/components/find-on-shelf/helper.tsx diff --git a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx index 4c7ae12db1..89208d1264 100644 --- a/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx +++ b/src/components/find-on-shelf/FindOnShelfManifestationListItem.tsx @@ -2,6 +2,7 @@ import * as React from "react"; import { FC } from "react"; import { useText } from "../../core/utils/text"; import { Manifestation } from "../../core/utils/types/entities"; +import { getFindOnShelfLocationText } from "./helper"; export interface FindOnShelfManifestationListItemProps { shelfmark: Manifestation["shelfmark"]; @@ -47,9 +48,7 @@ const FindOnShelfManifestationListItem: FC< {locationArray.length - ? `${locationArray.join(" · ")}${ - author && author !== "undefined" ? ` · ${author}` : "" - }` + ? getFindOnShelfLocationText(locationArray, author) : t("findOnShelfModalNoLocationSpecifiedText")} diff --git a/src/components/find-on-shelf/helper.tsx b/src/components/find-on-shelf/helper.tsx new file mode 100644 index 0000000000..3d0eced294 --- /dev/null +++ b/src/components/find-on-shelf/helper.tsx @@ -0,0 +1,10 @@ +export const getFindOnShelfLocationText = ( + locationArray: (string | undefined)[], + author: string +) => { + return `${locationArray.join(" · ")}${ + author && author !== "undefined" ? ` · ${author}` : "" + }`; +}; + +export default {}; From a8f6cdd6d5a31a36c4c2c8e25b58c60972043ea2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:46:22 +0000 Subject: [PATCH 15/32] Bump @types/react from 18.3.4 to 18.3.5 Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.4 to 18.3.5. - [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 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5b4663f7a6..f48fff1fd8 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.16.1", - "@types/react": "^18.3.4", + "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "@types/react-flatpickr": "^3.8.11", "@types/react-redux": "^7.1.24", diff --git a/yarn.lock b/yarn.lock index e6c908eaf3..5c6c78b8ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4951,10 +4951,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.3.4": - version "18.3.4" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.4.tgz#dfdd534a1d081307144c00e325c06e00312c93a3" - integrity sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw== +"@types/react@*", "@types/react@^18.3.5": + version "18.3.5" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.5.tgz#5f524c2ad2089c0ff372bbdabc77ca2c4dbadf8f" + integrity sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA== dependencies: "@types/prop-types" "*" csstype "^3.0.2" From f8cd209eca2d395560eaaded4fe8d118f4bc1fb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:46:39 +0000 Subject: [PATCH 16/32] Bump postcss from 8.4.41 to 8.4.43 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.41 to 8.4.43. - [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.41...8.4.43) --- 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 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f48fff1fd8..9f1fe4c4c8 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "mutationobserver-shim": "^0.3.7", "nyc": "^17.0.0", "orval": "^6.26.0", - "postcss": "^8.4.41", + "postcss": "^8.4.43", "postcss-cli": "^11.0.0", "postcss-loader": "^8.1.1", "postcss-scss": "^4.0.9", @@ -176,6 +176,6 @@ "unfetch": "^4.2.0" }, "peerDependencies": { - "postcss": "^8.4.41" + "postcss": "^8.4.43" } } diff --git a/yarn.lock b/yarn.lock index 5c6c78b8ce..497bd599b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15900,10 +15900,10 @@ 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.33, postcss@^8.4.41: - version "8.4.41" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" - integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== +postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.33, postcss@^8.4.43: + version "8.4.43" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.43.tgz#a5ddf22f4cc38e64c6ae030182b43e539d316419" + integrity sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ== dependencies: nanoid "^3.3.7" picocolors "^1.0.1" From 6ba203546ed20e538e2e2467ada372c60ec469bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:46:52 +0000 Subject: [PATCH 17/32] Bump @cypress/code-coverage from 3.12.45 to 3.12.46 Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.45 to 3.12.46. - [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.45...v3.12.46) --- 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 9f1fe4c4c8..0551669578 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@babel/preset-typescript": "^7.24.7", "@csstools/postcss-sass": "^5.1.1", "@cypress/browserify-preprocessor": "^3.0.2", - "@cypress/code-coverage": "^3.12.45", + "@cypress/code-coverage": "^3.12.46", "@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 497bd599b4..e6960f44b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1632,10 +1632,10 @@ through2 "^2.0.0" watchify "^4.0.0" -"@cypress/code-coverage@^3.12.45": - version "3.12.45" - resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.45.tgz#45eeeb53391153767640a5a1a626b0d6e4c417b0" - integrity sha512-QRvdc9Zmner/CxQ1F5jcNVZR8P8VrRTyE8THcisxnB6D3AMIKKSmjYUGH6OnWBDF/vi3CqimuMSbrUfzmPzmhw== +"@cypress/code-coverage@^3.12.46": + version "3.12.46" + resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.46.tgz#16c178a5b729ce9829588866cf9b66c262ced34f" + integrity sha512-Y6lG3VjJX8R64mZH5lSqZPw2aj89C1v7e8uC9Ngob1r1DgaAVRQtXZD6mXeHm23FHh131ZMckQ9b+AzCUeJ0mg== dependencies: "@cypress/webpack-preprocessor" "^6.0.0" chalk "4.1.2" From 1183e64a124b069bbfe058be392cb0ef75d01762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 07:19:29 +0000 Subject: [PATCH 18/32] Bump @types/node from 20.16.1 to 20.16.3 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.16.1 to 20.16.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 0551669578..cb354b77b9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@testing-library/react": "^14.2.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", - "@types/node": "^20.16.1", + "@types/node": "^20.16.3", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "@types/react-flatpickr": "^3.8.11", diff --git a/yarn.lock b/yarn.lock index e6960f44b2..eda9806bb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4855,10 +4855,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^20.16.1": - version "20.16.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.1.tgz#0b44b15271d0e2191ca68faf1fbe506e06aed732" - integrity sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ== +"@types/node@*", "@types/node@^20.16.3": + version "20.16.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.3.tgz#7b4f9a37091cf03a0c2561bf76a9a55f03f4f523" + integrity sha512-/wdGiWRkMOm53gAsSyFMXFZHbVg7C6CbkrzHNpaHoYfsUWPg7m6ZRKtvQjgvQ9i8WT540a3ydRlRQbxjY30XxQ== dependencies: undici-types "~6.19.2" From 198630de199da5b8cac641b21e933a71411d74e4 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 2 Sep 2024 13:25:07 +0200 Subject: [PATCH 19/32] chore: Update material.dev.tsx with irregular Faust IDs --- src/apps/material/material.dev.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/apps/material/material.dev.tsx b/src/apps/material/material.dev.tsx index 7953412d8d..2c797bd05e 100644 --- a/src/apps/material/material.dev.tsx +++ b/src/apps/material/material.dev.tsx @@ -958,11 +958,16 @@ digitalArticle.args = { wid: "work-of:870971-tsart:36297484" }; -export const inLargeSameSeriesAndIrregularFaustId = Template.bind({}); -inLargeSameSeriesAndIrregularFaustId.args = { +export const irregularFaustId1InLargeSameSeries = Template.bind({}); +irregularFaustId1InLargeSameSeries.args = { wid: "work-of:150086-netmusik:BIS-2067" }; +export const irregularFaustId2fairytale = Template.bind({}); +irregularFaustId2fairytale.args = { + wid: "work-of:800010-katalog:99122572002205763__1" +}; + export const journal = Template.bind({}); journal.args = { wid: "work-of:870970-basis:01007556" From 1359a93bf4305b729036214d2bc96500f5774d18 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 2 Sep 2024 13:25:24 +0200 Subject: [PATCH 20/32] refactor: Update regular expression to allow hyphens and underscores in Faust IDs --- src/core/utils/helpers/general.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/utils/helpers/general.ts b/src/core/utils/helpers/general.ts index c98f3ba5af..0d4cd08ad5 100644 --- a/src/core/utils/helpers/general.ts +++ b/src/core/utils/helpers/general.ts @@ -151,7 +151,7 @@ export const convertPostIdToFaustId = (postId: Pid) => { // in the last part after the colon, but it can also have a dash. // We are about to have clarified what the proper name of the element. // But for now we will call it faustId. - const matches = postId.match(/^[0-9]+-[a-z]+:([a-zA-Z0-9-]+)$/); + const matches = postId.match(/^[0-9]+-[a-z]+:([a-zA-Z0-9-_]+)$/); if (matches?.[1]) { return matches?.[1] as FaustId; } From 262d7bba614b6f24de6f1ed61a0d1a122b309adb Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Mon, 2 Sep 2024 13:25:35 +0200 Subject: [PATCH 21/32] refactor: Update skeleton loading styles in FavoritesList component --- src/apps/favorites-list/FavoritesList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/favorites-list/FavoritesList.tsx b/src/apps/favorites-list/FavoritesList.tsx index 70c6ef7512..ca6546d243 100644 --- a/src/apps/favorites-list/FavoritesList.tsx +++ b/src/apps/favorites-list/FavoritesList.tsx @@ -44,8 +44,8 @@ const FavoritesList: React.FC = ({ pageSize }) => { const skeletonList = ( <> -
      -
       
      +
      +
       
        {/* From ddae4e9659ca93a030ab77ec5f96acf885722d15 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Thu, 5 Sep 2024 11:13:04 +0200 Subject: [PATCH 22/32] Refactor URL translation logic in MaterialButtonOnlineExternal component --- .../material-buttons/online/MaterialButtonOnlineExternal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/material/material-buttons/online/MaterialButtonOnlineExternal.tsx b/src/components/material/material-buttons/online/MaterialButtonOnlineExternal.tsx index 3ba4e2d737..bde9344cf0 100644 --- a/src/components/material/material-buttons/online/MaterialButtonOnlineExternal.tsx +++ b/src/components/material/material-buttons/online/MaterialButtonOnlineExternal.tsx @@ -68,7 +68,7 @@ const MaterialButtonOnlineExternal: FC = ({ // Handle URL translation when data or error changes useEffect(() => { - if (urlWasTranslated === false && !error && data?.data?.url) { + if (!urlWasTranslated && !error && data?.data?.url) { setTranslatedUrl(new URL(data.data.url)); setUrlWasTranslated(true); } From 1701b8da4aca36825a5ac3c2a35ee16980115c44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:11:38 +0000 Subject: [PATCH 23/32] Bump caniuse-lite from 1.0.30001655 to 1.0.30001658 Bumps [caniuse-lite](https://github.com/browserslist/caniuse-lite) from 1.0.30001655 to 1.0.30001658. - [Commits](https://github.com/browserslist/caniuse-lite/compare/1.0.30001655...1.0.30001658) --- 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 | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index be63b33c33..d07d5ce31e 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "babel-plugin-istanbul": "^7.0.0", "babel-plugin-lodash": "^3.3.4", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "caniuse-lite": "^1.0.30001655", + "caniuse-lite": "^1.0.30001658", "change-case-all": "^2.1.0", "chokidar-cli": "^3.0.0", "concurrently": "^8.2.2", diff --git a/yarn.lock b/yarn.lock index 04f9456653..7132a81d21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7202,10 +7202,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.30001646, caniuse-lite@^1.0.30001655: - version "1.0.30001655" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz#0ce881f5a19a2dcfda2ecd927df4d5c1684b982f" - integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001658: + version "1.0.30001658" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz#b5f7be8ac748a049ab06aa1cf7a1408d83f074ec" + integrity sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw== capital-case@^1.0.4: version "1.0.4" @@ -18068,7 +18068,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18094,6 +18094,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" @@ -18257,7 +18266,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18285,6 +18294,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -20333,7 +20349,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -20368,6 +20384,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From ff100f0525965eee2917a326abf9cccc7671d20f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:12:17 +0000 Subject: [PATCH 24/32] Bump @cypress/code-coverage from 3.12.46 to 3.12.47 Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.46 to 3.12.47. - [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.46...v3.12.47) --- 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 | 48 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index be63b33c33..06e79495cd 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@babel/preset-typescript": "^7.24.7", "@csstools/postcss-sass": "^5.1.1", "@cypress/browserify-preprocessor": "^3.0.2", - "@cypress/code-coverage": "^3.12.46", + "@cypress/code-coverage": "^3.12.47", "@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 04f9456653..542afe8a2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1632,14 +1632,14 @@ through2 "^2.0.0" watchify "^4.0.0" -"@cypress/code-coverage@^3.12.46": - version "3.12.46" - resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.46.tgz#16c178a5b729ce9829588866cf9b66c262ced34f" - integrity sha512-Y6lG3VjJX8R64mZH5lSqZPw2aj89C1v7e8uC9Ngob1r1DgaAVRQtXZD6mXeHm23FHh131ZMckQ9b+AzCUeJ0mg== +"@cypress/code-coverage@^3.12.47": + version "3.12.47" + resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.47.tgz#fc071c34351de524d9dbd53858dd602e413dc6e0" + integrity sha512-ianeOSqg2NyAIxrY8sxsGDPKe6XBk2EoCXTmrSIqr9cVJn2qWBvIPnyd6O/IG9MGdWhMGeyophpUb57ZZAfpBA== dependencies: "@cypress/webpack-preprocessor" "^6.0.0" chalk "4.1.2" - dayjs "1.11.12" + dayjs "1.11.13" debug "4.3.6" execa "4.1.0" globby "11.1.0" @@ -8448,12 +8448,7 @@ date-fns@^2.30.0: dependencies: "@babel/runtime" "^7.21.0" -dayjs@1.11.12: - version "1.11.12" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d" - integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg== - -dayjs@^1.10.4, dayjs@^1.11.13: +dayjs@1.11.13, dayjs@^1.10.4, dayjs@^1.11.13: version "1.11.13" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c" integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg== @@ -18068,7 +18063,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18094,6 +18089,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" @@ -18257,7 +18261,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18285,6 +18289,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -20333,7 +20344,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -20368,6 +20379,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From ca6b7294d9e93a61016cea28a31d261c48f17d4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:12:34 +0000 Subject: [PATCH 25/32] Bump eslint-plugin-import from 2.29.1 to 2.30.0 Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.1 to 2.30.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.1...v2.30.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 119 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 76 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index be63b33c33..15fde1b978 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-loader": "^4.0.2", "eslint-plugin-cypress": "^2.12.1", - "eslint-plugin-import": "^2.29.1", + "eslint-plugin-import": "^2.30.0", "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-no-only-tests": "^3.3.0", "eslint-plugin-prettier": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 04f9456653..f5b3074b5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2982,6 +2982,11 @@ redux-thunk "^2.4.2" reselect "^4.1.8" +"@rtsao/scc@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" + integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g== + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.1" resolved "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz" @@ -5963,7 +5968,7 @@ array-flatten@1.1.1: resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-includes@^3.0.3, array-includes@^3.1.4, array-includes@^3.1.7, array-includes@^3.1.8: +array-includes@^3.0.3, array-includes@^3.1.4, array-includes@^3.1.8: version "3.1.8" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== @@ -6014,16 +6019,17 @@ array.prototype.findlast@^1.2.5: es-object-atoms "^1.0.0" es-shim-unscopables "^1.0.2" -array.prototype.findlastindex@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" - integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== +array.prototype.findlastindex@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d" + integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - get-intrinsic "^1.2.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-shim-unscopables "^1.0.2" array.prototype.flat@^1.2.1, array.prototype.flat@^1.3.2: version "1.3.2" @@ -9657,10 +9663,10 @@ eslint-loader@^4.0.2: object-hash "^2.0.3" schema-utils "^2.6.5" -eslint-module-utils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== +eslint-module-utils@^2.9.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz#b99b211ca4318243f09661fae088f373ad5243c4" + integrity sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ== dependencies: debug "^3.2.7" @@ -9671,26 +9677,27 @@ eslint-plugin-cypress@^2.12.1: dependencies: globals "^11.12.0" -eslint-plugin-import@^2.29.1: - version "2.29.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643" - integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== +eslint-plugin-import@^2.30.0: + version "2.30.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz#21ceea0fc462657195989dd780e50c92fe95f449" + integrity sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw== dependencies: - array-includes "^3.1.7" - array.prototype.findlastindex "^1.2.3" + "@rtsao/scc" "^1.1.0" + array-includes "^3.1.8" + array.prototype.findlastindex "^1.2.5" array.prototype.flat "^1.3.2" array.prototype.flatmap "^1.3.2" debug "^3.2.7" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.9" - eslint-module-utils "^2.8.0" - hasown "^2.0.0" - is-core-module "^2.13.1" + eslint-module-utils "^2.9.0" + hasown "^2.0.2" + is-core-module "^2.15.1" is-glob "^4.0.3" minimatch "^3.1.2" - object.fromentries "^2.0.7" - object.groupby "^1.0.1" - object.values "^1.1.7" + object.fromentries "^2.0.8" + object.groupby "^1.0.3" + object.values "^1.2.0" semver "^6.3.1" tsconfig-paths "^3.15.0" @@ -12110,12 +12117,12 @@ 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: - 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== +is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.5.0: + version "2.15.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: - hasown "^2.0.0" + hasown "^2.0.2" is-data-descriptor@^0.1.4: version "0.1.4" @@ -14739,7 +14746,7 @@ object.entries@^1.1.0, object.entries@^1.1.5, object.entries@^1.1.8: define-properties "^1.2.1" es-object-atoms "^1.0.0" -"object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.7, object.fromentries@^2.0.8: +"object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65" integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ== @@ -14757,15 +14764,14 @@ object.getownpropertydescriptors@^2.0.3: define-properties "^1.1.2" es-abstract "^1.5.1" -object.groupby@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" - integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== +object.groupby@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e" + integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" object.pick@^1.3.0: version "1.3.0" @@ -14774,7 +14780,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.7, object.values@^1.2.0: +object.values@^1.1.0, object.values@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== @@ -18068,7 +18074,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18094,6 +18100,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" @@ -18257,7 +18272,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18285,6 +18300,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -20333,7 +20355,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -20368,6 +20390,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 32a86c0519bf16fabd87cb31e39400138524512a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:12:55 +0000 Subject: [PATCH 26/32] Bump @types/node from 20.16.3 to 20.16.5 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.16.3 to 20.16.5. - [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 | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index be63b33c33..58cb03cef6 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@testing-library/react": "^14.2.2", "@testing-library/react-hooks": "^8.0.1", "@tsconfig/create-react-app": "^1.0.2", - "@types/node": "^20.16.3", + "@types/node": "^20.16.5", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "@types/react-flatpickr": "^3.8.11", diff --git a/yarn.lock b/yarn.lock index 04f9456653..db0720e750 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4855,10 +4855,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^20.16.3": - version "20.16.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.3.tgz#7b4f9a37091cf03a0c2561bf76a9a55f03f4f523" - integrity sha512-/wdGiWRkMOm53gAsSyFMXFZHbVg7C6CbkrzHNpaHoYfsUWPg7m6ZRKtvQjgvQ9i8WT540a3ydRlRQbxjY30XxQ== +"@types/node@*", "@types/node@^20.16.5": + version "20.16.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.5.tgz#d43c7f973b32ffdf9aa7bd4f80e1072310fd7a53" + integrity sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA== dependencies: undici-types "~6.19.2" @@ -18068,7 +18068,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18094,6 +18094,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" @@ -18257,7 +18266,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18285,6 +18294,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -20333,7 +20349,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -20368,6 +20384,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 6dab7762f8128fe7ce149ffea4c8d96dc3cffb9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:13:11 +0000 Subject: [PATCH 27/32] Bump cssnano from 7.0.5 to 7.0.6 Bumps [cssnano](https://github.com/cssnano/cssnano) from 7.0.5 to 7.0.6. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/cssnano@7.0.5...cssnano@7.0.6) --- updated-dependencies: - dependency-name: cssnano dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 133 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 80 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index be63b33c33..eafa3b8af9 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "concurrently": "^8.2.2", "core-js": "^3.38.1", "css-loader": "^7.1.2", - "cssnano": "^7.0.5", + "cssnano": "^7.0.6", "cypress": "^9.6.1", "dotenv": "^16.4.5", "eslint": "^8.57.0", diff --git a/yarn.lock b/yarn.lock index 04f9456653..211c8aa41b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8261,27 +8261,27 @@ cssesc@^3.0.0: resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^7.0.5: - version "7.0.5" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-7.0.5.tgz#916108ab2f73a45a83dc15be5ac83f7a0ff5fa0a" - integrity sha512-Jbzja0xaKwc5JzxPQoc+fotKpYtWEu4wQLMQe29CM0FjjdRjA4omvbGHl2DTGgARKxSTpPssBsok+ixv8uTBqw== +cssnano-preset-default@^7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-7.0.6.tgz#0220fa7507478369aa2a226bac03e1204cd024c1" + integrity sha512-ZzrgYupYxEvdGGuqL+JKOY70s7+saoNlHSCK/OGn1vB2pQK8KSET8jvenzItcY+kA7NoWvfbb/YhlzuzNKjOhQ== dependencies: browserslist "^4.23.3" css-declaration-sorter "^7.2.0" cssnano-utils "^5.0.0" - postcss-calc "^10.0.1" + postcss-calc "^10.0.2" postcss-colormin "^7.0.2" - postcss-convert-values "^7.0.3" - postcss-discard-comments "^7.0.2" + postcss-convert-values "^7.0.4" + postcss-discard-comments "^7.0.3" postcss-discard-duplicates "^7.0.1" postcss-discard-empty "^7.0.0" postcss-discard-overridden "^7.0.0" - postcss-merge-longhand "^7.0.3" - postcss-merge-rules "^7.0.3" + postcss-merge-longhand "^7.0.4" + postcss-merge-rules "^7.0.4" postcss-minify-font-values "^7.0.0" postcss-minify-gradients "^7.0.0" postcss-minify-params "^7.0.2" - postcss-minify-selectors "^7.0.3" + postcss-minify-selectors "^7.0.4" postcss-normalize-charset "^7.0.0" postcss-normalize-display-values "^7.0.0" postcss-normalize-positions "^7.0.0" @@ -8295,19 +8295,19 @@ cssnano-preset-default@^7.0.5: postcss-reduce-initial "^7.0.2" postcss-reduce-transforms "^7.0.0" postcss-svgo "^7.0.1" - postcss-unique-selectors "^7.0.2" + postcss-unique-selectors "^7.0.3" cssnano-utils@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-5.0.0.tgz#b53a0343dd5d21012911882db6ae7d2eae0e3687" integrity sha512-Uij0Xdxc24L6SirFr25MlwC2rCFX6scyUmuKpzI+JQ7cyqDEwD42fJ0xfB3yLfOnRDU5LKGgjQ9FA6LYh76GWQ== -cssnano@^7.0.5: - version "7.0.5" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-7.0.5.tgz#97186daaf96f4db447227ee2d823ce6332f77beb" - integrity sha512-Aq0vqBLtpTT5Yxj+hLlLfNPFuRQCDIjx5JQAhhaedQKLNDvDGeVziF24PS+S1f0Z5KCxWvw0QVI3VNHNBITxVQ== +cssnano@^7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-7.0.6.tgz#63d54fd42bc017f6aaed69e47d9aaef85b7850ec" + integrity sha512-54woqx8SCbp8HwvNZYn68ZFAepuouZW4lTwiMVnBErM3VkO7/Sd4oTOt3Zz3bPx3kxQ36aISppyXj2Md4lg8bw== dependencies: - cssnano-preset-default "^7.0.5" + cssnano-preset-default "^7.0.6" lilconfig "^3.1.2" csso@^5.0.5: @@ -15533,7 +15533,7 @@ possible-typed-array-names@^1.0.0: resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== -postcss-calc@^10.0.1: +postcss-calc@^10.0.2: version "10.0.2" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-10.0.2.tgz#15f01635a27b9d38913a98c4ef2877f5b715b439" integrity sha512-DT/Wwm6fCKgpYVI7ZEWuPJ4az8hiEHtCUeYjZXqU7Ou4QqYh1Df2yCQ7Ca6N7xqKPFkxN3fhf+u9KSoOCJNAjg== @@ -15569,20 +15569,20 @@ postcss-colormin@^7.0.2: colord "^2.9.3" postcss-value-parser "^4.2.0" -postcss-convert-values@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-7.0.3.tgz#93524dcc3797cda89d70801e9cc7b7758c76d088" - integrity sha512-yJhocjCs2SQer0uZ9lXTMOwDowbxvhwFVrZeS6NPEij/XXthl73ggUmfwVvJM+Vaj5gtCKJV1jiUu4IhAUkX/Q== +postcss-convert-values@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-7.0.4.tgz#fc13ecedded6365f3c794b502dbcf77d298da12c" + integrity sha512-e2LSXPqEHVW6aoGbjV9RsSSNDO3A0rZLCBxN24zvxF25WknMPpX8Dm9UxxThyEbaytzggRuZxaGXqaOhxQ514Q== dependencies: browserslist "^4.23.3" postcss-value-parser "^4.2.0" -postcss-discard-comments@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.2.tgz#b402b2957a1ecefc77a44062ea6563190eaa8903" - integrity sha512-/Hje9Ls1IYcB9duELO/AyDUJI6aQVY3h5Rj1ziXgaLYCTi1iVBLnjg/TS0D6NszR/kDG6I86OwLmAYe+bvJjiQ== +postcss-discard-comments@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.3.tgz#9c414e8ee99d3514ad06a3465ccc20ec1dbce780" + integrity sha512-q6fjd4WU4afNhWOA2WltHgCbkRhZPgQe7cXF74fuVB/ge4QbM9HEaOIzGSiMvM+g/cOsNAUGdf2JDzqA2F8iLA== dependencies: - postcss-selector-parser "^6.1.1" + postcss-selector-parser "^6.1.2" postcss-discard-duplicates@^7.0.1: version "7.0.1" @@ -15639,23 +15639,23 @@ postcss-media-query-parser@^0.2.3: resolved "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz" integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= -postcss-merge-longhand@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-7.0.3.tgz#cb31d8f2381dccf560c0454ce565f0dd0cfbd366" - integrity sha512-8waYomFxshdv6M9Em3QRM9MettRLDRcH2JQi2l0Z1KlYD/vhal3gbkeSES0NuACXOlZBB0V/B0AseHZaklzWOA== +postcss-merge-longhand@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-7.0.4.tgz#a52d0662b4b29420f3b64a8d5b0ac5133d8db776" + integrity sha512-zer1KoZA54Q8RVHKOY5vMke0cCdNxMP3KBfDerjH/BYHh4nCIh+1Yy0t1pAEQF18ac/4z3OFclO+ZVH8azjR4A== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^7.0.3" + stylehacks "^7.0.4" -postcss-merge-rules@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-7.0.3.tgz#2340495eba01aff0dc98d92ce9433167e39b4616" - integrity sha512-2eSas2p3voPxNfdI5sQrvIkMaeUHpVc3EezgVs18hz/wRTQAC9U99tp9j3W5Jx9/L3qHkEDvizEx/LdnmumIvQ== +postcss-merge-rules@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-7.0.4.tgz#648cc864d3121e6ec72c2a4f08df1cc801e60ce8" + integrity sha512-ZsaamiMVu7uBYsIdGtKJ64PkcQt6Pcpep/uO90EpLS3dxJi6OXamIobTYcImyXGoW0Wpugh7DSD3XzxZS9JCPg== dependencies: browserslist "^4.23.3" caniuse-api "^3.0.0" cssnano-utils "^5.0.0" - postcss-selector-parser "^6.1.1" + postcss-selector-parser "^6.1.2" postcss-minify-font-values@^7.0.0: version "7.0.0" @@ -15682,13 +15682,13 @@ postcss-minify-params@^7.0.2: cssnano-utils "^5.0.0" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-7.0.3.tgz#355ef9cc2136b62398b8c2521cb26efc16b070cc" - integrity sha512-SxTgUQSgBk6wEqzQZKEv1xQYIp9UBju6no9q+npohzSdhuSICQdkqmD1UMKkZWItS3olJSJMDDEY9WOJ5oGJew== +postcss-minify-selectors@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-7.0.4.tgz#2b69c99ec48a1c223fce4840609d9c53340a11f5" + integrity sha512-JG55VADcNb4xFCf75hXkzc1rNeURhlo7ugf6JjiiKRfMsKlDzN9CXHZDyiG6x/zGchpjQS+UAgb1d4nqXqOpmA== dependencies: cssesc "^3.0.0" - postcss-selector-parser "^6.1.1" + postcss-selector-parser "^6.1.2" postcss-modules-extract-imports@^2.0.0: version "2.0.0" @@ -15880,12 +15880,12 @@ postcss-svgo@^7.0.1: postcss-value-parser "^4.2.0" svgo "^3.3.2" -postcss-unique-selectors@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-7.0.2.tgz#3e97445b3cd47701c7e457fafe60c76e39d12d4d" - integrity sha512-CjSam+7Vf8cflJQsHrMS0P2hmy9u0+n/P001kb5eAszLmhjMqrt/i5AqQuNFihhViwDvEAezqTmXqaYXL2ugMw== +postcss-unique-selectors@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-7.0.3.tgz#483fc11215b23d517d5d9bbe5833d9915619ca33" + integrity sha512-J+58u5Ic5T1QjP/LDV9g3Cx4CNOgB5vz+kM6+OxHHhFACdcDeKhBXjQmB7fnIZM12YSTvsL0Opwco83DmacW2g== dependencies: - postcss-selector-parser "^6.1.1" + postcss-selector-parser "^6.1.2" postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" @@ -18068,7 +18068,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18094,6 +18094,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" @@ -18257,7 +18266,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18285,6 +18294,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -18395,13 +18411,13 @@ style-to-object@0.3.0, style-to-object@^0.3.0: dependencies: inline-style-parser "0.1.1" -stylehacks@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-7.0.3.tgz#c661773377739e9282dc5347a300bd3539a63514" - integrity sha512-4DqtecvI/Nd+2BCvW9YEF6lhBN5UM50IJ1R3rnEAhBwbCKf4VehRf+uqvnVArnBayjYD/WtT3g0G/HSRxWfTRg== +stylehacks@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-7.0.4.tgz#9c21f7374f4bccc0082412b859b3c89d77d3277c" + integrity sha512-i4zfNrGMt9SB4xRK9L83rlsFCgdGANfeDAYacO1pkqcE7cRHPdWHwnKZVz7WY17Veq/FvyYsRAU++Ga+qDFIww== dependencies: browserslist "^4.23.3" - postcss-selector-parser "^6.1.1" + postcss-selector-parser "^6.1.2" stylelint-config-prettier@^9.0.5: version "9.0.5" @@ -20333,7 +20349,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -20368,6 +20384,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From c0f90c06697863776831ece7f3aa8aeaadcc7b2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:13:19 +0000 Subject: [PATCH 28/32] Bump eslint-plugin-react from 7.35.0 to 7.35.2 Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.35.0 to 7.35.2. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.35.0...v7.35.2) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index be63b33c33..3311464076 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-no-only-tests": "^3.3.0", "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-react": "^7.35.0", + "eslint-plugin-react": "^7.35.2", "eslint-plugin-react-hooks": "^4.6.2", "eslint-webpack-plugin": "^4.2.0", "glob": "^8.0.1", diff --git a/yarn.lock b/yarn.lock index 04f9456653..8a2129dcae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9729,10 +9729,10 @@ eslint-plugin-react-hooks@^4.6.2: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596" integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== -eslint-plugin-react@^7.35.0: - version "7.35.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41" - integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA== +eslint-plugin-react@^7.35.2: + version "7.35.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.2.tgz#d32500d3ec268656d5071918bfec78cfd8b070ed" + integrity sha512-Rbj2R9zwP2GYNcIak4xoAMV57hrBh3hTaR0k7hVjwCQgryE/pw5px4b13EYjduOI0hfXyZhwBxaGpOTbWSGzKQ== dependencies: array-includes "^3.1.8" array.prototype.findlast "^1.2.5" @@ -18068,7 +18068,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18094,6 +18094,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" @@ -18257,7 +18266,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18285,6 +18294,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -20333,7 +20349,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -20368,6 +20384,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 501aa1c1ec0cdae47657b9788812c66c0a0b0a41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:00:38 +0000 Subject: [PATCH 29/32] Bump concurrently from 8.2.2 to 9.0.0 Bumps [concurrently](https://github.com/open-cli-tools/concurrently) from 8.2.2 to 9.0.0. - [Release notes](https://github.com/open-cli-tools/concurrently/releases) - [Commits](https://github.com/open-cli-tools/concurrently/compare/v8.2.2...v9.0.0) --- 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 | 24 +++++------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 90459cd221..7fa2e04b3f 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "caniuse-lite": "^1.0.30001658", "change-case-all": "^2.1.0", "chokidar-cli": "^3.0.0", - "concurrently": "^8.2.2", + "concurrently": "^9.0.0", "core-js": "^3.38.1", "css-loader": "^7.1.2", "cssnano": "^7.0.6", diff --git a/yarn.lock b/yarn.lock index 4979285fc5..d867e73376 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1482,7 +1482,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.5.tgz#11edb98f8aeec529b82b211028177679144242db" integrity sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w== @@ -7805,17 +7805,15 @@ 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@^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== +concurrently@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.0.0.tgz#b74e85bfbed9b920c54128f8cf7f91f23cc19112" + integrity sha512-iAxbsDeUkn8E/4+QalT7T3WvlyTfmsoez+19lbbcsxZdOEMfBukd8LA30KYez2UR5xkKFzbcqXIZy5RisCbaxw== dependencies: chalk "^4.1.2" - date-fns "^2.30.0" lodash "^4.17.21" 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 "^17.7.2" @@ -8441,13 +8439,6 @@ 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.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.13, dayjs@^1.10.4, dayjs@^1.11.13: version "1.11.13" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c" @@ -17807,11 +17798,6 @@ 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: - 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" resolved "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz" From 800a2598ce2867195b437a59a8de2dc6bf1f1b7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:00:41 +0000 Subject: [PATCH 30/32] Bump postcss from 8.4.43 to 8.4.45 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.43 to 8.4.45. - [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.43...8.4.45) --- 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 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 90459cd221..a467bac828 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "mutationobserver-shim": "^0.3.7", "nyc": "^17.0.0", "orval": "^6.26.0", - "postcss": "^8.4.43", + "postcss": "^8.4.45", "postcss-cli": "^11.0.0", "postcss-loader": "^8.1.1", "postcss-scss": "^4.0.9", @@ -176,6 +176,6 @@ "unfetch": "^4.2.0" }, "peerDependencies": { - "postcss": "^8.4.43" + "postcss": "^8.4.45" } } diff --git a/yarn.lock b/yarn.lock index 4979285fc5..400b899a14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15895,10 +15895,10 @@ 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.33, postcss@^8.4.43: - version "8.4.43" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.43.tgz#a5ddf22f4cc38e64c6ae030182b43e539d316419" - integrity sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ== +postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.33, postcss@^8.4.45: + version "8.4.45" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.45.tgz#538d13d89a16ef71edbf75d895284ae06b79e603" + integrity sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q== dependencies: nanoid "^3.3.7" picocolors "^1.0.1" From 7c860a4141f764418f1e87974447243caa07b444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:01:25 +0000 Subject: [PATCH 31/32] Bump sass from 1.77.8 to 1.78.0 Bumps [sass](https://github.com/sass/dart-sass) from 1.77.8 to 1.78.0. - [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.77.8...1.78.0) --- updated-dependencies: - dependency-name: sass 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 90459cd221..22a7d1fbdb 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "postcss-scss": "^4.0.9", "prettier": "^2.6.2", "replace-in-file": "^6.3.2", - "sass": "^1.77.8", + "sass": "^1.78.0", "source-map-support": "^0.5.21", "style-loader": "^4.0.0", "stylelint": "^15.11.0", diff --git a/yarn.lock b/yarn.lock index 4979285fc5..0755ff1f3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17263,10 +17263,10 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass@^1.69.5, sass@^1.77.8: - version "1.77.8" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd" - integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ== +sass@^1.69.5, sass@^1.78.0: + version "1.78.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.78.0.tgz#cef369b2f9dc21ea1d2cf22c979f52365da60841" + integrity sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From fe1e836701dfd69b39f901d60bedbbc6156d3231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Garn=C3=A6s?= Date: Tue, 10 Sep 2024 15:33:39 +0200 Subject: [PATCH 32/32] Use release 2024.37.0 of the design system --- package.json | 2 +- yarn.lock | 39 +++++++-------------------------------- 2 files changed, 8 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 382c94b755..ad084ba718 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "prop-types": "Since we use former ddb-react components that depend on prop-types we keep this. Should be removed when usage of prop-types is deprecated." }, "dependencies": { - "@danskernesdigitalebibliotek/dpl-design-system": "^2024.36.0-b82b94df2d6d6d798fa5c695a2622133b60cd16d", + "@danskernesdigitalebibliotek/dpl-design-system": "^2024.37.0-d007a043185fe27649dc16ba7d4996eab9ee1caf", "@fullcalendar/core": "^6.1.15", "@fullcalendar/daygrid": "^6.1.15", "@fullcalendar/interaction": "^6.1.15", diff --git a/yarn.lock b/yarn.lock index cef991264a..67b0a344ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1688,10 +1688,10 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@danskernesdigitalebibliotek/dpl-design-system@^2024.36.0-b82b94df2d6d6d798fa5c695a2622133b60cd16d": - version "2024.36.0-b82b94df2d6d6d798fa5c695a2622133b60cd16d" - resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/2024.36.0-b82b94df2d6d6d798fa5c695a2622133b60cd16d/4946b84d20cc004a6083dcd50e2660bfbfa7af1c#4946b84d20cc004a6083dcd50e2660bfbfa7af1c" - integrity sha512-lxL8aRD+NyrKDqzk45NjTBHGkfTpU+AyKgAdv6EQXXuslXq058NBckkutQnqgWi+aDmpeBM1UKGiXBLJdljNnw== +"@danskernesdigitalebibliotek/dpl-design-system@^2024.37.0-d007a043185fe27649dc16ba7d4996eab9ee1caf": + version "2024.37.0-d007a043185fe27649dc16ba7d4996eab9ee1caf" + resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/2024.37.0-d007a043185fe27649dc16ba7d4996eab9ee1caf/cfccb64463628af68609995d38f1c787a4c68358#cfccb64463628af68609995d38f1c787a4c68358" + integrity sha512-jUmeqghVDeKchRXNHf9PsViwiGpiawF8eMYVJ4ugEDJRa2X8ubazChlI/MrW4O5O3nHIVIdxvbW1C6FRnATQ7w== "@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@^0.5.3": version "0.5.7" @@ -18055,7 +18055,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18081,15 +18081,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" @@ -18253,7 +18244,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18281,13 +18272,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -20336,7 +20320,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -20371,15 +20355,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"