From e3e20a7d5e06d24e45660750ac0ad21bcd11bcc6 Mon Sep 17 00:00:00 2001 From: Georges Lebreton Date: Tue, 27 Jun 2023 12:29:15 +0100 Subject: [PATCH 001/147] initial work on moving discussion-rendering into dcr and removing package import Co-authored-by: Jamie Byers --- dotcom-rendering/package.json | 1 - .../src/components/Discussion.tsx | 4 +- .../src/discussion-rendering/App.stories.tsx | 281 ++++ .../src/discussion-rendering/App.test.tsx | 39 + .../src/discussion-rendering/App.tsx | 604 +++++++++ .../AbuseReportForm.stories.tsx | 23 + .../AbuseReportForm/AbuseReportForm.test.tsx | 74 + .../AbuseReportForm/AbuseReportForm.tsx | 306 +++++ .../components/Avatar/Avatar.stories.tsx | 35 + .../components/Avatar/Avatar.tsx | 35 + .../components/Badges/Badges.tsx | 81 ++ .../components/Column/Column.tsx | 14 + .../components/Comment/Comment.stories.tsx | 472 +++++++ .../components/Comment/Comment.tsx | 812 +++++++++++ .../CommentContainer.stories.tsx | 256 ++++ .../CommentContainer.test.tsx | 195 +++ .../CommentContainer/CommentContainer.tsx | 234 ++++ .../CommentForm/CommentForm.stories.tsx | 100 ++ .../components/CommentForm/CommentForm.tsx | 557 ++++++++ .../CommentReplyPreview.stories.tsx | 101 ++ .../CommentReplyPreview.tsx | 204 +++ .../components/Dropdown/Dropdown.stories.tsx | 122 ++ .../components/Dropdown/Dropdown.test.tsx | 155 +++ .../components/Dropdown/Dropdown.tsx | 225 ++++ .../components/Filters/Filters.stories.tsx | 24 + .../components/Filters/Filters.tsx | 153 +++ .../FirstCommentWelcome.stories.tsx | 25 + .../FirstCommentWelcome.tsx | 161 +++ .../LoadingComments.stories.tsx | 6 + .../LoadingComments/LoadingComments.tsx | 87 ++ .../LoadingPicks/LoadingPicks.stories.tsx | 6 + .../components/LoadingPicks/LoadingPicks.tsx | 116 ++ .../Pagination/Pagination.stories.tsx | 196 +++ .../components/Pagination/Pagination.test.tsx | 59 + .../components/Pagination/Pagination.tsx | 313 +++++ .../PillarButton/PillarButton.stories.tsx | 258 ++++ .../components/PillarButton/PillarButton.tsx | 109 ++ .../components/Preview/Preview.stories.tsx | 28 + .../components/Preview/Preview.tsx | 69 + .../RecommendationCount.stories.tsx | 43 + .../RecommendationCount.tsx | 85 ++ .../components/Row/Row.tsx | 14 + .../Timestamp/Timestamp.stories.tsx | 45 + .../components/Timestamp/Timestamp.tsx | 57 + .../components/TopPick/TopPick.stories.tsx | 143 ++ .../components/TopPick/TopPick.tsx | 255 ++++ .../components/TopPicks/TopPicks.stories.tsx | 95 ++ .../components/TopPicks/TopPicks.tsx | 117 ++ .../discussion-rendering/discussionTypes.ts | 175 +++ .../discussion-rendering/fixtures/comment.ts | 159 +++ .../fixtures/discussion.ts | 1186 +++++++++++++++++ .../fixtures/discussionWithNoComments.ts | 21 + .../fixtures/discussionWithTwoComments.ts | 66 + .../legacyDiscussionWithoutThreading.ts | 971 ++++++++++++++ .../fixtures/noTopPicks.ts | 21 + .../discussion-rendering/fixtures/topPicks.ts | 70 + .../src/discussion-rendering/lib/api.tsx | 345 +++++ .../discussion-rendering/lib/dateFormatter.ts | 36 + .../lib/identity-component-event.test.ts | 9 + .../lib/identity-component-event.ts | 8 + .../src/discussion-rendering/lib/joinUrl.ts | 19 + .../lib/mockFetchCalls.ts | 169 +++ .../src/discussion-rendering/lib/palette.ts | 17 + .../discussion-rendering/lib/pillarToEnum.ts | 20 + .../lib/pillarToString.ts | 22 + .../src/discussion-rendering/lib/reducer.ts | 134 ++ .../lib/simulateNewComment.ts | 51 + .../discussion-rendering/lib/useInterval.ts | 24 + .../src/discussion-rendering/test-page.tsx | 119 ++ yarn.lock | 7 +- 70 files changed, 11035 insertions(+), 8 deletions(-) create mode 100644 dotcom-rendering/src/discussion-rendering/App.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/App.test.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/App.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Badges/Badges.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Comment/Comment.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/CommentReplyPreview/CommentReplyPreview.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/CommentReplyPreview/CommentReplyPreview.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.test.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Filters/Filters.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Filters/Filters.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/FirstCommentWelcome/FirstCommentWelcome.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/FirstCommentWelcome/FirstCommentWelcome.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Pagination/Pagination.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Pagination/Pagination.test.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Pagination/Pagination.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/PillarButton/PillarButton.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/PillarButton/PillarButton.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Preview/Preview.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/RecommendationCount/RecommendationCount.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/RecommendationCount/RecommendationCount.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Row/Row.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Timestamp/Timestamp.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/Timestamp/Timestamp.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/TopPick/TopPick.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/TopPick/TopPick.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/TopPicks/TopPicks.stories.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/components/TopPicks/TopPicks.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/discussionTypes.ts create mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/comment.ts create mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/discussion.ts create mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/discussionWithNoComments.ts create mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/discussionWithTwoComments.ts create mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/legacyDiscussionWithoutThreading.ts create mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/noTopPicks.ts create mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/topPicks.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/api.tsx create mode 100644 dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/identity-component-event.test.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/identity-component-event.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/joinUrl.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/palette.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/pillarToEnum.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/pillarToString.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/reducer.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/simulateNewComment.ts create mode 100644 dotcom-rendering/src/discussion-rendering/lib/useInterval.ts create mode 100644 dotcom-rendering/src/discussion-rendering/test-page.tsx diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index 0b6100337bc..fbb021b76ed 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -70,7 +70,6 @@ "@guardian/commercial": "10.1.0", "@guardian/consent-management-platform": "13.5.0", "@guardian/core-web-vitals": "4.0.0", - "@guardian/discussion-rendering": "14.0.0", "@guardian/eslint-config": "3.0.0", "@guardian/eslint-config-typescript": "5.0.0", "@guardian/eslint-plugin-source-react-components": "14.0.0", diff --git a/dotcom-rendering/src/components/Discussion.tsx b/dotcom-rendering/src/components/Discussion.tsx index 117e7b60dc1..46301190b10 100644 --- a/dotcom-rendering/src/components/Discussion.tsx +++ b/dotcom-rendering/src/components/Discussion.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; -import { App as Comments } from '@guardian/discussion-rendering'; import { joinUrl } from '@guardian/libs'; import { neutral, space } from '@guardian/source-foundations'; import { SvgPlus } from '@guardian/source-react-components'; import { EditorialButton } from '@guardian/source-react-components-development-kitchen'; import { useEffect, useState } from 'react'; +import { App as Comments } from '../discussion-rendering/App'; import { decidePalette } from '../lib/decidePalette'; import { getCommentContext } from '../lib/getCommentContext'; import { revealStyles } from '../lib/revealStyles'; @@ -145,6 +145,7 @@ export const Discussion = ({ } }, [commentCount]); + const test = 'foo'; return ( <>
{!isExpanded && (
diff --git a/dotcom-rendering/src/discussion-rendering/App.stories.tsx b/dotcom-rendering/src/discussion-rendering/App.stories.tsx new file mode 100644 index 00000000000..4e2042bceec --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/App.stories.tsx @@ -0,0 +1,281 @@ +import { css } from '@emotion/react'; +import { ArticlePillar } from '@guardian/libs'; +import { App } from './App'; +import { UserProfile } from './discussionTypes'; + +export default { component: App, title: 'App' }; + +const aUser: UserProfile = { + userId: 'abc123', + displayName: 'Jane Smith', + webUrl: '', + apiUrl: '', + avatar: '', + secureAvatarUrl: '', + badge: [], + privateFields: { + canPostComment: true, + isPremoderated: false, + hasCommented: true, + }, +}; + +export const LoggedOutHiddenPicks = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +LoggedOutHiddenPicks.storyName = 'when logged out, unexpanded and with picks'; + +export const InitialPage = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +InitialPage.storyName = 'with initial page set to 3'; + +export const Overrides = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +Overrides.storyName = 'with page size overridden to 50'; + +export const LoggedInHiddenNoPicks = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +LoggedInHiddenNoPicks.storyName = + 'when logged in, with no picks and not expanded'; + +export const LoggedIn = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +LoggedIn.storyName = 'when logged in and expanded'; + +export const LoggedInShortDiscussion = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +LoggedInShortDiscussion.storyName = 'when logged in but only wo comments made'; + +export const LoggedOutHiddenNoPicks = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +LoggedOutHiddenNoPicks.storyName = + 'when logged out, with no picks and not expanded'; + +export const Closed = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +Closed.storyName = 'Logged in but closed for comments'; + +export const NoComments = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +NoComments.storyName = 'when no comments have been made'; + +export const LegacyDiscussion = () => ( +
+ {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + /> +
+); +LegacyDiscussion.storyName = "a legacy discussion that doesn't allow threading"; diff --git a/dotcom-rendering/src/discussion-rendering/App.test.tsx b/dotcom-rendering/src/discussion-rendering/App.test.tsx new file mode 100644 index 00000000000..d6b6e4f2110 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/App.test.tsx @@ -0,0 +1,39 @@ +import '@testing-library/jest-dom/extend-expect'; +import { ArticlePillar } from '@guardian/libs'; +import { + render, + screen, + waitForElementToBeRemoved, +} from '@testing-library/react'; +import { App } from './App'; +import { mockFetchCalls } from './lib/mockFetchCalls'; + +mockFetchCalls(); + +describe('App', () => { + it('should not render the comment form if user is logged out', async () => { + render( + {}} + apiKey="" + idApiUrl="https://idapi.theguardian.com" + />, + ); + + await waitForElementToBeRemoved(() => + screen.getByTestId('loading-comments'), + ); + + expect(screen.queryAllByText('jamesgorrie').length).toBeGreaterThan(0); + expect(screen.queryByPlaceholderText('Join the discussion')).toBeNull(); + }); +}); diff --git a/dotcom-rendering/src/discussion-rendering/App.tsx b/dotcom-rendering/src/discussion-rendering/App.tsx new file mode 100644 index 00000000000..85a20d84941 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/App.tsx @@ -0,0 +1,604 @@ +import { css } from '@emotion/react'; +import type { ArticleTheme } from '@guardian/libs'; +import { neutral, space, textSans } from '@guardian/source-foundations'; +import { useEffect, useState } from 'react'; +import { CommentContainer } from './components/CommentContainer/CommentContainer'; +import { CommentForm } from './components/CommentForm/CommentForm'; +import { Filters } from './components/Filters/Filters'; +import { LoadingComments } from './components/LoadingComments/LoadingComments'; +import { Pagination } from './components/Pagination/Pagination'; +import { TopPicks } from './components/TopPicks/TopPicks'; +import type { + AdditionalHeadersType, + CommentResponse, + CommentType, + FilterOptions, + OrderByType, + PageSizeType, + ThreadsType, + UserProfile, +} from './discussionTypes'; +import { getDiscussion, getPicks, initialiseApi } from './lib/api'; + +type Props = { + shortUrl: string; + baseUrl: string; + pillar: ArticleTheme; + isClosedForComments: boolean; + commentToScrollTo?: number; + initialPage?: number; + pageSizeOverride?: PageSizeType; + orderByOverride?: OrderByType; + user?: UserProfile; + additionalHeaders: AdditionalHeadersType; + expanded: boolean; + onPermalinkClick: (commentId: number) => void; + apiKey: string; + onRecommend?: (commentId: number) => Promise; + onComment?: (shortUrl: string, body: string) => Promise; + onReply?: ( + shortUrl: string, + body: string, + parentCommentId: number, + ) => Promise; + onPreview?: (body: string) => Promise; + onExpand?: () => void; + idApiUrl: string; + test: string; +}; + +const footerStyles = css` + display: flex; + justify-content: flex-end; +`; + +const commentColumnWrapperStyles = css` + display: flex; + flex-direction: column; + max-width: 100%; +`; + +const commentContainerStyles = css` + display: flex; + flex-direction: column; + list-style-type: none; + padding-left: 0; + margin: 0; +`; + +const picksWrapper = css` + display: flex; + flex-wrap: wrap; + justify-content: space-between; +`; + +const DEFAULT_FILTERS: FilterOptions = { + orderBy: 'newest', + pageSize: 100, + threads: 'collapsed', +}; + +const NoComments = () => ( +
+ No comments found +
+); + +const rememberFilters = (filtersToRemember: FilterOptions) => { + try { + localStorage.setItem( + 'gu.prefs.discussion.threading', + JSON.stringify({ value: filtersToRemember.threads }), + ); + localStorage.setItem( + 'gu.prefs.discussion.pagesize', + JSON.stringify({ value: filtersToRemember.pageSize }), + ); + localStorage.setItem( + 'gu.prefs.discussion.order', + JSON.stringify({ value: filtersToRemember.orderBy }), + ); + } catch (error) { + // Sometimes it's not possible to access localStorage, we accept this and don't want to + // capture these errors + } +}; + +const initialiseFilters = ({ + pageSizeOverride, + orderByOverride, + permalinkBeingUsed, + isClosedForComments, +}: { + pageSizeOverride?: PageSizeType; + orderByOverride?: OrderByType; + permalinkBeingUsed: boolean; + isClosedForComments: boolean; +}) => { + const initialisedFilters = initFiltersFromLocalStorage({ + isClosedForComments, + }); + return { + ...initialisedFilters, + // Override if prop given + pageSize: pageSizeOverride ?? initialisedFilters.pageSize, + orderBy: orderByOverride ?? initialisedFilters.orderBy, + threads: + initialisedFilters.threads === 'collapsed' && permalinkBeingUsed + ? 'expanded' + : initialisedFilters.threads, + }; +}; + +const initFiltersFromLocalStorage = ({ + isClosedForComments, +}: { + isClosedForComments: boolean; +}): FilterOptions => { + let threads; + let pageSize; + let orderBy; + + try { + // Try to read from local storage + orderBy = localStorage.getItem('gu.prefs.discussion.order'); + threads = localStorage.getItem('gu.prefs.discussion.threading'); + pageSize = localStorage.getItem('gu.prefs.discussion.pagesize'); + } catch (error) { + return { + ...DEFAULT_FILTERS, + orderBy: decideDefaultOrderBy(isClosedForComments), + }; + } + + function checkPageSize(size: any): PageSizeType { + // This function handles the fact that some readers have legacy values + // stored in the browsers + if (!size) return DEFAULT_FILTERS.pageSize; // Default + if (size === 'All') return DEFAULT_FILTERS.pageSize; // Convert 'All' to default + const supportedSizes: PageSizeType[] = [25, 50, 100]; + if (!supportedSizes.includes(size)) return DEFAULT_FILTERS.pageSize; // Convert anything else to default + return size; // size is acceptable + } + + function decideDefaultOrderBy(isClosedForComment: boolean): OrderByType { + return isClosedForComments ? 'oldest' : 'newest'; + } + + // If we found something in LS, use it, otherwise return defaults + //todo: stop typecasting these and parse these properly instead + return { + orderBy: orderBy + ? (JSON.parse(orderBy) as { value: OrderByType }).value + : decideDefaultOrderBy(isClosedForComments), + threads: threads + ? (JSON.parse(threads) as { value: ThreadsType }).value + : DEFAULT_FILTERS.threads, + pageSize: pageSize + ? checkPageSize( + (JSON.parse(pageSize) as { value: ThreadsType }).value, + ) + : DEFAULT_FILTERS.pageSize, + }; +}; + +const readMutes = (): string[] => { + let mutes; + try { + // Try to read from local storage + mutes = localStorage.getItem('gu.prefs.discussion.mutes'); + } catch (error) { + return []; + } + + return mutes ? (JSON.parse(mutes) as { value: string[] }).value : []; +}; + +const writeMutes = (mutes: string[]) => { + try { + localStorage.setItem( + 'gu.prefs.discussion.mutes', + JSON.stringify({ value: mutes }), + ); + } catch (error) { + // Sometimes it's not possible to access localStorage, we accept this and don't want to + // capture these errors + } +}; + +export const App = ({ + baseUrl, + shortUrl, + pillar, + isClosedForComments, + initialPage, + commentToScrollTo, + pageSizeOverride, + orderByOverride, + user, + additionalHeaders, + expanded, + onPermalinkClick, + apiKey, + onRecommend, + onComment, + onReply, + onPreview, + onExpand, + idApiUrl, + test, +}: Props) => { + const [filters, setFilters] = useState( + initialiseFilters({ + pageSizeOverride, + orderByOverride, + permalinkBeingUsed: + commentToScrollTo !== undefined && + !Number.isNaN(commentToScrollTo), + isClosedForComments, + }), + ); + const [isExpanded, setIsExpanded] = useState( + expanded || window.location.hash === '#comments', + ); + const [loading, setLoading] = useState(true); + const [loadingMore, setLoadingMore] = useState(false); + const [totalPages, setTotalPages] = useState(0); + const [page, setPage] = useState(initialPage ?? 1); + const [picks, setPicks] = useState([]); + const [commentBeingRepliedTo, setCommentBeingRepliedTo] = + useState(); + const [comments, setComments] = useState([]); + const [numberOfCommentsToShow, setNumberOfCommentsToShow] = + useState(10); + const [commentCount, setCommentCount] = useState(0); + const [mutes, setMutes] = useState(readMutes()); + + useEffect(() => { + if (isExpanded) { + // We want react to complete the current work and render, without trying to batch this update + // before resetting the number of comments + // to the total comment amount. + // This allows a quick render of minimal comments and then immediately begin rendering + // the remaining comments. + const timer = setTimeout(() => { + setNumberOfCommentsToShow(comments.length); + setLoadingMore(false); + }, 0); + return () => clearTimeout(timer); + } else return; + }, [isExpanded, comments.length]); + + useEffect(() => { + // We need this use effect to capture any changes in the expanded prop. This is typicallly + // seen when clicking permalinks + setIsExpanded(expanded); + }, [expanded]); + + useEffect(() => { + setLoading(true); + //todo: come back and handle the error case + void getDiscussion(shortUrl, { ...filters, page }).then((json) => { + setLoading(false); + setLoadingMore(true); + if (json && json.status !== 'error') { + setComments( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- we'll come back and fix this by properly parsing the json + json?.discussion?.comments, + ); + setCommentCount( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- we'll come back and fix this by properly parsing the json + json?.discussion?.topLevelCommentCount, + ); + } + //todo: come back and parse this properly (apologies for the horribleness) + setTotalPages(json?.pages as number); + }); + }, [filters, page, shortUrl]); + + //todo: parse this properly + useEffect(() => { + const fetchPicks = async () => { + const json = await getPicks(shortUrl); + if (json !== undefined) { + setPicks(json); + } + }; + void fetchPicks(); + }, [shortUrl]); + + // If these override props are updated we want to respect them + useEffect(() => { + setFilters((oldFilters) => { + return { + ...oldFilters, + orderBy: orderByOverride ? orderByOverride : oldFilters.orderBy, + pageSize: pageSizeOverride + ? pageSizeOverride + : oldFilters.pageSize, + }; + }); + }, [pageSizeOverride, orderByOverride]); + + // Keep initialPage prop in sync with page + useEffect(() => { + if (initialPage !== undefined) setPage(initialPage); + // We added commentToScrollTo to the deps here because the initialPage alone wasn't triggered the effect + // and we want to ensure the discussion rerenders with the right page when the reader clicks Jump To Comment + // for a comment on a different page + }, [initialPage, commentToScrollTo]); + + // Check if there is a comment to scroll to and if + // so, scroll to the div with this id. + // We need to do this in javascript like this because the comments list isn't + // loaded on the inital page load and only gets added to the dom later, after + // an api call is made. + useEffect(() => { + if (commentToScrollTo !== undefined) { + const commentElement = document.getElementById( + `comment-${commentToScrollTo}`, + ); + commentElement?.scrollIntoView(); + } + }, [comments, commentToScrollTo]); // Add comments to deps so we rerun this effect when comments are loaded + + const onFilterChange = (newFilterObject: FilterOptions) => { + // If we're reducing the pageSize then we may need to override the page we're on to prevent making + // requests for pages that don't exist. + // E.g. If we used to have 102 comments and a pageSize of 25 then the current page could be 5 (showing 2 + // comments). If we then change pageSize to be 50 then there is no longer a page 5 and trying to ask for it + // from the api would return an error so, in order to respect the readers desire to be on the last page, we + // need to work out the maximum page possible and use that instead. + let maxPagePossible = Math.floor( + commentCount / newFilterObject.pageSize, + ); + // Add 1 if there is a remainder + if (commentCount % newFilterObject.pageSize) { + maxPagePossible = maxPagePossible + 1; + } + // Check + if (page > maxPagePossible) setPage(maxPagePossible); + + rememberFilters(newFilterObject); + // Filters also show when the view is not expanded but we want to expand when they're changed + setIsExpanded(true); + onExpand?.(); + setFilters(newFilterObject); + }; + + const onPageChange = (pageNumber: number) => { + // Pagination also show when the view is not expanded so we want to expand when clicked + setIsExpanded(true); + const element = document.getElementById('comment-filters'); + element?.scrollIntoView(); + setPage(pageNumber); + }; + + const toggleMuteStatus = (userId: string) => { + let updatedMutes; + if (mutes.includes(userId)) { + // Already muted, unmute them + updatedMutes = mutes.filter((id) => id !== userId); + } else { + // Add this user to our list of mutes + updatedMutes = [...mutes, userId]; + } + // Update local state + setMutes(updatedMutes); + // Remember these new values + writeMutes(updatedMutes); + }; + + const onAddComment = (comment: CommentType) => { + comments.pop(); // Remove last item from our local array + // Replace it with this new comment at the start + setComments([comment, ...comments]); + + if (!isExpanded) { + // It's possible to post a comment without the view being expanded + setIsExpanded(true); + if (typeof onExpand === 'function') onExpand(); + } + + const commentElement = document.getElementById(`comment-${comment.id}`); + commentElement?.scrollIntoView(); + }; + + initialiseApi({ additionalHeaders, baseUrl, apiKey, idApiUrl }); + + const showPagination = totalPages > 1; + + if (!isExpanded && loading) { + return ; + } + + if (!isExpanded) { + return ( + <> +
+ {picks.length !== 0 ? ( +
+ +
+ ) : ( + <> + + {showPagination && ( + { + onPageChange(newPage); + }} + commentCount={commentCount} + filters={filters} + /> + )} + {!comments.length ? ( + + ) : ( +
    + {comments.slice(0, 2).map((comment) => ( +
  • + +
    • + ))} +
+ )} + + )} +
+ + ); + } + + return ( + <> +
{test}
+
+ {user && !isClosedForComments && ( + + )} + {!!picks.length && ( + + )} + + {showPagination && ( + { + onPageChange(newPage); + }} + commentCount={commentCount} + filters={filters} + /> + )} + {loading ? ( + + ) : !comments.length ? ( + + ) : ( +
    + {comments + .slice(0, numberOfCommentsToShow) + .map((comment) => ( +
  • + +
    • + ))} +
+ )} + {loadingMore && } + {showPagination && ( +
+ { + onPageChange(newPage); + }} + commentCount={commentCount} + filters={filters} + /> +
+ )} + {user && !isClosedForComments && comments.length > 10 && ( + + )} +
+ + ); +}; diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.stories.tsx new file mode 100644 index 00000000000..58f0950b97f --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.stories.tsx @@ -0,0 +1,23 @@ +import { css } from '@emotion/react'; +import { ArticlePillar } from '@guardian/libs'; +import { AbuseReportForm } from './AbuseReportForm'; + +export default { title: 'Abuse Report Form' }; + +const wrapperStyles = css` + padding: 20px; + height: 300px; + width: 400px; + background-color: blue; + position: relative; +`; + +export const Dialog = () => ( +
+ {}} + pillar={ArticlePillar.Sport} + commentId={123} + /> +
+); diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx new file mode 100644 index 00000000000..267ee9fe40c --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx @@ -0,0 +1,74 @@ +import '@testing-library/jest-dom/extend-expect'; + +import { ArticlePillar } from '@guardian/libs'; +import { + render, + fireEvent, + // @ts-expect-error : https://github.com/testing-library/react-testing-library/issues/610 + waitFor, +} from '@testing-library/react'; +import { mockFetchCalls } from '../../lib/mockFetchCalls'; +import { AbuseReportForm } from './AbuseReportForm'; + +const fetchMock = mockFetchCalls(); + +describe('Dropdown', () => { + it('Should show the expected label names', () => { + const { getByText } = render( + {}} + pillar={ArticlePillar.Sport} + commentId={123} + />, + ); + + expect(getByText('Category')).toBeInTheDocument(); + expect(getByText('Reason (optional)')).toBeInTheDocument(); + expect(getByText('Email (optional)')).toBeInTheDocument(); + }); + + it('Should show the category error message if not chosen on submit', () => { + const { getByText } = render( + {}} + pillar={ArticlePillar.Sport} + commentId={123} + />, + ); + + fireEvent.click(getByText('Report')); + expect( + getByText('You must select a category before submitting'), + ).toBeInTheDocument(); + }); + + it('Should show the success message category is selected', async () => { + const { getByText, getByLabelText, queryByText } = render( + {}} + pillar={ArticlePillar.Sport} + commentId={123} + />, + ); + + fireEvent.change(getByLabelText('Category'), { target: { value: 3 } }); + + fireEvent.click(getByText('Report')); + + const options: any = getByLabelText('Category'); + expect(options[1].selected).toBeFalsy(); + expect(options[3].selected).toBeTruthy(); + + expect( + queryByText('You must select a category before submitting'), + ).not.toBeInTheDocument(); + + await waitFor(() => { + expect(fetchMock.called(/reportAbuse/)).toBeTruthy(); + }); + + await waitFor(() => { + expect(getByText('Report submitted')).toBeInTheDocument(); + }); + }); +}); diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx new file mode 100644 index 00000000000..bb88cdc6636 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx @@ -0,0 +1,306 @@ +import { css } from '@emotion/react'; +import { ArticleTheme } from '@guardian/libs'; +import { neutral, space, textSans } from '@guardian/source-foundations'; +import { Button, SvgCross } from '@guardian/source-react-components'; +import { useEffect, useRef, useState } from 'react'; +import { reportAbuse } from '../../lib/api'; +import { palette } from '../../lib/palette'; +import { pillarToString } from '../../lib/pillarToString'; + +type formData = { + categoryId: number; + reason?: string; + email?: string; +}; + +const formWrapper = css` + z-index: 1; + border: 1px solid ${neutral[86]}; + position: absolute; + width: 300px; + top: 0; + right: 0; + display: flex; + flex-direction: column; + padding: ${space[3]}px; + background-color: white; + ${textSans.xxsmall()}; +`; + +const labelStyles = (pillar: ArticleTheme) => css` + color: ${palette[pillarToString(pillar)][400]}; + ${textSans.small({ fontWeight: 'bold' })} +`; + +const inputWrapper = css` + display: flex; + flex-direction: column; + margin-bottom: ${space[2]}px; + + label { + display: block; + } + + select, + input, + textarea { + min-height: ${space[5]}px; + width: 75%; + border: 1px solid ${neutral[86]}; + } +`; + +const errorMessageStyles = css` + color: red; +`; + +export const AbuseReportForm: React.FC<{ + commentId: number; + toggleSetShowForm: () => void; + pillar: ArticleTheme; +}> = ({ commentId, toggleSetShowForm, pillar }) => { + const modalRef = useRef(null); + // TODO: use ref once forwardRef is implemented @guardian/src-button + // We want to pull out the 1st and last elements of the form, and highlight the 1st element + let firstElement: HTMLSelectElement | null = null; + let lastElement: HTMLButtonElement | null = null; + useEffect(() => { + if (!modalRef.current) return; + // eslint-disable-next-line react-hooks/exhaustive-deps + firstElement = modalRef.current.querySelector( + 'select[name="category"]', + ); + // eslint-disable-next-line react-hooks/exhaustive-deps + lastElement = modalRef.current.querySelector( + 'button[custom-guardian="close-modal"]', + ); + }, [modalRef]); + // We want to highlight the 1st element when the modal is open + useEffect(() => { + firstElement && firstElement.focus(); + }, [firstElement]); + + // We want to make sure to close the modal when a user clicks away from the modal + useEffect(() => { + const closeOnClickAway = (e: MouseEvent) => { + if ( + modalRef.current && + !modalRef.current.contains(e.target as Node) + ) { + toggleSetShowForm(); + } + }; + document.addEventListener('mousedown', closeOnClickAway); + }, [modalRef, toggleSetShowForm]); + + // We want to listen to keydown events for accessibility + useEffect(() => { + const keyListener = (e: KeyboardEvent) => { + if (e.keyCode === 27) { + toggleSetShowForm(); + } else if (e.keyCode === 9) { + // If firstElement or lastElement are not defined, do not continue + if (!firstElement || !lastElement) return; + + // we use `e.shiftKey` internally to determin the direction of the highlighting + // using document.activeElement and e.shiftKey we can check what should be the next element to be highlighted + if (!e.shiftKey && document.activeElement === lastElement) { + firstElement && firstElement.focus(); + e.preventDefault(); + } + + if (e.shiftKey && document.activeElement === firstElement) { + lastElement && lastElement.focus(); // The shift key is down so loop focus back to the last item + e.preventDefault(); + } + } + }; + document.addEventListener('keydown', keyListener); + return () => document.removeEventListener('keydown', keyListener); + }); + + const [formVariables, setFormVariables] = useState({ + categoryId: 0, + reason: '', + email: '', + }); + + const defaultErrorTexts = { + categoryId: '', + reason: '', + email: '', + response: '', + }; + const [errors, setErrors] = useState(defaultErrorTexts); + const [successMessage, setSuccessMessage] = useState(); + const onSubmit = async (event: React.FormEvent) => { + event.preventDefault(); + + const { categoryId, reason, email } = formVariables; + + // Reset error messages + setErrors(defaultErrorTexts); + + // Error validation + if (!categoryId) { + setErrors({ + ...errors, + categoryId: 'You must select a category before submitting', + }); + + return; + } + const response = await reportAbuse({ + categoryId, + reason, + email, + commentId, + }); + if (response.status !== 'ok') { + // Fallback to errors returned from the API + setErrors({ ...errors, response: response.message }); + } else { + setSuccessMessage('Report submitted'); + } + }; + + const labelStylesClass = labelStyles(pillar); + return ( +
+
+
+ + + {!!errors.categoryId && ( + + {errors.categoryId} + + )} +
+ +
+ + + {!!errors.reason && ( + {errors.reason} + )} +
+ +
+ + ) => + setFormVariables({ + ...formVariables, + email: e.target.value, + }) + } + value={formVariables.email} + > + {!!errors.email && ( + {errors.email} + )} +
+ +
+ + + {!!errors.response && ( + + {errors.response} + + )} + + {!!successMessage && ( + + {successMessage} + + )} +
+
+ +
+
+
+ ); +}; diff --git a/dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.stories.tsx new file mode 100644 index 00000000000..50ec1499dcf --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.stories.tsx @@ -0,0 +1,35 @@ +import { Avatar } from './Avatar'; + +export default { component: Avatar, title: 'Avatar' }; + +export const Sizes = () => { + return ( + <> + + + + + ); +}; +Sizes.storyName = 'different sizes'; + +export const NoImage = () => { + return ( + <> + + + ); +}; +NoImage.storyName = 'with no image url given'; diff --git a/dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.tsx b/dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.tsx new file mode 100644 index 00000000000..7952a7662cf --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/Avatar/Avatar.tsx @@ -0,0 +1,35 @@ +import { css } from '@emotion/react'; + +type Props = { + imageUrl?: string; + displayName: string; + size: 'small' | 'medium' | 'large'; +}; + +const imageStyles = (size: number) => css` + border-radius: ${size + 10}px; + width: ${size}px; + height: ${size}px; +`; + +export const Avatar = ({ + imageUrl = 'https://avatar.guim.co.uk/no-user-image.gif', + displayName, + size, +}: Props) => { + switch (size) { + case 'small': + return ( + {displayName} + ); + case 'large': + return ( + {displayName} + ); + case 'medium': + default: + return ( + {displayName} + ); + } +}; diff --git a/dotcom-rendering/src/discussion-rendering/components/Badges/Badges.tsx b/dotcom-rendering/src/discussion-rendering/components/Badges/Badges.tsx new file mode 100644 index 00000000000..931e9f86ae0 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/Badges/Badges.tsx @@ -0,0 +1,81 @@ +import { css } from '@emotion/react'; +import { brand, neutral, space, textSans } from '@guardian/source-foundations'; + +const staffBadge = css` + display: flex; + flex-direction: row; + align-items: center; +`; + +const iconStyles = css` + display: inline-block; + width: 15px; + height: 15px; +`; + +const labelText = css` + display: inline-block; + line-height: 15px; + margin: 0 0 0 ${space[1]}px; + ${textSans.xxsmall({ fontWeight: 'bold' })}; +`; + +const staffIcon = css` + fill: ${brand[400]}; +`; + +const staffLabel = css` + color: ${brand[400]}; +`; +const guardianPickLabel = css` + color: ${neutral[7]}; +`; + +export const GuardianStaff = () => ( +
+ + + + +

Staff

+
+); + +export const GuardianContributor = () => ( +
+ + + + +

Contributor

+
+); + +export const GuardianPick = () => ( +
+ + + + +

Guardian Pick

+
+); diff --git a/dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx b/dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx new file mode 100644 index 00000000000..4008b5d11f7 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx @@ -0,0 +1,14 @@ +import { css } from '@emotion/react'; + +type Props = { children: JSX.Element | JSX.Element[] }; + +export const Column = ({ children }: Props) => ( +
+ {children} +
+); diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.stories.tsx new file mode 100644 index 00000000000..2c63d177b05 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.stories.tsx @@ -0,0 +1,472 @@ +import { ArticlePillar } from '@guardian/libs'; +import { CommentType, UserProfile } from '../../discussionTypes'; +import { Comment } from './Comment'; + +export default { title: 'Comment' }; + +const commentData: CommentType = { + id: 25487686, + body: `

Beau Jos pizza in Idaho Springs is a great place for mountain pizza pies. Order one with extra thick crust and drizzle it with honey. Y'all can try the Challenge if you fancy, and sketch on your napkins so your art can join their walls. This was 15 years ago, but I hope it's still there! As for music, anything from Boulder's own Big Head Todd & the Monsters - 'Broken Hearted Savior' is a good start, with 'Bittersweet' a good road track. I'm jealous!!!

`, + date: '26 July 2013 4:13pm', + isoDateTime: '2013-07-26T15:13:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/25487686', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/25487686', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '2762428', + displayName: 'FrankDeFord', + webUrl: 'https://profile.theguardian.com/user/id/2762428', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2762428', + avatar: 'https://avatar.guim.co.uk/user/2762428', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2762428', + badge: [], + }, + responses: [], + metaData: { + commentCount: 2, + staffCommenterCount: 1, + editorsPickCount: 0, + blockedCount: 0, + responseCount: 1, + }, +}; + +const commentStaffData: CommentType = { + ...commentData, + userProfile: { + ...commentData.userProfile, + badge: [ + { + name: 'Staff', + }, + ], + }, +}; + +const commentContributorData: CommentType = { + ...commentData, + userProfile: { + ...commentData.userProfile, + badge: [ + { + name: 'Contributor', + }, + ], + }, +}; + +const blockedCommentData = { + ...commentData, + status: 'blocked', + body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", +}; + +const replyCommentData: CommentType = { + ...commentData, + responseTo: { + displayName: 'ArtVandelay', + commentApiUrl: '', + isoDateTime: '', + date: '', + commentId: '123456', + commentWebUrl: '', + }, +}; + +const longReplyCommentData: CommentType = { + ...commentData, + responseTo: { + displayName: 'ArtVandelayWithAVeryLongUserName', + commentApiUrl: '', + isoDateTime: '', + date: '', + commentId: '123456', + commentWebUrl: '', + }, +}; + +const longBothReplyCommentData: CommentType = { + ...commentData, + userProfile: { + ...commentData.userProfile, + displayName: 'AVeryLongUserNameForThisUserToo', + }, + responseTo: { + displayName: 'ArtVandelayWithAVeryLongUserName', + commentApiUrl: '', + isoDateTime: '', + date: '', + commentId: '123456', + commentWebUrl: '', + }, +}; + +const user: UserProfile = { + userId: 'abc123', + displayName: 'Jane Smith', + webUrl: '', + apiUrl: '', + avatar: '', + secureAvatarUrl: '', + badge: [], + privateFields: { + canPostComment: true, + isPremoderated: false, + hasCommented: true, + }, +}; + +const staffUser: UserProfile = { + userId: 'abc123', + displayName: 'Jane Smith', + webUrl: '', + apiUrl: '', + avatar: '', + secureAvatarUrl: '', + badge: [{ name: 'Staff' }], + privateFields: { + canPostComment: true, + isPremoderated: false, + hasCommented: true, + }, +}; + +export const Root = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +Root.storyName = 'A root comment on desktop view'; +Root.story = { + parameters: { + viewport: { defaultViewport: 'desktop' }, + chromatic: { viewports: [1300] }, + }, +}; + +export const RootMobile = () => ( + {}} + isReply={false} + isClosedForComments={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +RootMobile.storyName = 'A root comment on mobile view'; +RootMobile.story = { + parameters: { + viewport: { defaultViewport: 'mobileMedium' }, + chromatic: { viewports: [375] }, + }, +}; + +export const ReplyComment = () => ( + {}} + isReply={true} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +ReplyComment.storyName = 'A reply on desktop view'; +ReplyComment.story = { + parameters: { + viewport: { defaultViewport: 'desktop' }, + chromatic: { viewports: [1300] }, + }, +}; + +export const MobileReply = () => ( + {}} + isReply={true} + isClosedForComments={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +MobileReply.storyName = 'A reply on mobile view'; +MobileReply.story = { + parameters: { + viewport: { defaultViewport: 'mobileMedium' }, + chromatic: { viewports: [375] }, + }, +}; + +export const LongMobileReply = () => ( + {}} + isReply={true} + isClosedForComments={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +LongMobileReply.storyName = 'A long username reply on mobile view'; +LongMobileReply.story = { + parameters: { + viewport: { defaultViewport: 'mobileMedium' }, + chromatic: { viewports: [375] }, + }, +}; + +export const LongBothMobileReply = () => ( + {}} + isReply={true} + isClosedForComments={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +LongBothMobileReply.storyName = 'Both long usernames replying on mobile view'; +LongBothMobileReply.story = { + parameters: { + viewport: { defaultViewport: 'mobileMedium' }, + chromatic: { viewports: [375] }, + }, +}; + +export const PickedComment = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +PickedComment.storyName = 'Picked Comment'; + +export const StaffUserComment = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +StaffUserComment.storyName = 'Staff User Comment'; + +export const ContributorUserComment = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +ContributorUserComment.storyName = 'Contributor User Comment'; + +export const PickedStaffUserComment = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +PickedStaffUserComment.storyName = 'with staff and picked badges on desktop'; +PickedStaffUserComment.story = { + parameters: { + viewport: { defaultViewport: 'desktop' }, + chromatic: { viewports: [1300] }, + }, +}; + +export const PickedStaffUserCommentMobile = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +PickedStaffUserCommentMobile.storyName = + 'with staff and picked badges on mobile'; +PickedStaffUserCommentMobile.story = { + parameters: { + viewport: { defaultViewport: 'mobileMedium' }, + chromatic: { viewports: [375] }, + }, +}; + +export const ContributorUserCommentDesktop = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +ContributorUserCommentDesktop.storyName = + 'with contributor and picked badges on desktop'; +ContributorUserCommentDesktop.story = { + parameters: { + viewport: { defaultViewport: 'desktop' }, + chromatic: { viewports: [1300] }, + }, +}; + +export const ContributorUserCommentMobile = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +ContributorUserCommentMobile.storyName = + 'with contributor and picked badges on mobile'; +ContributorUserCommentMobile.story = { + parameters: { + viewport: { defaultViewport: 'mobileMedium' }, + chromatic: { viewports: [375] }, + }, +}; + +export const LoggedInAsModerator = () => ( + {}} + user={staffUser} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +LoggedInAsModerator.storyName = 'Logged in as moderator'; + +export const LoggedInAsUser = () => ( + {}} + user={user} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +LoggedInAsUser.storyName = 'Logged in as normal user'; + +export const BlockedComment = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +BlockedComment.storyName = 'Blocked comment'; + +export const MutedComment = () => ( + {}} + isReply={false} + isMuted={true} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +MutedComment.storyName = 'Muted comment'; + +export const ClosedForComments = () => ( + {}} + isReply={false} + isMuted={false} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +ClosedForComments.storyName = 'A closed comment on desktop view'; +ClosedForComments.story = { + parameters: { + viewport: { defaultViewport: 'desktop' }, + chromatic: { viewports: [1300] }, + }, +}; diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx new file mode 100644 index 00000000000..669d552152b --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx @@ -0,0 +1,812 @@ +import { css } from '@emotion/react'; +import { ArticleTheme } from '@guardian/libs'; +import { + border, + brand, + from, + neutral, + remSpace, + space, + textSans, + until, +} from '@guardian/source-foundations'; +import { Button, Link, SvgIndent } from '@guardian/source-react-components'; +import { useState } from 'react'; +import { CommentType, UserProfile } from '../../discussionTypes'; +import { pickComment, unPickComment } from '../../lib/api'; +import { createAuthenticationEventParams } from '../../lib/identity-component-event'; +import { palette } from '../../lib/palette'; +import { pillarToString } from '../../lib/pillarToString'; +import { AbuseReportForm } from '../AbuseReportForm/AbuseReportForm'; +import { Avatar } from '../Avatar/Avatar'; +import { + GuardianContributor, + GuardianPick, + GuardianStaff, +} from '../Badges/Badges'; +import { Column } from '../Column/Column'; +import { RecommendationCount } from '../RecommendationCount/RecommendationCount'; +import { Row } from '../Row/Row'; +import { Timestamp } from '../Timestamp/Timestamp'; + +type Props = { + user?: UserProfile; + comment: CommentType; + pillar: ArticleTheme; + isClosedForComments: boolean; + setCommentBeingRepliedTo: (commentBeingRepliedTo?: CommentType) => void; + isReply: boolean; + wasScrolledTo?: boolean; + isMuted: boolean; + toggleMuteStatus: (userId: string) => void; + onPermalinkClick: (commentId: number) => void; + onRecommend?: (commentId: number) => Promise; +}; + +const commentControlsLink = (pillar: ArticleTheme) => css` + margin-top: -2px; + + a { + ${textSans.small({ fontWeight: 'bold' })} + margin-right: ${space[2]}px; + color: ${palette[pillarToString(pillar)][400]}; + /* + We do not want underline to be applied to SVG + therefore we override the styles and apply them to the nested + */ + :hover { + text-decoration: none; + text-decoration-color: none; + span { + color: ${palette[pillarToString(pillar)][400]}; + text-decoration: underline; + text-decoration-color: ${palette[pillarToString(pillar)][400]}; + } + } + } +`; + +const spaceBetween = css` + display: flex; + justify-content: space-between; +`; + +const commentCss = css` + display: block; + clear: left; + ${textSans.small()} + margin-top: ${remSpace[2]}; + margin-bottom: ${remSpace[3]}; + word-break: break-word; + + p { + margin-top: 0; + margin-bottom: ${space[3]}px; + } + + blockquote { + margin-top: ${space[3]}px; + margin-bottom: ${space[3]}px; + margin-left: ${space[5]}px; + margin-right: ${space[5]}px; + padding-left: ${space[2]}px; + color: ${neutral[46]}; + } + + i { + font-style: italic; + } + + b { + font-weight: bold; + } + + code { + font-family: monospace; + font-size: 1em; + } +`; + +const blockedCommentStyles = css` + color: ${neutral[46]}; + ${textSans.xxsmall()} +`; + +// to override a tag styles from dangerouslySetInnerHTML +const commentLinkStyling = css` + a { + color: ${brand[500]}; + text-decoration: none; + :hover { + text-decoration: underline; + } + } +`; + +const commentWrapper = css` + border-top: 1px solid ${border.secondary}; + display: flex; + padding: ${space[2]}px 0; +`; + +const selectedStyles = css` + background-color: ${neutral[97]}; + margin-left: -${space[2]}px; + padding-left: ${space[2]}px; + margin-right: -${space[2]}px; + padding-right: ${space[2]}px; +`; + +const avatarMargin = css` + margin-right: ${space[2]}px; + + ${until.mobileLandscape} { + display: none; + } +`; + +const colourStyles = (pillar: ArticleTheme) => css` + a { + color: ${palette[pillarToString(pillar)][400]}; + text-decoration-color: ${palette[pillarToString(pillar)][400]}; + :hover { + color: ${palette[pillarToString(pillar)][400]}; + text-decoration-color: ${palette[pillarToString(pillar)][400]}; + } + } +`; + +const boldFont = css` + a { + ${textSans.small({ fontWeight: 'bold' })} + } +`; + +const regularFont = css` + a { + ${textSans.small()} + } +`; + +const svgReplyArrow = css` + svg { + fill: ${neutral[46]} !important; + } +`; + +const commentDetails = css` + flex-grow: 1; + width: 100%; +`; + +const headerStyles = css` + display: flex; + flex-direction: row; + justify-content: space-between; +`; + +const iconWrapper = css` + padding: 2px; + white-space: nowrap; +`; + +const timestampWrapperStyles = css` + margin-left: ${space[2]}px; + margin-bottom: -2px; + display: flex; + flex-direction: column; + justify-content: center; +`; + +const hideBelowMobileLandscape = css` + ${until.mobileLandscape} { + display: none; + } +`; + +const hideAboveMobileLandscape = css` + ${from.mobileLandscape} { + display: none; + } +`; + +const negativeMargin = css` + margin-top: 0px; + margin-bottom: -6px; +`; + +const cssTextOverflowElip = css` + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +`; + +const cssReplyToWrapper = css` + ${until.mobileLandscape} { + padding-right: 10px; + width: calc(100% - 35px); + box-sizing: border-box; + } +`; + +const buttonLinkPillarBaseStyles = (pillar: ArticleTheme) => css` + button { + color: ${palette[pillarToString(pillar)][400]}; + background-color: transparent; + height: 18px; + min-height: 18px; + /* Radius 0 is used to style focus halo */ + border-radius: 0; + + :hover { + text-decoration: underline; + text-decoration-color: ${palette[pillarToString(pillar)][400]}; + } + } +`; + +const buttonLinkBaseStyles = css` + button { + color: ${neutral[46]}; + background-color: transparent; + height: 18px; + min-height: 18px; + /* Radius 0 is used to style focus halo */ + border-radius: 0; + + :hover { + text-decoration: underline; + text-decoration-color: ${neutral[46]}; + } + } +`; + +const subdued = css` + text-decoration: none; +`; + +// In order to show as much of the usernames as possible without fixed widths: +// - First label should shrink to contents but be no bigger than 60% +// - Second label should never force first label less than its contents if less than 60% +// - Second label should fill remaining space after above +// - Both labels should truncate with ellipsis if they fill their space +// Test page: https://codepen.io/gtrufitt/pen/LYGKQyY + +const cssReplyAlphaDisplayName = css` + ${until.mobileLandscape} { + ${cssTextOverflowElip} + width: 100%; + max-width: fit-content; + } +`; + +const cssReplyBetaDisplayName = css` + ${until.mobileLandscape} { + ${cssTextOverflowElip} + min-width: 40%; + flex-grow: 1; + } +`; + +const Space = ({ amount }: { amount: 1 | 2 | 3 | 4 | 5 | 6 | 9 | 12 | 24 }) => ( +
+); + +export const Comment = ({ + comment, + pillar, + isClosedForComments, + setCommentBeingRepliedTo, + user, + isReply, + wasScrolledTo, + isMuted, + toggleMuteStatus, + onPermalinkClick, + onRecommend, +}: Props) => { + const [isHighlighted, setIsHighlighted] = useState( + comment.isHighlighted, + ); + const [error, setError] = useState(); + + const [showAbuseReportForm, setAbuseReportForm] = useState(false); + const toggleSetShowForm = () => setAbuseReportForm(!showAbuseReportForm); + + const pick = async () => { + setError(''); + const response = await pickComment(comment.id); + if (response.status === 'error') { + setError(response.message); + } else { + setIsHighlighted(true); + } + }; + + const unPick = async () => { + setError(''); + const response = await unPickComment(comment.id); + if (response.status === 'error') { + setError(response.message); + } else { + setIsHighlighted(false); + } + }; + + const showStaffBadge = comment.userProfile.badge.find( + (obj) => obj['name'] === 'Staff', + ); + + const showPickBadge = comment.status !== 'blocked' && isHighlighted; + + // A contributor could be e.g. a freelancer that commonly comments on articles. + // In frontend we check/display the Staff badge else we check/display the + // Contributor - we shouldn't see both Staff & Contributor badges. + // https://github.com/guardian/frontend/blob/main/discussion/app/views/fragments/commentBadges.scala.html#L8 + const showContributorBadge = comment.userProfile.badge.find( + (obj) => obj['name'] === 'Contributor', + ); + + return ( + <> + {!!error && ( + + {error} + + )} +
+
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ + { + comment.userProfile + .displayName + } + +
+ + + +
+
+ +
+ + { + comment.userProfile + .displayName + } + +
+ {comment.responseTo ? ( +
+ } + iconSide="left" + rel="nofollow" + > + { + comment.responseTo + .displayName + } + +
+ ) : ( + <> + )} +
+ +
+ + + {showStaffBadge && ( +
+ +
+ )} + {showContributorBadge && + !showStaffBadge && ( +
+ +
+ )} + {showPickBadge && ( +
+ +
+ )} + +
+ +
+ {comment.status !== 'blocked' && ( + + )} +
+ +
+ + {showStaffBadge && ( +
+ +
+ )} + {showContributorBadge && !showStaffBadge && ( +
+ +
+ )} + {showPickBadge && ( +
+ +
+ )} + +
+ + {/* MUTED */} + {isMuted && ( +

+ + <> + All posts from this user have been muted on + this device. + + +

+ +
+ +

+ )} + + {/* BLOCKED */} + {!isMuted && comment.status === 'blocked' && ( +

+ )} + + {/* NORMAL */} + {!isMuted && comment.status !== 'blocked' && ( + <> +

+
+ + {/* When commenting is closed, no reply link shows at all */} + {!isClosedForComments && ( + <> + {/* If user is not logged in we link to the login page */} + {user ? ( +
+ +
+ ) : ( +
+ } + iconSide="left" + rel="nofollow" + > + {/* We use this span to scope the styling */} + + Reply + + +
+ )} + + + )} + + {/* Only staff can pick, and they cannot pick thier own comment */} + {user && + user.badge.some( + (e) => e.name === 'Staff', + ) && + user.userId !== + comment.userProfile.userId && ( +
+ +
+ )} + + + {/* You can't mute unless logged in and you can't yourself */} + {user && + comment.userProfile.userId !== + user.userId ? ( +
+ +
+ ) : ( + <> + )} + +
+ +
+ {showAbuseReportForm && ( +
+ +
+ )} + +
+ + )} +
+
+ + ); +}; diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.stories.tsx new file mode 100644 index 00000000000..a5d047b6d0c --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.stories.tsx @@ -0,0 +1,256 @@ +import { ArticlePillar } from '@guardian/libs'; +import { CommentType } from '../../discussionTypes'; +import { CommentContainer } from './CommentContainer'; + +export default { title: 'CommentContainer' }; + +const commentData: CommentType = { + id: 25487686, + body: "

Beau Jos pizza in Idaho Springs is a great place for mountain pizza pies. Order one with extra thick crust and drizzle it with honey. Y'all can try the Challenge if you fancy, and sketch on your napkins so your art can join their walls. This was 15 years ago, but I hope it's still there! As for music, anything from Boulder's own Big Head Todd & the Monsters - 'Broken Hearted Savior' is a good start, with 'Bittersweet' a good road track. I'm jealous!!!

", + date: '26 July 2013 4:13pm', + isoDateTime: '2013-07-26T15:13:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/25487686', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/25487686', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '2762428', + displayName: 'FrankDeFord', + webUrl: 'https://profile.theguardian.com/user/id/2762428', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2762428', + avatar: 'https://avatar.guim.co.uk/user/2762428', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2762428', + badge: [], + }, + responses: [], + metaData: { + commentCount: 2, + staffCommenterCount: 1, + editorsPickCount: 0, + blockedCount: 0, + responseCount: 1, + }, +}; + +const threadComment: CommentType = { + id: 25488498, + body: "

It's still there FrankDeFord - and thanks, I will pass that on

", + date: '26 July 2013 4:35pm', + isoDateTime: '2013-07-26T15:13:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/25488498', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/25488498', + numRecommends: 0, + isHighlighted: false, + responseTo: { + displayName: 'FrankDeFord', + commentApiUrl: + 'https://discussion.guardianapis.com/discussion-api/comment/25487686', + isoDateTime: '2013-07-26T15:13:20Z', + date: '26 July 2013 4:13pm', + commentId: '25487686', + commentWebUrl: + 'https://discussion.theguardian.com/comment-permalink/25487686', + }, + userProfile: { + userId: '3150446', + displayName: 'AndyPietrasik', + webUrl: 'https://profile.theguardian.com/user/id/3150446', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3150446', + avatar: 'https://avatar.guim.co.uk/user/3150446', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3150446', + badge: [ + { + name: 'Staff', + }, + ], + }, +}; + +const threadCommentWithLongUsernames: CommentType = { + id: 25488498, + body: "

It's still there FrankDeFord - and thanks, I will pass that on

", + date: '26 July 2013 4:35pm', + isoDateTime: '2013-07-26T15:13:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/25488498', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/25488498', + numRecommends: 0, + isHighlighted: false, + responseTo: { + displayName: 'FrankDeFord', + commentApiUrl: + 'https://discussion.guardianapis.com/discussion-api/comment/25487686', + isoDateTime: '2013-07-26T15:13:20Z', + date: '26 July 2013 4:13pm', + commentId: '25487686', + commentWebUrl: + 'https://discussion.theguardian.com/comment-permalink/25487686', + }, + userProfile: { + userId: '3150446', + displayName: 'ThisIsAVeryLongUserNameTooLongInFact', + webUrl: 'https://profile.theguardian.com/user/id/3150446', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3150446', + avatar: 'https://avatar.guim.co.uk/user/3150446', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3150446', + badge: [ + { + name: 'Staff', + }, + ], + }, +}; + +const commentDataWithLongThread: CommentType = { + id: 25487686, + body: "

Beau Jos pizza in Idaho Springs is a great place for mountain pizza pies. Order one with extra thick crust and drizzle it with honey. Y'all can try the Challenge if you fancy, and sketch on your napkins so your art can join their walls. This was 15 years ago, but I hope it's still there! As for music, anything from Boulder's own Big Head Todd & the Monsters - 'Broken Hearted Savior' is a good start, with 'Bittersweet' a good road track. I'm jealous!!!

", + date: '26 July 2013 4:13pm', + isoDateTime: '2013-07-26T15:13:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/25487686', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/25487686', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '2762428', + displayName: 'FrankDeFord', + webUrl: 'https://profile.theguardian.com/user/id/2762428', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2762428', + avatar: 'https://avatar.guim.co.uk/user/2762428', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2762428', + badge: [], + }, + responses: [], + metaData: { + commentCount: 6, + staffCommenterCount: 1, + editorsPickCount: 0, + blockedCount: 0, + responseCount: 5, + }, +}; + +const aUser = { + userId: 'abc123', + displayName: 'Jane Smith', + webUrl: '', + apiUrl: '', + avatar: '', + secureAvatarUrl: '', + badge: [], + privateFields: { + canPostComment: true, + isPremoderated: false, + hasCommented: true, + }, +}; + +const commentDataThreaded: CommentType = { + ...commentData, + ...{ + responses: [threadComment], + }, +}; + +const commentDataThreadedWithLongThread: CommentType = { + ...commentDataWithLongThread, + ...{ + responses: [threadComment], + }, +}; + +const commentDataThreadedWithLongUserNames: CommentType = { + ...commentData, + ...{ + responses: [threadCommentWithLongUsernames], + }, +}; + +export const defaultStory = () => ( + {}} + mutes={[]} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +defaultStory.storyName = 'default'; + +export const threadedComment = () => ( + {}} + mutes={[]} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +threadedComment.storyName = 'threaded'; + +export const threadedCommentWithShowMore = () => ( + {}} + mutes={[]} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +threadedCommentWithShowMore.storyName = 'threaded with show more button'; + +export const threadedCommentWithLongUsernames = () => ( + {}} + mutes={[]} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +threadedCommentWithLongUsernames.storyName = 'threaded with long usernames'; + +export const threadedCommentWithLongUsernamesMobile = () => ( + {}} + mutes={[]} + toggleMuteStatus={() => {}} + onPermalinkClick={() => {}} + /> +); +threadedCommentWithLongUsernamesMobile.storyName = + 'threaded with long usernames on mobile display'; +threadedCommentWithLongUsernamesMobile.story = { + parameters: { + viewport: { defaultViewport: 'mobileMedium' }, + chromatic: { viewports: [375] }, + }, +}; diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx new file mode 100644 index 00000000000..ff7386dbce0 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx @@ -0,0 +1,195 @@ +import '@testing-library/jest-dom/extend-expect'; +import { ArticlePillar } from '@guardian/libs'; +import { + render, + fireEvent, + // @ts-expect-error : https://github.com/testing-library/react-testing-library/issues/610 + waitFor, +} from '@testing-library/react'; +import { vi } from 'vitest'; +import { CommentType } from '../../discussionTypes'; +import { comment } from '../../fixtures/comment'; +import { mockedMessageID, mockFetchCalls } from '../../lib/mockFetchCalls'; +import { CommentContainer } from './CommentContainer'; + +mockFetchCalls(); + +// @ts-expect-error +const firstCommentResponse: CommentType = comment.responses[0]; + +const commentWithReply: CommentType = { + ...comment, + responses: [firstCommentResponse], +}; + +const commentWithoutReply: CommentType = { + ...comment, + responses: [], +}; + +const aUser = { + userId: 'abc123', + displayName: 'Jane Smith', + webUrl: '', + apiUrl: '', + avatar: '', + secureAvatarUrl: '', + badge: [], + privateFields: { + canPostComment: true, + isPremoderated: false, + hasCommented: true, + }, +}; + +describe('CommentContainer', () => { + it('Post a comment to a root comment', async () => { + const newCommentText = 'A brand new comment'; + + // a workaround to emulating hooks outside of render + let commentBeingRepliedTo: CommentType | undefined = + commentWithoutReply; + const mockSetCommentBeingRepliedTo = vi.fn( + (newCommentBeingRepliedTo?: CommentType) => { + commentBeingRepliedTo = newCommentBeingRepliedTo; + }, + ); + + // https://stackoverflow.com/a/52335414 + Element.prototype.scrollIntoView = () => {}; + + const { getByTestId, queryByText, getByText, rerender } = render( + {}} + onPermalinkClick={() => {}} + />, + ); + + // expect Comment Form to be present + expect(getByText('Post your comment')).toBeInTheDocument(); + + // add comment to textarea + fireEvent.change(getByTestId('comment-input'), { + target: { value: newCommentText }, + }); + + // Submit form + fireEvent.click(getByText('Post your comment')); + + // make sure mock function has been called + await waitFor(() => + expect(mockSetCommentBeingRepliedTo).toHaveBeenCalledTimes(1), + ); + + // make sure the new comment appeats + await waitFor(() => { + expect(getByTestId(mockedMessageID)).toBeInTheDocument(); + }); + + // rerender with updated commentBeingRepliedTo + rerender( + {}} + onPermalinkClick={() => {}} + />, + ); + + // make sure the comment form submit button does not appear anymore + // note: we need to use queryByText or else we get an error + const commentFormSubmitButton = queryByText('Post your comment'); + expect(commentFormSubmitButton).toBeNull(); + }); + + it('Post a comment to a reply comment', async () => { + const newCommentText = 'A brand new comment'; + + // a workaround to emulating hooks outside of render + let commentBeingRepliedTo: CommentType | undefined = + firstCommentResponse; + const mockSetCommentBeingRepliedTo = vi.fn( + (newCommentBeingRepliedTo?: CommentType) => { + commentBeingRepliedTo = newCommentBeingRepliedTo; + }, + ); + + // https://stackoverflow.com/a/52335414 + Element.prototype.scrollIntoView = () => {}; + + const { getByTestId, queryByText, getByText, rerender } = render( + {}} + onPermalinkClick={() => {}} + />, + ); + + // expect Comment Form to be present + expect(getByText('Post your comment')).toBeInTheDocument(); + + // add comment to textarea + fireEvent.change(getByTestId('comment-input'), { + target: { value: newCommentText }, + }); + + // Submit form + fireEvent.click(getByText('Post your comment')); + + // make sure mock function has been called + await waitFor(() => + expect(mockSetCommentBeingRepliedTo).toHaveBeenCalledTimes(1), + ); + + // make sure the new comment appeats + await waitFor(() => { + expect(getByTestId(mockedMessageID)).toBeInTheDocument(); + }); + + // rerender with updated commentBeingRepliedTo + rerender( + {}} + onPermalinkClick={() => {}} + />, + ); + + // make sure the comment form submit button does not appear anymore + // note: we need to use queryByText or else we get an error + const commentFormSubmitButton = queryByText('Post your comment'); + expect(commentFormSubmitButton).toBeNull(); + }); +}); diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx new file mode 100644 index 00000000000..d77dc33f0b1 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx @@ -0,0 +1,234 @@ +import { css } from '@emotion/react'; +import { ArticleTheme } from '@guardian/libs'; +import { border, neutral, space } from '@guardian/source-foundations'; +import { SvgPlus } from '@guardian/source-react-components'; +import { useEffect, useState } from 'react'; +import { + CommentResponse, + CommentType, + ThreadsType, + UserProfile, +} from '../../discussionTypes'; +import { getMoreResponses } from '../../lib/api'; +import { Comment } from '../Comment/Comment'; +import { CommentForm } from '../CommentForm/CommentForm'; +import { CommentReplyPreview } from '../CommentReplyPreview/CommentReplyPreview'; +import { PillarButton } from '../PillarButton/PillarButton'; + +type Props = { + comment: CommentType; + pillar: ArticleTheme; + isClosedForComments: boolean; + shortUrl: string; + user?: UserProfile; + threads: ThreadsType; + commentBeingRepliedTo?: CommentType; + setCommentBeingRepliedTo: (commentBeingRepliedTo?: CommentType) => void; + commentToScrollTo?: number; + mutes: string[]; + toggleMuteStatus: (userId: string) => void; + onPermalinkClick: (commentId: number) => void; + onRecommend?: (commentId: number) => Promise; + onComment?: (shortUrl: string, body: string) => Promise; + onReply?: ( + shortUrl: string, + body: string, + parentCommentId: number, + ) => Promise; + onPreview?: (body: string) => Promise; +}; + +const nestingStyles = css` + list-style-type: none; + padding-left: ${space[2]}px; + margin-left: ${space[12]}px; +`; + +const topBorder = css` + border-top: 1px solid ${border.secondary}; +`; + +const commentContainerStyles = css` + list-style-type: none; + padding-left: 0; +`; + +const selectedStyles = css` + background-color: ${neutral[97]}; + margin-left: -${space[2]}px; + padding-left: ${space[2]}px; + margin-right: -${space[2]}px; + padding-right: ${space[2]}px; +`; + +const removeMargin = css` + margin: 0px; +`; + +export const avatar = (avatarSize: number) => css` + border-radius: ${avatarSize + 10}px; + width: ${avatarSize}px; + height: ${avatarSize}px; +`; + +export const CommentContainer = ({ + comment, + pillar, + isClosedForComments, + user, + shortUrl, + threads, + commentBeingRepliedTo, + setCommentBeingRepliedTo, + commentToScrollTo, + mutes, + toggleMuteStatus, + onPermalinkClick, + onRecommend, + onComment, + onReply, + onPreview, +}: Props) => { + // Filter logic + const [expanded, setExpanded] = useState(threads === 'expanded'); + const [responses, setResponses] = useState(comment.responses || []); + const [loading, setLoading] = useState(false); + + const showResponses = threads !== 'unthreaded'; + + const decideShowMoreText = () => { + const remainingResponses = + comment.metaData && + comment.metaData.responseCount && + comment.metaData.responseCount - 3; + if (remainingResponses === 1) return `Show 1 more reply`; + return `Show ${remainingResponses} more replies`; + }; + + useEffect(() => { + setResponses(comment.responses || []); + }, [comment]); + + const expand = (commentId: number) => { + setLoading(true); + getMoreResponses(commentId) + .then((json) => { + setExpanded(true); + setResponses(json.comment.responses || []); + }) + .finally(() => { + setLoading(false); + }); + }; + + return ( +
+ + + <> + {showResponses && responses && ( +
+
    + {responses.map((responseComment) => ( +
  • + +
    • + ))} +
+ {!expanded && + comment.metaData && + !!comment.metaData.responseCount && + comment.metaData.responseCount > 3 && ( +
+ } + iconSide="left" + linkName="Show more replies" + onClick={() => expand(comment.id)} + pillar={pillar} + size="xsmall" + > + {loading + ? 'loading...' + : decideShowMoreText()} + +
+ )} +
+ )} + {commentBeingRepliedTo && + (commentBeingRepliedTo.id === comment.id || + responses.find( + (response: CommentType) => + response.id === commentBeingRepliedTo.id, + )) && + user && ( +
+ + + setResponses([...responses, response]) + } + user={user} + setCommentBeingRepliedTo={ + setCommentBeingRepliedTo + } + commentBeingRepliedTo={commentBeingRepliedTo} + onComment={onComment} + onReply={onReply} + onPreview={onPreview} + /> +
+ )} + +
+ ); +}; diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.stories.tsx new file mode 100644 index 00000000000..1d51d53a620 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.stories.tsx @@ -0,0 +1,100 @@ +import { ArticlePillar } from '@guardian/libs'; +import { CommentType } from '../../discussionTypes'; +import { CommentForm } from './CommentForm'; + +export default { component: CommentForm, title: 'CommentForm' }; + +const shortUrl = '/p/39f5z'; + +const aUser = { + userId: 'abc123', + displayName: 'Jane Smith', + webUrl: '', + apiUrl: '', + avatar: '', + secureAvatarUrl: '', + badge: [], + privateFields: { + canPostComment: true, + isPremoderated: false, + hasCommented: true, + }, +}; + +const aComment: CommentType = { + id: 25487686, + body: "

Beau Jos pizza in Idaho Springs is a great place for mountain pizza pies. Order one with extra thick crust and drizzle it with honey. Y'all can try the Challenge if you fancy, and sketch on your napkins so your art can join their walls. This was 15 years ago, but I hope it's still there! As for music, anything from Boulder's own Big Head Todd & the Monsters - 'Broken Hearted Savior' is a good start, with 'Bittersweet' a good road track. I'm jealous!!!

", + date: '26 July 2013 4:13pm', + isoDateTime: '2013-07-26T15:13:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/25487686', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/25487686', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '2762428', + displayName: 'FrankDeFord', + webUrl: 'https://profile.theguardian.com/user/id/2762428', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2762428', + avatar: 'https://avatar.guim.co.uk/user/2762428', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2762428', + badge: [], + }, + responses: [], + metaData: { + commentCount: 2, + staffCommenterCount: 1, + editorsPickCount: 0, + blockedCount: 0, + responseCount: 1, + }, +}; + +export const Default = () => ( + {}} + /> +); +Default.storyName = 'default'; + +// This story has a mocked post endpoint that returns an error, see 97d6eab4a98917f63bc96a7ac64f7ca7 +export const Error = () => ( + {}} + /> +); +Error.storyName = 'form with errors'; + +export const Active = () => ( + {}} + commentBeingRepliedTo={aComment} + /> +); +Active.storyName = 'form is active'; + +export const Premoderated = () => ( + {}} + commentBeingRepliedTo={aComment} + /> +); +Premoderated.storyName = 'user is premoderated'; diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx new file mode 100644 index 00000000000..65817b65418 --- /dev/null +++ b/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx @@ -0,0 +1,557 @@ +import { css } from '@emotion/react'; +import { ArticleTheme } from '@guardian/libs'; +import { neutral, space, text, textSans } from '@guardian/source-foundations'; +import { useEffect, useRef, useState } from 'react'; +import { + CommentResponse, + CommentType, + UserProfile, +} from '../../discussionTypes'; +import { + addUserName, + comment as defaultComment, + preview as defaultPreview, + reply as defaultReply, +} from '../../lib/api'; +import { simulateNewComment } from '../../lib/simulateNewComment'; +import { FirstCommentWelcome } from '../FirstCommentWelcome/FirstCommentWelcome'; +import { PillarButton } from '../PillarButton/PillarButton'; +import { Preview } from '../Preview/Preview'; +import { Row } from '../Row/Row'; + +type Props = { + shortUrl: string; + pillar: ArticleTheme; + user: UserProfile; + onAddComment: (response: CommentType) => void; + setCommentBeingRepliedTo?: () => void; + commentBeingRepliedTo?: CommentType; + onComment?: (shortUrl: string, body: string) => Promise; + onReply?: ( + shortUrl: string, + body: string, + parentCommentId: number, + ) => Promise; + onPreview?: (body: string) => Promise; +}; + +const boldString = (text: string) => `${text}`; +const italicsString = (text: string) => `${text}`; +const strikethroughString = (text: string) => `${text}`; +const codeString = (text: string) => `${text}`; +const quoteString = (text: string) => `
${text}
`; +const linkStringFunc = (url: string, highlightedText?: string) => + `${ + highlightedText ? highlightedText : url + }`; + +const formWrapper = css` + display: flex; + flex-wrap: wrap; + margin-bottom: ${space[5]}px; +`; + +const commentTextArea = css` + width: 100%; + margin-bottom: ${space[3]}px; + padding: 8px 10px 10px 8px; + ${textSans.small()}; + border-color: ${neutral[86]}; + :focus { + border-color: ${neutral[46]}; + outline: none; + } +`; + +const greyPlaceholder = css` + ::placeholder { + color: ${neutral[46]}; + } +`; + +// Opacity? See: https://stackoverflow.com/questions/19621306/css-placeholder-text-color-on-firefox +const blackPlaceholder = css` + ::placeholder { + font-weight: bold; + opacity: 1; + color: ${neutral[0]}; + } +`; + +const headerTextStyles = css` + margin: 0; + ${textSans.xxsmall()}; +`; + +const errorTextStyles = css` + margin: 0; + ${textSans.xxsmall()}; + color: ${text.error}; +`; + +const infoTextStyles = css` + margin: 0; + ${textSans.xxsmall()}; + color: ${text.supporting}; +`; + +const msgContainerStyles = css` + margin-top: 8px; +`; + +const linkStyles = css` + a { + color: ${text.anchorPrimary}; + text-decoration: none; + :hover, + :focus { + text-decoration: underline; + } + } +`; + +const wrapperHeaderTextStyles = css` + background-color: ${neutral[97]}; + padding: 8px 10px 10px 8px; + width: 100%; + margin-top: 8px; + margin-bottom: 2px; +`; + +const commentAddOns = css` + height: 22px; + font-size: 13px; + line-height: 17px; + border: 1px solid ${neutral[100]}; + color: ${neutral[46]}; + text-align: center; + cursor: pointer; + margin-left: 4px; + padding: 2px 5px 0px 5px; + min-width: 11px; + line-height: 17px; + list-style-type: none; +`; + +const bottomContainer = css` + width: 100%; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + align-items: stretch; + align-content: space-between; +`; + +const Space = ({ amount }: { amount: 1 | 2 | 3 | 4 | 5 | 6 | 9 | 12 | 24 }) => ( +
+); + +export const CommentForm = ({ + shortUrl, + pillar, + onAddComment, + user, + setCommentBeingRepliedTo, + commentBeingRepliedTo, + onComment, + onReply, + onPreview, +}: Props) => { + const [isActive, setIsActive] = useState( + commentBeingRepliedTo ? true : false, + ); + const [userNameMissing, setUserNameMissing] = useState(false); + const [body, setBody] = useState(''); + const [previewBody, setPreviewBody] = useState(''); + const [error, setError] = useState(''); + const [info, setInfo] = useState(''); + const [showPreview, setShowPreview] = useState(false); + const textAreaRef = useRef(null); + + useEffect(() => { + if (commentBeingRepliedTo) { + document + .getElementById(`comment-${commentBeingRepliedTo.id}`) + ?.scrollIntoView(); + document + .querySelector( + `#comment-reply-form-${commentBeingRepliedTo.id} textarea`, + ) + ?.focus(); + } + }, [commentBeingRepliedTo]); + + const getHighlightedString = (): + | { + highlightedString: string; + startString: string; + endString: string; + } + | undefined => { + if (!textAreaRef || !textAreaRef.current) return; + const selectionStart = textAreaRef.current.selectionStart; + const selectionEnd = textAreaRef.current.selectionEnd; + const value = textAreaRef.current.value; + + const startString = value.substring(0, selectionStart); + const highlightedString = value.substring(selectionStart, selectionEnd); + const endString = value.substring(selectionEnd, value.length); + return { startString, highlightedString, endString }; + }; + + const transformText = ( + transfromFunc: (highlightedString: string) => string, + ) => { + const textAreaStrings = getHighlightedString(); + if (!textAreaStrings) return; + const { startString, highlightedString, endString } = textAreaStrings; + setBody( + startString.concat(transfromFunc(highlightedString), endString), + ); + }; + + const transformLink = () => { + const url = prompt('Your URL:', 'http://www.'); + if (url === null) return; + const textAreaStrings = getHighlightedString(); + if (!textAreaStrings) return; + const { startString, highlightedString, endString } = textAreaStrings; + setBody( + startString.concat( + linkStringFunc(url, highlightedString), + endString, + ), + ); + }; + + const fetchShowPreview = async () => { + if (!body) return; + + try { + const preview = onPreview || defaultPreview; + const response = await preview(body); + setPreviewBody(response); + setShowPreview(true); + } catch (e) { + setError('Preview request failed, please try again'); + setPreviewBody(''); + setShowPreview(false); + } + }; + + const resetForm = () => { + setError(''); + setInfo(''); + setBody(''); + setShowPreview(false); + setIsActive(false); + setCommentBeingRepliedTo && setCommentBeingRepliedTo(); + }; + + const submitForm = async () => { + setError(''); + setInfo(''); + + if (body) { + const comment = onComment || defaultComment; + const reply = onReply || defaultReply; + const response: CommentResponse = commentBeingRepliedTo + ? await reply(shortUrl, body, commentBeingRepliedTo.id) + : await comment(shortUrl, body); + // Check response message for error states + if (response.errorCode === 'USERNAME_MISSING') { + // Reader has never posted before and needs to choose a username + setUserNameMissing(true); + } else if (response.errorCode === 'EMPTY_COMMENT_BODY') { + setError('Please write a comment.'); + } else if (response.errorCode === 'COMMENT_TOO_LONG') { + setError( + 'Your comment must be fewer than 5000 characters long.', + ); + } else if (response.errorCode === 'USER_BANNED') { + setError( + 'Commenting has been disabled for this account (why?).', + ); + } else if (response.errorCode === 'IP_THROTTLED') { + setError( + 'Commenting has been temporarily blocked for this IP address (why?).', + ); + } else if (response.errorCode === 'DISCUSSION_CLOSED') { + setError( + 'Sorry your comment can not be published as the discussion is now closed for comments.', + ); + } else if (response.errorCode === 'PARENT_COMMENT_MODERATED') { + setError( + 'Sorry the comment can not be published as the comment you replied to has been moderated since.', + ); + } else if (response.errorCode === 'COMMENT_RATE_LIMIT_EXCEEDED') { + setError( + 'You can only post one comment every minute. Please try again in a moment.', + ); + } else if (response.errorCode === 'INVALID_PROTOCOL') { + setError(`Sorry your comment can not be published as it was not sent over + a secure channel. Please report us this issue using the technical issue link + in the page footer.`); + } else if (response.errorCode === 'AUTH_COOKIE_INVALID') { + setError( + 'Sorry, your comment was not published as you are no longer signed in. Please sign in and try again.', + ); + } else if (response.errorCode === 'READ-ONLY-MODE') { + setError(`Sorry your comment can not currently be published as + commenting is undergoing maintenance but will be back shortly. Please try + again in a moment.`); + } else if (response.errorCode === 'API_CORS_BLOCKED') { + setError(`Could not post due to your internet settings, which might be + controlled by your provider. Please contact your administrator + or disable any proxy servers or VPNs and try again.`); + } else if (response.errorCode === 'API_ERROR') { + setError(`Sorry, there was a problem posting your comment. Please try + another browser or network connection. Reference code `); + } else if (response.errorCode === 'EMAIL_VERIFIED') { + setInfo( + 'Sent. Please check your email to verify your email address. Once verified post your comment.', + ); + } else if (response.errorCode === 'EMAIL_VERIFIED_FAIL') { + // TODO: Support resending verification email + setError(`We are having technical difficulties. Please try again later or + + resend the verification.`); + } else if (response.errorCode === 'EMAIL_NOT_VALIDATED') { + // TODO: Support resending verification email + setError(`Please confirm your email address to comment.
+ If you can't find the email, we can + + resend the verification email to your email + address.`); + } else if (response.status === 'ok') { + onAddComment( + simulateNewComment( + // response.errorCode is the id of the comment that was created on the server + // it is returned as a string, so we need to cast to an number to be compatable + parseInt(response.message), + body, + user, + commentBeingRepliedTo, + ), + ); + resetForm(); + } else { + setError('Sorry, there was a problem posting your comment.'); + } + } + }; + + const submitUserName = async (userName: string) => { + setError(''); + if (!userName) { + setError('Username field cannot be empty'); + return; + } + + const response = await addUserName(userName); + if (response.status === 'ok') { + // If we are able to submit userName we should continue with submitting comment + submitForm(); + setUserNameMissing(false); + } else { + response.errors && + setError(response.errors[0]?.message ?? 'unknown error'); + } + }; + + if (userNameMissing && body) { + return ( + setUserNameMissing(false)} + onPreview={onPreview} + /> + ); + } + + return ( + <> +
{ + e.preventDefault(); + submitForm(); + }} + > + {!!error && ( +
+

+

+ )} + {!!info && ( +
+

{info}

+
+ )} + {isActive && ( +
+

+ Please keep comments respectful and abide by the{' '} + + community guidelines + + . +

+ + {user.privateFields && + user.privateFields.isPremoderated && ( +

+ Your comments are currently being + pre-moderated ( + + why? + + ) +

+ )} +
+ )} + {!!errors.reason && ( @@ -250,8 +248,7 @@ export const AbuseReportForm = ({ setFormVariables({ ...formVariables, email: e.target.value, - }) - } + })} value={formVariables.email} > {!!errors.email && ( From a56071135c8bbf073ab92f4059f515fed9dec4c0 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Tue, 27 Jun 2023 19:59:25 +0100 Subject: [PATCH 016/147] Simplify AbuseReportForm test --- .../AbuseReportForm/AbuseReportForm.test.tsx | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx index 267ee9fe40c..875eb86affa 100644 --- a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx @@ -1,12 +1,7 @@ import '@testing-library/jest-dom/extend-expect'; - import { ArticlePillar } from '@guardian/libs'; -import { - render, - fireEvent, - // @ts-expect-error : https://github.com/testing-library/react-testing-library/issues/610 - waitFor, -} from '@testing-library/react'; +import { fireEvent, render, waitFor } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; import { mockFetchCalls } from '../../lib/mockFetchCalls'; import { AbuseReportForm } from './AbuseReportForm'; @@ -43,7 +38,8 @@ describe('Dropdown', () => { }); it('Should show the success message category is selected', async () => { - const { getByText, getByLabelText, queryByText } = render( + const user = userEvent.setup(); + const { getByText, getByLabelText, getByRole } = render( {}} pillar={ArticlePillar.Sport} @@ -51,17 +47,8 @@ describe('Dropdown', () => { />, ); - fireEvent.change(getByLabelText('Category'), { target: { value: 3 } }); - - fireEvent.click(getByText('Report')); - - const options: any = getByLabelText('Category'); - expect(options[1].selected).toBeFalsy(); - expect(options[3].selected).toBeTruthy(); - - expect( - queryByText('You must select a category before submitting'), - ).not.toBeInTheDocument(); + await user.selectOptions(getByLabelText('Category'), 'Legal issue'); + await user.click(getByRole('button', { name: 'Report' })); await waitFor(() => { expect(fetchMock.called(/reportAbuse/)).toBeTruthy(); From a766904835126092e14fb55feecf1f2ef5a9152e Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:05:05 +0100 Subject: [PATCH 017/147] lint fix for CommentContainer.test.tsx --- .../CommentContainer/CommentContainer.test.tsx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx index ff7386dbce0..4aa7135eab1 100644 --- a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx @@ -1,20 +1,14 @@ import '@testing-library/jest-dom/extend-expect'; import { ArticlePillar } from '@guardian/libs'; -import { - render, - fireEvent, - // @ts-expect-error : https://github.com/testing-library/react-testing-library/issues/610 - waitFor, -} from '@testing-library/react'; -import { vi } from 'vitest'; -import { CommentType } from '../../discussionTypes'; +import { fireEvent, render, waitFor } from '@testing-library/react'; +import type { CommentType } from '../../discussionTypes'; import { comment } from '../../fixtures/comment'; import { mockedMessageID, mockFetchCalls } from '../../lib/mockFetchCalls'; import { CommentContainer } from './CommentContainer'; mockFetchCalls(); -// @ts-expect-error +// @ts-expect-error -- We know this is not `undefined` const firstCommentResponse: CommentType = comment.responses[0]; const commentWithReply: CommentType = { @@ -49,7 +43,7 @@ describe('CommentContainer', () => { // a workaround to emulating hooks outside of render let commentBeingRepliedTo: CommentType | undefined = commentWithoutReply; - const mockSetCommentBeingRepliedTo = vi.fn( + const mockSetCommentBeingRepliedTo = jest.fn( (newCommentBeingRepliedTo?: CommentType) => { commentBeingRepliedTo = newCommentBeingRepliedTo; }, @@ -124,7 +118,7 @@ describe('CommentContainer', () => { // a workaround to emulating hooks outside of render let commentBeingRepliedTo: CommentType | undefined = firstCommentResponse; - const mockSetCommentBeingRepliedTo = vi.fn( + const mockSetCommentBeingRepliedTo = jest.fn( (newCommentBeingRepliedTo?: CommentType) => { commentBeingRepliedTo = newCommentBeingRepliedTo; }, From b0fe19d6891a31e4edab51c42735e5fb6c56570d Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:15:46 +0100 Subject: [PATCH 018/147] lint fixes for Comment --- .../components/Comment/Comment.tsx | 12 +++++------- .../src/discussion-rendering/discussionTypes.ts | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx index 8b35c7d8ad6..75adce04f3b 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx @@ -693,10 +693,9 @@ export const Comment = ({ )} {/* Only staff can pick, and they cannot pick thier own comment */} - {user && - user.badge.some( - (e) => e.name === 'Staff', - ) && + {user?.badge.some( + (e) => e.name === 'Staff', + ) && user.userId !== comment.userProfile.userId && (
{/* You can't mute unless logged in and you can't yourself */} - {user && - comment.userProfile.userId !== - user.userId ? ( + {comment.userProfile.userId !== + user?.userId ? (
Date: Tue, 27 Jun 2023 20:33:54 +0100 Subject: [PATCH 019/147] more lint fixes --- .../components/Dropdown/Dropdown.tsx | 8 +++--- .../LoadingComments/LoadingComments.tsx | 2 +- .../components/LoadingPicks/LoadingPicks.tsx | 2 +- .../RecommendationCount.tsx | 17 +++++++------ .../lib/identity-component-event.ts | 2 +- .../lib/mockFetchCalls.ts | 2 +- .../src/discussion-rendering/test-page.tsx | 25 +++++++++++++------ 7 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx index 82d5f67d896..bef829213b7 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { ArticleTheme } from '@guardian/libs'; +import type { ArticleTheme } from '@guardian/libs'; import { background, border, @@ -10,7 +10,7 @@ import { until, } from '@guardian/source-foundations'; import { useEffect, useState } from 'react'; -import { DropdownOptionType } from '../../discussionTypes'; +import type { DropdownOptionType } from '../../discussionTypes'; import { palette } from '../../lib/palette'; import { pillarToString } from '../../lib/pillarToString'; @@ -199,6 +199,7 @@ export const Dropdown = ({ id, label, options, pillar, onSelect }: Props) => { css={[buttonStyles, isExpanded && expandedStyles]} aria-controls={dropdownID} aria-expanded={isExpanded ? 'true' : 'false'} + type="button" > {activeLink ? activeLink.title : 'Please select'} @@ -213,7 +214,8 @@ export const Dropdown = ({ id, label, options, pillar, onSelect }: Props) => { option.isActive && activeStyles(pillar), index === 0 && firstStyles, ]} - disabled={option.isActive || option.disabled} + disabled={option.isActive ?? option.disabled} + type="button" > {option.title} diff --git a/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx b/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx index 59b456c923d..14037e4b24d 100644 --- a/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx @@ -56,7 +56,7 @@ const Grey = ({
{ - if (!accepted) { - setCount(newCount - 1); - setRecommended(alreadyRecommended); - } - }); + recommend(commentId) + .then((accepted) => { + if (!accepted) { + setCount(newCount - 1); + setRecommended(alreadyRecommended); + } + }) + .catch((e) => {}); }; return ( @@ -75,6 +77,7 @@ export const RecommendationCount = ({ disabled={recommended || !isSignedIn || userMadeComment} data-link-name="Recommend comment" aria-label="Recommend comment" + type="button" >
diff --git a/dotcom-rendering/src/discussion-rendering/lib/identity-component-event.ts b/dotcom-rendering/src/discussion-rendering/lib/identity-component-event.ts index 3f0879f15f1..5110b18605f 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/identity-component-event.ts +++ b/dotcom-rendering/src/discussion-rendering/lib/identity-component-event.ts @@ -2,7 +2,7 @@ export type AuthenticationComponentId = 'signin_to_reply_comment'; export const createAuthenticationEventParams = ( componentId: AuthenticationComponentId, -) => { +): string => { const params = `componentType=identityauthentication&componentId=${componentId}`; return `componentEventParams=${encodeURIComponent(params)}`; }; diff --git a/dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts b/dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts index 161486f8727..4058d1f05ce 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts +++ b/dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts @@ -9,7 +9,7 @@ import { topPicks } from '../fixtures/topPicks'; export const mockedMessageID = '123456'; -export const mockFetchCalls = () => { +export const mockFetchCalls = (): typeof fetchMock => { fetchMock .restore() // Comment count diff --git a/dotcom-rendering/src/discussion-rendering/test-page.tsx b/dotcom-rendering/src/discussion-rendering/test-page.tsx index 6683fe4b0ed..1303a4aa4c5 100644 --- a/dotcom-rendering/src/discussion-rendering/test-page.tsx +++ b/dotcom-rendering/src/discussion-rendering/test-page.tsx @@ -51,7 +51,11 @@ const IndexPageWrapper = () => {

- @@ -59,7 +63,11 @@ const IndexPageWrapper = () => { -
@@ -74,14 +82,16 @@ const IndexPageWrapper = () => { name="pillar" value={pillar} onChange={(e) => { - const pillar = e.target.value; - const validPillar = isPillar(pillar) ? pillar : 'news'; + const selectedPillar = e.target.value; + const validPillar = isPillar(selectedPillar) + ? selectedPillar + : 'news'; setPillar(validPillar); }} > - {pillars.map((pillar) => ( - ))} @@ -103,6 +113,7 @@ const IndexPageWrapper = () => { apiKey="discussion-rendering" initialPage={1} idApiUrl="https://idapi.theguardian.com" + test="" // page={page} // onPageChange={setPage} /> From 13e9a5a30318a56ba2bc8224d410e29653a1f7ab Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:49:21 +0100 Subject: [PATCH 020/147] refactor `dateFormatter` to use `Intl.DateTimeFormat` --- .../discussion-rendering/lib/dateFormatter.ts | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts b/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts index 9ff4e0a8819..9b9c3611c17 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts +++ b/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts @@ -1,36 +1,25 @@ import { timeAgo } from '@guardian/libs'; -const monthConverter: { [key: number]: string } = { - 0: 'Jan', - 1: 'Feb', - 2: 'Mar', - 3: 'Apr', - 4: 'May', - 5: 'Jun', - 6: 'Jul', - 7: 'Aug', - 8: 'Sep', - 9: 'Oct', - 10: 'Nov', - 11: 'Dec', -}; - const isLast24Hrs = (date: Date) => { const timeStamp = Math.round(new Date().getTime() / 1000); const timeStampYesterday = timeStamp - 24 * 3600; return date.getTime() >= new Date(timeStampYesterday * 1000).getTime(); }; -export const dateFormatter = (dateString: string) => { +export const dateFormatter = (dateString: string): string | false => { const date = new Date(dateString); if (isLast24Hrs(date)) { return timeAgo(date.getTime(), { verbose: true, daysUntilAbsolute: 1 }); } - return `${date.getDate()} ${ - monthConverter[date.getMonth()] - } ${date.getFullYear()} ${date.getHours()}.${String( - date.getMinutes(), - ).padStart(2, '0')}`; + const dateFormat = Intl.DateTimeFormat('en-gb', { + dateStyle: 'medium', // 27 Jun 2023 + }); + const timeFormat = Intl.DateTimeFormat('en-gb', { + timeStyle: 'short', // 20:46 + }); + return `${dateFormat.format(date)} ${timeFormat + .format(date) + .replace(':', '.')}`; }; From 570049e1f0efa177ebaf94d638a9fd810a6f9bc5 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 08:30:25 +0100 Subject: [PATCH 021/147] delete `joinUrl` module in favour of `@guardian/libs` implementation --- .../src/discussion-rendering/lib/api.tsx | 2 +- .../src/discussion-rendering/lib/joinUrl.ts | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 dotcom-rendering/src/discussion-rendering/lib/joinUrl.ts diff --git a/dotcom-rendering/src/discussion-rendering/lib/api.tsx b/dotcom-rendering/src/discussion-rendering/lib/api.tsx index 45ad4bf3c15..63056dc9717 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/api.tsx +++ b/dotcom-rendering/src/discussion-rendering/lib/api.tsx @@ -1,3 +1,4 @@ +import { joinUrl } from '@guardian/libs'; import type { AdditionalHeadersType, CommentResponse, @@ -9,7 +10,6 @@ import type { UserNameResponse, UserProfile, } from '../discussionTypes'; -import { joinUrl } from './joinUrl'; const options = { // Defaults diff --git a/dotcom-rendering/src/discussion-rendering/lib/joinUrl.ts b/dotcom-rendering/src/discussion-rendering/lib/joinUrl.ts deleted file mode 100644 index 928bc893c26..00000000000 --- a/dotcom-rendering/src/discussion-rendering/lib/joinUrl.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { isNonNullable } from '@guardian/libs'; - -/** - * Remove any leading or trailing slashes from all parts and then join cleanly on - * a single slash - prevents malformed urls - */ -export const joinUrl = (parts: string[]): string => { - const trimmed = parts - .filter(isNonNullable) // Filter any falsey parts - .map((part) => { - // Trim left - if (part.startsWith('/')) { - return part.slice(1); - } - return part; - }) - .map((part) => { - // Trim right - if (part.endsWith('/')) { - return part.slice(0, -1); - } - return part; - }); - - return trimmed.join('/'); -}; From 25f8b23b3f1df652e50e5b7ac57ea4498a4f994e Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 08:31:15 +0100 Subject: [PATCH 022/147] refactor to use jest over vitest --- .../components/Dropdown/Dropdown.test.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.test.tsx b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.test.tsx index 79d254edfe8..ee34aac576e 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.test.tsx @@ -1,9 +1,7 @@ import '@testing-library/jest-dom/extend-expect'; - import { ArticlePillar } from '@guardian/libs'; import { fireEvent, render, screen } from '@testing-library/react'; -import { vi } from 'vitest'; -import { DropdownOptionType } from '../../discussionTypes'; +import type { DropdownOptionType } from '../../discussionTypes'; import { Dropdown } from './Dropdown'; const threadOptions: [ @@ -133,7 +131,7 @@ describe('Dropdown', () => { }); it('should trigger the correct onSelect callbacks when an option is clicked', () => { - const mockCallback = vi.fn(); + const mockCallback = jest.fn(); render( Date: Wed, 28 Jun 2023 08:35:03 +0100 Subject: [PATCH 023/147] refactor arguments to `joinUrl` --- .../src/discussion-rendering/lib/api.tsx | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/api.tsx b/dotcom-rendering/src/discussion-rendering/lib/api.tsx index 63056dc9717..17b8e8b1021 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/api.tsx +++ b/dotcom-rendering/src/discussion-rendering/lib/api.tsx @@ -79,7 +79,7 @@ export const getDiscussion = ( }; const params = objAsParams(apiOpts); - const url = joinUrl([options.baseUrl, 'discussion', shortUrl]) + params; + const url = joinUrl(options.baseUrl, 'discussion', shortUrl) + params; return fetch(url, { headers: { @@ -106,7 +106,7 @@ export const getDiscussion = ( export const preview = (body: string): Promise => { const url = - joinUrl([options.baseUrl, 'comment/preview']) + + joinUrl(options.baseUrl, 'comment/preview') + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('body', body); @@ -126,7 +126,7 @@ export const preview = (body: string): Promise => { export const getProfile = (): Promise => { const url = - joinUrl([options.baseUrl, 'profile/me']) + objAsParams(defaultParams); + joinUrl(options.baseUrl, 'profile/me') + objAsParams(defaultParams); return fetch(url, { credentials: 'include', @@ -143,7 +143,7 @@ export const comment = ( body: string, ): Promise => { const url = - joinUrl([options.baseUrl, 'discussion', shortUrl, 'comment']) + + joinUrl(options.baseUrl, 'discussion', shortUrl, 'comment') + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('body', body); @@ -165,14 +165,14 @@ export const reply = ( parentCommentId: number, ): Promise => { const url = - joinUrl([ + joinUrl( options.baseUrl, 'discussion', shortUrl, 'comment', parentCommentId.toString(), 'reply', - ]) + objAsParams(defaultParams); + ) + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('body', body); @@ -192,7 +192,7 @@ export const getPicks = ( shortUrl: string, ): Promise => { const url = - joinUrl([options.baseUrl, 'discussion', shortUrl, 'topcomments']) + + joinUrl(options.baseUrl, 'discussion', shortUrl, 'topcomments') + objAsParams(defaultParams); return fetch(url, { @@ -217,12 +217,12 @@ export const reportAbuse = ({ email?: string; }): Promise => { const url = - joinUrl([ + joinUrl( options.baseUrl, 'comment', commentId.toString(), 'reportAbuse', - ]) + objAsParams(defaultParams); + ) + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('categoryId', categoryId.toString()); @@ -241,12 +241,8 @@ export const reportAbuse = ({ export const recommend = (commentId: number): Promise => { const url = - joinUrl([ - options.baseUrl, - 'comment', - commentId.toString(), - 'recommend', - ]) + objAsParams(defaultParams); + joinUrl(options.baseUrl, 'comment', commentId.toString(), 'recommend') + + objAsParams(defaultParams); return fetch(url, { method: 'POST', @@ -279,12 +275,8 @@ export const addUserName = (userName: string): Promise => { export const pickComment = (commentId: number): Promise => { const url = - joinUrl([ - options.baseUrl, - 'comment', - commentId.toString(), - 'highlight', - ]) + objAsParams(defaultParams); + joinUrl(options.baseUrl, 'comment', commentId.toString(), 'highlight') + + objAsParams(defaultParams); return fetch(url, { method: 'POST', @@ -300,12 +292,12 @@ export const pickComment = (commentId: number): Promise => { export const unPickComment = (commentId: number): Promise => { const url = - joinUrl([ + joinUrl( options.baseUrl, 'comment', commentId.toString(), 'unhighlight', - ]) + objAsParams(defaultParams); + ) + objAsParams(defaultParams); return fetch(url, { method: 'POST', @@ -326,7 +318,7 @@ export const getMoreResponses = ( comment: CommentType; }> => { const url = - joinUrl([options.baseUrl, 'comment', commentId.toString()]) + + joinUrl(options.baseUrl, 'comment', commentId.toString()) + objAsParams({ ...defaultParams, ...{ From da4667399d4a7726589f1944ac60380f1f3f36e1 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:14:29 +0100 Subject: [PATCH 024/147] refactor `objAsParams` to be more typesafe chance this has made things worse!! --- .../src/discussion-rendering/lib/api.tsx | 76 +++++++++++-------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/api.tsx b/dotcom-rendering/src/discussion-rendering/lib/api.tsx index 17b8e8b1021..51479688156 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/api.tsx +++ b/dotcom-rendering/src/discussion-rendering/lib/api.tsx @@ -3,7 +3,6 @@ import type { AdditionalHeadersType, CommentResponse, CommentType, - DiscussionOptions, DiscussionResponse, OrderByType, ThreadsType, @@ -42,14 +41,18 @@ export const initialiseApi = ({ defaultParams['api-key'] = options.apiKey; }; -const objAsParams = (obj: any): string => { - const params = Object.keys(obj) - .map((key) => { - return `${key}=${obj[key]}`; // type issues here cannot be avoided - }) - .join('&'); - - return '?' + params; +const makeParams = (params?: { + [key: string]: string | boolean | number; +}): URLSearchParams => { + const paramsWithDefault = Object.assign({ ...defaultParams }, params); + const thing: Record = Object.fromEntries( + Object.entries(paramsWithDefault).map( + ([k, v]: [string, string | boolean | number]) => { + return [k, v.toString()]; + }, + ), + ); + return new URLSearchParams(thing); }; //todo: figure out the different return types and consider error handling @@ -62,10 +65,10 @@ export const getDiscussion = ( page: number; }, ): Promise => { - const apiOpts: DiscussionOptions = { + const apiOpts = { ...defaultParams, ...{ - // Frontend uses the 'recommendations' key to store this options but the api expects + // Frontend uses the 'recommendations' key to store these options but the api expects // 'mostRecommended' so we have to map here to support both orderBy: opts.orderBy === 'recommendations' @@ -77,9 +80,11 @@ export const getDiscussion = ( page: opts.page, }, }; - const params = objAsParams(apiOpts); - - const url = joinUrl(options.baseUrl, 'discussion', shortUrl) + params; + const params = makeParams(apiOpts); + const url = + joinUrl(options.baseUrl, 'discussion', shortUrl) + + '?' + + params.toString(); return fetch(url, { headers: { @@ -107,7 +112,8 @@ export const getDiscussion = ( export const preview = (body: string): Promise => { const url = joinUrl(options.baseUrl, 'comment/preview') + - objAsParams(defaultParams); + '?' + + makeParams().toString(); const data = new URLSearchParams(); data.append('body', body); @@ -126,7 +132,7 @@ export const preview = (body: string): Promise => { export const getProfile = (): Promise => { const url = - joinUrl(options.baseUrl, 'profile/me') + objAsParams(defaultParams); + joinUrl(options.baseUrl, 'profile/me') + '?' + makeParams().toString(); return fetch(url, { credentials: 'include', @@ -144,7 +150,8 @@ export const comment = ( ): Promise => { const url = joinUrl(options.baseUrl, 'discussion', shortUrl, 'comment') + - objAsParams(defaultParams); + '?' + + makeParams().toString(); const data = new URLSearchParams(); data.append('body', body); @@ -172,7 +179,9 @@ export const reply = ( 'comment', parentCommentId.toString(), 'reply', - ) + objAsParams(defaultParams); + ) + + '?' + + makeParams().toString(); const data = new URLSearchParams(); data.append('body', body); @@ -193,7 +202,8 @@ export const getPicks = ( ): Promise => { const url = joinUrl(options.baseUrl, 'discussion', shortUrl, 'topcomments') + - objAsParams(defaultParams); + '?' + + makeParams().toString(); return fetch(url, { headers: { @@ -222,7 +232,9 @@ export const reportAbuse = ({ 'comment', commentId.toString(), 'reportAbuse', - ) + objAsParams(defaultParams); + ) + + '?' + + makeParams().toString(); const data = new URLSearchParams(); data.append('categoryId', categoryId.toString()); @@ -242,7 +254,8 @@ export const reportAbuse = ({ export const recommend = (commentId: number): Promise => { const url = joinUrl(options.baseUrl, 'comment', commentId.toString(), 'recommend') + - objAsParams(defaultParams); + '?' + + makeParams().toString(); return fetch(url, { method: 'POST', @@ -254,7 +267,7 @@ export const recommend = (commentId: number): Promise => { }; export const addUserName = (userName: string): Promise => { - const url = options.idApiUrl + `/user/me` + objAsParams(defaultParams); + const url = options.idApiUrl + `/user/me` + '?' + makeParams().toString(); return fetch(url, { method: 'POST', @@ -276,7 +289,8 @@ export const addUserName = (userName: string): Promise => { export const pickComment = (commentId: number): Promise => { const url = joinUrl(options.baseUrl, 'comment', commentId.toString(), 'highlight') + - objAsParams(defaultParams); + '?' + + makeParams().toString(); return fetch(url, { method: 'POST', @@ -297,7 +311,9 @@ export const unPickComment = (commentId: number): Promise => { 'comment', commentId.toString(), 'unhighlight', - ) + objAsParams(defaultParams); + ) + + '?' + + makeParams().toString(); return fetch(url, { method: 'POST', @@ -319,13 +335,11 @@ export const getMoreResponses = ( }> => { const url = joinUrl(options.baseUrl, 'comment', commentId.toString()) + - objAsParams({ - ...defaultParams, - ...{ - displayThreaded: true, - displayResponses: true, - }, - }); + '?' + + makeParams({ + displayThreaded: true, + displayResponses: true, + }).toString(); return fetch(url, { headers: { From f3c87300e0bd7d9a0c024ceacf98a53acbb99083 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:44:05 +0100 Subject: [PATCH 025/147] ignore unsafe member access errors ignore the correct line --- .../src/discussion-rendering/lib/api.tsx | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/api.tsx b/dotcom-rendering/src/discussion-rendering/lib/api.tsx index 51479688156..ff4b210886e 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/api.tsx +++ b/dotcom-rendering/src/discussion-rendering/lib/api.tsx @@ -34,7 +34,7 @@ export const initialiseApi = ({ idApiUrl: string; }) => { options.baseUrl = baseUrl || options.baseUrl; - options.headers = additionalHeaders || options.headers; + options.headers = additionalHeaders; options.apiKey = apiKey || options.apiKey; options.idApiUrl = idApiUrl || options.idApiUrl; @@ -94,6 +94,7 @@ export const getDiscussion = ( .then((resp) => resp.json()) .then((json) => { if ( + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access json.errorCode === 'DISCUSSION_ONLY_AVAILABLE_IN_LINEAR_FORMAT' ) { // We need force a refetch with unthreaded set, as we don't know @@ -117,17 +118,20 @@ export const preview = (body: string): Promise => { const data = new URLSearchParams(); data.append('body', body); - return fetch(url, { - method: 'POST', - body: data.toString(), - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - ...options.headers, - }, - }) - .then((resp) => resp.json()) - .then((json) => json.commentBody) - .catch((error) => console.error(`Error fetching ${url}`, error)); + return ( + fetch(url, { + method: 'POST', + body: data.toString(), + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + ...options.headers, + }, + }) + .then((resp) => resp.json()) + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + .then((json) => json.commentBody) + .catch((error) => console.error(`Error fetching ${url}`, error)) + ); }; export const getProfile = (): Promise => { @@ -205,14 +209,17 @@ export const getPicks = ( '?' + makeParams().toString(); - return fetch(url, { - headers: { - ...options.headers, - }, - }) - .then((resp) => resp.json()) - .then((json) => json.discussion.comments) - .catch((error) => console.error(`Error fetching ${url}`, error)); + return ( + fetch(url, { + headers: { + ...options.headers, + }, + }) + .then((resp) => resp.json()) + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + .then((json) => json.discussion.comments) + .catch((error) => console.error(`Error fetching ${url}`, error)) + ); }; export const reportAbuse = ({ From 991e3d8fba46ebae887701197bd8faacb07bdf36 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 11:20:01 +0100 Subject: [PATCH 026/147] more lint fixes --- .../src/discussion-rendering/App.stories.tsx | 2 +- .../src/discussion-rendering/App.tsx | 2 +- .../components/Column/Column.tsx | 2 +- .../FirstCommentWelcome.stories.tsx | 4 ++-- .../components/TopPick/TopPick.tsx | 20 ++++++++----------- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/App.stories.tsx b/dotcom-rendering/src/discussion-rendering/App.stories.tsx index 4e2042bceec..abd0f494f0f 100644 --- a/dotcom-rendering/src/discussion-rendering/App.stories.tsx +++ b/dotcom-rendering/src/discussion-rendering/App.stories.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import { ArticlePillar } from '@guardian/libs'; import { App } from './App'; -import { UserProfile } from './discussionTypes'; +import type { UserProfile } from './discussionTypes'; export default { component: App, title: 'App' }; diff --git a/dotcom-rendering/src/discussion-rendering/App.tsx b/dotcom-rendering/src/discussion-rendering/App.tsx index 85a20d84941..679e17a9b22 100644 --- a/dotcom-rendering/src/discussion-rendering/App.tsx +++ b/dotcom-rendering/src/discussion-rendering/App.tsx @@ -44,7 +44,7 @@ type Props = { onPreview?: (body: string) => Promise; onExpand?: () => void; idApiUrl: string; - test: string; + test?: string; }; const footerStyles = css` diff --git a/dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx b/dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx index 4008b5d11f7..ca6f3b274a9 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Column/Column.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -type Props = { children: JSX.Element | JSX.Element[] }; +type Props = { children: React.ReactNode }; export const Column = ({ children }: Props) => (
( {}} + submitForm={() => Promise.resolve()} cancelSubmit={() => {}} /> ); @@ -18,7 +18,7 @@ export const CommentWithError = () => ( body="My first message ever!!" pillar={ArticlePillar.News} error="This is a custom user name error message" - submitForm={() => {}} + submitForm={() => Promise.resolve()} cancelSubmit={() => {}} /> ); diff --git a/dotcom-rendering/src/discussion-rendering/components/TopPick/TopPick.tsx b/dotcom-rendering/src/discussion-rendering/components/TopPick/TopPick.tsx index 67464d0f185..1600a3ba573 100644 --- a/dotcom-rendering/src/discussion-rendering/components/TopPick/TopPick.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/TopPick/TopPick.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { ArticleTheme } from '@guardian/libs'; +import type { ArticleTheme } from '@guardian/libs'; import { brand, from, @@ -8,7 +8,7 @@ import { textSans, } from '@guardian/source-foundations'; import { Link } from '@guardian/source-react-components'; -import { CommentType } from '../../discussionTypes'; +import type { CommentType } from '../../discussionTypes'; import { palette } from '../../lib/palette'; import { pillarToString } from '../../lib/pillarToString'; import { Avatar } from '../Avatar/Avatar'; @@ -98,11 +98,7 @@ const wrapStyles = css` word-break: break-word; `; -const PickBubble = ({ - children, -}: { - children: JSX.Element | JSX.Element[]; -}) => ( +const PickBubble = ({ children }: { children: React.ReactNode }) => (
); -const Top = ({ children }: { children: JSX.Element | JSX.Element[] }) => ( +const Top = ({ children }: { children: React.ReactNode }) => (
{children}
); -const Bottom = ({ children }: { children: JSX.Element | JSX.Element[] }) => ( +const Bottom = ({ children }: { children: React.ReactNode }) => (
{children}
); -const PickMeta = ({ children }: { children: JSX.Element | JSX.Element[] }) => ( +const PickMeta = ({ children }: { children: React.ReactNode }) => (
{ - const showStaffBadge = comment.userProfile.badge.find( + const showStaffBadge = comment.userProfile.badge.some( (obj) => obj['name'] === 'Staff', ); - const showContributorBadge = comment.userProfile.badge.find( + const showContributorBadge = comment.userProfile.badge.some( (obj) => obj['name'] === 'Contributor', ); From 4aabb73609476e2a013db9f0e50576a983eca3cc Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 11:23:19 +0100 Subject: [PATCH 027/147] use type `React.ReactNode` for `children` props --- .../components/Dropdown/Dropdown.stories.tsx | 4 ++-- .../FirstCommentWelcome/FirstCommentWelcome.tsx | 8 +++----- .../components/LoadingPicks/LoadingPicks.tsx | 6 +----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.stories.tsx index 56345799f3e..c44a6d65ca0 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.stories.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.stories.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; import { ArticlePillar } from '@guardian/libs'; import { useState } from 'react'; -import { DropdownOptionType } from '../../discussionTypes'; +import type { DropdownOptionType } from '../../discussionTypes'; import { Dropdown } from './Dropdown'; -const Container = ({ children }: { children: JSX.Element | JSX.Element[] }) => ( +const Container = ({ children }: { children: React.ReactNode }) => (

{children}

; +const Text = ({ children }: { children: React.ReactNode }) => ( +

{children}

+); export const FirstCommentWelcome = ({ body, diff --git a/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx b/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx index 40af8d8aad1..682e7e8e106 100644 --- a/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx @@ -60,11 +60,7 @@ const pickBoxStyles = css` ${shimmerStyles} `; -const FullWidthColumn = ({ - children, -}: { - children: JSX.Element | JSX.Element[]; -}) => ( +const FullWidthColumn = ({ children }: { children: React.ReactNode }) => (
Date: Wed, 28 Jun 2023 12:21:31 +0100 Subject: [PATCH 028/147] stylelint fixes --- .../src/discussion-rendering/components/Comment/Comment.tsx | 3 +++ .../components/CommentForm/CommentForm.tsx | 1 - .../components/CommentReplyPreview/CommentReplyPreview.tsx | 5 +++-- .../components/Pagination/Pagination.tsx | 1 + .../src/discussion-rendering/components/Preview/Preview.tsx | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx index 75adce04f3b..ab60a84b7d1 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx @@ -102,6 +102,7 @@ const commentCss = css` } code { + /* stylelint-disable-next-line property-disallowed-list */ font-family: monospace; font-size: 1em; } @@ -168,8 +169,10 @@ const regularFont = css` } `; +// TODO: fix using !important const svgReplyArrow = css` svg { + /* stylelint-disable-next-line declaration-no-important */ fill: ${neutral[46]} !important; } `; diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx index 39158a5ef74..cf2c2558647 100644 --- a/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/CommentForm/CommentForm.tsx @@ -129,7 +129,6 @@ const commentAddOns = css` margin-left: 4px; padding: 2px 5px 0px 5px; min-width: 11px; - line-height: 17px; list-style-type: none; `; diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentReplyPreview/CommentReplyPreview.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentReplyPreview/CommentReplyPreview.tsx index 6ec994e8c96..be8375dcb71 100644 --- a/dotcom-rendering/src/discussion-rendering/components/CommentReplyPreview/CommentReplyPreview.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/CommentReplyPreview/CommentReplyPreview.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/react'; -import { ArticleTheme } from '@guardian/libs'; +import type { ArticleTheme } from '@guardian/libs'; import { neutral, space, text, textSans } from '@guardian/source-foundations'; import { Button, SvgIndent } from '@guardian/source-react-components'; import { useState } from 'react'; -import { CommentType } from '../../discussionTypes'; +import type { CommentType } from '../../discussionTypes'; import { palette } from '../../lib/palette'; import { pillarToString } from '../../lib/pillarToString'; import { Row } from '../Row/Row'; @@ -24,6 +24,7 @@ const Space = ({ amount }: { amount: 1 | 2 | 3 | 4 | 5 | 6 | 9 | 12 | 24 }) => ( const indentStyles = css` width: 18px; svg { + /* stylelint-disable-next-line declaration-no-important */ fill: ${neutral[46]} !important; } `; diff --git a/dotcom-rendering/src/discussion-rendering/components/Pagination/Pagination.tsx b/dotcom-rendering/src/discussion-rendering/components/Pagination/Pagination.tsx index cee39851822..4985dd201cc 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Pagination/Pagination.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Pagination/Pagination.tsx @@ -75,6 +75,7 @@ const chevronButtonStyles = ({ isSelected }: { isSelected: boolean }) => css` & svg { /* Make the chevrons grey */ + /* stylelint-disable-next-line declaration-no-important */ fill: ${neutral[46]} !important; /* Set the dimensions */ width: 22px; diff --git a/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx b/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx index 0bb668b4077..6ff8edbbaab 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx @@ -32,6 +32,7 @@ const previewStyle = css` } code { + /* stylelint-disable-next-line property-disallowed-list */ font-family: monospace; font-size: 1em; } From 963ab83038124a039f2fd497b77b1250c7ad3ada Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:37:02 +0100 Subject: [PATCH 029/147] prettier fixes --- .../AbuseReportForm/AbuseReportForm.tsx | 17 ++++++++++------- .../CommentContainer/CommentContainer.tsx | 9 +++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx index 72ae10ba9ae..7f9ad621299 100644 --- a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.tsx @@ -73,11 +73,11 @@ export const AbuseReportForm = ({ let lastElement: HTMLButtonElement | null = null; useEffect(() => { if (!modalRef.current) return; - // eslint-disable-next-line react-hooks/exhaustive-deps + // eslint-disable-next-line react-hooks/exhaustive-deps -- https://github.com/guardian/discussion-rendering/pull/56 for where this was first introduced firstElement = modalRef.current.querySelector( 'select[name="category"]', ); - // eslint-disable-next-line react-hooks/exhaustive-deps + // eslint-disable-next-line react-hooks/exhaustive-deps -- https://github.com/guardian/discussion-rendering/pull/56 for where this was first introduced lastElement = modalRef.current.querySelector( 'button[custom-guardian="close-modal"]', ); @@ -192,10 +192,11 @@ export const AbuseReportForm = ({ setFormVariables({ ...formVariables, categoryId: Number(e.target.value), - })} + }) + } value={formVariables.categoryId} - // TODO: use ref once forwardRef is implemented @guardian/src-button - // ref={firstElement} + // TODO: use ref once forwardRef is implemented @guardian/src-button + // ref={firstElement} > @@ -228,7 +229,8 @@ export const AbuseReportForm = ({ setFormVariables({ ...formVariables, reason: e.target.value, - })} + }) + } value={formVariables.reason} > {!!errors.reason && ( @@ -248,7 +250,8 @@ export const AbuseReportForm = ({ setFormVariables({ ...formVariables, email: e.target.value, - })} + }) + } value={formVariables.email} > {!!errors.email && ( diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx index b8bc3bca771..cccf2b24eed 100644 --- a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.tsx @@ -191,9 +191,9 @@ export const CommentContainer = ({ {loading ? 'loading...' : decideShowMoreText( - comment.metaData - .responseCount, - )} + comment.metaData + .responseCount, + )}
)} @@ -218,7 +218,8 @@ export const CommentContainer = ({ shortUrl={shortUrl} pillar={pillar} onAddComment={(response) => - setResponses([...responses, response])} + setResponses([...responses, response]) + } user={user} setCommentBeingRepliedTo={ setCommentBeingRepliedTo From 9ea918d50b97bed8623e903ca409c4030f269d62 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:37:56 +0100 Subject: [PATCH 030/147] Revert "refactor `dateFormatter` to use `Intl.DateTimeFormat`" This reverts commit 13e9a5a30318a56ba2bc8224d410e29653a1f7ab. --- .../discussion-rendering/lib/dateFormatter.ts | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts b/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts index 9b9c3611c17..9ff4e0a8819 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts +++ b/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts @@ -1,25 +1,36 @@ import { timeAgo } from '@guardian/libs'; +const monthConverter: { [key: number]: string } = { + 0: 'Jan', + 1: 'Feb', + 2: 'Mar', + 3: 'Apr', + 4: 'May', + 5: 'Jun', + 6: 'Jul', + 7: 'Aug', + 8: 'Sep', + 9: 'Oct', + 10: 'Nov', + 11: 'Dec', +}; + const isLast24Hrs = (date: Date) => { const timeStamp = Math.round(new Date().getTime() / 1000); const timeStampYesterday = timeStamp - 24 * 3600; return date.getTime() >= new Date(timeStampYesterday * 1000).getTime(); }; -export const dateFormatter = (dateString: string): string | false => { +export const dateFormatter = (dateString: string) => { const date = new Date(dateString); if (isLast24Hrs(date)) { return timeAgo(date.getTime(), { verbose: true, daysUntilAbsolute: 1 }); } - const dateFormat = Intl.DateTimeFormat('en-gb', { - dateStyle: 'medium', // 27 Jun 2023 - }); - const timeFormat = Intl.DateTimeFormat('en-gb', { - timeStyle: 'short', // 20:46 - }); - return `${dateFormat.format(date)} ${timeFormat - .format(date) - .replace(':', '.')}`; + return `${date.getDate()} ${ + monthConverter[date.getMonth()] + } ${date.getFullYear()} ${date.getHours()}.${String( + date.getMinutes(), + ).padStart(2, '0')}`; }; From 8e93fbd2af960cb677ea6b08078b9ec3bd1d2fb7 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:39:04 +0100 Subject: [PATCH 031/147] Revert "refactor `objAsParams` to be more typesafe" This reverts commit da4667399d4a7726589f1944ac60380f1f3f36e1. --- .../src/discussion-rendering/lib/api.tsx | 76 ++++++++----------- 1 file changed, 31 insertions(+), 45 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/api.tsx b/dotcom-rendering/src/discussion-rendering/lib/api.tsx index ff4b210886e..28b37d5760e 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/api.tsx +++ b/dotcom-rendering/src/discussion-rendering/lib/api.tsx @@ -3,6 +3,7 @@ import type { AdditionalHeadersType, CommentResponse, CommentType, + DiscussionOptions, DiscussionResponse, OrderByType, ThreadsType, @@ -41,18 +42,14 @@ export const initialiseApi = ({ defaultParams['api-key'] = options.apiKey; }; -const makeParams = (params?: { - [key: string]: string | boolean | number; -}): URLSearchParams => { - const paramsWithDefault = Object.assign({ ...defaultParams }, params); - const thing: Record = Object.fromEntries( - Object.entries(paramsWithDefault).map( - ([k, v]: [string, string | boolean | number]) => { - return [k, v.toString()]; - }, - ), - ); - return new URLSearchParams(thing); +const objAsParams = (obj: any): string => { + const params = Object.keys(obj) + .map((key) => { + return `${key}=${obj[key]}`; // type issues here cannot be avoided + }) + .join('&'); + + return '?' + params; }; //todo: figure out the different return types and consider error handling @@ -65,10 +62,10 @@ export const getDiscussion = ( page: number; }, ): Promise => { - const apiOpts = { + const apiOpts: DiscussionOptions = { ...defaultParams, ...{ - // Frontend uses the 'recommendations' key to store these options but the api expects + // Frontend uses the 'recommendations' key to store this options but the api expects // 'mostRecommended' so we have to map here to support both orderBy: opts.orderBy === 'recommendations' @@ -80,11 +77,9 @@ export const getDiscussion = ( page: opts.page, }, }; - const params = makeParams(apiOpts); - const url = - joinUrl(options.baseUrl, 'discussion', shortUrl) + - '?' + - params.toString(); + const params = objAsParams(apiOpts); + + const url = joinUrl(options.baseUrl, 'discussion', shortUrl) + params; return fetch(url, { headers: { @@ -113,8 +108,7 @@ export const getDiscussion = ( export const preview = (body: string): Promise => { const url = joinUrl(options.baseUrl, 'comment/preview') + - '?' + - makeParams().toString(); + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('body', body); @@ -136,7 +130,7 @@ export const preview = (body: string): Promise => { export const getProfile = (): Promise => { const url = - joinUrl(options.baseUrl, 'profile/me') + '?' + makeParams().toString(); + joinUrl(options.baseUrl, 'profile/me') + objAsParams(defaultParams); return fetch(url, { credentials: 'include', @@ -154,8 +148,7 @@ export const comment = ( ): Promise => { const url = joinUrl(options.baseUrl, 'discussion', shortUrl, 'comment') + - '?' + - makeParams().toString(); + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('body', body); @@ -183,9 +176,7 @@ export const reply = ( 'comment', parentCommentId.toString(), 'reply', - ) + - '?' + - makeParams().toString(); + ) + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('body', body); @@ -206,8 +197,7 @@ export const getPicks = ( ): Promise => { const url = joinUrl(options.baseUrl, 'discussion', shortUrl, 'topcomments') + - '?' + - makeParams().toString(); + objAsParams(defaultParams); return ( fetch(url, { @@ -239,9 +229,7 @@ export const reportAbuse = ({ 'comment', commentId.toString(), 'reportAbuse', - ) + - '?' + - makeParams().toString(); + ) + objAsParams(defaultParams); const data = new URLSearchParams(); data.append('categoryId', categoryId.toString()); @@ -261,8 +249,7 @@ export const reportAbuse = ({ export const recommend = (commentId: number): Promise => { const url = joinUrl(options.baseUrl, 'comment', commentId.toString(), 'recommend') + - '?' + - makeParams().toString(); + objAsParams(defaultParams); return fetch(url, { method: 'POST', @@ -274,7 +261,7 @@ export const recommend = (commentId: number): Promise => { }; export const addUserName = (userName: string): Promise => { - const url = options.idApiUrl + `/user/me` + '?' + makeParams().toString(); + const url = options.idApiUrl + `/user/me` + objAsParams(defaultParams); return fetch(url, { method: 'POST', @@ -296,8 +283,7 @@ export const addUserName = (userName: string): Promise => { export const pickComment = (commentId: number): Promise => { const url = joinUrl(options.baseUrl, 'comment', commentId.toString(), 'highlight') + - '?' + - makeParams().toString(); + objAsParams(defaultParams); return fetch(url, { method: 'POST', @@ -318,9 +304,7 @@ export const unPickComment = (commentId: number): Promise => { 'comment', commentId.toString(), 'unhighlight', - ) + - '?' + - makeParams().toString(); + ) + objAsParams(defaultParams); return fetch(url, { method: 'POST', @@ -342,11 +326,13 @@ export const getMoreResponses = ( }> => { const url = joinUrl(options.baseUrl, 'comment', commentId.toString()) + - '?' + - makeParams({ - displayThreaded: true, - displayResponses: true, - }).toString(); + objAsParams({ + ...defaultParams, + ...{ + displayThreaded: true, + displayResponses: true, + }, + }); return fetch(url, { headers: { From 34a5adcfced1409da884cf8680c4b45c1d9e2ca3 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:42:15 +0100 Subject: [PATCH 032/147] add comments about why we ignore eslint errors --- dotcom-rendering/src/discussion-rendering/lib/api.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/api.tsx b/dotcom-rendering/src/discussion-rendering/lib/api.tsx index 28b37d5760e..c4427a25e83 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/api.tsx +++ b/dotcom-rendering/src/discussion-rendering/lib/api.tsx @@ -45,7 +45,9 @@ export const initialiseApi = ({ const objAsParams = (obj: any): string => { const params = Object.keys(obj) .map((key) => { - return `${key}=${obj[key]}`; // type issues here cannot be avoided + // TODO: Refactor this for better typesafety. See https://github.com/guardian/dotcom-rendering/pull/8057/commits/da4667399d4a7726589f1944ac60380f1f3f36e1 + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions -- type issues here cannot be avoided with this implementation + return `${key}=${obj[key]}`; }) .join('&'); From 155f35fca7477011a9a442f79545a9e2f3554dcc Mon Sep 17 00:00:00 2001 From: Olly <9575458+OllysCoding@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:45:52 +0100 Subject: [PATCH 033/147] fix: Use correct layouts when ad-free for dynamic/slow-mpu --- .../src/components/DecideContainer.tsx | 1 - .../src/components/DynamicFast.tsx | 38 +- .../src/components/DynamicSlow.tsx | 56 +-- .../src/components/DynamicSlowMPU.stories.tsx | 66 +++- .../src/components/DynamicSlowMPU.tsx | 350 +++++++++--------- dotcom-rendering/src/lib/dynamicSlices.tsx | 91 +++++ 6 files changed, 333 insertions(+), 269 deletions(-) diff --git a/dotcom-rendering/src/components/DecideContainer.tsx b/dotcom-rendering/src/components/DecideContainer.tsx index fbfd6025a8b..66889a8cedc 100644 --- a/dotcom-rendering/src/components/DecideContainer.tsx +++ b/dotcom-rendering/src/components/DecideContainer.tsx @@ -68,7 +68,6 @@ export const DecideContainer = ({ showAge={showAge} adIndex={adIndex} renderAds={renderAds} - trails={trails} /> ); case 'dynamic/package': diff --git a/dotcom-rendering/src/components/DynamicFast.tsx b/dotcom-rendering/src/components/DynamicFast.tsx index 0d553ef96ee..2816bbce2d3 100644 --- a/dotcom-rendering/src/components/DynamicFast.tsx +++ b/dotcom-rendering/src/components/DynamicFast.tsx @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/naming-convention -- because underscores work here*/ import { Card25Media25, Card50Media50Tall, @@ -7,6 +6,7 @@ import { import { Card100PictureRight, Card100PictureTop, + Card25_Card25_Card25_Card25, Card25_Card75, Card50_Card50, Card75_Card25, @@ -423,42 +423,6 @@ const Card25_Card25_Card25_ColumnOfThreeCards25 = ({ ); }; -const Card25_Card25_Card25_Card25 = ({ - cards, - showAge, - containerPalette, -}: { - cards: DCRFrontCard[]; - showAge?: boolean; - containerPalette?: DCRContainerPalette; -}) => { - if (cards.length < 4) return null; - - const bigs = cards.slice(0, 4); - - return ( -
    - {bigs.map((card, cardIndex) => { - return ( -
  • - -
    • - ); - })} -
- ); -}; - export const DynamicFast = ({ groupedTrails, containerPalette, diff --git a/dotcom-rendering/src/components/DynamicSlow.tsx b/dotcom-rendering/src/components/DynamicSlow.tsx index 168b30b8ee3..bda86ba21df 100644 --- a/dotcom-rendering/src/components/DynamicSlow.tsx +++ b/dotcom-rendering/src/components/DynamicSlow.tsx @@ -1,5 +1,4 @@ import { - Card25Media25Tall, Card50Media50, CardDefaultMedia, CardDefaultMediaMobile, @@ -10,6 +9,7 @@ import { Card25_Card75, Card50_Card50, Card75_Card25, + ColumnOfCards50_Card25_Card25, filterGroupedTrails, shouldPadWrappableRows, } from '../lib/dynamicSlices'; @@ -79,60 +79,6 @@ const ColumnOfCards50_Card50 = ({ ); }; -const ColumnOfCards50_Card25_Card25 = ({ - cards, - showAge, - containerPalette, -}: { - cards: DCRFrontCard[]; - showAge?: boolean; - containerPalette?: DCRContainerPalette; -}) => { - const bigs = cards.slice(0, 2).reverse(); - const remaining = cards.slice(2); - - return ( -
    - {bigs.map((big) => { - return ( -
  • - -
    • - ); - })} -
  • -
      - {remaining.map((card) => { - return ( -
    • - -
      • - ); - })} -
    -
    • -
- ); -}; - const ColumnOfCards50_ColumnOfCards50 = ({ cards, showAge, diff --git a/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx b/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx index 9095cefc263..8f92fa0fc0b 100644 --- a/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx +++ b/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx @@ -33,7 +33,6 @@ export const NoBigs = () => ( showAge={true} adIndex={1} renderAds={true} - trails={trails} /> ); @@ -52,7 +51,6 @@ export const OneBig = () => ( showAge={true} adIndex={1} renderAds={true} - trails={trails} /> ); @@ -71,7 +69,6 @@ export const TwoBigs = () => ( showAge={true} adIndex={1} renderAds={true} - trails={trails} /> ); @@ -94,7 +91,6 @@ export const FirstBigBoosted = () => ( showAge={true} adIndex={1} renderAds={true} - trails={trails} /> ); @@ -117,7 +113,6 @@ export const SecondBigBoosted = () => ( showAge={true} adIndex={1} renderAds={true} - trails={trails} /> ); @@ -136,7 +131,6 @@ export const ThreeBigs = () => ( showAge={true} adIndex={1} renderAds={true} - trails={trails} /> ); @@ -155,13 +149,12 @@ export const AllBigs = () => ( showAge={true} adIndex={1} renderAds={true} - trails={trails} /> ); AllBigs.storyName = 'with lots of bigs and no standards'; -export const AdfreeDynamicSlowMPU = () => ( +export const AllBigsNoMPU = () => ( ( showAge={true} adIndex={1} renderAds={false} - trails={trails} /> ); -AdfreeDynamicSlowMPU.storyName = 'Ad-free dynamic slow MPU'; +AllBigsNoMPU.storyName = 'Ad-free with lots of bigs'; + +export const TwoBigsThreeStandardsNoMPU = () => ( + + + +); +TwoBigsThreeStandardsNoMPU.storyName = 'Ad-free with 2 bigs & 3 standards'; + +export const NoBigsTwoStandardsNoMPU = () => ( + + + +); +NoBigsTwoStandardsNoMPU.storyName = 'Ad-free with 0 bigs & 2 standards'; + +export const NoBigsFiveStandardsNoMPU = () => ( + + + +); +NoBigsFiveStandardsNoMPU.storyName = 'Ad-free with 0 bigs & 5 standards'; diff --git a/dotcom-rendering/src/components/DynamicSlowMPU.tsx b/dotcom-rendering/src/components/DynamicSlowMPU.tsx index e08c134fd8d..16d75b80028 100644 --- a/dotcom-rendering/src/components/DynamicSlowMPU.tsx +++ b/dotcom-rendering/src/components/DynamicSlowMPU.tsx @@ -1,15 +1,17 @@ import { Hide } from '@guardian/source-react-components'; import { - Card25Media25SmallHeadline, Card33Media33, CardDefault, CardDefaultMediaMobile, } from '../lib/cardWrappers'; import { + Card25_Card25_Card25_Card25, Card25_Card75, Card50_Card25_Card25, Card50_Card50, Card75_Card25, + ColumnOfCards50_Card25_Card25, + filterGroupedTrails, } from '../lib/dynamicSlices'; import type { DCRContainerPalette, @@ -26,7 +28,6 @@ type Props = { showAge?: boolean; adIndex: number; renderAds: boolean; - trails: DCRFrontCard[]; }; /* .___________.___________.___________. @@ -86,6 +87,33 @@ const Card33_ColumnOfThree33_Ad33 = ({ ); }; +/* .___________.___________.___________. + * |___________|___________|___________| + */ +const Card33_Card33_Card33 = ({ + cards, + containerPalette, + showAge, +}: { + cards: DCRFrontCard[]; + containerPalette?: DCRContainerPalette; + showAge?: boolean; +}) => { + return ( +
    + {cards.slice(0, 3).map((card) => ( +
  • + +
    • + ))} +
+ ); +}; + /* ._________________._________________. * |_###_____________| | * |_###_____________| MPU | @@ -128,216 +156,206 @@ const ColumnOfThree50_Ad50 = ({ ); }; -type MPUProps = { - groupedTrails: DCRGroupedTrails; - containerPalette?: DCRContainerPalette; - showAge?: boolean; - adIndex: number; -}; - -const MPUSlice = ({ +/** + * DynamicSlowMPU + * + * This container only allows big and standard cards (from groupedTrails) + * + * Layout is dynamic deopending on the number of big cards. You're only + * allowed to have 2 or 3 big cards. If you pass 1 a standard card will + * get promoted to make two bigs. If you pass more than 3 bigs then the + * extras will get demoted to standard. + * + * If you pass no bigs at all the top slice will not render and a special + * 3 column layout is used for the remaining slice. + * + */ +export const DynamicSlowMPU = ({ groupedTrails, containerPalette, showAge, adIndex, -}: MPUProps) => { - let layout: - | 'noBigs' + renderAds, +}: Props) => { + let firstSliceLayout: + | undefined | 'twoBigs' | 'twoBigsFirstBoosted' | 'twoBigsSecondBoosted' | 'threeBigs'; - let bigCards: DCRFrontCard[] = []; - let standardCards: DCRFrontCard[] = []; - switch (groupedTrails.big.length) { - case 0: { - standardCards = groupedTrails.standard; - layout = 'noBigs'; - break; - } - case 1: { - // If there is only one big item a standard item is promoted such that - // there is always at least two - const promoted = groupedTrails.standard.slice(0, 1); - bigCards = [...groupedTrails.big, ...promoted]; - standardCards = groupedTrails.standard.slice(1); - layout = 'twoBigs'; - break; + let firstSliceCards: DCRFrontCard[] = []; + if (groupedTrails.big.length === 1) { + // If there is only one big item a standard item is promoted such that + // there is always at least two + const promoted = groupedTrails.standard.slice(0, 1); + firstSliceCards = [...groupedTrails.big, ...promoted]; + firstSliceLayout = 'twoBigs'; + } else if (groupedTrails.big.length === 2) { + firstSliceCards = groupedTrails.big.slice(0, 2); + if (groupedTrails.big[0]?.isBoosted) { + firstSliceLayout = 'twoBigsFirstBoosted'; + } else if (groupedTrails.big[1]?.isBoosted) { + firstSliceLayout = 'twoBigsSecondBoosted'; + } else { + firstSliceLayout = 'twoBigs'; } - case 2: { - bigCards = groupedTrails.big; - standardCards = groupedTrails.standard; - if (groupedTrails.big[0]?.isBoosted) { - layout = 'twoBigsFirstBoosted'; - } else if (groupedTrails.big[1]?.isBoosted) { - layout = 'twoBigsSecondBoosted'; + } else if (groupedTrails.big.length > 2) { + firstSliceCards = groupedTrails.big.slice(0, 3); + firstSliceLayout = 'threeBigs'; + } + + // Create our object of grouped trails that doesn't include any + // cards used by the first slice + const secondSliceGroupedTrails = filterGroupedTrails({ + groupedTrails, + filter: firstSliceCards, + }); + + let secondSliceLayout: + | 'noFirstSlice' + | 'standard' + | 'noFirstSliceNoMPU' + | 'noFirstSliceNoMPUThreeOrMore' + | 'standardNoMPU' + | 'standardNoMPUFourOrMore'; + + let secondSliceCards: DCRFrontCard[] = []; + const standards = [ + // Demote any left over 'big' grouped cards + ...secondSliceGroupedTrails.big, + ...secondSliceGroupedTrails.standard, + ]; + + if (firstSliceCards.length === 0) { + if (renderAds) { + secondSliceCards = standards; + secondSliceLayout = 'noFirstSlice'; + } else { + if (standards.length > 2) { + secondSliceCards = standards.slice(0, 4); + secondSliceLayout = 'noFirstSliceNoMPUThreeOrMore'; } else { - layout = 'twoBigs'; + secondSliceCards = standards.slice(0, 2); + secondSliceLayout = 'noFirstSliceNoMPU'; } - break; - } - case 3: { - bigCards = groupedTrails.big; - standardCards = groupedTrails.standard; - layout = 'threeBigs'; - break; } - default: { - // If there are more than three big cards, these extra bigs are demoted to - // standard. - const demoted = groupedTrails.big.slice(3); - standardCards = [...demoted, ...groupedTrails.standard]; - bigCards = groupedTrails.big.slice(0, 3); - layout = 'threeBigs'; + } else { + if (renderAds) { + secondSliceCards = standards; + secondSliceLayout = 'standard'; + } else { + if (standards.length > 3) { + secondSliceCards = standards.slice(0, 5); + secondSliceLayout = 'standardNoMPUFourOrMore'; + } else { + secondSliceCards = standards.slice(0, 3); + secondSliceLayout = 'standardNoMPU'; + } } } - switch (layout) { - case 'noBigs': { - return ( - - ); - } - case 'twoBigs': { - return ( - <> + const FirstSlice = () => { + switch (firstSliceLayout) { + case 'twoBigs': + return ( - - - ); - } - case 'twoBigsFirstBoosted': { - return ( - <> - - - - ); + ); + default: + return <>; } - case 'twoBigsSecondBoosted': { - return ( - <> - { + switch (secondSliceLayout) { + // With MPU + case 'standard': + return ( + - - - ); - } - case 'threeBigs': { - return ( - <> - - - - ); - } - } -}; - -type NonMPUProps = { - containerPalette?: DCRContainerPalette; - showAge?: boolean; - trails: DCRFrontCard[]; -}; + ); -const NonMPUSlice = ({ trails, containerPalette, showAge }: NonMPUProps) => { - return ( -
    - {trails.slice(0, 4).map((card, cardIndex) => { + case 'noFirstSliceNoMPU': + return ( + + ); + case 'noFirstSliceNoMPUThreeOrMore': return ( -
  • 0} + - -
    • + /> ); - })} -
- ); -}; + } + }; -/** - * DynamicSlowMPU - * - * This container only allows big and standard cards (from groupedTrails) - * - * Layout is dynamic deopending on the number of big cards. You're only - * allowed to have 2 or 3 big cards. If you pass 1 a standard card will - * get promoted to make two bigs. If you pass more than 3 bigs then the - * extras will get demoted to standard. - * - * If you pass no bigs at all the top slice will not render and a special - * 3 column layout is used for the remaining slice. - * - */ -export const DynamicSlowMPU = ({ - groupedTrails, - containerPalette, - showAge, - adIndex, - renderAds, - trails, -}: Props) => { - return renderAds ? ( - - ) : ( - + return ( + <> + + + ); }; diff --git a/dotcom-rendering/src/lib/dynamicSlices.tsx b/dotcom-rendering/src/lib/dynamicSlices.tsx index 04f59417826..54ce79e0a5d 100644 --- a/dotcom-rendering/src/lib/dynamicSlices.tsx +++ b/dotcom-rendering/src/lib/dynamicSlices.tsx @@ -15,6 +15,7 @@ import { Card50Media50Tall, Card75Media50Left, Card75Media50Right, + CardDefaultMedia, } from './cardWrappers'; /** @@ -236,6 +237,96 @@ export const Card100PictureTop = ({ ); }; +export const Card25_Card25_Card25_Card25 = ({ + cards, + showAge, + containerPalette, +}: { + cards: DCRFrontCard[]; + showAge?: boolean; + containerPalette?: DCRContainerPalette; +}) => { + if (cards.length < 4) return null; + + const bigs = cards.slice(0, 4); + + return ( +
    + {bigs.map((card, cardIndex) => { + return ( +
  • + +
    • + ); + })} +
+ ); +}; + +export const ColumnOfCards50_Card25_Card25 = ({ + cards, + showAge, + containerPalette, +}: { + cards: DCRFrontCard[]; + showAge?: boolean; + containerPalette?: DCRContainerPalette; +}) => { + const bigs = cards.slice(0, 2).reverse(); + const remaining = cards.slice(2); + + return ( +
    + {bigs.map((big) => { + return ( +
  • + +
    • + ); + })} +
  • +
      + {remaining.map((card) => { + return ( +
    • + +
      • + ); + })} +
    +
    • +
+ ); +}; + /* .___________________________________. * | ############################| * | ############################| From a467408cfa5fb26b71aee96c94bb45cd541694f1 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:47:46 +0100 Subject: [PATCH 034/147] remove `test` prop --- dotcom-rendering/src/components/Discussion.tsx | 2 -- dotcom-rendering/src/discussion-rendering/App.tsx | 3 --- dotcom-rendering/src/discussion-rendering/test-page.tsx | 1 - 3 files changed, 6 deletions(-) diff --git a/dotcom-rendering/src/components/Discussion.tsx b/dotcom-rendering/src/components/Discussion.tsx index 46301190b10..fe5fa1c0eb8 100644 --- a/dotcom-rendering/src/components/Discussion.tsx +++ b/dotcom-rendering/src/components/Discussion.tsx @@ -145,7 +145,6 @@ export const Discussion = ({ } }, [commentCount]); - const test = 'foo'; return ( <>
{!isExpanded && (
diff --git a/dotcom-rendering/src/discussion-rendering/App.tsx b/dotcom-rendering/src/discussion-rendering/App.tsx index 679e17a9b22..ba29d92ab8c 100644 --- a/dotcom-rendering/src/discussion-rendering/App.tsx +++ b/dotcom-rendering/src/discussion-rendering/App.tsx @@ -44,7 +44,6 @@ type Props = { onPreview?: (body: string) => Promise; onExpand?: () => void; idApiUrl: string; - test?: string; }; const footerStyles = css` @@ -234,7 +233,6 @@ export const App = ({ onPreview, onExpand, idApiUrl, - test, }: Props) => { const [filters, setFilters] = useState( initialiseFilters({ @@ -497,7 +495,6 @@ export const App = ({ return ( <> -
{test}
{user && !isClosedForComments && ( { apiKey="discussion-rendering" initialPage={1} idApiUrl="https://idapi.theguardian.com" - test="" // page={page} // onPageChange={setPage} /> From a0a60a99a4ed3ba635a7eed863c316f5d724e799 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 13:03:18 +0100 Subject: [PATCH 035/147] refactor test to check request body for `categoryId` --- .../components/AbuseReportForm/AbuseReportForm.test.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx index 875eb86affa..c2160435e27 100644 --- a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx @@ -47,11 +47,13 @@ describe('Dropdown', () => { />, ); - await user.selectOptions(getByLabelText('Category'), 'Legal issue'); + await user.selectOptions(getByLabelText('Category'), 'Trolling'); await user.click(getByRole('button', { name: 'Report' })); await waitFor(() => { - expect(fetchMock.called(/reportAbuse/)).toBeTruthy(); + expect(fetchMock.lastOptions(/reportAbuse/)?.body).toBe( + 'categoryId=4', + ); }); await waitFor(() => { From 9f5dfe6ca6201f3e18146ea4408c580631eb332d Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 14:21:20 +0100 Subject: [PATCH 036/147] return `undefined` to silence empty function warning --- .../components/AbuseReportForm/AbuseReportForm.test.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx index c2160435e27..2ac73e0ff57 100644 --- a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx @@ -11,7 +11,7 @@ describe('Dropdown', () => { it('Should show the expected label names', () => { const { getByText } = render( {}} + toggleSetShowForm={() => undefined} pillar={ArticlePillar.Sport} commentId={123} />, @@ -25,7 +25,7 @@ describe('Dropdown', () => { it('Should show the category error message if not chosen on submit', () => { const { getByText } = render( {}} + toggleSetShowForm={() => undefined} pillar={ArticlePillar.Sport} commentId={123} />, @@ -41,7 +41,7 @@ describe('Dropdown', () => { const user = userEvent.setup(); const { getByText, getByLabelText, getByRole } = render( {}} + toggleSetShowForm={() => undefined} pillar={ArticlePillar.Sport} commentId={123} />, From cabb8c094420a14a41623da2e52c2c86fbcd23fb Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 14:29:16 +0100 Subject: [PATCH 037/147] refactor month name lookup --- .../discussion-rendering/lib/dateFormatter.ts | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts b/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts index 9ff4e0a8819..146aa1df729 100644 --- a/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts +++ b/dotcom-rendering/src/discussion-rendering/lib/dateFormatter.ts @@ -1,18 +1,34 @@ import { timeAgo } from '@guardian/libs'; -const monthConverter: { [key: number]: string } = { - 0: 'Jan', - 1: 'Feb', - 2: 'Mar', - 3: 'Apr', - 4: 'May', - 5: 'Jun', - 6: 'Jul', - 7: 'Aug', - 8: 'Sep', - 9: 'Oct', - 10: 'Nov', - 11: 'Dec', +const getMonthString = (month: number): string => { + switch (month) { + case 0: + return 'Jan'; + case 1: + return 'Feb'; + case 2: + return 'Mar'; + case 3: + return 'Apr'; + case 4: + return 'May'; + case 5: + return 'Jun'; + case 6: + return 'Jul'; + case 7: + return 'Aug'; + case 8: + return 'Sep'; + case 9: + return 'Oct'; + case 10: + return 'Nov'; + case 11: + return 'Dec'; + default: + return ''; + } }; const isLast24Hrs = (date: Date) => { @@ -21,16 +37,16 @@ const isLast24Hrs = (date: Date) => { return date.getTime() >= new Date(timeStampYesterday * 1000).getTime(); }; -export const dateFormatter = (dateString: string) => { +export const dateFormatter = (dateString: string): string | false => { const date = new Date(dateString); if (isLast24Hrs(date)) { return timeAgo(date.getTime(), { verbose: true, daysUntilAbsolute: 1 }); } - return `${date.getDate()} ${ - monthConverter[date.getMonth()] - } ${date.getFullYear()} ${date.getHours()}.${String( + return `${date.getDate()} ${getMonthString( + date.getMonth(), + )} ${date.getFullYear()} ${date.getHours()}.${String( date.getMinutes(), ).padStart(2, '0')}`; }; From caf58b85b6cac6d0fb160bcae9903cc0a1ce378b Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:09:56 +0100 Subject: [PATCH 038/147] refactor disabled dropdown logic --- .../src/discussion-rendering/components/Dropdown/Dropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx index bef829213b7..561b49ea409 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Dropdown/Dropdown.tsx @@ -214,7 +214,7 @@ export const Dropdown = ({ id, label, options, pillar, onSelect }: Props) => { option.isActive && activeStyles(pillar), index === 0 && firstStyles, ]} - disabled={option.isActive ?? option.disabled} + disabled={!!option.isActive || !!option.disabled} type="button" > {option.title} From 9733f158eb4f2222ed2dbb94462ec0b553848a79 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:10:10 +0100 Subject: [PATCH 039/147] add comment explaining we don't have a Source monospace font --- .../src/discussion-rendering/components/Comment/Comment.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx index ab60a84b7d1..5e220731474 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx @@ -102,7 +102,7 @@ const commentCss = css` } code { - /* stylelint-disable-next-line property-disallowed-list */ + /* stylelint-disable-next-line property-disallowed-list -- we do not have a monospace Source font */ font-family: monospace; font-size: 1em; } From 802fd68b639e59224edf64cf844600e3dad5c86a Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:10:25 +0100 Subject: [PATCH 040/147] fix logic for muting users --- .../discussion-rendering/components/Comment/Comment.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx index 5e220731474..0b2d7e6b346 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx @@ -737,9 +737,10 @@ export const Comment = ({ )} - {/* You can't mute unless logged in and you can't yourself */} - {comment.userProfile.userId !== - user?.userId ? ( + {/* You can't mute unless logged in and you can't mute yourself */} + {user && + comment.userProfile.userId !== + user.userId ? (
Date: Wed, 28 Jun 2023 15:14:38 +0100 Subject: [PATCH 041/147] return `undefined` instead of nothing --- .../FirstCommentWelcome/FirstCommentWelcome.stories.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/FirstCommentWelcome/FirstCommentWelcome.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/FirstCommentWelcome/FirstCommentWelcome.stories.tsx index a50eedeb899..19aa2de04aa 100644 --- a/dotcom-rendering/src/discussion-rendering/components/FirstCommentWelcome/FirstCommentWelcome.stories.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/FirstCommentWelcome/FirstCommentWelcome.stories.tsx @@ -8,7 +8,7 @@ export const defaultStory = () => ( body="My first message ever!!" pillar={ArticlePillar.Lifestyle} submitForm={() => Promise.resolve()} - cancelSubmit={() => {}} + cancelSubmit={() => undefined} /> ); defaultStory.storyName = 'Welcome message'; @@ -19,7 +19,7 @@ export const CommentWithError = () => ( pillar={ArticlePillar.News} error="This is a custom user name error message" submitForm={() => Promise.resolve()} - cancelSubmit={() => {}} + cancelSubmit={() => undefined} /> ); CommentWithError.storyName = 'Welcome message with error'; From c9a7303e557237ea7dcfde9ec98a611bc291e9f5 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:19:55 +0100 Subject: [PATCH 042/147] handle 0 and NaN widths as well --- .../components/LoadingComments/LoadingComments.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx b/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx index 14037e4b24d..7a9983d0ae3 100644 --- a/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/LoadingComments/LoadingComments.tsx @@ -56,7 +56,9 @@ const Grey = ({
Date: Wed, 28 Jun 2023 15:20:47 +0100 Subject: [PATCH 043/147] check NaN and 0 --- .../components/LoadingPicks/LoadingPicks.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx b/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx index 682e7e8e106..16c0f5c456b 100644 --- a/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/LoadingPicks/LoadingPicks.tsx @@ -86,7 +86,9 @@ const Grey = ({
Date: Wed, 28 Jun 2023 15:25:18 +0100 Subject: [PATCH 044/147] add comment explaining stylelint rule squash --- .../src/discussion-rendering/components/Preview/Preview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx b/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx index 6ff8edbbaab..04ae618acca 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Preview/Preview.tsx @@ -32,7 +32,7 @@ const previewStyle = css` } code { - /* stylelint-disable-next-line property-disallowed-list */ + /* stylelint-disable-next-line property-disallowed-list -- Source doesn't have a monospace font */ font-family: monospace; font-size: 1em; } From 2cb41c2223838ee9c89e56b0515e6ea7816e9f27 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:27:50 +0100 Subject: [PATCH 045/147] add TODO to implement error handling --- .../components/RecommendationCount/RecommendationCount.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/RecommendationCount/RecommendationCount.tsx b/dotcom-rendering/src/discussion-rendering/components/RecommendationCount/RecommendationCount.tsx index 1ed1523bb23..a021f6f2010 100644 --- a/dotcom-rendering/src/discussion-rendering/components/RecommendationCount/RecommendationCount.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/RecommendationCount/RecommendationCount.tsx @@ -65,7 +65,8 @@ export const RecommendationCount = ({ setRecommended(alreadyRecommended); } }) - .catch((e) => {}); + // TODO: do some error handling + .catch(() => undefined); }; return ( From 62195d405224ca1535fa3f5cb556b6c4d1e0e8ea Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:49:13 +0100 Subject: [PATCH 046/147] fix indentation --- .../components/Comment/Comment.tsx | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx index 0b2d7e6b346..6d4f01eb764 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx @@ -597,8 +597,7 @@ export const Comment = ({ onClick={() => toggleMuteStatus( comment.userProfile.userId, - ) - } + )} data-link-name="unmute-user" > Unmute? @@ -655,8 +654,7 @@ export const Comment = ({ onClick={() => setCommentBeingRepliedTo( comment, - ) - } + )} icon={} iconSide="left" data-link-name="reply to comment" @@ -741,30 +739,29 @@ export const Comment = ({ {user && comment.userProfile.userId !== user.userId ? ( -
- -
+ +
) : ( <> )} From 1485839d06aae3989df6a03c73084897d752a898 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 16:01:05 +0100 Subject: [PATCH 047/147] put prettier last in eslint config --- dotcom-rendering/.eslintrc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dotcom-rendering/.eslintrc.js b/dotcom-rendering/.eslintrc.js index c97ab68792f..0dd60e64244 100644 --- a/dotcom-rendering/.eslintrc.js +++ b/dotcom-rendering/.eslintrc.js @@ -66,9 +66,10 @@ module.exports = { extends: [ 'eslint:recommended', '@guardian/eslint-config-typescript', - 'prettier', 'plugin:@guardian/source-react-components/recommended', 'plugin:jsx-a11y/recommended', + // prettier needs to go last so it can override other configuration. See https://github.com/prettier/eslint-config-prettier#installation + 'prettier', ], parser: '@typescript-eslint/parser', parserOptions: { From 0a4b2b4c83fa7a64ee80a7cf861bdd37e846b40d Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 16:01:19 +0100 Subject: [PATCH 048/147] Array.prototype.find => Array.prototype.some --- .../components/Comment/Comment.tsx | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx index 6d4f01eb764..19a9057dcfb 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Comment/Comment.tsx @@ -340,7 +340,7 @@ export const Comment = ({ } }; - const showStaffBadge = comment.userProfile.badge.find( + const showStaffBadge = comment.userProfile.badge.some( (obj) => obj['name'] === 'Staff', ); @@ -350,7 +350,7 @@ export const Comment = ({ // In frontend we check/display the Staff badge else we check/display the // Contributor - we shouldn't see both Staff & Contributor badges. // https://github.com/guardian/frontend/blob/main/discussion/app/views/fragments/commentBadges.scala.html#L8 - const showContributorBadge = comment.userProfile.badge.find( + const showContributorBadge = comment.userProfile.badge.some( (obj) => obj['name'] === 'Contributor', ); @@ -597,7 +597,8 @@ export const Comment = ({ onClick={() => toggleMuteStatus( comment.userProfile.userId, - )} + ) + } data-link-name="unmute-user" > Unmute? @@ -654,7 +655,8 @@ export const Comment = ({ onClick={() => setCommentBeingRepliedTo( comment, - )} + ) + } icon={} iconSide="left" data-link-name="reply to comment" @@ -739,29 +741,30 @@ export const Comment = ({ {user && comment.userProfile.userId !== user.userId ? ( -
+ -
+ Mute + +
) : ( <> )} From 77470af6d7dbae2086639f2e165f30abf8b86d6e Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Wed, 28 Jun 2023 16:04:54 +0100 Subject: [PATCH 049/147] disable eslint formatting rules --- dotcom-rendering/.eslintrc.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dotcom-rendering/.eslintrc.js b/dotcom-rendering/.eslintrc.js index 0dd60e64244..0a0324abbad 100644 --- a/dotcom-rendering/.eslintrc.js +++ b/dotcom-rendering/.eslintrc.js @@ -41,6 +41,10 @@ const rulesToReview = { '@typescript-eslint/default-param-last': 'warn', '@typescript-eslint/no-misused-promises': 'warn', + // We use prettier to format code. Some eslint rules conflict with prettier + 'react/jsx-indent-props': 'off', + 'react/jsx-indent': 'off', + // More rules 'eslint-comments/require-description': 'warn', 'eslint-comments/no-unused-disable': 'warn', @@ -91,8 +95,6 @@ module.exports = { 'react-hooks/exhaustive-deps': 'error', 'react-hooks/rules-of-hooks': 'error', 'react/jsx-boolean-value': [2, 'always'], - 'react/jsx-indent-props': [2, 'tab'], - 'react/jsx-indent': [2, 'tab'], 'react/jsx-key': 'error', 'react/jsx-no-target-blank': 'error', 'react/jsx-one-expression-per-line': 'off', From 56bee1a194ec7bf0b9c662811483410bd3bb95e7 Mon Sep 17 00:00:00 2001 From: Ashleigh Carr Date: Thu, 29 Jun 2023 11:28:48 +0100 Subject: [PATCH 050/147] Apply width: 100% to thrashers first element --- dotcom-rendering/src/components/Snap.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dotcom-rendering/src/components/Snap.tsx b/dotcom-rendering/src/components/Snap.tsx index 584356a145f..5e5d6ba9382 100644 --- a/dotcom-rendering/src/components/Snap.tsx +++ b/dotcom-rendering/src/components/Snap.tsx @@ -5,6 +5,11 @@ const snapStyles = css` overflow: hidden; position: relative; display: flex; + + // Some thrashers don't have "width: 100%" applied to their first element which causes them to not correctly take up their space + > * { + width: 100%; + } `; type Props = { From b89b48daa2b5b1702eb9f111f31b0a97c7a13e40 Mon Sep 17 00:00:00 2001 From: Joe Cowton Date: Thu, 29 Jun 2023 11:30:31 +0100 Subject: [PATCH 051/147] Update dependencies --- apps-rendering/package.json | 92 +- apps-rendering/src/articleFormat.ts | 2 +- apps-rendering/yarn.lock | 7241 ++++++++--------- dotcom-rendering/package.json | 44 +- .../scripts/webpack/webpack.config.server.js | 4 + .../components/TableOfContents.importable.tsx | 2 + package.json | 11 +- yarn.lock | 4596 +++++------ 8 files changed, 5432 insertions(+), 6560 deletions(-) diff --git a/apps-rendering/package.json b/apps-rendering/package.json index 681160214ef..992ab72671b 100644 --- a/apps-rendering/package.json +++ b/apps-rendering/package.json @@ -37,83 +37,85 @@ "@babel/core": "^7.18.13", "@babel/preset-env": "^7.20.2", "@creditkarma/thrift-server-core": "^1.0.4", - "@emotion/cache": "^11.4.0", - "@emotion/jest": "^11.10.0", - "@emotion/react": "^11.4.1", - "@emotion/server": "^11.4.0", + "@emotion/cache": "^11.11.0", + "@emotion/jest": "^11.11.0", + "@emotion/react": "^11.11.1", + "@emotion/server": "^11.11.0", "@guardian/apps-rendering-api-models": "6.1.0", - "@guardian/bridget": "^2.0.0", + "@guardian/bridget": "^2.4.0", "@guardian/cdk": "^47.3.3", - "@guardian/content-api-models": "^17.6.2", - "@guardian/content-atom-model": "^3.4.0", - "@guardian/eslint-config-typescript": "^5.0.0", - "@guardian/eslint-plugin-source-react-components": "^15.0.0", - "@guardian/libs": "^14.0.0", + "@guardian/content-api-models": "^17.6.3", + "@guardian/content-atom-model": "^3.4.4", + "@guardian/eslint-config-typescript": "^6.0.1", + "@guardian/eslint-plugin-source-react-components": "^17.0.0", + "@guardian/libs": "^15.1.0", "@guardian/node-riffraff-artifact": "^0.3.2", "@guardian/renditions": "^0.2.0", - "@guardian/source-foundations": "^10.0.1", - "@guardian/source-react-components": "^13.0.0", - "@guardian/source-react-components-development-kitchen": "^11.0.0", + "@guardian/source-foundations": "^12.0.0", + "@guardian/source-react-components": "^15.0.1", + "@guardian/source-react-components-development-kitchen": "^13.0.1", "@guardian/types": "^9.0.1", - "@storybook/addon-essentials": "^7.0.7", - "@storybook/addons": "^7.0.7", - "@storybook/api": "^7.0.7", - "@storybook/components": "^7.0.7", - "@storybook/core-events": "^7.0.7", - "@storybook/react": "^7.0.7", - "@storybook/react-webpack5": "^7.0.7", - "@storybook/theming": "^7.0.7", - "@types/clean-css": "^4.2.5", + "@storybook/addon-essentials": "^7.0.24", + "@storybook/addons": "^7.0.24", + "@storybook/api": "^7.0.24", + "@storybook/components": "^7.0.24", + "@storybook/core-events": "^7.0.24", + "@storybook/react": "^7.0.24", + "@storybook/react-webpack5": "^7.0.24", + "@storybook/theming": "^7.0.24", + "@types/clean-css": "^4.2.6", "@types/compression": "^1.7.2", - "@types/express": "^4.17.13", + "@types/express": "^4.17.17", "@types/html-webpack-plugin": "^3.2.6", - "@types/jest": "^28.1.6", - "@types/jsdom": "^16.2.13", + "@types/jest": "^29.5.2", + "@types/jsdom": "^21.1.1", "@types/node": "18.16.18", - "@types/react": "^18.2.0", + "@types/react": "^18.2.14", "@types/react-dom": "^18.2.0", "@types/react-test-renderer": "^18.0.0", "@types/uuid": "^8.3.1", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^5.57.0", - "@typescript-eslint/parser": "^5.54.1", + "@typescript-eslint/eslint-plugin": "^5.60.1", + "@typescript-eslint/parser": "^5.60.1", "aws-cdk": "2.39.1", "aws-cdk-lib": "2.39.1", "aws-sdk": "^2.1231.0", "babel-loader": "^9.1.2", "buffer": "^6.0.3", + "bufferutil": "4.0.7", "clean-css": "^5.3.2", "compression": "^1.7.4", - "constructs": "10.1.91", - "core-js": "^3.24.1", - "eslint": "^8.35.0", - "eslint-config-prettier": "^8.5.0", + "constructs": "10.2.63", + "core-js": "^3.31.0", + "eslint": "^8.43.0", + "eslint-config-prettier": "^8.8.0", "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-import": "^2.26.0", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-react": "^7.31.11", - "express": "^4.18.1", - "html-webpack-plugin": "^5.5.0", - "jest": "^28.1.3", - "jest-environment-jsdom": "^28.1.3", - "jsdom": "^16.7.0", - "lodash.debounce": "4.0.6", - "node-fetch": "^3.2.10", + "eslint-plugin-react": "^7.32.2", + "express": "^4.18.2", + "html-webpack-plugin": "^5.5.3", + "jest": "^29.5.0", + "jest-environment-jsdom": "^29.5.0", + "jsdom": "^22.1.0", + "lodash.debounce": "4.0.8", + "node-fetch": "^3.3.1", "node-int64": "^0.4.0", - "prettier": "^2.8.4", + "prettier": "^2.8.8", "react": "^18.2.0", "react-dom": "^18.2.0", "react-test-renderer": "^18.2.0", "require-from-string": "^2.0.2", "source-map-support": "^0.5.21", - "storybook": "^7.0.7", + "storybook": "^7.0.24", "thrift": "^0.16.0", "ts-jest": "^28.0.7", "ts-loader": "^9.4.1", "ts-node": "^10.9.1", - "tslib": "^2.5.0", - "typescript": "^4.9.5", + "tslib": "^2.5.3", + "typescript": "5.1.3", + "utf-8-validate": "6.0.3", "webpack": "^5.76.1", "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.11.1", diff --git a/apps-rendering/src/articleFormat.ts b/apps-rendering/src/articleFormat.ts index bc9efb6c212..95d49a1afe6 100644 --- a/apps-rendering/src/articleFormat.ts +++ b/apps-rendering/src/articleFormat.ts @@ -121,7 +121,7 @@ const themeToPillar = (theme: ArticleTheme): ArticlePillar => { * @param design An {@linkcode ArticleDesign} * @returns A string representation of `ArticleDesign` */ -const designToString = (design: ArticleDesign): string => { +const designToString = (design: ArticleDesign): string | undefined => { switch (design) { case ArticleDesign.Standard: return 'Standard'; diff --git a/apps-rendering/yarn.lock b/apps-rendering/yarn.lock index b8a7f89f69c..b6b9935901d 100644 --- a/apps-rendering/yarn.lock +++ b/apps-rendering/yarn.lock @@ -2,13 +2,10 @@ # yarn lockfile v1 -"@ampproject/remapping@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== - dependencies: - "@jridgewell/gen-mapping" "^0.1.0" - "@jridgewell/trace-mapping" "^0.3.9" +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== "@ampproject/remapping@^2.2.0": version "2.2.1" @@ -25,202 +22,128 @@ dependencies: default-browser-id "3.0.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/code-frame@^7.16.7", "@babel/code-frame@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" - integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5": - version "7.20.10" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" - integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== - -"@babel/compat-data@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" - integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== - -"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.13": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac" - integrity sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.13" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-module-transforms" "^7.18.9" - "@babel/helpers" "^7.18.9" - "@babel/parser" "^7.18.13" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.18.13" - "@babel/types" "^7.18.13" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" + integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== + dependencies: + "@babel/highlight" "^7.22.5" -"@babel/core@^7.12.10": - version "7.20.12" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" - integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5", "@babel/compat-data@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" + integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== + +"@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.18.13", "@babel/core@^7.20.2", "@babel/core@^7.7.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89" + integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg== dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helpers" "^7.20.7" - "@babel/parser" "^7.20.7" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.12" - "@babel/types" "^7.20.7" + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.22.5" + "@babel/generator" "^7.22.5" + "@babel/helper-compilation-targets" "^7.22.5" + "@babel/helper-module-transforms" "^7.22.5" + "@babel/helpers" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/core@^7.13.16", "@babel/core@^7.20.2", "@babel/core@^7.7.5", "@babel/core@~7.21.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" - integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== +"@babel/core@~7.21.0": + version "7.21.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4" + integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.4" - "@babel/helper-compilation-targets" "^7.21.4" - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helpers" "^7.21.0" - "@babel/parser" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-compilation-targets" "^7.21.5" + "@babel/helper-module-transforms" "^7.21.5" + "@babel/helpers" "^7.21.5" + "@babel/parser" "^7.21.8" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.4" - "@babel/types" "^7.21.4" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.12.11", "@babel/generator@^7.21.4", "@babel/generator@~7.21.1": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" - integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== +"@babel/generator@^7.12.11", "@babel/generator@^7.21.5", "@babel/generator@^7.22.5", "@babel/generator@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7" + integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA== dependencies: - "@babel/types" "^7.21.4" + "@babel/types" "^7.22.5" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/generator@^7.18.13": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212" - integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ== - dependencies: - "@babel/types" "^7.18.13" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/generator@^7.18.9", "@babel/generator@^7.7.2": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.9.tgz#68337e9ea8044d6ddc690fb29acae39359cca0a5" - integrity sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug== - dependencies: - "@babel/types" "^7.18.9" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/generator@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" - integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== +"@babel/generator@~7.21.1": + version "7.21.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.9.tgz#3a1b706e07d836e204aee0650e8ee878d3aaa241" + integrity sha512-F3fZga2uv09wFdEjEQIJxXALXfz0+JaOb7SabvVMmjHxeVTuGW8wgE8Vp1Hd7O+zMTYtcfEISGRzPkeiaPPsvg== dependencies: - "@babel/types" "^7.20.7" + "@babel/types" "^7.21.5" "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" - integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== +"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" + integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== dependencies: - "@babel/types" "^7.18.6" + "@babel/types" "^7.22.5" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" - integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878" + integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw== dependencies: - "@babel/helper-explode-assignable-expression" "^7.18.6" - "@babel/types" "^7.18.9" + "@babel/types" "^7.22.5" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" - integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5", "@babel/helper-compilation-targets@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02" + integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw== dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-validator-option" "^7.18.6" + "@babel/compat-data" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" browserslist "^4.21.3" lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-compilation-targets@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" - integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== - dependencies: - "@babel/compat-data" "^7.21.4" - "@babel/helper-validator-option" "^7.21.0" - browserslist "^4.21.3" - lru-cache "^5.1.1" +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c" + integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-member-expression-to-functions" "^7.22.5" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7": - version "7.20.12" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819" - integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-member-expression-to-functions" "^7.20.7" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/helper-split-export-declaration" "^7.18.6" - -"@babel/helper-create-class-features-plugin@^7.21.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18" - integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4" + integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-member-expression-to-functions" "^7.21.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/helper-split-export-declaration" "^7.18.6" - -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca" - integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.2.1" + "@babel/helper-annotate-as-pure" "^7.22.5" + regexpu-core "^5.3.1" + semver "^6.3.0" "@babel/helper-define-polyfill-provider@^0.3.3": version "0.3.3" @@ -234,269 +157,191 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-explode-assignable-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" - integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" - -"@babel/helper-function-name@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" - integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== - dependencies: - "@babel/template" "^7.20.7" - "@babel/types" "^7.21.0" - -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-member-expression-to-functions@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05" - integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw== - dependencies: - "@babel/types" "^7.20.7" - -"@babel/helper-member-expression-to-functions@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" - integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q== - dependencies: - "@babel/types" "^7.21.0" - -"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" - integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.10" - "@babel/types" "^7.20.7" - -"@babel/helper-module-transforms@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712" - integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.18.6" - "@babel/template" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-module-transforms@^7.21.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" - integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.2" - "@babel/types" "^7.21.2" - -"@babel/helper-optimise-call-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" - integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" - integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== - -"@babel/helper-remap-async-to-generator@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" - integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-wrap-function" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" - integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.20.7" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/helper-simple-access@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" - integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-simple-access@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" - integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== - dependencies: - "@babel/types" "^7.20.2" - -"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" - integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== - dependencies: - "@babel/types" "^7.20.0" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helper-validator-option@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" - integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== - -"@babel/helper-wrap-function@^7.18.9": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3" - integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q== - dependencies: - "@babel/helper-function-name" "^7.19.0" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" - -"@babel/helpers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9" - integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ== - dependencies: - "@babel/template" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helpers@^7.20.7": - version "7.20.13" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2" - integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg== - dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.13" - "@babel/types" "^7.20.7" - -"@babel/helpers@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" - integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== +"@babel/helper-define-polyfill-provider@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz#487053f103110f25b9755c5980e031e93ced24d8" + integrity sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg== dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.0" - "@babel/types" "^7.21.0" + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-plugin-utils" "^7.16.7" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" +"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5", "@babel/helper-environment-visitor@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" + integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== + +"@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" + integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== + dependencies: + "@babel/template" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-member-expression-to-functions@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2" + integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c" + integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-module-transforms@^7.21.5", "@babel/helper-module-transforms@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" + integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw== + dependencies: + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-module-imports" "^7.22.5" + "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helper-optimise-call-expression@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" + integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" + integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== + +"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2" + integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-wrap-function" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helper-replace-supers@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc" + integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg== + dependencies: + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-member-expression-to-functions" "^7.22.5" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helper-simple-access@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" + integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" + integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08" + integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-string-parser@^7.21.5", "@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + +"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" + integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== + +"@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" + integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== + +"@babel/helper-wrap-function@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06" + integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw== + dependencies: + "@babel/helper-function-name" "^7.22.5" + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helpers@^7.21.5", "@babel/helpers@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820" + integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q== + dependencies: + "@babel/template" "^7.22.5" + "@babel/traverse" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/highlight@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" + integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== + dependencies: + "@babel/helper-validator-identifier" "^7.22.5" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539" - integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg== - -"@babel/parser@^7.13.16", "@babel/parser@^7.21.4", "@babel/parser@~7.21.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" - integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== - -"@babel/parser@^7.18.13": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4" - integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg== +"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" + integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== -"@babel/parser@^7.18.6", "@babel/parser@^7.20.13", "@babel/parser@^7.20.7": - version "7.20.13" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.13.tgz#ddf1eb5a813588d2fb1692b70c6fce75b945c088" - integrity sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw== +"@babel/parser@~7.21.2": + version "7.21.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.9.tgz#ab18ea3b85b4bc33ba98a8d4c2032c557d23cf14" + integrity sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" - integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e" + integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" - integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca" + integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-proposal-optional-chaining" "^7.20.7" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-transform-optional-chaining" "^7.22.5" -"@babel/plugin-proposal-async-generator-functions@^7.20.1", "@babel/plugin-proposal-async-generator-functions@^7.20.7": +"@babel/plugin-proposal-async-generator-functions@^7.20.7": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== @@ -514,15 +359,6 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-class-static-block@^7.18.6": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz#92592e9029b13b15be0f7ce6a7aedc2879ca45a7" - integrity sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.20.7" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-proposal-class-static-block@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d" @@ -556,7 +392,7 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.18.9", "@babel/plugin-proposal-logical-assignment-operators@^7.20.7": +"@babel/plugin-proposal-logical-assignment-operators@^7.20.7": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== @@ -580,7 +416,7 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.20.2", "@babel/plugin-proposal-object-rest-spread@^7.20.7": +"@babel/plugin-proposal-object-rest-spread@^7.20.7": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== @@ -608,15 +444,6 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz#49f2b372519ab31728cc14115bb0998b15bfda55" - integrity sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-proposal-private-methods@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" @@ -625,20 +452,15 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-private-property-in-object@^7.18.6": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135" - integrity sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.20.5" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" +"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2": + version "7.21.0-placeholder-for-preset-env.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703" + integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w== "@babel/plugin-proposal-private-property-in-object@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc" - integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw== + version "7.21.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c" + integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-create-class-features-plugin" "^7.21.0" @@ -695,21 +517,28 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-flow@^7.18.6": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.21.4.tgz#3e37fca4f06d93567c1cd9b75156422e90a67107" - integrity sha512-l9xd3N+XG4fZRxEP3vXdK6RW7vN1Uf5dxzRC/09wV86wqZ/YYQooBIGNsiRdfNR3/q2/5pPzV4B54J/9ctX5jw== +"@babel/plugin-syntax-flow@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz#163b820b9e7696ce134df3ee716d9c0c98035859" + integrity sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-syntax-import-assertions@^7.20.0", "@babel/plugin-syntax-import-assertions@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98" + integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-import-assertions@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" - integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== +"@babel/plugin-syntax-import-attributes@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb" + integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg== dependencies: - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-import-meta@^7.8.3": +"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== @@ -723,19 +552,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.17.12", "@babel/plugin-syntax-jsx@^7.18.6": - version "7.18.6" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== +"@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" + integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-jsx@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" - integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -793,417 +615,480 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" - integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== +"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272" + integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ== dependencies: - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-typescript@^7.7.2": +"@babel/plugin-syntax-unicode-sets-regex@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285" - integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA== + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357" + integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.18.6", "@babel/plugin-transform-arrow-functions@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" - integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== +"@babel/plugin-transform-arrow-functions@^7.21.5", "@babel/plugin-transform-arrow-functions@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958" + integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-async-to-generator@^7.18.6", "@babel/plugin-transform-async-to-generator@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" - integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== +"@babel/plugin-transform-async-generator-functions@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz#7336356d23380eda9a56314974f053a020dab0c3" + integrity sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg== dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-remap-async-to-generator" "^7.18.9" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-remap-async-to-generator" "^7.22.5" + "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-transform-block-scoped-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" - integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== +"@babel/plugin-transform-async-to-generator@^7.20.7", "@babel/plugin-transform-async-to-generator@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775" + integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-module-imports" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-remap-async-to-generator" "^7.22.5" -"@babel/plugin-transform-block-scoping@^7.20.2": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz#9f5a3424bd112a3f32fe0cf9364fbb155cff262a" - integrity sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw== +"@babel/plugin-transform-block-scoped-functions@^7.18.6", "@babel/plugin-transform-block-scoped-functions@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024" + integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-block-scoping@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02" - integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ== +"@babel/plugin-transform-block-scoping@^7.21.0", "@babel/plugin-transform-block-scoping@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b" + integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-classes@^7.20.2": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz#f438216f094f6bb31dc266ebfab8ff05aecad073" - integrity sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ== +"@babel/plugin-transform-class-properties@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77" + integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-split-export-declaration" "^7.18.6" - globals "^11.1.0" + "@babel/helper-create-class-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-classes@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665" - integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ== +"@babel/plugin-transform-class-static-block@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba" + integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + +"@babel/plugin-transform-classes@^7.21.0", "@babel/plugin-transform-classes@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1" + integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-compilation-targets" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.5" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.18.9", "@babel/plugin-transform-computed-properties@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" - integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== +"@babel/plugin-transform-computed-properties@^7.21.5", "@babel/plugin-transform-computed-properties@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869" + integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/template" "^7.20.7" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/template" "^7.22.5" -"@babel/plugin-transform-destructuring@^7.20.2": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454" - integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA== +"@babel/plugin-transform-destructuring@^7.21.3", "@babel/plugin-transform-destructuring@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc" + integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-destructuring@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401" - integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA== +"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165" + integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-create-regexp-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" - integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== +"@babel/plugin-transform-duplicate-keys@^7.18.9", "@babel/plugin-transform-duplicate-keys@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285" + integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-duplicate-keys@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" - integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== +"@babel/plugin-transform-dynamic-import@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e" + integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" - integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== +"@babel/plugin-transform-exponentiation-operator@^7.18.6", "@babel/plugin-transform-exponentiation-operator@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a" + integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-flow-strip-types@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz#6aeca0adcb81dc627c8986e770bfaa4d9812aff5" - integrity sha512-FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w== +"@babel/plugin-transform-export-namespace-from@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b" + integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-flow" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-transform-for-of@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" - integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== +"@babel/plugin-transform-flow-strip-types@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz#0bb17110c7bf5b35a60754b2f00c58302381dee2" + integrity sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-flow" "^7.22.5" -"@babel/plugin-transform-for-of@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e" - integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ== +"@babel/plugin-transform-for-of@^7.21.5", "@babel/plugin-transform-for-of@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f" + integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" - integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== +"@babel/plugin-transform-function-name@^7.18.9", "@babel/plugin-transform-function-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143" + integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg== dependencies: - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-compilation-targets" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" - integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== +"@babel/plugin-transform-json-strings@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0" + integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-member-expression-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" - integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== +"@babel/plugin-transform-literals@^7.18.9", "@babel/plugin-transform-literals@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920" + integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-amd@^7.19.6", "@babel/plugin-transform-modules-amd@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" - integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== +"@babel/plugin-transform-logical-assignment-operators@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c" + integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA== dependencies: - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.21.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" - integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== +"@babel/plugin-transform-member-expression-literals@^7.18.6", "@babel/plugin-transform-member-expression-literals@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def" + integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew== dependencies: - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-commonjs@^7.19.6": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz#8cb23010869bf7669fd4b3098598b6b2be6dc607" - integrity sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw== +"@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526" + integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ== dependencies: - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-module-transforms" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-systemjs@^7.19.6", "@babel/plugin-transform-modules-systemjs@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" - integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== +"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.21.5", "@babel/plugin-transform-modules-commonjs@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa" + integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA== dependencies: - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-identifier" "^7.19.1" + "@babel/helper-module-transforms" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-simple-access" "^7.22.5" -"@babel/plugin-transform-modules-umd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" - integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== +"@babel/plugin-transform-modules-systemjs@^7.20.11", "@babel/plugin-transform-modules-systemjs@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496" + integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ== dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-module-transforms" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" - integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== +"@babel/plugin-transform-modules-umd@^7.18.6", "@babel/plugin-transform-modules-umd@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98" + integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.20.5" - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-module-transforms" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-new-target@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" - integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== +"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f" + integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-regexp-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-object-super@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" - integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== +"@babel/plugin-transform-new-target@^7.18.6", "@babel/plugin-transform-new-target@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d" + integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f" - integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA== +"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381" + integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-transform-parameters@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db" - integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ== +"@babel/plugin-transform-numeric-separator@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58" + integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-property-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" - integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== +"@babel/plugin-transform-object-rest-spread@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1" + integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/compat-data" "^7.22.5" + "@babel/helper-compilation-targets" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.22.5" -"@babel/plugin-transform-react-display-name@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" - integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== +"@babel/plugin-transform-object-super@^7.18.6", "@babel/plugin-transform-object-super@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c" + integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.5" -"@babel/plugin-transform-react-jsx-development@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5" - integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA== +"@babel/plugin-transform-optional-catch-binding@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333" + integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg== dependencies: - "@babel/plugin-transform-react-jsx" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-react-jsx@^7.18.6": - version "7.20.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz#f950f0b0c36377503d29a712f16287cedf886cbb" - integrity sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw== +"@babel/plugin-transform-optional-chaining@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0" + integrity sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.20.7" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-transform-react-jsx@^7.19.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2" - integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3", "@babel/plugin-transform-parameters@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18" + integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.21.0" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-react-pure-annotations@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844" - integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ== +"@babel/plugin-transform-private-methods@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722" + integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-regenerator@^7.18.6", "@babel/plugin-transform-regenerator@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d" - integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ== +"@babel/plugin-transform-private-property-in-object@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32" + integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + +"@babel/plugin-transform-property-literals@^7.18.6", "@babel/plugin-transform-property-literals@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766" + integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-transform-react-display-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz#3c4326f9fce31c7968d6cb9debcaf32d9e279a2b" + integrity sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-transform-react-jsx-development@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87" + integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A== + dependencies: + "@babel/plugin-transform-react-jsx" "^7.22.5" + +"@babel/plugin-transform-react-jsx@^7.19.0", "@babel/plugin-transform-react-jsx@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz#932c291eb6dd1153359e2a90cb5e557dcf068416" + integrity sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-module-imports" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/plugin-transform-react-pure-annotations@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz#1f58363eef6626d6fa517b95ac66fe94685e32c0" + integrity sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-transform-regenerator@^7.21.5", "@babel/plugin-transform-regenerator@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa" + integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" regenerator-transform "^0.15.1" -"@babel/plugin-transform-reserved-words@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" - integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== +"@babel/plugin-transform-reserved-words@^7.18.6", "@babel/plugin-transform-reserved-words@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb" + integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-shorthand-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" - integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== +"@babel/plugin-transform-shorthand-properties@^7.18.6", "@babel/plugin-transform-shorthand-properties@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624" + integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-spread@^7.19.0", "@babel/plugin-transform-spread@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" - integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== +"@babel/plugin-transform-spread@^7.20.7", "@babel/plugin-transform-spread@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b" + integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" -"@babel/plugin-transform-sticky-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" - integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== +"@babel/plugin-transform-sticky-regex@^7.18.6", "@babel/plugin-transform-sticky-regex@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa" + integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-template-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" - integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== +"@babel/plugin-transform-template-literals@^7.18.9", "@babel/plugin-transform-template-literals@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff" + integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-typeof-symbol@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" - integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== +"@babel/plugin-transform-typeof-symbol@^7.18.9", "@babel/plugin-transform-typeof-symbol@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34" + integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-typescript@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b" - integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw== +"@babel/plugin-transform-typescript@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d" + integrity sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.21.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-typescript" "^7.20.0" + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-typescript" "^7.22.5" -"@babel/plugin-transform-unicode-escapes@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" - integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ== +"@babel/plugin-transform-unicode-escapes@^7.21.5", "@babel/plugin-transform-unicode-escapes@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c" + integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-unicode-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" - integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== +"@babel/plugin-transform-unicode-property-regex@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81" + integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-regexp-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506" - integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg== +"@babel/plugin-transform-unicode-regex@^7.18.6", "@babel/plugin-transform-unicode-regex@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183" + integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg== dependencies: - "@babel/compat-data" "^7.20.1" - "@babel/helper-compilation-targets" "^7.20.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-async-generator-functions" "^7.20.1" - "@babel/plugin-proposal-class-properties" "^7.18.6" - "@babel/plugin-proposal-class-static-block" "^7.18.6" - "@babel/plugin-proposal-dynamic-import" "^7.18.6" - "@babel/plugin-proposal-export-namespace-from" "^7.18.9" - "@babel/plugin-proposal-json-strings" "^7.18.6" - "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" - "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.20.2" - "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-private-methods" "^7.18.6" - "@babel/plugin-proposal-private-property-in-object" "^7.18.6" - "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" + "@babel/helper-create-regexp-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-transform-unicode-sets-regex@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91" + integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/preset-env@^7.20.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e" + integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A== + dependencies: + "@babel/compat-data" "^7.22.5" + "@babel/helper-compilation-targets" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5" + "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.20.0" + "@babel/plugin-syntax-import-assertions" "^7.22.5" + "@babel/plugin-syntax-import-attributes" "^7.22.5" + "@babel/plugin-syntax-import-meta" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -1213,54 +1098,71 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.18.6" - "@babel/plugin-transform-async-to-generator" "^7.18.6" - "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.20.2" - "@babel/plugin-transform-classes" "^7.20.2" - "@babel/plugin-transform-computed-properties" "^7.18.9" - "@babel/plugin-transform-destructuring" "^7.20.2" - "@babel/plugin-transform-dotall-regex" "^7.18.6" - "@babel/plugin-transform-duplicate-keys" "^7.18.9" - "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.18.8" - "@babel/plugin-transform-function-name" "^7.18.9" - "@babel/plugin-transform-literals" "^7.18.9" - "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.19.6" - "@babel/plugin-transform-modules-commonjs" "^7.19.6" - "@babel/plugin-transform-modules-systemjs" "^7.19.6" - "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1" - "@babel/plugin-transform-new-target" "^7.18.6" - "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.20.1" - "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.18.6" - "@babel/plugin-transform-reserved-words" "^7.18.6" - "@babel/plugin-transform-shorthand-properties" "^7.18.6" - "@babel/plugin-transform-spread" "^7.19.0" - "@babel/plugin-transform-sticky-regex" "^7.18.6" - "@babel/plugin-transform-template-literals" "^7.18.9" - "@babel/plugin-transform-typeof-symbol" "^7.18.9" - "@babel/plugin-transform-unicode-escapes" "^7.18.10" - "@babel/plugin-transform-unicode-regex" "^7.18.6" + "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" + "@babel/plugin-transform-arrow-functions" "^7.22.5" + "@babel/plugin-transform-async-generator-functions" "^7.22.5" + "@babel/plugin-transform-async-to-generator" "^7.22.5" + "@babel/plugin-transform-block-scoped-functions" "^7.22.5" + "@babel/plugin-transform-block-scoping" "^7.22.5" + "@babel/plugin-transform-class-properties" "^7.22.5" + "@babel/plugin-transform-class-static-block" "^7.22.5" + "@babel/plugin-transform-classes" "^7.22.5" + "@babel/plugin-transform-computed-properties" "^7.22.5" + "@babel/plugin-transform-destructuring" "^7.22.5" + "@babel/plugin-transform-dotall-regex" "^7.22.5" + "@babel/plugin-transform-duplicate-keys" "^7.22.5" + "@babel/plugin-transform-dynamic-import" "^7.22.5" + "@babel/plugin-transform-exponentiation-operator" "^7.22.5" + "@babel/plugin-transform-export-namespace-from" "^7.22.5" + "@babel/plugin-transform-for-of" "^7.22.5" + "@babel/plugin-transform-function-name" "^7.22.5" + "@babel/plugin-transform-json-strings" "^7.22.5" + "@babel/plugin-transform-literals" "^7.22.5" + "@babel/plugin-transform-logical-assignment-operators" "^7.22.5" + "@babel/plugin-transform-member-expression-literals" "^7.22.5" + "@babel/plugin-transform-modules-amd" "^7.22.5" + "@babel/plugin-transform-modules-commonjs" "^7.22.5" + "@babel/plugin-transform-modules-systemjs" "^7.22.5" + "@babel/plugin-transform-modules-umd" "^7.22.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" + "@babel/plugin-transform-new-target" "^7.22.5" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5" + "@babel/plugin-transform-numeric-separator" "^7.22.5" + "@babel/plugin-transform-object-rest-spread" "^7.22.5" + "@babel/plugin-transform-object-super" "^7.22.5" + "@babel/plugin-transform-optional-catch-binding" "^7.22.5" + "@babel/plugin-transform-optional-chaining" "^7.22.5" + "@babel/plugin-transform-parameters" "^7.22.5" + "@babel/plugin-transform-private-methods" "^7.22.5" + "@babel/plugin-transform-private-property-in-object" "^7.22.5" + "@babel/plugin-transform-property-literals" "^7.22.5" + "@babel/plugin-transform-regenerator" "^7.22.5" + "@babel/plugin-transform-reserved-words" "^7.22.5" + "@babel/plugin-transform-shorthand-properties" "^7.22.5" + "@babel/plugin-transform-spread" "^7.22.5" + "@babel/plugin-transform-sticky-regex" "^7.22.5" + "@babel/plugin-transform-template-literals" "^7.22.5" + "@babel/plugin-transform-typeof-symbol" "^7.22.5" + "@babel/plugin-transform-unicode-escapes" "^7.22.5" + "@babel/plugin-transform-unicode-property-regex" "^7.22.5" + "@babel/plugin-transform-unicode-regex" "^7.22.5" + "@babel/plugin-transform-unicode-sets-regex" "^7.22.5" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.20.2" - babel-plugin-polyfill-corejs2 "^0.3.3" - babel-plugin-polyfill-corejs3 "^0.6.0" - babel-plugin-polyfill-regenerator "^0.4.1" - core-js-compat "^3.25.1" + "@babel/types" "^7.22.5" + babel-plugin-polyfill-corejs2 "^0.4.3" + babel-plugin-polyfill-corejs3 "^0.8.1" + babel-plugin-polyfill-regenerator "^0.5.0" + core-js-compat "^3.30.2" semver "^6.3.0" "@babel/preset-env@~7.21.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58" - integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw== + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.5.tgz#db2089d99efd2297716f018aeead815ac3decffb" + integrity sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg== dependencies: - "@babel/compat-data" "^7.21.4" - "@babel/helper-compilation-targets" "^7.21.4" - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/compat-data" "^7.21.5" + "@babel/helper-compilation-targets" "^7.21.5" + "@babel/helper-plugin-utils" "^7.21.5" "@babel/helper-validator-option" "^7.21.0" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7" @@ -1285,6 +1187,7 @@ "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-import-assertions" "^7.20.0" + "@babel/plugin-syntax-import-meta" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -1294,22 +1197,22 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.20.7" + "@babel/plugin-transform-arrow-functions" "^7.21.5" "@babel/plugin-transform-async-to-generator" "^7.20.7" "@babel/plugin-transform-block-scoped-functions" "^7.18.6" "@babel/plugin-transform-block-scoping" "^7.21.0" "@babel/plugin-transform-classes" "^7.21.0" - "@babel/plugin-transform-computed-properties" "^7.20.7" + "@babel/plugin-transform-computed-properties" "^7.21.5" "@babel/plugin-transform-destructuring" "^7.21.3" "@babel/plugin-transform-dotall-regex" "^7.18.6" "@babel/plugin-transform-duplicate-keys" "^7.18.9" "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.21.0" + "@babel/plugin-transform-for-of" "^7.21.5" "@babel/plugin-transform-function-name" "^7.18.9" "@babel/plugin-transform-literals" "^7.18.9" "@babel/plugin-transform-member-expression-literals" "^7.18.6" "@babel/plugin-transform-modules-amd" "^7.20.11" - "@babel/plugin-transform-modules-commonjs" "^7.21.2" + "@babel/plugin-transform-modules-commonjs" "^7.21.5" "@babel/plugin-transform-modules-systemjs" "^7.20.11" "@babel/plugin-transform-modules-umd" "^7.18.6" "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5" @@ -1317,17 +1220,17 @@ "@babel/plugin-transform-object-super" "^7.18.6" "@babel/plugin-transform-parameters" "^7.21.3" "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.20.5" + "@babel/plugin-transform-regenerator" "^7.21.5" "@babel/plugin-transform-reserved-words" "^7.18.6" "@babel/plugin-transform-shorthand-properties" "^7.18.6" "@babel/plugin-transform-spread" "^7.20.7" "@babel/plugin-transform-sticky-regex" "^7.18.6" "@babel/plugin-transform-template-literals" "^7.18.9" "@babel/plugin-transform-typeof-symbol" "^7.18.9" - "@babel/plugin-transform-unicode-escapes" "^7.18.10" + "@babel/plugin-transform-unicode-escapes" "^7.21.5" "@babel/plugin-transform-unicode-regex" "^7.18.6" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.21.4" + "@babel/types" "^7.21.5" babel-plugin-polyfill-corejs2 "^0.3.3" babel-plugin-polyfill-corejs3 "^0.6.0" babel-plugin-polyfill-regenerator "^0.4.1" @@ -1335,13 +1238,13 @@ semver "^6.3.0" "@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.18.6": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.21.4.tgz#a5de2a1cafa61f0e0b3af9b30ff0295d38d3608f" - integrity sha512-F24cSq4DIBmhq4OzK3dE63NHagb27OPE3eWR+HLekt4Z3Y5MzIIUGF3LlLgV0gN8vzbDViSY7HnrReNVCJXTeA== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.22.5.tgz#876f24ab6b38bd79703a93f32020ca2162312784" + integrity sha512-ta2qZ+LSiGCrP5pgcGt8xMnnkXQrq8Sa4Ulhy06BOlF5QbLw9q5hIx7bn5MrsvyTGAfh6kTOo07Q+Pfld/8Y5Q== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-option" "^7.21.0" - "@babel/plugin-transform-flow-strip-types" "^7.21.0" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" + "@babel/plugin-transform-flow-strip-types" "^7.22.5" "@babel/preset-modules@^0.1.5": version "0.1.5" @@ -1355,32 +1258,32 @@ esutils "^2.0.2" "@babel/preset-react@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d" - integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.22.5.tgz#c4d6058fbf80bccad02dd8c313a9aaa67e3c3dd6" + integrity sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-transform-react-display-name" "^7.18.6" - "@babel/plugin-transform-react-jsx" "^7.18.6" - "@babel/plugin-transform-react-jsx-development" "^7.18.6" - "@babel/plugin-transform-react-pure-annotations" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" + "@babel/plugin-transform-react-display-name" "^7.22.5" + "@babel/plugin-transform-react-jsx" "^7.22.5" + "@babel/plugin-transform-react-jsx-development" "^7.22.5" + "@babel/plugin-transform-react-pure-annotations" "^7.22.5" "@babel/preset-typescript@^7.13.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz#b913ac8e6aa8932e47c21b01b4368d8aa239a529" - integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8" + integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-option" "^7.21.0" - "@babel/plugin-syntax-jsx" "^7.21.4" - "@babel/plugin-transform-modules-commonjs" "^7.21.2" - "@babel/plugin-transform-typescript" "^7.21.3" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.22.5" + "@babel/plugin-transform-modules-commonjs" "^7.22.5" + "@babel/plugin-transform-typescript" "^7.22.5" "@babel/register@^7.13.16": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz#c97bf56c2472e063774f31d344c592ebdcefa132" - integrity sha512-9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.22.5.tgz#e4d8d0f615ea3233a27b5c6ada6750ee59559939" + integrity sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ== dependencies: clone-deep "^4.0.1" find-cache-dir "^2.0.0" @@ -1388,119 +1291,74 @@ pirates "^4.0.5" source-map-support "^0.5.16" +"@babel/regjsgen@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" + integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== + "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" - integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" + integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA== dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/template@^7.3.3": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31" - integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.6" - "@babel/types" "^7.18.6" - -"@babel/traverse@^7.1.6", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@~7.21.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" - integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== - dependencies: - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.4" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.4" - "@babel/types" "^7.21.4" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68" - integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.13" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.18.13" - "@babel/types" "^7.18.13" +"@babel/template@^7.20.7", "@babel/template@^7.22.5", "@babel/template@^7.3.3": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" + integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw== + dependencies: + "@babel/code-frame" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/traverse@^7.1.6", "@babel/traverse@^7.21.5", "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" + integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== + dependencies: + "@babel/code-frame" "^7.22.5" + "@babel/generator" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/types" "^7.22.5" debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7": - version "7.20.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473" - integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ== +"@babel/traverse@~7.21.2": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133" + integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.13" - "@babel/types" "^7.20.7" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.7.2": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98" - integrity sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.9" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-environment-visitor" "^7.21.5" + "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/parser" "^7.21.5" + "@babel/types" "^7.21.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842" - integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog== +"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" + integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" to-fast-properties "^2.0.0" -"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.4.4": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" - integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== +"@babel/types@~7.21.2": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" + integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.2.0", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@~7.21.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" - integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== - dependencies: - "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-string-parser" "^7.21.5" "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" @@ -1553,254 +1411,253 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@emotion/babel-plugin@^11.10.5": - version "11.10.5" - resolved "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c" - integrity sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA== +"@emotion/babel-plugin@^11.11.0": + version "11.11.0" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c" + integrity sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ== dependencies: "@babel/helper-module-imports" "^7.16.7" - "@babel/plugin-syntax-jsx" "^7.17.12" "@babel/runtime" "^7.18.3" - "@emotion/hash" "^0.9.0" - "@emotion/memoize" "^0.8.0" - "@emotion/serialize" "^1.1.1" + "@emotion/hash" "^0.9.1" + "@emotion/memoize" "^0.8.1" + "@emotion/serialize" "^1.1.2" babel-plugin-macros "^3.1.0" convert-source-map "^1.5.0" escape-string-regexp "^4.0.0" find-root "^1.1.0" source-map "^0.5.7" - stylis "4.1.3" + stylis "4.2.0" -"@emotion/cache@^11.10.5", "@emotion/cache@^11.4.0": - version "11.10.5" - resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz#c142da9351f94e47527ed458f7bbbbe40bb13c12" - integrity sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA== +"@emotion/cache@^11.11.0": + version "11.11.0" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.11.0.tgz#809b33ee6b1cb1a625fef7a45bc568ccd9b8f3ff" + integrity sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ== dependencies: - "@emotion/memoize" "^0.8.0" - "@emotion/sheet" "^1.2.1" - "@emotion/utils" "^1.2.0" - "@emotion/weak-memoize" "^0.3.0" - stylis "4.1.3" + "@emotion/memoize" "^0.8.1" + "@emotion/sheet" "^1.2.2" + "@emotion/utils" "^1.2.1" + "@emotion/weak-memoize" "^0.3.1" + stylis "4.2.0" -"@emotion/css-prettifier@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@emotion/css-prettifier/-/css-prettifier-1.1.0.tgz#1b5ac1588af9525e583f56fa898abb7edb3c7d9e" - integrity sha512-ALZCKBcpC9FeA0D6HLc4Et3bwY06fOG63CqLtWwk4W/u7+bWjorRxS9yikcJ2aTmlKur/ST9eWm5ohzBmWlTOQ== +"@emotion/css-prettifier@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@emotion/css-prettifier/-/css-prettifier-1.1.3.tgz#014ff59a87a3be5f2ce555b70f096af66b2dc845" + integrity sha512-KNv23+VQ+pcw3ebd1vSEl11CQ6SKAG5EQkrinjVGsfw3ZTWe6/tpWQrsvFLqCtU2LRiLPi04KgFCE4A9+crfpQ== dependencies: - "@emotion/memoize" "^0.8.0" - stylis "4.0.13" + "@emotion/memoize" "^0.8.1" + stylis "4.2.0" -"@emotion/hash@^0.9.0": - version "0.9.0" - resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7" - integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ== +"@emotion/hash@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.1.tgz#4ffb0055f7ef676ebc3a5a91fb621393294e2f43" + integrity sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ== -"@emotion/jest@^11.10.0": - version "11.10.0" - resolved "https://registry.yarnpkg.com/@emotion/jest/-/jest-11.10.0.tgz#a39c16d0a5794254e0e4c5caf3f11278a64ae4a4" - integrity sha512-jeevEzauWrjDPWt9BGITjKzgLd31Q6kZ35gmH77f+LSaU/Ie1bFfxroum0nQNPEHS+kUxh6unv9DQIw+DEr5Ug== +"@emotion/jest@^11.11.0": + version "11.11.0" + resolved "https://registry.yarnpkg.com/@emotion/jest/-/jest-11.11.0.tgz#4d64b33052308739dcdd7396fd2bc902f7244f82" + integrity sha512-XZlnmdUZ32YjQnInsCFk/plKpkV/NXN1Ab4YoNvXN887MeR3Hr5ZsTyoblIW8AWwdfQiZHHphaPMb56lk6Ofdw== dependencies: "@babel/runtime" "^7.18.3" - "@emotion/css-prettifier" "^1.1.0" + "@emotion/css-prettifier" "^1.1.3" chalk "^4.1.0" specificity "^0.4.1" - stylis "4.0.13" + stylis "4.2.0" -"@emotion/memoize@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f" - integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA== +"@emotion/memoize@^0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17" + integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA== -"@emotion/react@^11.4.1": - version "11.10.5" - resolved "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz#95fff612a5de1efa9c0d535384d3cfa115fe175d" - integrity sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A== +"@emotion/react@^11.11.1": + version "11.11.1" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.1.tgz#b2c36afac95b184f73b08da8c214fdf861fa4157" + integrity sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA== dependencies: "@babel/runtime" "^7.18.3" - "@emotion/babel-plugin" "^11.10.5" - "@emotion/cache" "^11.10.5" - "@emotion/serialize" "^1.1.1" - "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0" - "@emotion/utils" "^1.2.0" - "@emotion/weak-memoize" "^0.3.0" + "@emotion/babel-plugin" "^11.11.0" + "@emotion/cache" "^11.11.0" + "@emotion/serialize" "^1.1.2" + "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1" + "@emotion/utils" "^1.2.1" + "@emotion/weak-memoize" "^0.3.1" hoist-non-react-statics "^3.3.1" -"@emotion/serialize@^1.1.1": - version "1.1.1" - resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz#0595701b1902feded8a96d293b26be3f5c1a5cf0" - integrity sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA== +"@emotion/serialize@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.2.tgz#017a6e4c9b8a803bd576ff3d52a0ea6fa5a62b51" + integrity sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA== dependencies: - "@emotion/hash" "^0.9.0" - "@emotion/memoize" "^0.8.0" - "@emotion/unitless" "^0.8.0" - "@emotion/utils" "^1.2.0" + "@emotion/hash" "^0.9.1" + "@emotion/memoize" "^0.8.1" + "@emotion/unitless" "^0.8.1" + "@emotion/utils" "^1.2.1" csstype "^3.0.2" -"@emotion/server@^11.4.0": - version "11.10.0" - resolved "https://registry.npmjs.org/@emotion/server/-/server-11.10.0.tgz#3edc075b672c75426f682d56aadc6404fb1f6648" - integrity sha512-MTvJ21JPo9aS02GdjFW4nhdwOi2tNNpMmAM/YED0pkxzjDNi5WbiTwXqaCnvLc2Lr8NFtjhT0az1vTJyLIHYcw== +"@emotion/server@^11.11.0": + version "11.11.0" + resolved "https://registry.yarnpkg.com/@emotion/server/-/server-11.11.0.tgz#35537176a2a5ed8aed7801f254828e636ec3bd6e" + integrity sha512-6q89fj2z8VBTx9w93kJ5n51hsmtYuFPtZgnc1L8VzRx9ti4EU6EyvF6Nn1H1x3vcCQCF7u2dB2lY4AYJwUW4PA== dependencies: - "@emotion/utils" "^1.2.0" + "@emotion/utils" "^1.2.1" html-tokenize "^2.0.0" multipipe "^1.0.2" through "^2.3.8" -"@emotion/sheet@^1.2.1": - version "1.2.1" - resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz#0767e0305230e894897cadb6c8df2c51e61a6c2c" - integrity sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA== - -"@emotion/unitless@^0.8.0": - version "0.8.0" - resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db" - integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw== +"@emotion/sheet@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.2.tgz#d58e788ee27267a14342303e1abb3d508b6d0fec" + integrity sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA== -"@emotion/use-insertion-effect-with-fallbacks@^1.0.0": - version "1.0.0" - resolved "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df" - integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A== +"@emotion/unitless@^0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.1.tgz#182b5a4704ef8ad91bde93f7a860a88fd92c79a3" + integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ== -"@emotion/utils@^1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561" - integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw== +"@emotion/use-insertion-effect-with-fallbacks@^1.0.0", "@emotion/use-insertion-effect-with-fallbacks@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963" + integrity sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw== -"@emotion/weak-memoize@^0.3.0": - version "0.3.0" - resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb" - integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg== - -"@esbuild/android-arm64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.18.tgz#4aa8d8afcffb4458736ca9b32baa97d7cb5861ea" - integrity sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw== - -"@esbuild/android-arm@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.18.tgz#74a7e95af4ee212ebc9db9baa87c06a594f2a427" - integrity sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw== - -"@esbuild/android-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.18.tgz#1dcd13f201997c9fe0b204189d3a0da4eb4eb9b6" - integrity sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg== - -"@esbuild/darwin-arm64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.18.tgz#444f3b961d4da7a89eb9bd35cfa4415141537c2a" - integrity sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ== - -"@esbuild/darwin-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.18.tgz#a6da308d0ac8a498c54d62e0b2bfb7119b22d315" - integrity sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A== - -"@esbuild/freebsd-arm64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.18.tgz#b83122bb468889399d0d63475d5aea8d6829c2c2" - integrity sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA== - -"@esbuild/freebsd-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.18.tgz#af59e0e03fcf7f221b34d4c5ab14094862c9c864" - integrity sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew== - -"@esbuild/linux-arm64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.18.tgz#8551d72ba540c5bce4bab274a81c14ed01eafdcf" - integrity sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ== - -"@esbuild/linux-arm@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.18.tgz#e09e76e526df4f665d4d2720d28ff87d15cdf639" - integrity sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg== - -"@esbuild/linux-ia32@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.18.tgz#47878860ce4fe73a36fd8627f5647bcbbef38ba4" - integrity sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ== - -"@esbuild/linux-loong64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.18.tgz#3f8fbf5267556fc387d20b2e708ce115de5c967a" - integrity sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ== - -"@esbuild/linux-mips64el@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.18.tgz#9d896d8f3c75f6c226cbeb840127462e37738226" - integrity sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA== - -"@esbuild/linux-ppc64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.18.tgz#3d9deb60b2d32c9985bdc3e3be090d30b7472783" - integrity sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ== - -"@esbuild/linux-riscv64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.18.tgz#8a943cf13fd24ff7ed58aefb940ef178f93386bc" - integrity sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA== - -"@esbuild/linux-s390x@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.18.tgz#66cb01f4a06423e5496facabdce4f7cae7cb80e5" - integrity sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw== - -"@esbuild/linux-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.18.tgz#23c26050c6c5d1359c7b774823adc32b3883b6c9" - integrity sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA== - -"@esbuild/netbsd-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.18.tgz#789a203d3115a52633ff6504f8cbf757f15e703b" - integrity sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg== - -"@esbuild/openbsd-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.18.tgz#d7b998a30878f8da40617a10af423f56f12a5e90" - integrity sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA== - -"@esbuild/sunos-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.18.tgz#ecad0736aa7dae07901ba273db9ef3d3e93df31f" - integrity sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg== - -"@esbuild/win32-arm64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.18.tgz#58dfc177da30acf956252d7c8ae9e54e424887c4" - integrity sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg== - -"@esbuild/win32-ia32@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.18.tgz#340f6163172b5272b5ae60ec12c312485f69232b" - integrity sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw== - -"@esbuild/win32-x64@0.17.18": - version "0.17.18" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.18.tgz#3a8e57153905308db357fd02f57c180ee3a0a1fa" - integrity sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg== +"@emotion/utils@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.1.tgz#bbab58465738d31ae4cb3dbb6fc00a5991f755e4" + integrity sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg== + +"@emotion/weak-memoize@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6" + integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww== + +"@esbuild/android-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd" + integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA== + +"@esbuild/android-arm@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d" + integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A== + +"@esbuild/android-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1" + integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww== + +"@esbuild/darwin-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276" + integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg== + +"@esbuild/darwin-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb" + integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw== + +"@esbuild/freebsd-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2" + integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ== + +"@esbuild/freebsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4" + integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ== + +"@esbuild/linux-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb" + integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg== + +"@esbuild/linux-arm@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a" + integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA== + +"@esbuild/linux-ia32@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a" + integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ== + +"@esbuild/linux-loong64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72" + integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ== + +"@esbuild/linux-mips64el@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289" + integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A== + +"@esbuild/linux-ppc64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7" + integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg== + +"@esbuild/linux-riscv64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09" + integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA== + +"@esbuild/linux-s390x@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829" + integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q== + +"@esbuild/linux-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4" + integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw== + +"@esbuild/netbsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462" + integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q== + +"@esbuild/openbsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691" + integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g== + +"@esbuild/sunos-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273" + integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg== + +"@esbuild/win32-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f" + integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag== + +"@esbuild/win32-ia32@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03" + integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw== + +"@esbuild/win32-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061" + integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA== "@eslint-community/eslint-utils@^4.2.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.3.0.tgz#a556790523a351b4e47e9d385f47265eaaf9780a" - integrity sha512-v3oplH6FYCULtFuCeqyuTd9D2WKO937Dxdq+GmHOLL72TTRriLxz2VLlNfkZRsvj6PKnOPAtuT6dwrs/pA5DvA== + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== dependencies: eslint-visitor-keys "^3.3.0" "@eslint-community/regexpp@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403" - integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884" + integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ== -"@eslint/eslintrc@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.0.tgz#943309d8697c52fc82c076e90c1c74fbbe69dbff" - integrity sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A== +"@eslint/eslintrc@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331" + integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.4.0" + espree "^9.5.2" globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -1808,10 +1665,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.35.0": - version "8.35.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.35.0.tgz#b7569632b0b788a0ca0e438235154e45d42813a7" - integrity sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw== +"@eslint/js@8.43.0": + version "8.43.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0" + integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg== "@fal-works/esbuild-plugin-global-externals@^2.1.2": version "2.1.2" @@ -1832,34 +1689,34 @@ node-int64 "^0.4.0" thrift "^0.15.0" -"@guardian/bridget@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@guardian/bridget/-/bridget-2.0.0.tgz#9be79e1f8c0c4a9ee3829390b9bcb828d78cb4d7" - integrity sha512-bCNIQuPe74AwR0eZWHgN/at3vumPOB0NxozciTujGUblhun23f+Fagtkkf1zyIqQ2VjaYmSVy5zVug+E5v9auw== +"@guardian/bridget@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@guardian/bridget/-/bridget-2.4.0.tgz#0ab23b952bc56a9ae6f2620c35b0f16f7839a63d" + integrity sha512-k1RR2mg9MZGhO6bJdznoDLxmC9PS6EIn0HSQUPM3hFzh6C0Wuu/EuGV8CdlZSiq4lFa/KBMna6j0yJwUv7xBPA== "@guardian/cdk@^47.3.3": - version "47.3.3" - resolved "https://registry.yarnpkg.com/@guardian/cdk/-/cdk-47.3.3.tgz#e2c892846e7086610ca5a49eb5599413828e8f63" - integrity sha512-weA6KgnIsw/AhhoS6yUIsycnnXCJYn5B3QQqAuCc5srXuVYitc1NjLysbLwufxLCRnVotlAydewrvsHlgRzgSA== + version "47.3.5" + resolved "https://registry.yarnpkg.com/@guardian/cdk/-/cdk-47.3.5.tgz#f966e7debdfb3e16d33ddf024e5eff752ac32ba6" + integrity sha512-vwJuUP0rmtKjhf6J7z8IUZzp58+MomTCSTuTc4dsFcpGiW2kq+fEex4ZW/B1U+gxmcXQtTUtR0ehNs8mVZXnEA== dependencies: - "@oclif/core" "1.16.0" - aws-cdk-lib "2.39.1" - aws-sdk "^2.1209.0" + "@oclif/core" "1.16.4" + aws-cdk-lib "2.44.0" + aws-sdk "^2.1227.0" chalk "^4.1.2" - codemaker "^1.67.0" - constructs "10.1.91" - git-url-parse "^13.0.0" + codemaker "^1.69.0" + constructs "10.1.117" + git-url-parse "^13.1.0" js-yaml "^4.1.0" lodash.camelcase "^4.3.0" lodash.kebabcase "^4.1.1" lodash.upperfirst "^4.3.1" read-pkg-up "7.0.1" - yargs "^17.5.1" + yargs "^17.6.0" -"@guardian/content-api-models@^17.6.2": - version "17.6.2" - resolved "https://registry.yarnpkg.com/@guardian/content-api-models/-/content-api-models-17.6.2.tgz#abedae35d37745ce5b5ff7e99306c7eba7cc413f" - integrity sha512-2mmlL9HX73b86EzYZqyYxiNlu4x2EoqWsMVt58vHIiM0QxEj0baQtD4H9bF8yq/hJ2BQKSHBrDnkW/Aak5Ojfg== +"@guardian/content-api-models@^17.6.2", "@guardian/content-api-models@^17.6.3": + version "17.6.3" + resolved "https://registry.yarnpkg.com/@guardian/content-api-models/-/content-api-models-17.6.3.tgz#b467f25263e5fdfd1b17b7f02dfcd12627fbb023" + integrity sha512-V0mXy1ua1lDnZjgKAc7xBjM70nA8SyS0NGEfknQv4Z/fqzm5WGGonjaFiHPc09OjRhqIOH8G/IXoH6FFadpPvQ== dependencies: "@guardian/content-atom-model" "^3.4.2" "@guardian/content-entity-model" "^2.2.1" @@ -1869,18 +1726,7 @@ node-int64 "^0.4.0" thrift "^0.15.0" -"@guardian/content-atom-model@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@guardian/content-atom-model/-/content-atom-model-3.4.0.tgz#1dfddb7598df0500fd34d7ab9ffbf8a42459b46a" - integrity sha512-b0cgk+obNJ1RDj0/sOuFjUwf80+I29civ28iBDIa+ZxJRAd5hjE4SXoWyvb2Cpz7fkUEvIF/JJlX/yAsL6MhmA== - dependencies: - "@guardian/content-entity-model" "^2.2.1" - "@types/node-int64" "^0.4.29" - "@types/thrift" "^0.10.11" - node-int64 "^0.4.0" - thrift "^0.15.0" - -"@guardian/content-atom-model@^3.4.2": +"@guardian/content-atom-model@^3.4.0", "@guardian/content-atom-model@^3.4.2", "@guardian/content-atom-model@^3.4.4": version "3.4.4" resolved "https://registry.yarnpkg.com/@guardian/content-atom-model/-/content-atom-model-3.4.4.tgz#289c9c0d2ff1c889787667c2c08cf30bbf72356d" integrity sha512-OeLqmQODJPqSa9Y/RhLhJOTIYj0BK07tSZBn71QZ3OstQhcW2nZGxSCN9tbYLYHhj30Uzn6fsLwZcv4JlNTbtg== @@ -1901,38 +1747,38 @@ node-int64 "^0.4.0" thrift "^0.15.0" -"@guardian/eslint-config-typescript@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@guardian/eslint-config-typescript/-/eslint-config-typescript-5.0.0.tgz#5bfcc8d9655f5f978474347f7cdefdb08706a805" - integrity sha512-0v77rdbJ1mb4kEnRn4s0z//aFs1qwnUumqNV60ayBGWs18gmZscmIxgKm4rmoYIr/IJugTkLFZozEWlbwIhAOw== +"@guardian/eslint-config-typescript@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@guardian/eslint-config-typescript/-/eslint-config-typescript-6.0.1.tgz#47eac1ec8b61a9f14d041610b2c78cfedef403a4" + integrity sha512-ZFJDRF0FMNjqBqyslde35mpBakQc1xNys1ph/PLUhAlZT5NPqS+vMWw+WaHephWvtrQO6wMsZi/axR4/GhNC9Q== dependencies: - "@guardian/eslint-config" "3.0.0" - "@typescript-eslint/eslint-plugin" "5.46.1" - "@typescript-eslint/parser" "5.46.1" - eslint-import-resolver-typescript "3.5.2" - eslint-plugin-import "2.26.0" + "@guardian/eslint-config" "4.1.0" + "@typescript-eslint/eslint-plugin" "5.59.9" + "@typescript-eslint/parser" "5.59.9" + eslint-import-resolver-typescript "3.5.5" + eslint-plugin-import "2.27.5" -"@guardian/eslint-config@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@guardian/eslint-config/-/eslint-config-3.0.0.tgz#5cdf7f422d7291ea044607ff8a8474f931f4f127" - integrity sha512-LF15QHOBvX26Vhdz+5RsktRCOdCecWNpVaBqqw41j6SrOk3no/u7radyQrkXM6Zlgkl9j4O/9uMh0sGJtgAA+A== +"@guardian/eslint-config@4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@guardian/eslint-config/-/eslint-config-4.1.0.tgz#5f838a6d03d3146c79d0f3e40695ff9c826f2f72" + integrity sha512-nJxPbdQ02dgXHrQxY95hhDqZ+NGbK1r2w52g6B+tbug7FAqi1bbETW9gZLPArM5kBl/1R1125jEBNB+GC61bAQ== dependencies: - eslint-config-prettier "8.5.0" + eslint-config-prettier "8.8.0" eslint-plugin-eslint-comments "3.2.0" - eslint-plugin-import "2.26.0" + eslint-plugin-import "2.27.5" -"@guardian/eslint-plugin-source-react-components@^15.0.0": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@guardian/eslint-plugin-source-react-components/-/eslint-plugin-source-react-components-15.0.0.tgz#1635914895771800c5d23bfbbafd4385e220985a" - integrity sha512-aFux08FXGdqyRl1whX9cNkPR4mMje+LJHUmMpvboTaPdSz5kW9vAEX2Emkk5P4pK2NKGbRO9PVPwDaCd8ec+wA== +"@guardian/eslint-plugin-source-react-components@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@guardian/eslint-plugin-source-react-components/-/eslint-plugin-source-react-components-17.0.0.tgz#56a2545c62ff3864fd51ea91b1ca5220fcad681d" + integrity sha512-E2F47A4Cin8vVt2oRBnc9yUxyXqZHLs2DKvjpfHX35O5uQ3ubdGa4QrOIgUayy+Ar27lEtLv7HhJkdH+Y3FLeA== dependencies: "@typescript-eslint/eslint-plugin" "5.46.1" - "@typescript-eslint/parser" "5.46.1" + "@typescript-eslint/parser" "5.59.9" -"@guardian/libs@^14.0.0": - version "14.0.0" - resolved "https://registry.yarnpkg.com/@guardian/libs/-/libs-14.0.0.tgz#07022b652430a1c5d6b16f8aa105ae3d73da4e7c" - integrity sha512-rB4h4FlD3EcoCY66f3xjO7alnXiimPOynL9znvX/xP2nAVpG4UyedJnIpupw4KPqJuB0lZMih6EeXq0a1XnI3w== +"@guardian/libs@^15.1.0": + version "15.1.0" + resolved "https://registry.yarnpkg.com/@guardian/libs/-/libs-15.1.0.tgz#a919fd08cb298cba0b7363d128f0da38e598ec98" + integrity sha512-1USL3EuhwhyUANjWeVBZx2mRVCydE0QAzUIOV2ukojp92ZAWyt2RqxV8luTEPgUxbDAtma9MuO6lgTshTk5nYw== "@guardian/node-riffraff-artifact@^0.3.2": version "0.3.2" @@ -1955,22 +1801,22 @@ dependencies: typescript "^4.1.3" -"@guardian/source-foundations@^10.0.1": - version "10.0.1" - resolved "https://registry.yarnpkg.com/@guardian/source-foundations/-/source-foundations-10.0.1.tgz#fe9d5d1bee9dd1b0d3d579d21a99f6051aa47649" - integrity sha512-q7FHvQO2JN463SHRjLNKeywW8KUfjoao6oiULoyHssI07saol2rE0W8BdPCeD9337FNztiOxMGOmXWSBUIdYJw== +"@guardian/source-foundations@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@guardian/source-foundations/-/source-foundations-12.0.0.tgz#3f75d5dd26dae0d3fe13fd93aabe1e837cf0ddbb" + integrity sha512-sq+htAsvPlaZBjfSZ8ISZZdAnFQwuZ7xeCrI/C369HA+MDl3pQ1dFWz3YmqCP/vkXS8Wr3qVlxXNqWGwKKrYrw== dependencies: mini-svg-data-uri "1.4.4" -"@guardian/source-react-components-development-kitchen@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@guardian/source-react-components-development-kitchen/-/source-react-components-development-kitchen-11.0.0.tgz#6fe57d6f5fda751e311df70ed0e7735cd8342316" - integrity sha512-KNC+IZfufZI0L6sBEvsdzYa1HLkuV3stZ8Ty+wSHKjN22nxON2Yzvrkf9gw4LKNCAWuaLVkSPzritfs87zdWuQ== +"@guardian/source-react-components-development-kitchen@^13.0.1": + version "13.0.1" + resolved "https://registry.yarnpkg.com/@guardian/source-react-components-development-kitchen/-/source-react-components-development-kitchen-13.0.1.tgz#c8072f9369cbb06272d9f9174c2f6637d258c885" + integrity sha512-aQ39E0qQ6KCDgJqTnxG7d36HWfmHcLVImbDq/4TnbFGV100CUtPe19VBzMKgGP7/CYYnC22QKDa6cNgVcZysjQ== -"@guardian/source-react-components@^13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@guardian/source-react-components/-/source-react-components-13.0.0.tgz#11157b8b7615b371a6f6ab96d2efdfe5a20c6ea2" - integrity sha512-mhWHSUSCr8PjkajzsQs0yMFch1h9BONTlgV96T+niPkrtqn+xWvkQJeaBsN/X/QLSqweBLCjo6yvPdGxgJgaWw== +"@guardian/source-react-components@^15.0.1": + version "15.0.1" + resolved "https://registry.yarnpkg.com/@guardian/source-react-components/-/source-react-components-15.0.1.tgz#c584f507181fc88761bf702b7a6068b28a54003b" + integrity sha512-a4IBy0wmvb7UvnsT41I7VRdxeGaYz7l3LTV8PUE7swmS5UC/6SCQjOmsmXE54UiasdolUGMEt6C5p5oTxTDrdg== "@guardian/story-packages-model@^2.2.0": version "2.2.0" @@ -1987,10 +1833,10 @@ resolved "https://registry.yarnpkg.com/@guardian/types/-/types-9.0.1.tgz#a03682d9c2942560714f9c724a1cd7068f772a93" integrity sha512-JTQe4giki1QYqE5bRkCbYWvelF2DtaQVlGmIbVwO8XWNc62TOQcBOUmqFb2EWpszWqkzBLEBB4rKKArgBZHTeA== -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== +"@humanwhocodes/config-array@^0.11.10": + version "0.11.10" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2" + integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" @@ -2022,110 +1868,110 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df" - integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw== +"@jest/console@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.5.0.tgz#593a6c5c0d3f75689835f1b3b4688c4f8544cb57" + integrity sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ== dependencies: - "@jest/types" "^28.1.3" + "@jest/types" "^29.5.0" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^28.1.3" - jest-util "^28.1.3" + jest-message-util "^29.5.0" + jest-util "^29.5.0" slash "^3.0.0" -"@jest/core@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7" - integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA== +"@jest/core@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03" + integrity sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ== dependencies: - "@jest/console" "^28.1.3" - "@jest/reporters" "^28.1.3" - "@jest/test-result" "^28.1.3" - "@jest/transform" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/console" "^29.5.0" + "@jest/reporters" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" ci-info "^3.2.0" exit "^0.1.2" graceful-fs "^4.2.9" - jest-changed-files "^28.1.3" - jest-config "^28.1.3" - jest-haste-map "^28.1.3" - jest-message-util "^28.1.3" - jest-regex-util "^28.0.2" - jest-resolve "^28.1.3" - jest-resolve-dependencies "^28.1.3" - jest-runner "^28.1.3" - jest-runtime "^28.1.3" - jest-snapshot "^28.1.3" - jest-util "^28.1.3" - jest-validate "^28.1.3" - jest-watcher "^28.1.3" + jest-changed-files "^29.5.0" + jest-config "^29.5.0" + jest-haste-map "^29.5.0" + jest-message-util "^29.5.0" + jest-regex-util "^29.4.3" + jest-resolve "^29.5.0" + jest-resolve-dependencies "^29.5.0" + jest-runner "^29.5.0" + jest-runtime "^29.5.0" + jest-snapshot "^29.5.0" + jest-util "^29.5.0" + jest-validate "^29.5.0" + jest-watcher "^29.5.0" micromatch "^4.0.4" - pretty-format "^28.1.3" - rimraf "^3.0.0" + pretty-format "^29.5.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.3.tgz#abed43a6b040a4c24fdcb69eab1f97589b2d663e" - integrity sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA== +"@jest/environment@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65" + integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ== dependencies: - "@jest/fake-timers" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/fake-timers" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" - jest-mock "^28.1.3" + jest-mock "^29.5.0" -"@jest/expect-utils@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525" - integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA== +"@jest/expect-utils@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036" + integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg== dependencies: - jest-get-type "^28.0.2" + jest-get-type "^29.4.3" -"@jest/expect@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72" - integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw== +"@jest/expect@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba" + integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g== dependencies: - expect "^28.1.3" - jest-snapshot "^28.1.3" + expect "^29.5.0" + jest-snapshot "^29.5.0" -"@jest/fake-timers@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.3.tgz#230255b3ad0a3d4978f1d06f70685baea91c640e" - integrity sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw== +"@jest/fake-timers@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.5.0.tgz#d4d09ec3286b3d90c60bdcd66ed28d35f1b4dc2c" + integrity sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg== dependencies: - "@jest/types" "^28.1.3" - "@sinonjs/fake-timers" "^9.1.2" + "@jest/types" "^29.5.0" + "@sinonjs/fake-timers" "^10.0.2" "@types/node" "*" - jest-message-util "^28.1.3" - jest-mock "^28.1.3" - jest-util "^28.1.3" + jest-message-util "^29.5.0" + jest-mock "^29.5.0" + jest-util "^29.5.0" -"@jest/globals@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333" - integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA== +"@jest/globals@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.5.0.tgz#6166c0bfc374c58268677539d0c181f9c1833298" + integrity sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ== dependencies: - "@jest/environment" "^28.1.3" - "@jest/expect" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/environment" "^29.5.0" + "@jest/expect" "^29.5.0" + "@jest/types" "^29.5.0" + jest-mock "^29.5.0" -"@jest/reporters@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a" - integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg== +"@jest/reporters@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.5.0.tgz#985dfd91290cd78ddae4914ba7921bcbabe8ac9b" + integrity sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^28.1.3" - "@jest/test-result" "^28.1.3" - "@jest/transform" "^28.1.3" - "@jest/types" "^28.1.3" - "@jridgewell/trace-mapping" "^0.3.13" + "@jest/console" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" + "@jridgewell/trace-mapping" "^0.3.15" "@types/node" "*" chalk "^4.0.0" collect-v8-coverage "^1.0.0" @@ -2137,13 +1983,12 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.1.3" - jest-message-util "^28.1.3" - jest-util "^28.1.3" - jest-worker "^28.1.3" + jest-message-util "^29.5.0" + jest-util "^29.5.0" + jest-worker "^29.5.0" slash "^3.0.0" string-length "^4.0.1" strip-ansi "^6.0.0" - terminal-link "^2.0.0" v8-to-istanbul "^9.0.1" "@jest/schemas@^28.1.3": @@ -2160,57 +2005,36 @@ dependencies: "@sinclair/typebox" "^0.25.16" -"@jest/source-map@^28.1.2": - version "28.1.2" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24" - integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww== +"@jest/source-map@^29.4.3": + version "29.4.3" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.3.tgz#ff8d05cbfff875d4a791ab679b4333df47951d20" + integrity sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w== dependencies: - "@jridgewell/trace-mapping" "^0.3.13" + "@jridgewell/trace-mapping" "^0.3.15" callsites "^3.0.0" graceful-fs "^4.2.9" -"@jest/test-result@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5" - integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg== +"@jest/test-result@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408" + integrity sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ== dependencies: - "@jest/console" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/console" "^29.5.0" + "@jest/types" "^29.5.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3" - integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw== - dependencies: - "@jest/test-result" "^28.1.3" - graceful-fs "^4.2.9" - jest-haste-map "^28.1.3" - slash "^3.0.0" - -"@jest/transform@^28.1.3": - version "28.1.3" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0" - integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA== +"@jest/test-sequencer@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz#34d7d82d3081abd523dbddc038a3ddcb9f6d3cc4" + integrity sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ== dependencies: - "@babel/core" "^7.11.6" - "@jest/types" "^28.1.3" - "@jridgewell/trace-mapping" "^0.3.13" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" + "@jest/test-result" "^29.5.0" graceful-fs "^4.2.9" - jest-haste-map "^28.1.3" - jest-regex-util "^28.0.2" - jest-util "^28.1.3" - micromatch "^4.0.4" - pirates "^4.0.4" + jest-haste-map "^29.5.0" slash "^3.0.0" - write-file-atomic "^4.0.1" -"@jest/transform@^29.3.1": +"@jest/transform@^29.3.1", "@jest/transform@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9" integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw== @@ -2255,46 +2079,48 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/resolve-uri@3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": +"@jridgewell/resolve-uri@^3.0.3": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + +"@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== +"@jridgewell/source-map@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda" + integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg== dependencies: "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" @@ -2303,23 +2129,7 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@jridgewell/trace-mapping@^0.3.13": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" - integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": version "0.3.18" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== @@ -2353,9 +2163,9 @@ lodash.isequal "^4.5.0" "@ndelangen/get-tarball@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@ndelangen/get-tarball/-/get-tarball-3.0.7.tgz#87c7aef2df4ff4fbdbab6ac9ed32cee142c4b1a3" - integrity sha512-NqGfTZIZpRFef1GoVaShSSRwDC3vde3ThtTeqFdcYd6ipKqnfEVhjK2hUeHjCQUcptyZr2TONqcloFXM+5QBrQ== + version "3.0.9" + resolved "https://registry.yarnpkg.com/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz#727ff4454e65f34707e742a59e5e6b1f525d8964" + integrity sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA== dependencies: gunzip-maybe "^1.4.2" pump "^3.0.0" @@ -2382,10 +2192,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oclif/core@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.16.0.tgz#4b53261eeb0c0244700bfc9eb41159d483436f21" - integrity sha512-xtqhAbjQHBcz+xQpEHJ3eJEVfRQ4zl41Yw5gw/N+D1jgaIUrHTxCY/sfTvhw93LAQo7B++ozHzSb7DISFXsQFQ== +"@oclif/core@1.16.4": + version "1.16.4" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.16.4.tgz#fafa338ada0624d7f1adac036302b05a37cd96d0" + integrity sha512-l+xHtVMteJWeTZZ+f2yLyNjf69X0mhAH8GILXnmoAGAemXbc1DVstvloxOouarvm9xyHHhquzO1Qg5l6xa1VIw== dependencies: "@oclif/linewrap" "^1.0.0" "@oclif/screen" "^3.0.2" @@ -2422,21 +2232,21 @@ integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw== "@oclif/screen@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-3.0.2.tgz#969054308fe98d130c02844a45cc792199b75670" - integrity sha512-S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-3.0.4.tgz#663db0ecaf23f3184e7f01886ed578060e4a7f1c" + integrity sha512-IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA== "@pkgr/utils@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03" - integrity sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.1.tgz#adf291d0357834c410ce80af16e711b56c7b1cd3" + integrity sha512-JOqwkgFEyi+OROIyq7l4Jy28h/WwhDnG/cPkXG2Z1iFbubB6jsHW1NDvmyOzTBxHr3yg68YGirmh1JUgMqa+9w== dependencies: cross-spawn "^7.0.3" + fast-glob "^3.2.12" is-glob "^4.0.3" - open "^8.4.0" + open "^9.1.0" picocolors "^1.0.0" - tiny-glob "^0.2.9" - tslib "^2.4.0" + tslib "^2.5.0" "@pmmmwh/react-refresh-webpack-plugin@^0.5.5": version "0.5.10" @@ -2454,42 +2264,42 @@ source-map "^0.7.3" "@sinclair/typebox@^0.24.1": - version "0.24.20" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.20.tgz#11a657875de6008622d53f56e063a6347c51a6dd" - integrity sha512-kVaO5aEFZb33nPMTZBxiPEkY+slxiPtqC7QX8f9B3eGOMBvEfuMfxp9DSTTCsRJPumPKjrge4yagyssO4q6qzQ== + version "0.24.51" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" + integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA== "@sinclair/typebox@^0.25.16": version "0.25.24" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== -"@sinonjs/commons@^1.7.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" - integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== +"@sinonjs/commons@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72" + integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA== dependencies: type-detect "4.0.8" -"@sinonjs/fake-timers@^9.1.2": - version "9.1.2" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" - integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== +"@sinonjs/fake-timers@^10.0.2": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66" + integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA== dependencies: - "@sinonjs/commons" "^1.7.0" + "@sinonjs/commons" "^3.0.0" -"@storybook/addon-actions@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.0.7.tgz#d35c77a0ae0127562da5b5c27dc68ebd72fdebf7" - integrity sha512-WxsnSjAvdf6NhUfTqcwV+FJmsJV56gh2cY4QnGfqfwO5zoBWTUYnhz57TgxSMhJY0kspyX9Q1Kc//r1d5lt1qA== +"@storybook/addon-actions@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.0.24.tgz#6bdbd8118acfc46f140207a108a5a35cc980d948" + integrity sha512-sIPY6uH8I26KBWUb5fMYBB9xCKB02oSM8gIHzqPZ0DnW8zl+p6+dX3tAdX+XQvb9YOLJihxZ1GF1tOxFduc3Pw== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/theming" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/theming" "7.0.24" + "@storybook/types" "7.0.24" dequal "^2.0.2" lodash "^4.17.21" polished "^4.2.2" @@ -2499,181 +2309,181 @@ ts-dedent "^2.0.0" uuid "^9.0.0" -"@storybook/addon-backgrounds@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.0.7.tgz#40162274e0cccd119cef29c03c00702fe881bb4e" - integrity sha512-DhT32K1+ti7MXY9oqt36b9jlg7iY68IP0ZQbR3gjShcsIXZpFqh18TQo0vwDY1ldqnBvkTk6Jd5vcxA8tfyshw== +"@storybook/addon-backgrounds@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.0.24.tgz#568196858d926228c982d58000d2cd83fecd2d5f" + integrity sha512-vThKkrSj+J7matGowxIJ4eV+kAF8iUHGQjlaW0J7vhzmVkNnxBvNn/DGOWWQLAJPCTmLVelLaBZEWcMNoKJiVA== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/theming" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/theming" "7.0.24" + "@storybook/types" "7.0.24" memoizerific "^1.11.3" ts-dedent "^2.0.0" -"@storybook/addon-controls@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.0.7.tgz#a08f1cf70c89a0abe75e890a95ea6e12cc025d93" - integrity sha512-/QEzleKoWRQ3i7KB32QvqDGcGMw4kG2BxEf0d+ymxd2SjoeL6kX2eHE0b4OxFPXiWUyTfXBFwmcI2Re3fRUJnQ== - dependencies: - "@storybook/blocks" "7.0.7" - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-common" "7.0.7" - "@storybook/manager-api" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/theming" "7.0.7" - "@storybook/types" "7.0.7" +"@storybook/addon-controls@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.0.24.tgz#3899664baf72d3af112aafd009a35ad5eb7745cd" + integrity sha512-x05Ng4wyBRkrupgSkBHKZSGPyUbvIDGiBseA/AjA/BNAMUMWy3t8ll9f7tlKzyDPaUeBSv8peP21r/Ry26Eqhw== + dependencies: + "@storybook/blocks" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-common" "7.0.24" + "@storybook/manager-api" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/theming" "7.0.24" + "@storybook/types" "7.0.24" lodash "^4.17.21" ts-dedent "^2.0.0" -"@storybook/addon-docs@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.0.7.tgz#9295a03815ae28ae5bc84f887a97cb8156f62f24" - integrity sha512-5PT7aiTD6QPH+4CZLcv4PiUgWucD9JNGHVMRbQMEyFW6qbs87dHmu1m1uXIvx3BF5h3mTo4FHNAf8IQIq5HH9w== +"@storybook/addon-docs@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.0.24.tgz#b437172433787b702eba411a3e6eb9e3c36cfd34" + integrity sha512-O5S+E6+8c/EHEQc5WcrNQ8dOVg9Q2ONIOYxlbSAcfMUA/d+tRR9xXTZog7nv1tj4U0G29+Vr4pKgsGh3Ya5qcw== dependencies: "@babel/core" "^7.20.2" "@babel/plugin-transform-react-jsx" "^7.19.0" "@jest/transform" "^29.3.1" "@mdx-js/react" "^2.1.5" - "@storybook/blocks" "7.0.7" - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/csf-plugin" "7.0.7" - "@storybook/csf-tools" "7.0.7" + "@storybook/blocks" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/csf-plugin" "7.0.24" + "@storybook/csf-tools" "7.0.24" "@storybook/global" "^5.0.0" "@storybook/mdx2-csf" "^1.0.0" - "@storybook/node-logger" "7.0.7" - "@storybook/postinstall" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/react-dom-shim" "7.0.7" - "@storybook/theming" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/node-logger" "7.0.24" + "@storybook/postinstall" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/react-dom-shim" "7.0.24" + "@storybook/theming" "7.0.24" + "@storybook/types" "7.0.24" fs-extra "^11.1.0" remark-external-links "^8.0.0" remark-slug "^6.0.0" ts-dedent "^2.0.0" -"@storybook/addon-essentials@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.0.7.tgz#5675b4ccf24f6b240f47be75a09886088757e3c9" - integrity sha512-uNx0BvN1XP7cNnk/L4oiFQlEB/KABqOeIyI8/mhfIyTvvwo9uAYIQAyiwWuz9MFmofCNm7CgLNOUaEwNDkM4CA== - dependencies: - "@storybook/addon-actions" "7.0.7" - "@storybook/addon-backgrounds" "7.0.7" - "@storybook/addon-controls" "7.0.7" - "@storybook/addon-docs" "7.0.7" - "@storybook/addon-highlight" "7.0.7" - "@storybook/addon-measure" "7.0.7" - "@storybook/addon-outline" "7.0.7" - "@storybook/addon-toolbars" "7.0.7" - "@storybook/addon-viewport" "7.0.7" - "@storybook/core-common" "7.0.7" - "@storybook/manager-api" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/preview-api" "7.0.7" +"@storybook/addon-essentials@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.0.24.tgz#a1f17db5efdba0a0c52057483dfdec42adc1d551" + integrity sha512-OL27TNQYUJv/FprFCU7Q9RQYrgGdM+4SH+XmsQCcuQuGa67s6/eRKyERwOdy4Pli3Payo76+Vz1DAeJZJ0F8oA== + dependencies: + "@storybook/addon-actions" "7.0.24" + "@storybook/addon-backgrounds" "7.0.24" + "@storybook/addon-controls" "7.0.24" + "@storybook/addon-docs" "7.0.24" + "@storybook/addon-highlight" "7.0.24" + "@storybook/addon-measure" "7.0.24" + "@storybook/addon-outline" "7.0.24" + "@storybook/addon-toolbars" "7.0.24" + "@storybook/addon-viewport" "7.0.24" + "@storybook/core-common" "7.0.24" + "@storybook/manager-api" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/preview-api" "7.0.24" ts-dedent "^2.0.0" -"@storybook/addon-highlight@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.0.7.tgz#222928e5fe5e0a108e6ca8a19ccc183dafed1026" - integrity sha512-expme2GzzCXX7/lL7UjCDi1Tfj+4LeNsAdWiurVLH7glK7yKPPeXXkIldbLP/XjJv4NKlqCwnNRHQx0vDLlE6g== +"@storybook/addon-highlight@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.0.24.tgz#fb8e47a0b175ea373a7cc35f89da63b821651bbf" + integrity sha512-IoCJHiX5Ai+7S08isxt7BH4baNF2RsjuGUA/iMoJtto/rMc5u0xftVeIjh6oVqV3tjckowXpezI3oStnrLWuRw== dependencies: - "@storybook/core-events" "7.0.7" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/preview-api" "7.0.7" + "@storybook/preview-api" "7.0.24" -"@storybook/addon-measure@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.0.7.tgz#cf6a00652b4b0ab876468fb78956b2a9b0d45359" - integrity sha512-lb4wEIvIVF+ePx1sC+n9rDI0+49sRa6MWbcvZ+BhbAoCeGcX7uACQFdW6HyXolmBuZASsTnzVQ4KqzzvY1dSWw== +"@storybook/addon-measure@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.0.24.tgz#4f409b9539a9bfaa25d9e591ff90484194c487a9" + integrity sha512-4VNs4rjdz+YFiJCz9DfCmBJwFuoa3pLhcEsAAdT3B+Hrkae+hvLtnQWIvAMsOlSWdl4tiuEWssDf4cjCEne87w== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/types" "7.0.7" - -"@storybook/addon-outline@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.0.7.tgz#764d4a0589cb6e63a910742d9485c13c4a6526bf" - integrity sha512-AxbNZ4N1fXBTeMYM9tFudfW+Gzq7UikCjPxn5ax3Pde+zZjaEMppUxv5EMz4g5GIJupLYRmKH5pN0YcYoRLY6w== - dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/types" "7.0.24" + +"@storybook/addon-outline@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.0.24.tgz#2f00acc0ea374edd141265ad7212e29f41466fcf" + integrity sha512-YwSfs8bsmh7mEF+rlmL7zBsebWA5e/Rsf09vVqt6/k3fpopgBrq44zQlMwo1dCWV/0YhhXQF21OGzeJ1dSb8fA== + dependencies: + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/types" "7.0.24" ts-dedent "^2.0.0" -"@storybook/addon-toolbars@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.0.7.tgz#62100cc44f1522fc987544695882e868e4bc9c51" - integrity sha512-/NkYHhU1VAz5lXjWuV8+ADWB84HzktvZv4jfiKX7Zzu6JVzrBu7FotQSWh3pDqqVwCB50RClUGtcHmSSac9CAQ== - dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/theming" "7.0.7" - -"@storybook/addon-viewport@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.0.7.tgz#31f259fbbf8cb77d5c04c6ccb9f370b3e440f6a8" - integrity sha512-znqhd8JFEFoXcAdwYhz1CwrCpVAzhuSyUVBUNDsDs+mgBEfGth4D4abIdWWGcfP6+CmI5ebFHtk443cExZebag== - dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-events" "7.0.7" +"@storybook/addon-toolbars@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.0.24.tgz#7ca37e9ffbbbd972fea9ee822f4733527d9a55d8" + integrity sha512-+nDVahs2kAojzF6RbChowJmN0z7cyD/5BGMEhBemhBWSuMVnQLLEgtQi/kOY5fUxq3z1BkqcE4LV98u5CIKgKg== + dependencies: + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/theming" "7.0.24" + +"@storybook/addon-viewport@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.0.24.tgz#4f6777589e2484a7dad56f57982ca586bde9000b" + integrity sha512-bc3TR+feemGxVP1QQT6OsFSldHjLToJNuQAGd5EEBsDFhcMTsmitiGVoxIylqIhfioL9zauLIsk5eLZ/TYxuXQ== + dependencies: + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/theming" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/theming" "7.0.24" memoizerific "^1.11.3" prop-types "^15.7.2" -"@storybook/addons@7.0.7", "@storybook/addons@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-7.0.7.tgz#cef9a022bcdd14e79d4fc364fb3eb8e44e94ed18" - integrity sha512-it8NWXsdm3dhjc237d9jj7dGJf6eHDfuDv12nirV64J1dzWrnW+lONeZMPMgxxdLlgYfxH52fLgjcw/dAC/E+Q== +"@storybook/addons@7.0.24", "@storybook/addons@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-7.0.24.tgz#7834401931d3a15b43895ca714514e356a9b027a" + integrity sha512-e15hORnOD0ugvOVOTyZyLJhbDTWa4G1OHVUlboazy8O4TSvAXNBdLV1wOdY5RGoGD6Z5A4iR/gZXM0qc6Fh9xg== dependencies: - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/types" "7.0.24" -"@storybook/api@7.0.7", "@storybook/api@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-7.0.7.tgz#ae2c3f435b025f0aac86da1033ad3f0cbceb6ef4" - integrity sha512-0++LcK6PX1Z2HsI9fyZyqvmeFrB5NDMcsbmIvJfA2NfK92UW8y7t6Ft2fq/2jUCJcWT8Jp3xpatUvYb28irfwg== +"@storybook/api@7.0.24", "@storybook/api@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-7.0.24.tgz#9c9b6f8a1883ca90226ea8bf2bc9c64a428c65ce" + integrity sha512-rjWZgBbt43Ma5Vg2RwK9FtiF9ZkLRT+vOfDFtRL1PQkOIUlYlm33dOdPTh+HrW5QMO9cj/cchqmzU2AtgEZCyw== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/manager-api" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/manager-api" "7.0.24" -"@storybook/blocks@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.0.7.tgz#42a9271ab05e98e871f2c68cb7775af122a753a6" - integrity sha512-ehR0hAFWNHHqmrmbwYPKhLpgbIBKtyMbeoGClTRSnrVBGONciYJdmxegkCTReUklCY+HBJjtlwNowT+7+5sSaw== +"@storybook/blocks@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.0.24.tgz#43696ea35ca2d4b20feb9837a0663333aec21da5" + integrity sha512-76pe4QC3WZBVxBt/RomGubW5xzbh4uF7LVn1Vonfujf4GaHgIDzu7KtLIjgM3NmDJCsp3PNfbgA1EKzWrPQz2A== dependencies: - "@storybook/channels" "7.0.7" - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/csf" "^0.1.0" - "@storybook/docs-tools" "7.0.7" + "@storybook/docs-tools" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/theming" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/theming" "7.0.24" + "@storybook/types" "7.0.24" "@types/lodash" "^4.14.167" color-convert "^2.0.1" dequal "^2.0.2" @@ -2686,15 +2496,15 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/builder-manager@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.0.7.tgz#3761647d414a9854bac99ee0d21e2b6f50bb5fed" - integrity sha512-VI/0iEjAlzQDt1yKu8GXugNIz7t46IHIKgMNmltQ05KPypMgInUoMmbfP5AYOVddjLdSqjMLO7EK58pBLOInpw== +"@storybook/builder-manager@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.0.24.tgz#0a88b6583de68d9cfc3107c4a5250a193f454ad8" + integrity sha512-qSehfB1yS1ch/XSUdqNaTXitboNry4aKASte+kFhM5wSJcAgGBeB5akz8pc+JiRPWozqyceYkIdTG/KcRDeojg== dependencies: "@fal-works/esbuild-plugin-global-externals" "^2.1.2" - "@storybook/core-common" "7.0.7" - "@storybook/manager" "7.0.7" - "@storybook/node-logger" "7.0.7" + "@storybook/core-common" "7.0.24" + "@storybook/manager" "7.0.24" + "@storybook/node-logger" "7.0.24" "@types/ejs" "^3.1.1" "@types/find-cache-dir" "^3.2.1" "@yarnpkg/esbuild-plugin-pnp" "^3.0.0-rc.10" @@ -2708,31 +2518,31 @@ process "^0.11.10" util "^0.12.4" -"@storybook/builder-webpack5@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-7.0.7.tgz#533b124e950289b321d22bd53a4182e219e6b059" - integrity sha512-VdPPgQau9150arge3IVW+CkVBNwkQgmtJlUst7pIe/7lTP/m+ClWLTfhdkZHZk5Qb24EAdq6rmEO3LlvRBMUAg== +"@storybook/builder-webpack5@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-7.0.24.tgz#82bdd20e71f4c4ab9302cc310ce87ae9711f32c9" + integrity sha512-gA4otfsq9yTRT2IdYKkyqUdy+60a09CRDUtM1JB8a1eLmyL4az02qZv/l6D9Ccj/w5JNcJndtJX+3thOowOWOQ== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "7.0.7" - "@storybook/api" "7.0.7" - "@storybook/channel-postmessage" "7.0.7" - "@storybook/channel-websocket" "7.0.7" - "@storybook/channels" "7.0.7" - "@storybook/client-api" "7.0.7" - "@storybook/client-logger" "7.0.7" - "@storybook/components" "7.0.7" - "@storybook/core-common" "7.0.7" - "@storybook/core-events" "7.0.7" - "@storybook/core-webpack" "7.0.7" + "@storybook/addons" "7.0.24" + "@storybook/api" "7.0.24" + "@storybook/channel-postmessage" "7.0.24" + "@storybook/channel-websocket" "7.0.24" + "@storybook/channels" "7.0.24" + "@storybook/client-api" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/components" "7.0.24" + "@storybook/core-common" "7.0.24" + "@storybook/core-events" "7.0.24" + "@storybook/core-webpack" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/manager-api" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/preview" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/router" "7.0.7" - "@storybook/store" "7.0.7" - "@storybook/theming" "7.0.7" + "@storybook/manager-api" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/preview" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/router" "7.0.24" + "@storybook/store" "7.0.24" + "@storybook/theming" "7.0.24" "@types/node" "^16.0.0" "@types/semver" "^7.3.4" babel-loader "^9.0.0" @@ -2757,50 +2567,49 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.4.3" -"@storybook/channel-postmessage@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-7.0.7.tgz#8b00a45f3a078946169f7222c320d8d1e17b67c2" - integrity sha512-XMtYfcaE0UoY/V7K1cTu9PcWETD4iyWb/Yswc4F9VrPw0Ui4UwGS1j4iaAu8DC06yyoJs4XvxYFBMlCQmKja6A== +"@storybook/channel-postmessage@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-7.0.24.tgz#789bd121cf64e306737ec0f3b096ea0ac6f47bf5" + integrity sha512-QLtLXjEeTEwBN/7pB888mBaykmRU9Jy2BitvZuLJWyHHygTYm3vYZOaGR37DT+q/6Ob5GaZ0tURZmCSNDe8IIA== dependencies: - "@storybook/channels" "7.0.7" - "@storybook/client-logger" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" qs "^6.10.0" telejson "^7.0.3" -"@storybook/channel-websocket@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-7.0.7.tgz#c2ddd6503275153824a0f487bd77ec3bd3763edd" - integrity sha512-KDbLiQts4/dCow3qk5WJSPA6SlaX3iP9RhF0Fjj03hoG2TRskrvo+AkUiJr8gF6dpkPndfuCYUCRsO2Ml8B+AA== +"@storybook/channel-websocket@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-7.0.24.tgz#8c58698eda89e1b4dfee822e5f9106453b637e6c" + integrity sha512-GKSlWx5FgMQM0TKRCSGNTxLh0YU7xmg7m6FH8b/mvhH0Uido487qcJap2Ma/WOLe8aRiZo9jJpfcbUsKBWhuMg== dependencies: - "@storybook/channels" "7.0.7" - "@storybook/client-logger" "7.0.7" + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" "@storybook/global" "^5.0.0" telejson "^7.0.3" -"@storybook/channels@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.7.tgz#3f3962be97b447752db99a78ef7beea9f94d75a4" - integrity sha512-Om4ovBLNw8pVrBu83MpOKgAuGO9Dpr1Coh2qp8t64WRPkejX1mxOY9IgH723//zH3igx8LCkf9rvBvcrsyaScQ== +"@storybook/channels@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.24.tgz#fcfe7a1a5599265506f07fe81d03b0585303fc15" + integrity sha512-NZVLwMhtzy6cZrNRjshFvMAD9mQTmJDNwhohodSkM/YFCDVFhmxQk9tgizVGh9MwY3CYGJ1SI96RUejGosb49Q== -"@storybook/cli@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.0.7.tgz#56d8f021fb64b6c07a9795e960a5267c3a411d75" - integrity sha512-koTkWr7wlaHF14T5moRP/tYM44+Jf4GEzQ/rqx/Jfn7EbNlVUOibdLJj4JnseMGRc7ZP6tKYku2n+B8g7hJX4w== +"@storybook/cli@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.0.24.tgz#8b01bb5b59aff34742d71e145c0f577ae20271fa" + integrity sha512-TmHPJrcqUMAGpPKqw0PHI82m+Tyh6J8LgWjyZENpOGJlQH6SJ5caA/ho9R3pqVuMRRcnGgWt0xq1YJtDlYBN9g== dependencies: "@babel/core" "^7.20.2" "@babel/preset-env" "^7.20.2" "@ndelangen/get-tarball" "^3.0.7" - "@storybook/codemod" "7.0.7" - "@storybook/core-common" "7.0.7" - "@storybook/core-server" "7.0.7" - "@storybook/csf-tools" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/telemetry" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/codemod" "7.0.24" + "@storybook/core-common" "7.0.24" + "@storybook/core-server" "7.0.24" + "@storybook/csf-tools" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/telemetry" "7.0.24" + "@storybook/types" "7.0.24" "@types/semver" "^7.3.4" - boxen "^5.1.2" chalk "^4.1.0" commander "^6.2.1" cross-spawn "^7.0.3" @@ -2816,6 +2625,7 @@ globby "^11.0.2" jscodeshift "^0.14.0" leven "^3.1.0" + ora "^5.4.1" prettier "^2.8.0" prompts "^2.4.0" puppeteer-core "^2.1.1" @@ -2828,33 +2638,33 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-api@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-7.0.7.tgz#527925ede8f08a0b2d619e751a4896819ee84b92" - integrity sha512-O8HLBWR4TVuUifF8RBSi5++TjetSlQ6bgtGEWLkmPB9+135gczJuRYAZ7xbNw2xACzFa5KWka4OE30+MXOUiDA== +"@storybook/client-api@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-7.0.24.tgz#873d4ce9e46ef7f790063166b69490a763656d58" + integrity sha512-D9brib29aET1peRq6Nu7iBFgE+9W7ia3KCua5/AS980RFnXgGPE9x07knTbaAOuiHxHFrmQpdFF9BvVms1GS4A== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/preview-api" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/preview-api" "7.0.24" -"@storybook/client-logger@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.7.tgz#1f91eb2785111c94b7946bda2d32199c11045d71" - integrity sha512-EclHjDs5HwHMKB4X2orn/KKA0DTIDmp4AXAUJGRfxb5ArpKEb7tXLHsgrRBlaoz1j5LAwKTmEyZOONh9G3etjg== +"@storybook/client-logger@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.24.tgz#7be57ce1f90e65c6e9da7a88ed9ca7c5ce3c6536" + integrity sha512-4zRTb+QQ1hWaRqad/UufZNRfi2d/cf5a40My72Ct97VwjhJFE6aQ3K+hl1Xt6hh8dncDL2JK3cgziw6ElqjT0w== dependencies: "@storybook/global" "^5.0.0" -"@storybook/codemod@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.0.7.tgz#cb7b1eddaffc6bd5cc609fc40afe7cec3d5cf0b2" - integrity sha512-VlkDlkvfbzLe+NOmzs5zGrGb4jnaeAFZqpvIkXxevr6aGcOwgeelNv8gTmgBAcy+xbGW4Pp0XA2BlMweIvKEKA== +"@storybook/codemod@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.0.24.tgz#5cc64eb45b3d46cbd7cd6d66899b5538b7a64bad" + integrity sha512-PukV4GRPIISuVxpMMlTilwlGXdZ7E+JZWHNVb1tTwntmxMNcby8UxyWSHjbOpA2fxXGeUCjgCpcfTymJ+hxoYw== dependencies: "@babel/core" "~7.21.0" "@babel/preset-env" "~7.21.0" "@babel/types" "~7.21.2" "@storybook/csf" "^0.1.0" - "@storybook/csf-tools" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/csf-tools" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/types" "7.0.24" cross-spawn "^7.0.3" globby "^11.0.2" jscodeshift "^0.14.0" @@ -2862,84 +2672,85 @@ prettier "^2.8.0" recast "^0.23.1" -"@storybook/components@7.0.7", "@storybook/components@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.0.7.tgz#3b4829e8287e81a6850417c40f6f28e6ea5580bc" - integrity sha512-6PLs9LMkBuhH/w4bSJ72tYgICMbOOIHuoB/fQdVlzhsdnXL2fM/v4RVW2N7v+Oz3lYXp/JtV8V9Ub8h6eDQKXg== +"@storybook/components@7.0.24", "@storybook/components@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.0.24.tgz#0676fa8d2085217786ccf994bc890dab0fa3d9c2" + integrity sha512-Pu7zGurCyWyiuFl2Pb5gybHA0f4blmHuVqccbMqnUw4Ew80BRu8AqfhNqN2hNdxFCx0mmy0baRGVftx76rNZ0w== dependencies: - "@storybook/client-logger" "7.0.7" + "@storybook/client-logger" "7.0.24" "@storybook/csf" "^0.1.0" "@storybook/global" "^5.0.0" - "@storybook/theming" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/theming" "7.0.24" + "@storybook/types" "7.0.24" memoizerific "^1.11.3" use-resize-observer "^9.1.0" util-deprecate "^1.0.2" -"@storybook/core-client@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.0.7.tgz#247d5b36af61ec59f93d465df0e1a993819892a5" - integrity sha512-eydcpR28qV3A3BwR5V6wsixoI1BRLA0SzFiwH/1ajrgX13inv+gV97gHv47Ojf/+YAZ3HqdVaUKFsUfMKwKieA== +"@storybook/core-client@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.0.24.tgz#eb1e6f239ca8bc3a9cce77295463c6712a2b9829" + integrity sha512-uToMHbi5EnOk+8Z941j0hrRE1h9u/QWqCmqS2FBIWrBOeREwy0AAib1/hqihzhO7OzekY5mtLTANiCpIpLHAHQ== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/preview-api" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/preview-api" "7.0.24" -"@storybook/core-common@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.0.7.tgz#7401d202c3e277caa5f9033a05a95aa8df570363" - integrity sha512-c8T24wex9bnCYdZVZFNX4VV+wfhrp47OLzVONZDqxMhq6G//Bgv5zH4Awcx5UfWf/05VcP7KGF1VKj8ebRyEEA== +"@storybook/core-common@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.0.24.tgz#2828323f9e0de2cec093f42773324ab0826fa1f3" + integrity sha512-FHjL2dpwDHnicLTePkiZMfO5eFxJxpTP2xmGWFQnWFTyEgh+ipcWnLVoYYXiKcc6EzKED0yebk8rAIalbzpICg== dependencies: - "@storybook/node-logger" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/node-logger" "7.0.24" + "@storybook/types" "7.0.24" "@types/node" "^16.0.0" + "@types/node-fetch" "^2.6.4" "@types/pretty-hrtime" "^1.0.0" chalk "^4.1.0" esbuild "^0.17.0" esbuild-register "^3.4.0" - file-system-cache "^2.0.0" + file-system-cache "2.3.0" find-up "^5.0.0" fs-extra "^11.1.0" glob "^8.1.0" glob-promise "^6.0.2" handlebars "^4.7.7" lazy-universal-dotenv "^4.0.0" + node-fetch "^2.0.0" picomatch "^2.3.0" pkg-dir "^5.0.0" pretty-hrtime "^1.0.3" resolve-from "^5.0.0" ts-dedent "^2.0.0" -"@storybook/core-events@7.0.7", "@storybook/core-events@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.7.tgz#9acb6425d0a2a3d25becc21980c2c678c6c5548e" - integrity sha512-XNsR2RgaL2vBwuqsu+KA1DzGmB1UFfrAhpxhmyWTKDCniwtTLlaXgfKbqwcrOrPu/o1YswgIup/9UHepRHaf4A== +"@storybook/core-events@7.0.24", "@storybook/core-events@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.24.tgz#3fa4b2b3af64a86525b4cf07f49a7410125ef810" + integrity sha512-xkf/rihCkhqMeh5EA8lVp90/mzbb2gcg6I3oeFWw2hognVcTnPXg6llhWdU4Spqd0cals7GEFmQugIILCmH8GA== -"@storybook/core-server@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.0.7.tgz#77de045a76e52d5beb9acf27695a82f2af63dd6c" - integrity sha512-PB4zoClH7aKG4XeJhxx43iK9n/C9gctXubNN5DSN6thPm4UITOas+/q4N7AHbCPyRbcMyoW7M31KtpzZu4Fjew== +"@storybook/core-server@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.0.24.tgz#f1f5f223fc0bc40eff15495450b4fc8bf544f644" + integrity sha512-FJgdbtLgppFMd/RedF728I+v45TRG7s5/3RJfwgRgbq4ZEhKFzZN66MwWFeq3i5Q8ETHVwAxyVvC/JrRqAJxoA== dependencies: "@aw-web-design/x-default-browser" "1.4.88" "@discoveryjs/json-ext" "^0.5.3" - "@storybook/builder-manager" "7.0.7" - "@storybook/core-common" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/builder-manager" "7.0.24" + "@storybook/core-common" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/csf" "^0.1.0" - "@storybook/csf-tools" "7.0.7" + "@storybook/csf-tools" "7.0.24" "@storybook/docs-mdx" "^0.1.0" "@storybook/global" "^5.0.0" - "@storybook/manager" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/telemetry" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/manager" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/telemetry" "7.0.24" + "@storybook/types" "7.0.24" "@types/detect-port" "^1.3.0" "@types/node" "^16.0.0" "@types/node-fetch" "^2.5.7" "@types/pretty-hrtime" "^1.0.0" "@types/semver" "^7.3.4" better-opn "^2.1.1" - boxen "^5.1.2" chalk "^4.1.0" cli-table3 "^0.6.1" compression "^1.7.4" @@ -2962,44 +2773,44 @@ watchpack "^2.2.0" ws "^8.2.3" -"@storybook/core-webpack@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/core-webpack/-/core-webpack-7.0.7.tgz#7a0c6a6cbe2b8f6f9859c11b170e11bec2276160" - integrity sha512-6s2PN4yoaIubs/Lv02/un9zQd/OSxFmx+dLStz3nI6JWzHjboIkIwjU3aryJuhM0OrQ/3Sxmv1WxgMiCnSCagg== +"@storybook/core-webpack@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/core-webpack/-/core-webpack-7.0.24.tgz#a8bbb3f82788578924403a06b8d5997965cdc1b0" + integrity sha512-sM0hX55uNFXfQdRMthFdY6luWmi9MG+dIj6bNPiVY2SxNenxj62P/0/R/1Ime27X/vzFbi12pqUijzPNUwiwQw== dependencies: - "@storybook/core-common" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/core-common" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/types" "7.0.24" "@types/node" "^16.0.0" ts-dedent "^2.0.0" -"@storybook/csf-plugin@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.0.7.tgz#beaab0e234bc116f11de06a089f8d31363fd01cf" - integrity sha512-uhf2g077gXA6ZEMXIPQ0RnX+IoOTBJbj+6+VQfT7K5tvJeop1z0Fvk0FoknNXcUe7aUA0nzA/cUQ1v4vXqbY3Q== +"@storybook/csf-plugin@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.0.24.tgz#e312d032f7a7b107246cacfda305dcb967cb7e30" + integrity sha512-+oIZCIhrRFbvplXUwJn671ZM0kgNqZ59jM9RmehJGgu5N5h1JSbBcz1edXgStNsMk9e2NJopuOKrzZGTGyi0XA== dependencies: - "@storybook/csf-tools" "7.0.7" + "@storybook/csf-tools" "7.0.24" unplugin "^0.10.2" -"@storybook/csf-tools@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.0.7.tgz#d75a0f57b1660338a985eb88bb5dbe45edf48019" - integrity sha512-KbO5K2RS0oFm94eR49bAPvoyXY3Q6+ozvBek/F05RP7iAV790icQc59Xci9YDM1ONgb3afS+gSJGFBsE0h4pmg== +"@storybook/csf-tools@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.0.24.tgz#ba35a537a2d6cca46f9c5ac9c0c6bdf5e3d0aa7b" + integrity sha512-RBNiXY3ht6XpcIyVgxBo7mK2t32tJuC93OO/HgcoRFClcdA8HUnlva297XpJpMqCgrcF8fPqRo+ZcLeC7vjzvw== dependencies: "@babel/generator" "~7.21.1" "@babel/parser" "~7.21.2" "@babel/traverse" "~7.21.2" "@babel/types" "~7.21.2" "@storybook/csf" "^0.1.0" - "@storybook/types" "7.0.7" + "@storybook/types" "7.0.24" fs-extra "^11.1.0" recast "^0.23.1" ts-dedent "^2.0.0" "@storybook/csf@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.0.tgz#62315bf9704f3aa4e0d4d909b9033833774ddfbe" - integrity sha512-uk+jMXCZ8t38jSTHk2o5btI+aV2Ksbvl6DoOv3r6VaCM1KZqeuMwtwywIQdflkA8/6q/dKT8z8L+g8hC4GC3VQ== + version "0.1.1" + resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.1.tgz#abccc8c3e49aed0a6a7e87beb0d1c262b1921c06" + integrity sha512-4hE3AlNVxR60Wc5KSC68ASYzUobjPqtSKyhV6G+ge0FIXU55N5nTY7dXGRZHQGDBPq+XqchMkIdlkHPRs8nTHg== dependencies: type-fest "^2.19.0" @@ -3008,15 +2819,15 @@ resolved "https://registry.yarnpkg.com/@storybook/docs-mdx/-/docs-mdx-0.1.0.tgz#33ba0e39d1461caf048b57db354b2cc410705316" integrity sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg== -"@storybook/docs-tools@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.0.7.tgz#d64333fe862889b664509f7eeef9f586b5c30ccd" - integrity sha512-VB4Qa33DYNxXALWcXyDid246r9Q6SGM+Q+pGWOuEJsxRxDmrUspXHaHG0CO1NIjMWfbqpOoz61vquZO0GZoAAg== +"@storybook/docs-tools@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.0.24.tgz#388a0bab7c2d179b571045929f264a2b984e38ee" + integrity sha512-vmDHmHB1B5CWsYQ7CEtfz4vdf36VK/EZdNQUox9kdN935Dks7KSuGcDdXiRlWc78e94/A9+1mJQpyfwtn3E8fQ== dependencies: "@babel/core" "^7.12.10" - "@storybook/core-common" "7.0.7" - "@storybook/preview-api" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/core-common" "7.0.24" + "@storybook/preview-api" "7.0.24" + "@storybook/types" "7.0.24" "@types/doctrine" "^0.0.3" doctrine "^3.0.0" lodash "^4.17.21" @@ -3026,19 +2837,19 @@ resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed" integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ== -"@storybook/manager-api@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.0.7.tgz#0b3a839f4c48c84424ce0462739afb5c7e08d1b7" - integrity sha512-QTd/P72peAhofKqK+8yzIO9iWAEfPn8WUGGveV2KGaTlSlgbr87RLHEKilcXMZcYhBWC9izFRmjKum9ROdskrQ== +"@storybook/manager-api@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.0.24.tgz#29a357a35c661a0e86567ef6f0f8afeca3b3bced" + integrity sha512-cBpgDWq8reFgyrv4fBZlZJQyWYb9cDW0LDe476rWn/29uXNvYMNsHRwveLNgSA8Oy1NdyQCgf4ZgcYvY3wpvMA== dependencies: - "@storybook/channels" "7.0.7" - "@storybook/client-logger" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/csf" "^0.1.0" "@storybook/global" "^5.0.0" - "@storybook/router" "7.0.7" - "@storybook/theming" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/router" "7.0.24" + "@storybook/theming" "7.0.24" + "@storybook/types" "7.0.24" dequal "^2.0.2" lodash "^4.17.21" memoizerific "^1.11.3" @@ -3047,43 +2858,43 @@ telejson "^7.0.3" ts-dedent "^2.0.0" -"@storybook/manager@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.0.7.tgz#7d28ddf681fe96382704bca0cd1a0053be8eba32" - integrity sha512-FhquwUpUOHsjZROf6E6kzUnJ6EmMeJ9b+HYg6yYPyIMYVMjAhnkRKbIj0phGx2lhgKFlmxik+3pgchK5SLdcZA== +"@storybook/manager@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.0.24.tgz#7c9420d448a88574b696d2bd9c2ae11e7d33de22" + integrity sha512-LsQd2cFJViwoPJ7K0A/XBWrBBhJv7F0J6+aa7qHszNmIZHVbMXyZfiX7JS3RHVs4I2kLuNpSk4X+iDG0QAafEQ== "@storybook/mdx2-csf@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@storybook/mdx2-csf/-/mdx2-csf-1.0.0.tgz#ce4b2e44c9082bf382db835eef611b0097b7d771" - integrity sha512-dBAnEL4HfxxJmv7LdEYUoZlQbWj9APZNIbOaq0tgF8XkxiIbzqvgB0jhL/9UOrysSDbQWBiCRTu2wOVxedGfmw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@storybook/mdx2-csf/-/mdx2-csf-1.1.0.tgz#97f6df04d0bf616991cc1005a073ac004a7281e5" + integrity sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw== -"@storybook/node-logger@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.0.7.tgz#114e6d1994e0445dd9e579768bdb89adbf1055cd" - integrity sha512-5Y4LLgKeCStq1ktCKZ5eNPzQQSQ+CYZAlkEdzQ3Pp//0KXaZvVxEvGtaYhAymP2HatLpI8Oneo4lHrJioRfgww== +"@storybook/node-logger@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.0.24.tgz#dc260cbce5cd5187b131e4d1d08fe750f748f5ad" + integrity sha512-gjcYnreYBBtZVF6p/cHMas4FEafPddjsLMrAfB+0lLGoRdUwWVto46BZTHQ9seY5gPW0JQydAdDGHko8/kEOXA== dependencies: "@types/npmlog" "^4.1.2" chalk "^4.1.0" npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/postinstall@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.0.7.tgz#93350a924da06035dc8683c8c8ab2609186bdb6b" - integrity sha512-APcZ2KaR7z1aJje3pID4Ywmt1/aVcP3Sc4ltzNdH9mCkEsuq0fZHHQrYSa9Ya1IPRmSeLZ5/23q1iyqmGU3zoQ== +"@storybook/postinstall@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.0.24.tgz#c24e8ba032313d7776d2501435fa3c9a6685e055" + integrity sha512-UYMXyEU4nVIKyrlUdIs3NHQmILzrN+EkEDbmeQC2WMMPw+t4GY2cDVmpx90JYYZcn7gY+cNDgQ55iiqbvlamLQ== -"@storybook/preset-react-webpack@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/preset-react-webpack/-/preset-react-webpack-7.0.7.tgz#a3bd218476a1f86ec14e3055a7483c8d3387f93a" - integrity sha512-OvLnWuZg/idR5gi8kinZf8RVCFcmAsSAbMI0CENaUAPkozFgQNpVlUzWZIHA9PXwPZC4dl2tkVbphkwYOfU9AA== +"@storybook/preset-react-webpack@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/preset-react-webpack/-/preset-react-webpack-7.0.24.tgz#b5922e629f71ec6b8663dcc8c2d74c5e43bc11bb" + integrity sha512-9BI243TMv5f+CjzGVB3CFA82E2kWYhQTaRoeNKxxk7NvgiascFMATkgBjIwtGYVXL9umk8mytzulOq/oXPnscQ== dependencies: "@babel/preset-flow" "^7.18.6" "@babel/preset-react" "^7.18.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.5" - "@storybook/core-webpack" "7.0.7" - "@storybook/docs-tools" "7.0.7" - "@storybook/node-logger" "7.0.7" - "@storybook/react" "7.0.7" + "@storybook/core-webpack" "7.0.24" + "@storybook/docs-tools" "7.0.24" + "@storybook/node-logger" "7.0.24" + "@storybook/react" "7.0.24" "@storybook/react-docgen-typescript-plugin" "1.0.6--canary.9.0c3f3b7.0" "@types/node" "^16.0.0" "@types/semver" "^7.3.4" @@ -3094,18 +2905,18 @@ semver "^7.3.7" webpack "5" -"@storybook/preview-api@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.7.tgz#8f8da37418d91dd3d9009df914cb26add87a8e67" - integrity sha512-R5pmGTodpu6hbwEg2RM2ulWtW3d426YzsisHrZJ+FT9lecWauN1y9xHCz7HdNzEFhT8r4YOa24L9ZS3mosZ7hA== +"@storybook/preview-api@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.24.tgz#93634c060aa43bb10fb233f28ae83b7d74b98aad" + integrity sha512-psycU07tuB5nyJvfAJiDN/9e8cjOdJ+5lrCSYC3vPzH86LxADDIN0/8xFb1CaQWcXZsADEFJGpHKWbRhjym5ew== dependencies: - "@storybook/channel-postmessage" "7.0.7" - "@storybook/channels" "7.0.7" - "@storybook/client-logger" "7.0.7" - "@storybook/core-events" "7.0.7" + "@storybook/channel-postmessage" "7.0.24" + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/csf" "^0.1.0" "@storybook/global" "^5.0.0" - "@storybook/types" "7.0.7" + "@storybook/types" "7.0.24" "@types/qs" "^6.9.5" dequal "^2.0.2" lodash "^4.17.21" @@ -3115,10 +2926,10 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/preview@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.0.7.tgz#a86b4fe9bf92ececf1be54ec0753a088ca838e50" - integrity sha512-uL3ZcFao6UvxiSxCIcXKFakxEr9Nn0lvu0zzC2yQCVepzA7a+GDr1cK5VbZ6Mez38CnOvBmb5pkCbgRqSf/oug== +"@storybook/preview@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.0.24.tgz#2657c36f7de9c13958333b25b395a798f5be3e43" + integrity sha512-rej4Wz8Qy4gVuyvg4cpQGkR4wJc3b+0Uv6EYylbmpdj2585cOhFtRBykagDVZteVU4xaLMT7YHIZRnoLmJKIgw== "@storybook/react-docgen-typescript-plugin@1.0.6--canary.9.0c3f3b7.0": version "1.0.6--canary.9.0c3f3b7.0" @@ -3133,33 +2944,33 @@ react-docgen-typescript "^2.2.2" tslib "^2.0.0" -"@storybook/react-dom-shim@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.0.7.tgz#c733bae46900098b494bbeb9ef5e2bc9b23cca8d" - integrity sha512-INGwFeu9M+RzpvktSKuwy8Rk/70mXGqxxsb9lPtq7phmETvfpNX7GnLJqiVazTaQiB1DkB0iAPUsK2MNbBu+Kw== +"@storybook/react-dom-shim@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.0.24.tgz#987378ef01a550778ac8c6b16c89ad5271ad02ef" + integrity sha512-YOP1C3dWTLYP5mPb7hNuDRIhADzz+ppfb+S22JNJ3kqm+tsyE/YtAbRf80k6QIG1LzukMpGoEnjjOPOsWsyvFQ== -"@storybook/react-webpack5@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/react-webpack5/-/react-webpack5-7.0.7.tgz#f14d1c451a982d7423de89137ed865704c63ec5a" - integrity sha512-LTDpE5ufygYa2BW4K8/Kx3U0UlIPYbYYNoIXngFbn9YFIQZEtg0GEulC2lvD9OadRZVspUOJz/g+3jHmA/jt3A== +"@storybook/react-webpack5@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/react-webpack5/-/react-webpack5-7.0.24.tgz#22e4d5101ecc0e5918badd56772389cf8b449edc" + integrity sha512-z5TwjpLeNXyNAPVGvTsHcXa9sjOop4lorWa++prJAY5Bpx+2//dq/O8poQat7KivtwCBmAlgYWqW52AcxXwYXA== dependencies: - "@storybook/builder-webpack5" "7.0.7" - "@storybook/preset-react-webpack" "7.0.7" - "@storybook/react" "7.0.7" + "@storybook/builder-webpack5" "7.0.24" + "@storybook/preset-react-webpack" "7.0.24" + "@storybook/react" "7.0.24" "@types/node" "^16.0.0" -"@storybook/react@7.0.7", "@storybook/react@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.0.7.tgz#cec5c1866cb7bcf235da4b0a3e391ef3ba5c4197" - integrity sha512-eEsIfAGumzo7KRi/WKFpn/PGFhwLv72oiEM/8l5MMX/6poIkiekunqJLfx2BoL4cCtiS4g7OYzOdWjN01DwVCg== +"@storybook/react@7.0.24", "@storybook/react@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.0.24.tgz#21ce8a0b09dceac7193bb0f1463b3cb9bd13ead6" + integrity sha512-JAgSs8ANysBl3+cOAjFSVG3bA2V/wP6jyu7oK0jSATRQhHRjRS/tHFMA82j0j98G2sr3JXQUxNt55Qq3k2mUcg== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/core-client" "7.0.7" - "@storybook/docs-tools" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/core-client" "7.0.24" + "@storybook/docs-tools" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/preview-api" "7.0.7" - "@storybook/react-dom-shim" "7.0.7" - "@storybook/types" "7.0.7" + "@storybook/preview-api" "7.0.24" + "@storybook/react-dom-shim" "7.0.24" + "@storybook/types" "7.0.24" "@types/escodegen" "^0.0.6" "@types/estree" "^0.0.51" "@types/node" "^16.0.0" @@ -3175,30 +2986,30 @@ type-fest "^2.19.0" util-deprecate "^1.0.2" -"@storybook/router@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.0.7.tgz#9f60dc63f083b3a24e40e2461cc18eb531dfd451" - integrity sha512-/lM8/NHQKeshfnC3ayFuO8Y9TCSHnCAPRhIsVxvanBzcj+ILbCIyZ+TspvB3hT4MbX/Ez+JR8VrMbjXIGwmH8w== +"@storybook/router@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.0.24.tgz#510b91d161d822f276300fded7b254ed3e2594f3" + integrity sha512-SRCV+srCZUbko/V0phVN8jY8ilrxQWWAY/gegwNlIYaNqLJSyYqIj739VDmX+deXl6rOEpFLZreClVXWiDU9+w== dependencies: - "@storybook/client-logger" "7.0.7" + "@storybook/client-logger" "7.0.24" memoizerific "^1.11.3" qs "^6.10.0" -"@storybook/store@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/store/-/store-7.0.7.tgz#97f85bc6954e347106f6bb694ed6809f3c69fe3d" - integrity sha512-yXVuh6DF9kOcpMGeT7lZ1kQV8bKkeGMZMRFwCfy7TeusXqUXZLCPYfgqm8gvd05dP+XZegDAXVsm/9d/NVLcwA== +"@storybook/store@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/store/-/store-7.0.24.tgz#987f622477464b505335a4926363cce48ace0eca" + integrity sha512-T6BOXpiIAiGpQcfe0Hyu3d+8Gd0sUaVTSDXJLadfr7tqC6qmMpOuyApFu1qRfgJqh4aykUb75ESCvYWoEjwm+A== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/preview-api" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/preview-api" "7.0.24" -"@storybook/telemetry@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.0.7.tgz#e38912bd803816a0995be94ac3dd9dc3a4ed1581" - integrity sha512-Ka6pwWr3sWs3A/6WQ0wsoSYzXx3Mhr7eByNZZKuuCu9jnw3I8AbIOqQX2iOVzaQBLZsvXEeqvYY8iZ+GuRbbGQ== +"@storybook/telemetry@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.0.24.tgz#bc5e510559e02fe85449ab48388feacf43911d57" + integrity sha512-mLGwm3yeWlM9Srrcecrpce4m8uyazIMkHIYcBC0cD2L/JzIRzeRS3Na8QlLKz4/+Hxawm7K/pE/DBrVjvBbm8A== dependencies: - "@storybook/client-logger" "7.0.7" - "@storybook/core-common" "7.0.7" + "@storybook/client-logger" "7.0.24" + "@storybook/core-common" "7.0.24" chalk "^4.1.0" detect-package-manager "^2.0.1" fetch-retry "^5.0.2" @@ -3207,30 +3018,25 @@ nanoid "^3.3.1" read-pkg-up "^7.0.1" -"@storybook/theming@7.0.7", "@storybook/theming@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.0.7.tgz#263c162825e3c0ff4eb53e204e586077e596037e" - integrity sha512-InTZe+Sgco1NsxgiG+cyUKWQe3GsjlIyU/o5qDdtOTXcZ64HzyBuAZlAequSddqfDeMDqxRFPc2w1J28MAUHxA== +"@storybook/theming@7.0.24", "@storybook/theming@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.0.24.tgz#5e74f20bda1cdb9ba2a4a0c7a96ca014cdee5532" + integrity sha512-CMeCCfqffJ/D5rBl1HpAM/e5Vw0h7ucT+CLzP0ALtLrguz9ZzOiIZYgMj17KpfvWqje7HT+DwEtNkSrnJ01FNQ== dependencies: "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0" - "@storybook/client-logger" "7.0.7" + "@storybook/client-logger" "7.0.24" "@storybook/global" "^5.0.0" memoizerific "^1.11.3" -"@storybook/types@7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.7.tgz#e42ab7e44b3d7d49f50592f0d9d03023f44af079" - integrity sha512-v9piuwp8FvTiHXIOOi5lEyTEJKhnbcbhVxgJ3VFhhXYFd0DTz6Bst0XIIgkgs21ITb3xhkfPbCRUueMcbXO1MA== +"@storybook/types@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.24.tgz#22b2f6658f9a091ff584e1a0643ee1ea9a54ed39" + integrity sha512-SZh/XBHP1TT5bmEk0W52nT0v6fUnYwmZVls3da5noutdgOAiwL7TANtl41XrNjG+UDr8x0OE3PVVJi+LhwUaNA== dependencies: - "@storybook/channels" "7.0.7" + "@storybook/channels" "7.0.24" "@types/babel__core" "^7.0.0" "@types/express" "^4.7.0" - file-system-cache "^2.0.0" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + file-system-cache "2.3.0" "@tootallnate/once@2": version "2.0.0" @@ -3253,14 +3059,14 @@ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== "@tsconfig/node16@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" - integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== -"@types/babel__core@^7.0.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" - integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b" + integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw== dependencies: "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" @@ -3268,17 +3074,6 @@ "@types/babel__template" "*" "@types/babel__traverse" "*" -"@types/babel__core@^7.1.14": - version "7.1.19" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" - integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - "@types/babel__generator@*": version "7.6.4" resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" @@ -3295,16 +3090,16 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.17.1" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.17.1.tgz#1a0e73e8c28c7e832656db372b779bfd2ef37314" - integrity sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA== + version "7.20.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf" + integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg== dependencies: - "@babel/types" "^7.3.0" + "@babel/types" "^7.20.7" "@types/body-parser@*": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" - integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== + version "1.19.2" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" "@types/node" "*" @@ -3316,10 +3111,10 @@ dependencies: "@types/node" "*" -"@types/clean-css@*", "@types/clean-css@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.5.tgz#69ce62cc13557c90ca40460133f672dc52ceaf89" - integrity sha512-NEzjkGGpbs9S9fgC4abuBvTpVwE3i+Acu9BBod3PUyjDVZcNsGx61b8r2PphR61QGPnn0JHVs5ey6/I4eTrkxw== +"@types/clean-css@*", "@types/clean-css@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.6.tgz#48b427285b2b654751a9bbc6f7d35e6173dec8d2" + integrity sha512-Ze1tf+LnGPmG6hBFMi0B4TEB0mhF7EiMM5oyjLDNPE9hxrPU0W+5+bHvO+eFPA+bt0iC1zkQMoU/iGdRVjcRbw== dependencies: "@types/node" "*" source-map "^0.6.0" @@ -3332,9 +3127,9 @@ "@types/express" "*" "@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== + version "1.5.0" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#9fd20b3974bdc2bcd4ac6567e2e0f6885cb2cf41" + integrity sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig== dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" @@ -3347,9 +3142,9 @@ "@types/node" "*" "@types/detect-port@^1.3.0": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/detect-port/-/detect-port-1.3.2.tgz#8c06a975e472803b931ee73740aeebd0a2eb27ae" - integrity sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g== + version "1.3.3" + resolved "https://registry.yarnpkg.com/@types/detect-port/-/detect-port-1.3.3.tgz#124c5d4c283f48a21f80826bcf39433b3e64aa81" + integrity sha512-bV/jQlAJ/nPY3XqSatkGpu+nGzou+uSwrH1cROhn+jBFg47yaNH+blW4C7p9KhopC7QxCv/6M86s37k8dMk0Yg== "@types/doctrine@^0.0.3": version "0.0.3" @@ -3375,66 +3170,34 @@ "@types/estree" "*" "@types/eslint@*": - version "8.4.10" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb" - integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw== + version "8.40.2" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.2.tgz#2833bc112d809677864a4b0e7d1de4f04d7dac2d" + integrity sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== +"@types/estree@*", "@types/estree@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== "@types/estree@^0.0.51": version "0.0.51" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== -"@types/estree@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== - -"@types/express-serve-static-core@*": - version "4.17.29" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz#2a1795ea8e9e9c91b4a4bbe475034b20c1ec711c" - integrity sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express-serve-static-core@^4.17.18": - version "4.17.24" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" - integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express-serve-static-core@^4.17.33": - version "4.17.33" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" - integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": + version "4.17.35" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" + integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" + "@types/send" "*" -"@types/express@*", "@types/express@^4.17.13": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/express@^4.7.0": +"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.17", "@types/express@^4.7.0": version "4.17.17" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== @@ -3458,9 +3221,9 @@ "@types/node" "*" "@types/graceful-fs@^4.1.3": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" - integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== + version "4.1.6" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" + integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== dependencies: "@types/node" "*" @@ -3470,9 +3233,9 @@ integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== "@types/html-minifier@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-4.0.1.tgz#9486ffc144f8d7b8f75b07939c500ac3d73617a0" - integrity sha512-6u58FWQbWP45bsxVeMJo0yk2LEsjjZsCwn0JDe/i5Edk3L+b9TR5eZ2FGaMCrLdtGYpME5AGxUqv8o+3hWKogw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-4.0.2.tgz#ea0b927ad0019821a2e9d14ba9c57d105b63cecc" + integrity sha512-4IkmkXJP/25R2fZsCHDX2abztXuQRzUAZq39PfCMz2loLFj8vS9y7aF6vDl58koXSTpsF+eL4Lc5Y4Aww/GCTQ== dependencies: "@types/clean-css" "*" "@types/relateurl" "*" @@ -3487,10 +3250,15 @@ "@types/tapable" "^1" "@types/webpack" "^4" +"@types/http-errors@*": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65" + integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ== + "@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== + version "1.17.11" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.11.tgz#0ca21949a5588d55ac2b659b69035c84bd5da293" + integrity sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA== dependencies: "@types/node" "*" @@ -3513,53 +3281,62 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^28.1.6": - version "28.1.6" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.6.tgz#d6a9cdd38967d2d746861fb5be6b120e38284dd4" - integrity sha512-0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ== +"@types/jest@^29.5.2": + version "29.5.2" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b" + integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg== + dependencies: + expect "^29.0.0" + pretty-format "^29.0.0" + +"@types/jsdom@^20.0.0": + version "20.0.1" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808" + integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ== dependencies: - jest-matcher-utils "^28.0.0" - pretty-format "^28.0.0" + "@types/node" "*" + "@types/tough-cookie" "*" + parse5 "^7.0.0" -"@types/jsdom@^16.2.13", "@types/jsdom@^16.2.4": - version "16.2.13" - resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.13.tgz#126c8b7441b159d6234610a48de77b6066f1823f" - integrity sha512-8JQCjdeAidptSsOcRWk2iTm9wCcwn9l+kRG6k5bzUacrnm1ezV4forq0kWjUih/tumAeoG+OspOvQEbbRucBTw== +"@types/jsdom@^21.1.1": + version "21.1.1" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.1.tgz#e59e26352071267b507bf04d51841a1d7d3e8617" + integrity sha512-cZFuoVLtzKP3gmq9eNosUL1R50U+USkbLtUQ1bYVgl/lKp0FZM7Cq4aIHAL8oIvQ17uSHi7jXPtfDOdjPwBE7A== dependencies: "@types/node" "*" - "@types/parse5" "*" "@types/tough-cookie" "*" + parse5 "^7.0.0" "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + version "7.0.12" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" + integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/lodash@^4.14.136": - version "4.14.185" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.185.tgz#c9843f5a40703a8f5edfd53358a58ae729816908" - integrity sha512-evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA== - -"@types/lodash@^4.14.167": - version "4.14.194" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76" - integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g== +"@types/lodash@^4.14.136", "@types/lodash@^4.14.167": + version "4.14.195" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.195.tgz#bafc975b252eb6cea78882ce8a7b6bf22a6de632" + integrity sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg== "@types/mdx@^2.0.0": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.4.tgz#d1cad61ccc803b3c248c3d9990a2a6880bef537f" - integrity sha512-qCYrNdpKwN6YO6FVnx+ulfqifKlE3lQGsNhvDaW9Oxzyob/cRLBJWow8GHBBD4NxQ7BVvtsATgLsX0vZAWmtrg== + version "2.0.5" + resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.5.tgz#9a85a8f70c7c4d9e695a21d5ae5c93645eda64b1" + integrity sha512-76CqzuD6Q7LC+AtbPqrvD9AqsN0k8bsYo2bM2J8pmNldP1aIPAbzUQ7QbobyXL4eLr1wK5x8FZFe8eF/ubRuBg== "@types/mime-types@^2.1.0": version "2.1.1" resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1" integrity sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw== +"@types/mime@*": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" + integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -3570,10 +3347,10 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== -"@types/node-fetch@^2.5.7": - version "2.6.3" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.3.tgz#175d977f5e24d93ad0f57602693c435c57ad7e80" - integrity sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w== +"@types/node-fetch@^2.5.7", "@types/node-fetch@^2.6.4": + version "2.6.4" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660" + integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg== dependencies: "@types/node" "*" form-data "^3.0.0" @@ -3586,9 +3363,9 @@ "@types/node" "*" "@types/node@*": - version "18.11.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" - integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== + version "20.3.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898" + integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw== "@types/node@18.16.18": version "18.16.18" @@ -3596,9 +3373,9 @@ integrity sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw== "@types/node@^16.0.0": - version "16.18.24" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.24.tgz#f21925dd56cd3467b4e1e0c5071d0f2af5e9a316" - integrity sha512-zvSN2Esek1aeLdKDYuntKAYjti9Z2oT4I8bfkLLhIxHlv3dwZ5vvATxOc31820iYm4hQRCwjUgDpwSMFjfTUnw== + version "16.18.37" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.37.tgz#a1f8728e4dc30163deb41e9b7aba65d0c2d4eda1" + integrity sha512-ql+4dw4PlPFBP495k8JzUX/oMNRI2Ei4PrMHgj8oT4VhGlYUzF4EYr0qk2fW+XBVGIrq8Zzk13m4cvyXZuv4pA== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -3615,15 +3392,10 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/parse5@*": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.1.tgz#f8ae4fbcd2b9ba4ff934698e28778961f9cb22ca" - integrity sha512-ARATsLdrGPUnaBvxLhUlnltcMgn7pQG312S8ccdYlnyijabrX9RN/KN/iGj9Am96CoW8e/K9628BA7Bv4XHdrA== - "@types/prettier@^2.1.5": - version "2.6.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.3.tgz#68ada76827b0010d0db071f739314fa429943d0a" - integrity sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg== + version "2.7.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" + integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== "@types/pretty-hrtime@^1.0.0": version "1.0.1" @@ -3631,34 +3403,29 @@ integrity sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ== "@types/prop-types@*": - version "15.7.4" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" - integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + version "15.7.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== "@types/q@*": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" - integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + version "1.5.5" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== -"@types/qs@*": - version "6.9.5" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b" - integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ== - -"@types/qs@^6.9.5": +"@types/qs@*", "@types/qs@^6.9.5": version "6.9.7" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== "@types/range-parser@*": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" - integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== "@types/react-dom@^18.2.0": - version "18.2.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.0.tgz#374f28074bb117f56f58c4f3f71753bebb545156" - integrity sha512-8yQrvS6sMpSwIovhPOwfyNf2Wz6v/B62LFSVYQ85+Rq3tLsBIG7rP5geMxaijTUxSkrO6RzN/IRuIAADYQsleA== + version "18.2.6" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.6.tgz#ad621fa71a8db29af7c31b41b2ea3d8a6f4144d1" + integrity sha512-2et4PDvg6PVCyS7fuTc4gPoksV58bW0RwSxWKcPRcHZf0PRUGq03TKcD/rUHe3azfV6/5/biUBJw+HhCQjaP0A== dependencies: "@types/react" "*" @@ -3669,19 +3436,10 @@ dependencies: "@types/react" "*" -"@types/react@*": - version "17.0.39" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce" - integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@>=16", "@types/react@^18.2.0": - version "18.2.0" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.0.tgz#15cda145354accfc09a18d2f2305f9fc099ada21" - integrity sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA== +"@types/react@*", "@types/react@>=16", "@types/react@^18.2.14": + version "18.2.14" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.14.tgz#fa7a6fecf1ce35ca94e74874f70c56ce88f7a127" + integrity sha512-A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -3698,14 +3456,22 @@ integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== "@types/scheduler@*": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + version "0.16.3" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" + integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== "@types/semver@^7.3.12", "@types/semver@^7.3.4": - version "7.3.13" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" - integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== + version "7.5.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a" + integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw== + +"@types/send@*": + version "0.17.1" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301" + integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q== + dependencies: + "@types/mime" "^1" + "@types/node" "*" "@types/serve-index@^1.9.1": version "1.9.1" @@ -3715,11 +3481,12 @@ "@types/express" "*" "@types/serve-static@*", "@types/serve-static@^1.13.10": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + version "1.15.2" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a" + integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw== dependencies: - "@types/mime" "^1" + "@types/http-errors" "*" + "@types/mime" "*" "@types/node" "*" "@types/sockjs@^0.3.33": @@ -3752,18 +3519,23 @@ "@types/node" "*" "@types/thrift@^0.10.11": - version "0.10.11" - resolved "https://registry.yarnpkg.com/@types/thrift/-/thrift-0.10.11.tgz#4d53e176b8c0d299f7cd4f67f78d7beb02ee7b6a" - integrity sha512-skAJTzEcz0RSKX/oooCz4nrLW+lgAq3Wy0imNRqwVpw2ODYKaQHg6iRA5Ig5tzvbFAWPUb9BcQWCf0Ul+IYyCw== + version "0.10.12" + resolved "https://registry.yarnpkg.com/@types/thrift/-/thrift-0.10.12.tgz#523426dcc1eef8ff229eac9fa5175f90b879e700" + integrity sha512-5BIQz+lJDwFCsShtLVm2o/1oXrAps9aDd1czeMP0JvYzDQqZ3cRees8ahBkMR0AGIxZR+OFvcRe7GI/v+Udc4Q== dependencies: "@types/node" "*" "@types/node-int64" "*" "@types/q" "*" "@types/tough-cookie@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.1.tgz#8f80dd965ad81f3e1bc26d6f5c727e132721ff40" - integrity sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg== + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== + +"@types/triple-beam@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8" + integrity sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g== "@types/uglify-js@*": version "3.17.1" @@ -3778,9 +3550,9 @@ integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== "@types/uuid@^8.3.1": - version "8.3.1" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f" - integrity sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg== + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== "@types/webpack-sources@*": version "3.2.0" @@ -3804,18 +3576,18 @@ source-map "^0.6.0" "@types/webpack@^5.28.0": - version "5.28.0" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03" - integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w== + version "5.28.1" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.1.tgz#c369baeff31abe54b45f7f29997e1623604198d6" + integrity sha512-qw1MqGZclCoBrpiSe/hokSgQM/su8Ocpl3L/YHE0L6moyaypg4+5F7Uzq7NgaPKPxUxUbQ4fLPLpDWdR27bCZw== dependencies: "@types/node" "*" tapable "^2.2.0" webpack "^5" -"@types/ws@^8.5.1": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== +"@types/ws@^8.5.5": + version "8.5.5" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" + integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== dependencies: "@types/node" "*" @@ -3825,9 +3597,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.8": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" - integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== + version "17.0.24" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" + integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== dependencies: "@types/yargs-parser" "*" @@ -3846,15 +3618,15 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/eslint-plugin@^5.57.0": - version "5.57.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.0.tgz#52c8a7a4512f10e7249ca1e2e61f81c62c34365c" - integrity sha512-itag0qpN6q2UMM6Xgk6xoHa0D0/P+M17THnr4SVgqn9Rgam5k/He33MA7/D7QoJcdMxHFyX7U9imaBonAX/6qA== +"@typescript-eslint/eslint-plugin@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz#2604cfaf2b306e120044f901e20c8ed926debf15" + integrity sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.57.0" - "@typescript-eslint/type-utils" "5.57.0" - "@typescript-eslint/utils" "5.57.0" + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/type-utils" "5.59.9" + "@typescript-eslint/utils" "5.59.9" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -3862,24 +3634,40 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@5.46.1": - version "5.46.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.46.1.tgz#1fc8e7102c1141eb64276c3b89d70da8c0ba5699" - integrity sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg== +"@typescript-eslint/eslint-plugin@^5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.1.tgz#81382d6ecb92b8dda70e91f9035611cb2fecd1c3" + integrity sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw== dependencies: - "@typescript-eslint/scope-manager" "5.46.1" - "@typescript-eslint/types" "5.46.1" - "@typescript-eslint/typescript-estree" "5.46.1" + "@eslint-community/regexpp" "^4.4.0" + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/type-utils" "5.60.1" + "@typescript-eslint/utils" "5.60.1" + debug "^4.3.4" + grapheme-splitter "^1.0.4" + ignore "^5.2.0" + natural-compare-lite "^1.4.0" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/parser@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.9.tgz#a85c47ccdd7e285697463da15200f9a8561dd5fa" + integrity sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ== + dependencies: + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/typescript-estree" "5.59.9" debug "^4.3.4" -"@typescript-eslint/parser@^5.54.1": - version "5.54.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.54.1.tgz#05761d7f777ef1c37c971d3af6631715099b084c" - integrity sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg== +"@typescript-eslint/parser@^5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.60.1.tgz#0f2f58209c0862a73e3d5a56099abfdfa21d0fd3" + integrity sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q== dependencies: - "@typescript-eslint/scope-manager" "5.54.1" - "@typescript-eslint/types" "5.54.1" - "@typescript-eslint/typescript-estree" "5.54.1" + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/typescript-estree" "5.60.1" debug "^4.3.4" "@typescript-eslint/scope-manager@5.46.1": @@ -3890,21 +3678,21 @@ "@typescript-eslint/types" "5.46.1" "@typescript-eslint/visitor-keys" "5.46.1" -"@typescript-eslint/scope-manager@5.54.1": - version "5.54.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz#6d864b4915741c608a58ce9912edf5a02bb58735" - integrity sha512-zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg== +"@typescript-eslint/scope-manager@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz#eadce1f2733389cdb58c49770192c0f95470d2f4" + integrity sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ== dependencies: - "@typescript-eslint/types" "5.54.1" - "@typescript-eslint/visitor-keys" "5.54.1" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/visitor-keys" "5.59.9" -"@typescript-eslint/scope-manager@5.57.0": - version "5.57.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz#79ccd3fa7bde0758059172d44239e871e087ea36" - integrity sha512-NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw== +"@typescript-eslint/scope-manager@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz#35abdb47f500c68c08f2f2b4f22c7c79472854bb" + integrity sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ== dependencies: - "@typescript-eslint/types" "5.57.0" - "@typescript-eslint/visitor-keys" "5.57.0" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/visitor-keys" "5.60.1" "@typescript-eslint/type-utils@5.46.1": version "5.46.1" @@ -3916,13 +3704,23 @@ debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/type-utils@5.57.0": - version "5.57.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.57.0.tgz#98e7531c4e927855d45bd362de922a619b4319f2" - integrity sha512-kxXoq9zOTbvqzLbdNKy1yFrxLC6GDJFE2Yuo3KqSwTmDOFjUGeWSakgoXT864WcK5/NAJkkONCiKb1ddsqhLXQ== +"@typescript-eslint/type-utils@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz#53bfaae2e901e6ac637ab0536d1754dfef4dafc2" + integrity sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q== + dependencies: + "@typescript-eslint/typescript-estree" "5.59.9" + "@typescript-eslint/utils" "5.59.9" + debug "^4.3.4" + tsutils "^3.21.0" + +"@typescript-eslint/type-utils@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz#17770540e98d65ab4730c7aac618003f702893f4" + integrity sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A== dependencies: - "@typescript-eslint/typescript-estree" "5.57.0" - "@typescript-eslint/utils" "5.57.0" + "@typescript-eslint/typescript-estree" "5.60.1" + "@typescript-eslint/utils" "5.60.1" debug "^4.3.4" tsutils "^3.21.0" @@ -3931,15 +3729,15 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.46.1.tgz#4e9db2107b9a88441c4d5ecacde3bb7a5ebbd47e" integrity sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w== -"@typescript-eslint/types@5.54.1": - version "5.54.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.54.1.tgz#29fbac29a716d0f08c62fe5de70c9b6735de215c" - integrity sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw== +"@typescript-eslint/types@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.9.tgz#3b4e7ae63718ce1b966e0ae620adc4099a6dcc52" + integrity sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw== -"@typescript-eslint/types@5.57.0": - version "5.57.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.0.tgz#727bfa2b64c73a4376264379cf1f447998eaa132" - integrity sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ== +"@typescript-eslint/types@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.60.1.tgz#a17473910f6b8d388ea83c9d7051af89c4eb7561" + integrity sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg== "@typescript-eslint/typescript-estree@5.46.1": version "5.46.1" @@ -3954,26 +3752,26 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.54.1": - version "5.54.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz#df7b6ae05fd8fef724a87afa7e2f57fa4a599be1" - integrity sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg== +"@typescript-eslint/typescript-estree@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz#6bfea844e468427b5e72034d33c9fffc9557392b" + integrity sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA== dependencies: - "@typescript-eslint/types" "5.54.1" - "@typescript-eslint/visitor-keys" "5.54.1" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/visitor-keys" "5.59.9" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.57.0": - version "5.57.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz#ebcd0ee3e1d6230e888d88cddf654252d41e2e40" - integrity sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw== +"@typescript-eslint/typescript-estree@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz#8c71824b7165b64d5ebd7aa42968899525959834" + integrity sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw== dependencies: - "@typescript-eslint/types" "5.57.0" - "@typescript-eslint/visitor-keys" "5.57.0" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/visitor-keys" "5.60.1" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -3994,17 +3792,31 @@ eslint-utils "^3.0.0" semver "^7.3.7" -"@typescript-eslint/utils@5.57.0": - version "5.57.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.57.0.tgz#eab8f6563a2ac31f60f3e7024b91bf75f43ecef6" - integrity sha512-ps/4WohXV7C+LTSgAL5CApxvxbMkl9B9AUZRtnEFonpIxZDIT7wC1xfvuJONMidrkB9scs4zhtRyIwHh4+18kw== +"@typescript-eslint/utils@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.9.tgz#adee890107b5ffe02cd46fdaa6c2125fb3c6c7c4" + integrity sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@types/json-schema" "^7.0.9" + "@types/semver" "^7.3.12" + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/typescript-estree" "5.59.9" + eslint-scope "^5.1.1" + semver "^7.3.7" + +"@typescript-eslint/utils@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.60.1.tgz#6861ebedbefba1ac85482d2bdef6f2ff1eb65b80" + integrity sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.57.0" - "@typescript-eslint/types" "5.57.0" - "@typescript-eslint/typescript-estree" "5.57.0" + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/typescript-estree" "5.60.1" eslint-scope "^5.1.1" semver "^7.3.7" @@ -4016,278 +3828,157 @@ "@typescript-eslint/types" "5.46.1" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@5.54.1": - version "5.54.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz#d7a8a0f7181d6ac748f4d47b2306e0513b98bf8b" - integrity sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg== +"@typescript-eslint/visitor-keys@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz#9f86ef8e95aca30fb5a705bb7430f95fc58b146d" + integrity sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q== dependencies: - "@typescript-eslint/types" "5.54.1" + "@typescript-eslint/types" "5.59.9" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@5.57.0": - version "5.57.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz#e2b2f4174aff1d15eef887ce3d019ecc2d7a8ac1" - integrity sha512-ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g== +"@typescript-eslint/visitor-keys@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz#19a877358bf96318ec35d90bfe6bd1445cce9434" + integrity sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw== dependencies: - "@typescript-eslint/types" "5.57.0" + "@typescript-eslint/types" "5.60.1" eslint-visitor-keys "^3.3.0" -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/ast@1.11.5", "@webassemblyjs/ast@^1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.5.tgz#6e818036b94548c1fb53b754b5cae3c9b208281c" - integrity sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.5" - "@webassemblyjs/helper-wasm-bytecode" "1.11.5" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/floating-point-hex-parser@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz#e85dfdb01cad16b812ff166b96806c050555f1b4" - integrity sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-api-error@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz#1e82fa7958c681ddcf4eabef756ce09d49d442d1" - integrity sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-buffer@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz#91381652ea95bb38bbfd270702351c0c89d69fba" - integrity sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" +"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" + integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" -"@webassemblyjs/helper-numbers@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz#23380c910d56764957292839006fecbe05e135a9" - integrity sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA== +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== + +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== + +"@webassemblyjs/helper-buffer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" + integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== + +"@webassemblyjs/helper-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.5" - "@webassemblyjs/helper-api-error" "1.11.5" + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-bytecode@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz#e258a25251bc69a52ef817da3001863cc1c24b9f" - integrity sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/helper-wasm-section@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz#966e855a6fae04d5570ad4ec87fbcf29b42ba78e" - integrity sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA== - dependencies: - "@webassemblyjs/ast" "1.11.5" - "@webassemblyjs/helper-buffer" "1.11.5" - "@webassemblyjs/helper-wasm-bytecode" "1.11.5" - "@webassemblyjs/wasm-gen" "1.11.5" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== -"@webassemblyjs/ieee754@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz#b2db1b33ce9c91e34236194c2b5cba9b25ca9d60" - integrity sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg== +"@webassemblyjs/helper-wasm-section@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" + integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== dependencies: - "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== dependencies: - "@xtuc/long" "4.2.2" + "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.5.tgz#482e44d26b6b949edf042a8525a66c649e38935a" - integrity sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ== +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/utf8@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.5.tgz#83bef94856e399f3740e8df9f63bc47a987eae1a" - integrity sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== "@webassemblyjs/wasm-edit@^1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz#93ee10a08037657e21c70de31c47fdad6b522b2d" - integrity sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ== - dependencies: - "@webassemblyjs/ast" "1.11.5" - "@webassemblyjs/helper-buffer" "1.11.5" - "@webassemblyjs/helper-wasm-bytecode" "1.11.5" - "@webassemblyjs/helper-wasm-section" "1.11.5" - "@webassemblyjs/wasm-gen" "1.11.5" - "@webassemblyjs/wasm-opt" "1.11.5" - "@webassemblyjs/wasm-parser" "1.11.5" - "@webassemblyjs/wast-printer" "1.11.5" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz#ceb1c82b40bf0cf67a492c53381916756ef7f0b1" - integrity sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA== - dependencies: - "@webassemblyjs/ast" "1.11.5" - "@webassemblyjs/helper-wasm-bytecode" "1.11.5" - "@webassemblyjs/ieee754" "1.11.5" - "@webassemblyjs/leb128" "1.11.5" - "@webassemblyjs/utf8" "1.11.5" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz#b52bac29681fa62487e16d3bb7f0633d5e62ca0a" - integrity sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw== - dependencies: - "@webassemblyjs/ast" "1.11.5" - "@webassemblyjs/helper-buffer" "1.11.5" - "@webassemblyjs/wasm-gen" "1.11.5" - "@webassemblyjs/wasm-parser" "1.11.5" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.5", "@webassemblyjs/wasm-parser@^1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz#7ba0697ca74c860ea13e3ba226b29617046982e2" - integrity sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew== - dependencies: - "@webassemblyjs/ast" "1.11.5" - "@webassemblyjs/helper-api-error" "1.11.5" - "@webassemblyjs/helper-wasm-bytecode" "1.11.5" - "@webassemblyjs/ieee754" "1.11.5" - "@webassemblyjs/leb128" "1.11.5" - "@webassemblyjs/utf8" "1.11.5" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" + integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-opt" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wast-printer" "1.11.6" + +"@webassemblyjs/wasm-gen@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" + integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wasm-opt@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" + integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + +"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" + integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wast-printer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" + integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== + dependencies: + "@webassemblyjs/ast" "1.11.6" "@xtuc/long" "4.2.2" -"@webassemblyjs/wast-printer@1.11.5": - version "1.11.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz#7a5e9689043f3eca82d544d7be7a8e6373a6fa98" - integrity sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA== - dependencies: - "@webassemblyjs/ast" "1.11.5" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f" - integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A== +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" - integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" - integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -4306,25 +3997,12 @@ dependencies: tslib "^2.4.0" -abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== - abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== -accepts@~1.3.4, accepts@~1.3.5: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -accepts@~1.3.8: +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -4332,43 +4010,43 @@ accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== +acorn-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" + integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" + acorn "^8.1.0" + acorn-walk "^8.0.2" -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== +acorn-import-assertions@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^7.1.1, acorn-walk@^7.2.0: +acorn-walk@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1: +acorn-walk@^8.0.2, acorn-walk@^8.1.1: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^7.1.1, acorn@^7.4.1: +acorn@^7.4.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== +acorn@^8.1.0, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.8.2: + version "8.9.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" + integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== address@^1.0.1: version "1.2.2" @@ -4407,7 +4085,7 @@ ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv-keywords@^5.0.0: +ajv-keywords@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== @@ -4424,36 +4102,22 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.8.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== +ajv@^8.0.0, ajv@^8.9.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" uri-js "^4.2.2" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-escapes@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== -ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== - dependencies: - type-fest "^0.11.0" - -ansi-escapes@^4.3.2: +ansi-escapes@^4.2.1, ansi-escapes@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== @@ -4567,11 +4231,19 @@ argparse@^2.0.1: integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== aria-query@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e" - integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" + integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== + dependencies: + dequal "^2.0.3" + +array-buffer-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" + integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== dependencies: - deep-equal "^2.0.5" + call-bind "^1.0.2" + is-array-buffer "^3.0.1" array-flatten@1.1.1: version "1.1.1" @@ -4583,7 +4255,7 @@ array-flatten@^2.1.2: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6: +array-includes@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== @@ -4599,14 +4271,14 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array.prototype.flat@^1.2.5: - version "1.3.0" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b" - integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw== +array.prototype.flat@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" + integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" es-shim-unscopables "^1.0.0" array.prototype.flatmap@^1.3.1: @@ -4713,6 +4385,21 @@ aws-cdk-lib@2.39.1: semver "^7.3.7" yaml "1.10.2" +aws-cdk-lib@2.44.0: + version "2.44.0" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.44.0.tgz#e6157df7a72b8d1a4528f6fb9f9b0ed7aa404bcc" + integrity sha512-h0lCcS3t2TPF5FIpkA7OcE2t4vChtz/FGcZ5jVaORj21quiUz84eOhGk2BeRoKqfSp1Zqu2QxQUk6p6YpAOrRA== + dependencies: + "@balena/dockerignore" "^1.0.2" + case "1.6.3" + fs-extra "^9.1.0" + ignore "^5.2.0" + jsonschema "^1.4.1" + minimatch "^3.1.2" + punycode "^2.1.1" + semver "^7.3.7" + yaml "1.10.2" + aws-cdk@2.39.1: version "2.39.1" resolved "https://registry.yarnpkg.com/aws-cdk/-/aws-cdk-2.39.1.tgz#028eccbbe0f18a2e7c5ad9780c5b512da17645e2" @@ -4720,10 +4407,10 @@ aws-cdk@2.39.1: optionalDependencies: fsevents "2.3.2" -aws-sdk@^2.1209.0: - version "2.1213.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1213.0.tgz#efdbe52c72e6879348650ff9a69ab55ef948b6f3" - integrity sha512-ZfrUfhlLjwvQ6QTbg8lR4+SRFHaivzZMmfpS+64YzafcKjwc7rklYqiyh4MPTSmdNZkErgaAykYpXPMuTiWBug== +aws-sdk@^2.1227.0, aws-sdk@^2.1231.0, aws-sdk@^2.946.0: + version "2.1407.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1407.0.tgz#8854a87192ea0bd984f44e751cd137d219180ca5" + integrity sha512-J02Cjciw+5p9zR7923rfH+UGDEmbg72YRAZISEahzuWPf/DwMAyIrC5B1cMMq3KrV+KVsRtEY5LujVCFKwB8Yw== dependencies: buffer "4.9.2" events "1.1.1" @@ -4734,50 +4421,34 @@ aws-sdk@^2.1209.0: url "0.10.3" util "^0.12.4" uuid "8.0.0" - xml2js "0.4.19" - -aws-sdk@^2.1231.0, aws-sdk@^2.946.0: - version "2.1231.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1231.0.tgz#c02e83b095211d9f6dfb540fd47fa69190af9c0d" - integrity sha512-ONBuRsOxsu0zL8u/Vmz49tPWi9D4ls2pjb6szdfSx9VQef7bOnWe9gJpWoA94OTzcjOWsvjsG7UgjvQJkIuPBg== - dependencies: - buffer "4.9.2" - events "1.1.1" - ieee754 "1.1.13" - jmespath "0.16.0" - querystring "0.2.0" - sax "1.2.1" - url "0.10.3" - util "^0.12.4" - uuid "8.0.0" - xml2js "0.4.19" + xml2js "0.5.0" axe-core@^4.6.2: - version "4.6.3" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.3.tgz#fc0db6fdb65cc7a80ccf85286d91d64ababa3ece" - integrity sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg== + version "4.7.2" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0" + integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g== axobject-query@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1" - integrity sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg== + version "3.2.1" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a" + integrity sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg== dependencies: - deep-equal "^2.0.5" + dequal "^2.0.3" babel-core@^7.0.0-bridge.0: version "7.0.0-bridge.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== -babel-jest@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5" - integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q== +babel-jest@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5" + integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q== dependencies: - "@jest/transform" "^28.1.3" + "@jest/transform" "^29.5.0" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^28.1.3" + babel-preset-jest "^29.5.0" chalk "^4.0.0" graceful-fs "^4.2.9" slash "^3.0.0" @@ -4806,10 +4477,10 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe" - integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q== +babel-plugin-jest-hoist@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a" + integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -4818,7 +4489,7 @@ babel-plugin-jest-hoist@^28.1.3: babel-plugin-macros@^3.1.0: version "3.1.0" - resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg== dependencies: "@babel/runtime" "^7.12.5" @@ -4839,6 +4510,15 @@ babel-plugin-polyfill-corejs2@^0.3.3: "@babel/helper-define-polyfill-provider" "^0.3.3" semver "^6.1.1" +babel-plugin-polyfill-corejs2@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz#75044d90ba5043a5fb559ac98496f62f3eb668fd" + integrity sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw== + dependencies: + "@babel/compat-data" "^7.17.7" + "@babel/helper-define-polyfill-provider" "^0.4.0" + semver "^6.1.1" + babel-plugin-polyfill-corejs3@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" @@ -4847,6 +4527,14 @@ babel-plugin-polyfill-corejs3@^0.6.0: "@babel/helper-define-polyfill-provider" "^0.3.3" core-js-compat "^3.25.1" +babel-plugin-polyfill-corejs3@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz#39248263c38191f0d226f928d666e6db1b4b3a8a" + integrity sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.4.0" + core-js-compat "^3.30.1" + babel-plugin-polyfill-regenerator@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" @@ -4854,6 +4542,13 @@ babel-plugin-polyfill-regenerator@^0.4.1: dependencies: "@babel/helper-define-polyfill-provider" "^0.3.3" +babel-plugin-polyfill-regenerator@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz#e7344d88d9ef18a3c47ded99362ae4a757609380" + integrity sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.4.0" + babel-plugin-react-docgen@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz#7cc8e2f94e8dc057a06e953162f0810e4e72257b" @@ -4881,12 +4576,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d" - integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A== +babel-preset-jest@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2" + integrity sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg== dependencies: - babel-plugin-jest-hoist "^28.1.3" + babel-plugin-jest-hoist "^29.5.0" babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: @@ -4894,16 +4589,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.0.2: +base64-js@^1.0.2, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64-js@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" - integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== - batch@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" @@ -4931,7 +4621,7 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bl@^4.0.3: +bl@^4.0.3, bl@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -4959,9 +4649,9 @@ body-parser@1.20.1: unpipe "1.0.0" bonjour-service@^1.0.11: - version "1.0.13" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.13.tgz#4ac003dc1626023252d58adf2946f57e5da450c1" - integrity sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" + integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== dependencies: array-flatten "^2.1.2" dns-equal "^1.0.0" @@ -4973,20 +4663,6 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== -boxen@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" - bplist-parser@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e" @@ -5026,11 +4702,6 @@ browser-or-node@^1.2.1: resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-1.3.0.tgz#f2a4e8568f60263050a6714b2cc236bb976647a7" integrity sha512-0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg== -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - browserify-zlib@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" @@ -5038,15 +4709,15 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4: - version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" - integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== +browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.5: + version "4.21.9" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" + integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== dependencies: - caniuse-lite "^1.0.30001400" - electron-to-chromium "^1.4.251" - node-releases "^2.0.6" - update-browserslist-db "^1.0.9" + caniuse-lite "^1.0.30001503" + electron-to-chromium "^1.4.431" + node-releases "^2.0.12" + update-browserslist-db "^1.0.11" bs-logger@0.x: version "0.2.6" @@ -5074,7 +4745,7 @@ buffer-from@^1.0.0: buffer-from@~0.1.1: version "0.1.2" - resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== buffer@4.9.2: @@ -5102,6 +4773,20 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" +bufferutil@4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad" + integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw== + dependencies: + node-gyp-build "^4.3.0" + +bundle-name@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a" + integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw== + dependencies: + run-applescript "^5.0.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -5113,9 +4798,9 @@ bytes@3.1.2: integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== c8@^7.6.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/c8/-/c8-7.13.0.tgz#a2a70a851278709df5a9247d62d7f3d4bcb5f2e4" - integrity sha512-/NL4hQTv1gBL6J6ei80zu3IiTrmePDKXKXOTLpHvcIWZTVYQlDhVWjjWvkhICylE8EwwnMVzDZugCvdx0/DIIA== + version "7.14.0" + resolved "https://registry.yarnpkg.com/c8/-/c8-7.14.0.tgz#f368184c73b125a80565e9ab2396ff0be4d732f3" + integrity sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw== dependencies: "@bcoe/v8-coverage" "^0.2.3" "@istanbuljs/schema" "^0.1.3" @@ -5161,10 +4846,10 @@ camelcase@^6.2.0, camelcase@^6.3.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001400: - version "1.0.30001448" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001448.tgz#ca7550b1587c92a392a2b377cd9c508b3b4395bf" - integrity sha512-tq2YI+MJnooG96XpbTRYkBxLxklZPOdLmNIOdIhvf7SNJan6u5vCKum8iT7ZfCt70m1GPkuC7P3TtX6UuhupuA== +caniuse-lite@^1.0.30001503: + version "1.0.30001509" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz#2b7ad5265392d6d2de25cd8776d1ab3899570d14" + integrity sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA== cardinal@^2.1.1: version "2.1.1" @@ -5245,14 +4930,14 @@ chrome-trace-event@^1.0.2: integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^3.2.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128" - integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg== + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== cjs-module-lexer@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" - integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" + integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== clean-css@^5.2.2, clean-css@^5.3.2: version "5.3.2" @@ -5273,11 +4958,6 @@ clean-stack@^3.0.1: dependencies: escape-string-regexp "4.0.0" -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== - cli-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" @@ -5286,16 +4966,16 @@ cli-cursor@^3.1.0: restore-cursor "^3.1.0" cli-progress@^3.10.0: - version "3.11.2" - resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" - integrity sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA== + version "3.12.0" + resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942" + integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A== dependencies: string-width "^4.2.3" -cli-spinners@^2.2.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" - integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== +cli-spinners@^2.2.0, cli-spinners@^2.5.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db" + integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g== cli-table3@^0.6.1: version "0.6.3" @@ -5324,6 +5004,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -5343,10 +5032,10 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemaker@^1.67.0: - version "1.67.0" - resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.67.0.tgz#adba45ef5058219cbd84e7b4bd70dfa60b98c3a2" - integrity sha512-ChqnwbXIDIq8EAju+OMOnuzJ5MQWXvFaf4PMZo2RLbLiqUfx4+ATv/i1y0rY5uZ7nvKC8lRfwmbRsgsbWQHAhA== +codemaker@^1.69.0: + version "1.84.0" + resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.84.0.tgz#da95dc297fc4be657baa49fdc3127ce1f057c6f3" + integrity sha512-sOUH3y2q2DEO+gDiBCCoGgkDs8aMY0LTMH0FmHbKpqReZwWDAmWJ0Voc4Thp4Mn380bPku9/ncqyY1a3MZnfEQ== dependencies: camelcase "^6.3.0" decamelize "^5.0.1" @@ -5371,12 +5060,12 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3, color-name@^1.0.0: +color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== -color-name@~1.1.4: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -5402,12 +5091,7 @@ color@^3.1.3: color-convert "^1.9.3" color-string "^1.6.0" -colorette@^2.0.10, colorette@^2.0.14: - version "2.0.19" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== - -colorette@^2.0.19: +colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.19: version "2.0.20" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== @@ -5427,6 +5111,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -5442,11 +5131,6 @@ commander@^8.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== -commander@^9.4.1: - version "9.4.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" - integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== - common-path-prefix@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" @@ -5512,10 +5196,15 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -constructs@10.1.91: - version "10.1.91" - resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.1.91.tgz#0491d240d12b73d5cfcd1d9f1f835732d8296949" - integrity sha512-qf5beNs2Fv9nhlzWXk1PB1AdZfAodbgepKQCkUli/H+X8EafvqC0/2o2heAAp8IrUJxLnGfC4TCz9OHtx1eESA== +constructs@10.1.117: + version "10.1.117" + resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.1.117.tgz#89032da53dfbd57d22836b5933d2f0f190adeab4" + integrity sha512-6Y1Po8yr1M/WAtamLL4kKXIWygky2rYPD4cpea9fKoI6fqtSSOy5TWmYoWXtLMS9hpi/v3XnLY+MjPsa6bMooQ== + +constructs@10.2.63: + version "10.2.63" + resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.2.63.tgz#1d02c89ae91488ebc9c8815bf2e5f7832038c78b" + integrity sha512-WoQCPWTpqAJA6fLH2wFhP642ECrtFyV9Sdw5lFOsfoem/GDfQilnBSWQyJxT9cFq2yd4J1O/7oBl0GgtpZgbSg== content-disposition@0.5.4: version "0.5.4" @@ -5525,18 +5214,11 @@ content-disposition@0.5.4: safe-buffer "5.2.1" content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -convert-source-map@^1.4.0, convert-source-map@^1.5.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== - dependencies: - safe-buffer "~5.1.1" + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== @@ -5556,22 +5238,22 @@ cookie@0.5.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== -core-js-compat@^3.25.1: - version "3.27.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.27.2.tgz#607c50ad6db8fd8326af0b2883ebb987be3786da" - integrity sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg== +core-js-compat@^3.25.1, core-js-compat@^3.30.1, core-js-compat@^3.30.2: + version "3.31.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1" + integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw== dependencies: - browserslist "^4.21.4" + browserslist "^4.21.5" core-js-pure@^3.23.3: - version "3.30.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.1.tgz#7d93dc89e7d47b8ef05d7e79f507b0e99ea77eec" - integrity sha512-nXBEVpmUnNRhz83cHd9JRQC52cTMcuXAmR56+9dSMpRdpeA4I1PX6yjmhd71Eyc/wXNsdBdUDIj1QTIeZpU5Tg== + version "3.31.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.31.0.tgz#052fd9e82fbaaf86457f5db1fadcd06f15966ff2" + integrity sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg== -core-js@^3.24.1: - version "3.26.1" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz#7a9816dabd9ee846c1c0fe0e8fcad68f3709134e" - integrity sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA== +core-js@^3.31.0: + version "3.31.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344" + integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ== core-util-is@~1.0.0: version "1.0.3" @@ -5635,14 +5317,14 @@ crypto-random-string@^2.0.0: integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== css-loader@^6.7.1: - version "6.7.3" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd" - integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ== + version "6.8.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88" + integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g== dependencies: icss-utils "^5.1.0" - postcss "^8.4.19" + postcss "^8.4.21" postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" + postcss-modules-local-by-default "^4.0.3" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" postcss-value-parser "^4.2.0" @@ -5669,11 +5351,6 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== - cssom@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" @@ -5691,10 +5368,17 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" +cssstyle@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a" + integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg== + dependencies: + rrweb-cssom "^0.6.0" + csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== + version "3.1.2" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" + integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== damerau-levenshtein@^1.0.8: version "1.0.8" @@ -5702,20 +5386,11 @@ damerau-levenshtein@^1.0.8: integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== data-uri-to-buffer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b" - integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA== - -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== - dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" + version "4.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e" + integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A== -data-urls@^3.0.1: +data-urls@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== @@ -5724,6 +5399,15 @@ data-urls@^3.0.1: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" +data-urls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4" + integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.0" + debug@2.6.9, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -5755,55 +5439,27 @@ decamelize@^5.0.1: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== -decimal.js@^10.2.1, decimal.js@^10.3.1: - version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" - integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== +decimal.js@^10.4.2, decimal.js@^10.4.3: + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== -deep-equal@^2.0.5: - version "2.2.0" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.0.tgz#5caeace9c781028b9ff459f33b779346637c43e6" - integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw== - dependencies: - call-bind "^1.0.2" - es-get-iterator "^1.1.2" - get-intrinsic "^1.1.3" - is-arguments "^1.1.1" - is-array-buffer "^3.0.1" - is-date-object "^1.0.5" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - isarray "^2.0.5" - object-is "^1.1.5" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" - side-channel "^1.0.4" - which-boxed-primitive "^1.0.2" - which-collection "^1.0.1" - which-typed-array "^1.1.9" - -deep-is@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw== - -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== -default-browser-id@3.0.0: +default-browser-id@3.0.0, default-browser-id@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c" integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA== @@ -5811,6 +5467,16 @@ default-browser-id@3.0.0: bplist-parser "^0.2.0" untildify "^4.0.0" +default-browser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da" + integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA== + dependencies: + bundle-name "^3.0.0" + default-browser-id "^3.0.0" + execa "^7.1.1" + titleize "^3.0.0" + default-gateway@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" @@ -5819,9 +5485,9 @@ default-gateway@^6.0.3: execa "^5.0.0" defaults@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" + integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== dependencies: clone "^1.0.2" @@ -5830,10 +5496,15 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.3, define-properties@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== + +define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -5877,7 +5548,7 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== -dequal@^2.0.2: +dequal@^2.0.2, dequal@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== @@ -5917,10 +5588,10 @@ detect-port@^1.3.0: address "^1.0.1" debug "4" -diff-sequences@^28.1.1: - version "28.1.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6" - integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw== +diff-sequences@^29.4.3: + version "29.4.3" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2" + integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA== diff@^4.0.1: version "4.0.2" @@ -5940,9 +5611,9 @@ dns-equal@^1.0.0: integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== dns-packet@^5.2.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" - integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== + version "5.6.0" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" + integrity sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ== dependencies: "@leichtgewicht/ip-codec" "^2.0.1" @@ -5981,13 +5652,6 @@ domelementtype@^2.0.1, domelementtype@^2.2.0: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== - dependencies: - webidl-conversions "^5.0.0" - domexception@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" @@ -6025,13 +5689,13 @@ dotenv-expand@^10.0.0: integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A== dotenv@^16.0.0: - version "16.0.3" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" - integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== duplexer2@^0.1.2: version "0.1.4" - resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA== dependencies: readable-stream "^2.0.2" @@ -6051,29 +5715,22 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@^3.1.6: - version "3.1.8" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" - integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== - dependencies: - jake "^10.8.5" - -ejs@^3.1.8: +ejs@^3.1.6, ejs@^3.1.8: version "3.1.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== dependencies: jake "^10.8.5" -electron-to-chromium@^1.4.251: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== +electron-to-chromium@^1.4.431: + version "1.4.445" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.445.tgz#058d2c5f3a2981ab1a37440f5a5e42d15672aa6d" + integrity sha512-++DB+9VK8SBJwC+X1zlMfJ1tMA3F0ipi39GdEp+x3cV2TyBihqAgad8cNMWtLDEkbH39nlDQP7PfGrDr3Dr7HA== -emittery@^0.10.2: - version "0.10.2" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933" - integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw== +emittery@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" + integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== emoji-regex@^8.0.0: version "8.0.0" @@ -6116,18 +5773,10 @@ endent@^2.0.1: fast-json-parse "^1.0.3" objectorarray "^1.0.5" -enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" - integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -enhanced-resolve@^5.13.0: - version "5.13.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz#26d1ecc448c02de997133217b5c1053f34a0a275" - integrity sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg== +enhanced-resolve@^5.0.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.15.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" + integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -6137,10 +5786,15 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== +entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + version "7.10.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13" + integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw== error-ex@^1.3.1: version "1.3.2" @@ -6157,17 +5811,17 @@ error-stack-parser@^2.0.6: stackframe "^1.3.4" es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.21.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6" - integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg== + version "1.21.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" + integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== dependencies: + array-buffer-byte-length "^1.0.0" available-typed-arrays "^1.0.5" call-bind "^1.0.2" es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" - function-bind "^1.1.1" function.prototype.name "^1.1.5" - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.0" get-symbol-description "^1.0.0" globalthis "^1.0.3" gopd "^1.0.1" @@ -6175,8 +5829,8 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: has-property-descriptors "^1.0.0" has-proto "^1.0.1" has-symbols "^1.0.3" - internal-slot "^1.0.4" - is-array-buffer "^3.0.1" + internal-slot "^1.0.5" + is-array-buffer "^3.0.2" is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" @@ -6184,70 +5838,22 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: is-string "^1.0.7" is-typed-array "^1.1.10" is-weakref "^1.0.2" - object-inspect "^1.12.2" + object-inspect "^1.12.3" object-keys "^1.1.1" object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" safe-regex-test "^1.0.0" + string.prototype.trim "^1.2.7" string.prototype.trimend "^1.0.6" string.prototype.trimstart "^1.0.6" typed-array-length "^1.0.4" unbox-primitive "^1.0.2" which-typed-array "^1.1.9" -es-abstract@^1.19.2, es-abstract@^1.20.0: - version "1.20.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" - integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.1.1" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-symbols "^1.0.3" - internal-slot "^1.0.3" - is-callable "^1.2.4" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-weakref "^1.0.2" - object-inspect "^1.12.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - regexp.prototype.flags "^1.4.3" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" - unbox-primitive "^1.0.2" - -es-get-iterator@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" - integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - has-symbols "^1.0.3" - is-arguments "^1.1.1" - is-map "^2.0.2" - is-set "^2.0.2" - is-string "^1.0.7" - isarray "^2.0.5" - stop-iteration-iterator "^1.0.0" - -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - es-module-lexer@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527" - integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg== + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" + integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== es-set-tostringtag@^2.0.1: version "2.0.1" @@ -6292,32 +5898,32 @@ esbuild-register@^3.4.0: debug "^4.3.4" esbuild@^0.17.0: - version "0.17.18" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.18.tgz#f4f8eb6d77384d68cd71c53eb6601c7efe05e746" - integrity sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w== + version "0.17.19" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955" + integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw== optionalDependencies: - "@esbuild/android-arm" "0.17.18" - "@esbuild/android-arm64" "0.17.18" - "@esbuild/android-x64" "0.17.18" - "@esbuild/darwin-arm64" "0.17.18" - "@esbuild/darwin-x64" "0.17.18" - "@esbuild/freebsd-arm64" "0.17.18" - "@esbuild/freebsd-x64" "0.17.18" - "@esbuild/linux-arm" "0.17.18" - "@esbuild/linux-arm64" "0.17.18" - "@esbuild/linux-ia32" "0.17.18" - "@esbuild/linux-loong64" "0.17.18" - "@esbuild/linux-mips64el" "0.17.18" - "@esbuild/linux-ppc64" "0.17.18" - "@esbuild/linux-riscv64" "0.17.18" - "@esbuild/linux-s390x" "0.17.18" - "@esbuild/linux-x64" "0.17.18" - "@esbuild/netbsd-x64" "0.17.18" - "@esbuild/openbsd-x64" "0.17.18" - "@esbuild/sunos-x64" "0.17.18" - "@esbuild/win32-arm64" "0.17.18" - "@esbuild/win32-ia32" "0.17.18" - "@esbuild/win32-x64" "0.17.18" + "@esbuild/android-arm" "0.17.19" + "@esbuild/android-arm64" "0.17.19" + "@esbuild/android-x64" "0.17.19" + "@esbuild/darwin-arm64" "0.17.19" + "@esbuild/darwin-x64" "0.17.19" + "@esbuild/freebsd-arm64" "0.17.19" + "@esbuild/freebsd-x64" "0.17.19" + "@esbuild/linux-arm" "0.17.19" + "@esbuild/linux-arm64" "0.17.19" + "@esbuild/linux-ia32" "0.17.19" + "@esbuild/linux-loong64" "0.17.19" + "@esbuild/linux-mips64el" "0.17.19" + "@esbuild/linux-ppc64" "0.17.19" + "@esbuild/linux-riscv64" "0.17.19" + "@esbuild/linux-s390x" "0.17.19" + "@esbuild/linux-x64" "0.17.19" + "@esbuild/netbsd-x64" "0.17.19" + "@esbuild/openbsd-x64" "0.17.19" + "@esbuild/sunos-x64" "0.17.19" + "@esbuild/win32-arm64" "0.17.19" + "@esbuild/win32-ia32" "0.17.19" + "@esbuild/win32-x64" "0.17.19" escalade@^3.1.1: version "3.1.1" @@ -6356,39 +5962,40 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@8.5.0, eslint-config-prettier@^8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" - integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== +eslint-config-prettier@8.8.0, eslint-config-prettier@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" + integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== -eslint-import-resolver-node@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" - integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== +eslint-import-resolver-node@^0.3.7: + version "0.3.7" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" + integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== dependencies: debug "^3.2.7" - resolve "^1.20.0" + is-core-module "^2.11.0" + resolve "^1.22.1" -eslint-import-resolver-typescript@3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.2.tgz#9431acded7d898fd94591a08ea9eec3514c7de91" - integrity sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ== +eslint-import-resolver-typescript@3.5.5: + version "3.5.5" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.5.tgz#0a9034ae7ed94b254a360fbea89187b60ea7456d" + integrity sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw== dependencies: debug "^4.3.4" - enhanced-resolve "^5.10.0" - get-tsconfig "^4.2.0" - globby "^13.1.2" - is-core-module "^2.10.0" + enhanced-resolve "^5.12.0" + eslint-module-utils "^2.7.4" + get-tsconfig "^4.5.0" + globby "^13.1.3" + is-core-module "^2.11.0" is-glob "^4.0.3" - synckit "^0.8.4" + synckit "^0.8.5" -eslint-module-utils@^2.7.3: - version "2.7.3" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" - integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== +eslint-module-utils@^2.7.4: + 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== dependencies: debug "^3.2.7" - find-up "^2.1.0" eslint-plugin-eslint-comments@3.2.0, eslint-plugin-eslint-comments@^3.2.0: version "3.2.0" @@ -6398,23 +6005,25 @@ eslint-plugin-eslint-comments@3.2.0, eslint-plugin-eslint-comments@^3.2.0: escape-string-regexp "^1.0.5" ignore "^5.0.5" -eslint-plugin-import@2.26.0, eslint-plugin-import@^2.26.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" - integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== +eslint-plugin-import@2.27.5, eslint-plugin-import@^2.27.5: + version "2.27.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" + integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== dependencies: - array-includes "^3.1.4" - array.prototype.flat "^1.2.5" - debug "^2.6.9" + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + array.prototype.flatmap "^1.3.1" + debug "^3.2.7" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" + eslint-import-resolver-node "^0.3.7" + eslint-module-utils "^2.7.4" has "^1.0.3" - is-core-module "^2.8.1" + is-core-module "^2.11.0" is-glob "^4.0.3" minimatch "^3.1.2" - object.values "^1.1.5" - resolve "^1.22.0" + object.values "^1.1.6" + resolve "^1.22.1" + semver "^6.3.0" tsconfig-paths "^3.14.1" eslint-plugin-jsx-a11y@^6.7.1: @@ -6446,10 +6055,10 @@ eslint-plugin-prettier@^4.2.1: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-react@^7.31.11: - version "7.31.11" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz#011521d2b16dcf95795df688a4770b4eaab364c8" - integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw== +eslint-plugin-react@^7.32.2: + version "7.32.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10" + integrity sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg== dependencies: array-includes "^3.1.6" array.prototype.flatmap "^1.3.1" @@ -6463,7 +6072,7 @@ eslint-plugin-react@^7.31.11: object.hasown "^1.1.2" object.values "^1.1.6" prop-types "^15.8.1" - resolve "^2.0.0-next.3" + resolve "^2.0.0-next.4" semver "^6.3.0" string.prototype.matchall "^4.0.8" @@ -6475,10 +6084,10 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== +eslint-scope@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" + integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -6491,23 +6100,25 @@ eslint-utils@^3.0.0: eslint-visitor-keys "^2.0.0" eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -eslint@^8.35.0: - version "8.35.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.35.0.tgz#fffad7c7e326bae606f0e8f436a6158566d42323" - integrity sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw== +eslint@^8.43.0: + version "8.43.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094" + integrity sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q== dependencies: - "@eslint/eslintrc" "^2.0.0" - "@eslint/js" "8.35.0" - "@humanwhocodes/config-array" "^0.11.8" + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.4.0" + "@eslint/eslintrc" "^2.0.3" + "@eslint/js" "8.43.0" + "@humanwhocodes/config-array" "^0.11.10" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -6516,10 +6127,9 @@ eslint@^8.35.0: debug "^4.3.2" doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-utils "^3.0.0" - eslint-visitor-keys "^3.3.0" - espree "^9.4.0" + eslint-scope "^7.2.0" + eslint-visitor-keys "^3.4.1" + espree "^9.5.2" esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -6527,13 +6137,12 @@ eslint@^8.35.0: find-up "^5.0.0" glob-parent "^6.0.2" globals "^13.19.0" - grapheme-splitter "^1.0.4" + graphemer "^1.4.0" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" is-path-inside "^3.0.3" - js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" @@ -6541,19 +6150,18 @@ eslint@^8.35.0: minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.1" - regexpp "^3.2.0" strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" -espree@^9.4.0: - version "9.4.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" - integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== +espree@^9.5.2: + version "9.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" + integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.1" esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" @@ -6633,23 +6241,38 @@ execa@^5.0.0, execa@^5.1.1: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +execa@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-7.1.1.tgz#3eb3c83d239488e7b409d48e8813b76bb55c9c43" + integrity sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.1" + human-signals "^4.3.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^3.0.7" + strip-final-newline "^3.0.0" + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -expect@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec" - integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g== +expect@^29.0.0, expect@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7" + integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg== dependencies: - "@jest/expect-utils" "^28.1.3" - jest-get-type "^28.0.2" - jest-matcher-utils "^28.1.3" - jest-message-util "^28.1.3" - jest-util "^28.1.3" + "@jest/expect-utils" "^29.5.0" + jest-get-type "^29.4.3" + jest-matcher-utils "^29.5.0" + jest-message-util "^29.5.0" + jest-util "^29.5.0" -express@^4.17.3, express@^4.18.1: +express@^4.17.3, express@^4.18.2: version "4.18.2" resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== @@ -6707,11 +6330,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-diff@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + version "1.3.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" + integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== -fast-glob@^3.2.11, fast-glob@^3.2.9: +fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -6738,9 +6361,9 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastest-levenshtein@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" - integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: version "1.15.0" @@ -6757,9 +6380,9 @@ faye-websocket@^0.11.3: websocket-driver ">=0.5.1" fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== dependencies: bser "2.1.1" @@ -6784,9 +6407,9 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4: web-streams-polyfill "^3.0.3" fetch-retry@^5.0.2: - version "5.0.4" - resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.4.tgz#06e8e4533030bf6faa00ffbb9450cb9264c23c12" - integrity sha512-LXcdgpdcVedccGg0AZqg+S8lX/FCdwXD92WNZ5k5qsb0irRhSFsBOpcJt7oevyqT2/C2nEE0zSFNdBEpj3YOSw== + version "5.0.6" + resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.6.tgz#17d0bc90423405b7a88b74355bf364acd2a7fa56" + integrity sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ== file-entry-cache@^6.0.1: version "6.0.1" @@ -6795,22 +6418,22 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -file-stream-rotator@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz#868a2e5966f7640a17dd86eda0e4467c089f6286" - integrity sha512-VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ== +file-stream-rotator@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz#007019e735b262bb6c6f0197e58e5c87cb96cec3" + integrity sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ== dependencies: - moment "^2.11.2" + moment "^2.29.1" -file-system-cache@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-2.1.1.tgz#25bb4019f7d62b458f4bed45452b638e41f6412b" - integrity sha512-vgZ1uDsK29DM4pptUOv47zdJO2tYM5M/ERyAE9Jk0QBN6e64Md+a+xJSOp68dCCDH4niFMVD8nC8n8A5ic0bmg== +file-system-cache@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-2.3.0.tgz#201feaf4c8cd97b9d0d608e96861bb6005f46fe6" + integrity sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ== dependencies: - fs-extra "^11.1.0" - ramda "^0.28.0" + fs-extra "11.1.1" + ramda "0.29.0" -filelist@^1.0.1: +filelist@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== @@ -6860,13 +6483,6 @@ find-root@^1.1.0: resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== -find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ== - dependencies: - locate-path "^2.0.0" - find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -6904,9 +6520,9 @@ flatted@^3.1.0: integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== flow-parser@0.*: - version "0.204.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.204.1.tgz#a894bc5e8ad520134c1d13383b8991d03cbf8b01" - integrity sha512-PoeSF0VhSORn3hYzD/NxsQjXX1iLU0UZXzVwZXnRWjeVsedmvDo4epd7PtCQjxveGajmVlyVW35BOOOkqLqJpw== + version "0.210.1" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.210.1.tgz#6e04775dc2ebd5bde6a37de38532836678a5ac3e" + integrity sha512-M0SdOwD0wZHhk6K/AOaPReBnw2vB7p9KUFUFZHJRsU3ZMl/+WVrMpmb8AfEM6GXZ5mEssCx9vHugxxJg1ieoew== fn.name@1.x.x: version "1.1.0" @@ -6914,9 +6530,9 @@ fn.name@1.x.x: integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== follow-redirects@^1.0.0: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== for-each@^0.3.3: version "0.3.3" @@ -6991,19 +6607,19 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^10.0.0, fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== +fs-extra@11.1.1, fs-extra@^11.1.0: + version "11.1.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" + integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.1.0: - version "11.1.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" - integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -7026,10 +6642,10 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" -fs-monkey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== +fs-monkey@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747" + integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ== fs.realpath@^1.0.0: version "1.0.0" @@ -7056,7 +6672,7 @@ function.prototype.name@^1.1.5: es-abstract "^1.19.0" functions-have-names "^1.2.2" -functions-have-names@^1.2.2: +functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -7086,13 +6702,14 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-npm-tarball-url@^2.0.3: @@ -7110,7 +6727,7 @@ get-port@^5.1.1: resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193" integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ== -get-stream@^6.0.0: +get-stream@^6.0.0, get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -7123,10 +6740,12 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -get-tsconfig@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.4.0.tgz#64eee64596668a81b8fce18403f94f245ee0d4e5" - integrity sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ== +get-tsconfig@^4.5.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.6.2.tgz#831879a5e6c2aa24fe79b60340e2233a1e0f472e" + integrity sha512-E5XrT4CbbXcXWy+1jChlZmrmCwd5KGx502kDCXJJ7y898TtWW9FwoG5HfOLVRKmlmDGkWN2HM9Ho+/Y8F0sJDg== + dependencies: + resolve-pkg-maps "^1.0.0" giget@^1.0.0: version "1.1.2" @@ -7149,10 +6768,10 @@ git-up@^7.0.0: is-ssh "^1.4.0" parse-url "^8.1.0" -git-url-parse@^13.0.0: - version "13.0.0" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.0.0.tgz#9a18d0eaec579fb6379c368aecb09f00b544669c" - integrity sha512-X1kozCqKL82dMrCLi4vie9SHDC+QugKskAMs4VUbIkhURKg5yDwxDmf6Ixg73J+/xVgK5TXKhzn8a94nHJHpnA== +git-url-parse@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.0.tgz#07e136b5baa08d59fabdf0e33170de425adf07b4" + integrity sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA== dependencies: git-up "^7.0.0" @@ -7176,9 +6795,9 @@ glob-parent@^6.0.2: is-glob "^4.0.3" glob-promise@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-6.0.2.tgz#7c7f2a223e3aaa8f7bd7ff5f24d0ab2352724b31" - integrity sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ== + version "6.0.3" + resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-6.0.3.tgz#e6b3ab02d350b3f4b3e15b57e4485986e41ba2fe" + integrity sha512-m+kxywR5j/2Z2V9zvHKfwwL5Gp7gIFEBX+deTB9w2lJB+wSuw9kcS43VfvTAMk8TXL5JCl/cCjsR+tgNVspGyA== dependencies: "@types/glob" "^8.0.0" @@ -7229,11 +6848,6 @@ globalthis@^1.0.3: dependencies: define-properties "^1.1.3" -globalyzer@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" - integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== - globby@^11.0.1, globby@^11.0.2, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -7246,10 +6860,10 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -globby@^13.1.2: - version "13.1.3" - resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff" - integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw== +globby@^13.1.3: + version "13.2.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.0.tgz#7dd5678d765c4680c2e6d106230d86cb727cb1af" + integrity sha512-jWsQfayf13NvqKUIL3Ta+CIqMnvlaIDFveWE/dpOZ9+3AMEJozsxDvKA02zync9UuvOM8rOXzsD5GqKP4OnWPQ== dependencies: dir-glob "^3.0.1" fast-glob "^3.2.11" @@ -7257,11 +6871,6 @@ globby@^13.1.2: merge2 "^1.4.1" slash "^4.0.0" -globrex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" - integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== - gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -7270,15 +6879,20 @@ gopd@^1.0.1: get-intrinsic "^1.1.3" graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== grapheme-splitter@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + gunzip-maybe@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac" @@ -7366,7 +6980,7 @@ he@^1.2.0: hoist-non-react-statics@^3.3.1: version "3.3.2" - resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== dependencies: react-is "^16.7.0" @@ -7386,13 +7000,6 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== - dependencies: - whatwg-encoding "^1.0.5" - html-encoding-sniffer@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" @@ -7401,9 +7008,9 @@ html-encoding-sniffer@^3.0.0: whatwg-encoding "^2.0.0" html-entities@^2.1.0, html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== + version "2.4.0" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061" + integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ== html-escaper@^2.0.0: version "2.0.2" @@ -7424,13 +7031,13 @@ html-minifier-terser@^6.0.2: terser "^5.10.0" html-tags@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" - integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce" + integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ== html-tokenize@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/html-tokenize/-/html-tokenize-2.0.1.tgz#c3b2ea6e2837d4f8c06693393e9d2a12c960be5f" + resolved "https://registry.yarnpkg.com/html-tokenize/-/html-tokenize-2.0.1.tgz#c3b2ea6e2837d4f8c06693393e9d2a12c960be5f" integrity sha512-QY6S+hZ0f5m1WT8WffYN+Hg+xm/w5I8XeUcAq/ZYP5wVC8xbKi4Whhru3FtrAebD5EhBW8rmFzkDI6eCAuFe2w== dependencies: buffer-from "~0.1.1" @@ -7439,10 +7046,10 @@ html-tokenize@^2.0.0: readable-stream "~1.0.27-1" through2 "~0.4.1" -html-webpack-plugin@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== +html-webpack-plugin@^5.5.0, html-webpack-plugin@^5.5.3: + version "5.5.3" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz#72270f4a78e222b5825b296e5e3e1328ad525a3e" + integrity sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg== dependencies: "@types/html-minifier-terser" "^6.0.0" html-minifier-terser "^6.0.2" @@ -7491,15 +7098,6 @@ http-parser-js@>=0.5.1: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -7537,14 +7135,6 @@ https-proxy-agent@^4.0.0: agent-base "5" debug "4" -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - https-proxy-agent@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -7558,6 +7148,11 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +human-signals@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" + integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== + hyperlinker@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" @@ -7597,15 +7192,7 @@ ignore@^5.0.5, ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -import-fresh@^3.0.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" - integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-fresh@^3.2.1: +import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -7614,9 +7201,9 @@ import-fresh@^3.2.1: resolve-from "^4.0.0" import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -7649,12 +7236,12 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== -internal-slot@^1.0.3, internal-slot@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" - integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== +internal-slot@^1.0.3, internal-slot@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" + integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== dependencies: - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.0" has "^1.0.3" side-channel "^1.0.4" @@ -7679,16 +7266,16 @@ ipaddr.js@1.9.1: integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== + version "2.1.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f" + integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ== is-absolute-url@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== -is-arguments@^1.0.4, is-arguments@^1.1.1: +is-arguments@^1.0.4: version "1.1.1" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== @@ -7696,13 +7283,13 @@ is-arguments@^1.0.4, is-arguments@^1.1.1: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-array-buffer@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a" - integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ== +is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" + integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== dependencies: call-bind "^1.0.2" - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.0" is-typed-array "^1.1.10" is-arrayish@^0.2.1: @@ -7737,38 +7324,19 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-callable@^1.1.3: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" - integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== - -is-callable@^1.1.4, is-callable@^1.2.4, is-callable@^1.2.7: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.10.0, is-core-module@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== - dependencies: - has "^1.0.3" - -is-core-module@^2.11.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== - dependencies: - has "^1.0.3" - -is-core-module@^2.8.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== +is-core-module@^2.11.0, is-core-module@^2.9.0: + version "2.12.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" + integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== dependencies: has "^1.0.3" -is-date-object@^1.0.1, is-date-object@^1.0.5: +is-date-object@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== @@ -7785,6 +7353,11 @@ is-docker@^2.0.0, is-docker@^2.1.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -7819,16 +7392,18 @@ is-gzip@^1.0.0: resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83" integrity sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ== +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-interactive@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-map@^2.0.1, is-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== - is-nan@^1.2.1: version "1.3.2" resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" @@ -7894,11 +7469,6 @@ is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-set@^2.0.1, is-set@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== - is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -7918,6 +7488,11 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== +is-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" + integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== + is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" @@ -7932,7 +7507,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10: +is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9: version "1.1.10" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== @@ -7943,21 +7518,10 @@ is-typed-array@^1.1.10: gopd "^1.0.1" has-tostringtag "^1.0.0" -is-typed-array@^1.1.3, is-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67" - integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== is-weakref@^1.0.2: version "1.0.2" @@ -7966,14 +7530,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -7983,7 +7539,7 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: isarray@0.0.1: version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isarray@^1.0.0, isarray@~1.0.0: @@ -7991,11 +7547,6 @@ isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -8025,9 +7576,9 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f" - integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A== + version "5.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" + integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -8062,171 +7613,153 @@ istanbul-reports@^3.1.3, istanbul-reports@^3.1.4: istanbul-lib-report "^3.0.0" jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + version "10.8.7" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" + integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== dependencies: async "^3.2.3" chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" + filelist "^1.0.4" + minimatch "^3.1.2" -jest-changed-files@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831" - integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA== +jest-changed-files@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e" + integrity sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag== dependencies: execa "^5.0.0" p-limit "^3.1.0" -jest-circus@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4" - integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow== +jest-circus@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317" + integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA== dependencies: - "@jest/environment" "^28.1.3" - "@jest/expect" "^28.1.3" - "@jest/test-result" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/environment" "^29.5.0" + "@jest/expect" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" is-generator-fn "^2.0.0" - jest-each "^28.1.3" - jest-matcher-utils "^28.1.3" - jest-message-util "^28.1.3" - jest-runtime "^28.1.3" - jest-snapshot "^28.1.3" - jest-util "^28.1.3" + jest-each "^29.5.0" + jest-matcher-utils "^29.5.0" + jest-message-util "^29.5.0" + jest-runtime "^29.5.0" + jest-snapshot "^29.5.0" + jest-util "^29.5.0" p-limit "^3.1.0" - pretty-format "^28.1.3" + pretty-format "^29.5.0" + pure-rand "^6.0.0" slash "^3.0.0" stack-utils "^2.0.3" -jest-cli@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2" - integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ== +jest-cli@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67" + integrity sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw== dependencies: - "@jest/core" "^28.1.3" - "@jest/test-result" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/core" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/types" "^29.5.0" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^28.1.3" - jest-util "^28.1.3" - jest-validate "^28.1.3" + jest-config "^29.5.0" + jest-util "^29.5.0" + jest-validate "^29.5.0" prompts "^2.0.1" yargs "^17.3.1" -jest-config@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60" - integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ== +jest-config@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.5.0.tgz#3cc972faec8c8aaea9ae158c694541b79f3748da" + integrity sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA== dependencies: "@babel/core" "^7.11.6" - "@jest/test-sequencer" "^28.1.3" - "@jest/types" "^28.1.3" - babel-jest "^28.1.3" + "@jest/test-sequencer" "^29.5.0" + "@jest/types" "^29.5.0" + babel-jest "^29.5.0" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.3" graceful-fs "^4.2.9" - jest-circus "^28.1.3" - jest-environment-node "^28.1.3" - jest-get-type "^28.0.2" - jest-regex-util "^28.0.2" - jest-resolve "^28.1.3" - jest-runner "^28.1.3" - jest-util "^28.1.3" - jest-validate "^28.1.3" + jest-circus "^29.5.0" + jest-environment-node "^29.5.0" + jest-get-type "^29.4.3" + jest-regex-util "^29.4.3" + jest-resolve "^29.5.0" + jest-runner "^29.5.0" + jest-util "^29.5.0" + jest-validate "^29.5.0" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^28.1.3" + pretty-format "^29.5.0" slash "^3.0.0" strip-json-comments "^3.1.1" -jest-diff@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f" - integrity sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw== +jest-diff@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" + integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw== dependencies: chalk "^4.0.0" - diff-sequences "^28.1.1" - jest-get-type "^28.0.2" - pretty-format "^28.1.3" + diff-sequences "^29.4.3" + jest-get-type "^29.4.3" + pretty-format "^29.5.0" -jest-docblock@^28.1.1: - version "28.1.1" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8" - integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA== +jest-docblock@^29.4.3: + version "29.4.3" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.3.tgz#90505aa89514a1c7dceeac1123df79e414636ea8" + integrity sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg== dependencies: detect-newline "^3.0.0" -jest-each@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81" - integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g== +jest-each@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06" + integrity sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA== dependencies: - "@jest/types" "^28.1.3" + "@jest/types" "^29.5.0" chalk "^4.0.0" - jest-get-type "^28.0.2" - jest-util "^28.1.3" - pretty-format "^28.1.3" + jest-get-type "^29.4.3" + jest-util "^29.5.0" + pretty-format "^29.5.0" -jest-environment-jsdom@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-28.1.3.tgz#2d4e5d61b7f1d94c3bddfbb21f0308ee506c09fb" - integrity sha512-HnlGUmZRdxfCByd3GM2F100DgQOajUBzEitjGqIREcb45kGjZvRrKUdlaF6escXBdcXNl0OBh+1ZrfeZT3GnAg== +jest-environment-jsdom@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.5.0.tgz#cfe86ebaf1453f3297b5ff3470fbe94739c960cb" + integrity sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw== dependencies: - "@jest/environment" "^28.1.3" - "@jest/fake-timers" "^28.1.3" - "@jest/types" "^28.1.3" - "@types/jsdom" "^16.2.4" + "@jest/environment" "^29.5.0" + "@jest/fake-timers" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/jsdom" "^20.0.0" "@types/node" "*" - jest-mock "^28.1.3" - jest-util "^28.1.3" - jsdom "^19.0.0" + jest-mock "^29.5.0" + jest-util "^29.5.0" + jsdom "^20.0.0" -jest-environment-node@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5" - integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A== +jest-environment-node@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.5.0.tgz#f17219d0f0cc0e68e0727c58b792c040e332c967" + integrity sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw== dependencies: - "@jest/environment" "^28.1.3" - "@jest/fake-timers" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/environment" "^29.5.0" + "@jest/fake-timers" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" - jest-mock "^28.1.3" - jest-util "^28.1.3" - -jest-get-type@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203" - integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA== + jest-mock "^29.5.0" + jest-util "^29.5.0" -jest-haste-map@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b" - integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA== - dependencies: - "@jest/types" "^28.1.3" - "@types/graceful-fs" "^4.1.3" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^28.0.2" - jest-util "^28.1.3" - jest-worker "^28.1.3" - micromatch "^4.0.4" - walker "^1.0.8" - optionalDependencies: - fsevents "^2.3.2" +jest-get-type@^29.4.3: + version "29.4.3" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" + integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg== jest-haste-map@^29.5.0: version "29.5.0" @@ -8247,170 +7780,166 @@ jest-haste-map@^29.5.0: optionalDependencies: fsevents "^2.3.2" -jest-leak-detector@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d" - integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA== +jest-leak-detector@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz#cf4bdea9615c72bac4a3a7ba7e7930f9c0610c8c" + integrity sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow== dependencies: - jest-get-type "^28.0.2" - pretty-format "^28.1.3" + jest-get-type "^29.4.3" + pretty-format "^29.5.0" -jest-matcher-utils@^28.0.0, jest-matcher-utils@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e" - integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw== +jest-matcher-utils@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5" + integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw== dependencies: chalk "^4.0.0" - jest-diff "^28.1.3" - jest-get-type "^28.0.2" - pretty-format "^28.1.3" + jest-diff "^29.5.0" + jest-get-type "^29.4.3" + pretty-format "^29.5.0" -jest-message-util@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d" - integrity sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g== +jest-message-util@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e" + integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^28.1.3" + "@jest/types" "^29.5.0" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^28.1.3" + pretty-format "^29.5.0" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da" - integrity sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA== +jest-mock@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.5.0.tgz#26e2172bcc71d8b0195081ff1f146ac7e1518aed" + integrity sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw== dependencies: - "@jest/types" "^28.1.3" + "@jest/types" "^29.5.0" "@types/node" "*" + jest-util "^29.5.0" jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== - -jest-regex-util@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead" - integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw== + version "1.2.3" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" + integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== jest-regex-util@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8" integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg== -jest-resolve-dependencies@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66" - integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA== +jest-resolve-dependencies@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz#f0ea29955996f49788bf70996052aa98e7befee4" + integrity sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg== dependencies: - jest-regex-util "^28.0.2" - jest-snapshot "^28.1.3" + jest-regex-util "^29.4.3" + jest-snapshot "^29.5.0" -jest-resolve@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8" - integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ== +jest-resolve@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.5.0.tgz#b053cc95ad1d5f6327f0ac8aae9f98795475ecdc" + integrity sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w== dependencies: chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^28.1.3" + jest-haste-map "^29.5.0" jest-pnp-resolver "^1.2.2" - jest-util "^28.1.3" - jest-validate "^28.1.3" + jest-util "^29.5.0" + jest-validate "^29.5.0" resolve "^1.20.0" - resolve.exports "^1.1.0" + resolve.exports "^2.0.0" slash "^3.0.0" -jest-runner@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1" - integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA== +jest-runner@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.5.0.tgz#6a57c282eb0ef749778d444c1d758c6a7693b6f8" + integrity sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ== dependencies: - "@jest/console" "^28.1.3" - "@jest/environment" "^28.1.3" - "@jest/test-result" "^28.1.3" - "@jest/transform" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/console" "^29.5.0" + "@jest/environment" "^29.5.0" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" chalk "^4.0.0" - emittery "^0.10.2" + emittery "^0.13.1" graceful-fs "^4.2.9" - jest-docblock "^28.1.1" - jest-environment-node "^28.1.3" - jest-haste-map "^28.1.3" - jest-leak-detector "^28.1.3" - jest-message-util "^28.1.3" - jest-resolve "^28.1.3" - jest-runtime "^28.1.3" - jest-util "^28.1.3" - jest-watcher "^28.1.3" - jest-worker "^28.1.3" + jest-docblock "^29.4.3" + jest-environment-node "^29.5.0" + jest-haste-map "^29.5.0" + jest-leak-detector "^29.5.0" + jest-message-util "^29.5.0" + jest-resolve "^29.5.0" + jest-runtime "^29.5.0" + jest-util "^29.5.0" + jest-watcher "^29.5.0" + jest-worker "^29.5.0" p-limit "^3.1.0" source-map-support "0.5.13" -jest-runtime@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f" - integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw== - dependencies: - "@jest/environment" "^28.1.3" - "@jest/fake-timers" "^28.1.3" - "@jest/globals" "^28.1.3" - "@jest/source-map" "^28.1.2" - "@jest/test-result" "^28.1.3" - "@jest/transform" "^28.1.3" - "@jest/types" "^28.1.3" +jest-runtime@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420" + integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw== + dependencies: + "@jest/environment" "^29.5.0" + "@jest/fake-timers" "^29.5.0" + "@jest/globals" "^29.5.0" + "@jest/source-map" "^29.4.3" + "@jest/test-result" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" + "@types/node" "*" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" - execa "^5.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^28.1.3" - jest-message-util "^28.1.3" - jest-mock "^28.1.3" - jest-regex-util "^28.0.2" - jest-resolve "^28.1.3" - jest-snapshot "^28.1.3" - jest-util "^28.1.3" + jest-haste-map "^29.5.0" + jest-message-util "^29.5.0" + jest-mock "^29.5.0" + jest-regex-util "^29.4.3" + jest-resolve "^29.5.0" + jest-snapshot "^29.5.0" + jest-util "^29.5.0" slash "^3.0.0" strip-bom "^4.0.0" -jest-snapshot@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668" - integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg== +jest-snapshot@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce" + integrity sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g== dependencies: "@babel/core" "^7.11.6" "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-jsx" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.3.3" - "@jest/expect-utils" "^28.1.3" - "@jest/transform" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/expect-utils" "^29.5.0" + "@jest/transform" "^29.5.0" + "@jest/types" "^29.5.0" "@types/babel__traverse" "^7.0.6" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^28.1.3" + expect "^29.5.0" graceful-fs "^4.2.9" - jest-diff "^28.1.3" - jest-get-type "^28.0.2" - jest-haste-map "^28.1.3" - jest-matcher-utils "^28.1.3" - jest-message-util "^28.1.3" - jest-util "^28.1.3" + jest-diff "^29.5.0" + jest-get-type "^29.4.3" + jest-matcher-utils "^29.5.0" + jest-message-util "^29.5.0" + jest-util "^29.5.0" natural-compare "^1.4.0" - pretty-format "^28.1.3" + pretty-format "^29.5.0" semver "^7.3.5" -jest-util@^28.0.0, jest-util@^28.1.3: +jest-util@^28.0.0: version "28.1.3" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0" integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ== @@ -8434,30 +7963,30 @@ jest-util@^29.5.0: graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df" - integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA== +jest-validate@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.5.0.tgz#8e5a8f36178d40e47138dc00866a5f3bd9916ffc" + integrity sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ== dependencies: - "@jest/types" "^28.1.3" + "@jest/types" "^29.5.0" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^28.0.2" + jest-get-type "^29.4.3" leven "^3.1.0" - pretty-format "^28.1.3" + pretty-format "^29.5.0" -jest-watcher@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4" - integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g== +jest-watcher@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.5.0.tgz#cf7f0f949828ba65ddbbb45c743a382a4d911363" + integrity sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA== dependencies: - "@jest/test-result" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/test-result" "^29.5.0" + "@jest/types" "^29.5.0" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - emittery "^0.10.2" - jest-util "^28.1.3" + emittery "^0.13.1" + jest-util "^29.5.0" string-length "^4.0.1" jest-worker@^27.4.5: @@ -8469,15 +7998,6 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -jest-worker@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98" - integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - jest-worker@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" @@ -8488,40 +8008,27 @@ jest-worker@^29.5.0: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.3.tgz#e9c6a7eecdebe3548ca2b18894a50f45b36dfc6b" - integrity sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA== +jest@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e" + integrity sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ== dependencies: - "@jest/core" "^28.1.3" - "@jest/types" "^28.1.3" + "@jest/core" "^29.5.0" + "@jest/types" "^29.5.0" import-local "^3.0.2" - jest-cli "^28.1.3" + jest-cli "^29.5.0" jmespath@0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== -js-sdsl@^4.1.4: - version "4.3.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" - integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== - "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1: - version "3.14.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" - integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^3.14.1: +js-yaml@^3.13.1, js-yaml@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -8561,70 +8068,65 @@ jscodeshift@^0.14.0: temp "^0.8.4" write-file-atomic "^2.3.0" -jsdom@^16.7.0: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== +jsdom@^20.0.0: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" + integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== dependencies: - abab "^2.0.5" - acorn "^8.2.4" - acorn-globals "^6.0.0" - cssom "^0.4.4" + abab "^2.0.6" + acorn "^8.8.1" + acorn-globals "^7.0.0" + cssom "^0.5.0" cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" + data-urls "^3.0.2" + decimal.js "^10.4.2" + domexception "^4.0.0" escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" + nwsapi "^2.2.2" + parse5 "^7.1.1" + saxes "^6.0.0" symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" - -jsdom@^19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a" - integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A== - dependencies: - abab "^2.0.5" - acorn "^8.5.0" - acorn-globals "^6.0.0" - cssom "^0.5.0" - cssstyle "^2.3.0" - data-urls "^3.0.1" - decimal.js "^10.3.1" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + ws "^8.11.0" + xml-name-validator "^4.0.0" + +jsdom@^22.1.0: + version "22.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8" + integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw== + dependencies: + abab "^2.0.6" + cssstyle "^3.0.0" + data-urls "^4.0.0" + decimal.js "^10.4.3" domexception "^4.0.0" - escodegen "^2.0.0" form-data "^4.0.0" html-encoding-sniffer "^3.0.0" http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" + nwsapi "^2.2.4" + parse5 "^7.1.2" + rrweb-cssom "^0.6.0" + saxes "^6.0.0" symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^3.0.0" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" webidl-conversions "^7.0.0" whatwg-encoding "^2.0.0" whatwg-mimetype "^3.0.0" - whatwg-url "^10.0.0" - ws "^8.2.3" + whatwg-url "^12.0.1" + ws "^8.13.0" xml-name-validator "^4.0.0" jsesc@^2.5.1: @@ -8657,7 +8159,7 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== -json5@^1.0.1: +json5@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== @@ -8684,12 +8186,14 @@ jsonschema@^1.4.1: integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea" - integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw== + version "3.3.4" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz#b896535fed5b867650acce5a9bd4135ffc7b3bf9" + integrity sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw== dependencies: - array-includes "^3.1.5" - object.assign "^4.1.3" + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + object.assign "^4.1.4" + object.values "^1.1.6" kind-of@^6.0.2: version "6.0.3" @@ -8718,6 +8222,14 @@ language-tags@=1.0.5: dependencies: language-subtag-registry "~0.3.2" +launch-editor@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" + integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== + dependencies: + picocolors "^1.0.0" + shell-quote "^1.7.3" + lazy-universal-dotenv@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-4.0.0.tgz#0b220c264e89a042a37181a4928cdd298af73422" @@ -8774,14 +8286,6 @@ loader-utils@^2.0.4: emojis-list "^3.0.0" json5 "^2.1.2" -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA== - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -8809,12 +8313,7 @@ lodash.camelcase@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== -lodash.debounce@4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.6.tgz#3d9e81bb65cc7ce55f8c06d0c7b81d3db705a591" - integrity sha512-bvQ3Dur2OS7mlFg4XYHH8aoKEOyOubvORNQcIaYD999s/bB8b8WK03y/mFOKpkyT8K5E4EdREVxSucgREyVHQQ== - -lodash.debounce@^4.0.8: +lodash.debounce@4.0.8, lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== @@ -8869,7 +8368,7 @@ lodash.upperfirst@^4.3.1: resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -8881,12 +8380,21 @@ log-symbols@^3.0.0: dependencies: chalk "^2.4.2" +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + logform@^2.3.2, logform@^2.4.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.2.tgz#a617983ac0334d0c3b942c34945380062795b47c" - integrity sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw== + version "2.5.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.5.1.tgz#44c77c34becd71b3a42a3970c77929e52c6ed48b" + integrity sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg== dependencies: "@colors/colors" "1.5.0" + "@types/triple-beam" "^1.3.2" fecha "^4.2.0" ms "^2.1.1" safe-stable-stringify "^2.3.1" @@ -8953,9 +8461,9 @@ map-or-similar@^1.5.0: integrity sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg== markdown-to-jsx@^7.1.8: - version "7.2.0" - resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.2.0.tgz#e7b46b65955f6a04d48a753acd55874a14bdda4b" - integrity sha512-3l4/Bigjm4bEqjCR6Xr+d4DtM1X6vvtGsMGSjJYyep8RjjIvcWtrXBS8Wbfe1/P+atKNMccpsraESIaWVplzVg== + version "7.2.1" + resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.2.1.tgz#87061fd3176ad926ef3d99493e5c57f6335e0c51" + integrity sha512-9HrdzBAo0+sFz9ZYAGT5fB8ilzTW+q6lPocRxrIesMO+aB40V9MgFfbfMXxlGjf22OpRy+IXlvVaQenicdpgbg== mdast-util-definitions@^4.0.0: version "4.0.0" @@ -8974,19 +8482,12 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== -memfs@^3.4.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.5.1.tgz#f0cd1e2bfaef58f6fe09bfb9c2288f07fea099ec" - integrity sha512-UWbFJKvj5k+nETdteFndTpYxdeTMox/ULeqX5k/dpaQJCCFmj5EeKv3dBcyO2xmkRAx2vppRu5dVG7SOtsGOzA== - dependencies: - fs-monkey "^1.0.3" - -memfs@^3.4.3: - version "3.4.7" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a" - integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw== +memfs@^3.4.1, memfs@^3.4.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" + integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== dependencies: - fs-monkey "^1.0.3" + fs-monkey "^1.0.4" memoizerific@^1.11.3: version "1.11.3" @@ -9023,16 +8524,11 @@ micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: braces "^3.0.2" picomatch "^2.3.1" -mime-db@1.52.0: +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -"mime-db@>= 1.43.0 < 2": - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" @@ -9055,6 +8551,11 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" + integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== + min-indent@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" @@ -9078,16 +8579,16 @@ minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatc brace-expansion "^1.1.7" minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.5: - version "1.2.7" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== minipass@^3.0.0: version "3.3.6" @@ -9096,10 +8597,10 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minipass@^4.0.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" - integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== minizlib@^2.1.1: version "2.1.2" @@ -9126,7 +8627,7 @@ mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment@^2.11.2: +moment@^2.29.1: version "2.29.4" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -9166,7 +8667,7 @@ multicast-dns@^7.2.5: multipipe@^1.0.2: version "1.0.2" - resolved "https://registry.npmjs.org/multipipe/-/multipipe-1.0.2.tgz#cc13efd833c9cda99f224f868461b8e1a3fd939d" + resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-1.0.2.tgz#cc13efd833c9cda99f224f868461b8e1a3fd939d" integrity sha512-6uiC9OvY71vzSGX8lZvSqscE7ft9nPupJ8fMjrCNRAUy2LREUW42UL+V/NTrogr6rFgRydUrCX4ZitfpSNkSCQ== dependencies: duplexer2 "^0.1.2" @@ -9197,11 +8698,6 @@ natural-orderby@^2.0.3: resolved "https://registry.yarnpkg.com/natural-orderby/-/natural-orderby-2.0.3.tgz#8623bc518ba162f8ff1cdb8941d74deb0fdcc016" integrity sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q== -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -9243,28 +8739,21 @@ node-domexception@^1.0.0: integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== node-fetch-native@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.1.0.tgz#a530f5c4cadb49b382dcf81d8f5f19ed0f457fbe" - integrity sha512-nl5goFCig93JZ9FIV8GHT9xpNqXbxQUzkOmKIMKmncsBH9jhg7qKex8hirpymkBFmNQ114chEEG5lS4wgK2I+Q== - -node-fetch@^2.6.1: - version "2.6.9" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== - dependencies: - whatwg-url "^5.0.0" + version "1.2.0" + resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.2.0.tgz#13ec6df98f33168958dbfb6945f10aedf42e7ea8" + integrity sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ== -node-fetch@^2.6.7: - version "2.6.8" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.8.tgz#a68d30b162bc1d8fd71a367e81b997e1f4d4937e" - integrity sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg== +node-fetch@^2.0.0, node-fetch@^2.6.1, node-fetch@^2.6.7: + version "2.6.11" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" + integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== dependencies: whatwg-url "^5.0.0" -node-fetch@^3.2.10: - version "3.2.10" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.10.tgz#e8347f94b54ae18b57c9c049ef641cef398a85c8" - integrity sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA== +node-fetch@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.1.tgz#b3eea7b54b3a48020e46f4f88b9c5a7430d20b2e" + integrity sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow== dependencies: data-uri-to-buffer "^4.0.0" fetch-blob "^3.1.4" @@ -9275,15 +8764,20 @@ node-forge@^1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== +node-gyp-build@^4.3.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" + integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-releases@^2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" - integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== +node-releases@^2.0.12: + version "2.0.12" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" + integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== normalize-package-data@^2.5.0: version "2.5.0" @@ -9305,7 +8799,14 @@ npm-run-path@^4.0.1: resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== dependencies: - path-key "^3.0.0" + path-key "^3.0.0" + +npm-run-path@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" + integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q== + dependencies: + path-key "^4.0.0" npmlog@^5.0.1: version "5.0.1" @@ -9324,14 +8825,14 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -nwsapi@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c" - integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg== +nwsapi@^2.2.2, nwsapi@^2.2.4: + version "2.2.5" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2" + integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ== object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-hash@^2.0.1: @@ -9339,12 +8840,12 @@ object-hash@^2.0.1: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.12.0, object-inspect@^1.12.2, object-inspect@^1.9.0: +object-inspect@^1.12.3, object-inspect@^1.9.0: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== -object-is@^1.0.1, object-is@^1.1.5: +object-is@^1.0.1: version "1.1.5" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== @@ -9359,7 +8860,7 @@ object-keys@^1.1.1: object-keys@~0.4.0: version "0.4.0" - resolved "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw== object-treeify@^1.1.33: @@ -9367,7 +8868,7 @@ object-treeify@^1.1.33: resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.33.tgz#f06fece986830a3cba78ddd32d4c11d1f76cdf40" integrity sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A== -object.assign@^4.1.2, object.assign@^4.1.3, object.assign@^4.1.4: +object.assign@^4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -9403,7 +8904,7 @@ object.hasown@^1.1.2: define-properties "^1.1.4" es-abstract "^1.20.4" -object.values@^1.1.5, object.values@^1.1.6: +object.values@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== @@ -9455,6 +8956,13 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" +onetime@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" + integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== + dependencies: + mimic-fn "^4.0.0" + open@^7.0.3: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" @@ -9464,14 +8972,24 @@ open@^7.0.3: is-wsl "^2.1.1" open@^8.0.9, open@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== dependencies: define-lazy-prop "^2.0.0" is-docker "^2.1.1" is-wsl "^2.2.0" +open@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6" + integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg== + dependencies: + default-browser "^4.0.0" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^2.2.0" + optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -9485,16 +9003,16 @@ optionator@^0.8.1: word-wrap "~1.2.3" optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" - word-wrap "^1.2.3" ora@^4.0.3: version "4.1.1" @@ -9510,12 +9028,20 @@ ora@^4.0.3: strip-ansi "^6.0.0" wcwidth "^1.0.1" -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== +ora@^5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== dependencies: - p-try "^1.0.0" + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" @@ -9531,13 +9057,6 @@ p-limit@^3.0.2, p-limit@^3.1.0: dependencies: yocto-queue "^0.1.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg== - dependencies: - p-limit "^1.1.0" - p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -9574,11 +9093,6 @@ p-retry@^4.5.0: "@types/retry" "0.12.0" retry "^0.13.1" -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww== - p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -9628,10 +9142,12 @@ parse-url@^8.1.0: dependencies: parse-path "^7.0.0" -parse5@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parse5@^7.0.0, parse5@^7.1.1, parse5@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" @@ -9684,6 +9200,11 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-key@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" + integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== + path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" @@ -9700,9 +9221,9 @@ path-type@^4.0.0: integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pathe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.0.tgz#e2e13f6c62b31a3289af4ba19886c230f295ec03" - integrity sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w== + version "1.1.1" + resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a" + integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q== peek-stream@^1.1.0: version "1.1.3" @@ -9723,25 +9244,20 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.0, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - pify@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pirates@^4.0.4, pirates@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== pkg-dir@^3.0.0: version "3.0.0" @@ -9776,10 +9292,10 @@ postcss-modules-extract-imports@^3.0.0: resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== +postcss-modules-local-by-default@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524" + integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA== dependencies: icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" @@ -9800,9 +9316,9 @@ postcss-modules-values@^4.0.0: icss-utils "^5.0.0" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.11" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== + version "6.0.13" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" + integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -9812,10 +9328,10 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.19: - version "8.4.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab" - integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA== +postcss@^8.4.21: + version "8.4.24" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df" + integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" @@ -9838,16 +9354,11 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.8.0: +prettier@^2.8.0, prettier@^2.8.8: version "2.8.8" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== -prettier@^2.8.4: - version "2.8.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3" - integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw== - pretty-error@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" @@ -9856,13 +9367,12 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -pretty-format@^28.0.0, pretty-format@^28.1.3: - version "28.1.3" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5" - integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q== +pretty-format@^29.0.0, pretty-format@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a" + integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw== dependencies: - "@jest/schemas" "^28.1.3" - ansi-regex "^5.0.1" + "@jest/schemas" "^29.4.3" ansi-styles "^5.0.0" react-is "^18.0.0" @@ -9922,9 +9432,9 @@ proxy-from-env@^1.0.0: integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== psl@^1.1.33: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pump@^2.0.0: version "2.0.1" @@ -9956,16 +9466,11 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw== -punycode@^2.1.0: +punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - puppeteer-core@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-2.1.1.tgz#e9b3fbc1237b4f66e25999832229e9db3e0b90ed" @@ -9982,32 +9487,49 @@ puppeteer-core@^2.1.1: rimraf "^2.6.1" ws "^6.1.0" +pure-rand@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306" + integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ== + q@^1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== -qs@6.11.0, qs@^6.10.0: +qs@6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" +qs@^6.10.0: + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + dependencies: + side-channel "^1.0.4" + querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -ramda@^0.28.0: - version "0.28.0" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97" - integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA== +ramda@0.29.0: + version "0.29.0" + resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.29.0.tgz#fbbb67a740a754c8a4cbb41e2a6e0eb8507f55fb" + integrity sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA== randombytes@^2.1.0: version "2.1.0" @@ -10075,9 +9597,9 @@ react-element-to-jsx-string@^15.0.0: react-is "18.1.0" react-inspector@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.1.tgz#1a37f0165d9df81ee804d63259eaaeabe841287d" - integrity sha512-cxKSeFTf7jpSSVddm66sKdolG90qURAX3g1roTeaN6x0YEbtWc8JpmFN9+yIqLNH2uEkYerWLtJZIXRIFuBKrg== + version "6.0.2" + resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.2.tgz#aa3028803550cb6dbd7344816d5c80bf39d07e9d" + integrity sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ== react-is@18.1.0: version "18.1.0" @@ -10091,7 +9613,7 @@ react-is@18.1.0: react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" - resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== react-refresh@^0.11.0: @@ -10142,10 +9664,10 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@^2.3.7, readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -10156,9 +9678,9 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable util-deprecate "~1.0.1" readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -10166,7 +9688,7 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable readable-stream@~1.0.17, readable-stream@~1.0.27-1: version "1.0.34" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== dependencies: core-util-is "~1.0.0" @@ -10192,9 +9714,9 @@ recast@^0.21.0: tslib "^2.0.1" recast@^0.23.1: - version "0.23.1" - resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.1.tgz#ee415a5561d2f99f02318ea8db81ad3a2267a6ff" - integrity sha512-RokaBcoxSjXUDzz1TXSZmZsSW6ZpLmlA3GGqJ8uuTrQ9hZhEz+4Tpsc+gRvYRJ2BU4H+ZyUlg91eSGDw7bwy7g== + version "0.23.2" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.2.tgz#d3dda3e8f0a3366860d7508c00e34a338ac52b41" + integrity sha512-Qv6cPfVZyMOtPszK6PgW70pUgm7gPlFitAPf0Q69rlOA0zLw2XdDcNmPbVGYicFGT9O8I7TZ/0ryJD+6COvIPw== dependencies: assert "^2.0.0" ast-types "^0.16.1" @@ -10248,36 +9770,31 @@ regenerator-transform@^0.15.1: "@babel/runtime" "^7.8.4" regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== + version "1.5.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + functions-have-names "^1.2.3" regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== -regexpu-core@^5.2.1: - version "5.2.2" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc" - integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw== +regexpu-core@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" + integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== dependencies: + "@babel/regjsgen" "^0.8.0" regenerate "^1.4.2" regenerate-unicode-properties "^10.1.0" - regjsgen "^0.7.1" regjsparser "^0.9.1" unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.1.0" -regjsgen@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6" - integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA== - regjsparser@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" @@ -10358,12 +9875,17 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve.exports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" - integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== -resolve@^1.1.6: +resolve.exports@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" + integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== + +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1: version "1.22.2" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== @@ -10372,16 +9894,7 @@ resolve@^1.1.6: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^2.0.0-next.3: +resolve@^2.0.0-next.4: version "2.0.0-next.4" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ== @@ -10415,7 +9928,7 @@ rimraf@^2.6.1: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -10429,6 +9942,18 @@ rimraf@~2.6.2: dependencies: glob "^7.1.3" +rrweb-cssom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" + integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== + +run-applescript@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c" + integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg== + dependencies: + execa "^5.0.0" + run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -10441,12 +9966,12 @@ safe-buffer@5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== -safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -10461,24 +9986,29 @@ safe-regex-test@^1.0.0: is-regex "^1.1.4" safe-stable-stringify@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73" - integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== + version "2.4.3" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" + integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@1.2.1, sax@>=0.6.0: +sax@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA== -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== +sax@>=0.6.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== dependencies: xmlchars "^2.2.0" @@ -10489,33 +10019,24 @@ scheduler@^0.23.0: dependencies: loose-envify "^1.1.0" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99" - integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg== +schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== dependencies: "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== + version "4.2.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" + integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== dependencies: "@types/json-schema" "^7.0.9" - ajv "^8.8.0" + ajv "^8.9.0" ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" + ajv-keywords "^5.1.0" select-hose@^2.0.0: version "2.0.0" @@ -10534,10 +10055,10 @@ selfsigned@^2.1.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.x, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== +semver@7.x, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: + version "7.5.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" + integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== dependencies: lru-cache "^6.0.0" @@ -10546,13 +10067,6 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.8: - version "7.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" - integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== - dependencies: - lru-cache "^6.0.0" - semver@~7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" @@ -10577,7 +10091,7 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" -serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: +serialize-javascript@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== @@ -10664,6 +10178,11 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== +shell-quote@^1.7.3: + version "1.8.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== + shelljs@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" @@ -10772,9 +10291,9 @@ space-separated-tokens@^1.0.0: integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA== spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" @@ -10793,9 +10312,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" - integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== + version "3.0.13" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" + integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== spdy-transport@^3.0.0: version "3.0.0" @@ -10836,9 +10355,9 @@ stack-trace@0.0.x: integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== stack-utils@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" - integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== dependencies: escape-string-regexp "^2.0.0" @@ -10857,24 +10376,17 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== -stop-iteration-iterator@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" - integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ== - dependencies: - internal-slot "^1.0.4" - store2@^2.14.2: version "2.14.2" resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068" integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w== -storybook@^7.0.7: - version "7.0.7" - resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.0.7.tgz#f489c241aee6a5e2b2bfb5cef46ddbda45aa6138" - integrity sha512-MaFAhpPm/KsaoIQfGzapnRyXNh1VbS8l38BNZR5ZD97ejGkLukJ7TO4fFS87Hyy6whAXo6tTdtqeCByMQ9gRFA== +storybook@^7.0.24: + version "7.0.24" + resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.0.24.tgz#5194d7b72964669985b8c2227772e882e6ae2563" + integrity sha512-ilQDM4+KaNO8s5jU4EnS68JWb9KaLR0+xTNa/BEXQa18SnSt/qZYORXtqispwkyuL/9xwaMVwtS+st7JOucNWA== dependencies: - "@storybook/cli" "7.0.7" + "@storybook/cli" "7.0.24" stream-shift@^1.0.0: version "1.0.1" @@ -10889,7 +10401,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.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: +"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.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== @@ -10912,7 +10424,16 @@ string.prototype.matchall@^4.0.8: regexp.prototype.flags "^1.4.3" side-channel "^1.0.4" -string.prototype.trimend@^1.0.5, string.prototype.trimend@^1.0.6: +string.prototype.trim@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" + integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + +string.prototype.trimend@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== @@ -10921,7 +10442,7 @@ string.prototype.trimend@^1.0.5, string.prototype.trimend@^1.0.6: define-properties "^1.1.4" es-abstract "^1.20.4" -string.prototype.trimstart@^1.0.5, string.prototype.trimstart@^1.0.6: +string.prototype.trimstart@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== @@ -10939,7 +10460,7 @@ string_decoder@^1.1.1: string_decoder@~0.10.x: version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== string_decoder@~1.1.1: @@ -10971,6 +10492,11 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-final-newline@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" + integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== + strip-indent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" @@ -10984,19 +10510,14 @@ strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1 integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== style-loader@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.2.tgz#eaebca714d9e462c19aa1e3599057bc363924899" - integrity sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw== - -stylis@4.0.13: - version "4.0.13" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" - integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== + version "3.3.3" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff" + integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw== -stylis@4.1.3: - version "4.1.3" - resolved "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7" - integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA== +stylis@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51" + integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== supports-color@^5.3.0: version "5.5.0" @@ -11019,14 +10540,6 @@ supports-color@^8.0.0, supports-color@^8.1.1: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - supports-hyperlinks@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" @@ -11050,7 +10563,7 @@ synchronous-promise@^2.0.15: resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz#38901319632f946c982152586f2caf8ddc25c032" integrity sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g== -synckit@^0.8.4: +synckit@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3" integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q== @@ -11085,13 +10598,13 @@ tar-stream@^2.1.0, tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.1.13: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -11134,53 +10647,24 @@ tempy@^1.0.1: type-fest "^0.16.0" unique-string "^2.0.0" -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== - dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" - -terser-webpack-plugin@^5.1.3: - version "5.3.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" - integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.14" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.14.1" - terser-webpack-plugin@^5.3.1, terser-webpack-plugin@^5.3.7: - version "5.3.7" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7" - integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw== + version "5.3.9" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" + integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== dependencies: "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.1" - terser "^5.16.5" - -terser@^5.10.0, terser@^5.14.1: - version "5.16.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880" - integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" + terser "^5.16.8" -terser@^5.16.5: - version "5.17.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69" - integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw== +terser@^5.10.0, terser@^5.16.8: + version "5.18.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.2.tgz#ff3072a0faf21ffd38f99acc9a0ddf7b5f07b948" + integrity sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w== dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" commander "^2.20.0" source-map-support "~0.5.20" @@ -11235,7 +10719,7 @@ through2@^2.0.3: through2@~0.4.1: version "0.4.2" - resolved "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b" integrity sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ== dependencies: readable-stream "~1.0.17" @@ -11243,7 +10727,7 @@ through2@~0.4.1: through@^2.3.8: version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== thunky@^1.0.2: @@ -11251,13 +10735,10 @@ thunky@^1.0.2: resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== -tiny-glob@^0.2.9: - version "0.2.9" - resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2" - integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg== - dependencies: - globalyzer "0.1.0" - globrex "^0.1.2" +titleize@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53" + integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ== tmpl@1.0.5: version "1.0.5" @@ -11281,21 +10762,15 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== -tough-cookie@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== +tough-cookie@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== dependencies: psl "^1.1.33" punycode "^2.1.1" - universalify "^0.1.2" - -tr46@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" - integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== - dependencies: - punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" tr46@^3.0.0: version "3.0.0" @@ -11304,12 +10779,19 @@ tr46@^3.0.0: dependencies: punycode "^2.1.1" +tr46@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469" + integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw== + dependencies: + punycode "^2.3.0" + tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== -triple-beam@^1.2.0, triple-beam@^1.3.0: +triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== @@ -11320,9 +10802,9 @@ ts-dedent@^2.0.0: integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ== ts-jest@^28.0.7: - version "28.0.7" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.7.tgz#e18757a9e44693da9980a79127e5df5a98b37ac6" - integrity sha512-wWXCSmTwBVmdvWrOpYhal79bDpioDy4rTT+0vyUnE3ZzM7LOAAGG9NXwzkEL/a516rQEgnMmS/WKP9jBPCVJyA== + version "28.0.8" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73" + integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg== dependencies: bs-logger "0.x" fast-json-stable-stringify "2.x" @@ -11334,9 +10816,9 @@ ts-jest@^28.0.7: yargs-parser "^21.0.1" ts-loader@^9.4.1: - version "9.4.1" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.1.tgz#b6f3d82db0eac5a8295994f8cb5e4940ff6b1060" - integrity sha512-384TYAqGs70rn9F0VBnh6BPTfhga7yFNdC5gXbQpDrBj9/KsT4iRkGqKXhziofHOlE2j6YEaiTYVGKKvPhGWvw== + version "9.4.4" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4" + integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w== dependencies: chalk "^4.1.0" enhanced-resolve "^5.0.0" @@ -11363,12 +10845,12 @@ ts-node@^10.9.1: yn "3.1.1" tsconfig-paths@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" - integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== + version "3.14.2" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" + integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== dependencies: "@types/json5" "^0.0.29" - json5 "^1.0.1" + json5 "^1.0.2" minimist "^1.2.6" strip-bom "^3.0.0" @@ -11377,10 +10859,10 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.5.3: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== tsutils@^3.21.0: version "3.21.0" @@ -11408,11 +10890,6 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - type-fest@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860" @@ -11465,12 +10942,12 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^4.1.3: - version "4.8.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" - integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== +typescript@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826" + integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw== -typescript@^4.9.5: +typescript@^4.1.3: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== @@ -11547,10 +11024,10 @@ unist-util-visit@^2.0.0: unist-util-is "^4.0.0" unist-util-visit-parents "^3.0.0" -universalify@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== universalify@^2.0.0: version "2.0.0" @@ -11577,10 +11054,10 @@ untildify@^4.0.0: resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== -update-browserslist-db@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== +update-browserslist-db@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" + integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== dependencies: escalade "^3.1.1" picocolors "^1.0.0" @@ -11592,6 +11069,14 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" @@ -11607,12 +11092,19 @@ use-resize-observer@^9.1.0: dependencies: "@juggle/resize-observer" "^3.3.1" +utf-8-validate@6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-6.0.3.tgz#7d8c936d854e86b24d1d655f138ee27d2636d777" + integrity sha512-uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA== + dependencies: + node-gyp-build "^4.3.0" + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -util@^0.12.0: +util@^0.12.0, util@^0.12.4: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== @@ -11623,18 +11115,6 @@ util@^0.12.0: is-typed-array "^1.1.3" which-typed-array "^1.1.2" -util@^0.12.4: - version "0.12.4" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" - integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== - dependencies: - inherits "^2.0.3" - is-arguments "^1.0.4" - is-generator-function "^1.0.7" - is-typed-array "^1.1.3" - safe-buffer "^5.1.2" - which-typed-array "^1.1.2" - utila@~0.4: version "0.4.0" resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" @@ -11665,7 +11145,7 @@ v8-compile-cache-lib@^3.0.1: resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== -v8-to-istanbul@^9.0.0: +v8-to-istanbul@^9.0.0, v8-to-istanbul@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265" integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA== @@ -11674,15 +11154,6 @@ v8-to-istanbul@^9.0.0: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" -v8-to-istanbul@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" - integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== - dependencies: - "@jridgewell/trace-mapping" "^0.3.12" - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -11696,24 +11167,10 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== - dependencies: - browser-process-hrtime "^1.0.0" - -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== - dependencies: - xml-name-validator "^3.0.0" - -w3c-xmlserializer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923" - integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg== +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== dependencies: xml-name-validator "^4.0.0" @@ -11756,32 +11213,22 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - -webidl-conversions@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" - integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== - webidl-conversions@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== webpack-cli@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a" - integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A== + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.0.1" - "@webpack-cli/info" "^2.0.1" - "@webpack-cli/serve" "^2.0.1" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" - commander "^9.4.1" + commander "^10.0.1" cross-spawn "^7.0.3" envinfo "^7.7.3" fastest-levenshtein "^1.0.12" @@ -11802,9 +11249,9 @@ webpack-dev-middleware@^5.3.1: schema-utils "^4.0.0" webpack-dev-server@^4.11.1: - version "4.11.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz#ae07f0d71ca0438cf88446f09029b92ce81380b5" - integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw== + version "4.15.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7" + integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -11812,7 +11259,7 @@ webpack-dev-server@^4.11.1: "@types/serve-index" "^1.9.1" "@types/serve-static" "^1.13.10" "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" + "@types/ws" "^8.5.5" ansi-html-community "^0.0.8" bonjour-service "^1.0.11" chokidar "^3.5.3" @@ -11825,6 +11272,7 @@ webpack-dev-server@^4.11.1: html-entities "^2.3.2" http-proxy-middleware "^2.0.3" ipaddr.js "^2.0.1" + launch-editor "^2.6.0" open "^8.0.9" p-retry "^4.5.0" rimraf "^3.0.2" @@ -11834,12 +11282,12 @@ webpack-dev-server@^4.11.1: sockjs "^0.3.24" spdy "^4.0.2" webpack-dev-middleware "^5.3.1" - ws "^8.4.2" + ws "^8.13.0" webpack-hot-middleware@^2.25.1: - version "2.25.3" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz#be343ce2848022cfd854dd82820cd730998c6794" - integrity sha512-IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA== + version "2.25.4" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.4.tgz#d8bc9e9cb664fc3105c8e83d2b9ed436bee4e193" + integrity sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w== dependencies: ansi-html-community "0.0.8" html-entities "^2.1.0" @@ -11854,9 +11302,9 @@ webpack-manifest-plugin@^5.0.0: webpack-sources "^2.2.0" webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== + version "5.9.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" + integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" @@ -11879,10 +11327,10 @@ webpack-virtual-modules@^0.4.3, webpack-virtual-modules@^0.4.5: resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz#3e4008230731f1db078d9cb6f68baf8571182b45" integrity sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA== -webpack@5: - version "5.80.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.80.0.tgz#3e660b4ab572be38c5e954bdaae7e2bf76010fdc" - integrity sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA== +webpack@5, webpack@^5, webpack@^5.76.1: + version "5.88.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.1.tgz#21eba01e81bd5edff1968aea726e2fbfd557d3f8" + integrity sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" @@ -11890,10 +11338,10 @@ webpack@5: "@webassemblyjs/wasm-edit" "^1.11.5" "@webassemblyjs/wasm-parser" "^1.11.5" acorn "^8.7.1" - acorn-import-assertions "^1.7.6" + acorn-import-assertions "^1.9.0" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.13.0" + enhanced-resolve "^5.15.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" @@ -11903,42 +11351,12 @@ webpack@5: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.2" + schema-utils "^3.2.0" tapable "^2.1.1" terser-webpack-plugin "^5.3.7" watchpack "^2.4.0" webpack-sources "^3.2.3" -webpack@^5, webpack@^5.76.1: - version "5.76.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c" - integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" @@ -11953,13 +11371,6 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== - dependencies: - iconv-lite "0.4.24" - whatwg-encoding@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" @@ -11972,24 +11383,11 @@ whatwg-fetch@^3.6.2: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== - whatwg-mimetype@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== -whatwg-url@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da" - integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w== - dependencies: - tr46 "^3.0.0" - webidl-conversions "^7.0.0" - whatwg-url@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" @@ -11998,6 +11396,14 @@ whatwg-url@^11.0.0: tr46 "^3.0.0" webidl-conversions "^7.0.0" +whatwg-url@^12.0.0, whatwg-url@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c" + integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ== + dependencies: + tr46 "^4.1.1" + webidl-conversions "^7.0.0" + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -12006,15 +11412,6 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" -whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" - integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== - dependencies: - lodash "^4.7.0" - tr46 "^2.1.0" - webidl-conversions "^6.1.0" - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -12026,34 +11423,12 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== - -which-typed-array@^1.1.2: - version "1.1.8" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" - integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.9" + version "2.0.1" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.9: +which-typed-array@^1.1.2, which-typed-array@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== @@ -12094,29 +11469,21 @@ widest-line@^3.1.0: string-width "^4.0.0" wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" + integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== winston-daily-rotate-file@^4.5.5: - version "4.5.5" - resolved "https://registry.yarnpkg.com/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.5.tgz#cfa3a89f4eb0e4126917592b375759b772bcd972" - integrity sha512-ds0WahIjiDhKCiMXmY799pDBW+58ByqIBtUcsqr4oDoXrAI3Zn+hbgFdUxzMfqA93OG0mPLYVMiotqTgE/WeWQ== + version "4.7.1" + resolved "https://registry.yarnpkg.com/winston-daily-rotate-file/-/winston-daily-rotate-file-4.7.1.tgz#f60a643af87f8867f23170d8cd87dbe3603a625f" + integrity sha512-7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA== dependencies: - file-stream-rotator "^0.5.7" + file-stream-rotator "^0.6.1" object-hash "^2.0.1" triple-beam "^1.3.0" winston-transport "^4.4.0" -winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== - dependencies: - readable-stream "^2.3.7" - triple-beam "^1.2.0" - -winston-transport@^4.5.0: +winston-transport@^4.4.0, winston-transport@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa" integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q== @@ -12126,9 +11493,9 @@ winston-transport@^4.5.0: triple-beam "^1.3.0" winston@^3.8.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.2.tgz#56e16b34022eb4cff2638196d9646d7430fdad50" - integrity sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew== + version "3.9.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.9.0.tgz#2bbdeb8167a75fac6d9a0c6d002890cd908016c2" + integrity sha512-jW51iW/X95BCW6MMtZWr2jKQBP4hV5bIDq9QrIjfDk6Q9QuxvTKEAlpUNAzP+HYHFFCeENhph16s0zEunu4uuQ== dependencies: "@colors/colors" "1.5.0" "@dabh/diagnostics" "^2.0.2" @@ -12142,7 +11509,7 @@ winston@^3.8.2: triple-beam "^1.3.0" winston-transport "^4.5.0" -word-wrap@^1.2.3, word-wrap@~1.2.3: +word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -12184,14 +11551,6 @@ write-file-atomic@^2.3.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-atomic@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f" - integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - write-file-atomic@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" @@ -12214,43 +11573,28 @@ ws@^6.1.0: dependencies: async-limiter "~1.0.0" -ws@^7.4.6: - version "7.5.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" - integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== - -ws@^8.2.3: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== - -ws@^8.4.2: - version "8.8.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0" - integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA== - -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== +ws@^8.11.0, ws@^8.13.0, ws@^8.2.3: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== xml-name-validator@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== -xml2js@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" - integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== +xml2js@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" + integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== dependencies: sax ">=0.6.0" - xmlbuilder "~9.0.1" + xmlbuilder "~11.0.0" -xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== xmlchars@^2.2.0: version "2.2.0" @@ -12259,7 +11603,7 @@ xmlchars@^2.2.0: xtend@~2.1.1: version "2.1.2" - resolved "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ== dependencies: object-keys "~0.4.0" @@ -12307,16 +11651,11 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.9: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^21.0.0: +yargs-parser@^21.0.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs-parser@^21.0.1: - version "21.0.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" - integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== - yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" @@ -12347,18 +11686,18 @@ yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.3.1, yargs@^17.5.1: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== +yargs@^17.3.1, yargs@^17.6.0: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^21.0.0" + yargs-parser "^21.1.1" yauzl@^2.10.0: version "2.10.0" diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index e885ac38249..7ed36daf1b7 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -57,32 +57,32 @@ "@creditkarma/thrift-server-core": "1.0.4", "@cypress/skip-test": "2.6.1", "@cypress/webpack-preprocessor": "5.17.1", - "@emotion/babel-plugin": "11.10.5", - "@emotion/cache": "11.10.5", - "@emotion/react": "11.10.5", - "@emotion/server": "11.10.0", - "@guardian/ab-core": "4.0.0", - "@guardian/atoms-rendering": "31.0.0", + "@emotion/babel-plugin": "11.11.0", + "@emotion/cache": "11.11.0", + "@emotion/react": "11.11.1", + "@emotion/server": "11.11.0", + "@guardian/ab-core": "5.0.0", + "@guardian/atoms-rendering": "32.1.0", "@guardian/braze-components": "13.3.0", "@guardian/bridget": "2.3.0", "@guardian/browserslist-config": "5.0.0", "@guardian/cdk": "49.5.0", - "@guardian/commercial": "10.1.0", + "@guardian/commercial": "10.1.1", "@guardian/consent-management-platform": "13.5.0", - "@guardian/core-web-vitals": "4.0.0", - "@guardian/discussion-rendering": "14.0.0", - "@guardian/eslint-config": "3.0.0", - "@guardian/eslint-config-typescript": "5.0.0", - "@guardian/eslint-plugin-source-react-components": "14.0.0", + "@guardian/core-web-vitals": "5.0.0", + "@guardian/discussion-rendering": "15.0.0", + "@guardian/eslint-config": "4.1.0", + "@guardian/eslint-config-typescript": "6.0.1", + "@guardian/eslint-plugin-source-react-components": "17.0.0", "@guardian/identity-auth": "0.1.2", - "@guardian/libs": "14.1.0", - "@guardian/prettier": "3.0.0", + "@guardian/libs": "15.1.0", + "@guardian/prettier": "4.0.0", "@guardian/shimport": "1.0.2", - "@guardian/source-foundations": "10.0.1", - "@guardian/source-react-components": "13.0.0", - "@guardian/source-react-components-development-kitchen": "11.0.0", + "@guardian/source-foundations": "12.0.0", + "@guardian/source-react-components": "15.0.1", + "@guardian/source-react-components-development-kitchen": "13.0.1", "@guardian/support-dotcom-components": "1.0.7", - "@guardian/tsconfig": "0.1.6", + "@guardian/tsconfig": "0.2.0", "@percy/cli": "1.18.0", "@percy/cypress": "3.1.2", "@sentry/browser": "7.37.2", @@ -117,12 +117,13 @@ "@types/he": "1.2.0", "@types/html-minifier-terser": "7.0.0", "@types/jest": "27.5.2", - "@types/jsdom": "20.0.1", + "@types/jsdom": "21.1.1", "@types/lodash": "4.14.191", "@types/lodash.debounce": "4.0.7", "@types/lodash.get": "4.4.7", "@types/node": "18.16.18", "@types/node-fetch": "2.6.2", + "@types/parse5": "7.0.0", "@types/prop-types": "15.7.5", "@types/qs": "6.9.7", "@types/react": "18.2.0", @@ -204,7 +205,7 @@ "jest": "29.5.0", "jest-environment-jsdom": "29.5.0", "jest-teamcity-reporter": "0.9.0", - "jsdom": "20.0.3", + "jsdom": "22.1.0", "lint-staged": "13.2.1", "load-json-file": "6.2.0", "lodash": "4.17.21", @@ -261,7 +262,8 @@ "trusted-types": "2.0.0", "ts-loader": "9.4.3", "ts-unused-exports": "8.0.5", - "tslib": "2.5.0", + "tslib": "2.5.3", + "type-fest": "3.12.0", "typescript-json-schema": "0.54.0", "unified": "10.1.2", "uuid": "8.3.2", diff --git a/dotcom-rendering/scripts/webpack/webpack.config.server.js b/dotcom-rendering/scripts/webpack/webpack.config.server.js index cb893e79d0a..6efc3f93ce3 100644 --- a/dotcom-rendering/scripts/webpack/webpack.config.server.js +++ b/dotcom-rendering/scripts/webpack/webpack.config.server.js @@ -39,6 +39,7 @@ module.exports = ({ sessionId }) => ({ runtimeChunk: false, }, externals: [ + // @ts-expect-error - webpack-node-externals types are incorrect ...(DEV ? [ nodeExternals({ @@ -55,17 +56,20 @@ module.exports = ({ sessionId }) => ({ : []), // @aws-sdk modules are only used in CODE/PROD, so we don't need to // include them in the development bundle + // @ts-expect-error - webpack-node-externals types are incorrect ({ request }, callback) => { return process.env.NODE_ENV === 'development' && request?.startsWith('@aws-sdk') ? callback(undefined, `commonjs ${request}`) : callback(); }, + // @ts-expect-error - webpack-node-externals types are incorrect ({ request }, callback) => { return request?.endsWith('manifest.json') ? callback(undefined, `commonjs ${request}`) : callback(); }, + // @ts-expect-error - webpack-node-externals types are incorrect ({ request }, callback) => { return request?.endsWith('manifest.legacy.json') ? callback(undefined, `commonjs ${request}`) diff --git a/dotcom-rendering/src/components/TableOfContents.importable.tsx b/dotcom-rendering/src/components/TableOfContents.importable.tsx index c68da3a8c61..90a0f8e96c8 100644 --- a/dotcom-rendering/src/components/TableOfContents.importable.tsx +++ b/dotcom-rendering/src/components/TableOfContents.importable.tsx @@ -1,3 +1,5 @@ +/* eslint-disable jsx-a11y/no-static-element-interactions -- TODO */ +/* eslint-disable jsx-a11y/click-events-have-key-events -- TODO */ import { css } from '@emotion/react'; import { ArticleDisplay } from '@guardian/libs'; import { diff --git a/package.json b/package.json index 88ad01eacaa..aa89a122cc3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "type-fest", "**/@types/webpack", "**/@types/react", - "**/@types/express-serve-static-core" + "**/@types/express-serve-static-core", + "**/@guardian/**" ] }, "scripts": { @@ -28,11 +29,11 @@ "prepare": "husky install" }, "dependencies": { - "@guardian/prettier": "^2.0.0", - "chromatic": "^6.17.4", + "@guardian/prettier": "^4.0.0", + "chromatic": "^6.19.9", "husky": "^8.0.3", "npm-run-all": "^4.1.5", - "prettier": "^2.8.0", - "typescript": "^4.9.0" + "prettier": "^2.8.8", + "typescript": "5.1.3" } } diff --git a/yarn.lock b/yarn.lock index a76d563cfbc..d9effe3bc21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,26 +2,24 @@ # yarn lockfile v1 +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== + "@adobe/css-tools@^4.0.1": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.1.0.tgz#417fef4a143f4396ad0b3b4351fee21323f15aa8" - integrity sha512-mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ== + version "4.2.0" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855" + integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA== "@ampproject/remapping@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + version "2.2.1" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" + integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== dependencies: - "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@arcanis/slice-ansi@^1.0.2": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@arcanis/slice-ansi/-/slice-ansi-1.1.1.tgz#0ee328a68996ca45854450033a3d161421dc4f55" - integrity sha512-xguP2WR2Dv0gQ7Ykbdb7BNCnPnIPB94uTi0Z2NvkRBEnhbwjOQ7QyQKJXrVQg4qDpiD9hA5l5cCwy/z2OXgc3w== - dependencies: - grapheme-splitter "^1.0.4" - "@aw-web-design/x-default-browser@1.4.88": version "1.4.88" resolved "https://registry.yarnpkg.com/@aw-web-design/x-default-browser/-/x-default-browser-1.4.88.tgz#33d869cb2a537cd6d2a8369d4dc8ea4988d4be89" @@ -30,19 +28,19 @@ default-browser-id "3.0.0" "@aws-cdk/asset-awscli-v1@^2.2.97": - version "2.2.108" - resolved "https://registry.yarnpkg.com/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.108.tgz#500e46b7a0db26eb9f7b4eb421c87c83f14ccccc" - integrity sha512-ML3Z/m6D3biTcYFclx5ln3jmj2tR51LFrvqc4IXbraKr3CLsXvnrWHl3DYZQRgLbW1cauOAcoK1Lm5wGnc3pcQ== + version "2.2.199" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.199.tgz#59cf4abd11f2c5ff487155d7ddf9cc71cc22b56c" + integrity sha512-zNdD2OxALdsdQaRZBpTfMTuudxV+4jLMznJIvVj6O+OqCru4m5UtgVQmyApW1z2H9s4/06ovVt20aXe2G8Ta+w== "@aws-cdk/asset-kubectl-v20@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.1.tgz#d01c1efb867fb7f2cfd8c8b230b8eae16447e156" - integrity sha512-U1ntiX8XiMRRRH5J1IdC+1t5CE89015cwyt5U63Cpk0GnMlN5+h9WsWMlKlPXZR4rdq/m806JRlBMRpBUB2Dhw== + version "2.1.2" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.2.tgz#d8e20b5f5dc20128ea2000dc479ca3c7ddc27248" + integrity sha512-3M2tELJOxQv0apCIiuKQ4pAbncz9GuLwnKFqxifWfe77wuMxyTRPmxssYHs42ePqzap1LT6GDcPygGs+hHstLg== "@aws-cdk/asset-node-proxy-agent-v5@^2.0.77": - version "2.0.87" - resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.87.tgz#91dd83f059bc4fa0391349094ff532140f4e2d53" - integrity sha512-e924ANUrtvv4drdR1bfYn1YigDUgfnUpJO7ygm/6t0VGjmmhXY2g43XT+NIKOrCpC0z2Aqk4o5px8fuPCfmQTw== + version "2.0.165" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.165.tgz#c169599d83beceea7e638082ef9833997f04c85d" + integrity sha512-bsyLQD/vqXQcc9RDmlM1XqiFNO/yewgVFXmkMcQkndJbmE/jgYkzewwYGrBlfL725hGLQipXq19+jwWwdsXQqg== "@aws-crypto/crc32@3.0.0": version "3.0.0" @@ -624,11 +622,11 @@ tslib "^2.5.0" "@aws-sdk/types@^3.222.0": - version "3.267.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.267.0.tgz#fe543d1a1977c4e9e7ca6c32c837fcfd87b32441" - integrity sha512-fICTbSeIfXlTHnciQgDt37R0kXoKxgh0a3prnLWVvTcmf7NFujdZmg5YTAZT3KJJ7SuKsIgnI8azBYioVY8BVQ== + version "3.357.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.357.0.tgz#8491da71a4291cc2661c26a75089e86532b6a3b5" + integrity sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g== dependencies: - tslib "^2.3.1" + tslib "^2.5.0" "@aws-sdk/url-parser@3.347.0": version "3.347.0" @@ -714,11 +712,11 @@ tslib "^2.5.0" "@aws-sdk/util-locate-window@^3.0.0": - version "3.208.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz#0f598fc238a1256e4bcb64d01459f03a922dd4c3" - integrity sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg== + version "3.310.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz#b071baf050301adee89051032bd4139bba32cc40" + integrity sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w== dependencies: - tslib "^2.3.1" + tslib "^2.5.0" "@aws-sdk/util-middleware@3.347.0": version "3.347.0" @@ -791,17 +789,7 @@ dependencies: "@babel/highlight" "^7.22.5" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5": - version "7.20.14" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.14.tgz#4106fc8b755f3e3ee0a0a7c27dde5de1d2b2baf8" - integrity sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw== - -"@babel/compat-data@^7.20.0", "@babel/compat-data@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" - integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== - -"@babel/compat-data@^7.22.5": +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5", "@babel/compat-data@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== @@ -828,27 +816,27 @@ semver "^6.3.0" "@babel/core@~7.21.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" - integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== + version "7.21.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4" + integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.4" - "@babel/helper-compilation-targets" "^7.21.4" - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helpers" "^7.21.0" - "@babel/parser" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-compilation-targets" "^7.21.5" + "@babel/helper-module-transforms" "^7.21.5" + "@babel/helpers" "^7.21.5" + "@babel/parser" "^7.21.8" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.4" - "@babel/types" "^7.21.4" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.12.11", "@babel/generator@^7.21.4", "@babel/generator@^7.22.5", "@babel/generator@^7.7.2": +"@babel/generator@^7.12.11", "@babel/generator@^7.21.5", "@babel/generator@^7.22.5", "@babel/generator@^7.7.2": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7" integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA== @@ -859,37 +847,22 @@ jsesc "^2.5.1" "@babel/generator@~7.21.1": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" - integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== + version "7.21.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.9.tgz#3a1b706e07d836e204aee0650e8ee878d3aaa241" + integrity sha512-F3fZga2uv09wFdEjEQIJxXALXfz0+JaOb7SabvVMmjHxeVTuGW8wgE8Vp1Hd7O+zMTYtcfEISGRzPkeiaPPsvg== dependencies: - "@babel/types" "^7.21.4" + "@babel/types" "^7.21.5" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" - integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-annotate-as-pure@^7.22.5": +"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" - integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.18.6" - "@babel/types" "^7.18.9" - "@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878" @@ -907,7 +880,7 @@ browserslist "^4.21.3" semver "^6.3.0" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4", "@babel/helper-compilation-targets@^7.22.5": +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5", "@babel/helper-compilation-targets@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02" integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw== @@ -918,35 +891,7 @@ lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.12", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7": - version "7.20.12" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819" - integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-member-expression-to-functions" "^7.20.7" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/helper-split-export-declaration" "^7.18.6" - -"@babel/helper-create-class-features-plugin@^7.21.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18" - integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-member-expression-to-functions" "^7.21.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/helper-split-export-declaration" "^7.18.6" - -"@babel/helper-create-class-features-plugin@^7.22.5": +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c" integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q== @@ -961,7 +906,7 @@ "@babel/helper-split-export-declaration" "^7.22.5" semver "^6.3.0" -"@babel/helper-create-regexp-features-plugin@7.20.5", "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": +"@babel/helper-create-regexp-features-plugin@7.20.5": version "7.20.5" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca" integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w== @@ -969,7 +914,7 @@ "@babel/helper-annotate-as-pure" "^7.18.6" regexpu-core "^5.2.1" -"@babel/helper-create-regexp-features-plugin@^7.22.5": +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4" integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A== @@ -1002,40 +947,12 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-environment-visitor@^7.22.5": +"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5", "@babel/helper-environment-visitor@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== -"@babel/helper-explode-assignable-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" - integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" - -"@babel/helper-function-name@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" - integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== - dependencies: - "@babel/template" "^7.20.7" - "@babel/types" "^7.21.0" - -"@babel/helper-function-name@^7.22.5": +"@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== @@ -1043,34 +960,13 @@ "@babel/template" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-hoist-variables@^7.22.5": +"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-member-expression-to-functions@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05" - integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw== - dependencies: - "@babel/types" "^7.20.7" - -"@babel/helper-member-expression-to-functions@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" - integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q== - dependencies: - "@babel/types" "^7.21.0" - "@babel/helper-member-expression-to-functions@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2" @@ -1078,21 +974,14 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-imports@^7.22.5": +"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c" integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.22.5": +"@babel/helper-module-transforms@^7.21.5", "@babel/helper-module-transforms@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw== @@ -1106,13 +995,6 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/helper-optimise-call-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" - integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== - dependencies: - "@babel/types" "^7.18.6" - "@babel/helper-optimise-call-expression@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" @@ -1120,27 +1002,12 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" - integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== - -"@babel/helper-plugin-utils@^7.22.5": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== -"@babel/helper-remap-async-to-generator@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" - integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-wrap-function" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-remap-async-to-generator@^7.22.5": +"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2" integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g== @@ -1150,18 +1017,6 @@ "@babel/helper-wrap-function" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" - integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.20.7" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" - "@babel/helper-replace-supers@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc" @@ -1174,13 +1029,6 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/helper-simple-access@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" - integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== - dependencies: - "@babel/types" "^7.20.2" - "@babel/helper-simple-access@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" @@ -1188,79 +1036,35 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" - integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== - dependencies: - "@babel/types" "^7.20.0" - -"@babel/helper-skip-transparent-expression-wrappers@^7.22.5": +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-split-export-declaration@^7.22.5": +"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08" integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== - -"@babel/helper-string-parser@^7.22.5": +"@babel/helper-string-parser@^7.21.5", "@babel/helper-string-parser@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-identifier@^7.22.5": +"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helper-validator-option@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" - integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== - -"@babel/helper-validator-option@^7.22.5": +"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== -"@babel/helper-wrap-function@^7.18.9": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3" - integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q== - dependencies: - "@babel/helper-function-name" "^7.19.0" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" - "@babel/helper-wrap-function@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06" @@ -1271,7 +1075,7 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/helpers@^7.21.0", "@babel/helpers@^7.22.5": +"@babel/helpers@^7.21.5", "@babel/helpers@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820" integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q== @@ -1289,40 +1093,24 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4", "@babel/parser@^7.22.5", "@babel/parser@^7.8.3": +"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.22.5", "@babel/parser@^7.8.3": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== "@babel/parser@~7.21.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" - integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== + version "7.21.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.9.tgz#ab18ea3b85b4bc33ba98a8d4c2032c557d23cf14" + integrity sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" - integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e" integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" - integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-proposal-optional-chaining" "^7.20.7" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5": +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca" integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g== @@ -1349,16 +1137,7 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-class-static-block@^7.18.6": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz#92592e9029b13b15be0f7ce6a7aedc2879ca45a7" - integrity sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.20.7" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-proposal-class-static-block@^7.21.0": +"@babel/plugin-proposal-class-static-block@^7.18.6", "@babel/plugin-proposal-class-static-block@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d" integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw== @@ -1434,7 +1213,7 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@7.20.7", "@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7": +"@babel/plugin-proposal-optional-chaining@7.20.7": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz#49f2b372519ab31728cc14115bb0998b15bfda55" integrity sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ== @@ -1443,7 +1222,7 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.21.0": +"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== @@ -1465,20 +1244,10 @@ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703" integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w== -"@babel/plugin-proposal-private-property-in-object@^7.18.6": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135" - integrity sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.20.5" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-proposal-private-property-in-object@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc" - integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw== +"@babel/plugin-proposal-private-property-in-object@^7.18.6", "@babel/plugin-proposal-private-property-in-object@^7.21.0": + version "7.21.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c" + integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-create-class-features-plugin" "^7.21.0" @@ -1535,21 +1304,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-flow@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1" - integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-import-assertions@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" - integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== +"@babel/plugin-syntax-flow@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz#163b820b9e7696ce134df3ee716d9c0c98035859" + integrity sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ== dependencies: - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-import-assertions@^7.22.5": +"@babel/plugin-syntax-import-assertions@^7.20.0", "@babel/plugin-syntax-import-assertions@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98" integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg== @@ -1577,19 +1339,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.17.12", "@babel/plugin-syntax-jsx@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-jsx@^7.21.4", "@babel/plugin-syntax-jsx@^7.7.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" - integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ== +"@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" + integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -1647,19 +1402,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" - integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-syntax-typescript@^7.7.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz#2751948e9b7c6d771a8efa59340c15d4a2891ff8" - integrity sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA== +"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272" + integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-unicode-sets-regex@^7.18.6": version "7.18.6" @@ -1669,14 +1417,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.18.6", "@babel/plugin-transform-arrow-functions@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" - integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-arrow-functions@^7.22.5": +"@babel/plugin-transform-arrow-functions@^7.18.6", "@babel/plugin-transform-arrow-functions@^7.21.5", "@babel/plugin-transform-arrow-functions@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958" integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw== @@ -1693,16 +1434,7 @@ "@babel/helper-remap-async-to-generator" "^7.22.5" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-transform-async-to-generator@^7.18.6", "@babel/plugin-transform-async-to-generator@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" - integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== - dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-remap-async-to-generator" "^7.18.9" - -"@babel/plugin-transform-async-to-generator@^7.22.5": +"@babel/plugin-transform-async-to-generator@^7.18.6", "@babel/plugin-transform-async-to-generator@^7.20.7", "@babel/plugin-transform-async-to-generator@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775" integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ== @@ -1711,35 +1443,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-remap-async-to-generator" "^7.22.5" -"@babel/plugin-transform-block-scoped-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" - integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-block-scoped-functions@^7.22.5": +"@babel/plugin-transform-block-scoped-functions@^7.18.6", "@babel/plugin-transform-block-scoped-functions@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024" integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-block-scoping@^7.20.2": - version "7.20.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz#3e1b2aa9cbbe1eb8d644c823141a9c5c2a22392d" - integrity sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-block-scoping@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02" - integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-block-scoping@^7.22.5": +"@babel/plugin-transform-block-scoping@^7.20.2", "@babel/plugin-transform-block-scoping@^7.21.0", "@babel/plugin-transform-block-scoping@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b" integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg== @@ -1763,37 +1474,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.20.2": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz#f438216f094f6bb31dc266ebfab8ff05aecad073" - integrity sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-split-export-declaration" "^7.18.6" - globals "^11.1.0" - -"@babel/plugin-transform-classes@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665" - integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-split-export-declaration" "^7.18.6" - globals "^11.1.0" - -"@babel/plugin-transform-classes@^7.22.5": +"@babel/plugin-transform-classes@^7.20.2", "@babel/plugin-transform-classes@^7.21.0", "@babel/plugin-transform-classes@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1" integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ== @@ -1808,15 +1489,7 @@ "@babel/helper-split-export-declaration" "^7.22.5" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.18.9", "@babel/plugin-transform-computed-properties@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" - integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/template" "^7.20.7" - -"@babel/plugin-transform-computed-properties@^7.22.5": +"@babel/plugin-transform-computed-properties@^7.18.9", "@babel/plugin-transform-computed-properties@^7.21.5", "@babel/plugin-transform-computed-properties@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869" integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg== @@ -1824,36 +1497,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/template" "^7.22.5" -"@babel/plugin-transform-destructuring@^7.20.2": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454" - integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-destructuring@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401" - integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-destructuring@^7.22.5": +"@babel/plugin-transform-destructuring@^7.20.2", "@babel/plugin-transform-destructuring@^7.21.3", "@babel/plugin-transform-destructuring@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc" integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" - integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-dotall-regex@^7.22.5": +"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165" integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw== @@ -1861,14 +1512,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-duplicate-keys@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" - integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-duplicate-keys@^7.22.5": +"@babel/plugin-transform-duplicate-keys@^7.18.9", "@babel/plugin-transform-duplicate-keys@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285" integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw== @@ -1883,15 +1527,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" - integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-exponentiation-operator@^7.22.5": +"@babel/plugin-transform-exponentiation-operator@^7.18.6", "@babel/plugin-transform-exponentiation-operator@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a" integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g== @@ -1907,45 +1543,22 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-transform-flow-strip-types@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz#6aeca0adcb81dc627c8986e770bfaa4d9812aff5" - integrity sha512-FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-flow" "^7.18.6" - -"@babel/plugin-transform-for-of@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" - integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-for-of@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e" - integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ== +"@babel/plugin-transform-flow-strip-types@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz#0bb17110c7bf5b35a60754b2f00c58302381dee2" + integrity sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-flow" "^7.22.5" -"@babel/plugin-transform-for-of@^7.22.5": +"@babel/plugin-transform-for-of@^7.18.8", "@babel/plugin-transform-for-of@^7.21.5", "@babel/plugin-transform-for-of@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f" integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" - integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== - dependencies: - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-function-name@^7.22.5": +"@babel/plugin-transform-function-name@^7.18.9", "@babel/plugin-transform-function-name@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143" integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg== @@ -1962,14 +1575,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" - integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-literals@^7.22.5": +"@babel/plugin-transform-literals@^7.18.9", "@babel/plugin-transform-literals@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920" integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g== @@ -1984,29 +1590,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-transform-member-expression-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" - integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-member-expression-literals@^7.22.5": +"@babel/plugin-transform-member-expression-literals@^7.18.6", "@babel/plugin-transform-member-expression-literals@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def" integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-amd@^7.19.6", "@babel/plugin-transform-modules-amd@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" - integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== - dependencies: - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-modules-amd@^7.22.5": +"@babel/plugin-transform-modules-amd@^7.19.6", "@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526" integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ== @@ -2014,25 +1605,7 @@ "@babel/helper-module-transforms" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.21.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" - integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== - dependencies: - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-simple-access" "^7.20.2" - -"@babel/plugin-transform-modules-commonjs@^7.19.6": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz#8cb23010869bf7669fd4b3098598b6b2be6dc607" - integrity sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw== - dependencies: - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-simple-access" "^7.20.2" - -"@babel/plugin-transform-modules-commonjs@^7.22.5": +"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.19.6", "@babel/plugin-transform-modules-commonjs@^7.21.5", "@babel/plugin-transform-modules-commonjs@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa" integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA== @@ -2041,17 +1614,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-simple-access" "^7.22.5" -"@babel/plugin-transform-modules-systemjs@^7.19.6", "@babel/plugin-transform-modules-systemjs@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" - integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== - dependencies: - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-identifier" "^7.19.1" - -"@babel/plugin-transform-modules-systemjs@^7.22.5": +"@babel/plugin-transform-modules-systemjs@^7.19.6", "@babel/plugin-transform-modules-systemjs@^7.20.11", "@babel/plugin-transform-modules-systemjs@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496" integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ== @@ -2061,15 +1624,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-validator-identifier" "^7.22.5" -"@babel/plugin-transform-modules-umd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" - integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== - dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-modules-umd@^7.22.5": +"@babel/plugin-transform-modules-umd@^7.18.6", "@babel/plugin-transform-modules-umd@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98" integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ== @@ -2077,15 +1632,7 @@ "@babel/helper-module-transforms" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" - integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.20.5" - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": +"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.20.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f" integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ== @@ -2093,14 +1640,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-new-target@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" - integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-new-target@^7.22.5": +"@babel/plugin-transform-new-target@^7.18.6", "@babel/plugin-transform-new-target@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d" integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw== @@ -2134,15 +1674,7 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.22.5" -"@babel/plugin-transform-object-super@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" - integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.6" - -"@babel/plugin-transform-object-super@^7.22.5": +"@babel/plugin-transform-object-super@^7.18.6", "@babel/plugin-transform-object-super@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c" integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw== @@ -2167,21 +1699,7 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f" - integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-parameters@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db" - integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-parameters@^7.22.5": +"@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3", "@babel/plugin-transform-parameters@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18" integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg== @@ -2206,35 +1724,28 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-transform-property-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" - integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-property-literals@^7.22.5": +"@babel/plugin-transform-property-literals@^7.18.6", "@babel/plugin-transform-property-literals@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766" integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-react-display-name@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" - integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== +"@babel/plugin-transform-react-display-name@^7.18.6", "@babel/plugin-transform-react-display-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz#3c4326f9fce31c7968d6cb9debcaf32d9e279a2b" + integrity sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-react-jsx-development@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5" - integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA== +"@babel/plugin-transform-react-jsx-development@^7.18.6", "@babel/plugin-transform-react-jsx-development@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87" + integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A== dependencies: - "@babel/plugin-transform-react-jsx" "^7.18.6" + "@babel/plugin-transform-react-jsx" "^7.22.5" -"@babel/plugin-transform-react-jsx@7.20.13", "@babel/plugin-transform-react-jsx@^7.18.6": +"@babel/plugin-transform-react-jsx@7.20.13": version "7.20.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz#f950f0b0c36377503d29a712f16287cedf886cbb" integrity sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw== @@ -2245,34 +1756,26 @@ "@babel/plugin-syntax-jsx" "^7.18.6" "@babel/types" "^7.20.7" -"@babel/plugin-transform-react-jsx@^7.19.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2" - integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.21.0" - -"@babel/plugin-transform-react-pure-annotations@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844" - integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ== +"@babel/plugin-transform-react-jsx@^7.18.6", "@babel/plugin-transform-react-jsx@^7.19.0", "@babel/plugin-transform-react-jsx@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz#932c291eb6dd1153359e2a90cb5e557dcf068416" + integrity sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA== dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-module-imports" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.22.5" + "@babel/types" "^7.22.5" -"@babel/plugin-transform-regenerator@^7.18.6", "@babel/plugin-transform-regenerator@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d" - integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ== +"@babel/plugin-transform-react-pure-annotations@^7.18.6", "@babel/plugin-transform-react-pure-annotations@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz#1f58363eef6626d6fa517b95ac66fe94685e32c0" + integrity sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - regenerator-transform "^0.15.1" + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-regenerator@^7.22.5": +"@babel/plugin-transform-regenerator@^7.18.6", "@babel/plugin-transform-regenerator@^7.21.5", "@babel/plugin-transform-regenerator@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa" integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw== @@ -2280,14 +1783,7 @@ "@babel/helper-plugin-utils" "^7.22.5" regenerator-transform "^0.15.1" -"@babel/plugin-transform-reserved-words@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" - integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-reserved-words@^7.22.5": +"@babel/plugin-transform-reserved-words@^7.18.6", "@babel/plugin-transform-reserved-words@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb" integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA== @@ -2318,29 +1814,14 @@ babel-plugin-polyfill-regenerator "^0.5.0" semver "^6.3.0" -"@babel/plugin-transform-shorthand-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" - integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-shorthand-properties@^7.22.5": +"@babel/plugin-transform-shorthand-properties@^7.18.6", "@babel/plugin-transform-shorthand-properties@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624" integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-spread@^7.19.0", "@babel/plugin-transform-spread@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" - integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - -"@babel/plugin-transform-spread@^7.22.5": +"@babel/plugin-transform-spread@^7.19.0", "@babel/plugin-transform-spread@^7.20.7", "@babel/plugin-transform-spread@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b" integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg== @@ -2348,75 +1829,38 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" -"@babel/plugin-transform-sticky-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" - integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-sticky-regex@^7.22.5": +"@babel/plugin-transform-sticky-regex@^7.18.6", "@babel/plugin-transform-sticky-regex@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa" integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-template-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" - integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-template-literals@^7.22.5": +"@babel/plugin-transform-template-literals@^7.18.9", "@babel/plugin-transform-template-literals@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff" integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-typeof-symbol@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" - integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-typeof-symbol@^7.22.5": +"@babel/plugin-transform-typeof-symbol@^7.18.9", "@babel/plugin-transform-typeof-symbol@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34" integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-typescript@^7.18.6": - version "7.20.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz#e3581b356b8694f6ff450211fe6774eaff8d25ab" - integrity sha512-O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.20.12" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-typescript" "^7.20.0" - -"@babel/plugin-transform-typescript@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b" - integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.21.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-typescript" "^7.20.0" - -"@babel/plugin-transform-unicode-escapes@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" - integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ== +"@babel/plugin-transform-typescript@^7.18.6", "@babel/plugin-transform-typescript@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d" + integrity sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-typescript" "^7.22.5" -"@babel/plugin-transform-unicode-escapes@^7.22.5": +"@babel/plugin-transform-unicode-escapes@^7.18.10", "@babel/plugin-transform-unicode-escapes@^7.21.5", "@babel/plugin-transform-unicode-escapes@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c" integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg== @@ -2428,18 +1872,10 @@ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81" integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-unicode-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" - integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-regexp-features-plugin" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-unicode-regex@^7.22.5": +"@babel/plugin-transform-unicode-regex@^7.18.6", "@babel/plugin-transform-unicode-regex@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183" integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg== @@ -2536,7 +1972,7 @@ core-js-compat "^3.25.1" semver "^6.3.0" -"@babel/preset-env@^7.16.8": +"@babel/preset-env@^7.16.8", "@babel/preset-env@^7.20.2": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e" integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A== @@ -2622,14 +2058,14 @@ core-js-compat "^3.30.2" semver "^6.3.0" -"@babel/preset-env@^7.20.2", "@babel/preset-env@~7.21.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58" - integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw== +"@babel/preset-env@~7.21.0": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.5.tgz#db2089d99efd2297716f018aeead815ac3decffb" + integrity sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg== dependencies: - "@babel/compat-data" "^7.21.4" - "@babel/helper-compilation-targets" "^7.21.4" - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/compat-data" "^7.21.5" + "@babel/helper-compilation-targets" "^7.21.5" + "@babel/helper-plugin-utils" "^7.21.5" "@babel/helper-validator-option" "^7.21.0" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7" @@ -2654,6 +2090,7 @@ "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-import-assertions" "^7.20.0" + "@babel/plugin-syntax-import-meta" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -2663,22 +2100,22 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.20.7" + "@babel/plugin-transform-arrow-functions" "^7.21.5" "@babel/plugin-transform-async-to-generator" "^7.20.7" "@babel/plugin-transform-block-scoped-functions" "^7.18.6" "@babel/plugin-transform-block-scoping" "^7.21.0" "@babel/plugin-transform-classes" "^7.21.0" - "@babel/plugin-transform-computed-properties" "^7.20.7" + "@babel/plugin-transform-computed-properties" "^7.21.5" "@babel/plugin-transform-destructuring" "^7.21.3" "@babel/plugin-transform-dotall-regex" "^7.18.6" "@babel/plugin-transform-duplicate-keys" "^7.18.9" "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.21.0" + "@babel/plugin-transform-for-of" "^7.21.5" "@babel/plugin-transform-function-name" "^7.18.9" "@babel/plugin-transform-literals" "^7.18.9" "@babel/plugin-transform-member-expression-literals" "^7.18.6" "@babel/plugin-transform-modules-amd" "^7.20.11" - "@babel/plugin-transform-modules-commonjs" "^7.21.2" + "@babel/plugin-transform-modules-commonjs" "^7.21.5" "@babel/plugin-transform-modules-systemjs" "^7.20.11" "@babel/plugin-transform-modules-umd" "^7.18.6" "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5" @@ -2686,17 +2123,17 @@ "@babel/plugin-transform-object-super" "^7.18.6" "@babel/plugin-transform-parameters" "^7.21.3" "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.20.5" + "@babel/plugin-transform-regenerator" "^7.21.5" "@babel/plugin-transform-reserved-words" "^7.18.6" "@babel/plugin-transform-shorthand-properties" "^7.18.6" "@babel/plugin-transform-spread" "^7.20.7" "@babel/plugin-transform-sticky-regex" "^7.18.6" "@babel/plugin-transform-template-literals" "^7.18.9" "@babel/plugin-transform-typeof-symbol" "^7.18.9" - "@babel/plugin-transform-unicode-escapes" "^7.18.10" + "@babel/plugin-transform-unicode-escapes" "^7.21.5" "@babel/plugin-transform-unicode-regex" "^7.18.6" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.21.4" + "@babel/types" "^7.21.5" babel-plugin-polyfill-corejs2 "^0.3.3" babel-plugin-polyfill-corejs3 "^0.6.0" babel-plugin-polyfill-regenerator "^0.4.1" @@ -2704,13 +2141,13 @@ semver "^6.3.0" "@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.18.6": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.21.4.tgz#a5de2a1cafa61f0e0b3af9b30ff0295d38d3608f" - integrity sha512-F24cSq4DIBmhq4OzK3dE63NHagb27OPE3eWR+HLekt4Z3Y5MzIIUGF3LlLgV0gN8vzbDViSY7HnrReNVCJXTeA== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.22.5.tgz#876f24ab6b38bd79703a93f32020ca2162312784" + integrity sha512-ta2qZ+LSiGCrP5pgcGt8xMnnkXQrq8Sa4Ulhy06BOlF5QbLw9q5hIx7bn5MrsvyTGAfh6kTOo07Q+Pfld/8Y5Q== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-option" "^7.21.0" - "@babel/plugin-transform-flow-strip-types" "^7.21.0" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" + "@babel/plugin-transform-flow-strip-types" "^7.22.5" "@babel/preset-modules@^0.1.5": version "0.1.5" @@ -2723,7 +2160,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@7.18.6", "@babel/preset-react@^7.18.6": +"@babel/preset-react@7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d" integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg== @@ -2735,6 +2172,18 @@ "@babel/plugin-transform-react-jsx-development" "^7.18.6" "@babel/plugin-transform-react-pure-annotations" "^7.18.6" +"@babel/preset-react@^7.18.6": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.22.5.tgz#c4d6058fbf80bccad02dd8c313a9aaa67e3c3dd6" + integrity sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" + "@babel/plugin-transform-react-display-name" "^7.22.5" + "@babel/plugin-transform-react-jsx" "^7.22.5" + "@babel/plugin-transform-react-jsx-development" "^7.22.5" + "@babel/plugin-transform-react-pure-annotations" "^7.22.5" + "@babel/preset-typescript@7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399" @@ -2745,20 +2194,20 @@ "@babel/plugin-transform-typescript" "^7.18.6" "@babel/preset-typescript@^7.13.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz#b913ac8e6aa8932e47c21b01b4368d8aa239a529" - integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8" + integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-option" "^7.21.0" - "@babel/plugin-syntax-jsx" "^7.21.4" - "@babel/plugin-transform-modules-commonjs" "^7.21.2" - "@babel/plugin-transform-typescript" "^7.21.3" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.22.5" + "@babel/plugin-transform-modules-commonjs" "^7.22.5" + "@babel/plugin-transform-typescript" "^7.22.5" "@babel/register@^7.13.16": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz#c97bf56c2472e063774f31d344c592ebdcefa132" - integrity sha512-9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.22.5.tgz#e4d8d0f615ea3233a27b5c6ada6750ee59559939" + integrity sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ== dependencies: clone-deep "^4.0.1" find-cache-dir "^2.0.0" @@ -2771,21 +2220,21 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@7.20.13", "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@7.20.13": version "7.20.13" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b" integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA== dependencies: regenerator-runtime "^0.13.11" -"@babel/runtime@^7.18.9", "@babel/runtime@^7.20.1", "@babel/runtime@^7.5.5": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.1", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA== dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.5", "@babel/template@^7.3.3": +"@babel/template@^7.20.7", "@babel/template@^7.22.5", "@babel/template@^7.3.3": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw== @@ -2794,7 +2243,7 @@ "@babel/parser" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/traverse@^7.1.6", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.4", "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3": +"@babel/traverse@^7.1.6", "@babel/traverse@^7.21.5", "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== @@ -2811,22 +2260,22 @@ globals "^11.1.0" "@babel/traverse@~7.21.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" - integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133" + integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== dependencies: "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.4" - "@babel/helper-environment-visitor" "^7.18.9" + "@babel/generator" "^7.21.5" + "@babel/helper-environment-visitor" "^7.21.5" "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.4" - "@babel/types" "^7.21.4" + "@babel/parser" "^7.21.5" + "@babel/types" "^7.21.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== @@ -2836,11 +2285,11 @@ to-fast-properties "^2.0.0" "@babel/types@~7.21.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" - integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" + integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== dependencies: - "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-string-parser" "^7.21.5" "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" @@ -2864,13 +2313,13 @@ resolved "https://registry.yarnpkg.com/@braze/web-sdk-core/-/web-sdk-core-3.5.1.tgz#a239f2bd430266accba9e9a3393b03ac22f9abdf" integrity sha512-pHnlKaHz8UCrlGkAF6aoBptFUTzeZeL7OpHqKGx7uZC67ZfVvk1L11SJkxOw2CLxUQm9YxigSQXqtpUiImXDng== -"@changesets/apply-release-plan@^6.1.3": - version "6.1.3" - resolved "https://registry.yarnpkg.com/@changesets/apply-release-plan/-/apply-release-plan-6.1.3.tgz#3bcc0bd57ba00d50d20df7d0141f1a9b2134eaf7" - integrity sha512-ECDNeoc3nfeAe1jqJb5aFQX7CqzQhD2klXRez2JDb/aVpGUbX673HgKrnrgJRuQR/9f2TtLoYIzrGB9qwD77mg== +"@changesets/apply-release-plan@^6.1.4": + version "6.1.4" + resolved "https://registry.yarnpkg.com/@changesets/apply-release-plan/-/apply-release-plan-6.1.4.tgz#09293256090737ecd2f683842d6d732034a5e3c8" + integrity sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew== dependencies: "@babel/runtime" "^7.20.1" - "@changesets/config" "^2.3.0" + "@changesets/config" "^2.3.1" "@changesets/get-version-range-type" "^0.3.2" "@changesets/git" "^2.0.0" "@changesets/types" "^5.2.1" @@ -2881,19 +2330,19 @@ outdent "^0.5.0" prettier "^2.7.1" resolve-from "^5.0.0" - semver "^5.4.1" + semver "^7.5.3" -"@changesets/assemble-release-plan@^5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@changesets/assemble-release-plan/-/assemble-release-plan-5.2.3.tgz#5ce6191c6e193d40b566a7b0e01690cfb106f4db" - integrity sha512-g7EVZCmnWz3zMBAdrcKhid4hkHT+Ft1n0mLussFMcB1dE2zCuwcvGoy9ec3yOgPGF4hoMtgHaMIk3T3TBdvU9g== +"@changesets/assemble-release-plan@^5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@changesets/assemble-release-plan/-/assemble-release-plan-5.2.4.tgz#d42fd63f4297a2e630e8e0a49f07d4ff5f5ef7bc" + integrity sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg== dependencies: "@babel/runtime" "^7.20.1" "@changesets/errors" "^0.1.4" - "@changesets/get-dependents-graph" "^1.3.5" + "@changesets/get-dependents-graph" "^1.3.6" "@changesets/types" "^5.2.1" "@manypkg/get-packages" "^1.1.3" - semver "^5.4.1" + semver "^7.5.3" "@changesets/changelog-git@^0.1.14": version "0.1.14" @@ -2903,18 +2352,18 @@ "@changesets/types" "^5.2.1" "@changesets/cli@^2.26.1": - version "2.26.1" - resolved "https://registry.yarnpkg.com/@changesets/cli/-/cli-2.26.1.tgz#2d10858d7d32314a524e383111c96d831eb0402f" - integrity sha512-XnTa+b51vt057fyAudvDKGB0Sh72xutQZNAdXkCqPBKO2zvs2yYZx5hFZj1u9cbtpwM6Sxtcr02/FQJfZOzemQ== + version "2.26.2" + resolved "https://registry.yarnpkg.com/@changesets/cli/-/cli-2.26.2.tgz#8914dd6ef3ea425a7d5935f6c35a8b7ccde54e45" + integrity sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig== dependencies: "@babel/runtime" "^7.20.1" - "@changesets/apply-release-plan" "^6.1.3" - "@changesets/assemble-release-plan" "^5.2.3" + "@changesets/apply-release-plan" "^6.1.4" + "@changesets/assemble-release-plan" "^5.2.4" "@changesets/changelog-git" "^0.1.14" - "@changesets/config" "^2.3.0" + "@changesets/config" "^2.3.1" "@changesets/errors" "^0.1.4" - "@changesets/get-dependents-graph" "^1.3.5" - "@changesets/get-release-plan" "^3.0.16" + "@changesets/get-dependents-graph" "^1.3.6" + "@changesets/get-release-plan" "^3.0.17" "@changesets/git" "^2.0.0" "@changesets/logger" "^0.0.5" "@changesets/pre" "^1.0.14" @@ -2923,7 +2372,7 @@ "@changesets/write" "^0.2.3" "@manypkg/get-packages" "^1.1.3" "@types/is-ci" "^3.0.0" - "@types/semver" "^6.0.0" + "@types/semver" "^7.5.0" ansi-colors "^4.1.3" chalk "^2.1.0" enquirer "^2.3.0" @@ -2936,18 +2385,18 @@ p-limit "^2.2.0" preferred-pm "^3.0.0" resolve-from "^5.0.0" - semver "^5.4.1" + semver "^7.5.3" spawndamnit "^2.0.0" term-size "^2.1.0" tty-table "^4.1.5" -"@changesets/config@^2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@changesets/config/-/config-2.3.0.tgz#bff074d6492fa772cee139f9a04efa4cd56445bb" - integrity sha512-EgP/px6mhCx8QeaMAvWtRrgyxW08k/Bx2tpGT+M84jEdX37v3VKfh4Cz1BkwrYKuMV2HZKeHOh8sHvja/HcXfQ== +"@changesets/config@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@changesets/config/-/config-2.3.1.tgz#3d4a1dc866c3623375180b30f69fccdf0e3efebf" + integrity sha512-PQXaJl82CfIXddUOppj4zWu+987GCw2M+eQcOepxN5s+kvnsZOwjEJO3DH9eVy+OP6Pg/KFEWdsECFEYTtbg6w== dependencies: "@changesets/errors" "^0.1.4" - "@changesets/get-dependents-graph" "^1.3.5" + "@changesets/get-dependents-graph" "^1.3.6" "@changesets/logger" "^0.0.5" "@changesets/types" "^5.2.1" "@manypkg/get-packages" "^1.1.3" @@ -2961,25 +2410,25 @@ dependencies: extendable-error "^0.1.5" -"@changesets/get-dependents-graph@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@changesets/get-dependents-graph/-/get-dependents-graph-1.3.5.tgz#f94c6672d2f9a87aa35512eea74550585ba41c21" - integrity sha512-w1eEvnWlbVDIY8mWXqWuYE9oKhvIaBhzqzo4ITSJY9hgoqQ3RoBqwlcAzg11qHxv/b8ReDWnMrpjpKrW6m1ZTA== +"@changesets/get-dependents-graph@^1.3.6": + version "1.3.6" + resolved "https://registry.yarnpkg.com/@changesets/get-dependents-graph/-/get-dependents-graph-1.3.6.tgz#5e19e7b0bfbc7dc38e1986eaaa7016ff377ed888" + integrity sha512-Q/sLgBANmkvUm09GgRsAvEtY3p1/5OCzgBE5vX3vgb5CvW0j7CEljocx5oPXeQSNph6FXulJlXV3Re/v3K3P3Q== dependencies: "@changesets/types" "^5.2.1" "@manypkg/get-packages" "^1.1.3" chalk "^2.1.0" fs-extra "^7.0.1" - semver "^5.4.1" + semver "^7.5.3" -"@changesets/get-release-plan@^3.0.16": - version "3.0.16" - resolved "https://registry.yarnpkg.com/@changesets/get-release-plan/-/get-release-plan-3.0.16.tgz#5d9cfc4ffda02c496ef0fde407210de8e3a0fb19" - integrity sha512-OpP9QILpBp1bY2YNIKFzwigKh7Qe9KizRsZomzLe6pK8IUo8onkAAVUD8+JRKSr8R7d4+JRuQrfSSNlEwKyPYg== +"@changesets/get-release-plan@^3.0.17": + version "3.0.17" + resolved "https://registry.yarnpkg.com/@changesets/get-release-plan/-/get-release-plan-3.0.17.tgz#8aabced2795ffeae864696b60ee3031f8a94c5f3" + integrity sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw== dependencies: "@babel/runtime" "^7.20.1" - "@changesets/assemble-release-plan" "^5.2.3" - "@changesets/config" "^2.3.0" + "@changesets/assemble-release-plan" "^5.2.4" + "@changesets/config" "^2.3.1" "@changesets/pre" "^1.0.14" "@changesets/read" "^0.5.9" "@changesets/types" "^5.2.1" @@ -3085,9 +2534,9 @@ "@jridgewell/trace-mapping" "0.3.9" "@csstools/selector-specificity@^2.0.2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz#c9c61d9fe5ca5ac664e1153bb0aa0eba1c6d6308" - integrity sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw== + version "2.2.0" + resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016" + integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw== "@cypress/request@^2.88.10": version "2.88.11" @@ -3135,329 +2584,340 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@^0.5.3", "@discoveryjs/json-ext@^0.5.7": +"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@^0.5.3": version "0.5.7" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@emotion/babel-plugin@11.10.5", "@emotion/babel-plugin@^11.10.5": - version "11.10.5" - resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c" - integrity sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA== +"@emotion/babel-plugin@11.11.0", "@emotion/babel-plugin@^11.11.0": + version "11.11.0" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c" + integrity sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ== dependencies: "@babel/helper-module-imports" "^7.16.7" - "@babel/plugin-syntax-jsx" "^7.17.12" "@babel/runtime" "^7.18.3" - "@emotion/hash" "^0.9.0" - "@emotion/memoize" "^0.8.0" - "@emotion/serialize" "^1.1.1" + "@emotion/hash" "^0.9.1" + "@emotion/memoize" "^0.8.1" + "@emotion/serialize" "^1.1.2" babel-plugin-macros "^3.1.0" convert-source-map "^1.5.0" escape-string-regexp "^4.0.0" find-root "^1.1.0" source-map "^0.5.7" - stylis "4.1.3" + stylis "4.2.0" -"@emotion/cache@11.10.5", "@emotion/cache@^11.10.5": - version "11.10.5" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.5.tgz#c142da9351f94e47527ed458f7bbbbe40bb13c12" - integrity sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA== +"@emotion/cache@11.11.0", "@emotion/cache@^11.11.0": + version "11.11.0" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.11.0.tgz#809b33ee6b1cb1a625fef7a45bc568ccd9b8f3ff" + integrity sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ== dependencies: - "@emotion/memoize" "^0.8.0" - "@emotion/sheet" "^1.2.1" - "@emotion/utils" "^1.2.0" - "@emotion/weak-memoize" "^0.3.0" - stylis "4.1.3" + "@emotion/memoize" "^0.8.1" + "@emotion/sheet" "^1.2.2" + "@emotion/utils" "^1.2.1" + "@emotion/weak-memoize" "^0.3.1" + stylis "4.2.0" -"@emotion/hash@^0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7" - integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ== +"@emotion/hash@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.1.tgz#4ffb0055f7ef676ebc3a5a91fb621393294e2f43" + integrity sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ== -"@emotion/memoize@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f" - integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA== +"@emotion/memoize@^0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17" + integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA== -"@emotion/react@11.10.5": - version "11.10.5" - resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.5.tgz#95fff612a5de1efa9c0d535384d3cfa115fe175d" - integrity sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A== +"@emotion/react@11.11.1": + version "11.11.1" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.1.tgz#b2c36afac95b184f73b08da8c214fdf861fa4157" + integrity sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA== dependencies: "@babel/runtime" "^7.18.3" - "@emotion/babel-plugin" "^11.10.5" - "@emotion/cache" "^11.10.5" - "@emotion/serialize" "^1.1.1" - "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0" - "@emotion/utils" "^1.2.0" - "@emotion/weak-memoize" "^0.3.0" + "@emotion/babel-plugin" "^11.11.0" + "@emotion/cache" "^11.11.0" + "@emotion/serialize" "^1.1.2" + "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1" + "@emotion/utils" "^1.2.1" + "@emotion/weak-memoize" "^0.3.1" hoist-non-react-statics "^3.3.1" -"@emotion/serialize@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.1.tgz#0595701b1902feded8a96d293b26be3f5c1a5cf0" - integrity sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA== +"@emotion/serialize@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.2.tgz#017a6e4c9b8a803bd576ff3d52a0ea6fa5a62b51" + integrity sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA== dependencies: - "@emotion/hash" "^0.9.0" - "@emotion/memoize" "^0.8.0" - "@emotion/unitless" "^0.8.0" - "@emotion/utils" "^1.2.0" + "@emotion/hash" "^0.9.1" + "@emotion/memoize" "^0.8.1" + "@emotion/unitless" "^0.8.1" + "@emotion/utils" "^1.2.1" csstype "^3.0.2" -"@emotion/server@11.10.0": - version "11.10.0" - resolved "https://registry.yarnpkg.com/@emotion/server/-/server-11.10.0.tgz#3edc075b672c75426f682d56aadc6404fb1f6648" - integrity sha512-MTvJ21JPo9aS02GdjFW4nhdwOi2tNNpMmAM/YED0pkxzjDNi5WbiTwXqaCnvLc2Lr8NFtjhT0az1vTJyLIHYcw== +"@emotion/server@11.11.0": + version "11.11.0" + resolved "https://registry.yarnpkg.com/@emotion/server/-/server-11.11.0.tgz#35537176a2a5ed8aed7801f254828e636ec3bd6e" + integrity sha512-6q89fj2z8VBTx9w93kJ5n51hsmtYuFPtZgnc1L8VzRx9ti4EU6EyvF6Nn1H1x3vcCQCF7u2dB2lY4AYJwUW4PA== dependencies: - "@emotion/utils" "^1.2.0" + "@emotion/utils" "^1.2.1" html-tokenize "^2.0.0" multipipe "^1.0.2" through "^2.3.8" -"@emotion/sheet@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.1.tgz#0767e0305230e894897cadb6c8df2c51e61a6c2c" - integrity sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA== +"@emotion/sheet@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.2.tgz#d58e788ee27267a14342303e1abb3d508b6d0fec" + integrity sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA== -"@emotion/unitless@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db" - integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw== +"@emotion/unitless@^0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.1.tgz#182b5a4704ef8ad91bde93f7a860a88fd92c79a3" + integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ== -"@emotion/use-insertion-effect-with-fallbacks@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df" - integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A== +"@emotion/use-insertion-effect-with-fallbacks@^1.0.0", "@emotion/use-insertion-effect-with-fallbacks@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963" + integrity sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw== -"@emotion/utils@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561" - integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw== +"@emotion/utils@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.1.tgz#bbab58465738d31ae4cb3dbb6fc00a5991f755e4" + integrity sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg== -"@emotion/weak-memoize@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb" - integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg== +"@emotion/weak-memoize@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6" + integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww== "@esbuild/android-arm64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23" integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg== -"@esbuild/android-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.15.tgz#893ad71f3920ccb919e1757c387756a9bca2ef42" - integrity sha512-0kOB6Y7Br3KDVgHeg8PRcvfLkq+AccreK///B4Z6fNZGr/tNHX0z2VywCc7PTeWp+bPvjA5WMvNXltHw5QjAIA== +"@esbuild/android-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd" + integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA== "@esbuild/android-arm@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2" integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw== -"@esbuild/android-arm@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.15.tgz#143e0d4e4c08c786ea410b9a7739779a9a1315d8" - integrity sha512-sRSOVlLawAktpMvDyJIkdLI/c/kdRTOqo8t6ImVxg8yT7LQDUYV5Rp2FKeEosLr6ZCja9UjYAzyRSxGteSJPYg== +"@esbuild/android-arm@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d" + integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A== "@esbuild/android-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e" integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ== -"@esbuild/android-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.15.tgz#d2d12a7676b2589864281b2274355200916540bc" - integrity sha512-MzDqnNajQZ63YkaUWVl9uuhcWyEyh69HGpMIrf+acR4otMkfLJ4sUCxqwbCyPGicE9dVlrysI3lMcDBjGiBBcQ== +"@esbuild/android-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1" + integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww== "@esbuild/darwin-arm64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220" integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w== -"@esbuild/darwin-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.15.tgz#2e88e79f1d327a2a7d9d06397e5232eb0a473d61" - integrity sha512-7siLjBc88Z4+6qkMDxPT2juf2e8SJxmsbNVKFY2ifWCDT72v5YJz9arlvBw5oB4W/e61H1+HDB/jnu8nNg0rLA== +"@esbuild/darwin-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276" + integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg== "@esbuild/darwin-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4" integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg== -"@esbuild/darwin-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.15.tgz#9384e64c0be91388c57be6d3a5eaf1c32a99c91d" - integrity sha512-NbImBas2rXwYI52BOKTW342Tm3LTeVlaOQ4QPZ7XuWNKiO226DisFk/RyPk3T0CKZkKMuU69yOvlapJEmax7cg== +"@esbuild/darwin-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb" + integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw== "@esbuild/freebsd-arm64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27" integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw== -"@esbuild/freebsd-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.15.tgz#2ad5a35bc52ebd9ca6b845dbc59ba39647a93c1a" - integrity sha512-Xk9xMDjBVG6CfgoqlVczHAdJnCs0/oeFOspFap5NkYAmRCT2qTn1vJWA2f419iMtsHSLm+O8B6SLV/HlY5cYKg== +"@esbuild/freebsd-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2" + integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ== "@esbuild/freebsd-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72" integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug== -"@esbuild/freebsd-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.15.tgz#b513a48446f96c75fda5bef470e64d342d4379cd" - integrity sha512-3TWAnnEOdclvb2pnfsTWtdwthPfOz7qAfcwDLcfZyGJwm1SRZIMOeB5FODVhnM93mFSPsHB9b/PmxNNbSnd0RQ== +"@esbuild/freebsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4" + integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ== "@esbuild/linux-arm64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca" integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g== -"@esbuild/linux-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.15.tgz#9697b168175bfd41fa9cc4a72dd0d48f24715f31" - integrity sha512-T0MVnYw9KT6b83/SqyznTs/3Jg2ODWrZfNccg11XjDehIved2oQfrX/wVuev9N936BpMRaTR9I1J0tdGgUgpJA== +"@esbuild/linux-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb" + integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg== "@esbuild/linux-arm@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196" integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ== -"@esbuild/linux-arm@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.15.tgz#5b22062c54f48cd92fab9ffd993732a52db70cd3" - integrity sha512-MLTgiXWEMAMr8nmS9Gigx43zPRmEfeBfGCwxFQEMgJ5MC53QKajaclW6XDPjwJvhbebv+RzK05TQjvH3/aM4Xw== +"@esbuild/linux-arm@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a" + integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA== "@esbuild/linux-ia32@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54" integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg== -"@esbuild/linux-ia32@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.15.tgz#eb28a13f9b60b5189fcc9e98e1024f6b657ba54c" - integrity sha512-wp02sHs015T23zsQtU4Cj57WiteiuASHlD7rXjKUyAGYzlOKDAjqK6bk5dMi2QEl/KVOcsjwL36kD+WW7vJt8Q== +"@esbuild/linux-ia32@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a" + integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ== "@esbuild/linux-loong64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8" integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ== -"@esbuild/linux-loong64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.15.tgz#32454bdfe144cf74b77895a8ad21a15cb81cfbe5" - integrity sha512-k7FsUJjGGSxwnBmMh8d7IbObWu+sF/qbwc+xKZkBe/lTAF16RqxRCnNHA7QTd3oS2AfGBAnHlXL67shV5bBThQ== +"@esbuild/linux-loong64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72" + integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ== "@esbuild/linux-mips64el@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726" integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw== -"@esbuild/linux-mips64el@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.15.tgz#af12bde0d775a318fad90eb13a0455229a63987c" - integrity sha512-ZLWk6czDdog+Q9kE/Jfbilu24vEe/iW/Sj2d8EVsmiixQ1rM2RKH2n36qfxK4e8tVcaXkvuV3mU5zTZviE+NVQ== +"@esbuild/linux-mips64el@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289" + integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A== "@esbuild/linux-ppc64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8" integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g== -"@esbuild/linux-ppc64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.15.tgz#34c5ed145b2dfc493d3e652abac8bd3baa3865a5" - integrity sha512-mY6dPkIRAiFHRsGfOYZC8Q9rmr8vOBZBme0/j15zFUKM99d4ILY4WpOC7i/LqoY+RE7KaMaSfvY8CqjJtuO4xg== +"@esbuild/linux-ppc64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7" + integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg== "@esbuild/linux-riscv64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9" integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw== -"@esbuild/linux-riscv64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.15.tgz#87bd515e837f2eb004b45f9e6a94dc5b93f22b92" - integrity sha512-EcyUtxffdDtWjjwIH8sKzpDRLcVtqANooMNASO59y+xmqqRYBBM7xVLQhqF7nksIbm2yHABptoioS9RAbVMWVA== +"@esbuild/linux-riscv64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09" + integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA== "@esbuild/linux-s390x@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87" integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w== -"@esbuild/linux-s390x@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.15.tgz#20bf7947197f199ddac2ec412029a414ceae3aa3" - integrity sha512-BuS6Jx/ezxFuHxgsfvz7T4g4YlVrmCmg7UAwboeyNNg0OzNzKsIZXpr3Sb/ZREDXWgt48RO4UQRDBxJN3B9Rbg== +"@esbuild/linux-s390x@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829" + integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q== "@esbuild/linux-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f" integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw== -"@esbuild/linux-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.15.tgz#31b93f9c94c195e852c20cd3d1914a68aa619124" - integrity sha512-JsdS0EgEViwuKsw5tiJQo9UdQdUJYuB+Mf6HxtJSPN35vez1hlrNb1KajvKWF5Sa35j17+rW1ECEO9iNrIXbNg== +"@esbuild/linux-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4" + integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw== "@esbuild/netbsd-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775" integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA== -"@esbuild/netbsd-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.15.tgz#8da299b3ac6875836ca8cdc1925826498069ac65" - integrity sha512-R6fKjtUysYGym6uXf6qyNephVUQAGtf3n2RCsOST/neIwPqRWcnc3ogcielOd6pT+J0RDR1RGcy0ZY7d3uHVLA== +"@esbuild/netbsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462" + integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q== "@esbuild/openbsd-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35" integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg== -"@esbuild/openbsd-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.15.tgz#04a1ec3d4e919714dba68dcf09eeb1228ad0d20c" - integrity sha512-mVD4PGc26b8PI60QaPUltYKeSX0wxuy0AltC+WCTFwvKCq2+OgLP4+fFd+hZXzO2xW1HPKcytZBdjqL6FQFa7w== +"@esbuild/openbsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691" + integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g== "@esbuild/sunos-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c" integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw== -"@esbuild/sunos-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.15.tgz#6694ebe4e16e5cd7dab6505ff7c28f9c1c695ce5" - integrity sha512-U6tYPovOkw3459t2CBwGcFYfFRjivcJJc1WC8Q3funIwX8x4fP+R6xL/QuTPNGOblbq/EUDxj9GU+dWKX0oWlQ== +"@esbuild/sunos-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273" + integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg== "@esbuild/win32-arm64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a" integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw== -"@esbuild/win32-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.15.tgz#1f95b2564193c8d1fee8f8129a0609728171d500" - integrity sha512-W+Z5F++wgKAleDABemiyXVnzXgvRFs+GVKThSI+mGgleLWluv0D7Diz4oQpgdpNzh4i2nNDzQtWbjJiqutRp6Q== +"@esbuild/win32-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f" + integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag== "@esbuild/win32-ia32@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09" integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig== -"@esbuild/win32-ia32@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.15.tgz#c362b88b3df21916ed7bcf75c6d09c6bf3ae354a" - integrity sha512-Muz/+uGgheShKGqSVS1KsHtCyEzcdOn/W/Xbh6H91Etm+wiIfwZaBn1W58MeGtfI8WA961YMHFYTthBdQs4t+w== +"@esbuild/win32-ia32@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03" + integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw== "@esbuild/win32-x64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091" integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q== -"@esbuild/win32-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.15.tgz#c2e737f3a201ebff8e2ac2b8e9f246b397ad19b8" - integrity sha512-DjDa9ywLUUmjhV2Y9wUTIF+1XsmuFGvZoCmOWkli1XcNAh5t25cc7fgsCx4Zi/Uurep3TTLyDiKATgGEg61pkA== +"@esbuild/win32-x64@0.17.19": + version "0.17.19" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061" + integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA== + +"@eslint-community/eslint-utils@^4.2.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + dependencies: + eslint-visitor-keys "^3.3.0" + +"@eslint-community/regexpp@^4.4.0": + version "4.5.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884" + integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ== "@eslint/eslintrc@^1.4.1": version "1.4.1" @@ -3474,25 +2934,40 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@eslint/eslintrc@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331" + integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.5.2" + globals "^13.19.0" + ignore "^5.2.0" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.1.2" + strip-json-comments "^3.1.1" + +"@eslint/js@8.43.0": + version "8.43.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0" + integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg== + "@fal-works/esbuild-plugin-global-externals@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz#c05ed35ad82df8e6ac616c68b92c2282bd083ba4" integrity sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ== -"@guardian/ab-core@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@guardian/ab-core/-/ab-core-4.0.0.tgz#50c1fc076437e594b367f6e8d9469a3d9b97a78e" - integrity sha512-l6Ot/anisLKyoLZOp8koW7Ia5JFOtmZkB0sfgdWajv5+N0w0UScUVoImEdPlFstM1anSd3FvV8D3UgYkRzAang== - -"@guardian/ab-core@^5.0.0": +"@guardian/ab-core@5.0.0", "@guardian/ab-core@^5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@guardian/ab-core/-/ab-core-5.0.0.tgz#cce32ff4cdfb6b24c013723bf352dcd61135d34d" integrity sha512-Td5gtK2sARl+fXj1Qe6RuFqf/zxuZjW1q2Jck09zXPIfMgU+sJoTi549zbNeC1cldCBhPWy/qPQ0r+8klfF7jg== -"@guardian/atoms-rendering@31.0.0": - version "31.0.0" - resolved "https://registry.yarnpkg.com/@guardian/atoms-rendering/-/atoms-rendering-31.0.0.tgz#31e0f727b574e3385ef6688767a507ea18c3a9b6" - integrity sha512-dWhTI/djARS0qhtvMmpa91Rcyz/O82KHFWNCXsQLOg74Na96p+ibl6mDUOW5M/xBiL5TbF5Ac/ZbWdspWsiwWA== +"@guardian/atoms-rendering@32.1.0": + version "32.1.0" + resolved "https://registry.yarnpkg.com/@guardian/atoms-rendering/-/atoms-rendering-32.1.0.tgz#82ea0664e7249453d97443e843b7ad1bad2634ad" + integrity sha512-hC6cS+U1OWZYwcgkbcd16pSPGgyasRvHMGOQq16vp9EmNlOpGD/NERnvkEV3+RrApWrBlS9a9tbYzow3F/WE6Q== dependencies: is-mobile "3.1.1" @@ -3530,10 +3005,10 @@ read-pkg-up "7.0.1" yargs "^17.6.2" -"@guardian/commercial@10.1.0": - version "10.1.0" - resolved "https://registry.yarnpkg.com/@guardian/commercial/-/commercial-10.1.0.tgz#1a1fd256bbf6fc6bd9d1271816a119f27ecf879e" - integrity sha512-natr/bIH+8Jc0dqC3NrjP7OCgE9hm4XSJQ7ThyJqgcPxHmh6uWGOQTiOAgM30yYvQuETQo+rCRf4NNklHtiFcA== +"@guardian/commercial@10.1.1": + version "10.1.1" + resolved "https://registry.yarnpkg.com/@guardian/commercial/-/commercial-10.1.1.tgz#0a6820613fd7ecfa91adf438daf33ee397b16d8d" + integrity sha512-vq8jPbAnZcc7mhQz0TDIAq0/Qy18SXQ0K5XOc7ZQxUaSDfIrOm9zNLaLggFDqJ4PppSz+AcgN53+2CimU+S55w== dependencies: "@changesets/cli" "^2.26.1" "@guardian/ab-core" "^5.0.0" @@ -3546,7 +3021,7 @@ fastdom "^1.0.11" lodash-es "^4.17.21" ophan-tracker-js "^1.4.0" - prebid.js guardian/prebid.js#2e3b96d + prebid.js guardian/prebid.js process "^0.11.10" raven-js "^3.27.2" tslib "^2.5.3" @@ -3558,78 +3033,63 @@ resolved "https://registry.yarnpkg.com/@guardian/consent-management-platform/-/consent-management-platform-13.5.0.tgz#61a97c823f6b18f62a6517a3374f6e7bdfca121d" integrity sha512-9iz04lyonWAbUeZ7B+fNp0KbgAervsWDO3A4CE/3e+d876AQj0I3TwU7W4jpWxI4tthcA6UVk7Y6faaS8l+lFw== -"@guardian/core-web-vitals@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@guardian/core-web-vitals/-/core-web-vitals-4.0.0.tgz#e09bf40ee896ae92c0223fa57399b1b0b5f9bdb2" - integrity sha512-LDXnDhsNApO9v8LrXPK1AHMZYoa457tYjqjHnXNSxleHHoyeS3ehB4qohdDMpWv76F8DLUVMXBTZ/8EbQce3sA== - -"@guardian/core-web-vitals@^5.0.0": +"@guardian/core-web-vitals@5.0.0", "@guardian/core-web-vitals@^5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@guardian/core-web-vitals/-/core-web-vitals-5.0.0.tgz#ab74da6001427f3414a84d15f57bac1a888a140a" integrity sha512-Mq3v8Y/YJGs7p/8NWmYHFKdVqRThjDJSfpoo1zSb6DgpQ1Ko8RjvOa2Q9P9ABWfKJCaDp0kcGK3dk0AjDSi/Qw== -"@guardian/discussion-rendering@14.0.0": - version "14.0.0" - resolved "https://registry.yarnpkg.com/@guardian/discussion-rendering/-/discussion-rendering-14.0.0.tgz#2cbfe802a2f81bb8d2ee083a8374fb6bd00dbdcf" - integrity sha512-O4XlA1ueL2TX1pWD9jNAPIA8bdaGfZeLzDPVJAgpGIjwlXxQj/xSk/dpJ8jC/V/XBztucM7XtughigvN5fY59w== +"@guardian/discussion-rendering@15.0.0": + version "15.0.0" + resolved "https://registry.yarnpkg.com/@guardian/discussion-rendering/-/discussion-rendering-15.0.0.tgz#6d47205b7b759032e7ad5133ea59155635a2bd79" + integrity sha512-00Yajhwq5u3jy8/5zq3Sx/v66U3SeFkq66qVe4H6ZVQpYlzW0IRCB9reClyoDyx5XPZdAdpBSd9dTv3huNC3Ng== -"@guardian/eslint-config-typescript@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@guardian/eslint-config-typescript/-/eslint-config-typescript-5.0.0.tgz#5bfcc8d9655f5f978474347f7cdefdb08706a805" - integrity sha512-0v77rdbJ1mb4kEnRn4s0z//aFs1qwnUumqNV60ayBGWs18gmZscmIxgKm4rmoYIr/IJugTkLFZozEWlbwIhAOw== +"@guardian/eslint-config-typescript@6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@guardian/eslint-config-typescript/-/eslint-config-typescript-6.0.1.tgz#47eac1ec8b61a9f14d041610b2c78cfedef403a4" + integrity sha512-ZFJDRF0FMNjqBqyslde35mpBakQc1xNys1ph/PLUhAlZT5NPqS+vMWw+WaHephWvtrQO6wMsZi/axR4/GhNC9Q== dependencies: - "@guardian/eslint-config" "3.0.0" - "@typescript-eslint/eslint-plugin" "5.46.1" - "@typescript-eslint/parser" "5.46.1" - eslint-import-resolver-typescript "3.5.2" - eslint-plugin-import "2.26.0" + "@guardian/eslint-config" "4.1.0" + "@typescript-eslint/eslint-plugin" "5.59.9" + "@typescript-eslint/parser" "5.59.9" + eslint-import-resolver-typescript "3.5.5" + eslint-plugin-import "2.27.5" -"@guardian/eslint-config@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@guardian/eslint-config/-/eslint-config-3.0.0.tgz#5cdf7f422d7291ea044607ff8a8474f931f4f127" - integrity sha512-LF15QHOBvX26Vhdz+5RsktRCOdCecWNpVaBqqw41j6SrOk3no/u7radyQrkXM6Zlgkl9j4O/9uMh0sGJtgAA+A== +"@guardian/eslint-config@4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@guardian/eslint-config/-/eslint-config-4.1.0.tgz#5f838a6d03d3146c79d0f3e40695ff9c826f2f72" + integrity sha512-nJxPbdQ02dgXHrQxY95hhDqZ+NGbK1r2w52g6B+tbug7FAqi1bbETW9gZLPArM5kBl/1R1125jEBNB+GC61bAQ== dependencies: - eslint-config-prettier "8.5.0" + eslint-config-prettier "8.8.0" eslint-plugin-eslint-comments "3.2.0" - eslint-plugin-import "2.26.0" + eslint-plugin-import "2.27.5" -"@guardian/eslint-plugin-source-react-components@14.0.0": - version "14.0.0" - resolved "https://registry.yarnpkg.com/@guardian/eslint-plugin-source-react-components/-/eslint-plugin-source-react-components-14.0.0.tgz#d13cddbf9b4ec85743cd047f97d3cc75e70eb930" - integrity sha512-dhhPD1ml7OqiyBukURGtTMS8sHFWMHOjJfJcrHjhRXw7B6UAl9xEkQv6H94+INDdsWz3GMv2XwQlyMMihuEmSQ== +"@guardian/eslint-plugin-source-react-components@17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@guardian/eslint-plugin-source-react-components/-/eslint-plugin-source-react-components-17.0.0.tgz#56a2545c62ff3864fd51ea91b1ca5220fcad681d" + integrity sha512-E2F47A4Cin8vVt2oRBnc9yUxyXqZHLs2DKvjpfHX35O5uQ3ubdGa4QrOIgUayy+Ar27lEtLv7HhJkdH+Y3FLeA== dependencies: "@typescript-eslint/eslint-plugin" "5.46.1" - "@typescript-eslint/parser" "5.46.1" + "@typescript-eslint/parser" "5.59.9" "@guardian/identity-auth@0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@guardian/identity-auth/-/identity-auth-0.1.2.tgz#ce357767c0228d7792158770e94173ad6723b7be" integrity sha512-vInqAay30pyRS3EHoQwFYW1Fr6t3lD2zvpnnbPOzqqg/5eAoxNFloVkdmnffdB6XguSd9JUmVYS1XLtpZZswTQ== -"@guardian/libs@14.1.0": - version "14.1.0" - resolved "https://registry.yarnpkg.com/@guardian/libs/-/libs-14.1.0.tgz#feac9cc5636639e45ab2a6e2fd4a3f29f7af9a70" - integrity sha512-V/6ROWh0s8A6tJVFBMP9h9sb4L2SN98zSp84aLhBac4Ir1XJjG3kljAyB4uV1+341Amd+44QJGhB/D7roVsSfQ== +"@guardian/libs@15.1.0", "@guardian/libs@^15.0.0": + version "15.1.0" + resolved "https://registry.yarnpkg.com/@guardian/libs/-/libs-15.1.0.tgz#a919fd08cb298cba0b7363d128f0da38e598ec98" + integrity sha512-1USL3EuhwhyUANjWeVBZx2mRVCydE0QAzUIOV2ukojp92ZAWyt2RqxV8luTEPgUxbDAtma9MuO6lgTshTk5nYw== "@guardian/libs@^10.0.0": version "10.1.1" resolved "https://registry.yarnpkg.com/@guardian/libs/-/libs-10.1.1.tgz#7048c365a68dda068f707d46c78979f430221963" integrity sha512-OdWReBHRWhdbErVmS15hihVzlkdU8DkKrjDsUIN0P8QZiF4twuzcU3qsPwto2UfibAwPkWqKkNwH1k8b6xNclA== -"@guardian/libs@^15.0.0": - version "15.1.0" - resolved "https://registry.yarnpkg.com/@guardian/libs/-/libs-15.1.0.tgz#a919fd08cb298cba0b7363d128f0da38e598ec98" - integrity sha512-1USL3EuhwhyUANjWeVBZx2mRVCydE0QAzUIOV2ukojp92ZAWyt2RqxV8luTEPgUxbDAtma9MuO6lgTshTk5nYw== - -"@guardian/prettier@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@guardian/prettier/-/prettier-3.0.0.tgz#7a313372b7e6919298999dc801a23f5b69f008f0" - integrity sha512-o1g0tYVniUNFxWoCp3DbK33gTebDmvYORN6oeV+lXvqa9YyhslswzGkmV0mSRErXmla0H+pIlnfF0Ve7fb0Mfw== - -"@guardian/prettier@^2.0.0": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@guardian/prettier/-/prettier-2.1.5.tgz#715fff5b110006408f92a3fe2a803ad0e4c79e06" - integrity sha512-4fehERf5HHS9Nkaw+4u5EZ1OrFEHL4lYhLUWkpwEx4VmHI+RgcMezfDfosb3TD8cPFCKakrpdQEJUwNP283SJw== +"@guardian/prettier@4.0.0", "@guardian/prettier@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@guardian/prettier/-/prettier-4.0.0.tgz#1ad1d7d079194937bfd0107789dde7b0fb84fa11" + integrity sha512-JvvnDnI04NcmpuD2mF5ZXTWI7tand1pj1s33fh4JxHNAV00QXwTWZBI2/QWS3ck7KjpYjpRaz8CDUcMz35hReg== "@guardian/shimport@1.0.2": version "1.0.2" @@ -3638,39 +3098,32 @@ dependencies: tslib "^2.0.0" -"@guardian/source-foundations@10.0.1": - version "10.0.1" - resolved "https://registry.yarnpkg.com/@guardian/source-foundations/-/source-foundations-10.0.1.tgz#fe9d5d1bee9dd1b0d3d579d21a99f6051aa47649" - integrity sha512-q7FHvQO2JN463SHRjLNKeywW8KUfjoao6oiULoyHssI07saol2rE0W8BdPCeD9337FNztiOxMGOmXWSBUIdYJw== - dependencies: - mini-svg-data-uri "1.4.4" - -"@guardian/source-foundations@^12.0.0": +"@guardian/source-foundations@12.0.0", "@guardian/source-foundations@^12.0.0": version "12.0.0" resolved "https://registry.yarnpkg.com/@guardian/source-foundations/-/source-foundations-12.0.0.tgz#3f75d5dd26dae0d3fe13fd93aabe1e837cf0ddbb" integrity sha512-sq+htAsvPlaZBjfSZ8ISZZdAnFQwuZ7xeCrI/C369HA+MDl3pQ1dFWz3YmqCP/vkXS8Wr3qVlxXNqWGwKKrYrw== dependencies: mini-svg-data-uri "1.4.4" -"@guardian/source-react-components-development-kitchen@11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@guardian/source-react-components-development-kitchen/-/source-react-components-development-kitchen-11.0.0.tgz#6fe57d6f5fda751e311df70ed0e7735cd8342316" - integrity sha512-KNC+IZfufZI0L6sBEvsdzYa1HLkuV3stZ8Ty+wSHKjN22nxON2Yzvrkf9gw4LKNCAWuaLVkSPzritfs87zdWuQ== +"@guardian/source-react-components-development-kitchen@13.0.1": + version "13.0.1" + resolved "https://registry.yarnpkg.com/@guardian/source-react-components-development-kitchen/-/source-react-components-development-kitchen-13.0.1.tgz#c8072f9369cbb06272d9f9174c2f6637d258c885" + integrity sha512-aQ39E0qQ6KCDgJqTnxG7d36HWfmHcLVImbDq/4TnbFGV100CUtPe19VBzMKgGP7/CYYnC22QKDa6cNgVcZysjQ== -"@guardian/source-react-components@13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@guardian/source-react-components/-/source-react-components-13.0.0.tgz#11157b8b7615b371a6f6ab96d2efdfe5a20c6ea2" - integrity sha512-mhWHSUSCr8PjkajzsQs0yMFch1h9BONTlgV96T+niPkrtqn+xWvkQJeaBsN/X/QLSqweBLCjo6yvPdGxgJgaWw== +"@guardian/source-react-components@15.0.1": + version "15.0.1" + resolved "https://registry.yarnpkg.com/@guardian/source-react-components/-/source-react-components-15.0.1.tgz#c584f507181fc88761bf702b7a6068b28a54003b" + integrity sha512-a4IBy0wmvb7UvnsT41I7VRdxeGaYz7l3LTV8PUE7swmS5UC/6SCQjOmsmXE54UiasdolUGMEt6C5p5oTxTDrdg== "@guardian/support-dotcom-components@1.0.7", "@guardian/support-dotcom-components@^1.0.7": version "1.0.7" resolved "https://registry.yarnpkg.com/@guardian/support-dotcom-components/-/support-dotcom-components-1.0.7.tgz#b3aadcca5f6ee35b2c541121144be237d72bd3e0" integrity sha512-MhaO+rC+ujXMcaMd1TL5D0t0eEuHWGh3OrFkM8BhPwhMkjela/dCOPeVPvGJDJ0a37o4PeMszqy+dSuiR4BvvQ== -"@guardian/tsconfig@0.1.6": - version "0.1.6" - resolved "https://registry.yarnpkg.com/@guardian/tsconfig/-/tsconfig-0.1.6.tgz#2cc3ecce09e84b6bcaea8a1150c7b590e908d2a9" - integrity sha512-5GMp2tBMaIxxInmWGDZI9O3v76hbW2CV/3hnWhDDvtXZvgOFs3K41plkAoc+GpPNLZTrtJlAaHHhbZcDDGI9/w== +"@guardian/tsconfig@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@guardian/tsconfig/-/tsconfig-0.2.0.tgz#b1dac8831d2ff7ac557229f350d4b2f8c9fc60b5" + integrity sha512-RauppalK+cQZDRK6IssVmDSnU/VyqMNuVOxPxhmI03kVRxEdwcmBuRqexHwDbnClVUxW/N9hYLbFNuAb9V/p+A== "@hapi/hoek@^9.0.0": version "9.3.0" @@ -3684,10 +3137,10 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== +"@humanwhocodes/config-array@^0.11.10", "@humanwhocodes/config-array@^0.11.8": + version "0.11.10" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2" + integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" @@ -3782,13 +3235,6 @@ "@types/node" "*" jest-mock "^29.5.0" -"@jest/expect-utils@^29.4.2": - version "29.4.2" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.2.tgz#cd0065dfdd8e8a182aa350cc121db97b5eed7b3f" - integrity sha512-Dd3ilDJpBnqa0GiPN7QrudVs0cczMMHtehSo2CSTjm3zdHx0RcpmhFNVEltuEFeqfLIyWKFI224FsMSQ/nsJQA== - dependencies: - jest-get-type "^29.4.2" - "@jest/expect-utils@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036" @@ -3856,13 +3302,6 @@ strip-ansi "^6.0.0" v8-to-istanbul "^9.0.1" -"@jest/schemas@^29.4.2": - version "29.4.2" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.2.tgz#cf7cfe97c5649f518452b176c47ed07486270fc1" - integrity sha512-ZrGzGfh31NtdVH8tn0mgJw4khQuNHiKqdzJAFbCaERbyCP9tHlxWuL/mnMu8P7e/+k4puWjI1NOzi/sFsjce/g== - dependencies: - "@sinclair/typebox" "^0.25.16" - "@jest/schemas@^29.4.3": version "29.4.3" resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" @@ -3931,18 +3370,6 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -"@jest/types@^29.4.2": - version "29.4.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.2.tgz#8f724a414b1246b2bfd56ca5225d9e1f39540d82" - integrity sha512-CKlngyGP0fwlgC1BRUtPZSiWLBhyS9dKwKmyGxk8Z6M82LBEGB2aLQSg+U1MyLsU+M7UjnlLllBM2BLWKVm/Uw== - dependencies: - "@jest/schemas" "^29.4.2" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - "@jest/types@^29.5.0": version "29.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" @@ -3955,46 +3382,48 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/resolve-uri@3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": +"@jridgewell/resolve-uri@^3.0.3": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + +"@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== +"@jridgewell/source-map@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda" + integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg== dependencies: "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" @@ -4003,10 +3432,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.18" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" + integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== dependencies: "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" @@ -4079,9 +3508,9 @@ glob-to-regexp "^0.3.0" "@ndelangen/get-tarball@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@ndelangen/get-tarball/-/get-tarball-3.0.7.tgz#87c7aef2df4ff4fbdbab6ac9ed32cee142c4b1a3" - integrity sha512-NqGfTZIZpRFef1GoVaShSSRwDC3vde3ThtTeqFdcYd6ipKqnfEVhjK2hUeHjCQUcptyZr2TONqcloFXM+5QBrQ== + version "3.0.9" + resolved "https://registry.yarnpkg.com/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz#727ff4454e65f34707e742a59e5e6b1f525d8964" + integrity sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA== dependencies: gunzip-maybe "^1.4.2" pump "^3.0.0" @@ -4154,9 +3583,9 @@ integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ== "@octokit/core@^4.0.5": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.1.tgz#fee6341ad0ce60c29cc455e056cd5b500410a588" - integrity sha512-tEDxFx8E38zF3gT7sSMDrT1tGumDgsw5yPG6BBh/X+5ClIQfMH/Yqocxz1PnHx6CHyF6pxmovUTOfZAUvQ0Lvw== + version "4.2.4" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.4.tgz#d8769ec2b43ff37cc3ea89ec4681a20ba58ef907" + integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ== dependencies: "@octokit/auth-token" "^3.0.0" "@octokit/graphql" "^5.0.0" @@ -4167,9 +3596,9 @@ universal-user-agent "^6.0.0" "@octokit/endpoint@^7.0.0": - version "7.0.5" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.5.tgz#2bb2a911c12c50f10014183f5d596ce30ac67dd1" - integrity sha512-LG4o4HMY1Xoaec87IqQ41TQ+glvIeTKqfjkCEmt5AIwDZJwQeVZFIEYXrYY6yLwK+pAScb9Gj4q+Nz2qSw1roA== + version "7.0.6" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.6.tgz#791f65d3937555141fb6c08f91d618a7d645f1e2" + integrity sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg== dependencies: "@octokit/types" "^9.0.0" is-plain-object "^5.0.0" @@ -4184,10 +3613,10 @@ "@octokit/types" "^9.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.2.0.tgz#f1800b5f9652b8e1b85cc6dfb1e0dc888810bdb5" - integrity sha512-MazrFNx4plbLsGl+LFesMo96eIXkFgEtaKbnNpdh4aQ0VM10aoylFsTYP1AEjkeoRNZiiPe3T6Gl2Hr8dJWdlQ== +"@octokit/openapi-types@^18.0.0": + version "18.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.0.0.tgz#f43d765b3c7533fd6fb88f3f25df079c24fccf69" + integrity sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw== "@octokit/request-error@^3.0.0": version "3.0.3" @@ -4199,9 +3628,9 @@ once "^1.4.0" "@octokit/request@^6.0.0": - version "6.2.5" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.5.tgz#7beef1065042998f7455973ef3f818e7b84d6ec2" - integrity sha512-z83E8UIlPNaJUsXpjD8E0V5o/5f+vJJNbNcBwVZsX3/vC650U41cOkTLjq4PKk9BYonQGOnx7N17gvLyNjgGcQ== + version "6.2.8" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.8.tgz#aaf480b32ab2b210e9dadd8271d187c93171d8eb" + integrity sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw== dependencies: "@octokit/endpoint" "^7.0.0" "@octokit/request-error" "^3.0.0" @@ -4211,11 +3640,11 @@ universal-user-agent "^6.0.0" "@octokit/types@^9.0.0": - version "9.2.3" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.2.3.tgz#d0af522f394d74b585cefb7efd6197ca44d183a9" - integrity sha512-MMeLdHyFIALioycq+LFcA71v0S2xpQUX2cw6pPbHQjaibcHYwLnmK/kMZaWuGfGfjBJZ3wRUq+dOaWsvrPJVvA== + version "9.3.2" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5" + integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA== dependencies: - "@octokit/openapi-types" "^17.2.0" + "@octokit/openapi-types" "^18.0.0" "@opencensus/core@0.0.9": version "0.0.9" @@ -4379,21 +3808,21 @@ integrity sha512-ZC9OqaTVPjnndcSfbQaU0NcquC0J4KZFx7hEDznukXNsLIK4WSLiEK1QS+tGxAkIKZilHmVc/vv9q3lMvlQDaQ== "@percy/sdk-utils@^1.3.1": - version "1.18.0" - resolved "https://registry.yarnpkg.com/@percy/sdk-utils/-/sdk-utils-1.18.0.tgz#3c0c7faaf2668eb679546554418e96a53c81db4a" - integrity sha512-c+Avhw5rNa+xyAFIpuQ4jxksw7/5DWyPGaNncTMY4Dbc1fVxT6nu6V1Mytc9A1zxl0+ficQHTZeSugM4aL81hQ== + version "1.26.1" + resolved "https://registry.yarnpkg.com/@percy/sdk-utils/-/sdk-utils-1.26.1.tgz#09c792bdb45e0be144fe15405c684f5f0e1e1966" + integrity sha512-DrPaC/EfBjw6rMvMa3bkZhiQxJIIXqWhEwo0jnzlsR74FNeKRiCQwpx9/H1exN4LFYos7pwLd3e4ga8nPK/hqA== "@pkgr/utils@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03" - integrity sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.1.tgz#adf291d0357834c410ce80af16e711b56c7b1cd3" + integrity sha512-JOqwkgFEyi+OROIyq7l4Jy28h/WwhDnG/cPkXG2Z1iFbubB6jsHW1NDvmyOzTBxHr3yg68YGirmh1JUgMqa+9w== dependencies: cross-spawn "^7.0.3" + fast-glob "^3.2.12" is-glob "^4.0.3" - open "^8.4.0" + open "^9.1.0" picocolors "^1.0.0" - tiny-glob "^0.2.9" - tslib "^2.4.0" + tslib "^2.5.0" "@pm2/agent@~2.0.0": version "2.0.1" @@ -4468,6 +3897,16 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== +"@sentry-internal/tracing@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.57.0.tgz#cb761931b635f8f24c84be0eecfacb8516b20551" + integrity sha512-tpViyDd8AhQGYYhI94xi2aaDopXOPfL2Apwrtb3qirWkomIQ2K86W1mPmkce+B0cFOnW2Dxv/ZTFKz6ghjK75A== + dependencies: + "@sentry/core" "7.57.0" + "@sentry/types" "7.57.0" + "@sentry/utils" "7.57.0" + tslib "^2.4.1 || ^1.9.3" + "@sentry/browser@7.37.2": version "7.37.2" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.37.2.tgz#355dd28ad12677d63e0b12c5209d12b3f98ac3a4" @@ -4488,6 +3927,15 @@ "@sentry/utils" "7.37.2" tslib "^1.9.3" +"@sentry/core@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.57.0.tgz#65093d739c04f320a54395a21be955fcbe326acb" + integrity sha512-l014NudPH0vQlzybtXajPxYFfs9w762NoarjObC3gu76D1jzBBFzhdRelkGpDbSLNTIsKhEDDRpgAjBWJ9icfw== + dependencies: + "@sentry/types" "7.57.0" + "@sentry/utils" "7.57.0" + tslib "^2.4.1 || ^1.9.3" + "@sentry/integrations@7.37.2": version "7.37.2" resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.37.2.tgz#2ea6b228c8df24f201802eea1306035b0fc7e571" @@ -4499,17 +3947,18 @@ tslib "^1.9.3" "@sentry/node@^7.36.0": - version "7.37.2" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.37.2.tgz#7ce3b09c93112afca0eef0fd65ec87ea1cd1b7d2" - integrity sha512-aeJQ4oU3vF9zks8S/fvoLPVVhofmTjyMhZZIpSQWtfFqWxrXQsrqNlNUZZdXoqAUPNjA4QAzzOoXHhpUsa3Nxw== - dependencies: - "@sentry/core" "7.37.2" - "@sentry/types" "7.37.2" - "@sentry/utils" "7.37.2" + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.57.0.tgz#31052f5988ed4496d7f3ff925240cf9b02d09941" + integrity sha512-63mjyUVM6sfJFVQ5TGVRVGUsoEfESl5ABzIW1W0s9gUiQPaG8SOdaQJglb2VNrkMYxnRHgD8Q9LUh/qcmUyPGw== + dependencies: + "@sentry-internal/tracing" "7.57.0" + "@sentry/core" "7.57.0" + "@sentry/types" "7.57.0" + "@sentry/utils" "7.57.0" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" - tslib "^1.9.3" + tslib "^2.4.1 || ^1.9.3" "@sentry/replay@7.37.2": version "7.37.2" @@ -4525,6 +3974,11 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.37.2.tgz#99fd76230d7c1d3c6901ed4c0bea35be7d6fe26d" integrity sha512-SxKQOCX94ZaQM4C2ysNjHdJsjYapu/NYZCz1cnPyCdDvYfhwiVge1uq6ZHiQ/ARfxAAOmc3R4Mh3VvEz7WUOdw== +"@sentry/types@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.57.0.tgz#4fdb80cbd49ba034dd8d9be0c0005a016d5db3ce" + integrity sha512-D7ifoUfxuVCUyktIr5Gc+jXUbtcUMmfHdTtTbf1XCZHua5mJceK9wtl3YCg3eq/HK2Ppd52BKnTzEcS5ZKQM+w== + "@sentry/utils@7.37.2": version "7.37.2" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.37.2.tgz#14dea644454e3df247fb113fc834f509c1f0e48c" @@ -4533,6 +3987,14 @@ "@sentry/types" "7.37.2" tslib "^1.9.3" +"@sentry/utils@7.57.0": + version "7.57.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.57.0.tgz#8253c6fcf35138b4c424234b8da1596e11b98ad8" + integrity sha512-YXrkMCiNklqkXctn4mKYkrzNCf/dfVcRUQrkXjeBC+PHXbcpPyaJgInNvztR7Skl8lE3JPGPN4v5XhLxK1bUUg== + dependencies: + "@sentry/types" "7.57.0" + tslib "^2.4.1 || ^1.9.3" + "@sideway/address@^4.1.3": version "4.1.4" resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0" @@ -4551,9 +4013,9 @@ integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== "@sinclair/typebox@^0.25.16": - version "0.25.21" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272" - integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g== + version "0.25.24" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" + integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== "@sindresorhus/is@^4.0.0": version "4.6.0" @@ -4568,73 +4030,27 @@ type-detect "4.0.8" "@sinonjs/fake-timers@^10.0.2": - version "10.2.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.2.0.tgz#b3e322a34c5f26e3184e7f6115695f299c1b1194" - integrity sha512-OPwQlEdg40HAj5KNF8WW6q2KG4Z+cBCZb3m4ninfTZKaBmbIJodviQsDBoYMPHkOyJJMHnOJo5j2+LKDOhOACg== + version "10.3.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66" + integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA== dependencies: "@sinonjs/commons" "^3.0.0" "@smithy/protocol-http@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-1.0.1.tgz#62fd73d73db285fd8e9a2287ed2904ac66e0d43f" - integrity sha512-9OrEn0WfOVtBNYJUjUAn9AOiJ4lzERCJJ/JeZs8E6yajTGxBaFRxUnNBHiNqoDJVg076hY36UmEnPx7xXrvUSg== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-1.1.0.tgz#caf22e01cb825d7490a4915e03d6fa64954ff535" + integrity sha512-H5y/kZOqfJSqRkwtcAoVbqONmhdXwSgYNJ1Glk5Ry8qlhVVy5qUzD9EklaCH8/XLnoCsLO/F/Giee8MIvaBRkg== dependencies: - "@smithy/types" "^1.0.0" + "@smithy/types" "^1.1.0" tslib "^2.5.0" -"@smithy/types@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-1.0.0.tgz#87ab6131fe5e19cbd4d383ffb94d2b806d027d38" - integrity sha512-kc1m5wPBHQCTixwuaOh9vnak/iJm21DrSf9UK6yDE5S3mQQ4u11pqAUiKWnlrZnYkeLfAI9UEHj9OaMT1v5Umg== +"@smithy/types@^1.0.0", "@smithy/types@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-1.1.0.tgz#f30a23202c97634cca5c1ac955a9bf149c955226" + integrity sha512-KzmvisMmuwD2jZXuC9e65JrgsZM97y5NpDU7g347oB+Q+xQLU6hQZ5zFNNbEfwwOJHoOvEVTna+dk1h/lW7alw== dependencies: tslib "^2.5.0" -"@snyk/dep-graph@^2.3.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-2.5.0.tgz#32708d29501738a6d32529770818ae5aa75d14ef" - integrity sha512-wFKHAhsD1VBfESiuN2nHHeulEYAAod1Z4E/2t+ztsiJ5DCeD0pSXtJizdp2PhMZ0cFFce8ln3NO8xBhl+C4H+Q== - dependencies: - event-loop-spinner "^2.1.0" - lodash.clone "^4.5.0" - lodash.constant "^3.0.0" - lodash.filter "^4.6.0" - lodash.foreach "^4.5.0" - lodash.isempty "^4.4.0" - lodash.isequal "^4.5.0" - lodash.isfunction "^3.0.9" - lodash.isundefined "^3.0.1" - lodash.map "^4.6.0" - lodash.reduce "^4.6.0" - lodash.size "^4.2.0" - lodash.transform "^4.6.0" - lodash.union "^4.6.0" - lodash.values "^4.3.0" - object-hash "^3.0.0" - packageurl-js "^1.0.0" - semver "^7.0.0" - tslib "^2" - -"@snyk/graphlib@2.1.9-patch.3": - version "2.1.9-patch.3" - resolved "https://registry.yarnpkg.com/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz#b8edb2335af1978db7f3cb1f28f5d562960acf23" - integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== - dependencies: - lodash.clone "^4.5.0" - lodash.constant "^3.0.0" - lodash.filter "^4.6.0" - lodash.foreach "^4.5.0" - lodash.has "^4.5.2" - lodash.isempty "^4.4.0" - lodash.isfunction "^3.0.9" - lodash.isundefined "^3.0.1" - lodash.keys "^4.2.0" - lodash.map "^4.6.0" - lodash.reduce "^4.6.0" - lodash.size "^4.2.0" - lodash.transform "^4.6.0" - lodash.union "^4.6.0" - lodash.values "^4.3.0" - "@storybook/addon-actions@7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.0.2.tgz#720d764ec77e395a92be50f0cd0a1baa75a58518" @@ -4927,6 +4343,18 @@ qs "^6.10.0" telejson "^7.0.3" +"@storybook/channel-postmessage@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-7.0.24.tgz#789bd121cf64e306737ec0f3b096ea0ac6f47bf5" + integrity sha512-QLtLXjEeTEwBN/7pB888mBaykmRU9Jy2BitvZuLJWyHHygTYm3vYZOaGR37DT+q/6Ob5GaZ0tURZmCSNDe8IIA== + dependencies: + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/core-events" "7.0.24" + "@storybook/global" "^5.0.0" + qs "^6.10.0" + telejson "^7.0.3" + "@storybook/channel-websocket@7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-7.0.2.tgz#f9dacfe4eebc840bdd5d491749a0be0ad35ff12c" @@ -4942,6 +4370,11 @@ resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.2.tgz#2eb124d14fff50d4686888dca88f130c5aee358d" integrity sha512-qkI8mFy9c8mxN2f01etayKhCaauL6RAsxRzbX1/pKj6UqhHWqqUbtHwymrv4hG5qDYjV1e9pd7ae5eNF8Kui0g== +"@storybook/channels@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.24.tgz#fcfe7a1a5599265506f07fe81d03b0585303fc15" + integrity sha512-NZVLwMhtzy6cZrNRjshFvMAD9mQTmJDNwhohodSkM/YFCDVFhmxQk9tgizVGh9MwY3CYGJ1SI96RUejGosb49Q== + "@storybook/cli@7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.0.2.tgz#f96c42e7660b8f8f14595483036b3b5ef6724dc9" @@ -4994,7 +4427,7 @@ "@storybook/client-logger" "7.0.2" "@storybook/preview-api" "7.0.2" -"@storybook/client-logger@7.0.10", "@storybook/client-logger@^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": +"@storybook/client-logger@7.0.10": version "7.0.10" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.10.tgz#941f6cf54638a422732b40ec31b2414872cdf4a8" integrity sha512-hb8tO+w28ErzjEw69ERMtZT81Xyg835FQjH6Y42ejoGcBA9Z0W6RZmx4RgkcIUOlYXkU6lSnNVne9gXodV4/Hw== @@ -5008,6 +4441,13 @@ dependencies: "@storybook/global" "^5.0.0" +"@storybook/client-logger@7.0.24", "@storybook/client-logger@^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.24.tgz#7be57ce1f90e65c6e9da7a88ed9ca7c5ce3c6536" + integrity sha512-4zRTb+QQ1hWaRqad/UufZNRfi2d/cf5a40My72Ct97VwjhJFE6aQ3K+hl1Xt6hh8dncDL2JK3cgziw6ElqjT0w== + dependencies: + "@storybook/global" "^5.0.0" + "@storybook/codemod@7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.0.2.tgz#a1735d8b6448569b36d7787b08ba0c5dcc6ad952" @@ -5079,6 +4519,11 @@ resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.2.tgz#5038aa5ea1e035099ed1dc48aa233e232ff882e7" integrity sha512-1DCHCwHRL3+rlvnVVc/BCfReP31XaT2WYgcLeGTmkX1E43Po1MkgcM7PnJPSaa9POvSqZ+6YLZv5Bs1SXbufow== +"@storybook/core-events@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.24.tgz#3fa4b2b3af64a86525b4cf07f49a7410125ef810" + integrity sha512-xkf/rihCkhqMeh5EA8lVp90/mzbb2gcg6I3oeFWw2hognVcTnPXg6llhWdU4Spqd0cals7GEFmQugIILCmH8GA== + "@storybook/core-server@7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.0.2.tgz#23f14803c8d141f6af2cffdb240831c6f69ee7e3" @@ -5162,9 +4607,9 @@ ts-dedent "^2.0.0" "@storybook/csf@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.0.tgz#62315bf9704f3aa4e0d4d909b9033833774ddfbe" - integrity sha512-uk+jMXCZ8t38jSTHk2o5btI+aV2Ksbvl6DoOv3r6VaCM1KZqeuMwtwywIQdflkA8/6q/dKT8z8L+g8hC4GC3VQ== + version "0.1.1" + resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.1.tgz#abccc8c3e49aed0a6a7e87beb0d1c262b1921c06" + integrity sha512-4hE3AlNVxR60Wc5KSC68ASYzUobjPqtSKyhV6G+ge0FIXU55N5nTY7dXGRZHQGDBPq+XqchMkIdlkHPRs8nTHg== dependencies: type-fest "^2.19.0" @@ -5192,15 +4637,15 @@ integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ== "@storybook/instrumenter@^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@storybook/instrumenter/-/instrumenter-7.0.2.tgz#a94031d3678d7a7829e6ebe0d07e2b986f96593a" - integrity sha512-zr9/fuaYtGVUtcL8XgjA4Iq5jtzdcqQyOSH4XLXtz6JtSad3lkRagbJo2Vzbw7dO/4vzjfTMxEzvWjUuPxLOhA== + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/instrumenter/-/instrumenter-7.0.24.tgz#fbc81250f25b0d5f3da3a3aa9dad48cdc82642f9" + integrity sha512-XQ4Whq0rqW9eFMTtRpLxcl6bCf+KO3UZYcm+H63EDn9TstDyopmqv1fDg2tmJOpqLo143F8qLVC89rI7M/lO6w== dependencies: - "@storybook/channels" "7.0.2" - "@storybook/client-logger" "7.0.2" - "@storybook/core-events" "7.0.2" + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/core-events" "7.0.24" "@storybook/global" "^5.0.0" - "@storybook/preview-api" "7.0.2" + "@storybook/preview-api" "7.0.24" "@storybook/manager-api@7.0.2": version "7.0.2" @@ -5229,9 +4674,9 @@ integrity sha512-jsFsFKG0rPNYfuRm/WSXGMBy8vnALyFWU330ObDmfU0JID3SeLlVqAOZT1GlwI6vupYpWodsN6qPZKRmC8onRw== "@storybook/mdx2-csf@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@storybook/mdx2-csf/-/mdx2-csf-1.0.0.tgz#ce4b2e44c9082bf382db835eef611b0097b7d771" - integrity sha512-dBAnEL4HfxxJmv7LdEYUoZlQbWj9APZNIbOaq0tgF8XkxiIbzqvgB0jhL/9UOrysSDbQWBiCRTu2wOVxedGfmw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/@storybook/mdx2-csf/-/mdx2-csf-1.1.0.tgz#97f6df04d0bf616991cc1005a073ac004a7281e5" + integrity sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw== "@storybook/node-logger@7.0.2": version "7.0.2" @@ -5291,6 +4736,27 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/preview-api@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.24.tgz#93634c060aa43bb10fb233f28ae83b7d74b98aad" + integrity sha512-psycU07tuB5nyJvfAJiDN/9e8cjOdJ+5lrCSYC3vPzH86LxADDIN0/8xFb1CaQWcXZsADEFJGpHKWbRhjym5ew== + dependencies: + "@storybook/channel-postmessage" "7.0.24" + "@storybook/channels" "7.0.24" + "@storybook/client-logger" "7.0.24" + "@storybook/core-events" "7.0.24" + "@storybook/csf" "^0.1.0" + "@storybook/global" "^5.0.0" + "@storybook/types" "7.0.24" + "@types/qs" "^6.9.5" + dequal "^2.0.2" + lodash "^4.17.21" + memoizerific "^1.11.3" + qs "^6.10.0" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/preview@7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.0.2.tgz#f48f2a4383f5f8e0a9695c920b88c765b29549ae" @@ -5424,6 +4890,16 @@ "@types/express" "^4.7.0" file-system-cache "^2.0.0" +"@storybook/types@7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.24.tgz#22b2f6658f9a091ff584e1a0643ee1ea9a54ed39" + integrity sha512-SZh/XBHP1TT5bmEk0W52nT0v6fUnYwmZVls3da5noutdgOAiwL7TANtl41XrNjG+UDr8x0OE3PVVJi+LhwUaNA== + dependencies: + "@storybook/channels" "7.0.24" + "@types/babel__core" "^7.0.0" + "@types/express" "^4.7.0" + file-system-cache "2.3.0" + "@swc/cli@0.1.62": version "0.1.62" resolved "https://registry.yarnpkg.com/@swc/cli/-/cli-0.1.62.tgz#6442fde2fcf75175a300fb4fcf30f8c60bbb3ab3" @@ -5517,7 +4993,7 @@ dependencies: defer-to-connect "^2.0.0" -"@testing-library/dom@9.2.0", "@testing-library/dom@^9.0.0": +"@testing-library/dom@9.2.0": version "9.2.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.2.0.tgz#0e1f45e956f2a16f471559c06edd8827c4832f04" integrity sha512-xTEnpUKiV/bMyEsE5bT4oYA0x0Z/colMtxzUY8bKyPXBNLn/e0V4ZjBZkEhms0xE4pv9QsPfSRu9AWS4y5wGvA== @@ -5532,17 +5008,31 @@ pretty-format "^27.0.2" "@testing-library/dom@^8.3.0": - version "8.20.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.20.0.tgz#914aa862cef0f5e89b98cc48e3445c4c921010f6" - integrity sha512-d9ULIT+a4EXLX3UU8FBjauG9NnsZHkHztXoIcTsOKoOw030fyjheN9svkTULjJxtYag9DZz5Jz5qkWZDPxTFwA== + version "8.20.1" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.20.1.tgz#2e52a32e46fc88369eef7eef634ac2a192decd9f" + integrity sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" "@types/aria-query" "^5.0.1" - aria-query "^5.0.0" + aria-query "5.1.3" + chalk "^4.1.0" + dom-accessibility-api "^0.5.9" + lz-string "^1.5.0" + pretty-format "^27.0.2" + +"@testing-library/dom@^9.0.0": + version "9.3.1" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.1.tgz#8094f560e9389fb973fe957af41bf766937a9ee9" + integrity sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/runtime" "^7.12.5" + "@types/aria-query" "^5.0.1" + aria-query "5.1.3" chalk "^4.1.0" dom-accessibility-api "^0.5.9" - lz-string "^1.4.4" + lz-string "^1.5.0" pretty-format "^27.0.2" "@testing-library/jest-dom@5.16.5": @@ -5632,9 +5122,9 @@ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== "@tsconfig/node16@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" - integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== "@types/amphtml-validator@1.0.1": version "1.0.1" @@ -5648,18 +5138,7 @@ resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc" integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q== -"@types/babel__core@^7.0.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" - integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== - dependencies: - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__core@^7.1.14": +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": version "7.20.1" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b" integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw== @@ -5686,11 +5165,11 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.18.3" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" - integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== + version "7.20.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf" + integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg== dependencies: - "@babel/types" "^7.3.0" + "@babel/types" "^7.20.7" "@types/body-parser@*", "@types/body-parser@1.19.2": version "1.19.2" @@ -5740,9 +5219,9 @@ "@types/express" "*" "@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== + version "1.5.0" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#9fd20b3974bdc2bcd4ac6567e2e0f6885cb2cf41" + integrity sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig== dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" @@ -5760,16 +5239,16 @@ integrity sha512-BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA== "@types/debug@^4.0.0": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" - integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + version "4.1.8" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" + integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ== dependencies: "@types/ms" "*" "@types/detect-port@^1.3.0": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/detect-port/-/detect-port-1.3.2.tgz#8c06a975e472803b931ee73740aeebd0a2eb27ae" - integrity sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g== + version "1.3.3" + resolved "https://registry.yarnpkg.com/@types/detect-port/-/detect-port-1.3.3.tgz#124c5d4c283f48a21f80826bcf39433b3e64aa81" + integrity sha512-bV/jQlAJ/nPY3XqSatkGpu+nGzou+uSwrH1cROhn+jBFg47yaNH+blW4C7p9KhopC7QxCv/6M86s37k8dMk0Yg== "@types/doctrine@^0.0.3": version "0.0.3" @@ -5788,11 +5267,6 @@ resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.2.tgz#75d277b030bc11b3be38c807e10071f45ebc78d9" integrity sha512-ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g== -"@types/emscripten@^1.38.0": - version "1.39.6" - resolved "https://registry.yarnpkg.com/@types/emscripten/-/emscripten-1.39.6.tgz#698b90fe60d44acf93c31064218fbea93fbfd85a" - integrity sha512-H90aoynNhhkQP6DRweEjJp5vfUVdIj7tdPLsu7pq89vODD/lcugKfZOsfgwpvM6XUewEp2N5dCg1Uf3Qe55Dcg== - "@types/escodegen@^0.0.6": version "0.0.6" resolved "https://registry.yarnpkg.com/@types/escodegen/-/escodegen-0.0.6.tgz#5230a9ce796e042cda6f086dbf19f22ea330659c" @@ -5807,24 +5281,34 @@ "@types/estree" "*" "@types/eslint@*", "@types/eslint@^8.4.2": - version "8.21.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.21.1.tgz#110b441a210d53ab47795124dbc3e9bb993d1e7c" - integrity sha512-rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ== + version "8.40.2" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.2.tgz#2833bc112d809677864a4b0e7d1de4f04d7dac2d" + integrity sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== +"@types/estree@*", "@types/estree@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== "@types/estree@^0.0.51": version "0.0.51" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== -"@types/express-serve-static-core@*", "@types/express-serve-static-core@4.17.33", "@types/express-serve-static-core@^4.17.33": +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": + version "4.17.35" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" + integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express-serve-static-core@4.17.33": version "4.17.33" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== @@ -5860,10 +5344,10 @@ resolved "https://registry.yarnpkg.com/@types/gapi/-/gapi-0.0.44.tgz#f097f7a0f59d63a59098a08a62a560ca168426fb" integrity sha512-hsgJMfZ/pMwI15UlAYHMNwj8DRoigo1odhbPwEXdp19ZQwQAXbcRrpzaDsfc+9XM6RtGpvl4Ja7uW8A+KPCa7w== -"@types/glob@*": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.1.tgz#6e3041640148b7764adf21ce5c7138ad454725b0" - integrity sha512-8bVUjXZvJacUFkJXHdyZ9iH1Eaj5V7I8c4NdH5sQJsdXkqT4CA5Dhb4yb4VE/3asyx4L9ayZr1NIhTsWHczmMw== +"@types/glob@*", "@types/glob@^8.0.0": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" + integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== dependencies: "@types/minimatch" "^5.1.2" "@types/node" "*" @@ -5876,14 +5360,6 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/glob@^8.0.0": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" - integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== - dependencies: - "@types/minimatch" "^5.1.2" - "@types/node" "*" - "@types/google.analytics@0.0.42": version "0.0.42" resolved "https://registry.yarnpkg.com/@types/google.analytics/-/google.analytics-0.0.42.tgz#efe6ef9251a22ec8208dbb09f221a48a1863d720" @@ -5923,10 +5399,15 @@ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== +"@types/http-errors@*": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65" + integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ== + "@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== + version "1.17.11" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.11.tgz#0ca21949a5588d55ac2b659b69035c84bd5da293" + integrity sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA== dependencies: "@types/node" "*" @@ -5957,9 +5438,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@*": - version "29.4.0" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.4.0.tgz#a8444ad1704493e84dbf07bb05990b275b3b9206" - integrity sha512-VaywcGQ9tPorCX/Jkkni7RWGFfI11whqzs8dvxF41P17Z+z872thvEvlIbznjPJ02kl1HMX3LmLOonsj2n7HeQ== + version "29.5.2" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b" + integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg== dependencies: expect "^29.0.0" pretty-format "^29.0.0" @@ -5972,7 +5453,16 @@ jest-matcher-utils "^27.0.0" pretty-format "^27.0.0" -"@types/jsdom@20.0.1", "@types/jsdom@^20.0.0": +"@types/jsdom@21.1.1": + version "21.1.1" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.1.tgz#e59e26352071267b507bf04d51841a1d7d3e8617" + integrity sha512-cZFuoVLtzKP3gmq9eNosUL1R50U+USkbLtUQ1bYVgl/lKp0FZM7Cq4aIHAL8oIvQ17uSHi7jXPtfDOdjPwBE7A== + dependencies: + "@types/node" "*" + "@types/tough-cookie" "*" + parse5 "^7.0.0" + +"@types/jsdom@^20.0.0": version "20.0.1" resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808" integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ== @@ -5982,9 +5472,9 @@ parse5 "^7.0.0" "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + version "7.0.12" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" + integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== "@types/json5@^0.0.29": version "0.0.29" @@ -6012,22 +5502,27 @@ dependencies: "@types/lodash" "*" -"@types/lodash@*", "@types/lodash@4.14.191", "@types/lodash@^4.14.136", "@types/lodash@^4.14.167": +"@types/lodash@*", "@types/lodash@^4.14.136", "@types/lodash@^4.14.167": + version "4.14.195" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.195.tgz#bafc975b252eb6cea78882ce8a7b6bf22a6de632" + integrity sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg== + +"@types/lodash@4.14.191": version "4.14.191" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa" integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ== "@types/mdast@^3.0.0": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" - integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== + version "3.0.11" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.11.tgz#dc130f7e7d9306124286f6d6cee40cf4d14a3dc0" + integrity sha512-Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw== dependencies: "@types/unist" "*" "@types/mdx@^2.0.0": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.4.tgz#d1cad61ccc803b3c248c3d9990a2a6880bef537f" - integrity sha512-qCYrNdpKwN6YO6FVnx+ulfqifKlE3lQGsNhvDaW9Oxzyob/cRLBJWow8GHBBD4NxQ7BVvtsATgLsX0vZAWmtrg== + version "2.0.5" + resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.5.tgz#9a85a8f70c7c4d9e695a21d5ae5c93645eda64b1" + integrity sha512-76CqzuD6Q7LC+AtbPqrvD9AqsN0k8bsYo2bM2J8pmNldP1aIPAbzUQ7QbobyXL4eLr1wK5x8FZFe8eF/ubRuBg== "@types/mime-types@^2.1.0": version "2.1.1" @@ -6039,6 +5534,11 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + "@types/minimatch@*", "@types/minimatch@^5.1.2": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" @@ -6054,7 +5554,7 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@2.6.2", "@types/node-fetch@^2.5.7": +"@types/node-fetch@2.6.2": version "2.6.2" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== @@ -6062,10 +5562,18 @@ "@types/node" "*" form-data "^3.0.0" +"@types/node-fetch@^2.5.7": + version "2.6.4" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660" + integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node@*": - version "18.13.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.13.0.tgz#0400d1e6ce87e9d3032c19eb6c58205b0d3f7850" - integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg== + version "20.3.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898" + integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw== "@types/node@18.16.18": version "18.16.18" @@ -6077,25 +5585,15 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^13.7.0": - version "13.13.52" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.52.tgz#03c13be70b9031baaed79481c0c0cfb0045e53f7" - integrity sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ== - "@types/node@^14.14.31": - version "14.18.36" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.36.tgz#c414052cb9d43fab67d679d5f3c641be911f5835" - integrity sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ== + version "14.18.52" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.52.tgz#214674cbff9f86fad4bf0c25f31ab9b9fa31110f" + integrity sha512-DGhiXKOHSFVVm+PJD+9Y0ObxXLeG6qwc0HoOn+ooQKeNNu+T2mEJCM5UBDUREKAggl9MHYjb5E71PAmx6MbzIg== -"@types/node@^16.0.0": - version "16.18.23" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.23.tgz#b6e934fe427eb7081d0015aad070acb3373c3c90" - integrity sha512-XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g== - -"@types/node@^16.9.2": - version "16.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz#e3bfea80e31523fde4292a6118f19ffa24fd6f65" - integrity sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw== +"@types/node@^16.0.0", "@types/node@^16.9.2": + version "16.18.37" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.37.tgz#a1f8728e4dc30163deb41e9b7aba65d0c2d4eda1" + integrity sha512-ql+4dw4PlPFBP495k8JzUX/oMNRI2Ei4PrMHgj8oT4VhGlYUzF4EYr0qk2fW+XBVGIrq8Zzk13m4cvyXZuv4pA== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -6112,21 +5610,23 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== +"@types/parse5@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-7.0.0.tgz#8b412a0a4461c84d6280a372bfa8c57a418a06bd" + integrity sha512-f2SeAxumolBmhuR62vNGTsSAvdz/Oj0k682xNrcKJ4dmRnTPODB74j6CPoNPzBPTHsu7Y7W7u93Mgp8Ovo8vWw== + dependencies: + parse5 "*" + "@types/parse5@^6.0.0": version "6.0.3" resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.3.tgz#705bb349e789efa06f43f128cef51240753424cb" integrity sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g== -"@types/prettier@^2.1.5": +"@types/prettier@^2.1.5", "@types/prettier@^2.6.0": version "2.7.3" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== -"@types/prettier@^2.6.0": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" - integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== - "@types/pretty-hrtime@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz#72a26101dc567b0d68fd956cf42314556e42d601" @@ -6147,13 +5647,20 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@18.2.0", "@types/react-dom@^18.0.0": +"@types/react-dom@18.2.0": version "18.2.0" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.0.tgz#374f28074bb117f56f58c4f3f71753bebb545156" integrity sha512-8yQrvS6sMpSwIovhPOwfyNf2Wz6v/B62LFSVYQ85+Rq3tLsBIG7rP5geMxaijTUxSkrO6RzN/IRuIAADYQsleA== dependencies: "@types/react" "*" +"@types/react-dom@^18.0.0": + version "18.2.6" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.6.tgz#ad621fa71a8db29af7c31b41b2ea3d8a6f4144d1" + integrity sha512-2et4PDvg6PVCyS7fuTc4gPoksV58bW0RwSxWKcPRcHZf0PRUGq03TKcD/rUHe3azfV6/5/biUBJw+HhCQjaP0A== + dependencies: + "@types/react" "*" + "@types/react-google-recaptcha@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@types/react-google-recaptcha/-/react-google-recaptcha-2.1.5.tgz#af157dc2e4bde3355f9b815a64f90e85cfa9df8b" @@ -6168,10 +5675,10 @@ dependencies: "@types/react" "*" -"@types/react@*": - version "18.0.28" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065" - integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== +"@types/react@*", "@types/react@>=16": + version "18.2.14" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.14.tgz#fa7a6fecf1ce35ca94e74874f70c56ce88f7a127" + integrity sha512-A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -6186,15 +5693,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@>=16": - version "18.0.33" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.33.tgz#a1575160cb4376787c2f5fe0312302f824baa61e" - integrity sha512-sHxzVxeanvQyQ1lr8NSHaj0kDzcNiGpILEVt69g9S31/7PfMvNCKLKcsHw4lYKjs3cGNJjXSP4mYzX43QlnjNA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - "@types/relateurl@0.2.29": version "0.2.29" resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.29.tgz#68ccecec3d4ffdafb9c577fe764f912afc050fe6" @@ -6235,20 +5733,28 @@ dependencies: htmlparser2 "^8.0.0" -"@types/scheduler@*", "@types/scheduler@0.16.2": +"@types/scheduler@*": + version "0.16.3" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" + integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== + +"@types/scheduler@0.16.2": version "0.16.2" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@types/semver@^6.0.0": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.3.tgz#5798ecf1bec94eaa64db39ee52808ec0693315aa" - integrity sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A== +"@types/semver@^7.3.12", "@types/semver@^7.3.4", "@types/semver@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a" + integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw== -"@types/semver@^7.1.0", "@types/semver@^7.3.12", "@types/semver@^7.3.4": - version "7.3.13" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" - integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== +"@types/send@*": + version "0.17.1" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301" + integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q== + dependencies: + "@types/mime" "^1" + "@types/node" "*" "@types/serve-index@^1.9.1": version "1.9.1" @@ -6257,7 +5763,16 @@ dependencies: "@types/express" "*" -"@types/serve-static@*", "@types/serve-static@1.15.0", "@types/serve-static@^1.13.10": +"@types/serve-static@*", "@types/serve-static@^1.13.10": + version "1.15.2" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a" + integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw== + dependencies: + "@types/http-errors" "*" + "@types/mime" "*" + "@types/node" "*" + +"@types/serve-static@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== @@ -6287,23 +5802,25 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/testing-library__jest-dom@5.14.5", "@types/testing-library__jest-dom@^5.9.1": +"@types/testing-library__jest-dom@5.14.5": version "5.14.5" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f" integrity sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ== dependencies: "@types/jest" "*" +"@types/testing-library__jest-dom@^5.9.1": + version "5.14.6" + resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.6.tgz#4887f6e1af11215428ab02777873bcede98a53b0" + integrity sha512-FkHXCb+ikSoUP4Y4rOslzTdX5sqYwMxfefKh1GmZ8ce1GOkEHntSp6b5cGadmNfp5e4BMEWOMx+WSKd5/MqlDA== + dependencies: + "@types/jest" "*" + "@types/tough-cookie@*", "@types/tough-cookie@4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== -"@types/treeify@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/treeify/-/treeify-1.0.0.tgz#f04743cb91fc38254e8585d692bd92503782011c" - integrity sha512-ONpcZAEYlbPx4EtJwfTyCDQJGUpKf4sEcuySdCVjK5Fj/3vHp5HII1fqa1/+qrsLnpYELCQTfVW/awsGJePoIg== - "@types/trusted-types@*", "@types/trusted-types@2.0.3": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311" @@ -6333,7 +5850,7 @@ tapable "^2.2.0" webpack "^5" -"@types/webpack-env@1.18.0", "@types/webpack-env@^1.17.0": +"@types/webpack-env@1.18.0": version "1.18.0" resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.0.tgz#ed6ecaa8e5ed5dfe8b2b3d00181702c9925f13fb" integrity sha512-56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg== @@ -6347,9 +5864,9 @@ webpack "^5" "@types/ws@^8.5.1": - version "8.5.4" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" - integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== + version "8.5.5" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" + integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== dependencies: "@types/node" "*" @@ -6366,9 +5883,9 @@ "@types/yargs-parser" "*" "@types/yargs@^17.0.8": - version "17.0.22" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a" - integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g== + version "17.0.24" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" + integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== dependencies: "@types/yargs-parser" "*" @@ -6428,24 +5945,30 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@^5.5.0": - version "5.52.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.52.0.tgz#cc79b91ea62f43bb5e9bec2d94a7df513220e9df" - integrity sha512-kd8CRr04mNE3hw4et6+0T0NI5vli2H6dJCGzjX1r12s/FXUehLVadmvo2Nl3DN80YqAh1cVC6zYZAkpmGiVJ5g== +"@typescript-eslint/eslint-plugin@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz#2604cfaf2b306e120044f901e20c8ed926debf15" + integrity sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA== dependencies: - "@typescript-eslint/utils" "5.52.0" + "@eslint-community/regexpp" "^4.4.0" + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/type-utils" "5.59.9" + "@typescript-eslint/utils" "5.59.9" + debug "^4.3.4" + grapheme-splitter "^1.0.4" + ignore "^5.2.0" + natural-compare-lite "^1.4.0" + semver "^7.3.7" + tsutils "^3.21.0" -"@typescript-eslint/parser@5.46.1": - version "5.46.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.46.1.tgz#1fc8e7102c1141eb64276c3b89d70da8c0ba5699" - integrity sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg== +"@typescript-eslint/experimental-utils@^5.5.0": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.60.1.tgz#d783bb63b9183541019a945eda6a9d96b096d985" + integrity sha512-TXUdLxv2t8181nh5yLXl/Gr/zKj1ZofQ7m+ZdmG2+El0TYOHCvlZfc35D4nturemC3RUnf3KmLuFp3bVBjkG5w== dependencies: - "@typescript-eslint/scope-manager" "5.46.1" - "@typescript-eslint/types" "5.46.1" - "@typescript-eslint/typescript-estree" "5.46.1" - debug "^4.3.4" + "@typescript-eslint/utils" "5.60.1" -"@typescript-eslint/parser@5.59.7", "@typescript-eslint/parser@^5.10.0": +"@typescript-eslint/parser@5.59.7": version "5.59.7" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.7.tgz#02682554d7c1028b89aa44a48bf598db33048caa" integrity sha512-VhpsIEuq/8i5SF+mPg9jSdIwgMBBp0z9XqjiEay+81PYLJuroN+ET1hM5IhkiYMJd9MkTz8iJLt7aaGAgzWUbQ== @@ -6455,6 +5978,26 @@ "@typescript-eslint/typescript-estree" "5.59.7" debug "^4.3.4" +"@typescript-eslint/parser@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.9.tgz#a85c47ccdd7e285697463da15200f9a8561dd5fa" + integrity sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ== + dependencies: + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/typescript-estree" "5.59.9" + debug "^4.3.4" + +"@typescript-eslint/parser@^5.10.0": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.60.1.tgz#0f2f58209c0862a73e3d5a56099abfdfa21d0fd3" + integrity sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q== + dependencies: + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/typescript-estree" "5.60.1" + debug "^4.3.4" + "@typescript-eslint/scope-manager@5.46.1": version "5.46.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz#70af8425c79bbc1178b5a63fb51102ddf48e104a" @@ -6479,6 +6022,22 @@ "@typescript-eslint/types" "5.59.7" "@typescript-eslint/visitor-keys" "5.59.7" +"@typescript-eslint/scope-manager@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz#eadce1f2733389cdb58c49770192c0f95470d2f4" + integrity sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ== + dependencies: + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/visitor-keys" "5.59.9" + +"@typescript-eslint/scope-manager@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz#35abdb47f500c68c08f2f2b4f22c7c79472854bb" + integrity sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ== + dependencies: + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/visitor-keys" "5.60.1" + "@typescript-eslint/type-utils@5.46.1": version "5.46.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.46.1.tgz#195033e4b30b51b870dfcf2828e88d57b04a11cc" @@ -6499,6 +6058,16 @@ debug "^4.3.4" tsutils "^3.21.0" +"@typescript-eslint/type-utils@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz#53bfaae2e901e6ac637ab0536d1754dfef4dafc2" + integrity sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q== + dependencies: + "@typescript-eslint/typescript-estree" "5.59.9" + "@typescript-eslint/utils" "5.59.9" + debug "^4.3.4" + tsutils "^3.21.0" + "@typescript-eslint/types@5.46.1": version "5.46.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.46.1.tgz#4e9db2107b9a88441c4d5ecacde3bb7a5ebbd47e" @@ -6514,6 +6083,16 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.7.tgz#6f4857203fceee91d0034ccc30512d2939000742" integrity sha512-UnVS2MRRg6p7xOSATscWkKjlf/NDKuqo5TdbWck6rIRZbmKpVNTLALzNvcjIfHBE7736kZOFc/4Z3VcZwuOM/A== +"@typescript-eslint/types@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.9.tgz#3b4e7ae63718ce1b966e0ae620adc4099a6dcc52" + integrity sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw== + +"@typescript-eslint/types@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.60.1.tgz#a17473910f6b8d388ea83c9d7051af89c4eb7561" + integrity sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg== + "@typescript-eslint/typescript-estree@5.46.1": version "5.46.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz#5358088f98a8f9939355e0996f9c8f41c25eced2" @@ -6553,6 +6132,32 @@ semver "^7.3.7" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz#6bfea844e468427b5e72034d33c9fffc9557392b" + integrity sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA== + dependencies: + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/visitor-keys" "5.59.9" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/typescript-estree@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz#8c71824b7165b64d5ebd7aa42968899525959834" + integrity sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw== + dependencies: + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/visitor-keys" "5.60.1" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + "@typescript-eslint/utils@5.46.1": version "5.46.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.46.1.tgz#7da3c934d9fd0eb4002a6bb3429f33298b469b4a" @@ -6581,6 +6186,34 @@ eslint-utils "^3.0.0" semver "^7.3.7" +"@typescript-eslint/utils@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.9.tgz#adee890107b5ffe02cd46fdaa6c2125fb3c6c7c4" + integrity sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@types/json-schema" "^7.0.9" + "@types/semver" "^7.3.12" + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/typescript-estree" "5.59.9" + eslint-scope "^5.1.1" + semver "^7.3.7" + +"@typescript-eslint/utils@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.60.1.tgz#6861ebedbefba1ac85482d2bdef6f2ff1eb65b80" + integrity sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@types/json-schema" "^7.0.9" + "@types/semver" "^7.3.12" + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/typescript-estree" "5.60.1" + eslint-scope "^5.1.1" + semver "^7.3.7" + "@typescript-eslint/visitor-keys@5.46.1": version "5.46.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz#126cc6fe3c0f83608b2b125c5d9daced61394242" @@ -6605,6 +6238,22 @@ "@typescript-eslint/types" "5.59.7" eslint-visitor-keys "^3.3.0" +"@typescript-eslint/visitor-keys@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz#9f86ef8e95aca30fb5a705bb7430f95fc58b146d" + integrity sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q== + dependencies: + "@typescript-eslint/types" "5.59.9" + eslint-visitor-keys "^3.3.0" + +"@typescript-eslint/visitor-keys@5.60.1": + version "5.60.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz#19a877358bf96318ec35d90bfe6bd1445cce9434" + integrity sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw== + dependencies: + "@typescript-eslint/types" "5.60.1" + eslint-visitor-keys "^3.3.0" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -6613,21 +6262,44 @@ "@webassemblyjs/helper-numbers" "1.11.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.1" +"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" + integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== + "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== + "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== +"@webassemblyjs/helper-buffer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" + integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== + "@webassemblyjs/helper-numbers@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" @@ -6637,11 +6309,25 @@ "@webassemblyjs/helper-api-error" "1.11.1" "@xtuc/long" "4.2.2" +"@webassemblyjs/helper-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@xtuc/long" "4.2.2" + "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== + "@webassemblyjs/helper-wasm-section@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" @@ -6652,6 +6338,16 @@ "@webassemblyjs/helper-wasm-bytecode" "1.11.1" "@webassemblyjs/wasm-gen" "1.11.1" +"@webassemblyjs/helper-wasm-section@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" + integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/ieee754@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" @@ -6659,6 +6355,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/leb128@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" @@ -6666,11 +6369,23 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/utf8@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== + "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" @@ -6685,6 +6400,20 @@ "@webassemblyjs/wasm-parser" "1.11.1" "@webassemblyjs/wast-printer" "1.11.1" +"@webassemblyjs/wasm-edit@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" + integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-opt" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wast-printer" "1.11.6" + "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" @@ -6696,6 +6425,17 @@ "@webassemblyjs/leb128" "1.11.1" "@webassemblyjs/utf8" "1.11.1" +"@webassemblyjs/wasm-gen@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" + integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/wasm-opt@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" @@ -6706,6 +6446,16 @@ "@webassemblyjs/wasm-gen" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" +"@webassemblyjs/wasm-opt@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" + integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wasm-parser@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" @@ -6718,6 +6468,18 @@ "@webassemblyjs/leb128" "1.11.1" "@webassemblyjs/utf8" "1.11.1" +"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" + integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + "@webassemblyjs/wast-printer@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" @@ -6726,20 +6488,28 @@ "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" + integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@xtuc/long" "4.2.2" + "@webpack-cli/configtest@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f" - integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A== + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== "@webpack-cli/info@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" - integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== "@webpack-cli/serve@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" - integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -6751,43 +6521,6 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@yarnpkg/core@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/core/-/core-2.4.0.tgz#b5d8cc7ee2ddb022816c7afa3f83c3ee3d317c80" - integrity sha512-FYjcPNTfDfMKLFafQPt49EY28jnYC82Z2S7oMwLPUh144BL8v8YXzb4aCnFyi5nFC5h2kcrJfZh7+Pm/qvCqGw== - dependencies: - "@arcanis/slice-ansi" "^1.0.2" - "@types/semver" "^7.1.0" - "@types/treeify" "^1.0.0" - "@yarnpkg/fslib" "^2.4.0" - "@yarnpkg/json-proxy" "^2.1.0" - "@yarnpkg/libzip" "^2.2.1" - "@yarnpkg/parsers" "^2.3.0" - "@yarnpkg/pnp" "^2.3.2" - "@yarnpkg/shell" "^2.4.1" - binjumper "^0.1.4" - camelcase "^5.3.1" - chalk "^3.0.0" - ci-info "^2.0.0" - clipanion "^2.6.2" - cross-spawn "7.0.3" - diff "^4.0.1" - globby "^11.0.1" - got "^11.7.0" - json-file-plus "^3.3.1" - lodash "^4.17.15" - micromatch "^4.0.2" - mkdirp "^0.5.1" - p-limit "^2.2.0" - pluralize "^7.0.0" - pretty-bytes "^5.1.0" - semver "^7.1.2" - stream-to-promise "^2.2.0" - tar-stream "^2.0.1" - treeify "^1.1.0" - tslib "^1.13.0" - tunnel "^0.0.6" - "@yarnpkg/esbuild-plugin-pnp@^3.0.0-rc.10": version "3.0.0-rc.15" resolved "https://registry.yarnpkg.com/@yarnpkg/esbuild-plugin-pnp/-/esbuild-plugin-pnp-3.0.0-rc.15.tgz#4e40e7d2eb28825c9a35ab9d04c363931d7c0e67" @@ -6795,66 +6528,11 @@ dependencies: tslib "^2.4.0" -"@yarnpkg/fslib@^2.4.0", "@yarnpkg/fslib@^2.5.0": - version "2.10.1" - resolved "https://registry.yarnpkg.com/@yarnpkg/fslib/-/fslib-2.10.1.tgz#3ed7e450f1316e535740653c2e8eff2d851c45cb" - integrity sha512-pVMLtOYu87N5y5G2lyPNYTY2JbTco99v7nGFI34Blx01Ct9LmoKVOc91vnLOYIMMljKr1c8xs1O2UamRdMG5Pg== - dependencies: - "@yarnpkg/libzip" "^2.2.4" - tslib "^1.13.0" - -"@yarnpkg/json-proxy@^2.1.0": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@yarnpkg/json-proxy/-/json-proxy-2.1.1.tgz#47866706061e9bdb15b0d199f6f08dde655bf569" - integrity sha512-meUiCAgCYpXTH1qJfqfz+dX013ohW9p2dKfwIzUYAFutH+lsz1eHPBIk72cuCV84adh9gX6j66ekBKH/bIhCQw== - dependencies: - "@yarnpkg/fslib" "^2.5.0" - tslib "^1.13.0" - -"@yarnpkg/libzip@^2.2.1", "@yarnpkg/libzip@^2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@yarnpkg/libzip/-/libzip-2.2.4.tgz#438744efe3b7ae0514f5db1ead130c1df1e685f6" - integrity sha512-QP0vUP+w0d7Jlo7jqTnlRChSnIB/dOF7nJFLD/gsPvFIHsVWLQQuAiolOcXQUD2hezLD1mQd2qb0yOKqPYRcfQ== - dependencies: - "@types/emscripten" "^1.38.0" - tslib "^1.13.0" - -"@yarnpkg/lockfile@1.1.0", "@yarnpkg/lockfile@^1.1.0": +"@yarnpkg/lockfile@1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -"@yarnpkg/parsers@^2.3.0": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-2.5.1.tgz#0e7c510977a410747fc6d3727c1a2a189e6cd6eb" - integrity sha512-KtYN6Ez3x753vPF9rETxNTPnPjeaHY11Exlpqb4eTII7WRlnGiZ5rvvQBau4R20Ik5KBv+vS3EJEcHyCunwzzw== - dependencies: - js-yaml "^3.10.0" - tslib "^1.13.0" - -"@yarnpkg/pnp@^2.3.2": - version "2.3.2" - resolved "https://registry.yarnpkg.com/@yarnpkg/pnp/-/pnp-2.3.2.tgz#9a052a06bf09c9f0b7c31e0867a7e725cb6401ed" - integrity sha512-JdwHu1WBCISqJEhIwx6Hbpe8MYsYbkGMxoxolkDiAeJ9IGEe08mQcbX1YmUDV1ozSWlm9JZE90nMylcDsXRFpA== - dependencies: - "@types/node" "^13.7.0" - "@yarnpkg/fslib" "^2.4.0" - tslib "^1.13.0" - -"@yarnpkg/shell@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@yarnpkg/shell/-/shell-2.4.1.tgz#abc557f8924987c9c382703e897433a82780265d" - integrity sha512-oNNJkH8ZI5uwu0dMkJf737yMSY1WXn9gp55DqSA5wAOhKvV5DJTXFETxkVgBQhO6Bow9tMGSpvowTMD/oAW/9g== - dependencies: - "@yarnpkg/fslib" "^2.4.0" - "@yarnpkg/parsers" "^2.3.0" - clipanion "^2.6.2" - cross-spawn "7.0.3" - fast-glob "^3.2.2" - micromatch "^4.0.2" - stream-buffers "^3.0.2" - tslib "^1.13.0" - abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" @@ -6881,10 +6559,10 @@ acorn-globals@^7.0.0: acorn "^8.1.0" acorn-walk "^8.0.2" -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== +acorn-import-assertions@^1.7.6, acorn-import-assertions@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" @@ -6906,10 +6584,10 @@ acorn@^7.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== +acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.8.2: + version "8.9.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" + integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== address@^1.0.1: version "1.2.2" @@ -6948,14 +6626,14 @@ ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv-keywords@^5.0.0: +ajv-keywords@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" -ajv@8.12.0, ajv@^8.0.0, ajv@^8.0.1, ajv@^8.6.2, ajv@^8.8.0: +ajv@8.12.0, ajv@^8.0.0, ajv@^8.0.1, ajv@^8.6.2, ajv@^8.9.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -7094,11 +6772,6 @@ ansicolors@~0.3.2: resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg== -any-promise@^1.1.0, any-promise@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== - anymatch@^3.0.3, anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -7152,13 +6825,20 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -aria-query@^5.0.0, aria-query@^5.1.3: +aria-query@5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e" integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== dependencies: deep-equal "^2.0.5" +aria-query@^5.0.0, aria-query@^5.1.3: + version "5.3.0" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" + integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== + dependencies: + dequal "^2.0.3" + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -7174,6 +6854,14 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== +array-buffer-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" + integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== + dependencies: + call-bind "^1.0.2" + is-array-buffer "^3.0.1" + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -7184,7 +6872,7 @@ array-flatten@^2.1.2: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6: +array-includes@^3.1.4, array-includes@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== @@ -7217,7 +6905,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.5: +array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.5, array.prototype.flat@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== @@ -7258,7 +6946,7 @@ arrify@^2.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== -asap@~2.0.3, asap@~2.0.6: +asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== @@ -7399,9 +7087,9 @@ aws-cdk@2.68.0: fsevents "2.3.2" aws-sdk@^2.1339.0: - version "2.1344.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1344.0.tgz#61b901cb8a7f011d407b320860ed2117eb5afe5a" - integrity sha512-dOYkxyw5wSeX+UqGhVE4wXbLmw1z4t65jAYz4PdqXASbhB1YS5gFgTYnUg20psbzPnYV83KvUToWw5Sbc8tWcQ== + version "2.1407.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1407.0.tgz#8854a87192ea0bd984f44e751cd137d219180ca5" + integrity sha512-J02Cjciw+5p9zR7923rfH+UGDEmbg72YRAZISEahzuWPf/DwMAyIrC5B1cMMq3KrV+KVsRtEY5LujVCFKwB8Yw== dependencies: buffer "4.9.2" events "1.1.1" @@ -7412,7 +7100,7 @@ aws-sdk@^2.1339.0: url "0.10.3" util "^0.12.4" uuid "8.0.0" - xml2js "0.4.19" + xml2js "0.5.0" aws-sign2@~0.7.0: version "0.7.0" @@ -7425,9 +7113,9 @@ aws4@^1.8.0: integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== axe-core@^4.6.2: - version "4.6.3" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.3.tgz#fc0db6fdb65cc7a80ccf85286d91d64ababa3ece" - integrity sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg== + version "4.7.2" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0" + integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g== axios@^0.21.0: version "0.21.4" @@ -7445,11 +7133,11 @@ axios@^0.27.2: form-data "^4.0.0" axobject-query@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1" - integrity sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg== + version "3.2.1" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a" + integrity sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg== dependencies: - deep-equal "^2.0.5" + dequal "^2.0.3" babel-core@7.0.0-bridge.0, babel-core@^7.0.0-bridge.0: version "7.0.0-bridge.0" @@ -7728,13 +7416,13 @@ bin-check@^4.1.0: executable "^4.1.0" bin-version-check@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-5.0.0.tgz#958de30174d3fcedadbfc52f89f37bca62594877" - integrity sha512-Q3FMQnS5eZmrBGqmDXLs4dbAn/f+52voP6ykJYmweSA60t6DyH4UTSwZhtbK5UH+LBoWvDljILUQMLRUtsynsA== + version "5.1.0" + resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-5.1.0.tgz#788e80e036a87313f8be7908bc20e5abe43f0837" + integrity sha512-bYsvMqJ8yNGILLz1KP9zKLzQ6YpljV3ln1gqhuLkUtyfGi3qXKGuK2p+U4NAvjVFzDFiBBtOpCOSFNuYYEGZ5g== dependencies: bin-version "^6.0.0" - semver "^7.3.5" - semver-truncate "^2.0.0" + semver "^7.5.3" + semver-truncate "^3.0.0" bin-version@^6.0.0: version "6.0.0" @@ -7749,11 +7437,6 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -binjumper@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/binjumper/-/binjumper-0.1.4.tgz#4acc0566832714bd6508af6d666bd9e5e21fc7f8" - integrity sha512-Gdxhj+U295tIM6cO4bJO1jsvSjBVHNpj2o/OwW7pqDEtaqF6KdOxjtbo93jMMKAkP7+u09+bV8DhSqjIv4qR3w== - bl@^4.0.3, bl@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -7807,9 +7490,9 @@ body-parser@1.20.1: unpipe "1.0.0" bonjour-service@^1.0.11: - version "1.1.0" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.0.tgz#424170268d68af26ff83a5c640b95def01803a13" - integrity sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q== + version "1.1.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" + integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== dependencies: array-flatten "^2.1.2" dns-equal "^1.0.0" @@ -7909,7 +7592,7 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -browserslist@4.21.9: +browserslist@4.21.9, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.5: version "4.21.9" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== @@ -7919,16 +7602,6 @@ browserslist@4.21.9: node-releases "^2.0.12" update-browserslist-db "^1.0.11" -browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.5: - version "4.21.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" - integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== - dependencies: - caniuse-lite "^1.0.30001449" - electron-to-chromium "^1.4.284" - node-releases "^2.0.8" - update-browserslist-db "^1.0.10" - bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -7968,6 +7641,13 @@ buffer@^5.5.0, buffer@^5.6.0: base64-js "^1.3.1" ieee754 "^1.1.13" +bundle-name@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a" + integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw== + dependencies: + run-applescript "^5.0.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -7979,9 +7659,9 @@ bytes@3.1.2: integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== c8@^7.6.0: - version "7.12.0" - resolved "https://registry.yarnpkg.com/c8/-/c8-7.12.0.tgz#402db1c1af4af5249153535d1c84ad70c5c96b14" - integrity sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A== + version "7.14.0" + resolved "https://registry.yarnpkg.com/c8/-/c8-7.14.0.tgz#f368184c73b125a80565e9ab2396ff0be4d732f3" + integrity sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw== dependencies: "@bcoe/v8-coverage" "^0.2.3" "@istanbuljs/schema" "^0.1.3" @@ -8017,9 +7697,9 @@ cacheable-lookup@^5.0.3: integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== + version "7.0.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" + integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" @@ -8079,7 +7759,7 @@ camelcase@^6.2.0, camelcase@^6.3.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001503: +caniuse-lite@^1.0.30001503: version "1.0.30001509" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz#2b7ad5265392d6d2de25cd8776d1ab3899570d14" integrity sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA== @@ -8233,34 +7913,25 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chromatic@^6.17.4: - version "6.17.4" - resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-6.17.4.tgz#6a946d51c631d871c165fe28fa2b3b0bcdf32e24" - integrity sha512-vnlvsv2lkp8BVtTn1OumJzqkDk2qB3pcGxEDIfZtVboKtzIPjnIlGa+c1fVKQe8NvHDU8R39k8klqgKHIXUVJw== - dependencies: - "@discoveryjs/json-ext" "^0.5.7" - "@types/webpack-env" "^1.17.0" - snyk-nodejs-lockfile-parser "^1.49.0" +chromatic@^6.19.9: + version "6.19.9" + resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-6.19.9.tgz#b73548ad31154f3ac5e1291268ee44e4778e3057" + integrity sha512-UHrPbPoLnJwd063cRSO0U865VhcATykpMiHsAnNFz5EFRsBvM9wefqyS2Z6W8Ti9J7Fjrf4MV4PA+Q5k2lhFfQ== chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - ci-info@^3.1.0, ci-info@^3.2.0: version "3.8.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== cjs-module-lexer@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" - integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" + integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== class-utils@^0.3.5: version "0.3.6" @@ -8318,9 +7989,9 @@ cli-progress@^3.12.0: string-width "^4.2.3" cli-spinners@^2.5.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" - integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== + version "2.9.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db" + integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g== cli-table3@^0.6.1, cli-table3@~0.6.1: version "0.6.3" @@ -8359,11 +8030,6 @@ cli-width@^3.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== -clipanion@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/clipanion/-/clipanion-2.6.2.tgz#820e7440812052442455b248f927b187ed732f71" - integrity sha512-0tOHJNMF9+4R3qcbBL+4IxLErpaYSYvzs10aXuECDbZdJOuJHdagJMAqvLdeaUQTI/o2uSCDRpet6ywDiKOAYw== - cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -8418,9 +8084,9 @@ co@^4.6.0: integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== codemaker@^1.77.0: - version "1.78.1" - resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.78.1.tgz#bd9fa1015327c7cc1438b7d682411f7002b8d04a" - integrity sha512-BNyqClGzOqL+OtRb6BsYzBJo1/vZYpy2izfXlEMXhhZFvux0RWg6XB3cFnCXyTmzawJus97GWlBtcrMajeqvVQ== + version "1.84.0" + resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.84.0.tgz#da95dc297fc4be657baa49fdc3127ce1f057c6f3" + integrity sha512-sOUH3y2q2DEO+gDiBCCoGgkDs8aMY0LTMH0FmHbKpqReZwWDAmWJ0Voc4Thp4Mn380bPku9/ncqyY1a3MZnfEQ== dependencies: camelcase "^6.3.0" decamelize "^5.0.1" @@ -8665,44 +8331,27 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -core-js-compat@^3.25.1: - version "3.28.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.28.0.tgz#c08456d854608a7264530a2afa281fadf20ecee6" - integrity sha512-myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg== - dependencies: - browserslist "^4.21.5" - -core-js-compat@^3.30.1, core-js-compat@^3.30.2: - version "3.30.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.2.tgz#83f136e375babdb8c80ad3c22d67c69098c1dd8b" - integrity sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA== +core-js-compat@^3.25.1, core-js-compat@^3.30.1, core-js-compat@^3.30.2: + version "3.31.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1" + integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw== dependencies: browserslist "^4.21.5" -core-js-pure@^3.13.0: - version "3.30.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.2.tgz#005a82551f4af3250dcfb46ed360fad32ced114e" - integrity sha512-p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg== - -core-js-pure@^3.23.3: - version "3.28.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.28.0.tgz#4ef2888475b6c856ef6f5aeef8b4f618b76ad048" - integrity sha512-DSOVleA9/v3LNj/vFxAPfUHttKTzrB2RXhAPvR5TPXn4vrra3Z2ssytvRyt8eruJwAfwAiFADEbrjcRdcvPLQQ== +core-js-pure@^3.13.0, core-js-pure@^3.23.3: + version "3.31.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.31.0.tgz#052fd9e82fbaaf86457f5db1fadcd06f15966ff2" + integrity sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg== core-js@^2.4.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.0.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.28.0.tgz#ed8b9e99c273879fdfff0edfc77ee709a5800e4a" - integrity sha512-GiZn9D4Z/rSYvTeg1ljAIsEqFm0LaN9gVtwDCrKL80zHtS31p9BAjmTxVqTQDMpwlMolJZOFntUG2uwyj7DAqw== - -core-js@^3.13.0: - version "3.30.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.2.tgz#6528abfda65e5ad728143ea23f7a14f0dcf503fc" - integrity sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg== +core-js@^3.0.0, core-js@^3.13.0: + version "3.31.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344" + integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ== core-util-is@1.0.2: version "1.0.2" @@ -8767,15 +8416,6 @@ cron@1.8.2: dependencies: moment-timezone "^0.5.x" -cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -8796,6 +8436,15 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-js@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" @@ -8816,7 +8465,7 @@ css-functions-list@^3.1.0: resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b" integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w== -css-loader@6.7.3, css-loader@^6.7.1: +css-loader@6.7.3: version "6.7.3" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd" integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ== @@ -8830,6 +8479,20 @@ css-loader@6.7.3, css-loader@^6.7.1: postcss-value-parser "^4.2.0" semver "^7.3.8" +css-loader@^6.7.1: + version "6.8.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88" + integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g== + dependencies: + icss-utils "^5.1.0" + postcss "^8.4.21" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.3" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.2.0" + semver "^7.3.8" + css-select@^4.1.3: version "4.3.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" @@ -8873,11 +8536,23 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@3.1.1, csstype@^3.0.2: +cssstyle@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a" + integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg== + dependencies: + rrweb-cssom "^0.6.0" + +csstype@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== +csstype@^3.0.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" + integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== + csv-generate@^3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-3.4.3.tgz#bc42d943b45aea52afa896874291da4b9108ffff" @@ -8999,15 +8674,24 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" +data-urls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4" + integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.0" + date-format@^4.0.10, date-format@^4.0.14: version "4.0.14" resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg== dayjs@^1.10.4: - version "1.11.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" - integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== + version "1.11.8" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.8.tgz#4282f139c8c19dd6d0c7bd571e30c2d0ba7698ea" + integrity sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ== dayjs@~1.8.24, dayjs@~1.8.25: version "1.8.36" @@ -9053,7 +8737,7 @@ decamelize@^5.0.1: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== -decimal.js@^10.4.2: +decimal.js@^10.4.2, decimal.js@^10.4.3: version "10.4.3" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== @@ -9083,15 +8767,16 @@ dedent@^0.7.0: integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA== deep-equal@^2.0.5: - version "2.2.0" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.0.tgz#5caeace9c781028b9ff459f33b779346637c43e6" - integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.1.tgz#c72ab22f3a7d3503a4ca87dde976fe9978816739" + integrity sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ== dependencies: + array-buffer-byte-length "^1.0.0" call-bind "^1.0.2" - es-get-iterator "^1.1.2" - get-intrinsic "^1.1.3" + es-get-iterator "^1.1.3" + get-intrinsic "^1.2.0" is-arguments "^1.1.1" - is-array-buffer "^3.0.1" + is-array-buffer "^3.0.2" is-date-object "^1.0.5" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" @@ -9099,7 +8784,7 @@ deep-equal@^2.0.5: object-is "^1.1.5" object-keys "^1.1.1" object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" + regexp.prototype.flags "^1.5.0" side-channel "^1.0.4" which-boxed-primitive "^1.0.2" which-collection "^1.0.1" @@ -9111,11 +8796,11 @@ deep-is@^0.1.3, deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.0, deepmerge@^4.2.2: - version "4.3.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b" - integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og== + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== -default-browser-id@3.0.0: +default-browser-id@3.0.0, default-browser-id@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c" integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA== @@ -9123,6 +8808,16 @@ default-browser-id@3.0.0: bplist-parser "^0.2.0" untildify "^4.0.0" +default-browser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da" + integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA== + dependencies: + bundle-name "^3.0.0" + default-browser-id "^3.0.0" + execa "^7.1.1" + titleize "^3.0.0" + default-gateway@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" @@ -9147,7 +8842,12 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.3, define-properties@^1.1.4: +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== + +define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== @@ -9183,14 +8883,14 @@ defu@^6.1.2: integrity sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ== degenerator@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235" - integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.4.tgz#07ccf95bc11044a37a6efc2f66029fb636e31f24" + integrity sha512-Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw== dependencies: ast-types "^0.13.2" escodegen "^1.8.1" esprima "^4.0.0" - vm2 "^3.9.8" + vm2 "^3.9.17" del@^6.0.0: version "6.1.1" @@ -9231,7 +8931,7 @@ deprecation@^2.0.0: resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== -dequal@^2.0.0, dequal@^2.0.2: +dequal@^2.0.0, dequal@^2.0.2, dequal@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== @@ -9283,11 +8983,6 @@ diff-sequences@^27.5.1: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== -diff-sequences@^29.4.2: - version "29.4.2" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.2.tgz#711fe6bd8a5869fe2539cee4a5152425ff671fda" - integrity sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw== - diff-sequences@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2" @@ -9328,9 +9023,9 @@ dns-equal@^1.0.0: integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== dns-packet@^5.2.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" - integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== + version "5.6.0" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" + integrity sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ== dependencies: "@leichtgewicht/ip-codec" "^2.0.1" @@ -9409,7 +9104,7 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.2.2, domhandler@^4.3.1: dependencies: domelementtype "^2.2.0" -domhandler@^5.0.1, domhandler@^5.0.2: +domhandler@^5.0.2, domhandler@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== @@ -9431,13 +9126,13 @@ domutils@^2.5.2, domutils@^2.8.0: domhandler "^4.2.0" domutils@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" - integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + version "3.1.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" + integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== dependencies: dom-serializer "^2.0.0" domelementtype "^2.3.0" - domhandler "^5.0.1" + domhandler "^5.0.3" dot-case@^3.0.4: version "3.0.4" @@ -9453,9 +9148,9 @@ dotenv-expand@^10.0.0: integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A== dotenv@^16.0.0: - version "16.0.3" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" - integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== dset@3.1.2: version "3.1.2" @@ -9514,15 +9209,10 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-to-chromium@^1.4.284: - version "1.4.295" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.295.tgz#911d5df67542bf7554336142eb302c5ec90bba66" - integrity sha512-lEO94zqf1bDA3aepxwnWoHUjA8sZ+2owgcSZjYQy0+uOSEclJX0VieZC+r+wLpSxUHRd6gG32znTWmr+5iGzFw== - electron-to-chromium@^1.4.431: - version "1.4.442" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.442.tgz#455f4c5bd6ae73afb634dcffee6f356c26c8e294" - integrity sha512-RkrZF//Ya+0aJq2NM3OdisNh5ZodZq1rdXOS96G8DdDgpDKqKE81yTbbQ3F/4CKm1JBPsGu1Lp/akkna2xO06Q== + version "1.4.445" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.445.tgz#058d2c5f3a2981ab1a37440f5a5e42d15672aa6d" + integrity sha512-++DB+9VK8SBJwC+X1zlMfJ1tMA3F0ipi39GdEp+x3cV2TyBihqAgad8cNMWtLDEkbH39nlDQP7PfGrDr3Dr7HA== emitter-listener@^1.1.1: version "1.1.2" @@ -9568,13 +9258,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -end-of-stream@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.1.0.tgz#e9353258baa9108965efc41cb0ef8ade2f3cfb07" - integrity sha512-EoulkdKF/1xa92q25PbjuDcgJ9RDHYU2Rs3SCIvs2/dSQ3BpmxneNHmA/M7fe60M3PrV7nNGTTNbkK62l6vXiQ== - dependencies: - once "~1.3.0" - endent@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/endent/-/endent-2.1.0.tgz#5aaba698fb569e5e18e69e1ff7a28ff35373cd88" @@ -9584,10 +9267,10 @@ endent@^2.0.1: fast-json-parse "^1.0.3" objectorarray "^1.0.5" -enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" - integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== +enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.15.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" + integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -9610,14 +9293,14 @@ entities@^3.0.1: integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + version "7.10.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13" + integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw== error-ex@^1.3.1: version "1.3.2" @@ -9634,17 +9317,17 @@ error-stack-parser@^2.0.6: stackframe "^1.3.4" es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.21.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6" - integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg== + version "1.21.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" + integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== dependencies: + array-buffer-byte-length "^1.0.0" available-typed-arrays "^1.0.5" call-bind "^1.0.2" es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" - function-bind "^1.1.1" function.prototype.name "^1.1.5" - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.0" get-symbol-description "^1.0.0" globalthis "^1.0.3" gopd "^1.0.1" @@ -9652,8 +9335,8 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: has-property-descriptors "^1.0.0" has-proto "^1.0.1" has-symbols "^1.0.3" - internal-slot "^1.0.4" - is-array-buffer "^3.0.1" + internal-slot "^1.0.5" + is-array-buffer "^3.0.2" is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" @@ -9661,18 +9344,19 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: is-string "^1.0.7" is-typed-array "^1.1.10" is-weakref "^1.0.2" - object-inspect "^1.12.2" + object-inspect "^1.12.3" object-keys "^1.1.1" object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" safe-regex-test "^1.0.0" + string.prototype.trim "^1.2.7" string.prototype.trimend "^1.0.6" string.prototype.trimstart "^1.0.6" typed-array-length "^1.0.4" unbox-primitive "^1.0.2" which-typed-array "^1.1.9" -es-get-iterator@^1.1.2: +es-get-iterator@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== @@ -9692,6 +9376,11 @@ es-module-lexer@^0.9.0: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== +es-module-lexer@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" + integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== + es-set-tostringtag@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" @@ -9775,32 +9464,32 @@ esbuild@^0.16.17: "@esbuild/win32-x64" "0.16.17" esbuild@^0.17.0: - version "0.17.15" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.15.tgz#209ebc87cb671ffb79574db93494b10ffaf43cbc" - integrity sha512-LBUV2VsUIc/iD9ME75qhT4aJj0r75abCVS0jakhFzOtR7TQsqQA5w0tZ+KTKnwl3kXE0MhskNdHDh/I5aCR1Zw== + version "0.17.19" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955" + integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw== optionalDependencies: - "@esbuild/android-arm" "0.17.15" - "@esbuild/android-arm64" "0.17.15" - "@esbuild/android-x64" "0.17.15" - "@esbuild/darwin-arm64" "0.17.15" - "@esbuild/darwin-x64" "0.17.15" - "@esbuild/freebsd-arm64" "0.17.15" - "@esbuild/freebsd-x64" "0.17.15" - "@esbuild/linux-arm" "0.17.15" - "@esbuild/linux-arm64" "0.17.15" - "@esbuild/linux-ia32" "0.17.15" - "@esbuild/linux-loong64" "0.17.15" - "@esbuild/linux-mips64el" "0.17.15" - "@esbuild/linux-ppc64" "0.17.15" - "@esbuild/linux-riscv64" "0.17.15" - "@esbuild/linux-s390x" "0.17.15" - "@esbuild/linux-x64" "0.17.15" - "@esbuild/netbsd-x64" "0.17.15" - "@esbuild/openbsd-x64" "0.17.15" - "@esbuild/sunos-x64" "0.17.15" - "@esbuild/win32-arm64" "0.17.15" - "@esbuild/win32-ia32" "0.17.15" - "@esbuild/win32-x64" "0.17.15" + "@esbuild/android-arm" "0.17.19" + "@esbuild/android-arm64" "0.17.19" + "@esbuild/android-x64" "0.17.19" + "@esbuild/darwin-arm64" "0.17.19" + "@esbuild/darwin-x64" "0.17.19" + "@esbuild/freebsd-arm64" "0.17.19" + "@esbuild/freebsd-x64" "0.17.19" + "@esbuild/linux-arm" "0.17.19" + "@esbuild/linux-arm64" "0.17.19" + "@esbuild/linux-ia32" "0.17.19" + "@esbuild/linux-loong64" "0.17.19" + "@esbuild/linux-mips64el" "0.17.19" + "@esbuild/linux-ppc64" "0.17.19" + "@esbuild/linux-riscv64" "0.17.19" + "@esbuild/linux-s390x" "0.17.19" + "@esbuild/linux-x64" "0.17.19" + "@esbuild/netbsd-x64" "0.17.19" + "@esbuild/openbsd-x64" "0.17.19" + "@esbuild/sunos-x64" "0.17.19" + "@esbuild/win32-arm64" "0.17.19" + "@esbuild/win32-ia32" "0.17.19" + "@esbuild/win32-x64" "0.17.19" escalade@^3.1.1: version "3.1.1" @@ -9873,16 +9562,16 @@ eslint-config-airbnb-typescript@17.0.0: dependencies: eslint-config-airbnb-base "^15.0.0" -eslint-config-prettier@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" - integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== - eslint-config-prettier@8.6.0: version "8.6.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207" integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA== +eslint-config-prettier@8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" + integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== + eslint-import-resolver-babel-module@5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-5.3.2.tgz#67ed1cd2689d97e9566a8dbc2c6483671a6bde33" @@ -9891,7 +9580,7 @@ eslint-import-resolver-babel-module@5.3.2: pkg-up "^3.1.0" resolve "^1.20.0" -eslint-import-resolver-node@^0.3.6: +eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7: version "0.3.7" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== @@ -9900,23 +9589,24 @@ eslint-import-resolver-node@^0.3.6: is-core-module "^2.11.0" resolve "^1.22.1" -eslint-import-resolver-typescript@3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.2.tgz#9431acded7d898fd94591a08ea9eec3514c7de91" - integrity sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ== +eslint-import-resolver-typescript@3.5.5: + version "3.5.5" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.5.tgz#0a9034ae7ed94b254a360fbea89187b60ea7456d" + integrity sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw== dependencies: debug "^4.3.4" - enhanced-resolve "^5.10.0" - get-tsconfig "^4.2.0" - globby "^13.1.2" - is-core-module "^2.10.0" + enhanced-resolve "^5.12.0" + eslint-module-utils "^2.7.4" + get-tsconfig "^4.5.0" + globby "^13.1.3" + is-core-module "^2.11.0" is-glob "^4.0.3" - synckit "^0.8.4" + synckit "^0.8.5" -eslint-module-utils@^2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" - integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== +eslint-module-utils@^2.7.3, eslint-module-utils@^2.7.4: + 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== dependencies: debug "^3.2.7" @@ -9959,6 +9649,27 @@ eslint-plugin-import@2.26.0: resolve "^1.22.0" tsconfig-paths "^3.14.1" +eslint-plugin-import@2.27.5: + version "2.27.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" + integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== + dependencies: + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + array.prototype.flatmap "^1.3.1" + debug "^3.2.7" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.7" + eslint-module-utils "^2.7.4" + has "^1.0.3" + is-core-module "^2.11.0" + is-glob "^4.0.3" + minimatch "^3.1.2" + object.values "^1.1.6" + resolve "^1.22.1" + semver "^6.3.0" + tsconfig-paths "^3.14.1" + eslint-plugin-jsx-a11y@6.7.1: version "6.7.1" resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz#fca5e02d115f48c9a597a6894d5bcec2f7a76976" @@ -10031,10 +9742,10 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.0.0, eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== +eslint-scope@^7.0.0, eslint-scope@^7.1.1, eslint-scope@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" + integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -10059,12 +9770,12 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== +eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -eslint@8.34.0, eslint@^8.7.0: +eslint@8.34.0: version "8.34.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.34.0.tgz#fe0ab0ef478104c1f9ebc5537e303d25a8fb22d6" integrity sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg== @@ -10109,24 +9820,69 @@ eslint@8.34.0, eslint@^8.7.0: strip-json-comments "^3.1.0" text-table "^0.2.0" -espree@^9.0.0, espree@^9.4.0: - version "9.4.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" - integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== +eslint@^8.7.0: + version "8.43.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094" + integrity sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.4.0" + "@eslint/eslintrc" "^2.0.3" + "@eslint/js" "8.43.0" + "@humanwhocodes/config-array" "^0.11.10" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.2.0" + eslint-visitor-keys "^3.4.1" + espree "^9.5.2" + esquery "^1.4.2" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.1.2" + natural-compare "^1.4.0" + optionator "^0.9.1" + strip-ansi "^6.0.1" + strip-json-comments "^3.1.0" + text-table "^0.2.0" + +espree@^9.0.0, espree@^9.4.0, espree@^9.5.2: + version "9.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" + integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.1" esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== +esquery@^1.4.0, esquery@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== dependencies: estraverse "^5.1.0" @@ -10166,13 +9922,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -event-loop-spinner@^2.0.0, event-loop-spinner@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/event-loop-spinner/-/event-loop-spinner-2.2.0.tgz#5b9bdf1759a5d9600576260ae770446a1a16c9b0" - integrity sha512-KB44sV4Mv7uLIkJHJ5qhiZe5um6th2g57nHQL/uqnPHKP2IswoTRWUteEXTJQL4gW++1zqWUni+H2hGkP51c9w== - dependencies: - tslib "^2.1.0" - event-stream@=3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" @@ -10264,7 +10013,7 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^7.0.0: +execa@^7.0.0, execa@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-7.1.1.tgz#3eb3c83d239488e7b409d48e8813b76bb55c9c43" integrity sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q== @@ -10304,18 +10053,7 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^29.0.0: - version "29.4.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.2.tgz#2ae34eb88de797c64a1541ad0f1e2ea8a7a7b492" - integrity sha512-+JHYg9O3hd3RlICG90OPVjRkPBoiUH7PxvDVMnRiaq1g6JUgZStX514erMl0v2Dc5SkfVbm7ztqbd6qHHPn+mQ== - dependencies: - "@jest/expect-utils" "^29.4.2" - jest-get-type "^29.4.2" - jest-matcher-utils "^29.4.2" - jest-message-util "^29.4.2" - jest-util "^29.4.2" - -expect@^29.5.0: +expect@^29.0.0, expect@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7" integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg== @@ -10479,7 +10217,7 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.2, fast-glob@^3.2.5, fast-glob@^3.2.9: +fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -10593,9 +10331,9 @@ fetch-mock@9.11.0: whatwg-url "^6.5.0" fetch-retry@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.3.tgz#edfa3641892995f9afee94f25b168827aa97fe3d" - integrity sha512-uJQyMrX5IJZkhoEUBQ3EjxkeiZkppBd5jS/fMTJmfZxLSiaQjv2zD0kTvuvkSH89uFvgSlB6ueGpjD3HWN7Bxw== + version "5.0.6" + resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.6.tgz#17d0bc90423405b7a88b74355bf364acd2a7fa56" + integrity sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ== figures@3.2.x, figures@^3.0.0, figures@^3.2.0: version "3.2.0" @@ -10611,13 +10349,21 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +file-system-cache@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-2.3.0.tgz#201feaf4c8cd97b9d0d608e96861bb6005f46fe6" + integrity sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ== + dependencies: + fs-extra "11.1.1" + ramda "0.29.0" + file-system-cache@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-2.0.2.tgz#6b51d58c5786302146fa883529e0d7f88896e948" - integrity sha512-lp4BHO4CWqvRyx88Tt3quZic9ZMf4cJyquYq7UI8sH42Bm2ArlBBjKQAalZOo+UfaBassb7X123Lik5qZ/tSAA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-2.4.1.tgz#4e02ea62b9cdea9874909685131f7fe852fc5ff6" + integrity sha512-mzEiUdjzqhxwppIJVSBq8C9evWM1j0v/lCg7gFMDiQDQPlQSm8kRfXSPFScT1p/Fxy0N2LSIps6g28e8itumlg== dependencies: - fs-extra "^11.1.0" - ramda "^0.28.0" + fs-extra "11.1.1" + ramda "0.29.0" file-type@^17.1.6: version "17.1.6" @@ -10633,7 +10379,7 @@ file-uri-to-path@2: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba" integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg== -filelist@^1.0.1: +filelist@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== @@ -10774,9 +10520,9 @@ flatted@^3.1.0, flatted@^3.2.5: integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== flow-parser@0.*: - version "0.203.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.203.1.tgz#04180e57e6b8b658212bd4371017d11bf917b257" - integrity sha512-Nw2M8MPP/Zb+yhvmPDEjzkCXLtgyWGKXZjAYOVftm+wIf3xd4FKa7nRI9v67rODs0WzxMbPc8IPs/7o/dyxo/Q== + version "0.210.1" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.210.1.tgz#6e04775dc2ebd5bde6a37de38532836678a5ac3e" + integrity sha512-M0SdOwD0wZHhk6K/AOaPReBnw2vB7p9KUFUFZHJRsU3ZMl/+WVrMpmb8AfEM6GXZ5mEssCx9vHugxxJg1ieoew== follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9: version "1.15.2" @@ -10885,19 +10631,19 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^10.0.0, fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== +fs-extra@11.1.1, fs-extra@^11.1.0: + version "11.1.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" + integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.1.0: - version "11.1.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" - integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -10938,10 +10684,10 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" -fs-monkey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== +fs-monkey@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747" + integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ== fs.realpath@^1.0.0: version "1.0.0" @@ -10983,7 +10729,7 @@ function.prototype.name@^1.1.5: es-abstract "^1.19.0" functions-have-names "^1.2.2" -functions-have-names@^1.2.2: +functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -11014,12 +10760,13 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-npm-tarball-url@^2.0.3: @@ -11062,10 +10809,12 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -get-tsconfig@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.4.0.tgz#64eee64596668a81b8fce18403f94f245ee0d4e5" - integrity sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ== +get-tsconfig@^4.5.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.6.2.tgz#831879a5e6c2aa24fe79b60340e2233a1e0f472e" + integrity sha512-E5XrT4CbbXcXWy+1jChlZmrmCwd5KGx502kDCXJJ7y898TtWW9FwoG5HfOLVRKmlmDGkWN2HM9Ho+/Y8F0sJDg== + dependencies: + resolve-pkg-maps "^1.0.0" get-uri@3: version "3.0.2" @@ -11169,9 +10918,9 @@ glob-parent@^6.0.2: is-glob "^4.0.3" glob-promise@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-6.0.2.tgz#7c7f2a223e3aaa8f7bd7ff5f24d0ab2352724b31" - integrity sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ== + version "6.0.3" + resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-6.0.3.tgz#e6b3ab02d350b3f4b3e15b57e4485986e41ba2fe" + integrity sha512-m+kxywR5j/2Z2V9zvHKfwwL5Gp7gIFEBX+deTB9w2lJB+wSuw9kcS43VfvTAMk8TXL5JCl/cCjsR+tgNVspGyA== dependencies: "@types/glob" "^8.0.0" @@ -11250,11 +10999,6 @@ globalthis@^1.0.3: dependencies: define-properties "^1.1.3" -globalyzer@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" - integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== - globby@^11.0.0, globby@^11.0.1, globby@^11.0.2, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -11267,10 +11011,10 @@ globby@^11.0.0, globby@^11.0.1, globby@^11.0.2, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -globby@^13.1.2: - version "13.1.3" - resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff" - integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw== +globby@^13.1.3: + version "13.2.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.0.tgz#7dd5678d765c4680c2e6d106230d86cb727cb1af" + integrity sha512-jWsQfayf13NvqKUIL3Ta+CIqMnvlaIDFveWE/dpOZ9+3AMEJozsxDvKA02zync9UuvOM8rOXzsD5GqKP4OnWPQ== dependencies: dir-glob "^3.0.1" fast-glob "^3.2.11" @@ -11297,11 +11041,6 @@ globjoin@^0.1.4: resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg== -globrex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" - integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== - gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -11309,7 +11048,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -got@^11.7.0, got@^11.8.5: +got@^11.8.5: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== @@ -11326,12 +11065,7 @@ got@^11.7.0, got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -graceful-fs@^4.1.5: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -11341,6 +11075,11 @@ grapheme-splitter@^1.0.4: resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + gunzip-maybe@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac" @@ -11479,9 +11218,9 @@ has@^1.0.3: function-bind "^1.1.1" hast-util-from-parse5@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-7.1.1.tgz#1887b4dd4e19f29d9c48c2e1c8bfeaac13a1f3a0" - integrity sha512-R6PoNcUs89ZxLJmMWsVbwSWuz95/9OriyQZ3e2ybwqGsRXzhA6gv49rgGmQvLbZuSNDv9fCg7vV7gXUsvtUFaA== + version "7.1.2" + resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-7.1.2.tgz#aecfef73e3ceafdfa4550716443e4eb7b02e22b0" + integrity sha512-Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw== dependencies: "@types/hast" "^2.0.0" "@types/unist" "^2.0.0" @@ -11636,9 +11375,9 @@ html-encoding-sniffer@^3.0.0: whatwg-encoding "^2.0.0" html-entities@^2.1.0, html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== + version "2.4.0" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061" + integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ== html-escaper@^2.0.0: version "2.0.2" @@ -11672,9 +11411,9 @@ html-minifier-terser@^6.0.2: terser "^5.10.0" html-tags@^3.1.0, html-tags@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" - integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce" + integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ== html-tokenize@^2.0.0: version "2.0.1" @@ -11693,9 +11432,9 @@ html-void-elements@^2.0.0: integrity sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A== html-webpack-plugin@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== + version "5.5.3" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz#72270f4a78e222b5825b296e5e3e1328ad525a3e" + integrity sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg== dependencies: "@types/html-minifier-terser" "^6.0.0" html-minifier-terser "^6.0.2" @@ -11703,7 +11442,7 @@ html-webpack-plugin@^5.5.0: pretty-error "^4.0.0" tapable "^2.0.0" -htmlparser2@8.0.1, htmlparser2@^8.0.0: +htmlparser2@8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== @@ -11733,6 +11472,16 @@ htmlparser2@^7.2.0: domutils "^2.8.0" entities "^3.0.1" +htmlparser2@^8.0.0: + version "8.0.2" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + entities "^4.4.0" + http-cache-semantics@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" @@ -12006,7 +11755,7 @@ inquirer@8.2.5: through "^2.3.6" wrap-ansi "^7.0.0" -internal-slot@^1.0.3, internal-slot@^1.0.4: +internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== @@ -12041,9 +11790,9 @@ ipaddr.js@1.9.1: integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== + version "2.1.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f" + integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ== is-absolute-url@^3.0.0: version "3.0.3" @@ -12085,13 +11834,13 @@ is-arguments@^1.0.4, is-arguments@^1.1.1: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-array-buffer@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a" - integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ== +is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" + integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== dependencies: call-bind "^1.0.2" - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.0" is-typed-array "^1.1.10" is-arrayish@^0.2.1: @@ -12131,7 +11880,7 @@ is-buffer@^2.0.0: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.7: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -12143,10 +11892,10 @@ is-ci@^3.0.0, is-ci@^3.0.1: dependencies: ci-info "^3.2.0" -is-core-module@^2.10.0, is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== +is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0: + version "2.12.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" + integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== dependencies: has "^1.0.3" @@ -12204,6 +11953,11 @@ is-docker@^2.0.0, is-docker@^2.1.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -12267,6 +12021,13 @@ is-hexadecimal@^1.0.0: resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-installed-globally@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" @@ -12490,11 +12251,6 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -is@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/is/-/is-3.3.0.tgz#61cff6dd3c4193db94a3d62582072b44e5645d79" - integrity sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg== - isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -12583,14 +12339,14 @@ istanbul-reports@^3.1.3, istanbul-reports@^3.1.4: istanbul-lib-report "^3.0.0" jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + version "10.8.7" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" + integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== dependencies: async "^3.2.3" chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" + filelist "^1.0.4" + minimatch "^3.1.2" jest-changed-files@^29.5.0: version "29.5.0" @@ -12682,16 +12438,6 @@ jest-diff@^27.5.1: jest-get-type "^27.5.1" pretty-format "^27.5.1" -jest-diff@^29.4.2: - version "29.4.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.2.tgz#b88502d5dc02d97f6512d73c37da8b36f49b4871" - integrity sha512-EK8DSajVtnjx9sa1BkjZq3mqChm2Cd8rIzdXkQMA8e0wuXq53ypz6s5o5V8HRZkoEt2ywJ3eeNWFKWeYr8HK4g== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.4.2" - jest-get-type "^29.4.2" - pretty-format "^29.4.2" - jest-diff@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" @@ -12751,11 +12497,6 @@ jest-get-type@^27.5.1: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== -jest-get-type@^29.4.2: - version "29.4.2" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.2.tgz#7cb63f154bca8d8f57364d01614477d466fa43fe" - integrity sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg== - jest-get-type@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" @@ -12798,16 +12539,6 @@ jest-matcher-utils@^27.0.0: jest-get-type "^27.5.1" pretty-format "^27.5.1" -jest-matcher-utils@^29.4.2: - version "29.4.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.2.tgz#08d0bf5abf242e3834bec92c7ef5071732839e85" - integrity sha512-EZaAQy2je6Uqkrm6frnxBIdaWtSYFoR8SVb2sNLAtldswlR/29JAgx+hy67llT3+hXBaLB0zAm5UfeqerioZyg== - dependencies: - chalk "^4.0.0" - jest-diff "^29.4.2" - jest-get-type "^29.4.2" - pretty-format "^29.4.2" - jest-matcher-utils@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5" @@ -12818,21 +12549,6 @@ jest-matcher-utils@^29.5.0: jest-get-type "^29.4.3" pretty-format "^29.5.0" -jest-message-util@^29.4.2: - version "29.4.2" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.2.tgz#309a2924eae6ca67cf7f25781a2af1902deee717" - integrity sha512-SElcuN4s6PNKpOEtTInjOAA8QvItu0iugkXqhYyguRvQoXapg5gN+9RQxLAkakChZA7Y26j6yUCsFWN+hlKD6g== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^29.4.2" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^29.4.2" - slash "^3.0.0" - stack-utils "^2.0.3" - jest-message-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e" @@ -12979,18 +12695,6 @@ jest-teamcity-reporter@0.9.0: resolved "https://registry.yarnpkg.com/jest-teamcity-reporter/-/jest-teamcity-reporter-0.9.0.tgz#a9f337a928a14e7e84163817456b930ecf7cbce8" integrity sha512-q6W+ZaJSCIXmxC9wsY67zNn+vwG/EgKJygYJYH860jih5zS6mc2ZFc4v78gh6rgzgM9/siUtQm7SnRunYuWmVw== -jest-util@^29.4.2: - version "29.4.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.2.tgz#3db8580b295df453a97de4a1b42dd2578dabd2c2" - integrity sha512-wKnm6XpJgzMUSRFB7YF48CuwdzuDIHenVuoIb1PLuJ6F+uErZsuDkU+EiExkChf6473XcawBrSfDSnXl+/YG4g== - dependencies: - "@jest/types" "^29.4.2" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - jest-util@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" @@ -13064,9 +12768,9 @@ jmespath@0.16.0: integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== joi@^17.7.0: - version "17.7.1" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.1.tgz#854fc85c7fa3cfc47c91124d30bffdbb58e06cec" - integrity sha512-teoLhIvWE298R6AeJywcjR4sX2hHjB3/xJX4qPjg+gTg+c0mzUDsziYlqPmLomq9gVsfaMcgPaGc7VxtD/9StA== + version "17.9.2" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.9.2.tgz#8b2e4724188369f55451aebd1d0b1d9482470690" + integrity sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" @@ -13090,16 +12794,16 @@ js-git@^0.7.8: pako "^0.2.5" js-sdsl@^4.1.4: - version "4.3.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" - integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.1.tgz#9e3c7b566d8d9a7e1fe8fc26d00b5ab0f8918ab3" + integrity sha512-6Gsx8R0RucyePbWqPssR8DyfuXmLBooYN5cZFZKjHGnQuaf7pEzhtpceagJxVu4LqhYY5EYA7nko3FmeHZ1KbA== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.1, js-yaml@^3.6.1: +js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.1, js-yaml@^3.6.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -13144,7 +12848,36 @@ jscodeshift@^0.14.0: temp "^0.8.4" write-file-atomic "^2.3.0" -jsdom@20.0.3, jsdom@^20.0.0: +jsdom@22.1.0: + version "22.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8" + integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw== + dependencies: + abab "^2.0.6" + cssstyle "^3.0.0" + data-urls "^4.0.0" + decimal.js "^10.4.3" + domexception "^4.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.4" + parse5 "^7.1.2" + rrweb-cssom "^0.6.0" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.1" + ws "^8.13.0" + xml-name-validator "^4.0.0" + +jsdom@^20.0.0: version "20.0.3" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== @@ -13191,17 +12924,6 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-file-plus@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/json-file-plus/-/json-file-plus-3.3.1.tgz#f4363806b82819ff8803d83d539d6a9edd2a5258" - integrity sha512-wo0q1UuiV5NsDPQDup1Km8IwEeqe+olr8tkWxeJq9Bjtcp7DZ0l+yrg28fSC3DEtrE311mhTZ54QGS6oiqnZEA== - dependencies: - is "^3.2.1" - node.extend "^2.0.0" - object.assign "^4.1.0" - promiseback "^2.0.2" - safer-buffer "^2.0.2" - json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -13237,7 +12959,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^1.0.1: +json5@^1.0.1, json5@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== @@ -13286,12 +13008,14 @@ jsprim@^2.0.2: verror "1.10.0" "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea" - integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw== + version "3.3.4" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz#b896535fed5b867650acce5a9bd4135ffc7b3bf9" + integrity sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw== dependencies: - array-includes "^3.1.5" - object.assign "^4.1.3" + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + object.assign "^4.1.4" + object.values "^1.1.6" junk@^3.1.0: version "3.1.0" @@ -13579,86 +13303,31 @@ lodash.camelcase@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== -lodash.clone@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" - integrity sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg== - -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== - -lodash.constant@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.constant/-/lodash.constant-3.0.0.tgz#bfe05cce7e515b3128925d6362138420bd624910" - integrity sha512-X5XMrB+SdI1mFa81162NSTo/YNd23SLdLOLzcXTwS4inDZ5YCL8X67UFzZJAH4CqIa6R8cr56CShfA5K5MFiYQ== - lodash.debounce@4.0.8, lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.filter@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ== - -lodash.flatmap@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e" - integrity sha512-/OcpcAGWlrZyoHGeHh3cAoa6nGdX6QYtmzNP84Jqol6UEQQ2gIaU3H+0eICcjcKGl0/XF8LWOujNn9lffsnaOg== - -lodash.foreach@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ== - lodash.get@4.4.2, lodash.get@^4.0: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== -lodash.has@^4.0, lodash.has@^4.5.2: +lodash.has@^4.0: version "4.5.2" resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" integrity sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g== -lodash.isempty@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" - integrity sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg== - lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== -lodash.isfunction@^3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" - integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== - -lodash.isundefined@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" - integrity sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA== - lodash.kebabcase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== -lodash.keys@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" - integrity sha512-J79MkJcp7Df5mizHiVNpjoHXLi4HLjh9VLS/M7lQSGoQ+0oQ+lWEigREkqKyizPB1IawvQLLKY8mzEcm1tkyxQ== - -lodash.map@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q== - lodash.merge@^4.6.0, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -13669,16 +13338,6 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== -lodash.reduce@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - integrity sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw== - -lodash.size@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.size/-/lodash.size-4.2.0.tgz#71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86" - integrity sha512-wbu3SF1XC5ijqm0piNxw59yCbuUf2kaShumYBLWUrcCvwh6C8odz6SY/wGVzCWTQTFL/1Ygbvqg2eLtspUVVAQ== - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -13689,36 +13348,16 @@ lodash.startcase@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg== -lodash.topairs@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.topairs/-/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64" - integrity sha512-qrRMbykBSEGdOgQLJJqVSdPWMD7Q+GJJ5jMRfQYb+LTLsw3tYVIabnCzRqTJb2WTo17PG5gNzXuFaZgYH/9SAQ== - -lodash.transform@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" - integrity sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ== - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== -lodash.union@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw== - lodash.upperfirst@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash.values@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" - integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q== - lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -13822,11 +13461,6 @@ lru_map@^0.3.3: resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ== -lz-string@^1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" - integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== - lz-string@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941" @@ -13899,9 +13533,9 @@ markdown-table@^2.0.0: repeat-string "^1.0.0" markdown-to-jsx@^7.1.8: - version "7.2.0" - resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.2.0.tgz#e7b46b65955f6a04d48a753acd55874a14bdda4b" - integrity sha512-3l4/Bigjm4bEqjCR6Xr+d4DtM1X6vvtGsMGSjJYyep8RjjIvcWtrXBS8Wbfe1/P+atKNMccpsraESIaWVplzVg== + version "7.2.1" + resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.2.1.tgz#87061fd3176ad926ef3d99493e5c57f6335e0c51" + integrity sha512-9HrdzBAo0+sFz9ZYAGT5fB8ilzTW+q6lPocRxrIesMO+aB40V9MgFfbfMXxlGjf22OpRy+IXlvVaQenicdpgbg== mathml-tag-names@^2.1.3: version "2.1.3" @@ -13953,9 +13587,9 @@ mdast-util-from-markdown@^0.8.0: unist-util-stringify-position "^2.0.0" mdast-util-from-markdown@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.0.tgz#0214124154f26154a2b3f9d401155509be45e894" - integrity sha512-HN3W1gRIuN/ZW295c7zi7g9lVBllMgZE40RxCX37wrTPWXCWtpvOZdfnuK+1WNpvZje6XuJeI3Wnb4TJEUem+g== + version "1.3.1" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz#9421a5a247f10d31d2faed2a30df5ec89ceafcf0" + integrity sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww== dependencies: "@types/mdast" "^3.0.0" "@types/unist" "^2.0.0" @@ -14056,9 +13690,9 @@ mdast-util-to-string@^2.0.0: integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== mdast-util-to-string@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz#db859050d79d48cf9896d294de06f3ede7474d16" - integrity sha512-tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz#66f7bb6324756741c5f47a53557f0cbf16b6f789" + integrity sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg== dependencies: "@types/mdast" "^3.0.0" @@ -14068,11 +13702,11 @@ media-typer@0.3.0: integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== memfs@^3.4.1, memfs@^3.4.3: - version "3.4.13" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345" - integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg== + version "3.6.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" + integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== dependencies: - fs-monkey "^1.0.3" + fs-monkey "^1.0.4" memoizerific@^1.11.3: version "1.11.3" @@ -14142,9 +13776,9 @@ methods@~1.1.2: integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== micromark-core-commonmark@^1.0.1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz#edff4c72e5993d93724a3c206970f5a15b0585ad" - integrity sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz#1386628df59946b2d39fb2edfd10f3e8e0a75bb8" + integrity sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw== dependencies: decode-named-character-reference "^1.0.0" micromark-factory-destination "^1.0.0" @@ -14223,18 +13857,18 @@ micromark-extension-gfm@^0.3.0: micromark-extension-gfm-task-list-item "~0.3.0" micromark-factory-destination@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e" - integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz#eb815957d83e6d44479b3df640f010edad667b9f" + integrity sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg== dependencies: micromark-util-character "^1.0.0" micromark-util-symbol "^1.0.0" micromark-util-types "^1.0.0" micromark-factory-label@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz#6be2551fa8d13542fcbbac478258fb7a20047137" - integrity sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz#cc95d5478269085cfa2a7282b3de26eb2e2dec68" + integrity sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w== dependencies: micromark-util-character "^1.0.0" micromark-util-symbol "^1.0.0" @@ -14242,28 +13876,27 @@ micromark-factory-label@^1.0.0: uvu "^0.5.0" micromark-factory-space@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633" - integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz#c8f40b0640a0150751d3345ed885a080b0d15faf" + integrity sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ== dependencies: micromark-util-character "^1.0.0" micromark-util-types "^1.0.0" micromark-factory-title@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz#7e09287c3748ff1693930f176e1c4a328382494f" - integrity sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz#dd0fe951d7a0ac71bdc5ee13e5d1465ad7f50ea1" + integrity sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ== dependencies: micromark-factory-space "^1.0.0" micromark-util-character "^1.0.0" micromark-util-symbol "^1.0.0" micromark-util-types "^1.0.0" - uvu "^0.5.0" micromark-factory-whitespace@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c" - integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz#798fb7489f4c8abafa7ca77eed6b5745853c9705" + integrity sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ== dependencies: micromark-factory-space "^1.0.0" micromark-util-character "^1.0.0" @@ -14271,48 +13904,48 @@ micromark-factory-whitespace@^1.0.0: micromark-util-types "^1.0.0" micromark-util-character@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86" - integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg== + version "1.2.0" + resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.2.0.tgz#4fedaa3646db249bc58caeb000eb3549a8ca5dcc" + integrity sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg== dependencies: micromark-util-symbol "^1.0.0" micromark-util-types "^1.0.0" micromark-util-chunked@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06" - integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz#37a24d33333c8c69a74ba12a14651fd9ea8a368b" + integrity sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ== dependencies: micromark-util-symbol "^1.0.0" micromark-util-classify-character@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20" - integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz#6a7f8c8838e8a120c8e3c4f2ae97a2bff9190e9d" + integrity sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw== dependencies: micromark-util-character "^1.0.0" micromark-util-symbol "^1.0.0" micromark-util-types "^1.0.0" micromark-util-combine-extensions@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5" - integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz#192e2b3d6567660a85f735e54d8ea6e3952dbe84" + integrity sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA== dependencies: micromark-util-chunked "^1.0.0" micromark-util-types "^1.0.0" micromark-util-decode-numeric-character-reference@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946" - integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz#b1e6e17009b1f20bc652a521309c5f22c85eb1c6" + integrity sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw== dependencies: micromark-util-symbol "^1.0.0" micromark-util-decode-string@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz#942252ab7a76dec2dbf089cc32505ee2bc3acf02" - integrity sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz#dc12b078cba7a3ff690d0203f95b5d5537f2809c" + integrity sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ== dependencies: decode-named-character-reference "^1.0.0" micromark-util-character "^1.0.0" @@ -14320,42 +13953,42 @@ micromark-util-decode-string@^1.0.0: micromark-util-symbol "^1.0.0" micromark-util-encode@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz#2c1c22d3800870ad770ece5686ebca5920353383" - integrity sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz#92e4f565fd4ccb19e0dcae1afab9a173bbeb19a5" + integrity sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw== micromark-util-html-tag-name@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz#eb227118befd51f48858e879b7a419fc0df20497" - integrity sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz#48fd7a25826f29d2f71479d3b4e83e94829b3588" + integrity sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q== micromark-util-normalize-identifier@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828" - integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz#7a73f824eb9f10d442b4d7f120fecb9b38ebf8b7" + integrity sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q== dependencies: micromark-util-symbol "^1.0.0" micromark-util-resolve-all@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88" - integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz#4652a591ee8c8fa06714c9b54cd6c8e693671188" + integrity sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA== dependencies: micromark-util-types "^1.0.0" micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz#f12e07a85106b902645e0364feb07cf253a85aee" - integrity sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg== + version "1.2.0" + resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz#613f738e4400c6eedbc53590c67b197e30d7f90d" + integrity sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A== dependencies: micromark-util-character "^1.0.0" micromark-util-encode "^1.0.0" micromark-util-symbol "^1.0.0" micromark-util-subtokenize@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz#ff6f1af6ac836f8bfdbf9b02f40431760ad89105" - integrity sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz#941c74f93a93eaf687b9054aeb94642b0e92edb1" + integrity sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A== dependencies: micromark-util-chunked "^1.0.0" micromark-util-symbol "^1.0.0" @@ -14363,14 +13996,14 @@ micromark-util-subtokenize@^1.0.0: uvu "^0.5.0" micromark-util-symbol@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz#b90344db62042ce454f351cf0bebcc0a6da4920e" - integrity sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz#813cd17837bdb912d069a12ebe3a44b6f7063142" + integrity sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag== micromark-util-types@^1.0.0, micromark-util-types@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.2.tgz#f4220fdb319205812f99c40f8c87a9be83eded20" - integrity sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.1.0.tgz#e6676a8cae0bb86a2171c498167971886cb7e283" + integrity sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg== micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3: version "2.11.4" @@ -14381,9 +14014,9 @@ micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3: parse-entities "^2.0.0" micromark@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.1.0.tgz#eeba0fe0ac1c9aaef675157b52c166f125e89f62" - integrity sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.2.0.tgz#1af9fef3f995ea1ea4ac9c7e2f19c48fd5c006e9" + integrity sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA== dependencies: "@types/debug" "^4.0.0" debug "^4.0.0" @@ -14522,10 +14155,10 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minipass@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72" - integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== minizlib@^2.1.1: version "2.1.2" @@ -14558,7 +14191,7 @@ mkdirp@1.0.4, mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@^0.5.1, mkdirp@^0.5.4: +mkdirp@^0.5.4: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -14576,13 +14209,13 @@ module-details-from-path@^1.0.3: integrity sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A== moment-timezone@^0.5.x: - version "0.5.40" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89" - integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg== + version "0.5.43" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790" + integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ== dependencies: - moment ">= 2.9.0" + moment "^2.29.4" -"moment@>= 2.9.0": +moment@^2.29.4: version "2.29.4" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -14638,10 +14271,10 @@ mute-stream@0.0.8, mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nanoid@^3.3.1, nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== +nanoid@^3.3.1, nanoid@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== nanomatch@^1.2.9: version "1.2.13" @@ -14730,9 +14363,9 @@ node-dir@^0.1.10, node-dir@^0.1.17: minimatch "^3.0.2" node-fetch-native@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.0.2.tgz#de3651399fda89a1a7c0bf6e7c4e9c239e8d0697" - integrity sha512-KIkvH1jl6b3O7es/0ShyCgWLcfXxlBrLBbP3rOr23WArC66IMcU4DeZEeYEOwnopYhawLTn7/y+YtmASe8DFVQ== + version "1.2.0" + resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.2.0.tgz#13ec6df98f33168958dbfb6945f10aedf42e7ea8" + integrity sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ== node-fetch@2.6.7: version "2.6.7" @@ -14742,9 +14375,9 @@ node-fetch@2.6.7: whatwg-url "^5.0.0" node-fetch@^2.6.1, node-fetch@^2.6.7: - version "2.6.9" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== + version "2.6.11" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" + integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== dependencies: whatwg-url "^5.0.0" @@ -14763,19 +14396,6 @@ node-releases@^2.0.12: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== -node-releases@^2.0.8: - version "2.0.10" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" - integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== - -node.extend@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-2.0.2.tgz#b4404525494acc99740f3703c496b7d5182cc6cc" - integrity sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ== - dependencies: - has "^1.0.3" - is "^3.2.1" - nodemon@2.0.20: version "2.0.20" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.20.tgz#e3537de768a492e8d74da5c5813cb0c7486fc701" @@ -14890,10 +14510,10 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -nwsapi@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" - integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== +nwsapi@^2.2.2, nwsapi@^2.2.4: + version "2.2.5" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2" + integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ== object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" @@ -14909,12 +14529,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-hash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" - integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== - -object-inspect@^1.12.2, object-inspect@^1.12.3, object-inspect@^1.9.0: +object-inspect@^1.12.3, object-inspect@^1.9.0: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== @@ -14949,7 +14564,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.3, object.assign@^4.1.4: +object.assign@^4.1.2, object.assign@^4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -15030,13 +14645,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -once@~1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" - integrity sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w== - dependencies: - wrappy "1" - onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" @@ -15060,14 +14668,24 @@ open@^7.0.3: is-wsl "^2.1.1" open@^8.0.9, open@^8.4.0: - version "8.4.1" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.1.tgz#2ab3754c07f5d1f99a7a8d6a82737c95e3101cff" - integrity sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg== + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== dependencies: define-lazy-prop "^2.0.0" is-docker "^2.1.1" is-wsl "^2.2.0" +open@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6" + integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg== + dependencies: + default-browser "^4.0.0" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^2.2.0" + opener@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" @@ -15091,16 +14709,16 @@ optionator@^0.8.1: word-wrap "~1.2.3" optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" - word-wrap "^1.2.3" ora@^5.4.1: version "5.4.1" @@ -15268,11 +14886,6 @@ pac-resolver@^5.0.0: ip "^1.1.5" netmask "^2.0.2" -packageurl-js@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/packageurl-js/-/packageurl-js-1.0.0.tgz#188ed35688d44a0684476e7af5b6c6835c3c5533" - integrity sha512-06kNFU+yB2pjDf5JyXouQeKfwSScGP8hrZK6VgB+W4SlVy4y5yB4vl+AVmh3R0GBNd+fBt0dEiSx3HKmuchuJQ== - pako@^0.2.5, pako@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" @@ -15342,7 +14955,7 @@ parse-url@^8.1.0: dependencies: parse-path "^7.0.0" -parse5@7.1.2, parse5@^7.0.0, parse5@^7.1.1: +parse5@*, parse5@7.1.2, parse5@^7.0.0, parse5@^7.1.1, parse5@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== @@ -15458,9 +15071,9 @@ path-type@^4.0.0: integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pathe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.0.tgz#e2e13f6c62b31a3289af4ba19886c230f295ec03" - integrity sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w== + version "1.1.1" + resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a" + integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q== pause-stream@0.0.11: version "0.0.11" @@ -15541,9 +15154,9 @@ pify@^4.0.1: integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pirates@^4.0.4, pirates@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== pkg-dir@^3.0.0: version "3.0.0" @@ -15578,11 +15191,6 @@ platform@1.3.3: resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.3.tgz#646c77011899870b6a0903e75e997e8e51da7461" integrity sha512-VJK1SRmXBpjwsB4YOHYSturx48rLKMzHgCqDH2ZDa6ZbMS/N5huoNqyQdK5Fj/xayu3fqbXckn5SeCS1EbMDZg== -pluralize@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" - integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== - pm2-axon-rpc@~0.7.0, pm2-axon-rpc@~0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/pm2-axon-rpc/-/pm2-axon-rpc-0.7.1.tgz#2daec5383a63135b3f18babb70266dacdcbc429a" @@ -15685,10 +15293,10 @@ postcss-modules-extract-imports@^3.0.0: resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== +postcss-modules-local-by-default@^4.0.0, postcss-modules-local-by-default@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524" + integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA== dependencies: icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" @@ -15719,9 +15327,9 @@ postcss-safe-parser@^6.0.0: integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.11" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== + version "6.0.13" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" + integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -15739,12 +15347,12 @@ postcss@^7.0.26: picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.3.11, postcss@^8.4.19: - version "8.4.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" - integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== +postcss@^8.3.11, postcss@^8.4.19, postcss@^8.4.21: + version "8.4.24" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df" + integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg== dependencies: - nanoid "^3.3.4" + nanoid "^3.3.6" picocolors "^1.0.0" source-map-js "^1.0.2" @@ -15760,7 +15368,7 @@ preact@10.15.1: resolved "https://registry.yarnpkg.com/preact/-/preact-10.15.1.tgz#a1de60c9fc0c79a522d969c65dcaddc5d994eede" integrity sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g== -prebid.js@guardian/prebid.js#2e3b96d: +"prebid.js@github:guardian/prebid.js": version "7.26.0" resolved "https://codeload.github.com/guardian/prebid.js/tar.gz/2e3b96dc57dfe14ed8c418674ee7a0a150ece7cb" dependencies: @@ -15822,12 +15430,7 @@ prettier-eslint@15.0.1: typescript "^4.5.4" vue-eslint-parser "^8.0.1" -prettier@^2.5.1, prettier@^2.8.0: - version "2.8.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3" - integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw== - -prettier@^2.7.1: +prettier@^2.5.1, prettier@^2.7.1, prettier@^2.8.0, prettier@^2.8.8: version "2.8.8" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== @@ -15837,7 +15440,7 @@ pretty-bytes@6.1.0: resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.1.0.tgz#1d1cc9aae1939012c74180b679da6684616bf804" integrity sha512-Rk753HI8f4uivXi4ZCIYdhmG1V+WKzvRMg/X+M42a6t7D07RcmopXJMDNk6N++7Bl75URRGsb40ruvg7Hcp2wQ== -pretty-bytes@^5.1.0, pretty-bytes@^5.6.0: +pretty-bytes@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== @@ -15867,16 +15470,7 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1: ansi-styles "^5.0.0" react-is "^17.0.1" -pretty-format@^29.0.0, pretty-format@^29.4.2: - version "29.4.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.2.tgz#64bf5ccc0d718c03027d94ac957bdd32b3fb2401" - integrity sha512-qKlHR8yFVCbcEWba0H0TOC8dnLlO4vPlyEjRPw31FZ2Rupy9nLa8ZLbYny8gWEl8CkEhJqAE6IzdNELTBVcBEg== - dependencies: - "@jest/schemas" "^29.4.2" - ansi-styles "^5.0.0" - react-is "^18.0.0" - -pretty-format@^29.5.0: +pretty-format@^29.0.0, pretty-format@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a" integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw== @@ -15910,13 +15504,6 @@ progress@^2.0.1: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise-deferred@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/promise-deferred/-/promise-deferred-2.0.3.tgz#b99c9588820798501862a593d49cece51d06fd7f" - integrity sha512-n10XaoznCzLfyPFOlEE8iurezHpxrYzyjgq/1eW9Wk1gJwur/N7BdBmjJYJpqMeMcXK4wEbzo2EvZQcqjYcKUQ== - dependencies: - promise "^7.3.1" - promise@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" @@ -15924,21 +15511,6 @@ promise@8.1.0: dependencies: asap "~2.0.6" -promise@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - -promiseback@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/promiseback/-/promiseback-2.0.3.tgz#bd468d86930e8cd44bfc3292de9a6fbafb6378e6" - integrity sha512-VZXdCwS0ppVNTIRfNsCvVwJAaP2b+pxQF7lM8DMWfmpNWyTxB6O5YNbzs+8z0ki/KIBHKHk308NTIl4kJUem3w== - dependencies: - is-callable "^1.1.5" - promise-deferred "^2.0.3" - promptly@^2: version "2.2.0" resolved "https://registry.yarnpkg.com/promptly/-/promptly-2.2.0.tgz#2a13fa063688a2a5983b161fff0108a07d26fc74" @@ -16083,13 +15655,20 @@ pure-rand@^6.0.0: resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306" integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ== -qs@6.11.0, qs@^6.10.0: +qs@6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" +qs@^6.10.0: + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + dependencies: + side-channel "^1.0.4" + qs@~6.10.3: version "6.10.5" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" @@ -16135,14 +15714,14 @@ quick-lru@^5.1.1: integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== rambda@^7.1.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.4.0.tgz#61ec9de31d3dd6affe804de3bae04a5b818781e5" - integrity sha512-A9hihu7dUTLOUCM+I8E61V4kRXnN4DwYeK0DwCBydC1MqNI1PidyAtbtpsJlBBzK4icSctEcCQ1bGcLpBuETUQ== + version "7.5.0" + resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe" + integrity sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA== -ramda@^0.28.0: - version "0.28.0" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97" - integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA== +ramda@0.29.0: + version "0.29.0" + resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.29.0.tgz#fbbb67a740a754c8a4cbb41e2a6e0eb8507f55fb" + integrity sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA== randombytes@^2.1.0: version "2.1.0" @@ -16161,7 +15740,7 @@ raven-js@^3.27.2: resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775" integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ== -raw-body@2.5.1, raw-body@^2.2.0: +raw-body@2.5.1: version "2.5.1" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== @@ -16171,6 +15750,16 @@ raw-body@2.5.1, raw-body@^2.2.0: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@^2.2.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + react-async-script@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/react-async-script/-/react-async-script-1.2.0.tgz#ab9412a26f0b83f5e2e00de1d2befc9400834b21" @@ -16231,9 +15820,9 @@ react-google-recaptcha@2.1.0: react-async-script "^1.1.1" react-inspector@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.1.tgz#1a37f0165d9df81ee804d63259eaaeabe841287d" - integrity sha512-cxKSeFTf7jpSSVddm66sKdolG90qURAX3g1roTeaN6x0YEbtWc8JpmFN9+yIqLNH2uEkYerWLtJZIXRIFuBKrg== + version "6.0.2" + resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.2.tgz#aa3028803550cb6dbd7344816d5c80bf39d07e9d" + integrity sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ== react-is@18.1.0: version "18.1.0" @@ -16323,9 +15912,9 @@ readable-stream@1.1.x: string_decoder "~0.10.x" readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -16336,9 +15925,9 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable util-deprecate "~1.0.1" readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -16379,9 +15968,9 @@ recast@^0.21.0: tslib "^2.0.1" recast@^0.23.1: - version "0.23.1" - resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.1.tgz#ee415a5561d2f99f02318ea8db81ad3a2267a6ff" - integrity sha512-RokaBcoxSjXUDzz1TXSZmZsSW6ZpLmlA3GGqJ8uuTrQ9hZhEz+4Tpsc+gRvYRJ2BU4H+ZyUlg91eSGDw7bwy7g== + version "0.23.2" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.2.tgz#d3dda3e8f0a3366860d7508c00e34a338ac52b41" + integrity sha512-Qv6cPfVZyMOtPszK6PgW70pUgm7gPlFitAPf0Q69rlOA0zLw2XdDcNmPbVGYicFGT9O8I7TZ/0ryJD+6COvIPw== dependencies: assert "^2.0.0" ast-types "^0.16.1" @@ -16455,33 +16044,21 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== +regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + functions-have-names "^1.2.3" regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== -regexpu-core@^5.2.1: - version "5.3.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.0.tgz#4d0d044b76fedbad6238703ae84bfdedee2cf074" - integrity sha512-ZdhUQlng0RoscyW7jADnUZ25F5eVtHdMyXSb2PiwafvteRAOJUjFoUPEYZSIfP99fBIs3maLIRfpEddT78wAAQ== - dependencies: - "@babel/regjsgen" "^0.8.0" - regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsparser "^0.9.1" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.1.0" - -regexpu-core@^5.3.1: +regexpu-core@^5.2.1, regexpu-core@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== @@ -16684,9 +16261,9 @@ requires-port@^1.0.0: integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== reselect@^4.1.7: - version "4.1.7" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42" - integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A== + version "4.1.8" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" + integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== resolve-alpn@^1.0.0: version "1.2.1" @@ -16710,6 +16287,11 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -16721,11 +16303,11 @@ resolve.exports@^2.0.0: integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + version "1.22.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" + integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== dependencies: - is-core-module "^2.9.0" + is-core-module "^2.11.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -16802,6 +16384,18 @@ rimraf@~2.6.2: dependencies: glob "^7.1.3" +rrweb-cssom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" + integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== + +run-applescript@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c" + integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg== + dependencies: + execa "^5.0.0" + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -16820,9 +16414,9 @@ run-series@^1.1.8: integrity sha512-Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g== rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0: - version "7.8.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" - integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" @@ -16865,9 +16459,9 @@ safe-regex@^1.1.0: ret "~0.1.10" safe-stable-stringify@^2.2.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz#ec7b037768098bf65310d1d64370de0dc02353aa" - integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA== + version "2.4.3" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" + integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" @@ -16919,24 +16513,24 @@ schema-utils@^2.6.5: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0, schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== +schema-utils@^3.0, schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1, schema-utils@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== dependencies: "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== + version "4.2.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" + integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== dependencies: "@types/json-schema" "^7.0.9" - ajv "^8.8.0" + ajv "^8.9.0" ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" + ajv-keywords "^5.1.0" select-hose@^2.0.0: version "2.0.0" @@ -16955,14 +16549,14 @@ semver-regex@^4.0.5: resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-4.0.5.tgz#fbfa36c7ba70461311f5debcb3928821eb4f9180" integrity sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw== -semver-truncate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-2.0.0.tgz#cce4c0af36dbd97e898b821be870d17fbfb67f56" - integrity sha512-Rh266MLDYNeML5h90ttdMwfXe1+Nc4LAWd9X1KdJe8pPHP4kFmvLZALtsMNHNdvTyQygbEC0D59sIz47DIaq8w== +semver-truncate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-3.0.0.tgz#0e3b4825d4a4225d8ae6e7c72231182b42edba40" + integrity sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg== dependencies: - semver "^6.0.0" + semver "^7.3.5" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -16972,10 +16566,10 @@ semver@6.3.0, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.0.0, semver@^7.1.2, semver@^7.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== +semver@^7.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3: + version "7.5.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" + integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== dependencies: lru-cache "^6.0.0" @@ -17008,7 +16602,7 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" -serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: +serialize-javascript@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== @@ -17105,12 +16699,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.6.1: - version "1.8.0" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba" - integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ== - -shell-quote@^1.7.3: +shell-quote@^1.6.1, shell-quote@^1.7.3: version "1.8.1" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== @@ -17261,38 +16850,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -snyk-config@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-5.1.0.tgz#d725739ede0732a7db13be4e120c90b39e496ab7" - integrity sha512-wqVMxUGqjjHX+MJrz0WHa/pJTDWU17aRv6cnI/6i7cq93J3TkkJZ8sjgvwCgP8cWX5wTHIlRuMV+IAd59K4X/g== - dependencies: - async "^3.2.0" - debug "^4.1.1" - lodash.merge "^4.6.2" - minimist "^1.2.5" - -snyk-nodejs-lockfile-parser@^1.49.0: - version "1.51.0" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.51.0.tgz#73f1a364e9e921fb35d0239e1b4b156c48a35700" - integrity sha512-uepLn2WELhgAVoYZ7QOt3nFwBVZvJAUfdDyebhb2Wqn5ftTthELzUp5/kCqxOXWoXBSg2KQIjI42U7SRq8gxLg== - dependencies: - "@snyk/dep-graph" "^2.3.0" - "@snyk/graphlib" "2.1.9-patch.3" - "@yarnpkg/core" "^2.4.0" - "@yarnpkg/lockfile" "^1.1.0" - event-loop-spinner "^2.0.0" - js-yaml "^4.1.0" - lodash.clonedeep "^4.5.0" - lodash.flatmap "^4.5.0" - lodash.isempty "^4.4.0" - lodash.topairs "^4.3.0" - micromatch "^4.0.5" - p-map "^4.0.0" - semver "^7.3.5" - snyk-config "^5.0.0" - tslib "^1.9.3" - uuid "^8.3.0" - snyk@1.1103.0: version "1.1103.0" resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.1103.0.tgz#d9ebda2d3695e4e6e9be65e85a7a66c5a7189280" @@ -17424,9 +16981,9 @@ spawndamnit@^2.0.0: signal-exit "^3.0.2" spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" @@ -17445,9 +17002,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" - integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== + version "3.0.13" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" + integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== spdy-transport@^3.0.0: version "3.0.0" @@ -17576,11 +17133,6 @@ storybook@7.0.2: dependencies: "@storybook/cli" "7.0.2" -stream-buffers@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521" - integrity sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ== - stream-combiner@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" @@ -17593,22 +17145,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -stream-to-array@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353" - integrity sha512-UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA== - dependencies: - any-promise "^1.1.0" - -stream-to-promise@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/stream-to-promise/-/stream-to-promise-2.2.0.tgz#b1edb2e1c8cb11289d1b503c08d3f2aef51e650f" - integrity sha512-HAGUASw8NT0k8JvIVutB2Y/9iBk7gpgEyAudXwNJmZERdMITGdajOa4VJfD/kNiA3TppQpTP4J+CtcHwdzKBAw== - dependencies: - any-promise "~1.3.0" - end-of-stream "~1.1.0" - stream-to-array "~2.3.0" - stream-transform@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-2.1.3.tgz#a1c3ecd72ddbf500aa8d342b0b9df38f5aa598e3" @@ -17617,9 +17153,9 @@ stream-transform@^2.1.3: mixme "^0.5.1" streamroller@^3.1.1: - version "3.1.4" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.4.tgz#844a18e795d39c1089a8216e66a1cf1151271df0" - integrity sha512-Ha1Ccw2/N5C/IF8Do6zgNe8F3jQo8MPBnMBGvX0QjNv/I97BcNRzK6/mzOpZHHK7DjMLTI3c7Xw7Y1KvdChkvw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff" + integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw== dependencies: date-format "^4.0.14" debug "^4.3.4" @@ -17631,9 +17167,9 @@ strictdom@^1.0.1: integrity sha512-cEmp9QeXXRmjj/rVp9oyiqcvyocWab/HaoN4+bwFeZ7QzykJD6L3yD4v12K1x0tHpqRqVpJevN3gW7kyM39Bqg== string-argv@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" - integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== + version "0.3.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" + integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== string-length@^4.0.1: version "4.0.2" @@ -17684,6 +17220,15 @@ string.prototype.padend@^3.0.0: define-properties "^1.1.4" es-abstract "^1.20.4" +string.prototype.trim@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" + integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + string.prototype.trimend@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" @@ -17744,9 +17289,9 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: 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" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== dependencies: ansi-regex "^6.0.1" @@ -17806,9 +17351,9 @@ strtok3@^7.0.0-alpha.9: peek-readable "^5.0.0" style-loader@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.2.tgz#eaebca714d9e462c19aa1e3599057bc363924899" - integrity sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw== + version "3.3.3" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff" + integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw== style-search@^0.1.0: version "0.1.0" @@ -17886,10 +17431,10 @@ stylelint@14.16.1: v8-compile-cache "^2.3.0" write-file-atomic "^4.0.2" -stylis@4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7" - integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA== +stylis@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51" + integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== supports-color@^2.0.0: version "2.0.0" @@ -17960,7 +17505,7 @@ synchronous-promise@^2.0.15: resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz#38901319632f946c982152586f2caf8ddc25c032" integrity sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g== -synckit@^0.8.4: +synckit@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3" integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q== @@ -17969,9 +17514,9 @@ synckit@^0.8.4: tslib "^2.5.0" systeminformation@^5.7: - version "5.17.9" - resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.17.9.tgz#8a47bc84f076982734d7b7a0c71371d23bbbfd52" - integrity sha512-inxwRLI/4qpx4o85R54/zdhNagdBGBgs0la7Vl3qBorRVKRDk0nNsDTCGzG4lOITsw1gl7LRWeG4Zsp1pC8nfg== + version "5.18.6" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.18.6.tgz#5f223eb8d1d4ad14418aa2a5cc2e7ea6c2ba8849" + integrity sha512-pLXv6kjJZ1xUcVs9SrCqbQ9y0x1rgRWxBUc8/KxpOp9IRxFGFfzVK5efsxBn/KdYog4C9rPcKk+kHNIL2SB/8Q== table@^6.8.1: version "6.8.1" @@ -17999,7 +17544,7 @@ tar-fs@^2.1.1: pump "^3.0.0" tar-stream "^2.1.4" -tar-stream@^2.0.1, tar-stream@^2.1.4: +tar-stream@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -18011,13 +17556,13 @@ tar-stream@^2.0.1, tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.1.13: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -18057,45 +17602,24 @@ term-size@^2.1.0: resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== -terser-webpack-plugin@^5.1.3: - version "5.3.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" - integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.14" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.14.1" - -terser-webpack-plugin@^5.3.1: - version "5.3.7" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7" - integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw== +terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.1, terser-webpack-plugin@^5.3.7: + version "5.3.9" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" + integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== dependencies: "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.1" - terser "^5.16.5" + terser "^5.16.8" -terser@^5.10.0, terser@^5.14.1: - version "5.16.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.3.tgz#3266017a9b682edfe019b8ecddd2abaae7b39c6b" - integrity sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q== +terser@^5.10.0, terser@^5.15.1, terser@^5.16.8: + version "5.18.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.2.tgz#ff3072a0faf21ffd38f99acc9a0ddf7b5f07b948" + integrity sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w== dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -terser@^5.15.1, terser@^5.16.5: - version "5.16.8" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.8.tgz#ccde583dabe71df3f4ed02b65eb6532e0fae15d5" - integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" commander "^2.20.0" source-map-support "~0.5.20" @@ -18144,19 +17668,16 @@ thunky@^1.0.2: resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== -tiny-glob@^0.2.9: - version "0.2.9" - resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2" - integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg== - dependencies: - globalyzer "0.1.0" - globrex "^0.1.2" - tiny-hashes@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tiny-hashes/-/tiny-hashes-1.0.1.tgz#ddbe9060312ddb4efe0a174bb3a27e1331c425a1" integrity sha512-knIN5zj4fl7kW4EBU5sLP20DWUvi/rVouvJezV0UAym2DkQaqm365Nyc8F3QEiOvunNDMxR8UhcXd1d5g+Wg1g== +titleize@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53" + integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -18245,7 +17766,7 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" -tough-cookie@4.1.2, tough-cookie@^4.1.2: +tough-cookie@4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== @@ -18255,6 +17776,16 @@ tough-cookie@4.1.2, tough-cookie@^4.1.2: universalify "^0.2.0" url-parse "^1.5.3" +tough-cookie@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -18277,6 +17808,13 @@ tr46@^3.0.0: dependencies: punycode "^2.1.1" +tr46@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469" + integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw== + dependencies: + punycode "^2.3.0" + tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -18292,11 +17830,6 @@ traverse@^0.6.7: resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.7.tgz#46961cd2d57dd8706c36664acde06a248f1173fe" integrity sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg== -treeify@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8" - integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A== - trim-lines@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338" @@ -18372,12 +17905,12 @@ ts-unused-exports@8.0.5: tsconfig-paths "^3.9.0" tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0: - version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" - integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== + version "3.14.2" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" + integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== dependencies: "@types/json5" "^0.0.29" - json5 "^1.0.1" + json5 "^1.0.2" minimist "^1.2.6" strip-bom "^3.0.0" @@ -18386,20 +17919,20 @@ tslib@1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== -tslib@2.5.0, tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== +tslib@2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" + integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== -tslib@^1.11.1, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.3: +tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.5.3: - version "2.5.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" - integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, "tslib@^2.4.1 || ^1.9.3", tslib@^2.5.0, tslib@^2.5.3: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== tsutils@^3.21.0: version "3.21.0" @@ -18428,11 +17961,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - tv4@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963" @@ -18469,6 +17997,11 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== +type-fest@3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.12.0.tgz#4ce26edc1ccc59fc171e495887ef391fe1f5280e" + integrity sha512-qj9wWsnFvVEMUDbESiilKeXeHL7FwwiFcogfhfyjmvT968RXSvnl23f1JOClTHYItsi7o501C/7qVllscUP3oA== + type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" @@ -18564,7 +18097,12 @@ typescript-tuple@^2.2.1: dependencies: typescript-compare "^0.0.2" -typescript@^4.5.4, typescript@^4.9.0: +typescript@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826" + integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw== + +typescript@^4.5.4: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== @@ -18680,9 +18218,11 @@ unist-util-is@^4.0.0: integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== unist-util-is@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.2.0.tgz#37eed0617b76c114fd34d44c201aa96fd928b309" - integrity sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ== + version "5.2.1" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.2.1.tgz#b74960e145c18dcb6226bc57933597f5486deae9" + integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw== + dependencies: + "@types/unist" "^2.0.0" unist-util-position@^4.0.0: version "4.0.4" @@ -18787,14 +18327,6 @@ untildify@^4.0.0: resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== -update-browserslist-db@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - update-browserslist-db@^1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" @@ -18884,7 +18416,7 @@ uuid@8.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== -uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2: +uuid@8.3.2, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -18914,16 +18446,7 @@ v8-compile-cache@^2.3.0: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" - integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== - dependencies: - "@jridgewell/trace-mapping" "^0.3.12" - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - -v8-to-istanbul@^9.0.1: +v8-to-istanbul@^9.0.0, v8-to-istanbul@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265" integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA== @@ -19008,7 +18531,7 @@ vizion@~2.2.1: ini "^1.3.5" js-git "^0.7.8" -vm2@^3.9.8: +vm2@^3.9.17: version "3.9.19" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.19.tgz#be1e1d7a106122c6c492b4d51c2e8b93d3ed6a4a" integrity sha512-J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg== @@ -19213,7 +18736,7 @@ webpack-format-messages@^2.0.0: dependencies: kleur "^3.0.0" -webpack-hot-middleware@2.25.3, webpack-hot-middleware@^2.25.1: +webpack-hot-middleware@2.25.3: version "2.25.3" resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz#be343ce2848022cfd854dd82820cd730998c6794" integrity sha512-IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA== @@ -19222,6 +18745,15 @@ webpack-hot-middleware@2.25.3, webpack-hot-middleware@^2.25.1: html-entities "^2.1.0" strip-ansi "^6.0.0" +webpack-hot-middleware@^2.25.1: + version "2.25.4" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.4.tgz#d8bc9e9cb664fc3105c8e83d2b9ed436bee4e193" + integrity sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w== + dependencies: + ansi-html-community "0.0.8" + html-entities "^2.1.0" + strip-ansi "^6.0.0" + webpack-hot-server-middleware@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/webpack-hot-server-middleware/-/webpack-hot-server-middleware-0.6.1.tgz#1515b2d5db3277b583b01fc59bb0d5b87dc46494" @@ -19239,7 +18771,7 @@ webpack-manifest-plugin@5.0.0: tapable "^2.0.0" webpack-sources "^2.2.0" -webpack-merge@5.8.0, webpack-merge@^5.7.3: +webpack-merge@5.8.0: version "5.8.0" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== @@ -19247,6 +18779,14 @@ webpack-merge@5.8.0, webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" +webpack-merge@^5.7.3: + version "5.9.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" + integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + webpack-messages@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/webpack-messages/-/webpack-messages-2.0.4.tgz#96faef65565d8de75f3cf7661c8a45e5ca3741bc" @@ -19287,22 +18827,22 @@ webpack-virtual-modules@^0.4.3, webpack-virtual-modules@^0.4.5: resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz#3e4008230731f1db078d9cb6f68baf8571182b45" integrity sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA== -webpack@5: - version "5.77.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.77.0.tgz#dea3ad16d7ea6b84aa55fa42f4eac9f30e7eb9b4" - integrity sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q== +webpack@5, webpack@^5: + version "5.88.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.1.tgz#21eba01e81bd5edff1968aea726e2fbfd557d3f8" + integrity sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ== dependencies: "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" + "@types/estree" "^1.0.0" + "@webassemblyjs/ast" "^1.11.5" + "@webassemblyjs/wasm-edit" "^1.11.5" + "@webassemblyjs/wasm-parser" "^1.11.5" acorn "^8.7.1" - acorn-import-assertions "^1.7.6" + acorn-import-assertions "^1.9.0" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" + enhanced-resolve "^5.15.0" + es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" @@ -19311,13 +18851,13 @@ webpack@5: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.0" + schema-utils "^3.2.0" tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" + terser-webpack-plugin "^5.3.7" watchpack "^2.4.0" webpack-sources "^3.2.3" -webpack@5.76.1, webpack@^5: +webpack@5.76.1: version "5.76.1" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c" integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ== @@ -19381,6 +18921,14 @@ whatwg-url@^11.0.0: tr46 "^3.0.0" webidl-conversions "^7.0.0" +whatwg-url@^12.0.0, whatwg-url@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c" + integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ== + dependencies: + tr46 "^4.1.1" + webidl-conversions "^7.0.0" + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -19473,16 +19021,16 @@ widest-line@^3.1.0: string-width "^4.0.0" wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" + integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== wolfy87-eventemitter@^5.2.9: version "5.2.9" resolved "https://registry.yarnpkg.com/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz#e879f770b30fbb6512a8afbb330c388591099c2a" integrity sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw== -word-wrap@^1.2.3, word-wrap@~1.2.3: +word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -19559,18 +19107,18 @@ xml-name-validator@^4.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== -xml2js@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" - integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== +xml2js@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" + integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== dependencies: sax ">=0.6.0" - xmlbuilder "~9.0.1" + xmlbuilder "~11.0.0" -xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== xmlchars@^2.2.0: version "2.2.0" @@ -19625,9 +19173,9 @@ yaml@1.10.2, yaml@^1.10.0: integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== yaml@^2.0.0, yaml@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.2.2.tgz#ec551ef37326e6d42872dad1970300f8eb83a073" - integrity sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" + integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== yamljs@0.3.0: version "0.3.0" @@ -19685,20 +19233,7 @@ yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.1.1: - version "17.6.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - -yargs@^17.3.1, yargs@^17.7.1: +yargs@^17.1.1, yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.1: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== @@ -19711,19 +19246,6 @@ yargs@^17.3.1, yargs@^17.7.1: y18n "^5.0.5" yargs-parser "^21.1.1" -yargs@^17.6.2: - version "17.7.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" From b265837df2af4ec5359b1e9d1aca5ecae96fd9d2 Mon Sep 17 00:00:00 2001 From: Joe Cowton Date: Thu, 29 Jun 2023 11:43:37 +0100 Subject: [PATCH 052/147] Update schema --- dotcom-rendering/package.json | 2 +- .../src/model/article-schema.json | 799 ++++++------------ dotcom-rendering/src/model/block-schema.json | 623 ++++++-------- dotcom-rendering/src/model/front-schema.json | 4 +- .../src/model/tag-front-schema.json | 4 +- yarn.lock | 27 +- 6 files changed, 512 insertions(+), 947 deletions(-) diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index 7ed36daf1b7..085dc216160 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -264,7 +264,7 @@ "ts-unused-exports": "8.0.5", "tslib": "2.5.3", "type-fest": "3.12.0", - "typescript-json-schema": "0.54.0", + "typescript-json-schema": "0.58.1", "unified": "10.1.2", "uuid": "8.3.2", "web-vitals": "3.1.1", diff --git a/dotcom-rendering/src/model/article-schema.json b/dotcom-rendering/src/model/article-schema.json index c442eb6fd06..1ceda886eb3 100644 --- a/dotcom-rendering/src/model/article-schema.json +++ b/dotcom-rendering/src/model/article-schema.json @@ -14,158 +14,7 @@ "mainMediaElements": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/AudioAtomBlockElement" - }, - { - "$ref": "#/definitions/AudioBlockElement" - }, - { - "$ref": "#/definitions/BlockquoteBlockElement" - }, - { - "$ref": "#/definitions/CaptionBlockElement" - }, - { - "$ref": "#/definitions/CalloutBlockElement" - }, - { - "$ref": "#/definitions/CalloutBlockElementV2" - }, - { - "$ref": "#/definitions/ChartAtomBlockElement" - }, - { - "$ref": "#/definitions/QuizAtomBlockElement" - }, - { - "$ref": "#/definitions/CodeBlockElement" - }, - { - "$ref": "#/definitions/CommentBlockElement" - }, - { - "$ref": "#/definitions/ContentAtomBlockElement" - }, - { - "$ref": "#/definitions/DisclaimerBlockElement" - }, - { - "$ref": "#/definitions/DividerBlockElement" - }, - { - "$ref": "#/definitions/DocumentBlockElement" - }, - { - "$ref": "#/definitions/EmbedBlockElement" - }, - { - "$ref": "#/definitions/ExplainerAtomBlockElement" - }, - { - "$ref": "#/definitions/GenericAtomBlockElement" - }, - { - "$ref": "#/definitions/GuideAtomBlockElement" - }, - { - "$ref": "#/definitions/GuVideoBlockElement" - }, - { - "$ref": "#/definitions/HighlightBlockElement" - }, - { - "$ref": "#/definitions/ImageBlockElement" - }, - { - "$ref": "#/definitions/InstagramBlockElement" - }, - { - "$ref": "#/definitions/InteractiveAtomBlockElement" - }, - { - "$ref": "#/definitions/InteractiveBlockElement" - }, - { - "$ref": "#/definitions/ItemLinkBlockElement" - }, - { - "$ref": "#/definitions/MapBlockElement" - }, - { - "$ref": "#/definitions/MediaAtomBlockElement" - }, - { - "$ref": "#/definitions/MultiImageBlockElement" - }, - { - "$ref": "#/definitions/NewsletterSignupBlockElement" - }, - { - "$ref": "#/definitions/NumberedTitleBlockElement" - }, - { - "$ref": "#/definitions/InteractiveContentsBlockElement" - }, - { - "$ref": "#/definitions/ProfileAtomBlockElement" - }, - { - "$ref": "#/definitions/PullquoteBlockElement" - }, - { - "$ref": "#/definitions/QABlockElement" - }, - { - "$ref": "#/definitions/RichLinkBlockElement" - }, - { - "$ref": "#/definitions/SoundcloudBlockElement" - }, - { - "$ref": "#/definitions/SpotifyBlockElement" - }, - { - "$ref": "#/definitions/StarRatingBlockElement" - }, - { - "$ref": "#/definitions/SubheadingBlockElement" - }, - { - "$ref": "#/definitions/TableBlockElement" - }, - { - "$ref": "#/definitions/TextBlockElement" - }, - { - "$ref": "#/definitions/TimelineBlockElement" - }, - { - "$ref": "#/definitions/TweetBlockElement" - }, - { - "$ref": "#/definitions/VineBlockElement" - }, - { - "$ref": "#/definitions/VideoBlockElement" - }, - { - "$ref": "#/definitions/VideoFacebookBlockElement" - }, - { - "$ref": "#/definitions/VideoVimeoBlockElement" - }, - { - "$ref": "#/definitions/VideoYoutubeBlockElement" - }, - { - "$ref": "#/definitions/YoutubeBlockElement" - }, - { - "$ref": "#/definitions/WitnessTypeBlockElement" - } - ] + "$ref": "#/definitions/FEElement" } }, "main": { @@ -638,14 +487,166 @@ "webURL" ], "definitions": { + "FEElement": { + "anyOf": [ + { + "$ref": "#/definitions/AudioAtomBlockElement" + }, + { + "$ref": "#/definitions/AudioBlockElement" + }, + { + "$ref": "#/definitions/BlockquoteBlockElement" + }, + { + "$ref": "#/definitions/CaptionBlockElement" + }, + { + "$ref": "#/definitions/CalloutBlockElement" + }, + { + "$ref": "#/definitions/CalloutBlockElementV2" + }, + { + "$ref": "#/definitions/ChartAtomBlockElement" + }, + { + "$ref": "#/definitions/QuizAtomBlockElement" + }, + { + "$ref": "#/definitions/CodeBlockElement" + }, + { + "$ref": "#/definitions/CommentBlockElement" + }, + { + "$ref": "#/definitions/ContentAtomBlockElement" + }, + { + "$ref": "#/definitions/DisclaimerBlockElement" + }, + { + "$ref": "#/definitions/DividerBlockElement" + }, + { + "$ref": "#/definitions/DocumentBlockElement" + }, + { + "$ref": "#/definitions/EmbedBlockElement" + }, + { + "$ref": "#/definitions/ExplainerAtomBlockElement" + }, + { + "$ref": "#/definitions/GenericAtomBlockElement" + }, + { + "$ref": "#/definitions/GuideAtomBlockElement" + }, + { + "$ref": "#/definitions/GuVideoBlockElement" + }, + { + "$ref": "#/definitions/HighlightBlockElement" + }, + { + "$ref": "#/definitions/ImageBlockElement" + }, + { + "$ref": "#/definitions/InstagramBlockElement" + }, + { + "$ref": "#/definitions/InteractiveAtomBlockElement" + }, + { + "$ref": "#/definitions/InteractiveBlockElement" + }, + { + "$ref": "#/definitions/ItemLinkBlockElement" + }, + { + "$ref": "#/definitions/MapBlockElement" + }, + { + "$ref": "#/definitions/MediaAtomBlockElement" + }, + { + "$ref": "#/definitions/MultiImageBlockElement" + }, + { + "$ref": "#/definitions/NewsletterSignupBlockElement" + }, + { + "$ref": "#/definitions/NumberedTitleBlockElement" + }, + { + "$ref": "#/definitions/InteractiveContentsBlockElement" + }, + { + "$ref": "#/definitions/SubheadingBlockElement" + }, + { + "$ref": "#/definitions/ProfileAtomBlockElement" + }, + { + "$ref": "#/definitions/PullquoteBlockElement" + }, + { + "$ref": "#/definitions/QABlockElement" + }, + { + "$ref": "#/definitions/RichLinkBlockElement" + }, + { + "$ref": "#/definitions/SoundcloudBlockElement" + }, + { + "$ref": "#/definitions/SpotifyBlockElement" + }, + { + "$ref": "#/definitions/StarRatingBlockElement" + }, + { + "$ref": "#/definitions/TableBlockElement" + }, + { + "$ref": "#/definitions/TextBlockElement" + }, + { + "$ref": "#/definitions/TimelineBlockElement" + }, + { + "$ref": "#/definitions/TweetBlockElement" + }, + { + "$ref": "#/definitions/VineBlockElement" + }, + { + "$ref": "#/definitions/VideoBlockElement" + }, + { + "$ref": "#/definitions/VideoFacebookBlockElement" + }, + { + "$ref": "#/definitions/VideoVimeoBlockElement" + }, + { + "$ref": "#/definitions/VideoYoutubeBlockElement" + }, + { + "$ref": "#/definitions/YoutubeBlockElement" + }, + { + "$ref": "#/definitions/WitnessTypeBlockElement" + } + ] + }, "AudioAtomBlockElement": { "type": "object", "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.AudioAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.AudioAtomBlockElement" }, "elementId": { "type": "string" @@ -699,9 +700,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.AudioBlockElement" - ] + "const": "model.dotcomrendering.pageElements.AudioBlockElement" }, "elementId": { "type": "string" @@ -717,9 +716,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.BlockquoteBlockElement" - ] + "const": "model.dotcomrendering.pageElements.BlockquoteBlockElement" }, "elementId": { "type": "string" @@ -742,9 +739,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CaptionBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CaptionBlockElement" }, "elementId": { "type": "string" @@ -778,9 +773,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CalloutBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CalloutBlockElement" }, "elementId": { "type": "string" @@ -815,26 +808,7 @@ "formFields": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/CampaignFieldText" - }, - { - "$ref": "#/definitions/CampaignFieldTextArea" - }, - { - "$ref": "#/definitions/CampaignFieldFile" - }, - { - "$ref": "#/definitions/CampaignFieldRadio" - }, - { - "$ref": "#/definitions/CampaignFieldCheckbox" - }, - { - "$ref": "#/definitions/CampaignFieldSelect" - } - ] + "$ref": "#/definitions/CampaignFieldType" } }, "role": { @@ -855,6 +829,28 @@ "title" ] }, + "CampaignFieldType": { + "anyOf": [ + { + "$ref": "#/definitions/CampaignFieldText" + }, + { + "$ref": "#/definitions/CampaignFieldTextArea" + }, + { + "$ref": "#/definitions/CampaignFieldFile" + }, + { + "$ref": "#/definitions/CampaignFieldRadio" + }, + { + "$ref": "#/definitions/CampaignFieldCheckbox" + }, + { + "$ref": "#/definitions/CampaignFieldSelect" + } + ] + }, "CampaignFieldText": { "type": "object", "properties": { @@ -904,9 +900,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "textarea" - ] + "const": "textarea" }, "minlength": { "type": "number" @@ -952,9 +946,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "file" - ] + "const": "file" }, "id": { "type": "string" @@ -994,9 +986,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "radio" - ] + "const": "radio" }, "options": { "type": "array", @@ -1055,9 +1045,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "checkbox" - ] + "const": "checkbox" }, "options": { "type": "array", @@ -1116,9 +1104,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "select" - ] + "const": "select" }, "options": { "type": "array", @@ -1177,9 +1163,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CalloutBlockElementV2" - ] + "const": "model.dotcomrendering.pageElements.CalloutBlockElementV2" }, "elementId": { "type": "string" @@ -1217,26 +1201,7 @@ "formFields": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/CampaignFieldText" - }, - { - "$ref": "#/definitions/CampaignFieldTextArea" - }, - { - "$ref": "#/definitions/CampaignFieldFile" - }, - { - "$ref": "#/definitions/CampaignFieldRadio" - }, - { - "$ref": "#/definitions/CampaignFieldCheckbox" - }, - { - "$ref": "#/definitions/CampaignFieldSelect" - } - ] + "$ref": "#/definitions/CampaignFieldType" } }, "role": { @@ -1295,9 +1260,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ChartAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ChartAtomBlockElement" }, "elementId": { "type": "string" @@ -1337,9 +1300,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.QuizAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.QuizAtomBlockElement" }, "elementId": { "type": "string" @@ -1475,9 +1436,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CodeBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CodeBlockElement" }, "elementId": { "type": "string" @@ -1504,9 +1463,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CommentBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CommentBlockElement" }, "elementId": { "type": "string" @@ -1549,9 +1506,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ContentAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ContentAtomBlockElement" }, "elementId": { "type": "string" @@ -1571,9 +1526,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.DisclaimerBlockElement" - ] + "const": "model.dotcomrendering.pageElements.DisclaimerBlockElement" }, "elementId": { "type": "string" @@ -1596,9 +1549,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.DividerBlockElement" - ] + "const": "model.dotcomrendering.pageElements.DividerBlockElement" }, "size": { "enum": [ @@ -1624,9 +1575,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.DocumentBlockElement" - ] + "const": "model.dotcomrendering.pageElements.DocumentBlockElement" }, "elementId": { "type": "string" @@ -1670,9 +1619,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.EmbedBlockElement" - ] + "const": "model.dotcomrendering.pageElements.EmbedBlockElement" }, "elementId": { "type": "string" @@ -1724,9 +1671,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ExplainerAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ExplainerAtomBlockElement" }, "elementId": { "type": "string" @@ -1757,9 +1702,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.GenericAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.GenericAtomBlockElement" }, "url": { "type": "string" @@ -1794,9 +1737,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.GuideAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.GuideAtomBlockElement" }, "elementId": { "type": "string" @@ -1838,9 +1779,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.GuVideoBlockElement" - ] + "const": "model.dotcomrendering.pageElements.GuVideoBlockElement" }, "elementId": { "type": "string" @@ -1981,9 +1920,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.HighlightBlockElement" - ] + "const": "model.dotcomrendering.pageElements.HighlightBlockElement" }, "elementId": { "type": "string" @@ -2003,9 +1940,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ImageBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ImageBlockElement" }, "elementId": { "type": "string" @@ -2122,9 +2057,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InstagramBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InstagramBlockElement" }, "elementId": { "type": "string" @@ -2165,9 +2098,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InteractiveAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InteractiveAtomBlockElement" }, "elementId": { "type": "string" @@ -2206,9 +2137,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InteractiveBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InteractiveBlockElement" }, "elementId": { "type": "string" @@ -2242,9 +2171,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ItemLinkBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ItemLinkBlockElement" }, "elementId": { "type": "string" @@ -2264,9 +2191,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.MapBlockElement" - ] + "const": "model.dotcomrendering.pageElements.MapBlockElement" }, "elementId": { "type": "string" @@ -2318,9 +2243,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.MediaAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.MediaAtomBlockElement" }, "elementId": { "type": "string" @@ -2371,9 +2294,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.MultiImageBlockElement" - ] + "const": "model.dotcomrendering.pageElements.MultiImageBlockElement" }, "elementId": { "type": "string" @@ -2402,9 +2323,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.NewsletterSignupBlockElement" - ] + "const": "model.dotcomrendering.pageElements.NewsletterSignupBlockElement" }, "newsletter": { "type": "object", @@ -2462,9 +2381,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.NumberedTitleBlockElement" - ] + "const": "model.dotcomrendering.pageElements.NumberedTitleBlockElement" }, "elementId": { "type": "string" @@ -2560,9 +2477,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InteractiveContentsBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InteractiveContentsBlockElement" }, "elementId": { "type": "string" @@ -2588,9 +2503,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.SubheadingBlockElement" - ] + "const": "model.dotcomrendering.pageElements.SubheadingBlockElement" }, "elementId": { "type": "string" @@ -2610,9 +2523,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ProfileAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ProfileAtomBlockElement" }, "elementId": { "type": "string" @@ -2654,9 +2565,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.PullquoteBlockElement" - ] + "const": "model.dotcomrendering.pageElements.PullquoteBlockElement" }, "elementId": { "type": "string" @@ -2685,9 +2594,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.QABlockElement" - ] + "const": "model.dotcomrendering.pageElements.QABlockElement" }, "elementId": { "type": "string" @@ -2725,9 +2632,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.RichLinkBlockElement" - ] + "const": "model.dotcomrendering.pageElements.RichLinkBlockElement" }, "elementId": { "type": "string" @@ -2767,9 +2672,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.SoundcloudBlockElement" - ] + "const": "model.dotcomrendering.pageElements.SoundcloudBlockElement" }, "elementId": { "type": "string" @@ -2814,9 +2717,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.SpotifyBlockElement" - ] + "const": "model.dotcomrendering.pageElements.SpotifyBlockElement" }, "elementId": { "type": "string" @@ -2860,9 +2761,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.StarRatingBlockElement" - ] + "const": "model.dotcomrendering.pageElements.StarRatingBlockElement" }, "elementId": { "type": "string" @@ -2894,9 +2793,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TableBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TableBlockElement" }, "elementId": { "type": "string" @@ -2923,9 +2820,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TextBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TextBlockElement" }, "elementId": { "type": "string" @@ -2948,9 +2843,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TimelineBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TimelineBlockElement" }, "elementId": { "type": "string" @@ -3015,9 +2908,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TweetBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TweetBlockElement" }, "elementId": { "type": "string" @@ -3062,9 +2953,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VineBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VineBlockElement" }, "elementId": { "type": "string" @@ -3110,9 +2999,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoBlockElement" }, "elementId": { "type": "string" @@ -3141,9 +3028,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoFacebookBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoFacebookBlockElement" }, "elementId": { "type": "string" @@ -3190,9 +3075,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoVimeoBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoVimeoBlockElement" }, "elementId": { "type": "string" @@ -3248,9 +3131,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoYoutubeBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoYoutubeBlockElement" }, "elementId": { "type": "string" @@ -3307,9 +3188,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.YoutubeBlockElement" - ] + "const": "model.dotcomrendering.pageElements.YoutubeBlockElement" }, "elementId": { "type": "string" @@ -3374,9 +3253,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessBlockElement" - ] + "const": "model.dotcomrendering.pageElements.WitnessBlockElement" }, "elementId": { "type": "string" @@ -3423,15 +3300,11 @@ "properties": { "type": { "type": "string", - "enum": [ - "Image" - ] + "const": "Image" }, "mimeType": { "type": "string", - "enum": [ - "image/jpeg" - ] + "const": "image/jpeg" }, "file": { "type": "string" @@ -3460,15 +3333,11 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessTypeDataImage" - ] + "const": "model.dotcomrendering.pageElements.WitnessTypeDataImage" }, "type": { "type": "string", - "enum": [ - "image" - ] + "const": "image" }, "alt": { "type": "string" @@ -3539,15 +3408,11 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessTypeDataVideo" - ] + "const": "model.dotcomrendering.pageElements.WitnessTypeDataVideo" }, "type": { "type": "string", - "enum": [ - "video" - ] + "const": "video" }, "description": { "type": "string" @@ -3639,15 +3504,11 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessTypeDataText" - ] + "const": "model.dotcomrendering.pageElements.WitnessTypeDataText" }, "type": { "type": "string", - "enum": [ - "text" - ] + "const": "text" }, "description": { "type": "string" @@ -3711,158 +3572,7 @@ "elements": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/AudioAtomBlockElement" - }, - { - "$ref": "#/definitions/AudioBlockElement" - }, - { - "$ref": "#/definitions/BlockquoteBlockElement" - }, - { - "$ref": "#/definitions/CaptionBlockElement" - }, - { - "$ref": "#/definitions/CalloutBlockElement" - }, - { - "$ref": "#/definitions/CalloutBlockElementV2" - }, - { - "$ref": "#/definitions/ChartAtomBlockElement" - }, - { - "$ref": "#/definitions/QuizAtomBlockElement" - }, - { - "$ref": "#/definitions/CodeBlockElement" - }, - { - "$ref": "#/definitions/CommentBlockElement" - }, - { - "$ref": "#/definitions/ContentAtomBlockElement" - }, - { - "$ref": "#/definitions/DisclaimerBlockElement" - }, - { - "$ref": "#/definitions/DividerBlockElement" - }, - { - "$ref": "#/definitions/DocumentBlockElement" - }, - { - "$ref": "#/definitions/EmbedBlockElement" - }, - { - "$ref": "#/definitions/ExplainerAtomBlockElement" - }, - { - "$ref": "#/definitions/GenericAtomBlockElement" - }, - { - "$ref": "#/definitions/GuideAtomBlockElement" - }, - { - "$ref": "#/definitions/GuVideoBlockElement" - }, - { - "$ref": "#/definitions/HighlightBlockElement" - }, - { - "$ref": "#/definitions/ImageBlockElement" - }, - { - "$ref": "#/definitions/InstagramBlockElement" - }, - { - "$ref": "#/definitions/InteractiveAtomBlockElement" - }, - { - "$ref": "#/definitions/InteractiveBlockElement" - }, - { - "$ref": "#/definitions/ItemLinkBlockElement" - }, - { - "$ref": "#/definitions/MapBlockElement" - }, - { - "$ref": "#/definitions/MediaAtomBlockElement" - }, - { - "$ref": "#/definitions/MultiImageBlockElement" - }, - { - "$ref": "#/definitions/NewsletterSignupBlockElement" - }, - { - "$ref": "#/definitions/NumberedTitleBlockElement" - }, - { - "$ref": "#/definitions/InteractiveContentsBlockElement" - }, - { - "$ref": "#/definitions/ProfileAtomBlockElement" - }, - { - "$ref": "#/definitions/PullquoteBlockElement" - }, - { - "$ref": "#/definitions/QABlockElement" - }, - { - "$ref": "#/definitions/RichLinkBlockElement" - }, - { - "$ref": "#/definitions/SoundcloudBlockElement" - }, - { - "$ref": "#/definitions/SpotifyBlockElement" - }, - { - "$ref": "#/definitions/StarRatingBlockElement" - }, - { - "$ref": "#/definitions/SubheadingBlockElement" - }, - { - "$ref": "#/definitions/TableBlockElement" - }, - { - "$ref": "#/definitions/TextBlockElement" - }, - { - "$ref": "#/definitions/TimelineBlockElement" - }, - { - "$ref": "#/definitions/TweetBlockElement" - }, - { - "$ref": "#/definitions/VineBlockElement" - }, - { - "$ref": "#/definitions/VideoBlockElement" - }, - { - "$ref": "#/definitions/VideoFacebookBlockElement" - }, - { - "$ref": "#/definitions/VideoVimeoBlockElement" - }, - { - "$ref": "#/definitions/VideoYoutubeBlockElement" - }, - { - "$ref": "#/definitions/YoutubeBlockElement" - }, - { - "$ref": "#/definitions/WitnessTypeBlockElement" - } - ] + "$ref": "#/definitions/FEElement" } }, "attributes": { @@ -4530,13 +4240,13 @@ "CommercialProperties": { "type": "object", "properties": { - "AU": { + "UK": { "$ref": "#/definitions/EditionCommercialProperties" }, "US": { "$ref": "#/definitions/EditionCommercialProperties" }, - "UK": { + "AU": { "$ref": "#/definitions/EditionCommercialProperties" }, "INT": { @@ -4829,14 +4539,7 @@ "formFields": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/CampaignFieldText" - }, - { - "$ref": "#/definitions/CampaignFieldTextArea" - } - ] + "$ref": "#/definitions/MessageUsFieldType" } } }, @@ -4845,6 +4548,16 @@ "formId" ] }, + "MessageUsFieldType": { + "anyOf": [ + { + "$ref": "#/definitions/CampaignFieldText" + }, + { + "$ref": "#/definitions/CampaignFieldTextArea" + } + ] + }, "TableOfContentsItem": { "type": "object", "properties": { diff --git a/dotcom-rendering/src/model/block-schema.json b/dotcom-rendering/src/model/block-schema.json index 7eab87ead4d..d90319eadb7 100644 --- a/dotcom-rendering/src/model/block-schema.json +++ b/dotcom-rendering/src/model/block-schema.json @@ -7,158 +7,7 @@ "elements": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/AudioAtomBlockElement" - }, - { - "$ref": "#/definitions/AudioBlockElement" - }, - { - "$ref": "#/definitions/BlockquoteBlockElement" - }, - { - "$ref": "#/definitions/CaptionBlockElement" - }, - { - "$ref": "#/definitions/CalloutBlockElement" - }, - { - "$ref": "#/definitions/CalloutBlockElementV2" - }, - { - "$ref": "#/definitions/ChartAtomBlockElement" - }, - { - "$ref": "#/definitions/QuizAtomBlockElement" - }, - { - "$ref": "#/definitions/CodeBlockElement" - }, - { - "$ref": "#/definitions/CommentBlockElement" - }, - { - "$ref": "#/definitions/ContentAtomBlockElement" - }, - { - "$ref": "#/definitions/DisclaimerBlockElement" - }, - { - "$ref": "#/definitions/DividerBlockElement" - }, - { - "$ref": "#/definitions/DocumentBlockElement" - }, - { - "$ref": "#/definitions/EmbedBlockElement" - }, - { - "$ref": "#/definitions/ExplainerAtomBlockElement" - }, - { - "$ref": "#/definitions/GenericAtomBlockElement" - }, - { - "$ref": "#/definitions/GuideAtomBlockElement" - }, - { - "$ref": "#/definitions/GuVideoBlockElement" - }, - { - "$ref": "#/definitions/HighlightBlockElement" - }, - { - "$ref": "#/definitions/ImageBlockElement" - }, - { - "$ref": "#/definitions/InstagramBlockElement" - }, - { - "$ref": "#/definitions/InteractiveAtomBlockElement" - }, - { - "$ref": "#/definitions/InteractiveBlockElement" - }, - { - "$ref": "#/definitions/ItemLinkBlockElement" - }, - { - "$ref": "#/definitions/MapBlockElement" - }, - { - "$ref": "#/definitions/MediaAtomBlockElement" - }, - { - "$ref": "#/definitions/MultiImageBlockElement" - }, - { - "$ref": "#/definitions/NewsletterSignupBlockElement" - }, - { - "$ref": "#/definitions/NumberedTitleBlockElement" - }, - { - "$ref": "#/definitions/InteractiveContentsBlockElement" - }, - { - "$ref": "#/definitions/ProfileAtomBlockElement" - }, - { - "$ref": "#/definitions/PullquoteBlockElement" - }, - { - "$ref": "#/definitions/QABlockElement" - }, - { - "$ref": "#/definitions/RichLinkBlockElement" - }, - { - "$ref": "#/definitions/SoundcloudBlockElement" - }, - { - "$ref": "#/definitions/SpotifyBlockElement" - }, - { - "$ref": "#/definitions/StarRatingBlockElement" - }, - { - "$ref": "#/definitions/SubheadingBlockElement" - }, - { - "$ref": "#/definitions/TableBlockElement" - }, - { - "$ref": "#/definitions/TextBlockElement" - }, - { - "$ref": "#/definitions/TimelineBlockElement" - }, - { - "$ref": "#/definitions/TweetBlockElement" - }, - { - "$ref": "#/definitions/VineBlockElement" - }, - { - "$ref": "#/definitions/VideoBlockElement" - }, - { - "$ref": "#/definitions/VideoFacebookBlockElement" - }, - { - "$ref": "#/definitions/VideoVimeoBlockElement" - }, - { - "$ref": "#/definitions/VideoYoutubeBlockElement" - }, - { - "$ref": "#/definitions/YoutubeBlockElement" - }, - { - "$ref": "#/definitions/WitnessTypeBlockElement" - } - ] + "$ref": "#/definitions/FEElement" } }, "attributes": { @@ -227,14 +76,166 @@ "secondaryDateLine" ], "definitions": { + "FEElement": { + "anyOf": [ + { + "$ref": "#/definitions/AudioAtomBlockElement" + }, + { + "$ref": "#/definitions/AudioBlockElement" + }, + { + "$ref": "#/definitions/BlockquoteBlockElement" + }, + { + "$ref": "#/definitions/CaptionBlockElement" + }, + { + "$ref": "#/definitions/CalloutBlockElement" + }, + { + "$ref": "#/definitions/CalloutBlockElementV2" + }, + { + "$ref": "#/definitions/ChartAtomBlockElement" + }, + { + "$ref": "#/definitions/QuizAtomBlockElement" + }, + { + "$ref": "#/definitions/CodeBlockElement" + }, + { + "$ref": "#/definitions/CommentBlockElement" + }, + { + "$ref": "#/definitions/ContentAtomBlockElement" + }, + { + "$ref": "#/definitions/DisclaimerBlockElement" + }, + { + "$ref": "#/definitions/DividerBlockElement" + }, + { + "$ref": "#/definitions/DocumentBlockElement" + }, + { + "$ref": "#/definitions/EmbedBlockElement" + }, + { + "$ref": "#/definitions/ExplainerAtomBlockElement" + }, + { + "$ref": "#/definitions/GenericAtomBlockElement" + }, + { + "$ref": "#/definitions/GuideAtomBlockElement" + }, + { + "$ref": "#/definitions/GuVideoBlockElement" + }, + { + "$ref": "#/definitions/HighlightBlockElement" + }, + { + "$ref": "#/definitions/ImageBlockElement" + }, + { + "$ref": "#/definitions/InstagramBlockElement" + }, + { + "$ref": "#/definitions/InteractiveAtomBlockElement" + }, + { + "$ref": "#/definitions/InteractiveBlockElement" + }, + { + "$ref": "#/definitions/ItemLinkBlockElement" + }, + { + "$ref": "#/definitions/MapBlockElement" + }, + { + "$ref": "#/definitions/MediaAtomBlockElement" + }, + { + "$ref": "#/definitions/MultiImageBlockElement" + }, + { + "$ref": "#/definitions/NewsletterSignupBlockElement" + }, + { + "$ref": "#/definitions/NumberedTitleBlockElement" + }, + { + "$ref": "#/definitions/InteractiveContentsBlockElement" + }, + { + "$ref": "#/definitions/SubheadingBlockElement" + }, + { + "$ref": "#/definitions/ProfileAtomBlockElement" + }, + { + "$ref": "#/definitions/PullquoteBlockElement" + }, + { + "$ref": "#/definitions/QABlockElement" + }, + { + "$ref": "#/definitions/RichLinkBlockElement" + }, + { + "$ref": "#/definitions/SoundcloudBlockElement" + }, + { + "$ref": "#/definitions/SpotifyBlockElement" + }, + { + "$ref": "#/definitions/StarRatingBlockElement" + }, + { + "$ref": "#/definitions/TableBlockElement" + }, + { + "$ref": "#/definitions/TextBlockElement" + }, + { + "$ref": "#/definitions/TimelineBlockElement" + }, + { + "$ref": "#/definitions/TweetBlockElement" + }, + { + "$ref": "#/definitions/VineBlockElement" + }, + { + "$ref": "#/definitions/VideoBlockElement" + }, + { + "$ref": "#/definitions/VideoFacebookBlockElement" + }, + { + "$ref": "#/definitions/VideoVimeoBlockElement" + }, + { + "$ref": "#/definitions/VideoYoutubeBlockElement" + }, + { + "$ref": "#/definitions/YoutubeBlockElement" + }, + { + "$ref": "#/definitions/WitnessTypeBlockElement" + } + ] + }, "AudioAtomBlockElement": { "type": "object", "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.AudioAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.AudioAtomBlockElement" }, "elementId": { "type": "string" @@ -288,9 +289,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.AudioBlockElement" - ] + "const": "model.dotcomrendering.pageElements.AudioBlockElement" }, "elementId": { "type": "string" @@ -306,9 +305,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.BlockquoteBlockElement" - ] + "const": "model.dotcomrendering.pageElements.BlockquoteBlockElement" }, "elementId": { "type": "string" @@ -331,9 +328,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CaptionBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CaptionBlockElement" }, "elementId": { "type": "string" @@ -367,9 +362,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CalloutBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CalloutBlockElement" }, "elementId": { "type": "string" @@ -404,26 +397,7 @@ "formFields": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/CampaignFieldText" - }, - { - "$ref": "#/definitions/CampaignFieldTextArea" - }, - { - "$ref": "#/definitions/CampaignFieldFile" - }, - { - "$ref": "#/definitions/CampaignFieldRadio" - }, - { - "$ref": "#/definitions/CampaignFieldCheckbox" - }, - { - "$ref": "#/definitions/CampaignFieldSelect" - } - ] + "$ref": "#/definitions/CampaignFieldType" } }, "role": { @@ -444,6 +418,28 @@ "title" ] }, + "CampaignFieldType": { + "anyOf": [ + { + "$ref": "#/definitions/CampaignFieldText" + }, + { + "$ref": "#/definitions/CampaignFieldTextArea" + }, + { + "$ref": "#/definitions/CampaignFieldFile" + }, + { + "$ref": "#/definitions/CampaignFieldRadio" + }, + { + "$ref": "#/definitions/CampaignFieldCheckbox" + }, + { + "$ref": "#/definitions/CampaignFieldSelect" + } + ] + }, "CampaignFieldText": { "type": "object", "properties": { @@ -493,9 +489,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "textarea" - ] + "const": "textarea" }, "minlength": { "type": "number" @@ -541,9 +535,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "file" - ] + "const": "file" }, "id": { "type": "string" @@ -583,9 +575,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "radio" - ] + "const": "radio" }, "options": { "type": "array", @@ -644,9 +634,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "checkbox" - ] + "const": "checkbox" }, "options": { "type": "array", @@ -705,9 +693,7 @@ "properties": { "type": { "type": "string", - "enum": [ - "select" - ] + "const": "select" }, "options": { "type": "array", @@ -766,9 +752,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CalloutBlockElementV2" - ] + "const": "model.dotcomrendering.pageElements.CalloutBlockElementV2" }, "elementId": { "type": "string" @@ -806,26 +790,7 @@ "formFields": { "type": "array", "items": { - "anyOf": [ - { - "$ref": "#/definitions/CampaignFieldText" - }, - { - "$ref": "#/definitions/CampaignFieldTextArea" - }, - { - "$ref": "#/definitions/CampaignFieldFile" - }, - { - "$ref": "#/definitions/CampaignFieldRadio" - }, - { - "$ref": "#/definitions/CampaignFieldCheckbox" - }, - { - "$ref": "#/definitions/CampaignFieldSelect" - } - ] + "$ref": "#/definitions/CampaignFieldType" } }, "role": { @@ -884,9 +849,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ChartAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ChartAtomBlockElement" }, "elementId": { "type": "string" @@ -926,9 +889,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.QuizAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.QuizAtomBlockElement" }, "elementId": { "type": "string" @@ -1064,9 +1025,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CodeBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CodeBlockElement" }, "elementId": { "type": "string" @@ -1093,9 +1052,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.CommentBlockElement" - ] + "const": "model.dotcomrendering.pageElements.CommentBlockElement" }, "elementId": { "type": "string" @@ -1138,9 +1095,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ContentAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ContentAtomBlockElement" }, "elementId": { "type": "string" @@ -1160,9 +1115,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.DisclaimerBlockElement" - ] + "const": "model.dotcomrendering.pageElements.DisclaimerBlockElement" }, "elementId": { "type": "string" @@ -1185,9 +1138,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.DividerBlockElement" - ] + "const": "model.dotcomrendering.pageElements.DividerBlockElement" }, "size": { "enum": [ @@ -1213,9 +1164,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.DocumentBlockElement" - ] + "const": "model.dotcomrendering.pageElements.DocumentBlockElement" }, "elementId": { "type": "string" @@ -1259,9 +1208,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.EmbedBlockElement" - ] + "const": "model.dotcomrendering.pageElements.EmbedBlockElement" }, "elementId": { "type": "string" @@ -1313,9 +1260,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ExplainerAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ExplainerAtomBlockElement" }, "elementId": { "type": "string" @@ -1346,9 +1291,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.GenericAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.GenericAtomBlockElement" }, "url": { "type": "string" @@ -1383,9 +1326,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.GuideAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.GuideAtomBlockElement" }, "elementId": { "type": "string" @@ -1427,9 +1368,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.GuVideoBlockElement" - ] + "const": "model.dotcomrendering.pageElements.GuVideoBlockElement" }, "elementId": { "type": "string" @@ -1570,9 +1509,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.HighlightBlockElement" - ] + "const": "model.dotcomrendering.pageElements.HighlightBlockElement" }, "elementId": { "type": "string" @@ -1592,9 +1529,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ImageBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ImageBlockElement" }, "elementId": { "type": "string" @@ -1711,9 +1646,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InstagramBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InstagramBlockElement" }, "elementId": { "type": "string" @@ -1754,9 +1687,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InteractiveAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InteractiveAtomBlockElement" }, "elementId": { "type": "string" @@ -1795,9 +1726,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InteractiveBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InteractiveBlockElement" }, "elementId": { "type": "string" @@ -1831,9 +1760,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ItemLinkBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ItemLinkBlockElement" }, "elementId": { "type": "string" @@ -1853,9 +1780,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.MapBlockElement" - ] + "const": "model.dotcomrendering.pageElements.MapBlockElement" }, "elementId": { "type": "string" @@ -1907,9 +1832,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.MediaAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.MediaAtomBlockElement" }, "elementId": { "type": "string" @@ -1960,9 +1883,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.MultiImageBlockElement" - ] + "const": "model.dotcomrendering.pageElements.MultiImageBlockElement" }, "elementId": { "type": "string" @@ -1991,9 +1912,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.NewsletterSignupBlockElement" - ] + "const": "model.dotcomrendering.pageElements.NewsletterSignupBlockElement" }, "newsletter": { "type": "object", @@ -2051,9 +1970,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.NumberedTitleBlockElement" - ] + "const": "model.dotcomrendering.pageElements.NumberedTitleBlockElement" }, "elementId": { "type": "string" @@ -2149,9 +2066,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.InteractiveContentsBlockElement" - ] + "const": "model.dotcomrendering.pageElements.InteractiveContentsBlockElement" }, "elementId": { "type": "string" @@ -2177,9 +2092,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.SubheadingBlockElement" - ] + "const": "model.dotcomrendering.pageElements.SubheadingBlockElement" }, "elementId": { "type": "string" @@ -2199,9 +2112,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.ProfileAtomBlockElement" - ] + "const": "model.dotcomrendering.pageElements.ProfileAtomBlockElement" }, "elementId": { "type": "string" @@ -2243,9 +2154,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.PullquoteBlockElement" - ] + "const": "model.dotcomrendering.pageElements.PullquoteBlockElement" }, "elementId": { "type": "string" @@ -2274,9 +2183,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.QABlockElement" - ] + "const": "model.dotcomrendering.pageElements.QABlockElement" }, "elementId": { "type": "string" @@ -2314,9 +2221,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.RichLinkBlockElement" - ] + "const": "model.dotcomrendering.pageElements.RichLinkBlockElement" }, "elementId": { "type": "string" @@ -2356,9 +2261,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.SoundcloudBlockElement" - ] + "const": "model.dotcomrendering.pageElements.SoundcloudBlockElement" }, "elementId": { "type": "string" @@ -2403,9 +2306,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.SpotifyBlockElement" - ] + "const": "model.dotcomrendering.pageElements.SpotifyBlockElement" }, "elementId": { "type": "string" @@ -2449,9 +2350,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.StarRatingBlockElement" - ] + "const": "model.dotcomrendering.pageElements.StarRatingBlockElement" }, "elementId": { "type": "string" @@ -2483,9 +2382,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TableBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TableBlockElement" }, "elementId": { "type": "string" @@ -2512,9 +2409,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TextBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TextBlockElement" }, "elementId": { "type": "string" @@ -2537,9 +2432,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TimelineBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TimelineBlockElement" }, "elementId": { "type": "string" @@ -2604,9 +2497,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.TweetBlockElement" - ] + "const": "model.dotcomrendering.pageElements.TweetBlockElement" }, "elementId": { "type": "string" @@ -2651,9 +2542,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VineBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VineBlockElement" }, "elementId": { "type": "string" @@ -2699,9 +2588,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoBlockElement" }, "elementId": { "type": "string" @@ -2730,9 +2617,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoFacebookBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoFacebookBlockElement" }, "elementId": { "type": "string" @@ -2779,9 +2664,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoVimeoBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoVimeoBlockElement" }, "elementId": { "type": "string" @@ -2837,9 +2720,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.VideoYoutubeBlockElement" - ] + "const": "model.dotcomrendering.pageElements.VideoYoutubeBlockElement" }, "elementId": { "type": "string" @@ -2896,9 +2777,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.YoutubeBlockElement" - ] + "const": "model.dotcomrendering.pageElements.YoutubeBlockElement" }, "elementId": { "type": "string" @@ -2963,9 +2842,7 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessBlockElement" - ] + "const": "model.dotcomrendering.pageElements.WitnessBlockElement" }, "elementId": { "type": "string" @@ -3012,15 +2889,11 @@ "properties": { "type": { "type": "string", - "enum": [ - "Image" - ] + "const": "Image" }, "mimeType": { "type": "string", - "enum": [ - "image/jpeg" - ] + "const": "image/jpeg" }, "file": { "type": "string" @@ -3049,15 +2922,11 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessTypeDataImage" - ] + "const": "model.dotcomrendering.pageElements.WitnessTypeDataImage" }, "type": { "type": "string", - "enum": [ - "image" - ] + "const": "image" }, "alt": { "type": "string" @@ -3128,15 +2997,11 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessTypeDataVideo" - ] + "const": "model.dotcomrendering.pageElements.WitnessTypeDataVideo" }, "type": { "type": "string", - "enum": [ - "video" - ] + "const": "video" }, "description": { "type": "string" @@ -3228,15 +3093,11 @@ "properties": { "_type": { "type": "string", - "enum": [ - "model.dotcomrendering.pageElements.WitnessTypeDataText" - ] + "const": "model.dotcomrendering.pageElements.WitnessTypeDataText" }, "type": { "type": "string", - "enum": [ - "text" - ] + "const": "text" }, "description": { "type": "string" diff --git a/dotcom-rendering/src/model/front-schema.json b/dotcom-rendering/src/model/front-schema.json index f8e322ee624..aaacd0c1852 100644 --- a/dotcom-rendering/src/model/front-schema.json +++ b/dotcom-rendering/src/model/front-schema.json @@ -120,9 +120,7 @@ }, "isFront": { "type": "boolean", - "enum": [ - true - ] + "const": true }, "idWebAppUrl": { "type": "string" diff --git a/dotcom-rendering/src/model/tag-front-schema.json b/dotcom-rendering/src/model/tag-front-schema.json index e8cb77397c1..c0a06e23d18 100644 --- a/dotcom-rendering/src/model/tag-front-schema.json +++ b/dotcom-rendering/src/model/tag-front-schema.json @@ -927,9 +927,7 @@ }, "isFront": { "type": "boolean", - "enum": [ - true - ] + "const": true }, "idWebAppUrl": { "type": "string" diff --git a/yarn.lock b/yarn.lock index d9effe3bc21..90dbdf77036 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15003,7 +15003,7 @@ path-dirname@^1.0.0: resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q== -path-equal@^1.1.2: +path-equal@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/path-equal/-/path-equal-1.2.5.tgz#9fcbdd5e5daee448e96f43f3bac06c666b5e982a" integrity sha512-i73IctDr3F2W+bsOWDyyVm/lqsXO47aY9nsFZUjTT/aljSbkxHxxCoyZ9UUrM8jK0JVod+An+rl48RCsvWM+9g== @@ -15368,7 +15368,7 @@ preact@10.15.1: resolved "https://registry.yarnpkg.com/preact/-/preact-10.15.1.tgz#a1de60c9fc0c79a522d969c65dcaddc5d994eede" integrity sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g== -"prebid.js@github:guardian/prebid.js": +prebid.js@guardian/prebid.js: version "7.26.0" resolved "https://codeload.github.com/guardian/prebid.js/tar.gz/2e3b96dc57dfe14ed8c418674ee7a0a150ece7cb" dependencies: @@ -17877,7 +17877,7 @@ ts-loader@9.4.3: micromatch "^4.0.0" semver "^7.3.4" -ts-node@^10.2.1, ts-node@^10.9.1: +ts-node@^10.9.1: version "10.9.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== @@ -18071,18 +18071,18 @@ typescript-compare@^0.0.2: dependencies: typescript-logic "^0.0.0" -typescript-json-schema@0.54.0: - version "0.54.0" - resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.54.0.tgz#b3fc42ad90df6a0f6ab57571ebc8b4d41125df4f" - integrity sha512-/MNhm1pjdxXiVspjjyRCrQAA1B768cRzHU83aIqN5vQqQEW2NgyyKOfcguiRIMM64lseIZIelegnHOHEu7YDCg== +typescript-json-schema@0.58.1: + version "0.58.1" + resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.58.1.tgz#841fc5c9a05c894ce77a04b28025af4135a00b1f" + integrity sha512-EcmquhfGEmEJOAezLZC6CzY0rPNzfXuky+Z3zoXULEEncW8e13aAjmC2r8ppT1bvvDekJj1TJ4xVhOdkjYtkUA== dependencies: "@types/json-schema" "^7.0.9" "@types/node" "^16.9.2" glob "^7.1.7" - path-equal "^1.1.2" + path-equal "^1.2.5" safe-stable-stringify "^2.2.0" - ts-node "^10.2.1" - typescript "~4.6.0" + ts-node "^10.9.1" + typescript "~4.9.5" yargs "^17.1.1" typescript-logic@^0.0.0: @@ -18102,16 +18102,11 @@ typescript@5.1.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826" integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw== -typescript@^4.5.4: +typescript@^4.5.4, typescript@~4.9.5: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@~4.6.0: - version "4.6.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" - integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== - uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" From 86bab7a42547238159b0f8164dac48b4482dcb92 Mon Sep 17 00:00:00 2001 From: Olly <9575458+OllysCoding@users.noreply.github.com> Date: Thu, 29 Jun 2023 12:33:30 +0100 Subject: [PATCH 053/147] Update dotcom-rendering/src/components/DynamicSlowMPU.tsx Co-authored-by: Ioanna Kokkini --- dotcom-rendering/src/components/DynamicSlowMPU.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotcom-rendering/src/components/DynamicSlowMPU.tsx b/dotcom-rendering/src/components/DynamicSlowMPU.tsx index 16d75b80028..c1e88d1b02a 100644 --- a/dotcom-rendering/src/components/DynamicSlowMPU.tsx +++ b/dotcom-rendering/src/components/DynamicSlowMPU.tsx @@ -161,7 +161,7 @@ const ColumnOfThree50_Ad50 = ({ * * This container only allows big and standard cards (from groupedTrails) * - * Layout is dynamic deopending on the number of big cards. You're only + * Layout is dynamic depending on the number of big cards. You're only * allowed to have 2 or 3 big cards. If you pass 1 a standard card will * get promoted to make two bigs. If you pass more than 3 bigs then the * extras will get demoted to standard. From f7e4cbd4eafa27d8f97f683265873ad4c651b3d8 Mon Sep 17 00:00:00 2001 From: Joe Cowton Date: Thu, 29 Jun 2023 14:16:26 +0100 Subject: [PATCH 054/147] Update cdk and jest setup --- .../mobile-apps-rendering.test.ts.snap | 1754 ++++++++++------- apps-rendering/config/jestSetup.js | 3 +- apps-rendering/package.json | 10 +- apps-rendering/yarn.lock | 174 +- yarn.lock | 2 +- 5 files changed, 1131 insertions(+), 812 deletions(-) diff --git a/apps-rendering/cdk/lib/__snapshots__/mobile-apps-rendering.test.ts.snap b/apps-rendering/cdk/lib/__snapshots__/mobile-apps-rendering.test.ts.snap index 83415b301ca..50e6f31ef0b 100644 --- a/apps-rendering/cdk/lib/__snapshots__/mobile-apps-rendering.test.ts.snap +++ b/apps-rendering/cdk/lib/__snapshots__/mobile-apps-rendering.test.ts.snap @@ -1,15 +1,16 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`The MobileAppsRendering stack matches the snapshot 1`] = ` -Object { - "Metadata": Object { - "gu:cdk:constructs": Array [ +{ + "Metadata": { + "gu:cdk:constructs": [ "GuAllowPolicy", "GuVpcParameter", "GuSubnetListParameter", + "GuSubnetListParameter", + "GuEc2App", "GuCertificate", "GuInstanceRole", - "GuSSMRunCommandPolicy", "GuDescribeEC2Policy", "GuLoggingStreamNameParameter", "GuLogShippingPolicy", @@ -18,8 +19,8 @@ Object { "GuParameterStoreReadPolicy", "GuAmiParameter", "GuHttpsEgressSecurityGroup", - "GuAutoScalingGroup", "GuWazuhAccess", + "GuAutoScalingGroup", "GuApplicationLoadBalancer", "GuApplicationTargetGroup", "GuHttpsApplicationListener", @@ -27,204 +28,123 @@ Object { ], "gu:cdk:version": "TEST", }, - "Outputs": Object { - "LoadBalancerMobileappsrenderingDnsName": Object { + "Outputs": { + "LoadBalancerMobileappsrenderingDnsName": { "Description": "DNS entry for LoadBalancerMobileappsrendering", - "Value": Object { - "Fn::GetAtt": Array [ + "Value": { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingB8B00ACB", "DNSName", ], }, }, }, - "Parameters": Object { - "AMIMobileappsrendering": Object { + "Parameters": { + "AMIMobileappsrendering": { "Description": "Amazon Machine Image ID for the app mobile-apps-rendering. Use this in conjunction with AMIgo to keep AMIs up to date.", "Type": "AWS::EC2::Image::Id", }, - "DistributionBucketName": Object { + "DistributionBucketName": { "Default": "/account/services/artifact.bucket", "Description": "SSM parameter containing the S3 bucket name holding distribution artifacts", "Type": "AWS::SSM::Parameter::Value", }, - "LoggingStreamName": Object { + "LoggingStreamName": { "Default": "/account/services/logging.stream.name", "Description": "SSM parameter containing the Name (not ARN) on the kinesis stream", "Type": "AWS::SSM::Parameter::Value", }, - "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter": Object { + "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter": { "Default": "/account/services/artifact.bucket", "Type": "AWS::SSM::Parameter::Value", }, - "VpcId": Object { + "VpcId": { "Default": "/account/vpc/primary/id", "Description": "Virtual Private Cloud to run EC2 instances within. Should NOT be the account default VPC.", "Type": "AWS::SSM::Parameter::Value", }, - "mobileappsrenderingPrivateSubnets": Object { + "mobileappsrenderingPrivateSubnets": { "Default": "/account/vpc/primary/subnets/private", "Description": "A list of private subnets", "Type": "AWS::SSM::Parameter::Value>", }, + "mobileappsrenderingPublicSubnets": { + "Default": "/account/vpc/primary/subnets/public", + "Description": "A list of public subnets", + "Type": "AWS::SSM::Parameter::Value>", + }, }, - "Resources": Object { - "AutoScalingGroupMobileappsrenderingASG42891F00": Object { - "Properties": Object { + "Resources": { + "AutoScalingGroupMobileappsrenderingASG42891F00": { + "Properties": { "HealthCheckGracePeriod": 120, "HealthCheckType": "ELB", - "LaunchConfigurationName": Object { - "Ref": "AutoScalingGroupMobileappsrenderingLaunchConfig3CF3CAD9", + "LaunchTemplate": { + "LaunchTemplateId": { + "Ref": "mobileTESTmobileappsrenderingAD91FF83", + }, + "Version": { + "Fn::GetAtt": [ + "mobileTESTmobileappsrenderingAD91FF83", + "LatestVersionNumber", + ], + }, }, "MaxSize": "2", "MinSize": "1", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "PropagateAtLaunch": true, "Value": "mobile-apps-rendering", }, - Object { - "Key": "gu:cdk:pattern-name", - "PropagateAtLaunch": true, - "Value": "GuEc2App", - }, - Object { + { "Key": "gu:cdk:version", "PropagateAtLaunch": true, "Value": "TEST", }, - Object { + { "Key": "gu:repo", "PropagateAtLaunch": true, "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "LogKinesisStreamName", "PropagateAtLaunch": true, - "Value": Object { + "Value": { "Ref": "LoggingStreamName", }, }, - Object { - "Key": "Name", - "PropagateAtLaunch": true, - "Value": "MobileAppsRendering/AutoScalingGroupMobileappsrendering", - }, - Object { + { "Key": "Stack", "PropagateAtLaunch": true, "Value": "mobile", }, - Object { + { "Key": "Stage", "PropagateAtLaunch": true, "Value": "TEST", }, ], - "TargetGroupARNs": Array [ - Object { + "TargetGroupARNs": [ + { "Ref": "TargetGroupMobileappsrendering29320E35", }, ], - "VPCZoneIdentifier": Object { + "VPCZoneIdentifier": { "Ref": "mobileappsrenderingPrivateSubnets", }, }, "Type": "AWS::AutoScaling::AutoScalingGroup", }, - "AutoScalingGroupMobileappsrenderingInstanceProfile2F77976E": Object { - "Properties": Object { - "Roles": Array [ - Object { - "Ref": "InstanceRoleMobileappsrenderingEC64402A", - }, - ], - }, - "Type": "AWS::IAM::InstanceProfile", - }, - "AutoScalingGroupMobileappsrenderingLaunchConfig3CF3CAD9": Object { - "DependsOn": Array [ - "InstanceRoleMobileappsrenderingEC64402A", - ], - "Properties": Object { - "IamInstanceProfile": Object { - "Ref": "AutoScalingGroupMobileappsrenderingInstanceProfile2F77976E", - }, - "ImageId": Object { - "Ref": "AMIMobileappsrendering", - }, - "InstanceType": "t4g.small", - "MetadataOptions": Object { - "HttpTokens": "required", - }, - "SecurityGroups": Array [ - Object { - "Fn::GetAtt": Array [ - "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", - "GroupId", - ], - }, - Object { - "Fn::GetAtt": Array [ - "WazuhSecurityGroup", - "GroupId", - ], - }, - ], - "UserData": Object { - "Fn::Base64": Object { - "Fn::Join": Array [ - "", - Array [ - "#!/bin/bash -ev -groupadd mapi -useradd -r -m -s /usr/bin/nologin -g mapi mobile-apps-rendering - -export App=mobile-apps-rendering -export Stack=mobile -export Stage=TEST -export NODE_ENV=production - -aws s3 cp s3://", - Object { - "Ref": "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter", - }, - "/mobile/TEST/mobile-apps-rendering/mobile-apps-rendering.zip /tmp -mkdir -p /opt/mobile-apps-rendering -unzip /tmp/mobile-apps-rendering.zip -d /opt/mobile-apps-rendering -chown -R mobile-apps-rendering:mapi /opt/mobile-apps-rendering - -mkdir -p /usr/share/mobile-apps-rendering/logs -chown -R mobile-apps-rendering:mapi /usr/share/mobile-apps-rendering -ln -s /usr/share/mobile-apps-rendering/logs /var/log/mobile-apps-rendering -chown -R mobile-apps-rendering:mapi /var/log/mobile-apps-rendering - -export PM2_HOME=\\"/usr/share/mobile-apps-rendering\\" -export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" - -/usr/local/node/pm2 start --name mobile-apps-rendering --uid mobile-apps-rendering --gid mapi /opt/mobile-apps-rendering/server.js -/opt/aws-kinesis-agent/configure-aws-kinesis-agent ", - Object { - "Ref": "AWS::Region", - }, - " mobile-log-aggregation-TEST '/var/log/mobile-apps-rendering/*' -/usr/local/node/pm2 logrotate -u mobile-apps-rendering", - ], - ], - }, - }, - }, - "Type": "AWS::AutoScaling::LaunchConfiguration", - }, - "AutoScalingGroupMobileappsrenderingScalingPolicyCpuScalingPolicy25F424F1": Object { - "Properties": Object { - "AutoScalingGroupName": Object { + "AutoScalingGroupMobileappsrenderingScalingPolicyCpuScalingPolicy25F424F1": { + "Properties": { + "AutoScalingGroupName": { "Ref": "AutoScalingGroupMobileappsrenderingASG42891F00", }, "PolicyType": "TargetTrackingScaling", - "TargetTrackingConfiguration": Object { - "PredefinedMetricSpecification": Object { + "TargetTrackingConfiguration": { + "PredefinedMetricSpecification": { "PredefinedMetricType": "ASGAverageCPUUtilization", }, "TargetValue": 10, @@ -232,34 +152,38 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::AutoScaling::ScalingPolicy", }, - "CertificateMobileappsrendering85649D08": Object { + "CertificateMobileappsrendering85649D08": { "DeletionPolicy": "Retain", - "Properties": Object { + "Properties": { "DomainName": "mobile-rendering.mobile-aws.code.dev-guardianapis.com", - "DomainValidationOptions": Array [ - Object { + "DomainValidationOptions": [ + { "DomainName": "mobile-rendering.mobile-aws.code.dev-guardianapis.com", "HostedZoneId": "TEST-HOSTED-ZONE-ID", }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { + "Key": "Name", + "Value": "MobileAppsRendering/CertificateMobileappsrendering", + }, + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, @@ -269,12 +193,12 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Type": "AWS::CertificateManager::Certificate", "UpdateReplacePolicy": "Retain", }, - "DescribeEC2PolicyFF5F9295": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { - "Action": Array [ + "DescribeEC2PolicyFF5F9295": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ "autoscaling:DescribeAutoScalingInstances", "autoscaling:DescribeAutoScalingGroups", "ec2:DescribeTags", @@ -287,21 +211,21 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "describe-ec2-policy", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "DnsRecord": Object { - "Properties": Object { + "DnsRecord": { + "Properties": { "HostedZoneId": "TEST-HOSTED-ZONE-ID", "Name": "mobile-rendering.mobile-aws.code.dev-guardianapis.com.", - "ResourceRecords": Array [ - Object { - "Fn::GetAtt": Array [ + "ResourceRecords": [ + { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingB8B00ACB", "DNSName", ], @@ -312,19 +236,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::Route53::RecordSet", }, - "GetDistributablePolicyMobileappsrendering8E649036": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { + "GetDistributablePolicyMobileappsrendering8E649036": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { "Action": "s3:GetObject", "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:s3:::", - Object { + { "Ref": "DistributionBucketName", }, "/mobile/TEST/mobile-apps-rendering/*", @@ -336,19 +260,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "GetDistributablePolicyMobileappsrendering8E649036", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "GetParametersByPath37B32C62": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { + "GetParametersByPath37B32C62": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { "Action": "ssm:GetParametersByPath", "Effect": "Allow", "Resource": "*", @@ -357,19 +281,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "GetParametersByPath37B32C62", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "GuHttpsEgressSecurityGroupMobileappsrendering089F1660": Object { - "Properties": Object { + "GuHttpsEgressSecurityGroupMobileappsrendering089F1660": { + "Properties": { "GroupDescription": "Allow all outbound HTTPS traffic", - "SecurityGroupEgress": Array [ - Object { + "SecurityGroupEgress": [ + { "CidrIp": "0.0.0.0/0", "Description": "Allow all outbound HTTPS traffic", "FromPort": 443, @@ -377,47 +301,47 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "ToPort": 443, }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, - "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingInternalIngressSecurityGroupMobileappsrenderingB407C3A230407E6A596B": Object { - "Properties": Object { + "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingInternalIngressSecurityGroupMobileappsrenderingB407C3A230407E6A596B": { + "Properties": { "Description": "Load balancer to target", "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "IpProtocol": "tcp", - "SourceSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "SourceSecurityGroupId": { + "Fn::GetAtt": [ "InternalIngressSecurityGroupMobileappsrendering486B411A", "GroupId", ], @@ -426,19 +350,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupIngress", }, - "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingLoadBalancerMobileappsrenderingSecurityGroupE0CCF7183040505B735B": Object { - "Properties": Object { + "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingLoadBalancerMobileappsrenderingSecurityGroupE0CCF7183040505B735B": { + "Properties": { "Description": "Load balancer to target", "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "IpProtocol": "tcp", - "SourceSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "SourceSecurityGroupId": { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingSecurityGroup86D57550", "GroupId", ], @@ -447,30 +371,30 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupIngress", }, - "GuLogShippingPolicy981BFE5A": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { - "Action": Array [ + "GuLogShippingPolicy981BFE5A": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ "kinesis:Describe*", "kinesis:Put*", ], "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:kinesis:", - Object { + { "Ref": "AWS::Region", }, ":", - Object { + { "Ref": "AWS::AccountId", }, ":stream/", - Object { + { "Ref": "LoggingStreamName", }, ], @@ -481,57 +405,61 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "GuLogShippingPolicy981BFE5A", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "InstanceRoleMobileappsrenderingEC64402A": Object { - "Properties": Object { - "AssumeRolePolicyDocument": Object { - "Statement": Array [ - Object { + "InstanceRoleMobileappsrenderingEC64402A": { + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { "Action": "sts:AssumeRole", "Effect": "Allow", - "Principal": Object { - "Service": Object { - "Fn::Join": Array [ - "", - Array [ - "ec2.", - Object { - "Ref": "AWS::URLSuffix", - }, - ], - ], - }, + "Principal": { + "Service": "ec2.amazonaws.com", }, }, ], "Version": "2012-10-17", }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition", + }, + ":iam::aws:policy/AmazonSSMManagedInstanceCore", + ], + ], + }, + ], "Path": "/", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, @@ -539,11 +467,11 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::IAM::Role", }, - "InternalIngressSecurityGroupMobileappsrendering486B411A": Object { - "Properties": Object { + "InternalIngressSecurityGroupMobileappsrendering486B411A": { + "Properties": { "GroupDescription": "Allow restricted ingress from CIDR ranges", - "SecurityGroupIngress": Array [ - Object { + "SecurityGroupIngress": [ + { "CidrIp": "10.0.0.0/8", "Description": "Allow access on port 443 from 10.0.0.0/8", "FromPort": 443, @@ -551,46 +479,46 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "ToPort": 443, }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, - "InternalIngressSecurityGroupMobileappsrenderingtoMobileAppsRenderingGuHttpsEgressSecurityGroupMobileappsrenderingC4F35269304093993953": Object { - "Properties": Object { + "InternalIngressSecurityGroupMobileappsrenderingtoMobileAppsRenderingGuHttpsEgressSecurityGroupMobileappsrenderingC4F35269304093993953": { + "Properties": { "Description": "Load balancer to target", - "DestinationSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "InternalIngressSecurityGroupMobileappsrendering486B411A", "GroupId", ], @@ -600,24 +528,45 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupEgress", }, - "ListenerMobileappsrendering47F84352": Object { - "Properties": Object { - "Certificates": Array [ - Object { - "CertificateArn": Object { + "InternalIngressSecurityGroupMobileappsrenderingtoMobileAppsRenderingWazuhSecurityGroupB96243E1304031807BEA": { + "Properties": { + "Description": "Load balancer to target", + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "InternalIngressSecurityGroupMobileappsrendering486B411A", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupEgress", + }, + "ListenerMobileappsrendering47F84352": { + "Properties": { + "Certificates": [ + { + "CertificateArn": { "Ref": "CertificateMobileappsrendering85649D08", }, }, ], - "DefaultActions": Array [ - Object { - "TargetGroupArn": Object { + "DefaultActions": [ + { + "TargetGroupArn": { "Ref": "TargetGroupMobileappsrendering29320E35", }, "Type": "forward", }, ], - "LoadBalancerArn": Object { + "LoadBalancerArn": { "Ref": "LoadBalancerMobileappsrenderingB8B00ACB", }, "Port": 443, @@ -625,50 +574,50 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::ElasticLoadBalancingV2::Listener", }, - "LoadBalancerMobileappsrenderingB8B00ACB": Object { - "Properties": Object { - "LoadBalancerAttributes": Array [ - Object { + "LoadBalancerMobileappsrenderingB8B00ACB": { + "Properties": { + "LoadBalancerAttributes": [ + { "Key": "deletion_protection.enabled", "Value": "true", }, ], "Scheme": "internal", - "SecurityGroups": Array [ - Object { - "Fn::GetAtt": Array [ + "SecurityGroups": [ + { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingSecurityGroup86D57550", "GroupId", ], }, - Object { - "Fn::GetAtt": Array [ + { + "Fn::GetAtt": [ "InternalIngressSecurityGroupMobileappsrendering486B411A", "GroupId", ], }, ], - "Subnets": Object { + "Subnets": { "Ref": "mobileappsrenderingPrivateSubnets", }, - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, @@ -677,49 +626,49 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::ElasticLoadBalancingV2::LoadBalancer", }, - "LoadBalancerMobileappsrenderingSecurityGroup86D57550": Object { - "Properties": Object { + "LoadBalancerMobileappsrenderingSecurityGroup86D57550": { + "Properties": { "GroupDescription": "Automatically created Security Group for ELB MobileAppsRenderingLoadBalancerMobileappsrendering801C2FFB", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, - "LoadBalancerMobileappsrenderingSecurityGrouptoMobileAppsRenderingGuHttpsEgressSecurityGroupMobileappsrenderingC4F35269304019F57E42": Object { - "Properties": Object { + "LoadBalancerMobileappsrenderingSecurityGrouptoMobileAppsRenderingGuHttpsEgressSecurityGroupMobileappsrenderingC4F35269304019F57E42": { + "Properties": { "Description": "Load balancer to target", - "DestinationSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingSecurityGroup86D57550", "GroupId", ], @@ -729,23 +678,44 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupEgress", }, - "ParameterStoreReadMobileappsrenderingA4006661": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { + "LoadBalancerMobileappsrenderingSecurityGrouptoMobileAppsRenderingWazuhSecurityGroupB96243E130401C238DEC": { + "Properties": { + "Description": "Load balancer to target", + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "LoadBalancerMobileappsrenderingSecurityGroup86D57550", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupEgress", + }, + "ParameterStoreReadMobileappsrenderingA4006661": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { "Action": "ssm:GetParametersByPath", "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:ssm:", - Object { + { "Ref": "AWS::Region", }, ":", - Object { + { "Ref": "AWS::AccountId", }, ":parameter/TEST/mobile/mobile-apps-rendering", @@ -753,22 +723,22 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" ], }, }, - Object { - "Action": Array [ + { + "Action": [ "ssm:GetParameters", "ssm:GetParameter", ], "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:ssm:", - Object { + { "Ref": "AWS::Region", }, ":", - Object { + { "Ref": "AWS::AccountId", }, ":parameter/TEST/mobile/mobile-apps-rendering/*", @@ -780,52 +750,16 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "parameter-store-read-policy", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "SSMRunCommandPolicy244E1613": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { - "Action": Array [ - "ec2messages:AcknowledgeMessage", - "ec2messages:DeleteMessage", - "ec2messages:FailMessage", - "ec2messages:GetEndpoint", - "ec2messages:GetMessages", - "ec2messages:SendReply", - "ssm:UpdateInstanceInformation", - "ssm:ListInstanceAssociations", - "ssm:DescribeInstanceProperties", - "ssm:DescribeDocumentParameters", - "ssmmessages:CreateControlChannel", - "ssmmessages:CreateDataChannel", - "ssmmessages:OpenControlChannel", - "ssmmessages:OpenDataChannel", - ], - "Effect": "Allow", - "Resource": "*", - }, - ], - "Version": "2012-10-17", - }, - "PolicyName": "ssm-run-command-policy", - "Roles": Array [ - Object { - "Ref": "InstanceRoleMobileappsrenderingEC64402A", - }, - ], - }, - "Type": "AWS::IAM::Policy", - }, - "TargetGroupMobileappsrendering29320E35": Object { - "Properties": Object { + "TargetGroupMobileappsrendering29320E35": { + "Properties": { "HealthCheckIntervalSeconds": 10, "HealthCheckPath": "/healthcheck", "HealthCheckProtocol": "HTTP", @@ -833,58 +767,58 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "HealthyThresholdCount": 5, "Port": 3040, "Protocol": "HTTP", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "TargetGroupAttributes": Array [ - Object { + "TargetGroupAttributes": [ + { "Key": "deregistration_delay.timeout_seconds", "Value": "30", }, - Object { + { "Key": "stickiness.enabled", "Value": "false", }, ], "TargetType": "instance", "UnhealthyThresholdCount": 2, - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", }, - "WazuhSecurityGroup": Object { - "Properties": Object { + "WazuhSecurityGroup": { + "Properties": { "GroupDescription": "Allow outbound traffic from wazuh agent to manager", - "SecurityGroupEgress": Array [ - Object { + "SecurityGroupEgress": [ + { "CidrIp": "0.0.0.0/0", "Description": "Wazuh event logging", "FromPort": 1514, "IpProtocol": "tcp", "ToPort": 1514, }, - Object { + { "CidrIp": "0.0.0.0/0", "Description": "Wazuh agent registration", "FromPort": 1515, @@ -892,44 +826,254 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "ToPort": 1515, }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, + "WazuhSecurityGroupfromMobileAppsRenderingInternalIngressSecurityGroupMobileappsrenderingB407C3A23040A9B30033": { + "Properties": { + "Description": "Load balancer to target", + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "SourceSecurityGroupId": { + "Fn::GetAtt": [ + "InternalIngressSecurityGroupMobileappsrendering486B411A", + "GroupId", + ], + }, + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupIngress", + }, + "WazuhSecurityGroupfromMobileAppsRenderingLoadBalancerMobileappsrenderingSecurityGroupE0CCF718304012C66B0D": { + "Properties": { + "Description": "Load balancer to target", + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "SourceSecurityGroupId": { + "Fn::GetAtt": [ + "LoadBalancerMobileappsrenderingSecurityGroup86D57550", + "GroupId", + ], + }, + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupIngress", + }, + "mobileTESTmobileappsrenderingAD91FF83": { + "Properties": { + "LaunchTemplateData": { + "IamInstanceProfile": { + "Arn": { + "Fn::GetAtt": [ + "mobileTESTmobileappsrenderingProfileA8EFA7CB", + "Arn", + ], + }, + }, + "ImageId": { + "Ref": "AMIMobileappsrendering", + }, + "InstanceType": "t4g.small", + "MetadataOptions": { + "HttpTokens": "required", + }, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", + "GroupId", + ], + }, + { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + ], + "TagSpecifications": [ + { + "ResourceType": "instance", + "Tags": [ + { + "Key": "gu:cdk:version", + "Value": "TEST", + }, + { + "Key": "gu:repo", + "Value": "guardian/dotcom-rendering", + }, + { + "Key": "Name", + "Value": "MobileAppsRendering/mobile-TEST-mobile-apps-rendering", + }, + { + "Key": "Stack", + "Value": "mobile", + }, + { + "Key": "Stage", + "Value": "TEST", + }, + ], + }, + { + "ResourceType": "volume", + "Tags": [ + { + "Key": "gu:cdk:version", + "Value": "TEST", + }, + { + "Key": "gu:repo", + "Value": "guardian/dotcom-rendering", + }, + { + "Key": "Name", + "Value": "MobileAppsRendering/mobile-TEST-mobile-apps-rendering", + }, + { + "Key": "Stack", + "Value": "mobile", + }, + { + "Key": "Stage", + "Value": "TEST", + }, + ], + }, + ], + "UserData": { + "Fn::Base64": { + "Fn::Join": [ + "", + [ + "#!/bin/bash -ev +groupadd mapi +useradd -r -m -s /usr/bin/nologin -g mapi mobile-apps-rendering + +export App=mobile-apps-rendering +export Stack=mobile +export Stage=TEST +export NODE_ENV=production + +aws s3 cp s3://", + { + "Ref": "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter", + }, + "/mobile/TEST/mobile-apps-rendering/mobile-apps-rendering.zip /tmp +mkdir -p /opt/mobile-apps-rendering +unzip /tmp/mobile-apps-rendering.zip -d /opt/mobile-apps-rendering +chown -R mobile-apps-rendering:mapi /opt/mobile-apps-rendering + +mkdir -p /usr/share/mobile-apps-rendering/logs +chown -R mobile-apps-rendering:mapi /usr/share/mobile-apps-rendering +ln -s /usr/share/mobile-apps-rendering/logs /var/log/mobile-apps-rendering +chown -R mobile-apps-rendering:mapi /var/log/mobile-apps-rendering + +export PM2_HOME="/usr/share/mobile-apps-rendering" +export ASSETS_MANIFEST="/opt/mobile-apps-rendering/manifest.json" + +/usr/local/node/pm2 start --name mobile-apps-rendering --uid mobile-apps-rendering --gid mapi /opt/mobile-apps-rendering/server.js +/opt/aws-kinesis-agent/configure-aws-kinesis-agent ", + { + "Ref": "AWS::Region", + }, + " mobile-log-aggregation-TEST '/var/log/mobile-apps-rendering/*' +/usr/local/node/pm2 logrotate -u mobile-apps-rendering", + ], + ], + }, + }, + }, + "TagSpecifications": [ + { + "ResourceType": "launch-template", + "Tags": [ + { + "Key": "gu:cdk:version", + "Value": "TEST", + }, + { + "Key": "gu:repo", + "Value": "guardian/dotcom-rendering", + }, + { + "Key": "Name", + "Value": "MobileAppsRendering/mobile-TEST-mobile-apps-rendering", + }, + { + "Key": "Stack", + "Value": "mobile", + }, + { + "Key": "Stage", + "Value": "TEST", + }, + ], + }, + ], + }, + "Type": "AWS::EC2::LaunchTemplate", + }, + "mobileTESTmobileappsrenderingProfileA8EFA7CB": { + "Properties": { + "Roles": [ + { + "Ref": "InstanceRoleMobileappsrenderingEC64402A", + }, + ], + }, + "Type": "AWS::IAM::InstanceProfile", + }, }, } `; exports[`The MobileAppsRenderingPreview stack matches the snapshot 1`] = ` -Object { - "Metadata": Object { - "gu:cdk:constructs": Array [ +{ + "Metadata": { + "gu:cdk:constructs": [ "GuAllowPolicy", "GuVpcParameter", "GuSubnetListParameter", + "GuSubnetListParameter", + "GuEc2App", "GuCertificate", "GuInstanceRole", - "GuSSMRunCommandPolicy", "GuDescribeEC2Policy", "GuLoggingStreamNameParameter", "GuLogShippingPolicy", @@ -938,8 +1082,8 @@ Object { "GuParameterStoreReadPolicy", "GuAmiParameter", "GuHttpsEgressSecurityGroup", - "GuAutoScalingGroup", "GuWazuhAccess", + "GuAutoScalingGroup", "GuApplicationLoadBalancer", "GuApplicationTargetGroup", "GuHttpsApplicationListener", @@ -947,204 +1091,123 @@ Object { ], "gu:cdk:version": "TEST", }, - "Outputs": Object { - "LoadBalancerMobileappsrenderingDnsName": Object { + "Outputs": { + "LoadBalancerMobileappsrenderingDnsName": { "Description": "DNS entry for LoadBalancerMobileappsrendering", - "Value": Object { - "Fn::GetAtt": Array [ + "Value": { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingB8B00ACB", "DNSName", ], }, }, }, - "Parameters": Object { - "AMIMobileappsrendering": Object { + "Parameters": { + "AMIMobileappsrendering": { "Description": "Amazon Machine Image ID for the app mobile-apps-rendering. Use this in conjunction with AMIgo to keep AMIs up to date.", "Type": "AWS::EC2::Image::Id", }, - "DistributionBucketName": Object { + "DistributionBucketName": { "Default": "/account/services/artifact.bucket", "Description": "SSM parameter containing the S3 bucket name holding distribution artifacts", "Type": "AWS::SSM::Parameter::Value", }, - "LoggingStreamName": Object { + "LoggingStreamName": { "Default": "/account/services/logging.stream.name", "Description": "SSM parameter containing the Name (not ARN) on the kinesis stream", "Type": "AWS::SSM::Parameter::Value", }, - "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter": Object { + "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter": { "Default": "/account/services/artifact.bucket", "Type": "AWS::SSM::Parameter::Value", }, - "VpcId": Object { + "VpcId": { "Default": "/account/vpc/primary/id", "Description": "Virtual Private Cloud to run EC2 instances within. Should NOT be the account default VPC.", "Type": "AWS::SSM::Parameter::Value", }, - "mobileappsrenderingPrivateSubnets": Object { + "mobileappsrenderingPrivateSubnets": { "Default": "/account/vpc/primary/subnets/private", "Description": "A list of private subnets", "Type": "AWS::SSM::Parameter::Value>", }, + "mobileappsrenderingPublicSubnets": { + "Default": "/account/vpc/primary/subnets/public", + "Description": "A list of public subnets", + "Type": "AWS::SSM::Parameter::Value>", + }, }, - "Resources": Object { - "AutoScalingGroupMobileappsrenderingASG42891F00": Object { - "Properties": Object { + "Resources": { + "AutoScalingGroupMobileappsrenderingASG42891F00": { + "Properties": { "HealthCheckGracePeriod": 120, "HealthCheckType": "ELB", - "LaunchConfigurationName": Object { - "Ref": "AutoScalingGroupMobileappsrenderingLaunchConfig3CF3CAD9", + "LaunchTemplate": { + "LaunchTemplateId": { + "Ref": "mobilepreviewTESTmobileappsrenderingFF204ED7", + }, + "Version": { + "Fn::GetAtt": [ + "mobilepreviewTESTmobileappsrenderingFF204ED7", + "LatestVersionNumber", + ], + }, }, "MaxSize": "2", "MinSize": "1", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "PropagateAtLaunch": true, "Value": "mobile-apps-rendering", }, - Object { - "Key": "gu:cdk:pattern-name", - "PropagateAtLaunch": true, - "Value": "GuEc2App", - }, - Object { + { "Key": "gu:cdk:version", "PropagateAtLaunch": true, "Value": "TEST", }, - Object { + { "Key": "gu:repo", "PropagateAtLaunch": true, "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "LogKinesisStreamName", "PropagateAtLaunch": true, - "Value": Object { + "Value": { "Ref": "LoggingStreamName", }, }, - Object { - "Key": "Name", - "PropagateAtLaunch": true, - "Value": "MobileAppsRenderingPreview/AutoScalingGroupMobileappsrendering", - }, - Object { + { "Key": "Stack", "PropagateAtLaunch": true, "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "PropagateAtLaunch": true, "Value": "TEST", }, ], - "TargetGroupARNs": Array [ - Object { + "TargetGroupARNs": [ + { "Ref": "TargetGroupMobileappsrendering29320E35", }, ], - "VPCZoneIdentifier": Object { + "VPCZoneIdentifier": { "Ref": "mobileappsrenderingPrivateSubnets", }, }, "Type": "AWS::AutoScaling::AutoScalingGroup", }, - "AutoScalingGroupMobileappsrenderingInstanceProfile2F77976E": Object { - "Properties": Object { - "Roles": Array [ - Object { - "Ref": "InstanceRoleMobileappsrenderingEC64402A", - }, - ], - }, - "Type": "AWS::IAM::InstanceProfile", - }, - "AutoScalingGroupMobileappsrenderingLaunchConfig3CF3CAD9": Object { - "DependsOn": Array [ - "InstanceRoleMobileappsrenderingEC64402A", - ], - "Properties": Object { - "IamInstanceProfile": Object { - "Ref": "AutoScalingGroupMobileappsrenderingInstanceProfile2F77976E", - }, - "ImageId": Object { - "Ref": "AMIMobileappsrendering", - }, - "InstanceType": "t4g.micro", - "MetadataOptions": Object { - "HttpTokens": "required", - }, - "SecurityGroups": Array [ - Object { - "Fn::GetAtt": Array [ - "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", - "GroupId", - ], - }, - Object { - "Fn::GetAtt": Array [ - "WazuhSecurityGroup", - "GroupId", - ], - }, - ], - "UserData": Object { - "Fn::Base64": Object { - "Fn::Join": Array [ - "", - Array [ - "#!/bin/bash -ev -groupadd mapi -useradd -r -m -s /usr/bin/nologin -g mapi mobile-apps-rendering - -export App=mobile-apps-rendering -export Stack=mobile-preview -export Stage=TEST -export NODE_ENV=production - -aws s3 cp s3://", - Object { - "Ref": "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter", - }, - "/mobile-preview/TEST/mobile-apps-rendering/mobile-apps-rendering.zip /tmp -mkdir -p /opt/mobile-apps-rendering -unzip /tmp/mobile-apps-rendering.zip -d /opt/mobile-apps-rendering -chown -R mobile-apps-rendering:mapi /opt/mobile-apps-rendering - -mkdir -p /usr/share/mobile-apps-rendering/logs -chown -R mobile-apps-rendering:mapi /usr/share/mobile-apps-rendering -ln -s /usr/share/mobile-apps-rendering/logs /var/log/mobile-apps-rendering -chown -R mobile-apps-rendering:mapi /var/log/mobile-apps-rendering - -export PM2_HOME=\\"/usr/share/mobile-apps-rendering\\" -export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" - -/usr/local/node/pm2 start --name mobile-apps-rendering --uid mobile-apps-rendering --gid mapi /opt/mobile-apps-rendering/server.js -/opt/aws-kinesis-agent/configure-aws-kinesis-agent ", - Object { - "Ref": "AWS::Region", - }, - " mobile-log-aggregation-TEST '/var/log/mobile-apps-rendering/*' -/usr/local/node/pm2 logrotate -u mobile-apps-rendering", - ], - ], - }, - }, - }, - "Type": "AWS::AutoScaling::LaunchConfiguration", - }, - "AutoScalingGroupMobileappsrenderingScalingPolicyCpuScalingPolicy25F424F1": Object { - "Properties": Object { - "AutoScalingGroupName": Object { + "AutoScalingGroupMobileappsrenderingScalingPolicyCpuScalingPolicy25F424F1": { + "Properties": { + "AutoScalingGroupName": { "Ref": "AutoScalingGroupMobileappsrenderingASG42891F00", }, "PolicyType": "TargetTrackingScaling", - "TargetTrackingConfiguration": Object { - "PredefinedMetricSpecification": Object { + "TargetTrackingConfiguration": { + "PredefinedMetricSpecification": { "PredefinedMetricType": "ASGAverageCPUUtilization", }, "TargetValue": 10, @@ -1152,34 +1215,38 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::AutoScaling::ScalingPolicy", }, - "CertificateMobileappsrendering85649D08": Object { + "CertificateMobileappsrendering85649D08": { "DeletionPolicy": "Retain", - "Properties": Object { + "Properties": { "DomainName": "mobile-preview-rendering.mobile-aws.code.dev-guardianapis.com", - "DomainValidationOptions": Array [ - Object { + "DomainValidationOptions": [ + { "DomainName": "mobile-preview-rendering.mobile-aws.code.dev-guardianapis.com", "HostedZoneId": "TEST-HOSTED-ZONE-ID", }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { + "Key": "Name", + "Value": "MobileAppsRenderingPreview/CertificateMobileappsrendering", + }, + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, @@ -1189,12 +1256,12 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Type": "AWS::CertificateManager::Certificate", "UpdateReplacePolicy": "Retain", }, - "DescribeEC2PolicyFF5F9295": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { - "Action": Array [ + "DescribeEC2PolicyFF5F9295": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ "autoscaling:DescribeAutoScalingInstances", "autoscaling:DescribeAutoScalingGroups", "ec2:DescribeTags", @@ -1207,21 +1274,21 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "describe-ec2-policy", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "DnsRecord": Object { - "Properties": Object { + "DnsRecord": { + "Properties": { "HostedZoneId": "TEST-HOSTED-ZONE-ID", "Name": "mobile-preview-rendering.mobile-aws.code.dev-guardianapis.com.", - "ResourceRecords": Array [ - Object { - "Fn::GetAtt": Array [ + "ResourceRecords": [ + { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingB8B00ACB", "DNSName", ], @@ -1232,19 +1299,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::Route53::RecordSet", }, - "GetDistributablePolicyMobileappsrendering8E649036": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { + "GetDistributablePolicyMobileappsrendering8E649036": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { "Action": "s3:GetObject", "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:s3:::", - Object { + { "Ref": "DistributionBucketName", }, "/mobile-preview/TEST/mobile-apps-rendering/*", @@ -1256,19 +1323,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "GetDistributablePolicyMobileappsrendering8E649036", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "GetParametersByPath37B32C62": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { + "GetParametersByPath37B32C62": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { "Action": "ssm:GetParametersByPath", "Effect": "Allow", "Resource": "*", @@ -1277,19 +1344,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "GetParametersByPath37B32C62", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "GuHttpsEgressSecurityGroupMobileappsrendering089F1660": Object { - "Properties": Object { + "GuHttpsEgressSecurityGroupMobileappsrendering089F1660": { + "Properties": { "GroupDescription": "Allow all outbound HTTPS traffic", - "SecurityGroupEgress": Array [ - Object { + "SecurityGroupEgress": [ + { "CidrIp": "0.0.0.0/0", "Description": "Allow all outbound HTTPS traffic", "FromPort": 443, @@ -1297,47 +1364,47 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "ToPort": 443, }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, - "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingPreviewInternalIngressSecurityGroupMobileappsrendering981D8A7F30401C964232": Object { - "Properties": Object { + "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingPreviewInternalIngressSecurityGroupMobileappsrendering981D8A7F30401C964232": { + "Properties": { "Description": "Load balancer to target", "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "IpProtocol": "tcp", - "SourceSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "SourceSecurityGroupId": { + "Fn::GetAtt": [ "InternalIngressSecurityGroupMobileappsrendering486B411A", "GroupId", ], @@ -1346,19 +1413,19 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupIngress", }, - "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingPreviewLoadBalancerMobileappsrenderingSecurityGroupA08E152F304032151D11": Object { - "Properties": Object { + "GuHttpsEgressSecurityGroupMobileappsrenderingfromMobileAppsRenderingPreviewLoadBalancerMobileappsrenderingSecurityGroupA08E152F304032151D11": { + "Properties": { "Description": "Load balancer to target", "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "IpProtocol": "tcp", - "SourceSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "SourceSecurityGroupId": { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingSecurityGroup86D57550", "GroupId", ], @@ -1367,30 +1434,30 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupIngress", }, - "GuLogShippingPolicy981BFE5A": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { - "Action": Array [ + "GuLogShippingPolicy981BFE5A": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ "kinesis:Describe*", "kinesis:Put*", ], "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:kinesis:", - Object { + { "Ref": "AWS::Region", }, ":", - Object { + { "Ref": "AWS::AccountId", }, ":stream/", - Object { + { "Ref": "LoggingStreamName", }, ], @@ -1401,57 +1468,61 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "GuLogShippingPolicy981BFE5A", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "InstanceRoleMobileappsrenderingEC64402A": Object { - "Properties": Object { - "AssumeRolePolicyDocument": Object { - "Statement": Array [ - Object { + "InstanceRoleMobileappsrenderingEC64402A": { + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { "Action": "sts:AssumeRole", "Effect": "Allow", - "Principal": Object { - "Service": Object { - "Fn::Join": Array [ - "", - Array [ - "ec2.", - Object { - "Ref": "AWS::URLSuffix", - }, - ], - ], - }, + "Principal": { + "Service": "ec2.amazonaws.com", }, }, ], "Version": "2012-10-17", }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition", + }, + ":iam::aws:policy/AmazonSSMManagedInstanceCore", + ], + ], + }, + ], "Path": "/", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, @@ -1459,11 +1530,11 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::IAM::Role", }, - "InternalIngressSecurityGroupMobileappsrendering486B411A": Object { - "Properties": Object { + "InternalIngressSecurityGroupMobileappsrendering486B411A": { + "Properties": { "GroupDescription": "Allow restricted ingress from CIDR ranges", - "SecurityGroupIngress": Array [ - Object { + "SecurityGroupIngress": [ + { "CidrIp": "10.0.0.0/8", "Description": "Allow access on port 443 from 10.0.0.0/8", "FromPort": 443, @@ -1471,46 +1542,46 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "ToPort": 443, }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, - "InternalIngressSecurityGroupMobileappsrenderingtoMobileAppsRenderingPreviewGuHttpsEgressSecurityGroupMobileappsrendering86AAA55B30406414828D": Object { - "Properties": Object { + "InternalIngressSecurityGroupMobileappsrenderingtoMobileAppsRenderingPreviewGuHttpsEgressSecurityGroupMobileappsrendering86AAA55B30406414828D": { + "Properties": { "Description": "Load balancer to target", - "DestinationSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "InternalIngressSecurityGroupMobileappsrendering486B411A", "GroupId", ], @@ -1520,24 +1591,45 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupEgress", }, - "ListenerMobileappsrendering47F84352": Object { - "Properties": Object { - "Certificates": Array [ - Object { - "CertificateArn": Object { + "InternalIngressSecurityGroupMobileappsrenderingtoMobileAppsRenderingPreviewWazuhSecurityGroupBFDBFD7E3040AC7A9AEE": { + "Properties": { + "Description": "Load balancer to target", + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "InternalIngressSecurityGroupMobileappsrendering486B411A", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupEgress", + }, + "ListenerMobileappsrendering47F84352": { + "Properties": { + "Certificates": [ + { + "CertificateArn": { "Ref": "CertificateMobileappsrendering85649D08", }, }, ], - "DefaultActions": Array [ - Object { - "TargetGroupArn": Object { + "DefaultActions": [ + { + "TargetGroupArn": { "Ref": "TargetGroupMobileappsrendering29320E35", }, "Type": "forward", }, ], - "LoadBalancerArn": Object { + "LoadBalancerArn": { "Ref": "LoadBalancerMobileappsrenderingB8B00ACB", }, "Port": 443, @@ -1545,50 +1637,50 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::ElasticLoadBalancingV2::Listener", }, - "LoadBalancerMobileappsrenderingB8B00ACB": Object { - "Properties": Object { - "LoadBalancerAttributes": Array [ - Object { + "LoadBalancerMobileappsrenderingB8B00ACB": { + "Properties": { + "LoadBalancerAttributes": [ + { "Key": "deletion_protection.enabled", "Value": "true", }, ], "Scheme": "internal", - "SecurityGroups": Array [ - Object { - "Fn::GetAtt": Array [ + "SecurityGroups": [ + { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingSecurityGroup86D57550", "GroupId", ], }, - Object { - "Fn::GetAtt": Array [ + { + "Fn::GetAtt": [ "InternalIngressSecurityGroupMobileappsrendering486B411A", "GroupId", ], }, ], - "Subnets": Object { + "Subnets": { "Ref": "mobileappsrenderingPrivateSubnets", }, - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, @@ -1597,49 +1689,49 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::ElasticLoadBalancingV2::LoadBalancer", }, - "LoadBalancerMobileappsrenderingSecurityGroup86D57550": Object { - "Properties": Object { + "LoadBalancerMobileappsrenderingSecurityGroup86D57550": { + "Properties": { "GroupDescription": "Automatically created Security Group for ELB MobileAppsRenderingPreviewLoadBalancerMobileappsrenderingA476639F", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, - "LoadBalancerMobileappsrenderingSecurityGrouptoMobileAppsRenderingPreviewGuHttpsEgressSecurityGroupMobileappsrendering86AAA55B3040C6508311": Object { - "Properties": Object { + "LoadBalancerMobileappsrenderingSecurityGrouptoMobileAppsRenderingPreviewGuHttpsEgressSecurityGroupMobileappsrendering86AAA55B3040C6508311": { + "Properties": { "Description": "Load balancer to target", - "DestinationSecurityGroupId": Object { - "Fn::GetAtt": Array [ + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", "GroupId", ], }, "FromPort": 3040, - "GroupId": Object { - "Fn::GetAtt": Array [ + "GroupId": { + "Fn::GetAtt": [ "LoadBalancerMobileappsrenderingSecurityGroup86D57550", "GroupId", ], @@ -1649,23 +1741,44 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" }, "Type": "AWS::EC2::SecurityGroupEgress", }, - "ParameterStoreReadMobileappsrenderingA4006661": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { + "LoadBalancerMobileappsrenderingSecurityGrouptoMobileAppsRenderingPreviewWazuhSecurityGroupBFDBFD7E304032ED6346": { + "Properties": { + "Description": "Load balancer to target", + "DestinationSecurityGroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "LoadBalancerMobileappsrenderingSecurityGroup86D57550", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupEgress", + }, + "ParameterStoreReadMobileappsrenderingA4006661": { + "Properties": { + "PolicyDocument": { + "Statement": [ + { "Action": "ssm:GetParametersByPath", "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:ssm:", - Object { + { "Ref": "AWS::Region", }, ":", - Object { + { "Ref": "AWS::AccountId", }, ":parameter/TEST/mobile-preview/mobile-apps-rendering", @@ -1673,22 +1786,22 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" ], }, }, - Object { - "Action": Array [ + { + "Action": [ "ssm:GetParameters", "ssm:GetParameter", ], "Effect": "Allow", - "Resource": Object { - "Fn::Join": Array [ + "Resource": { + "Fn::Join": [ "", - Array [ + [ "arn:aws:ssm:", - Object { + { "Ref": "AWS::Region", }, ":", - Object { + { "Ref": "AWS::AccountId", }, ":parameter/TEST/mobile-preview/mobile-apps-rendering/*", @@ -1700,52 +1813,16 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "Version": "2012-10-17", }, "PolicyName": "parameter-store-read-policy", - "Roles": Array [ - Object { + "Roles": [ + { "Ref": "InstanceRoleMobileappsrenderingEC64402A", }, ], }, "Type": "AWS::IAM::Policy", }, - "SSMRunCommandPolicy244E1613": Object { - "Properties": Object { - "PolicyDocument": Object { - "Statement": Array [ - Object { - "Action": Array [ - "ec2messages:AcknowledgeMessage", - "ec2messages:DeleteMessage", - "ec2messages:FailMessage", - "ec2messages:GetEndpoint", - "ec2messages:GetMessages", - "ec2messages:SendReply", - "ssm:UpdateInstanceInformation", - "ssm:ListInstanceAssociations", - "ssm:DescribeInstanceProperties", - "ssm:DescribeDocumentParameters", - "ssmmessages:CreateControlChannel", - "ssmmessages:CreateDataChannel", - "ssmmessages:OpenControlChannel", - "ssmmessages:OpenDataChannel", - ], - "Effect": "Allow", - "Resource": "*", - }, - ], - "Version": "2012-10-17", - }, - "PolicyName": "ssm-run-command-policy", - "Roles": Array [ - Object { - "Ref": "InstanceRoleMobileappsrenderingEC64402A", - }, - ], - }, - "Type": "AWS::IAM::Policy", - }, - "TargetGroupMobileappsrendering29320E35": Object { - "Properties": Object { + "TargetGroupMobileappsrendering29320E35": { + "Properties": { "HealthCheckIntervalSeconds": 10, "HealthCheckPath": "/healthcheck", "HealthCheckProtocol": "HTTP", @@ -1753,58 +1830,58 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "HealthyThresholdCount": 5, "Port": 3040, "Protocol": "HTTP", - "Tags": Array [ - Object { + "Tags": [ + { "Key": "App", "Value": "mobile-apps-rendering", }, - Object { + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "TargetGroupAttributes": Array [ - Object { + "TargetGroupAttributes": [ + { "Key": "deregistration_delay.timeout_seconds", "Value": "30", }, - Object { + { "Key": "stickiness.enabled", "Value": "false", }, ], "TargetType": "instance", "UnhealthyThresholdCount": 2, - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::ElasticLoadBalancingV2::TargetGroup", }, - "WazuhSecurityGroup": Object { - "Properties": Object { + "WazuhSecurityGroup": { + "Properties": { "GroupDescription": "Allow outbound traffic from wazuh agent to manager", - "SecurityGroupEgress": Array [ - Object { + "SecurityGroupEgress": [ + { "CidrIp": "0.0.0.0/0", "Description": "Wazuh event logging", "FromPort": 1514, "IpProtocol": "tcp", "ToPort": 1514, }, - Object { + { "CidrIp": "0.0.0.0/0", "Description": "Wazuh agent registration", "FromPort": 1515, @@ -1812,30 +1889,239 @@ export ASSETS_MANIFEST=\\"/opt/mobile-apps-rendering/manifest.json\\" "ToPort": 1515, }, ], - "Tags": Array [ - Object { + "Tags": [ + { "Key": "gu:cdk:version", "Value": "TEST", }, - Object { + { "Key": "gu:repo", "Value": "guardian/dotcom-rendering", }, - Object { + { "Key": "Stack", "Value": "mobile-preview", }, - Object { + { "Key": "Stage", "Value": "TEST", }, ], - "VpcId": Object { + "VpcId": { "Ref": "VpcId", }, }, "Type": "AWS::EC2::SecurityGroup", }, + "WazuhSecurityGroupfromMobileAppsRenderingPreviewInternalIngressSecurityGroupMobileappsrendering981D8A7F30409D4BEBFF": { + "Properties": { + "Description": "Load balancer to target", + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "SourceSecurityGroupId": { + "Fn::GetAtt": [ + "InternalIngressSecurityGroupMobileappsrendering486B411A", + "GroupId", + ], + }, + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupIngress", + }, + "WazuhSecurityGroupfromMobileAppsRenderingPreviewLoadBalancerMobileappsrenderingSecurityGroupA08E152F3040CC90354B": { + "Properties": { + "Description": "Load balancer to target", + "FromPort": 3040, + "GroupId": { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + "IpProtocol": "tcp", + "SourceSecurityGroupId": { + "Fn::GetAtt": [ + "LoadBalancerMobileappsrenderingSecurityGroup86D57550", + "GroupId", + ], + }, + "ToPort": 3040, + }, + "Type": "AWS::EC2::SecurityGroupIngress", + }, + "mobilepreviewTESTmobileappsrenderingFF204ED7": { + "Properties": { + "LaunchTemplateData": { + "IamInstanceProfile": { + "Arn": { + "Fn::GetAtt": [ + "mobilepreviewTESTmobileappsrenderingProfile72DADF5F", + "Arn", + ], + }, + }, + "ImageId": { + "Ref": "AMIMobileappsrendering", + }, + "InstanceType": "t4g.micro", + "MetadataOptions": { + "HttpTokens": "required", + }, + "SecurityGroupIds": [ + { + "Fn::GetAtt": [ + "GuHttpsEgressSecurityGroupMobileappsrendering089F1660", + "GroupId", + ], + }, + { + "Fn::GetAtt": [ + "WazuhSecurityGroup", + "GroupId", + ], + }, + ], + "TagSpecifications": [ + { + "ResourceType": "instance", + "Tags": [ + { + "Key": "gu:cdk:version", + "Value": "TEST", + }, + { + "Key": "gu:repo", + "Value": "guardian/dotcom-rendering", + }, + { + "Key": "Name", + "Value": "MobileAppsRenderingPreview/mobile-preview-TEST-mobile-apps-rendering", + }, + { + "Key": "Stack", + "Value": "mobile-preview", + }, + { + "Key": "Stage", + "Value": "TEST", + }, + ], + }, + { + "ResourceType": "volume", + "Tags": [ + { + "Key": "gu:cdk:version", + "Value": "TEST", + }, + { + "Key": "gu:repo", + "Value": "guardian/dotcom-rendering", + }, + { + "Key": "Name", + "Value": "MobileAppsRenderingPreview/mobile-preview-TEST-mobile-apps-rendering", + }, + { + "Key": "Stack", + "Value": "mobile-preview", + }, + { + "Key": "Stage", + "Value": "TEST", + }, + ], + }, + ], + "UserData": { + "Fn::Base64": { + "Fn::Join": [ + "", + [ + "#!/bin/bash -ev +groupadd mapi +useradd -r -m -s /usr/bin/nologin -g mapi mobile-apps-rendering + +export App=mobile-apps-rendering +export Stack=mobile-preview +export Stage=TEST +export NODE_ENV=production + +aws s3 cp s3://", + { + "Ref": "SsmParameterValueaccountservicesartifactbucketC96584B6F00A464EAD1953AFF4B05118Parameter", + }, + "/mobile-preview/TEST/mobile-apps-rendering/mobile-apps-rendering.zip /tmp +mkdir -p /opt/mobile-apps-rendering +unzip /tmp/mobile-apps-rendering.zip -d /opt/mobile-apps-rendering +chown -R mobile-apps-rendering:mapi /opt/mobile-apps-rendering + +mkdir -p /usr/share/mobile-apps-rendering/logs +chown -R mobile-apps-rendering:mapi /usr/share/mobile-apps-rendering +ln -s /usr/share/mobile-apps-rendering/logs /var/log/mobile-apps-rendering +chown -R mobile-apps-rendering:mapi /var/log/mobile-apps-rendering + +export PM2_HOME="/usr/share/mobile-apps-rendering" +export ASSETS_MANIFEST="/opt/mobile-apps-rendering/manifest.json" + +/usr/local/node/pm2 start --name mobile-apps-rendering --uid mobile-apps-rendering --gid mapi /opt/mobile-apps-rendering/server.js +/opt/aws-kinesis-agent/configure-aws-kinesis-agent ", + { + "Ref": "AWS::Region", + }, + " mobile-log-aggregation-TEST '/var/log/mobile-apps-rendering/*' +/usr/local/node/pm2 logrotate -u mobile-apps-rendering", + ], + ], + }, + }, + }, + "TagSpecifications": [ + { + "ResourceType": "launch-template", + "Tags": [ + { + "Key": "gu:cdk:version", + "Value": "TEST", + }, + { + "Key": "gu:repo", + "Value": "guardian/dotcom-rendering", + }, + { + "Key": "Name", + "Value": "MobileAppsRenderingPreview/mobile-preview-TEST-mobile-apps-rendering", + }, + { + "Key": "Stack", + "Value": "mobile-preview", + }, + { + "Key": "Stage", + "Value": "TEST", + }, + ], + }, + ], + }, + "Type": "AWS::EC2::LaunchTemplate", + }, + "mobilepreviewTESTmobileappsrenderingProfile72DADF5F": { + "Properties": { + "Roles": [ + { + "Ref": "InstanceRoleMobileappsrenderingEC64402A", + }, + ], + }, + "Type": "AWS::IAM::InstanceProfile", + }, }, } `; diff --git a/apps-rendering/config/jestSetup.js b/apps-rendering/config/jestSetup.js index 150578154a2..dc0df79907f 100644 --- a/apps-rendering/config/jestSetup.js +++ b/apps-rendering/config/jestSetup.js @@ -5,4 +5,5 @@ jest.mock('@guardian/cdk/lib/constants/tracking-tag'); * available globally, and so we need to enable it here. * See https://github.com/jestjs/jest/issues/9983 */ -global.TextEncoder = require('util').TextEncoder +global.TextEncoder = require('util').TextEncoder; +global.TextDecoder = require('util').TextDecoder; diff --git a/apps-rendering/package.json b/apps-rendering/package.json index 992ab72671b..30880252718 100644 --- a/apps-rendering/package.json +++ b/apps-rendering/package.json @@ -41,9 +41,9 @@ "@emotion/jest": "^11.11.0", "@emotion/react": "^11.11.1", "@emotion/server": "^11.11.0", - "@guardian/apps-rendering-api-models": "6.1.0", + "@guardian/apps-rendering-api-models": "6.1.3", "@guardian/bridget": "^2.4.0", - "@guardian/cdk": "^47.3.3", + "@guardian/cdk": "^50.7.0", "@guardian/content-api-models": "^17.6.3", "@guardian/content-atom-model": "^3.4.4", "@guardian/eslint-config-typescript": "^6.0.1", @@ -77,9 +77,9 @@ "@types/webpack": "^5.28.0", "@typescript-eslint/eslint-plugin": "^5.60.1", "@typescript-eslint/parser": "^5.60.1", - "aws-cdk": "2.39.1", - "aws-cdk-lib": "2.39.1", - "aws-sdk": "^2.1231.0", + "aws-cdk": "2.78.0", + "aws-cdk-lib": "2.78.0", + "aws-sdk": "^2.1407.0", "babel-loader": "^9.1.2", "buffer": "^6.0.3", "bufferutil": "4.0.7", diff --git a/apps-rendering/yarn.lock b/apps-rendering/yarn.lock index b6b9935901d..91f1464ba80 100644 --- a/apps-rendering/yarn.lock +++ b/apps-rendering/yarn.lock @@ -22,6 +22,21 @@ dependencies: default-browser-id "3.0.0" +"@aws-cdk/asset-awscli-v1@^2.2.97": + version "2.2.199" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.199.tgz#59cf4abd11f2c5ff487155d7ddf9cc71cc22b56c" + integrity sha512-zNdD2OxALdsdQaRZBpTfMTuudxV+4jLMznJIvVj6O+OqCru4m5UtgVQmyApW1z2H9s4/06ovVt20aXe2G8Ta+w== + +"@aws-cdk/asset-kubectl-v20@^2.1.1": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.2.tgz#d8e20b5f5dc20128ea2000dc479ca3c7ddc27248" + integrity sha512-3M2tELJOxQv0apCIiuKQ4pAbncz9GuLwnKFqxifWfe77wuMxyTRPmxssYHs42ePqzap1LT6GDcPygGs+hHstLg== + +"@aws-cdk/asset-node-proxy-agent-v5@^2.0.77": + version "2.0.165" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.165.tgz#c169599d83beceea7e638082ef9833997f04c85d" + integrity sha512-bsyLQD/vqXQcc9RDmlM1XqiFNO/yewgVFXmkMcQkndJbmE/jgYkzewwYGrBlfL725hGLQipXq19+jwWwdsXQqg== + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" @@ -1675,10 +1690,10 @@ resolved "https://registry.yarnpkg.com/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz#c05ed35ad82df8e6ac616c68b92c2282bd083ba4" integrity sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ== -"@guardian/apps-rendering-api-models@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@guardian/apps-rendering-api-models/-/apps-rendering-api-models-6.1.0.tgz#9f8a72d7078f8e20a823d1ea0f0a58aa2090e857" - integrity sha512-cXbtpuGy/3wux1zSuUIVUG17i2sof51BPc6Jexkf9m3pjNr69z1e7C7ABaLQeeOKbi/ge+Xuj2eD6kziO41ZEA== +"@guardian/apps-rendering-api-models@6.1.3": + version "6.1.3" + resolved "https://registry.yarnpkg.com/@guardian/apps-rendering-api-models/-/apps-rendering-api-models-6.1.3.tgz#d5aa579a299707ba30eb7b5883d9d25666cb38df" + integrity sha512-NmYHvb+aICuuuSJLGqkQ6s6lEDpRDRFnsN3/kVklykbfpXHhJDzw5ybAwSZpLw5Xfl1scHihxmW/1wLxM+hUkQ== dependencies: "@guardian/content-api-models" "^17.6.2" "@guardian/content-atom-model" "^3.4.0" @@ -1694,24 +1709,24 @@ resolved "https://registry.yarnpkg.com/@guardian/bridget/-/bridget-2.4.0.tgz#0ab23b952bc56a9ae6f2620c35b0f16f7839a63d" integrity sha512-k1RR2mg9MZGhO6bJdznoDLxmC9PS6EIn0HSQUPM3hFzh6C0Wuu/EuGV8CdlZSiq4lFa/KBMna6j0yJwUv7xBPA== -"@guardian/cdk@^47.3.3": - version "47.3.5" - resolved "https://registry.yarnpkg.com/@guardian/cdk/-/cdk-47.3.5.tgz#f966e7debdfb3e16d33ddf024e5eff752ac32ba6" - integrity sha512-vwJuUP0rmtKjhf6J7z8IUZzp58+MomTCSTuTc4dsFcpGiW2kq+fEex4ZW/B1U+gxmcXQtTUtR0ehNs8mVZXnEA== +"@guardian/cdk@^50.7.0": + version "50.7.0" + resolved "https://registry.yarnpkg.com/@guardian/cdk/-/cdk-50.7.0.tgz#8e2768390956daf7542a76a7605f18eae5d5e3ba" + integrity sha512-7b/vvTwK4iJ/nrIpHi39EtVUIrMbpN388eFhuHon/TBxUwwYTVEw3iLy3MWBj51izeAjvwoEybu4Gh3/KZGdEQ== dependencies: - "@oclif/core" "1.16.4" - aws-cdk-lib "2.44.0" - aws-sdk "^2.1227.0" + "@oclif/core" "2.8.6" + aws-cdk-lib "2.78.0" + aws-sdk "^2.1397.0" chalk "^4.1.2" - codemaker "^1.69.0" - constructs "10.1.117" + codemaker "^1.84.0" + constructs "10.2.18" git-url-parse "^13.1.0" js-yaml "^4.1.0" lodash.camelcase "^4.3.0" lodash.kebabcase "^4.1.1" lodash.upperfirst "^4.3.1" read-pkg-up "7.0.1" - yargs "^17.6.0" + yargs "^17.6.2" "@guardian/content-api-models@^17.6.2", "@guardian/content-api-models@^17.6.3": version "17.6.3" @@ -2192,21 +2207,20 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oclif/core@1.16.4": - version "1.16.4" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.16.4.tgz#fafa338ada0624d7f1adac036302b05a37cd96d0" - integrity sha512-l+xHtVMteJWeTZZ+f2yLyNjf69X0mhAH8GILXnmoAGAemXbc1DVstvloxOouarvm9xyHHhquzO1Qg5l6xa1VIw== +"@oclif/core@2.8.6": + version "2.8.6" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.6.tgz#7eb6984108f471ad0d719d3c07cde14c47ab17c5" + integrity sha512-1QlPaHMhOORySCXkQyzjsIsy2GYTilOw3LkjeHkCgsPJQjAT4IclVytJusWktPbYNys9O+O4V23J44yomQvnBQ== dependencies: - "@oclif/linewrap" "^1.0.0" - "@oclif/screen" "^3.0.2" + "@types/cli-progress" "^3.11.0" ansi-escapes "^4.3.2" ansi-styles "^4.3.0" cardinal "^2.1.1" chalk "^4.1.2" clean-stack "^3.0.1" - cli-progress "^3.10.0" + cli-progress "^3.12.0" debug "^4.3.4" - ejs "^3.1.6" + ejs "^3.1.8" fs-extra "^9.1.0" get-package-type "^0.1.0" globby "^11.1.0" @@ -2222,20 +2236,12 @@ strip-ansi "^6.0.1" supports-color "^8.1.1" supports-hyperlinks "^2.2.0" - tslib "^2.3.1" + ts-node "^10.9.1" + tslib "^2.5.0" widest-line "^3.1.0" + wordwrap "^1.0.0" wrap-ansi "^7.0.0" -"@oclif/linewrap@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91" - integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw== - -"@oclif/screen@^3.0.2": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-3.0.4.tgz#663db0ecaf23f3184e7f01886ed578060e4a7f1c" - integrity sha512-IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA== - "@pkgr/utils@^2.3.1": version "2.4.1" resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.1.tgz#adf291d0357834c410ce80af16e711b56c7b1cd3" @@ -3119,6 +3125,13 @@ "@types/node" "*" source-map "^0.6.0" +"@types/cli-progress@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.0.tgz#ec79df99b26757c3d1c7170af8422e0fc95eef7e" + integrity sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg== + dependencies: + "@types/node" "*" + "@types/compression@^1.7.2": version "1.7.2" resolved "https://registry.yarnpkg.com/@types/compression/-/compression-1.7.2.tgz#7cc1cdb01b4730eea284615a68fc70a2cdfd5e71" @@ -4102,7 +4115,7 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.9.0: +ajv@^8.0.0, ajv@^8.0.1, ajv@^8.9.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -4338,6 +4351,11 @@ ast-types@^0.16.1: dependencies: tslib "^2.0.1" +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" @@ -4370,44 +4388,33 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-cdk-lib@2.39.1: - version "2.39.1" - resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.39.1.tgz#dff53ee86ddc926de55b78cea97d54e0db0aacc7" - integrity sha512-+KZBLBoCqq/TnC7LH8JMlQ+5IvKQtu7KHnVDiRmngtibLIXqLMVH4neKimNlSSIKhvSeOmqY2ZCaSp8v5szzrg== - dependencies: - "@balena/dockerignore" "^1.0.2" - case "1.6.3" - fs-extra "^9.1.0" - ignore "^5.2.0" - jsonschema "^1.4.1" - minimatch "^3.1.2" - punycode "^2.1.1" - semver "^7.3.7" - yaml "1.10.2" - -aws-cdk-lib@2.44.0: - version "2.44.0" - resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.44.0.tgz#e6157df7a72b8d1a4528f6fb9f9b0ed7aa404bcc" - integrity sha512-h0lCcS3t2TPF5FIpkA7OcE2t4vChtz/FGcZ5jVaORj21quiUz84eOhGk2BeRoKqfSp1Zqu2QxQUk6p6YpAOrRA== +aws-cdk-lib@2.78.0: + version "2.78.0" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.78.0.tgz#703d9611a4b05a866462b3a7f5f927413b507ac6" + integrity sha512-meg2lb7it1n83OrtAcA4Ttc3Tx3PDei2SdZ3Xe8/7RrfiMx3D6jBQZSzOj8hIOEhyNfYoz1AfZwIcqAlmWvmJQ== dependencies: + "@aws-cdk/asset-awscli-v1" "^2.2.97" + "@aws-cdk/asset-kubectl-v20" "^2.1.1" + "@aws-cdk/asset-node-proxy-agent-v5" "^2.0.77" "@balena/dockerignore" "^1.0.2" case "1.6.3" fs-extra "^9.1.0" - ignore "^5.2.0" + ignore "^5.2.4" jsonschema "^1.4.1" minimatch "^3.1.2" - punycode "^2.1.1" - semver "^7.3.7" + punycode "^2.3.0" + semver "^7.3.8" + table "^6.8.1" yaml "1.10.2" -aws-cdk@2.39.1: - version "2.39.1" - resolved "https://registry.yarnpkg.com/aws-cdk/-/aws-cdk-2.39.1.tgz#028eccbbe0f18a2e7c5ad9780c5b512da17645e2" - integrity sha512-HWruCkbsKJcFOKlVbcIQk/704PdPLHCkSpXNZK6BTpHB46bM49jLyQisgnbcPUc7Imk2k7kW6pe5Zvx1hFleMA== +aws-cdk@2.78.0: + version "2.78.0" + resolved "https://registry.yarnpkg.com/aws-cdk/-/aws-cdk-2.78.0.tgz#ccf737a4adef7346a5167c959ff1bb7e08d82d9e" + integrity sha512-fDqImTHefBjr8RYduO0bQRkINYJRGKdTXABeLsaMP6Ff4qDXTymaplyvUxNSB9DlQ+oXQ/aJgqFGiIJXSr+kpg== optionalDependencies: fsevents "2.3.2" -aws-sdk@^2.1227.0, aws-sdk@^2.1231.0, aws-sdk@^2.946.0: +aws-sdk@^2.1397.0, aws-sdk@^2.1407.0, aws-sdk@^2.946.0: version "2.1407.0" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1407.0.tgz#8854a87192ea0bd984f44e751cd137d219180ca5" integrity sha512-J02Cjciw+5p9zR7923rfH+UGDEmbg72YRAZISEahzuWPf/DwMAyIrC5B1cMMq3KrV+KVsRtEY5LujVCFKwB8Yw== @@ -4965,7 +4972,7 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-progress@^3.10.0: +cli-progress@^3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942" integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A== @@ -5032,7 +5039,7 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemaker@^1.69.0: +codemaker@^1.84.0: version "1.84.0" resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.84.0.tgz#da95dc297fc4be657baa49fdc3127ce1f057c6f3" integrity sha512-sOUH3y2q2DEO+gDiBCCoGgkDs8aMY0LTMH0FmHbKpqReZwWDAmWJ0Voc4Thp4Mn380bPku9/ncqyY1a3MZnfEQ== @@ -5196,10 +5203,10 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -constructs@10.1.117: - version "10.1.117" - resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.1.117.tgz#89032da53dfbd57d22836b5933d2f0f190adeab4" - integrity sha512-6Y1Po8yr1M/WAtamLL4kKXIWygky2rYPD4cpea9fKoI6fqtSSOy5TWmYoWXtLMS9hpi/v3XnLY+MjPsa6bMooQ== +constructs@10.2.18: + version "10.2.18" + resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.2.18.tgz#5ffe4d1eab5ee7c3880f6dc4c2b350404a034605" + integrity sha512-hRNYf416y6XyEiSAaaUC50pTeUMTNq1BJFkx2E23Gsp+4MwFPtmHqN4h5h6qeW/vNHAErePQPjMjOekvjBGUAg== constructs@10.2.63: version "10.2.63" @@ -5715,7 +5722,7 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@^3.1.6, ejs@^3.1.8: +ejs@^3.1.8: version "3.1.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== @@ -7187,7 +7194,7 @@ ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.0.5, ignore@^5.2.0: +ignore@^5.0.5, ignore@^5.2.0, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== @@ -8358,6 +8365,11 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== + lodash.union@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" @@ -10235,6 +10247,15 @@ slash@^4.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + sockjs@^0.3.24: version "0.3.24" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" @@ -10571,6 +10592,17 @@ synckit@^0.8.5: "@pkgr/utils" "^2.3.1" tslib "^2.5.0" +table@^6.8.1: + version "6.8.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" + integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" @@ -10859,7 +10891,7 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.5.3: +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.5.3: version "2.6.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== @@ -11686,7 +11718,7 @@ yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.3.1, yargs@^17.6.0: +yargs@^17.3.1, yargs@^17.6.2: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== diff --git a/yarn.lock b/yarn.lock index 90dbdf77036..43aaf709e21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15368,7 +15368,7 @@ preact@10.15.1: resolved "https://registry.yarnpkg.com/preact/-/preact-10.15.1.tgz#a1de60c9fc0c79a522d969c65dcaddc5d994eede" integrity sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g== -prebid.js@guardian/prebid.js: +"prebid.js@github:guardian/prebid.js": version "7.26.0" resolved "https://codeload.github.com/guardian/prebid.js/tar.gz/2e3b96dc57dfe14ed8c418674ee7a0a150ece7cb" dependencies: From cf5b3e34be8e106ab0eac7150640abb8072ef082 Mon Sep 17 00:00:00 2001 From: Joe Cowton Date: Thu, 29 Jun 2023 14:25:48 +0100 Subject: [PATCH 055/147] Install fetch-mock in AR --- apps-rendering/package.json | 1 + apps-rendering/src/articleFormat.ts | 4 +- apps-rendering/yarn.lock | 65 +++++++++++++++++++++++++++-- 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/apps-rendering/package.json b/apps-rendering/package.json index 30880252718..87b1b0ef90f 100644 --- a/apps-rendering/package.json +++ b/apps-rendering/package.json @@ -95,6 +95,7 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.32.2", "express": "^4.18.2", + "fetch-mock": "9.11.0", "html-webpack-plugin": "^5.5.3", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", diff --git a/apps-rendering/src/articleFormat.ts b/apps-rendering/src/articleFormat.ts index 95d49a1afe6..67b97392a76 100644 --- a/apps-rendering/src/articleFormat.ts +++ b/apps-rendering/src/articleFormat.ts @@ -121,7 +121,7 @@ const themeToPillar = (theme: ArticleTheme): ArticlePillar => { * @param design An {@linkcode ArticleDesign} * @returns A string representation of `ArticleDesign` */ -const designToString = (design: ArticleDesign): string | undefined => { +const designToString = (design: ArticleDesign): string => { switch (design) { case ArticleDesign.Standard: return 'Standard'; @@ -175,6 +175,8 @@ const designToString = (design: ArticleDesign): string | undefined => { return 'Timeline'; case ArticleDesign.Profile: return 'Profile'; + default: + return 'Standard'; } }; diff --git a/apps-rendering/yarn.lock b/apps-rendering/yarn.lock index 91f1464ba80..56c3badf9a8 100644 --- a/apps-rendering/yarn.lock +++ b/apps-rendering/yarn.lock @@ -49,7 +49,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== -"@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.18.13", "@babel/core@^7.20.2", "@babel/core@^7.7.5": +"@babel/core@^7.0.0", "@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.18.13", "@babel/core@^7.20.2", "@babel/core@^7.7.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89" integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg== @@ -1311,7 +1311,7 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA== @@ -5257,7 +5257,7 @@ core-js-pure@^3.23.3: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.31.0.tgz#052fd9e82fbaaf86457f5db1fadcd06f15966ff2" integrity sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg== -core-js@^3.31.0: +core-js@^3.0.0, core-js@^3.31.0: version "3.31.0" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344" integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ== @@ -6413,6 +6413,22 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4: node-domexception "^1.0.0" web-streams-polyfill "^3.0.3" +fetch-mock@9.11.0: + version "9.11.0" + resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-9.11.0.tgz#371c6fb7d45584d2ae4a18ee6824e7ad4b637a3f" + integrity sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q== + dependencies: + "@babel/core" "^7.0.0" + "@babel/runtime" "^7.0.0" + core-js "^3.0.0" + debug "^4.1.1" + glob-to-regexp "^0.4.0" + is-subset "^0.1.1" + lodash.isequal "^4.5.0" + path-to-regexp "^2.2.1" + querystring "^0.2.0" + whatwg-url "^6.5.0" + fetch-retry@^5.0.2: version "5.0.6" resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.6.tgz#17d0bc90423405b7a88b74355bf364acd2a7fa56" @@ -6808,7 +6824,7 @@ glob-promise@^6.0.2: dependencies: "@types/glob" "^8.0.0" -glob-to-regexp@^0.4.1: +glob-to-regexp@^0.4.0, glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== @@ -7507,6 +7523,11 @@ is-string@^1.0.5, is-string@^1.0.7: dependencies: has-tostringtag "^1.0.0" +is-subset@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" + integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw== + is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" @@ -8365,6 +8386,11 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== + lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" @@ -9227,6 +9253,11 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704" + integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w== + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -9528,6 +9559,11 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== +querystring@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" + integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== + querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" @@ -10804,6 +10840,13 @@ tough-cookie@^4.1.2: universalify "^0.2.0" url-parse "^1.5.3" +tr46@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA== + dependencies: + punycode "^2.1.0" + tr46@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" @@ -11245,6 +11288,11 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== +webidl-conversions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== + webidl-conversions@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" @@ -11444,6 +11492,15 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" +whatwg-url@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" + integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" From de7dc969cf4343102c74016b6f023d8659c6e3f0 Mon Sep 17 00:00:00 2001 From: Joe Cowton Date: Thu, 29 Jun 2023 14:39:54 +0100 Subject: [PATCH 056/147] update comment --- apps-rendering/config/jestSetup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps-rendering/config/jestSetup.js b/apps-rendering/config/jestSetup.js index dc0df79907f..c273bfd3802 100644 --- a/apps-rendering/config/jestSetup.js +++ b/apps-rendering/config/jestSetup.js @@ -1,8 +1,8 @@ jest.mock('@guardian/cdk/lib/constants/tracking-tag'); /** - * Some tests use a JSDOM Jest environment. It appears that TextEncoder is not - * available globally, and so we need to enable it here. + * Some tests use a JSDOM Jest environment. It appears that TextEncoder and + * TextDecoder are not available globally, and so we need to enable them here. * See https://github.com/jestjs/jest/issues/9983 */ global.TextEncoder = require('util').TextEncoder; From 6bbfdf594b4bd9997472d9809db343f2468d173c Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:44:36 +0100 Subject: [PATCH 057/147] delet displayAge logic --- dotcom-rendering/src/components/Card/Card.tsx | 55 +++---------------- dotcom-rendering/src/layouts/FrontLayout.tsx | 3 - 2 files changed, 7 insertions(+), 51 deletions(-) diff --git a/dotcom-rendering/src/components/Card/Card.tsx b/dotcom-rendering/src/components/Card/Card.tsx index 33bddb33a58..0c89b6348d8 100644 --- a/dotcom-rendering/src/components/Card/Card.tsx +++ b/dotcom-rendering/src/components/Card/Card.tsx @@ -137,46 +137,22 @@ const StarRatingComponent = ({ * about the container where the card sits. * */ -const decideIfAgeShouldShow = ({ - showLivePlayable, - containerPalette, - format, - showAge, -}: { - showLivePlayable: boolean; - containerPalette?: DCRContainerPalette; - format: ArticleFormat; - showAge: boolean; -}): boolean => { - if (showLivePlayable) return false; - // Some containers force all cards to show age. E.g., The articles in the headlines - // container are typically very recent so we want to display age there - if (showAge) return true; - // Palettes are time sensitive so show age if one is being used - if (containerPalette) return true; - // Liveblogs are evidently time sensitive - if (format.design === ArticleDesign.LiveBlog) return true; - // Otherwise, do not show the article age on the Card - return false; -}; type RenderFooter = ({ - displayAge, displayLines, }: { - displayAge: boolean; displayLines: boolean; }) => JSX.Element; const DecideFooter = ({ isOpinion, hasSublinks, - displayAge, + renderFooter, }: { isOpinion: boolean; hasSublinks?: boolean; - displayAge: boolean; + renderFooter: RenderFooter; }) => { if (isOpinion && !hasSublinks) { @@ -187,7 +163,6 @@ const DecideFooter = ({ // For all other cases (including opinion cards that *do* have sublinks) we // render a version of the footer without lines here return renderFooter({ - displayAge, displayLines: false, }); // Note. Opinion cards always show the lines at the bottom of the card (in CommentFooter) @@ -196,12 +171,12 @@ const DecideFooter = ({ const CommentFooter = ({ hasSublinks, palette, - displayAge, + renderFooter, }: { hasSublinks?: boolean; palette: Palette; - displayAge: boolean; + renderFooter: RenderFooter; }) => { return hasSublinks ? ( @@ -212,7 +187,6 @@ const CommentFooter = ({ // When an opinion card has no sublinks we show the entire footer, including lines // outside, along the entire bottom of the card renderFooter({ - displayAge, displayLines: true, }) ); @@ -288,7 +262,7 @@ export const Card = ({ snapData, containerPalette, containerType, - showAge = false, + showAge = true, discussionId, isDynamo, isCrossword, @@ -312,13 +286,7 @@ export const Card = ({ format.design === ArticleDesign.Editorial || format.design === ArticleDesign.Letter; - const renderFooter = ({ - displayAge, - displayLines, - }: { - displayAge?: boolean; - displayLines?: boolean; - }) => { + const renderFooter = ({ displayLines }: { displayLines?: boolean }) => { if (showLivePlayable) return <>; return ( @@ -535,7 +496,6 @@ export const Card = ({ {hasSublinks && sublinkPosition === 'inner' ? ( @@ -567,7 +527,6 @@ export const Card = ({ {isOpinion && !isDynamo && ( diff --git a/dotcom-rendering/src/layouts/FrontLayout.tsx b/dotcom-rendering/src/layouts/FrontLayout.tsx index 3179a77ed67..8181b90ad3b 100644 --- a/dotcom-rendering/src/layouts/FrontLayout.tsx +++ b/dotcom-rendering/src/layouts/FrontLayout.tsx @@ -544,9 +544,6 @@ export const FrontLayout = ({ front, NAV }: Props) => { containerPalette={ collection.containerPalette } - showAge={ - collection.displayName === 'Headlines' - } adIndex={desktopAdPositions.indexOf(index)} renderAds={renderAds} /> From f9e8cc60920f7ea52de50cc2d205056f5ce280d0 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:44:43 +0100 Subject: [PATCH 058/147] set discussion fixtures --- dotcom-rendering/fixtures/manual/comment.ts | 157 +++ .../fixtures/manual/discussion.ts | 4 +- .../manual/discussionWithNoComments.ts | 19 + .../manual/discussionWithTwoComments.ts | 64 ++ .../legacyDiscussionWithoutThreading.ts | 969 ++++++++++++++++++ .../fixtures/manual/noTopPicks.ts | 19 + dotcom-rendering/fixtures/manual/topPicks.ts | 68 ++ .../src/discussion-rendering/App.stories.tsx | 2 +- dotcom-rendering/src/lib/mockRESTCalls.ts | 207 +++- 9 files changed, 1497 insertions(+), 12 deletions(-) create mode 100644 dotcom-rendering/fixtures/manual/comment.ts create mode 100644 dotcom-rendering/fixtures/manual/discussionWithNoComments.ts create mode 100644 dotcom-rendering/fixtures/manual/discussionWithTwoComments.ts create mode 100644 dotcom-rendering/fixtures/manual/legacyDiscussionWithoutThreading.ts create mode 100644 dotcom-rendering/fixtures/manual/noTopPicks.ts create mode 100644 dotcom-rendering/fixtures/manual/topPicks.ts diff --git a/dotcom-rendering/fixtures/manual/comment.ts b/dotcom-rendering/fixtures/manual/comment.ts new file mode 100644 index 00000000000..b389189d0af --- /dev/null +++ b/dotcom-rendering/fixtures/manual/comment.ts @@ -0,0 +1,157 @@ +export const comment = { + id: 138809272, + body: '

Begone ye self-serving Tory isolationists.

Never has there been a more significant time for Big Government and public health provision. Nature has spoken.

', + date: '09 March 2020 7:09pm', + isoDateTime: '2020-03-09T19:09:28Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/138809272', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809272', + numRecommends: 45, + isHighlighted: false, + userProfile: { + userId: '13239086', + displayName: 'blipvert', + webUrl: 'https://profile.theguardian.com/user/id/13239086', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13239086', + avatar: 'https://avatar.guim.co.uk/user/13239086', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13239086', + badge: [], + }, + discussion: { + key: '/p/4k83z', + webUrl: 'https://www.theguardian.com/commentisfree/2020/mar/09/coronavirus-outbreak-nhs-staff-shortages', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/4k83z', + title: 'Even a starved NHS is still our best defence against the coronavirus', + isClosedForComments: true, + isClosedForRecommendation: true, + }, + responses: [ + { + id: 138809396, + body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", + date: '09 March 2020 7:19pm', + isoDateTime: '2020-03-09T19:19:03Z', + status: 'blocked', + webUrl: 'https://discussion.theguardian.com/comment-permalink/138809396', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809396', + numRecommends: 0, + isHighlighted: false, + responseTo: { + displayName: 'blipvert', + commentApiUrl: + 'https://discussion.guardianapis.com/discussion-api/comment/138809272', + isoDateTime: '2020-03-09T19:09:28Z', + date: '09 March 2020 7:09pm', + commentId: '138809272', + commentWebUrl: + 'https://discussion.theguardian.com/comment-permalink/138809272', + }, + userProfile: { + userId: '13093174', + displayName: 'Cricketnut', + webUrl: 'https://profile.theguardian.com/user/id/13093174', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13093174', + avatar: 'https://avatar.guim.co.uk/user/13093174', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13093174', + badge: [], + }, + }, + { + id: 138809487, + body: '

There are few Libertarians and small government advocates during pandemics.

', + date: '09 March 2020 7:24pm', + isoDateTime: '2020-03-09T19:24:46Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/138809487', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809487', + numRecommends: 30, + isHighlighted: false, + responseTo: { + displayName: 'blipvert', + commentApiUrl: + 'https://discussion.guardianapis.com/discussion-api/comment/138809272', + isoDateTime: '2020-03-09T19:09:28Z', + date: '09 March 2020 7:09pm', + commentId: '138809272', + commentWebUrl: + 'https://discussion.theguardian.com/comment-permalink/138809272', + }, + userProfile: { + userId: '100102208', + displayName: 'AJVC1991', + webUrl: 'https://profile.theguardian.com/user/id/100102208', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100102208', + avatar: 'https://avatar.guim.co.uk/user/100102208', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/100102208', + badge: [], + }, + }, + { + id: 138809896, + body: '

What?

', + date: '09 March 2020 7:48pm', + isoDateTime: '2020-03-09T19:48:31Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/138809896', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809896', + numRecommends: 9, + isHighlighted: false, + responseTo: { + displayName: 'blipvert', + commentApiUrl: + 'https://discussion.guardianapis.com/discussion-api/comment/138809272', + isoDateTime: '2020-03-09T19:09:28Z', + date: '09 March 2020 7:09pm', + commentId: '138809272', + commentWebUrl: + 'https://discussion.theguardian.com/comment-permalink/138809272', + }, + userProfile: { + userId: '2611744', + displayName: 'Delius', + webUrl: 'https://profile.theguardian.com/user/id/2611744', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', + avatar: 'https://avatar.guim.co.uk/user/2611744', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2611744', + badge: [], + }, + }, + { + id: 138810191, + body: '

Or at least, they don\'t flaunt their allegiance to Britannia Unchained and Rand quite so obviously. What awaits if we continue to act as if "there are individual men and women and there are families" and no responsibility to a wider society?

', + date: '09 March 2020 8:05pm', + isoDateTime: '2020-03-09T20:05:54Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/138810191', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810191', + numRecommends: 20, + isHighlighted: false, + responseTo: { + displayName: 'AJVC1991', + commentApiUrl: + 'https://discussion.guardianapis.com/discussion-api/comment/138809487', + isoDateTime: '2020-03-09T19:24:46Z', + date: '09 March 2020 7:24pm', + commentId: '138809487', + commentWebUrl: + 'https://discussion.theguardian.com/comment-permalink/138809487', + }, + userProfile: { + userId: '12298092', + displayName: '_jhfta_', + webUrl: 'https://profile.theguardian.com/user/id/12298092', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12298092', + avatar: 'https://avatar.guim.co.uk/user/12298092', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/12298092', + badge: [], + }, + }, + ], + metaData: { + commentCount: 5, + staffCommenterCount: 0, + editorsPickCount: 0, + blockedCount: 1, + responseCount: 4, + }, +}; diff --git a/dotcom-rendering/fixtures/manual/discussion.ts b/dotcom-rendering/fixtures/manual/discussion.ts index 7415513eced..2674347d191 100644 --- a/dotcom-rendering/fixtures/manual/discussion.ts +++ b/dotcom-rendering/fixtures/manual/discussion.ts @@ -5,9 +5,9 @@ export const discussion = { pageSize: 50, orderBy: 'oldest', discussion: { - key: '/p/ddp96', + key: '/p/4k83z', webUrl: 'https://www.theguardian.com/commentisfree/2020/mar/09/coronavirus-outbreak-nhs-staff-shortages', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion/p/ddp96', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion/p/4k83z', commentCount: 782, topLevelCommentCount: 198, isClosedForComments: true, diff --git a/dotcom-rendering/fixtures/manual/discussionWithNoComments.ts b/dotcom-rendering/fixtures/manual/discussionWithNoComments.ts new file mode 100644 index 00000000000..58f7716b286 --- /dev/null +++ b/dotcom-rendering/fixtures/manual/discussionWithNoComments.ts @@ -0,0 +1,19 @@ +export const discussionWithNoComments = { + status: 'ok', + page: 1, + pages: 0, + pageSize: 100, + orderBy: 'oldest', + discussion: { + key: '/p/39f5x', + webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5x', + commentCount: 0, + topLevelCommentCount: 0, + isClosedForComments: false, + isClosedForRecommendation: false, + isThreaded: true, + title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', + comments: [], + }, +}; diff --git a/dotcom-rendering/fixtures/manual/discussionWithTwoComments.ts b/dotcom-rendering/fixtures/manual/discussionWithTwoComments.ts new file mode 100644 index 00000000000..c5ce0274883 --- /dev/null +++ b/dotcom-rendering/fixtures/manual/discussionWithTwoComments.ts @@ -0,0 +1,64 @@ +export const discussionWithTwoComments = { + status: 'ok', + page: 1, + pages: 0, + pageSize: 100, + orderBy: 'oldest', + discussion: { + key: '/p/39f5x', + webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5x', + commentCount: 0, + topLevelCommentCount: 0, + isClosedForComments: false, + isClosedForRecommendation: false, + isThreaded: true, + title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', + comments: [ + { + id: 37772513, + body: '

Lovely chickens! https://www.supersupersuperlongdomainnameImeanitneverstopsatallevereveritmakesyouwonderiftheremightbealimittothesethings.com

', + date: '04 July 2014 1:57pm', + isoDateTime: '2014-07-04T12:57:48Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/37772513', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37772513', + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '2310959', + displayName: 'jamesgorrie', + webUrl: 'https://profile.theguardian.com/user/id/2310959', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', + avatar: 'https://avatar.guim.co.uk/user/2310959', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 42979860, + body: '

test

', + date: '30 October 2014 5:24pm', + isoDateTime: '2014-10-30T17:24:16Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/42979860', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/42979860', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '1186733', + displayName: 'GideonGoldberg', + webUrl: 'https://profile.theguardian.com/user/id/1186733', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', + avatar: 'https://avatar.guim.co.uk/user/1186733', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', + badge: [], + }, + }, + ], + }, +}; diff --git a/dotcom-rendering/fixtures/manual/legacyDiscussionWithoutThreading.ts b/dotcom-rendering/fixtures/manual/legacyDiscussionWithoutThreading.ts new file mode 100644 index 00000000000..6d229ab39b0 --- /dev/null +++ b/dotcom-rendering/fixtures/manual/legacyDiscussionWithoutThreading.ts @@ -0,0 +1,969 @@ +export const legacyDiscussionWithoutThreading = { + status: 'ok', + page: 1, + pages: 1, + pageSize: 100, + orderBy: 'oldest', + discussion: { + key: '/p/32255', + webUrl: 'https://www.theguardian.com/environment/2011/sep/19/richard-benyon-ragwort', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/32255', + commentCount: 45, + topLevelCommentCount: 45, + isClosedForComments: true, + isClosedForRecommendation: false, + isThreaded: false, + title: "Richard Benyon's Facebook 'war on ragwort' sparks spat with ecologists", + comments: [ + { + id: 12468508, + body: '

He is not being lobbied by a herbicide company is he?

', + date: '19 September 2011 1:01pm', + isoDateTime: '2011-09-19T12:01:11Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12468508', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12468508', + numResponses: 0, + numRecommends: 13, + isHighlighted: false, + userProfile: { + userId: '2479941', + displayName: 'madmonty', + webUrl: 'https://profile.theguardian.com/user/id/2479941', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2479941', + avatar: 'https://avatar.guim.co.uk/user/2479941', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2479941', + badge: [], + }, + }, + { + id: 12468646, + body: '

The very thought!

', + date: '19 September 2011 1:08pm', + isoDateTime: '2011-09-19T12:08:12Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12468646', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12468646', + numResponses: 0, + numRecommends: 5, + isHighlighted: false, + userProfile: { + userId: '2870517', + displayName: 'GSC82', + webUrl: 'https://profile.theguardian.com/user/id/2870517', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2870517', + avatar: 'https://avatar.guim.co.uk/user/2870517', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2870517', + badge: [], + }, + }, + { + id: 12469052, + body: "

The Minister for huntin' and shootin' strikes again...

On an aside though, I am also interested to see how often the 'folk knowledge' of those who work on the land (or in the city or anywhere else) is so often wrong...

", + date: '19 September 2011 1:29pm', + isoDateTime: '2011-09-19T12:29:05Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12469052', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469052', + numResponses: 0, + numRecommends: 12, + isHighlighted: false, + userProfile: { + userId: '794075', + displayName: 'Alasdairca', + webUrl: 'https://profile.theguardian.com/user/id/794075', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/794075', + avatar: 'https://avatar.guim.co.uk/user/794075', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/794075', + badge: [], + }, + }, + { + id: 12469251, + body: "

I am also interested to see how often the 'folk knowledge' of those who work on the land (or in the city or anywhere else) is so often wrong...
Indeed.
http://www.ragwortfacts.com/ragwort-myths.html

", + date: '19 September 2011 1:39pm', + isoDateTime: '2011-09-19T12:39:22Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12469251', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469251', + numResponses: 0, + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '3111076', + displayName: 'philstyle', + webUrl: 'https://profile.theguardian.com/user/id/3111076', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3111076', + avatar: 'https://avatar.guim.co.uk/user/3111076', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3111076', + badge: [], + }, + }, + { + id: 12469484, + body: "

Newbury MP Benyon, whose family's estates earn around £200,000 a year in EU farm subsidies...

Not earn. Are paid.

", + date: '19 September 2011 1:49pm', + isoDateTime: '2011-09-19T12:49:37Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12469484', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469484', + numResponses: 0, + numRecommends: 9, + isHighlighted: false, + userProfile: { + userId: '1331497', + displayName: 'DoctorDark', + webUrl: 'https://profile.theguardian.com/user/id/1331497', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1331497', + avatar: 'https://avatar.guim.co.uk/user/1331497', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1331497', + badge: [], + }, + }, + { + id: 12469659, + body: '

when I was farming I had one field which was full of ragwort. It is dangerous to cattle and horses. At the end of the school holidays I got hold of six or seven boys of about 10 or 11, gave them an empty fertilizer sack and promised to pay them a half-penny for every plant they pulled up. (this was in 1962 or 3).
Ragwort cannot be killled by any known selective weed-killer, It has to be pulled up by the roots.
Thwe boys got an average of 40 plants each and we werre very happy to be given 1/8d.

', + date: '19 September 2011 1:57pm', + isoDateTime: '2011-09-19T12:57:11Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12469659', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469659', + numResponses: 0, + numRecommends: 5, + isHighlighted: false, + userProfile: { + userId: '4279254', + displayName: 'bordighera1', + webUrl: 'https://profile.theguardian.com/user/id/4279254', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4279254', + avatar: 'https://avatar.guim.co.uk/user/4279254', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4279254', + badge: [], + }, + }, + { + id: 12469806, + body: "

Ragwort is everywhere. It can be a problem, but is also a part of our habitat.

There. All sorted.

Do we have to have this typical English hype,rant and posturing?

The English press whip everything up for copy and the public lap up the phoney drama.Then people wonder why politicians are so phoney and insincere. They daren't be anything else.
Political correctness rules.

", + date: '19 September 2011 2:03pm', + isoDateTime: '2011-09-19T13:03:27Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12469806', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469806', + numResponses: 0, + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4530494', + displayName: 'jobrian', + webUrl: 'https://profile.theguardian.com/user/id/4530494', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4530494', + avatar: 'https://avatar.guim.co.uk/user/4530494', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4530494', + badge: [], + }, + }, + { + id: 12469934, + body: '

And they attacked his ecological knowledge

This is the sort of thing that happens when ministers have to be picked from among MPs. It is amazing that almost nobody treats this as a problem.

There might be one or two Westminister MPs in total with the necessary knowledge of ecology. It is mad we expect MPs to be appointed ministers and within a year to be speaking with the expertise of people with several years of university study plus years on the job.

There are many European countries where ministers are appointed by the prime minister and are usually so choosen because of recognised expertise in the field. Cases like this show the UK needs to change. This sort of amateurism might have been fine for the Victorians but it is out of place today.

', + date: '19 September 2011 2:09pm', + isoDateTime: '2011-09-19T13:09:36Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12469934', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469934', + numResponses: 0, + numRecommends: 11, + isHighlighted: false, + userProfile: { + userId: '1954291', + displayName: 'drabacus', + webUrl: 'https://profile.theguardian.com/user/id/1954291', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1954291', + avatar: 'https://avatar.guim.co.uk/user/1954291', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1954291', + badge: [], + }, + }, + { + id: 12469981, + body: '

I\'ve long been aware of this attitude to Ragwort, and other so called "weeds". It is irrational thinking of a similar nature to racism and all the other stupid irrational hatreds people have.

Within hours of the post about the "vile weed", more than 30 people had complained that he was ecologically illiterate, plain wrong or perpetuating myths put out about the plant by herbicide companies.

This is precisely the problem, "ecological illiteracy". That it is the government\'s Minister for the Natural Environment and Fisheries, Richard Benyon expressing these views is nothing short of incredible. After all, presumably his department have enough advisers who could have quickly explained that he was a being a buffoon expressing his ignorance, before putting both feet in it - highlighting his ignorance and unsuitability for the position.

From what I understand the main problem with Ragwort poisoning in horses is being fed hay with dried Ragwort in it. They normally avoid eating live Ragwort in pastures.

Benyon struck back, saying his critics were being "unnecessarily aggressive", and that he wasn\'t advocating ethnic cleansing of ragwort but that he wanted to deal with "a severe infestation of a poisonous plant".


This is laughable, and clearly Richard Benyon has a problem with joined up thinking. He uses aggressive phrases like "vile weed" and "a severe infestation of a poisonous plant", whilst risibly accusing other of being "unnecessarily aggressive".

Matt Shardlow, the director of Buglife is very right when he says "a critically important nectar source for hundreds of species of butterflies, bees, moths, flies and other invertebrates". I tend to specialise in photographing feeding insects feeding in flowers, and I can confirm that Ragwort is an extremely important plant in sustaining pollinators. It is important not only because it is an attractive plant to pollinators, but because of the volume of it. I would describe it as one of our most important native plants for sustaining pollinator populations.

It is bizarre in the extreme, that there is a well recognised problem with the decline of pollinators, not just in the UK, but internationally. And here we have an uneducated buffoon, who has somehow found himself Minister for the Natural Environment and Fisheries, declaring war on an important native wildflower, which is of major importance in sustaining these species in serious decline. Species which are actually very important to farmers. This is why Richard Benyon is clearly "ecological illiteracy". I suggest that if Richard Benyon wants to do this job, then he urgently needs to educate himself about the subject.

', + date: '19 September 2011 2:12pm', + isoDateTime: '2011-09-19T13:12:32Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12469981', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469981', + numResponses: 0, + numRecommends: 12, + isHighlighted: false, + userProfile: { + userId: '4311896', + displayName: 'SteB1', + webUrl: 'https://profile.theguardian.com/user/id/4311896', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', + avatar: 'https://avatar.guim.co.uk/user/4311896', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', + badge: [], + }, + }, + { + id: 12470128, + body: "

Shame he can't get so aerated about the Rhododendron that invades and destroys anywhere its shoots spread or seeds land and his voters keep planting in their large gardens.

", + date: '19 September 2011 2:18pm', + isoDateTime: '2011-09-19T13:18:36Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12470128', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12470128', + numResponses: 0, + numRecommends: 8, + isHighlighted: false, + userProfile: { + userId: '1301439', + displayName: 'WaitForPete', + webUrl: 'https://profile.theguardian.com/user/id/1301439', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1301439', + avatar: 'https://avatar.guim.co.uk/user/1301439', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1301439', + badge: [], + }, + }, + { + id: 12470152, + body: '

@ bordighera:

Ragwort cannot be killled by any known selective weed-killer, It has to be pulled up by the roots.

Not necessarily true. Pulling up by the roots can be one of the worst things you can do - remember this is a plant that loves to colonise bare ground, which is what you create when pulling existing plants up. This creates perfect oportunities for seed in the soil, or new seed rain to colonise those areas making it seem like the ragwort never went away. I have seen this happen many times.

As for other control methods, I am not an expert on herbicides, but it would appear there are numerous to choose from that will do the job - see the Defra code of practice, or for example the Centre for ecology and Hydrology information sheet on ragwort http://www.ceh.ac.uk/sci_programmes/documents/Ragwort.pdf (to name but two sources) for more info.

', + date: '19 September 2011 2:20pm', + isoDateTime: '2011-09-19T13:20:06Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12470152', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12470152', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '3596779', + displayName: 'Ecoboy1980', + webUrl: 'https://profile.theguardian.com/user/id/3596779', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3596779', + avatar: 'https://avatar.guim.co.uk/user/3596779', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3596779', + badge: [], + }, + }, + { + id: 12470272, + body: '

@SteB1

Right as rain as usual :)

', + date: '19 September 2011 2:25pm', + isoDateTime: '2011-09-19T13:25:45Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12470272', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12470272', + numResponses: 0, + numRecommends: 4, + isHighlighted: false, + userProfile: { + userId: '4387033', + displayName: 'Atomant77', + webUrl: 'https://profile.theguardian.com/user/id/4387033', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4387033', + avatar: 'https://avatar.guim.co.uk/user/4387033', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4387033', + badge: [], + }, + }, + { + id: 12471548, + body: "

The stupid thing about using hebicides on ragwort is that the weed is easy to control by pulling.

Like bordighera1 I had a field full of ragwort with cattle and horses on it.

As vets warn it is a poison, I used to go out and pull a sackful every day when out walking.

They are easy to pull, especially after rain.

Ragworts are now a rarity in that field. Other weeds are caused by overfertilising.

When we went organic and stopped using mineral fertiliser, one surprising side effect was that weeds died out and clovers flourished. The mineral imbalance causes the weeds. A coating of dried seaweed fertiliser worked wonders. The meadow is full of bees, dragon flys butterflys and all kinds of insect life, a joy to visit on a summer's day.

", + date: '19 September 2011 3:34pm', + isoDateTime: '2011-09-19T14:34:07Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12471548', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12471548', + numResponses: 0, + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '1268926', + displayName: 'kvms', + webUrl: 'https://profile.theguardian.com/user/id/1268926', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1268926', + avatar: 'https://avatar.guim.co.uk/user/1268926', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1268926', + badge: [], + }, + }, + { + id: 12471828, + body: '

Government minister shown to be clueless, ignorant of portfolio, reactionary and protectionist idiot shocker. What an absolute prick and sadly so full of hubris he is unlikely to be embarrassed.

@SteB1 and @drabacus - spot on by the way.

', + date: '19 September 2011 3:52pm', + isoDateTime: '2011-09-19T14:52:35Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12471828', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12471828', + numResponses: 0, + numRecommends: 5, + isHighlighted: false, + userProfile: { + userId: '3874929', + displayName: 'carnaptious99', + webUrl: 'https://profile.theguardian.com/user/id/3874929', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3874929', + avatar: 'https://avatar.guim.co.uk/user/3874929', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3874929', + badge: [], + }, + }, + { + id: 12471872, + body: '

Another ill informed, arrogant minster who gets found out when he actually tries to interact with voters.

', + date: '19 September 2011 3:54pm', + isoDateTime: '2011-09-19T14:54:54Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12471872', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12471872', + numResponses: 0, + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '4568262', + displayName: 'JimmerInManila', + webUrl: 'https://profile.theguardian.com/user/id/4568262', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4568262', + avatar: 'https://avatar.guim.co.uk/user/4568262', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4568262', + badge: [], + }, + }, + { + id: 12472026, + body: '

@kvms ragwort is *not* "controlled" by pulling. First, you can\'t pull the rosette stage. Second, pulling the plant simply means that next year you\'ll have loads more plants to pull. The root system is quite complex even above ground. If you like pulling up ragwort, congratulations - you\'ve kept yourself in a job.

I wouldn\'t trust that "ragwort facts" site as it doesn\'t link out. Instead use PubMed where you can find some raw data, such as from this search.

@SteB1 "From what I understand the main problem with Ragwort poisoning in horses is being fed hay with dried Ragwort in it. They normally avoid eating live Ragwort in pastures."

That\'s because the ragwort has a bitter taste (because of the alkalinoids). Once dried, the taste is lost. So the argument really is about controlling ragwort in fields that will be used for hay, and perhaps also for human food (I don\'t think you really want phlebotoxic contaminants in your basic food supply).

Ragwort quickly colonises bare ground (another reason why pulling, which leaves bare patches, isn\'t so clever); I think that\'s why Benyon is so frustrated with the Highways Agency, which is great at digging up roads but no so good at chucking grass seed over the bits once repaired.

', + date: '19 September 2011 4:02pm', + isoDateTime: '2011-09-19T15:02:57Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12472026', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12472026', + numResponses: 0, + numRecommends: 5, + isHighlighted: false, + userProfile: { + userId: '2427181', + displayName: 'CharlesArthur', + webUrl: 'https://profile.theguardian.com/user/id/2427181', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2427181', + avatar: 'https://avatar.guim.co.uk/user/2427181', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2427181', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 12472059, + body: '

Richard Benyon shoots himself in the foot, good, saves others the bother of doing it for him.

Scary to think someone ignorant is in this Government position of power, though.

', + date: '19 September 2011 4:04pm', + isoDateTime: '2011-09-19T15:04:19Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12472059', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12472059', + numResponses: 0, + numRecommends: 3, + isHighlighted: false, + userProfile: { + userId: '4188282', + displayName: 'sparclear', + webUrl: 'https://profile.theguardian.com/user/id/4188282', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4188282', + avatar: 'https://avatar.guim.co.uk/user/4188282', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4188282', + badge: [], + }, + }, + { + id: 12473125, + body: '

Just be sure you are not confusing Senecio jacobaea with Tanacetum vulgare.

', + date: '19 September 2011 5:03pm', + isoDateTime: '2011-09-19T16:03:22Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12473125', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473125', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '4573193', + displayName: 'PanYanPickle', + webUrl: 'https://profile.theguardian.com/user/id/4573193', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4573193', + avatar: 'https://avatar.guim.co.uk/user/4573193', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4573193', + badge: [], + }, + }, + { + id: 12473463, + body: "

@CharlesArthur

\"From what I understand the main problem with Ragwort poisoning in horses is being fed hay with dried Ragwort in it. They normally avoid eating live Ragwort in pastures.\"\n
That's because the ragwort has a bitter taste (because of the alkalinoids). Once dried, the taste is lost. So the argument really is about controlling ragwort in fields that will be used for hay, and perhaps also for human food (I don't think you really want phlebotoxic contaminants in your basic food supply).

Ragwort quickly colonises bare ground (another reason why pulling, which leaves bare patches, isn't so clever); I think that's why Benyon is so frustrated with the Highways Agency, which is great at digging up roads but no so good at chucking grass seed over the bits once repaired.

Yes I'm well aware of some of the compounds in Ragwort and why horses supposedly avoid Ragwort in fields, but may eat it in hay. Although I think much of it is to do with the difference between the way horses selectively browse in fields, and the way they eat hay. Horses simply do not have the equipment to disentangle different plants from hay they are fed, so they are forced to eat whole, and not selectively as when thy browse. I should also add that I have formally studied herbivory, how some toxins operate biologically, and the secondary metabolites which inhibit herbivory. I was bought up in a rural area and I have known horsey people for most of my life. So I appreciate these aspects and have a good grasp of the rural attitude to Ragwort. I also understand the ecological prefererences of Ragwort, which is also important in understanding it's ecological importance in the modern era.

The main bit you miss out is that the wish to control Ragwort everywhere is because it has wind blown seed. In the countryside there is a traditional annoyance with landowners who don't control Ragwort as it is perceived that the seed from the Ragwort in their fields spreads elsewhere.

I admit it's quite some time since I have done specific reading on the toxicity of Ragwort. However, from what I can remember most of the literature appeared to imply that the dangers of Ragwort toxicity were somewhat exaggerated. This backs up my own experience. where I can't even think of an example of Ragwort toxicity in a horse. Although I have been personally aware of quite a few examples where people's horses have died or become ill with acorn poisoning. This has always what has struck me, horse owners are a bit obsessed with Ragwort, even though most of the things that effect horses aren't Ragwort poisoning.

I find that there is a very distorted view about \"poisonous plants\". Those that have these concerns often do not realise what a huge variety of our native plants species have pretty potent toxins in them. This tends to result in hysteria about some plants, where most people are not even aware that other plants they consider safe, are even more toxic.

Without doing a fair bit of reading to get up to date, my impression is that the toxicity of Ragwort is an overblown concern. The pre-occupation with Ragwort appears to be because it is a named plant in the 1959 Weeds Act. But the other named weeds are 2 Dock species and 2 Thistle species. This was a time of the green revolution and where our pasture was being turned into \"improved grassland\". In such grassland normally only one species of grass (usually a Ryegrass sp.) is welcome, and 2 Clover species. Typically such grassland only contains about 5 species. The other species being those named in the Weeds Act, which farmers want to eliminate to increase yield. Species rich grassland can contain 80 species. We have lost over 90% of our species rich grassland. In other words, I personally think it's far more about Ragwort being one of the few species to invade \"improved grassland\", than it is about toxicity or danger.

The notion that there are good species, and bad species which need to be demomized, and war waged on them has done massive damage to the biodiversity our countryside. To see our countryside as containing bad, or enemy species, which have to be controlled at all costs is really a bit of an uninformed Victorian attitude. As I explained before, Ragwort is an important native plant for sustaining pollinator populations, which have been in serious decline. This is what makes these simplistic views about good and bad species problematic. Often the species seen as bad, had an unacknowledged positive role to play in the ecology of our countryside.

I have also seen little evidence to suggest Ragwort is any sort of real threat to human health.

", + date: '19 September 2011 5:22pm', + isoDateTime: '2011-09-19T16:22:08Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12473463', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473463', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '4311896', + displayName: 'SteB1', + webUrl: 'https://profile.theguardian.com/user/id/4311896', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', + avatar: 'https://avatar.guim.co.uk/user/4311896', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', + badge: [], + }, + }, + { + id: 12473866, + body: '

This site appears to provide proper sources for its statements:
http://www.ragwort.org.uk/

', + date: '19 September 2011 5:50pm', + isoDateTime: '2011-09-19T16:50:45Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12473866', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473866', + numResponses: 0, + numRecommends: 3, + isHighlighted: false, + userProfile: { + userId: '4368868', + displayName: 'kitenet', + webUrl: 'https://profile.theguardian.com/user/id/4368868', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4368868', + avatar: 'https://avatar.guim.co.uk/user/4368868', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4368868', + badge: [], + }, + }, + { + id: 12473958, + body: '

To most of us, there is no story at all here, just a photo of a man pulling up some weeds and having a rant about them. My neighbours, colleagues, friends,... do the same thing every single weekend.

And he even has the sense of humour to laugh at himself in the comments on that facebook page.

But a few people want to make a fuss and vandalise his facebook page. Unfortunately that is all to common these days too. That says more about those people though than it does about the Minister.

', + date: '19 September 2011 5:57pm', + isoDateTime: '2011-09-19T16:57:16Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12473958', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473958', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '3699054', + displayName: 'NeverMindTheBollocks', + webUrl: 'https://profile.theguardian.com/user/id/3699054', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3699054', + avatar: 'https://avatar.guim.co.uk/user/3699054', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3699054', + badge: [], + }, + }, + { + id: 12473992, + body: '

cinnebar moths are beautiful pink moths and are a natural way of reducing ragwort since the caterpillars can be seen in abundance feeding on them, little yellow and balck striped beauties that can decimate a whole plant in hours apparently.

ignorant people irritate when they talk about stuff they know nothing about. me i try and enjoy the beauty that is there.http://www.flickr.com/photos/martin_black/5967445057/in/set-72157622416904918

', + date: '19 September 2011 5:59pm', + isoDateTime: '2011-09-19T16:59:24Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12473992', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473992', + numResponses: 0, + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '4212243', + displayName: 'grumpygrowlygirlie', + webUrl: 'https://profile.theguardian.com/user/id/4212243', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4212243', + avatar: 'https://avatar.guim.co.uk/user/4212243', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4212243', + badge: [], + }, + }, + { + id: 12474633, + body: '

@kitenet

This site appears to provide proper sources for its statements:
http://www.ragwort.org.uk/

Thanks very much for this useful link. It confirms many of my impressions. I\'ve have been baffled by Ragwort hysteria for a long time. Whilst it is a bit of a pre-occupation in equine circles, I was always a bit baffled because I wasn\'t aware of any specific cases where horses had definitely become ill due to Ragwort poisoning. Whereas I was aware of many examples of other types of poisoning such as horses eating large amounts of acorns. Although I am wary of these diagnoses, because often it appears to be more of a guess, and is often not confirmed by a post-morten.

A particular problem with concerns about plant toxicity, is that just because compounds are in plants, does not necessarily mean that they will be ingested in high enough levels to cause illness.

', + date: '19 September 2011 6:56pm', + isoDateTime: '2011-09-19T17:56:40Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12474633', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12474633', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '4311896', + displayName: 'SteB1', + webUrl: 'https://profile.theguardian.com/user/id/4311896', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', + avatar: 'https://avatar.guim.co.uk/user/4311896', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', + badge: [], + }, + }, + { + id: 12474814, + body: '

I am the author of the http://www.ragwort.org.uk/ , I did a lot research because I was made scared by press and repeated misinformation and I am a horse owner, I asked experts to help my cause some didn\'t look right for me, this expersts did help me with my website to discover facts and/or myths. ( most was myths)
I also made a picture gallery of the importance for biodiversity ( that is only visible on my Dutch website)
There are a lot of insects, butterflys etc feeding at ragwort, I think a lot more than catlle http://www.jakobskruiskruid.com/website/index.php?option=com_rsgallery2&Itemid=48
On the gallery tehere are also a lot of yellow plants where people make mistakes, some very common plant, but also some rare. Not any yellow is ragwort.

', + date: '19 September 2011 7:15pm', + isoDateTime: '2011-09-19T18:15:28Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12474814', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12474814', + numResponses: 0, + numRecommends: 6, + isHighlighted: false, + userProfile: { + userId: '4741862', + displayName: 'EstherHegt', + webUrl: 'https://profile.theguardian.com/user/id/4741862', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', + avatar: 'https://avatar.guim.co.uk/user/4741862', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', + badge: [], + }, + }, + { + id: 12475107, + body: "

@NMTB

To most of us, there is no story at all here, just a photo of a man pulling up some weeds and having a rant about them. My neighbours, colleagues, friends,... do the same thing every single weekend.

That's not really accurate is it? The man pulling up the \"weeds\" happened to be the Minister resonsible for biodiversity, and here he was calling a native wildflower, which supports a significant amount of biodiversity, a \"vile weed\" - saying \"I hate ragwort. It may not be the issue of the moment but I am on the warpath for those who let this vile weed spread\". These comments were made in a public context on his facebook page which makes his ministerial role clear.

Additionally, both my experience, and what I have read in the scientific literature in the past, indicates that the supposed problems Ragwort causes are grossly over-exaggerated, with there being little evidence for the widespread problems attributed to it.

But a few people want to make a fuss and vandalise his facebook page. Unfortunately that is all to common these days too. That says more about those people though than it does about the Minister.

You don't explain exactly what you mean by vandalise his facebook page. We can't cross check this because he removed the thread, presumably to hide his embarrassment. Do you just mean people pointed out that Richard Benyon doesn't appear to have any understanding of the ecological role Ragwort plays in supporting biodiversity? As he is the Minister responsible for biodiversity it was incumbent on those who understand the subject to point out that the Minister's comments were ill-informed, and showed an incredible degree ecological illiteracy for someone in such a role - a clear matter of public concern. Your comment is more like spin for the Minister than anything else. After all you've not said anything to support the validity of the Minister's ill-informed rant.

", + date: '19 September 2011 7:44pm', + isoDateTime: '2011-09-19T18:44:27Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12475107', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475107', + numResponses: 0, + numRecommends: 4, + isHighlighted: false, + userProfile: { + userId: '4311896', + displayName: 'SteB1', + webUrl: 'https://profile.theguardian.com/user/id/4311896', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', + avatar: 'https://avatar.guim.co.uk/user/4311896', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', + badge: [], + }, + }, + { + id: 12475117, + body: '

If, as has been suggests that 2000+ horse suffered from liver failure last year and died due to Ragwort consumption then someone needs to drop this chap a line for the facts..

If ragwort is poisonous and horses eat it and die that is not a good thing.

This is not hysteria.

The horses and their owners will be very grateful if someone gets to the truth here.
I haven\'t set up a website. But the equation would seem to be,

Ragwort + ragwort munching horse = dead horse not munching anything.

', + date: '19 September 2011 7:45pm', + isoDateTime: '2011-09-19T18:45:49Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12475117', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475117', + numResponses: 0, + numRecommends: 3, + isHighlighted: false, + userProfile: { + userId: '4641408', + displayName: 'MrRatfan1976', + webUrl: 'https://profile.theguardian.com/user/id/4641408', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4641408', + avatar: 'https://avatar.guim.co.uk/user/4641408', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4641408', + badge: [], + }, + }, + { + id: 12475461, + body: '

"There is very very clear science on meta-population dynamics that shows that habitat loss with in a patchwork of habitats has a very severe effect"

YAWN.

', + date: '19 September 2011 8:25pm', + isoDateTime: '2011-09-19T19:25:51Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12475461', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475461', + numResponses: 0, + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4487660', + displayName: 'MrPiggles', + webUrl: 'https://profile.theguardian.com/user/id/4487660', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4487660', + avatar: 'https://avatar.guim.co.uk/user/4487660', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4487660', + badge: [], + }, + }, + { + id: 12475751, + body: '

Ragwort is a noxious weed in agricultural situations.

http://www.sac.ac.uk/mainrep/pdfs/tn570ragwortpoisoning.pdf

Although it is also important for biodiversity, its not exactly a rare plant.

I would far rather pull it, as Benyon is doing, when infestations in problem areas are light and easily controlled, rather than allow things to get out of hand and then use herbicides which will needlessly cause huge collateral damage on many harmless and beneficial grassland species.

', + date: '19 September 2011 8:58pm', + isoDateTime: '2011-09-19T19:58:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12475751', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475751', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '2411079', + displayName: 'antipodean1', + webUrl: 'https://profile.theguardian.com/user/id/2411079', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2411079', + avatar: 'https://avatar.guim.co.uk/user/2411079', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2411079', + badge: [], + }, + }, + { + id: 12475801, + body: '

@ MrRatfan1976

If, as has been suggests that 2000+ horse suffered from liver failure last year and died due to Ragwort consumption then someone needs to drop this chap a line for the facts..

We did, we wrote the chap a email and that is our page about the myth of skin absorption http://www.ragwort.org.uk/facts-or-myths/7-i/13-ragwort-poisoning-through-skin-absorption-fact-or-fiction

', + date: '19 September 2011 9:02pm', + isoDateTime: '2011-09-19T20:02:42Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12475801', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475801', + numResponses: 0, + numRecommends: 4, + isHighlighted: false, + userProfile: { + userId: '4741862', + displayName: 'EstherHegt', + webUrl: 'https://profile.theguardian.com/user/id/4741862', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', + avatar: 'https://avatar.guim.co.uk/user/4741862', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', + badge: [], + }, + }, + { + id: 12475922, + body: "

I was one of those who posted comments on the minister's Facebook page. I don't believe I was 'aggressive' but I was most certainly was alarmed by Mr Benyon's total lack of knowledge.

One of the worst problems with ragwort is that people don't read the code of practice. Since his own department is responsible for the COP it is not unreasonable to expect Mr Benyon to have read it.

The photograph makes it clear he hasn't because there are five ways in which what he is doing is not in accordance with the advice in the COP. I blogged about all five the other day.

", + date: '19 September 2011 9:14pm', + isoDateTime: '2011-09-19T20:14:33Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12475922', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475922', + numResponses: 0, + numRecommends: 4, + isHighlighted: false, + userProfile: { + userId: '4323663', + displayName: 'thepoisongarden', + webUrl: 'https://profile.theguardian.com/user/id/4323663', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4323663', + avatar: 'https://avatar.guim.co.uk/user/4323663', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4323663', + badge: [], + }, + }, + { + id: 12476305, + body: "

At first , I'm a horse owner and have no fear for ragwort at all !!

<quote>
MrRatfan1976\n\n19 September 2011 7:45PM\n\nIf, as has been suggests that 2000+ horse suffered from liver failure last year and died due to Ragwort consumption then someone needs to drop this chap a line for the facts.. </quote>

That's done as you can see above...by EstherHegt and her experts

By the way...
Did you know , in those time's and also today there is still NO test that can make you sure it is ragwort that has killed a horse?
Besides... the guy Knottenbelt in you're link isn't even a toxicologist, and the same guy admitted in an other site that those numbers where.... a gamble.

", + date: '19 September 2011 9:47pm', + isoDateTime: '2011-09-19T20:47:08Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12476305', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476305', + numResponses: 0, + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '4742115', + displayName: 'NickAltena', + webUrl: 'https://profile.theguardian.com/user/id/4742115', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4742115', + avatar: 'https://avatar.guim.co.uk/user/4742115', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4742115', + badge: [], + }, + }, + { + id: 12476413, + body: "

It's just another myth that any flowering Ragwortplant wil grow overnight, the majority of ragwortplants needs 2 full growing seasons to get in a flowering state, it takes a bit more of skills to regognise the vegetative state , but an important one, because this is also the most effective state to use succesfully in destroying the plant, bij apropiate chemical herbicides.


it will allways be the horseowners who puts a horse in a certain field, horses can't speak for themselfs, keep them safe from contact with poisionous plants is just one of many, many horsemanship tasks to put in good practice!
Ragwort is just one of many not to tollerate plants in a horsefield or paddock, and it is one of many you don't want in hay or other feed.

", + date: '19 September 2011 9:57pm', + isoDateTime: '2011-09-19T20:57:51Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12476413', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476413', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '4741862', + displayName: 'EstherHegt', + webUrl: 'https://profile.theguardian.com/user/id/4741862', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', + avatar: 'https://avatar.guim.co.uk/user/4741862', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', + badge: [], + }, + }, + { + id: 12476758, + body: '

@antipodean1

Ragwort is a noxious weed in agricultural situations.

http://www.sac.ac.uk/mainrep/pdfs/tn570ragwortpoisoning.pdf
Although it is also important for biodiversity, its not exactly a rare plant.

I would far rather pull it, as Benyon is doing, when infestations in problem areas are light and easily controlled, rather than allow things to get out of hand and then use herbicides which will needlessly cause huge collateral damage on many harmless and beneficial grassland species.

I don\'t often find myself disagreeing with you. The reference you gave just gives a series of assertions and doesn\'t support or reference them.

I\'ve known about the supposed toxicity of Ragwort throughout most of my life. Several people in my family have been horse owners, and it is a big pre-occupation in the equine world. Also I knew about it because the caterpillars of Cinnabar moths supposedly were unpalatable because of a concentration of the Ragworts toxins. Initially I just accepted this as fact because it was repeated so much. However I started become sceptical because despite the equine world\'s pre-occupation with Ragwort I never knew of a definite Ragwort poisoning case. Yet I knew of other cases of horses being poisoned by eating other things, but not Ragwort. This was baffling given the prevalence of Ragwort in fields grazed by horses and in pasture cut for hay. I started to become suspicious that this was a "factoid" - an inaccurate assertion that gains credence over time by its repetition.

When I tried reading up on it some while back when I had access to an academic library I could find very little direct information about the supposed problem of Ragwort toxicity. Most of it just appeared to be unsupported assertions, and the anecdotal accounts weren\'t backed up by post-morten results. However, it was not enough of an issue for me to pursue it any further.

This is why I find @EstherHegt\'s comments and website so interesting, because it confirms my suspicions. At the very least the problem appears to be somewhat overstated.
http://www.ragwort.org.uk/

On the subject of Ragwort\'s importance for supporting biodiversity. Yes you are right that it is not a rare plant. However, the groups of pollinating insects, to which Ragwort is important, are in serious decline. So it is the volume of food sources (flowers) important to this biodiversity component, and not just whether it is there or not. Photographing flower feeding insects has given me a lot of insight into which flower food sources are the most popular with feeding insects, and which are the most widespread and used. In my experience Ragwort is one of the most important single plants. In my experience perhaps only Hogweed supports more feeding insects, and is more widespread. I think the shot below is of a hoverfly on Ragwort. Although I don\'t use Ragwort too much for my photography as I use flash, and the smaller flowers mean you tend to get a black background. Here I managed to get a few flowers behind to prevent this.
http://farm5.static.flickr.com/4018/4396328430_78f4045739_o.jpg

', + date: '19 September 2011 10:31pm', + isoDateTime: '2011-09-19T21:31:48Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12476758', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476758', + numResponses: 0, + numRecommends: 3, + isHighlighted: false, + userProfile: { + userId: '4311896', + displayName: 'SteB1', + webUrl: 'https://profile.theguardian.com/user/id/4311896', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', + avatar: 'https://avatar.guim.co.uk/user/4311896', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', + badge: [], + }, + }, + { + id: 12476847, + body: '

I have no fear of ragwort but for the sake of the nice old horses i ask the key question.

Is ragwort a risk for horses?

Can someone qualified pitch in with an answer. Otherwise we\'ll be chewing on the question for days, unlike the horses who wont know.

I don\'t really give a monkey\'s about this old boy tory and his facebook troll hell. However 30 years ago i was removing ragwort from fields so the old horsie wasn\'t at any risk, i was brought up with "Ragwort is poisonous for the horse"

@Esher "horses can\'t speak for themselves, keep them safe". Spot on.

Can we have some science please. Is Ragwort a danger to a horse and if it is what are we going to do about it. Defra, NFU, BHF, Mr Toxicologist. What is your best guideline?

', + date: '19 September 2011 10:41pm', + isoDateTime: '2011-09-19T21:41:03Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12476847', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476847', + numResponses: 0, + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4641408', + displayName: 'MrRatfan1976', + webUrl: 'https://profile.theguardian.com/user/id/4641408', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4641408', + avatar: 'https://avatar.guim.co.uk/user/4641408', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4641408', + badge: [], + }, + }, + { + id: 12477021, + body: "

Just to clarify the point I am making. I'm not suggesting that those with livestock and who want to take precautions shouldn't control Ragwort in their pastures. What I am concerned about is the demonization of plants like Ragwort. This can lead to pointless wars waged against certain plants everywhere, with little thought about what this is meant to achieve, or the effect it has on other biodiversity. I often find interesting places to photograph insects. I return and everything has been cut down or sprayed (not particularly Ragwort). There doesn't appear to be any clear rationale for this, as often these places have no other purpose to serve, that the vegetation cut down or sprayed prevents. When I have asked about this, I often get puzzled looks, and told they are weeds, or need to be tidied up. A weed is only a plant growing where someone doesn't want it to grow. Unfortunately, many people who don't understand this concept appear to believe that being a weed, makes a plant inherently bad wherever it is, and it is necessary to wage constant war on weeds, regardless of where they are growing.

", + date: '19 September 2011 10:59pm', + isoDateTime: '2011-09-19T21:59:44Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12477021', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477021', + numResponses: 0, + numRecommends: 3, + isHighlighted: false, + userProfile: { + userId: '4311896', + displayName: 'SteB1', + webUrl: 'https://profile.theguardian.com/user/id/4311896', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', + avatar: 'https://avatar.guim.co.uk/user/4311896', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', + badge: [], + }, + }, + { + id: 12477166, + body: '

Common ragwort (Senecio jacobaea), a risk to the livers of both horses and cows too folks.

Keep it away from them and them away from it would seem to be a wise move.

Here\'s the science - bit.

A wise move from Mr Benyon here and that cow up there is moost grateful.

', + date: '19 September 2011 11:14pm', + isoDateTime: '2011-09-19T22:14:23Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12477166', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477166', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '4641408', + displayName: 'MrRatfan1976', + webUrl: 'https://profile.theguardian.com/user/id/4641408', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4641408', + avatar: 'https://avatar.guim.co.uk/user/4641408', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4641408', + badge: [], + }, + }, + { + id: 12477257, + body: '

There are 6000 plantspecies who produce PAs (3 % of all flowering plants.

', + date: '19 September 2011 11:23pm', + isoDateTime: '2011-09-19T22:23:06Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12477257', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477257', + numResponses: 0, + numRecommends: 3, + isHighlighted: false, + userProfile: { + userId: '4741862', + displayName: 'EstherHegt', + webUrl: 'https://profile.theguardian.com/user/id/4741862', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', + avatar: 'https://avatar.guim.co.uk/user/4741862', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', + badge: [], + }, + }, + { + id: 12477258, + body: '

Ragwort can be poison for a horse!
It should not be in the pasture...it should not be in de hey....
However,...the horse also should not get both of it from the owner ;)

This "minister" is a joker, but not responsible.
The only person who is responsible (in MY eye\'s) is the owner of the horse who puts the horse in a pasture with a lot of ragwort or giving them hay with this ragwort in it !
A piece of ragwort doesn\'t hurt...but a lot of it or regular is dangerous.

', + date: '19 September 2011 11:23pm', + isoDateTime: '2011-09-19T22:23:12Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12477258', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477258', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '4742115', + displayName: 'NickAltena', + webUrl: 'https://profile.theguardian.com/user/id/4742115', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4742115', + avatar: 'https://avatar.guim.co.uk/user/4742115', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4742115', + badge: [], + }, + }, + { + id: 12477552, + body: '

@SteB1

I don\'t often find myself disagreeing with you.


If you read my post carefully - I dont think we actually disagree much on this.
The link i gave was merely illustrative of the agricultural approach.

Farmers and horse-keepers understandably wish to control ragwort on their land, so that their valuable animals, their source of income (and often their lifetimes work) are not put in jeopardy by an unfortunate poisoning incident.

Yes - demonisation of plants is silly.

The code of practise is detailed & IMHO pretty good.

http://www.defra.gov.uk/publications/files/pb9840-cop-ragwort.pdf

A careful eye and judicious pulling of ragwort where there are low populations, can prevent a major issue arising and unnecessary herbicide use.

', + date: '19 September 2011 11:55pm', + isoDateTime: '2011-09-19T22:55:39Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12477552', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477552', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '2411079', + displayName: 'antipodean1', + webUrl: 'https://profile.theguardian.com/user/id/2411079', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2411079', + avatar: 'https://avatar.guim.co.uk/user/2411079', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2411079', + badge: [], + }, + }, + { + id: 12478723, + body: "

I'm no supporter of Benyon, but at least, I assume, he thinks he is doing the right thing? Seems harsh from Dusty, et al, given it is still a widespread practice.

Many conservation organisations are still pulling ragwort on SSSIs so DEFRA will know that this is happening. If it is unnecessary why isn't the guidance flitering down to on the ground staff?

There may also be an issue that in order to get grazing, you have to remove ragwort otherwise grazers won't allow their stock on site.

", + date: '20 September 2011 6:30am', + isoDateTime: '2011-09-20T05:30:36Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12478723', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12478723', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '3237256', + displayName: 'PizzaRe', + webUrl: 'https://profile.theguardian.com/user/id/3237256', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3237256', + avatar: 'https://avatar.guim.co.uk/user/3237256', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3237256', + badge: [], + }, + }, + { + id: 12479039, + body: '

MrRatfan1976

You say you want the science and then link to two sites offering some of the information.

It\'s far easier to get the DEFRA Code of Practice and follow the advice given there.

That is what Mr Benyon didn\'t do and that is why he has been criticised.

', + date: '20 September 2011 8:13am', + isoDateTime: '2011-09-20T07:13:14Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12479039', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12479039', + numResponses: 0, + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '4323663', + displayName: 'thepoisongarden', + webUrl: 'https://profile.theguardian.com/user/id/4323663', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4323663', + avatar: 'https://avatar.guim.co.uk/user/4323663', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4323663', + badge: [], + }, + }, + { + id: 12480749, + body: '

His advisor probably thought that killing Japanese knotweed might be perceived as racist? Putting it on Facebook, eh? Oh yes, that viral branding stuff central office is always going on about.

', + date: '20 September 2011 10:44am', + isoDateTime: '2011-09-20T09:44:50Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12480749', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12480749', + numResponses: 0, + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '2456210', + displayName: 'paulhs', + webUrl: 'https://profile.theguardian.com/user/id/2456210', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2456210', + avatar: 'https://avatar.guim.co.uk/user/2456210', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2456210', + badge: [], + }, + }, + { + id: 12482898, + body: "

SteB1


To most of us, there is no story at all here, just a photo of a man pulling up some weeds and having a rant about them. My neighbours, colleagues, friends,... do the same thing every single weekend.

That's not really accurate is it?

Which bit isn't accurate?

It is a photo of a man pulling up weeds
He did have a rant about them.
And lots of people do the same thing every single weekend.

You don't explain exactly what you mean by vandalise his facebook page. We can't cross check this because he removed the thread, presumably to hide his embarrassment

How ironic!

So my comment, following on examples from above, is incorrect, whereas your \"presumption\" that he removed (some of) the comments because you allege he was embarrassed and wanted to hide this has some validity.

", + date: '20 September 2011 12:45pm', + isoDateTime: '2011-09-20T11:45:20Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12482898', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12482898', + numResponses: 0, + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '3699054', + displayName: 'NeverMindTheBollocks', + webUrl: 'https://profile.theguardian.com/user/id/3699054', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3699054', + avatar: 'https://avatar.guim.co.uk/user/3699054', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3699054', + badge: [], + }, + }, + { + id: 12483012, + body: '

Can we have a campaign against Japanese Knotweed.
This stuff is a real pest and many people are unaware of the damage it causes, taking over whole areas of land, wiping out other plants.

Fortunately a few of us locally who know of the issue, spray and cut it down where we find it, helped by the local children who also have some fun trampling it down.

', + date: '20 September 2011 12:50pm', + isoDateTime: '2011-09-20T11:50:38Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12483012', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12483012', + numResponses: 0, + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '3938636', + displayName: 'lxy001', + webUrl: 'https://profile.theguardian.com/user/id/3938636', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3938636', + avatar: 'https://avatar.guim.co.uk/user/3938636', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/3938636', + badge: [], + }, + }, + { + id: 12491080, + body: "

As a horse owner I would say o the minister and horse owners
Ragwort seeding from joining fields have their own excellent law in the UK, that's what the act of parliament is about. but don't blame this when it isn't the solution, your own fields could have a seedbank from the years beyond. even then there is a good posibility to make this a lesser problem for new growth of ragwort.
So taken care of your neighbours land doesn't mean allways your problem is over, covering every empty spot and reseeding with grass is a good working way to go.
There are excellent ways to use spot on chemicals to spare any other plants. don't look for excuses, spend your energy in solutions!

When you blame only ragwort for all causes of liverproblems in horses, you taken a risk with the horses that stay behind, what if it is just one of many other causes or options you could treat. Knowledge could spare other animals, assumptions can let others die unnecessary.
With ragwort there is a easy way out, don't let it go near a horse or other grazing animals, where it can be eaten!

", + date: '20 September 2011 9:55pm', + isoDateTime: '2011-09-20T20:55:45Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/12491080', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12491080', + numResponses: 0, + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '4741862', + displayName: 'EstherHegt', + webUrl: 'https://profile.theguardian.com/user/id/4741862', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', + avatar: 'https://avatar.guim.co.uk/user/4741862', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', + badge: [], + }, + }, + ], + }, +}; diff --git a/dotcom-rendering/fixtures/manual/noTopPicks.ts b/dotcom-rendering/fixtures/manual/noTopPicks.ts new file mode 100644 index 00000000000..fd9a93ca71c --- /dev/null +++ b/dotcom-rendering/fixtures/manual/noTopPicks.ts @@ -0,0 +1,19 @@ +export const noTopPicks = { + status: 'ok', + page: 1, + pages: 1, + pageSize: 50, + orderBy: 'oldest', + discussion: { + key: '/p/39f5z', + webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5z', + commentCount: 496, + topLevelCommentCount: 405, + isClosedForComments: false, + isClosedForRecommendation: false, + isThreaded: true, + title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', + comments: [], + }, +}; diff --git a/dotcom-rendering/fixtures/manual/topPicks.ts b/dotcom-rendering/fixtures/manual/topPicks.ts new file mode 100644 index 00000000000..6dc729de2f1 --- /dev/null +++ b/dotcom-rendering/fixtures/manual/topPicks.ts @@ -0,0 +1,68 @@ +export const topPicks = { + status: 'ok', + page: 1, + pages: 1, + pageSize: 50, + orderBy: 'oldest', + discussion: { + key: '/p/39f5z', + webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5z', + commentCount: 496, + topLevelCommentCount: 405, + isClosedForComments: false, + isClosedForRecommendation: false, + isThreaded: true, + title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', + comments: [ + { + id: 37678414, + body: '

This is how code looks. And this is how strikethrough looks

strong

italic

blockquote

link to mydomain.com

And this is what get withareallyreallyreallylonglonglongwordthatissupersuperlonglikelonnnnngggggggggImeanreallylong

', + date: '02 July 2014 11:20am', + isoDateTime: '2014-07-02T10:20:56Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/37678414', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37678414', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '2310959', + displayName: 'jamesgorrie', + webUrl: 'https://profile.theguardian.com/user/id/2310959', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', + avatar: 'https://avatar.guim.co.uk/user/2310959', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 37772513, + body: '

Lovely chickens! https://www.supersupersuperlongdomainnameImeanitneverstopsatallevereveritmakesyouwonderiftheremightbealimittothesethings.com

', + date: '04 July 2014 1:57pm', + isoDateTime: '2014-07-04T12:57:48Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/37772513', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37772513', + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '2310959', + displayName: 'jamesgorrie', + webUrl: 'https://profile.theguardian.com/user/id/2310959', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', + avatar: 'https://avatar.guim.co.uk/user/2310959', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + ], + }, +}; diff --git a/dotcom-rendering/src/discussion-rendering/App.stories.tsx b/dotcom-rendering/src/discussion-rendering/App.stories.tsx index abd0f494f0f..762b92a91f1 100644 --- a/dotcom-rendering/src/discussion-rendering/App.stories.tsx +++ b/dotcom-rendering/src/discussion-rendering/App.stories.tsx @@ -176,7 +176,7 @@ export const LoggedInShortDiscussion = () => ( />
); -LoggedInShortDiscussion.storyName = 'when logged in but only wo comments made'; +LoggedInShortDiscussion.storyName = 'when logged in but only two comments made'; export const LoggedOutHiddenNoPicks = () => (
{ }, { overwriteRoutes: false }, ) + .get( + /\/discussion\/comments\/count.*/, + { + status: 200, + body: { + counts: [ + { + id: '/p/4k83z', + count: 432, + }, + ], + }, + }, + { overwriteRoutes: false }, + ) // Most read by category .get( /.*api.nextgen.guardianapps.co.uk\/most-read.*/, @@ -236,15 +259,6 @@ export const mockRESTCalls = (): void => { }, { overwriteRoutes: false }, ) - // Get discussion - .get( - /.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, - { - status: 200, - body: discussion, - }, - { overwriteRoutes: false }, - ) // Get country code .get( /.*api.nextgen.guardianapps.co.uk\/geolocation.*/, @@ -289,5 +303,180 @@ export const mockRESTCalls = (): void => { }, }, { overwriteRoutes: false }, + ) + // Get discussion 39f5z + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5z\?.*/, + { + status: 200, + body: discussion, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/39f5z\/topcomments.*/, + { + status: 200, + body: topPicks, + }, + { overwriteRoutes: false }, + ) + + // Get discussion 39f5x + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5x\?.*/, + { + status: 200, + body: discussionWithNoComments, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/39f5x\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) + + // Get discussion 39f5a + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5a\?.*/, + { + status: 200, + body: discussionWithTwoComments, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/39f5a\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) + + // Get discussion 32255 + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/32255\?.*/, + { + status: 200, + body: legacyDiscussionWithoutThreading, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/32255\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) + + // Get discussion abc123 + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/abc123\?.*/, + { + status: 200, + body: discussion, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/abc123\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) + + // Get more replies + .get( + /.*discussion.theguardian.com\/discussion-api\/comment\/.*/, + { + status: 200, + body: { + status: 'ok', + comment, + }, + }, + { overwriteRoutes: false }, + ) + + // Recommend + .post( + /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/recommend/, + { + status: 200, + body: { + status: 'ok', + }, + }, + { overwriteRoutes: false }, + ) + + // Abuse form + .post( + /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/reportAbuse/, + { + status: 200, + body: { + status: 'ok', + }, + }, + { overwriteRoutes: false }, + ) + + // Login redirect + .get( + /.*profile\.theguardian\.com\/signin\?INTCMP=DOTCOM_NEWHEADER_SIGNIN/, + { + status: 200, + }, + { overwriteRoutes: false }, + ) + .post(/.*profile\.theguardian\.com\/actions\/signInSecondStepCurrent/, { + status: 200, + }) + + //https://discussion.theguardian.com/discussion-api/discussion/p/g8g7v/comment?api-key=dotcom-rendering + // This returns a mocked error for a story 97d6eab4a98917f63bc96a7ac64f7ca7 + .post( + /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/g8g7v\/.*/, + { + status: 400, + body: { + status: 'error', + message: 'API: Username Missing', + errorCode: 'USERNAME_MISSING', + }, + }, + { overwriteRoutes: false }, + ) + + // Post comment + .post( + /.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, + { + status: 200, + body: { + status: 'ok', + message: mockedMessageID, + }, + }, + { overwriteRoutes: false }, + ) + // Get discussion + .get( + /.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, + { + status: 200, + body: discussion, + }, + { overwriteRoutes: false }, ); }; From c946a348dc1460c9889e8ae566289bc27b1594e6 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:55:57 +0100 Subject: [PATCH 059/147] use `mockRESTCalls` for all mocks --- .../src/discussion-rendering/App.test.tsx | 4 +- .../AbuseReportForm/AbuseReportForm.test.tsx | 4 +- .../CommentContainer.test.tsx | 6 +- .../discussion-rendering/fixtures/comment.ts | 159 --- .../fixtures/discussion.ts | 1186 ----------------- .../fixtures/discussionWithNoComments.ts | 21 - .../fixtures/discussionWithTwoComments.ts | 66 - .../legacyDiscussionWithoutThreading.ts | 971 -------------- .../fixtures/noTopPicks.ts | 21 - .../discussion-rendering/fixtures/topPicks.ts | 70 - .../lib/mockFetchCalls.ts | 169 --- dotcom-rendering/src/lib/mockRESTCalls.ts | 681 +++++----- 12 files changed, 350 insertions(+), 3008 deletions(-) delete mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/comment.ts delete mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/discussion.ts delete mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/discussionWithNoComments.ts delete mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/discussionWithTwoComments.ts delete mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/legacyDiscussionWithoutThreading.ts delete mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/noTopPicks.ts delete mode 100644 dotcom-rendering/src/discussion-rendering/fixtures/topPicks.ts delete mode 100644 dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts diff --git a/dotcom-rendering/src/discussion-rendering/App.test.tsx b/dotcom-rendering/src/discussion-rendering/App.test.tsx index d6b6e4f2110..5987bd025d6 100644 --- a/dotcom-rendering/src/discussion-rendering/App.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/App.test.tsx @@ -5,10 +5,10 @@ import { screen, waitForElementToBeRemoved, } from '@testing-library/react'; +import { mockRESTCalls } from '../lib/mockRESTCalls'; import { App } from './App'; -import { mockFetchCalls } from './lib/mockFetchCalls'; -mockFetchCalls(); +mockRESTCalls(); describe('App', () => { it('should not render the comment form if user is logged out', async () => { diff --git a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx index 2ac73e0ff57..d28f09c597f 100644 --- a/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/AbuseReportForm/AbuseReportForm.test.tsx @@ -2,10 +2,10 @@ import '@testing-library/jest-dom/extend-expect'; import { ArticlePillar } from '@guardian/libs'; import { fireEvent, render, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { mockFetchCalls } from '../../lib/mockFetchCalls'; +import { mockRESTCalls } from '../../../lib/mockRESTCalls'; import { AbuseReportForm } from './AbuseReportForm'; -const fetchMock = mockFetchCalls(); +const fetchMock = mockRESTCalls(); describe('Dropdown', () => { it('Should show the expected label names', () => { diff --git a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx index 4aa7135eab1..2d2a8a13869 100644 --- a/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/CommentContainer/CommentContainer.test.tsx @@ -1,12 +1,12 @@ import '@testing-library/jest-dom/extend-expect'; import { ArticlePillar } from '@guardian/libs'; import { fireEvent, render, waitFor } from '@testing-library/react'; +import { comment } from '../../../../fixtures/manual/comment'; +import { mockedMessageID, mockRESTCalls } from '../../../lib/mockRESTCalls'; import type { CommentType } from '../../discussionTypes'; -import { comment } from '../../fixtures/comment'; -import { mockedMessageID, mockFetchCalls } from '../../lib/mockFetchCalls'; import { CommentContainer } from './CommentContainer'; -mockFetchCalls(); +mockRESTCalls(); // @ts-expect-error -- We know this is not `undefined` const firstCommentResponse: CommentType = comment.responses[0]; diff --git a/dotcom-rendering/src/discussion-rendering/fixtures/comment.ts b/dotcom-rendering/src/discussion-rendering/fixtures/comment.ts deleted file mode 100644 index 1c6f07e3cae..00000000000 --- a/dotcom-rendering/src/discussion-rendering/fixtures/comment.ts +++ /dev/null @@ -1,159 +0,0 @@ -import { CommentType } from '../discussionTypes'; - -export const comment: CommentType = { - id: 138809272, - body: '

Begone ye self-serving Tory isolationists.

Never has there been a more significant time for Big Government and public health provision. Nature has spoken.

', - date: '09 March 2020 7:09pm', - isoDateTime: '2020-03-09T19:09:28Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809272', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - numRecommends: 45, - isHighlighted: false, - userProfile: { - userId: '13239086', - displayName: 'blipvert', - webUrl: 'https://profile.theguardian.com/user/id/13239086', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13239086', - avatar: 'https://avatar.guim.co.uk/user/13239086', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13239086', - badge: [], - }, - discussion: { - key: '/p/ddp96', - webUrl: 'https://www.theguardian.com/commentisfree/2020/mar/09/coronavirus-outbreak-nhs-staff-shortages', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/ddp96', - title: 'Even a starved NHS is still our best defence against the coronavirus', - isClosedForComments: true, - isClosedForRecommendation: true, - }, - responses: [ - { - id: 138809396, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:19pm', - isoDateTime: '2020-03-09T19:19:03Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809396', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809396', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'blipvert', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - isoDateTime: '2020-03-09T19:09:28Z', - date: '09 March 2020 7:09pm', - commentId: '138809272', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809272', - }, - userProfile: { - userId: '13093174', - displayName: 'Cricketnut', - webUrl: 'https://profile.theguardian.com/user/id/13093174', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13093174', - avatar: 'https://avatar.guim.co.uk/user/13093174', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13093174', - badge: [], - }, - }, - { - id: 138809487, - body: '

There are few Libertarians and small government advocates during pandemics.

', - date: '09 March 2020 7:24pm', - isoDateTime: '2020-03-09T19:24:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809487', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809487', - numRecommends: 30, - isHighlighted: false, - responseTo: { - displayName: 'blipvert', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - isoDateTime: '2020-03-09T19:09:28Z', - date: '09 March 2020 7:09pm', - commentId: '138809272', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809272', - }, - userProfile: { - userId: '100102208', - displayName: 'AJVC1991', - webUrl: 'https://profile.theguardian.com/user/id/100102208', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100102208', - avatar: 'https://avatar.guim.co.uk/user/100102208', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/100102208', - badge: [], - }, - }, - { - id: 138809896, - body: '

What?

', - date: '09 March 2020 7:48pm', - isoDateTime: '2020-03-09T19:48:31Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809896', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'blipvert', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - isoDateTime: '2020-03-09T19:09:28Z', - date: '09 March 2020 7:09pm', - commentId: '138809272', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809272', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810191, - body: '

Or at least, they don\'t flaunt their allegiance to Britannia Unchained and Rand quite so obviously. What awaits if we continue to act as if "there are individual men and women and there are families" and no responsibility to a wider society?

', - date: '09 March 2020 8:05pm', - isoDateTime: '2020-03-09T20:05:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810191', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810191', - numRecommends: 20, - isHighlighted: false, - responseTo: { - displayName: 'AJVC1991', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809487', - isoDateTime: '2020-03-09T19:24:46Z', - date: '09 March 2020 7:24pm', - commentId: '138809487', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809487', - }, - userProfile: { - userId: '12298092', - displayName: '_jhfta_', - webUrl: 'https://profile.theguardian.com/user/id/12298092', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12298092', - avatar: 'https://avatar.guim.co.uk/user/12298092', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/12298092', - badge: [], - }, - }, - ], - metaData: { - commentCount: 5, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 1, - responseCount: 4, - }, -}; diff --git a/dotcom-rendering/src/discussion-rendering/fixtures/discussion.ts b/dotcom-rendering/src/discussion-rendering/fixtures/discussion.ts deleted file mode 100644 index f91b5051220..00000000000 --- a/dotcom-rendering/src/discussion-rendering/fixtures/discussion.ts +++ /dev/null @@ -1,1186 +0,0 @@ -import { DiscussionResponse } from '../discussionTypes'; - -export const discussion: DiscussionResponse = { - status: 'ok', - page: 1, - pages: 9, - pageSize: 50, - orderBy: 'oldest', - discussion: { - key: '/p/39f5z', - webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5z', - commentCount: 496, - topLevelCommentCount: 405, - isClosedForComments: false, - isClosedForRecommendation: false, - isThreaded: true, - title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', - comments: [ - { - id: 23628300, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '17 May 2013 3:15pm', - isoDateTime: '2013-05-17T14:15:14Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/23628300', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/23628300', - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '10427346', - displayName: 'User751903', - webUrl: 'https://profile.theguardian.com/user/id/10427346', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10427346', - avatar: 'https://avatar.guim.co.uk/user/10427346', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10427346', - badge: [], - }, - }, - { - id: 37678414, - body: '

This is how code looks. And this is how strikethrough looks

strong

italic

blockquote

link to mydomain.com

And this is what get withareallyreallyreallylonglonglongwordthatissupersuperlonglikelonnnnngggggggggImeanreallylong

', - date: '02 July 2014 11:20am', - isoDateTime: '2014-07-02T10:20:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/37678414', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37678414', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '2310959', - displayName: 'jamesgorrie', - webUrl: 'https://profile.theguardian.com/user/id/2310959', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', - avatar: 'https://avatar.guim.co.uk/user/2310959', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 37772513, - body: '

Lovely chickens! https://www.supersupersuperlongdomainnameImeanitneverstopsatallevereveritmakesyouwonderiftheremightbealimittothesethings.com

', - date: '04 July 2014 1:57pm', - isoDateTime: '2014-07-04T12:57:48Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/37772513', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37772513', - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '2310959', - displayName: 'jamesgorrie', - webUrl: 'https://profile.theguardian.com/user/id/2310959', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', - avatar: 'https://avatar.guim.co.uk/user/2310959', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 42979860, - body: '

test

', - date: '30 October 2014 5:24pm', - isoDateTime: '2014-10-30T17:24:16Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/42979860', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/42979860', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '1186733', - displayName: 'GideonGoldberg', - webUrl: 'https://profile.theguardian.com/user/id/1186733', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', - avatar: 'https://avatar.guim.co.uk/user/1186733', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', - badge: [], - }, - }, - { - id: 46810367, - body: '

Test from the API -1503725237

', - date: '29 January 2015 11:38am', - isoDateTime: '2015-01-29T11:38:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/46810367', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/46810367', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 47135441, - body: '

Another comment

', - date: '05 February 2015 2:53pm', - isoDateTime: '2015-02-05T14:53:38Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/47135441', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47135441', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '10187427', - displayName: 'Jholder112233', - webUrl: 'https://profile.theguardian.com/user/id/10187427', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', - avatar: 'https://avatar.guim.co.uk/user/10187427', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', - badge: [], - }, - }, - { - id: 47135508, - body: '

Final comment here

', - date: '05 February 2015 2:54pm', - isoDateTime: '2015-02-05T14:54:50Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/47135508', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47135508', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '10187427', - displayName: 'Jholder112233', - webUrl: 'https://profile.theguardian.com/user/id/10187427', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', - avatar: 'https://avatar.guim.co.uk/user/10187427', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', - badge: [], - }, - }, - { - id: 47512449, - body: '

Test comment.

', - date: '13 February 2015 2:11pm', - isoDateTime: '2015-02-13T14:11:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/47512449', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47512449', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '10187427', - displayName: 'Jholder112233', - webUrl: 'https://profile.theguardian.com/user/id/10187427', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', - avatar: 'https://avatar.guim.co.uk/user/10187427', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', - badge: [], - }, - }, - { - id: 47512495, - body: '

And another

', - date: '13 February 2015 2:12pm', - isoDateTime: '2015-02-13T14:12:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/47512495', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47512495', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '10187427', - displayName: 'Jholder112233', - webUrl: 'https://profile.theguardian.com/user/id/10187427', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', - avatar: 'https://avatar.guim.co.uk/user/10187427', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', - badge: [], - }, - }, - { - id: 48058272, - body: '

beautiful colours.

', - date: '25 February 2015 2:37pm', - isoDateTime: '2015-02-25T14:37:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/48058272', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/48058272', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 48058400, - body: '

love this bird

', - date: '25 February 2015 2:41pm', - isoDateTime: '2015-02-25T14:41:31Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/48058400', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/48058400', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 49450704, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '25 March 2015 3:06pm', - isoDateTime: '2015-03-25T15:06:53Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/49450704', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49450704', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 49505722, - body: '

Test from the API 1133942872

', - date: '26 March 2015 4:09pm', - isoDateTime: '2015-03-26T16:09:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/49505722', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49505722', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 49773224, - body: '

Test from the API -2124514465

', - date: '01 April 2015 12:53pm', - isoDateTime: '2015-04-01T11:53:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/49773224', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49773224', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 49828269, - body: '

Test from the API 2008701699

', - date: '02 April 2015 3:17pm', - isoDateTime: '2015-04-02T14:17:27Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/49828269', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49828269', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 49835646, - body: '

test post

', - date: '02 April 2015 5:53pm', - isoDateTime: '2015-04-02T16:53:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/49835646', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49835646', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13068528', - displayName: 'User489362', - webUrl: 'https://profile.theguardian.com/user/id/13068528', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13068528', - avatar: 'https://avatar.guim.co.uk/user/13068528', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13068528', - badge: [], - }, - }, - { - id: 50178110, - body: '

Test from the API 24995912

', - date: '09 April 2015 11:39am', - isoDateTime: '2015-04-09T10:39:28Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50178110', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50178110', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 50185580, - body: '

Test from the API 1730167644

', - date: '09 April 2015 1:44pm', - isoDateTime: '2015-04-09T12:44:24Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50185580', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50185580', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 50230774, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '10 April 2015 10:43am', - isoDateTime: '2015-04-10T09:43:27Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50230774', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50230774', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 50438395, - body: '

Test from the API 672270292

', - date: '14 April 2015 3:30pm', - isoDateTime: '2015-04-14T14:30:27Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50438395', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50438395', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 50534761, - body: '

My favourite bird!

', - date: '16 April 2015 12:10pm', - isoDateTime: '2015-04-16T11:10:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50534761', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50534761', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '14779990', - displayName: 'User461881', - webUrl: 'https://profile.theguardian.com/user/id/14779990', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14779990', - avatar: 'https://avatar.guim.co.uk/user/14779990', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14779990', - badge: [], - }, - }, - { - id: 50540517, - body: '

Cool Broadbill

', - date: '16 April 2015 1:53pm', - isoDateTime: '2015-04-16T12:53:01Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50540517', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50540517', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '14780375', - displayName: 'User435746', - webUrl: 'https://profile.theguardian.com/user/id/14780375', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14780375', - avatar: 'https://avatar.guim.co.uk/user/14780375', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14780375', - badge: [], - }, - }, - { - id: 50540563, - body: '

Cool broadbill

', - date: '16 April 2015 1:53pm', - isoDateTime: '2015-04-16T12:53:43Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50540563', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50540563', - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '14780375', - displayName: 'User435746', - webUrl: 'https://profile.theguardian.com/user/id/14780375', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14780375', - avatar: 'https://avatar.guim.co.uk/user/14780375', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14780375', - badge: [], - }, - }, - { - id: 50543198, - body: '

Nice bill!

', - date: '16 April 2015 2:44pm', - isoDateTime: '2015-04-16T13:44:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50543198', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50543198', - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '14780616', - displayName: 'User727613', - webUrl: 'https://profile.theguardian.com/user/id/14780616', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14780616', - avatar: 'https://avatar.guim.co.uk/user/14780616', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14780616', - badge: [], - }, - }, - { - id: 50789974, - body: '

Test from the API -1474918202

', - date: '21 April 2015 11:36am', - isoDateTime: '2015-04-21T10:36:59Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50789974', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50789974', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 50793031, - body: '

Test from the API -932163313

', - date: '21 April 2015 12:26pm', - isoDateTime: '2015-04-21T11:26:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/50793031', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50793031', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 51153735, - body: '

What glorious plumage!

', - date: '28 April 2015 9:48am', - isoDateTime: '2015-04-28T08:48:07Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/51153735', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51153735', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '14802426', - displayName: 'User941136', - webUrl: 'https://profile.theguardian.com/user/id/14802426', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', - avatar: 'https://avatar.guim.co.uk/user/14802426', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', - badge: [], - }, - }, - { - id: 51153843, - body: '

Indeed

', - date: '28 April 2015 9:49am', - isoDateTime: '2015-04-28T08:49:53Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/51153843', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51153843', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '14802426', - displayName: 'User941136', - webUrl: 'https://profile.theguardian.com/user/id/14802426', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', - avatar: 'https://avatar.guim.co.uk/user/14802426', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', - badge: [], - }, - }, - { - id: 51177701, - body: '

Test

', - date: '28 April 2015 4:29pm', - isoDateTime: '2015-04-28T15:29:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/51177701', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51177701', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '14802426', - displayName: 'User941136', - webUrl: 'https://profile.theguardian.com/user/id/14802426', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', - avatar: 'https://avatar.guim.co.uk/user/14802426', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', - badge: [], - }, - }, - { - id: 51177755, - body: '

Test Post

', - date: '28 April 2015 4:30pm', - isoDateTime: '2015-04-28T15:30:02Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/51177755', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51177755', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '14802426', - displayName: 'User941136', - webUrl: 'https://profile.theguardian.com/user/id/14802426', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', - avatar: 'https://avatar.guim.co.uk/user/14802426', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', - badge: [], - }, - }, - { - id: 51213229, - body: '

Test 6751

', - date: '29 April 2015 9:21am', - isoDateTime: '2015-04-29T08:21:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/51213229', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51213229', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '14802426', - displayName: 'User941136', - webUrl: 'https://profile.theguardian.com/user/id/14802426', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', - avatar: 'https://avatar.guim.co.uk/user/14802426', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', - badge: [], - }, - }, - { - id: 51214557, - body: '

Test 8067

', - date: '29 April 2015 9:44am', - isoDateTime: '2015-04-29T08:44:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/51214557', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51214557', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '10455474', - displayName: 'User174774', - webUrl: 'https://profile.theguardian.com/user/id/10455474', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10455474', - avatar: 'https://avatar.guim.co.uk/user/10455474', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10455474', - badge: [], - }, - }, - { - id: 52013677, - body: '

Acknowledgement Test

', - date: '12 May 2015 10:39am', - isoDateTime: '2015-05-12T09:39:07Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/52013677', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52013677', - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '14802426', - displayName: 'User941136', - webUrl: 'https://profile.theguardian.com/user/id/14802426', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', - avatar: 'https://avatar.guim.co.uk/user/14802426', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', - badge: [], - }, - }, - { - id: 52412694, - body: '

I love this bird

', - date: '19 May 2015 10:56am', - isoDateTime: '2015-05-19T09:56:02Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/52412694', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52412694', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '1186733', - displayName: 'GideonGoldberg', - webUrl: 'https://profile.theguardian.com/user/id/1186733', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', - avatar: 'https://avatar.guim.co.uk/user/1186733', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', - badge: [], - }, - }, - { - id: 52412721, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '19 May 2015 10:56am', - isoDateTime: '2015-05-19T09:56:47Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/52412721', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52412721', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '1186733', - displayName: 'GideonGoldberg', - webUrl: 'https://profile.theguardian.com/user/id/1186733', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', - avatar: 'https://avatar.guim.co.uk/user/1186733', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', - badge: [], - }, - }, - { - id: 52412791, - body: '

Test from the API 1236505540

', - date: '19 May 2015 10:58am', - isoDateTime: '2015-05-19T09:58:34Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/52412791', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52412791', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 53902608, - body: '

nice article

', - date: '16 June 2015 1:54pm', - isoDateTime: '2015-06-16T12:54:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/53902608', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53902608', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 53980488, - body: '

very interesting article

', - date: '17 June 2015 4:59pm', - isoDateTime: '2015-06-17T15:59:12Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/53980488', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53980488', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - responses: [ - { - id: 53980521, - body: '

although that was just for testing commenting

', - date: '17 June 2015 4:59pm', - isoDateTime: '2015-06-17T15:59:53Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/53980521', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53980521', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'John Duffell', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/53980488', - isoDateTime: '2015-06-17T15:59:12Z', - date: '17 June 2015 4:59pm', - commentId: '53980488', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/53980488', - }, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - ], - metaData: { - commentCount: 2, - staffCommenterCount: 1, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 1, - }, - }, - { - id: 53984125, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '17 June 2015 6:08pm', - isoDateTime: '2015-06-17T17:08:32Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/53984125', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53984125', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 53984175, - body: "

It's nice to comment on an article again

", - date: '17 June 2015 6:09pm', - isoDateTime: '2015-06-17T17:09:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/53984175', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53984175', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54096779, - body: '

interesting article

', - date: '19 June 2015 2:07pm', - isoDateTime: '2015-06-19T13:07:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54096779', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54096779', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54096834, - body: '

this article is quite good

', - date: '19 June 2015 2:08pm', - isoDateTime: '2015-06-19T13:08:02Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54096834', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54096834', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54297937, - body: '

nice article

', - date: '23 June 2015 12:48pm', - isoDateTime: '2015-06-23T11:48:17Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54297937', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54297937', - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54304818, - body: '

Test from the API -1673717805

', - date: '23 June 2015 2:49pm', - isoDateTime: '2015-06-23T13:49:30Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54304818', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54304818', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54305016, - body: '

this article is cool

', - date: '23 June 2015 2:53pm', - isoDateTime: '2015-06-23T13:53:29Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54305016', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305016', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54305061, - body: "

I'd like to make a comment here

", - date: '23 June 2015 2:54pm', - isoDateTime: '2015-06-23T13:54:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54305061', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305061', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54305123, - body: '

lovely stuff

', - date: '23 June 2015 2:55pm', - isoDateTime: '2015-06-23T13:55:32Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54305123', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305123', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54305139, - body: '

testing dicussion

', - date: '23 June 2015 2:55pm', - isoDateTime: '2015-06-23T13:55:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54305139', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305139', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54305287, - body: '

testing again

', - date: '23 June 2015 2:58pm', - isoDateTime: '2015-06-23T13:58:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54305287', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305287', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '13552794', - displayName: 'User780375', - webUrl: 'https://profile.theguardian.com/user/id/13552794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', - avatar: 'https://avatar.guim.co.uk/user/13552794', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 54351807, - body: '

Test from the API 1634173951

', - date: '24 June 2015 10:31am', - isoDateTime: '2015-06-24T09:31:02Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/54351807', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54351807', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4339939', - displayName: 'GideonGoldberg1', - webUrl: 'https://profile.theguardian.com/user/id/4339939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', - avatar: 'https://avatar.guim.co.uk/user/4339939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - ], - }, -}; diff --git a/dotcom-rendering/src/discussion-rendering/fixtures/discussionWithNoComments.ts b/dotcom-rendering/src/discussion-rendering/fixtures/discussionWithNoComments.ts deleted file mode 100644 index 69a3f753494..00000000000 --- a/dotcom-rendering/src/discussion-rendering/fixtures/discussionWithNoComments.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { DiscussionResponse } from '../discussionTypes'; - -export const discussionWithNoComments: DiscussionResponse = { - status: 'ok', - page: 1, - pages: 0, - pageSize: 100, - orderBy: 'oldest', - discussion: { - key: '/p/39f5x', - webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5x', - commentCount: 0, - topLevelCommentCount: 0, - isClosedForComments: false, - isClosedForRecommendation: false, - isThreaded: true, - title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', - comments: [], - }, -}; diff --git a/dotcom-rendering/src/discussion-rendering/fixtures/discussionWithTwoComments.ts b/dotcom-rendering/src/discussion-rendering/fixtures/discussionWithTwoComments.ts deleted file mode 100644 index 44d8c61a0c1..00000000000 --- a/dotcom-rendering/src/discussion-rendering/fixtures/discussionWithTwoComments.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { DiscussionResponse } from '../discussionTypes'; - -export const discussionWithTwoComments: DiscussionResponse = { - status: 'ok', - page: 1, - pages: 0, - pageSize: 100, - orderBy: 'oldest', - discussion: { - key: '/p/39f5x', - webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5x', - commentCount: 0, - topLevelCommentCount: 0, - isClosedForComments: false, - isClosedForRecommendation: false, - isThreaded: true, - title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', - comments: [ - { - id: 37772513, - body: '

Lovely chickens! https://www.supersupersuperlongdomainnameImeanitneverstopsatallevereveritmakesyouwonderiftheremightbealimittothesethings.com

', - date: '04 July 2014 1:57pm', - isoDateTime: '2014-07-04T12:57:48Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/37772513', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37772513', - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '2310959', - displayName: 'jamesgorrie', - webUrl: 'https://profile.theguardian.com/user/id/2310959', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', - avatar: 'https://avatar.guim.co.uk/user/2310959', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 42979860, - body: '

test

', - date: '30 October 2014 5:24pm', - isoDateTime: '2014-10-30T17:24:16Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/42979860', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/42979860', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '1186733', - displayName: 'GideonGoldberg', - webUrl: 'https://profile.theguardian.com/user/id/1186733', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', - avatar: 'https://avatar.guim.co.uk/user/1186733', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', - badge: [], - }, - }, - ], - }, -}; diff --git a/dotcom-rendering/src/discussion-rendering/fixtures/legacyDiscussionWithoutThreading.ts b/dotcom-rendering/src/discussion-rendering/fixtures/legacyDiscussionWithoutThreading.ts deleted file mode 100644 index 65fa01a0a68..00000000000 --- a/dotcom-rendering/src/discussion-rendering/fixtures/legacyDiscussionWithoutThreading.ts +++ /dev/null @@ -1,971 +0,0 @@ -import { DiscussionResponse } from '../discussionTypes'; - -export const legacyDiscussionWithoutThreading: DiscussionResponse = { - status: 'ok', - page: 1, - pages: 1, - pageSize: 100, - orderBy: 'oldest', - discussion: { - key: '/p/32255', - webUrl: 'https://www.theguardian.com/environment/2011/sep/19/richard-benyon-ragwort', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/32255', - commentCount: 45, - topLevelCommentCount: 45, - isClosedForComments: true, - isClosedForRecommendation: false, - isThreaded: false, - title: "Richard Benyon's Facebook 'war on ragwort' sparks spat with ecologists", - comments: [ - { - id: 12468508, - body: '

He is not being lobbied by a herbicide company is he?

', - date: '19 September 2011 1:01pm', - isoDateTime: '2011-09-19T12:01:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12468508', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12468508', - numResponses: 0, - numRecommends: 13, - isHighlighted: false, - userProfile: { - userId: '2479941', - displayName: 'madmonty', - webUrl: 'https://profile.theguardian.com/user/id/2479941', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2479941', - avatar: 'https://avatar.guim.co.uk/user/2479941', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2479941', - badge: [], - }, - }, - { - id: 12468646, - body: '

The very thought!

', - date: '19 September 2011 1:08pm', - isoDateTime: '2011-09-19T12:08:12Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12468646', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12468646', - numResponses: 0, - numRecommends: 5, - isHighlighted: false, - userProfile: { - userId: '2870517', - displayName: 'GSC82', - webUrl: 'https://profile.theguardian.com/user/id/2870517', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2870517', - avatar: 'https://avatar.guim.co.uk/user/2870517', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2870517', - badge: [], - }, - }, - { - id: 12469052, - body: "

The Minister for huntin' and shootin' strikes again...

On an aside though, I am also interested to see how often the 'folk knowledge' of those who work on the land (or in the city or anywhere else) is so often wrong...

", - date: '19 September 2011 1:29pm', - isoDateTime: '2011-09-19T12:29:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12469052', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469052', - numResponses: 0, - numRecommends: 12, - isHighlighted: false, - userProfile: { - userId: '794075', - displayName: 'Alasdairca', - webUrl: 'https://profile.theguardian.com/user/id/794075', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/794075', - avatar: 'https://avatar.guim.co.uk/user/794075', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/794075', - badge: [], - }, - }, - { - id: 12469251, - body: "

I am also interested to see how often the 'folk knowledge' of those who work on the land (or in the city or anywhere else) is so often wrong...
Indeed.
http://www.ragwortfacts.com/ragwort-myths.html

", - date: '19 September 2011 1:39pm', - isoDateTime: '2011-09-19T12:39:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12469251', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469251', - numResponses: 0, - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '3111076', - displayName: 'philstyle', - webUrl: 'https://profile.theguardian.com/user/id/3111076', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3111076', - avatar: 'https://avatar.guim.co.uk/user/3111076', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3111076', - badge: [], - }, - }, - { - id: 12469484, - body: "

Newbury MP Benyon, whose family's estates earn around £200,000 a year in EU farm subsidies...

Not earn. Are paid.

", - date: '19 September 2011 1:49pm', - isoDateTime: '2011-09-19T12:49:37Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12469484', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469484', - numResponses: 0, - numRecommends: 9, - isHighlighted: false, - userProfile: { - userId: '1331497', - displayName: 'DoctorDark', - webUrl: 'https://profile.theguardian.com/user/id/1331497', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1331497', - avatar: 'https://avatar.guim.co.uk/user/1331497', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1331497', - badge: [], - }, - }, - { - id: 12469659, - body: '

when I was farming I had one field which was full of ragwort. It is dangerous to cattle and horses. At the end of the school holidays I got hold of six or seven boys of about 10 or 11, gave them an empty fertilizer sack and promised to pay them a half-penny for every plant they pulled up. (this was in 1962 or 3).
Ragwort cannot be killled by any known selective weed-killer, It has to be pulled up by the roots.
Thwe boys got an average of 40 plants each and we werre very happy to be given 1/8d.

', - date: '19 September 2011 1:57pm', - isoDateTime: '2011-09-19T12:57:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12469659', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469659', - numResponses: 0, - numRecommends: 5, - isHighlighted: false, - userProfile: { - userId: '4279254', - displayName: 'bordighera1', - webUrl: 'https://profile.theguardian.com/user/id/4279254', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4279254', - avatar: 'https://avatar.guim.co.uk/user/4279254', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4279254', - badge: [], - }, - }, - { - id: 12469806, - body: "

Ragwort is everywhere. It can be a problem, but is also a part of our habitat.

There. All sorted.

Do we have to have this typical English hype,rant and posturing?

The English press whip everything up for copy and the public lap up the phoney drama.Then people wonder why politicians are so phoney and insincere. They daren't be anything else.
Political correctness rules.

", - date: '19 September 2011 2:03pm', - isoDateTime: '2011-09-19T13:03:27Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12469806', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469806', - numResponses: 0, - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4530494', - displayName: 'jobrian', - webUrl: 'https://profile.theguardian.com/user/id/4530494', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4530494', - avatar: 'https://avatar.guim.co.uk/user/4530494', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4530494', - badge: [], - }, - }, - { - id: 12469934, - body: '

And they attacked his ecological knowledge

This is the sort of thing that happens when ministers have to be picked from among MPs. It is amazing that almost nobody treats this as a problem.

There might be one or two Westminister MPs in total with the necessary knowledge of ecology. It is mad we expect MPs to be appointed ministers and within a year to be speaking with the expertise of people with several years of university study plus years on the job.

There are many European countries where ministers are appointed by the prime minister and are usually so choosen because of recognised expertise in the field. Cases like this show the UK needs to change. This sort of amateurism might have been fine for the Victorians but it is out of place today.

', - date: '19 September 2011 2:09pm', - isoDateTime: '2011-09-19T13:09:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12469934', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469934', - numResponses: 0, - numRecommends: 11, - isHighlighted: false, - userProfile: { - userId: '1954291', - displayName: 'drabacus', - webUrl: 'https://profile.theguardian.com/user/id/1954291', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1954291', - avatar: 'https://avatar.guim.co.uk/user/1954291', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1954291', - badge: [], - }, - }, - { - id: 12469981, - body: '

I\'ve long been aware of this attitude to Ragwort, and other so called "weeds". It is irrational thinking of a similar nature to racism and all the other stupid irrational hatreds people have.

Within hours of the post about the "vile weed", more than 30 people had complained that he was ecologically illiterate, plain wrong or perpetuating myths put out about the plant by herbicide companies.

This is precisely the problem, "ecological illiteracy". That it is the government\'s Minister for the Natural Environment and Fisheries, Richard Benyon expressing these views is nothing short of incredible. After all, presumably his department have enough advisers who could have quickly explained that he was a being a buffoon expressing his ignorance, before putting both feet in it - highlighting his ignorance and unsuitability for the position.

From what I understand the main problem with Ragwort poisoning in horses is being fed hay with dried Ragwort in it. They normally avoid eating live Ragwort in pastures.

Benyon struck back, saying his critics were being "unnecessarily aggressive", and that he wasn\'t advocating ethnic cleansing of ragwort but that he wanted to deal with "a severe infestation of a poisonous plant".


This is laughable, and clearly Richard Benyon has a problem with joined up thinking. He uses aggressive phrases like "vile weed" and "a severe infestation of a poisonous plant", whilst risibly accusing other of being "unnecessarily aggressive".

Matt Shardlow, the director of Buglife is very right when he says "a critically important nectar source for hundreds of species of butterflies, bees, moths, flies and other invertebrates". I tend to specialise in photographing feeding insects feeding in flowers, and I can confirm that Ragwort is an extremely important plant in sustaining pollinators. It is important not only because it is an attractive plant to pollinators, but because of the volume of it. I would describe it as one of our most important native plants for sustaining pollinator populations.

It is bizarre in the extreme, that there is a well recognised problem with the decline of pollinators, not just in the UK, but internationally. And here we have an uneducated buffoon, who has somehow found himself Minister for the Natural Environment and Fisheries, declaring war on an important native wildflower, which is of major importance in sustaining these species in serious decline. Species which are actually very important to farmers. This is why Richard Benyon is clearly "ecological illiteracy". I suggest that if Richard Benyon wants to do this job, then he urgently needs to educate himself about the subject.

', - date: '19 September 2011 2:12pm', - isoDateTime: '2011-09-19T13:12:32Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12469981', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12469981', - numResponses: 0, - numRecommends: 12, - isHighlighted: false, - userProfile: { - userId: '4311896', - displayName: 'SteB1', - webUrl: 'https://profile.theguardian.com/user/id/4311896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', - avatar: 'https://avatar.guim.co.uk/user/4311896', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', - badge: [], - }, - }, - { - id: 12470128, - body: "

Shame he can't get so aerated about the Rhododendron that invades and destroys anywhere its shoots spread or seeds land and his voters keep planting in their large gardens.

", - date: '19 September 2011 2:18pm', - isoDateTime: '2011-09-19T13:18:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12470128', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12470128', - numResponses: 0, - numRecommends: 8, - isHighlighted: false, - userProfile: { - userId: '1301439', - displayName: 'WaitForPete', - webUrl: 'https://profile.theguardian.com/user/id/1301439', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1301439', - avatar: 'https://avatar.guim.co.uk/user/1301439', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1301439', - badge: [], - }, - }, - { - id: 12470152, - body: '

@ bordighera:

Ragwort cannot be killled by any known selective weed-killer, It has to be pulled up by the roots.

Not necessarily true. Pulling up by the roots can be one of the worst things you can do - remember this is a plant that loves to colonise bare ground, which is what you create when pulling existing plants up. This creates perfect oportunities for seed in the soil, or new seed rain to colonise those areas making it seem like the ragwort never went away. I have seen this happen many times.

As for other control methods, I am not an expert on herbicides, but it would appear there are numerous to choose from that will do the job - see the Defra code of practice, or for example the Centre for ecology and Hydrology information sheet on ragwort http://www.ceh.ac.uk/sci_programmes/documents/Ragwort.pdf (to name but two sources) for more info.

', - date: '19 September 2011 2:20pm', - isoDateTime: '2011-09-19T13:20:06Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12470152', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12470152', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '3596779', - displayName: 'Ecoboy1980', - webUrl: 'https://profile.theguardian.com/user/id/3596779', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3596779', - avatar: 'https://avatar.guim.co.uk/user/3596779', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3596779', - badge: [], - }, - }, - { - id: 12470272, - body: '

@SteB1

Right as rain as usual :)

', - date: '19 September 2011 2:25pm', - isoDateTime: '2011-09-19T13:25:45Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12470272', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12470272', - numResponses: 0, - numRecommends: 4, - isHighlighted: false, - userProfile: { - userId: '4387033', - displayName: 'Atomant77', - webUrl: 'https://profile.theguardian.com/user/id/4387033', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4387033', - avatar: 'https://avatar.guim.co.uk/user/4387033', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4387033', - badge: [], - }, - }, - { - id: 12471548, - body: "

The stupid thing about using hebicides on ragwort is that the weed is easy to control by pulling.

Like bordighera1 I had a field full of ragwort with cattle and horses on it.

As vets warn it is a poison, I used to go out and pull a sackful every day when out walking.

They are easy to pull, especially after rain.

Ragworts are now a rarity in that field. Other weeds are caused by overfertilising.

When we went organic and stopped using mineral fertiliser, one surprising side effect was that weeds died out and clovers flourished. The mineral imbalance causes the weeds. A coating of dried seaweed fertiliser worked wonders. The meadow is full of bees, dragon flys butterflys and all kinds of insect life, a joy to visit on a summer's day.

", - date: '19 September 2011 3:34pm', - isoDateTime: '2011-09-19T14:34:07Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12471548', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12471548', - numResponses: 0, - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '1268926', - displayName: 'kvms', - webUrl: 'https://profile.theguardian.com/user/id/1268926', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1268926', - avatar: 'https://avatar.guim.co.uk/user/1268926', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1268926', - badge: [], - }, - }, - { - id: 12471828, - body: '

Government minister shown to be clueless, ignorant of portfolio, reactionary and protectionist idiot shocker. What an absolute prick and sadly so full of hubris he is unlikely to be embarrassed.

@SteB1 and @drabacus - spot on by the way.

', - date: '19 September 2011 3:52pm', - isoDateTime: '2011-09-19T14:52:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12471828', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12471828', - numResponses: 0, - numRecommends: 5, - isHighlighted: false, - userProfile: { - userId: '3874929', - displayName: 'carnaptious99', - webUrl: 'https://profile.theguardian.com/user/id/3874929', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3874929', - avatar: 'https://avatar.guim.co.uk/user/3874929', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3874929', - badge: [], - }, - }, - { - id: 12471872, - body: '

Another ill informed, arrogant minster who gets found out when he actually tries to interact with voters.

', - date: '19 September 2011 3:54pm', - isoDateTime: '2011-09-19T14:54:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12471872', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12471872', - numResponses: 0, - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '4568262', - displayName: 'JimmerInManila', - webUrl: 'https://profile.theguardian.com/user/id/4568262', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4568262', - avatar: 'https://avatar.guim.co.uk/user/4568262', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4568262', - badge: [], - }, - }, - { - id: 12472026, - body: '

@kvms ragwort is *not* "controlled" by pulling. First, you can\'t pull the rosette stage. Second, pulling the plant simply means that next year you\'ll have loads more plants to pull. The root system is quite complex even above ground. If you like pulling up ragwort, congratulations - you\'ve kept yourself in a job.

I wouldn\'t trust that "ragwort facts" site as it doesn\'t link out. Instead use PubMed where you can find some raw data, such as from this search.

@SteB1 "From what I understand the main problem with Ragwort poisoning in horses is being fed hay with dried Ragwort in it. They normally avoid eating live Ragwort in pastures."

That\'s because the ragwort has a bitter taste (because of the alkalinoids). Once dried, the taste is lost. So the argument really is about controlling ragwort in fields that will be used for hay, and perhaps also for human food (I don\'t think you really want phlebotoxic contaminants in your basic food supply).

Ragwort quickly colonises bare ground (another reason why pulling, which leaves bare patches, isn\'t so clever); I think that\'s why Benyon is so frustrated with the Highways Agency, which is great at digging up roads but no so good at chucking grass seed over the bits once repaired.

', - date: '19 September 2011 4:02pm', - isoDateTime: '2011-09-19T15:02:57Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12472026', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12472026', - numResponses: 0, - numRecommends: 5, - isHighlighted: false, - userProfile: { - userId: '2427181', - displayName: 'CharlesArthur', - webUrl: 'https://profile.theguardian.com/user/id/2427181', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2427181', - avatar: 'https://avatar.guim.co.uk/user/2427181', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2427181', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 12472059, - body: '

Richard Benyon shoots himself in the foot, good, saves others the bother of doing it for him.

Scary to think someone ignorant is in this Government position of power, though.

', - date: '19 September 2011 4:04pm', - isoDateTime: '2011-09-19T15:04:19Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12472059', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12472059', - numResponses: 0, - numRecommends: 3, - isHighlighted: false, - userProfile: { - userId: '4188282', - displayName: 'sparclear', - webUrl: 'https://profile.theguardian.com/user/id/4188282', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4188282', - avatar: 'https://avatar.guim.co.uk/user/4188282', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4188282', - badge: [], - }, - }, - { - id: 12473125, - body: '

Just be sure you are not confusing Senecio jacobaea with Tanacetum vulgare.

', - date: '19 September 2011 5:03pm', - isoDateTime: '2011-09-19T16:03:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12473125', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473125', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '4573193', - displayName: 'PanYanPickle', - webUrl: 'https://profile.theguardian.com/user/id/4573193', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4573193', - avatar: 'https://avatar.guim.co.uk/user/4573193', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4573193', - badge: [], - }, - }, - { - id: 12473463, - body: "

@CharlesArthur

\"From what I understand the main problem with Ragwort poisoning in horses is being fed hay with dried Ragwort in it. They normally avoid eating live Ragwort in pastures.\"\n
That's because the ragwort has a bitter taste (because of the alkalinoids). Once dried, the taste is lost. So the argument really is about controlling ragwort in fields that will be used for hay, and perhaps also for human food (I don't think you really want phlebotoxic contaminants in your basic food supply).

Ragwort quickly colonises bare ground (another reason why pulling, which leaves bare patches, isn't so clever); I think that's why Benyon is so frustrated with the Highways Agency, which is great at digging up roads but no so good at chucking grass seed over the bits once repaired.

Yes I'm well aware of some of the compounds in Ragwort and why horses supposedly avoid Ragwort in fields, but may eat it in hay. Although I think much of it is to do with the difference between the way horses selectively browse in fields, and the way they eat hay. Horses simply do not have the equipment to disentangle different plants from hay they are fed, so they are forced to eat whole, and not selectively as when thy browse. I should also add that I have formally studied herbivory, how some toxins operate biologically, and the secondary metabolites which inhibit herbivory. I was bought up in a rural area and I have known horsey people for most of my life. So I appreciate these aspects and have a good grasp of the rural attitude to Ragwort. I also understand the ecological prefererences of Ragwort, which is also important in understanding it's ecological importance in the modern era.

The main bit you miss out is that the wish to control Ragwort everywhere is because it has wind blown seed. In the countryside there is a traditional annoyance with landowners who don't control Ragwort as it is perceived that the seed from the Ragwort in their fields spreads elsewhere.

I admit it's quite some time since I have done specific reading on the toxicity of Ragwort. However, from what I can remember most of the literature appeared to imply that the dangers of Ragwort toxicity were somewhat exaggerated. This backs up my own experience. where I can't even think of an example of Ragwort toxicity in a horse. Although I have been personally aware of quite a few examples where people's horses have died or become ill with acorn poisoning. This has always what has struck me, horse owners are a bit obsessed with Ragwort, even though most of the things that effect horses aren't Ragwort poisoning.

I find that there is a very distorted view about \"poisonous plants\". Those that have these concerns often do not realise what a huge variety of our native plants species have pretty potent toxins in them. This tends to result in hysteria about some plants, where most people are not even aware that other plants they consider safe, are even more toxic.

Without doing a fair bit of reading to get up to date, my impression is that the toxicity of Ragwort is an overblown concern. The pre-occupation with Ragwort appears to be because it is a named plant in the 1959 Weeds Act. But the other named weeds are 2 Dock species and 2 Thistle species. This was a time of the green revolution and where our pasture was being turned into \"improved grassland\". In such grassland normally only one species of grass (usually a Ryegrass sp.) is welcome, and 2 Clover species. Typically such grassland only contains about 5 species. The other species being those named in the Weeds Act, which farmers want to eliminate to increase yield. Species rich grassland can contain 80 species. We have lost over 90% of our species rich grassland. In other words, I personally think it's far more about Ragwort being one of the few species to invade \"improved grassland\", than it is about toxicity or danger.

The notion that there are good species, and bad species which need to be demomized, and war waged on them has done massive damage to the biodiversity our countryside. To see our countryside as containing bad, or enemy species, which have to be controlled at all costs is really a bit of an uninformed Victorian attitude. As I explained before, Ragwort is an important native plant for sustaining pollinator populations, which have been in serious decline. This is what makes these simplistic views about good and bad species problematic. Often the species seen as bad, had an unacknowledged positive role to play in the ecology of our countryside.

I have also seen little evidence to suggest Ragwort is any sort of real threat to human health.

", - date: '19 September 2011 5:22pm', - isoDateTime: '2011-09-19T16:22:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12473463', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473463', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '4311896', - displayName: 'SteB1', - webUrl: 'https://profile.theguardian.com/user/id/4311896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', - avatar: 'https://avatar.guim.co.uk/user/4311896', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', - badge: [], - }, - }, - { - id: 12473866, - body: '

This site appears to provide proper sources for its statements:
http://www.ragwort.org.uk/

', - date: '19 September 2011 5:50pm', - isoDateTime: '2011-09-19T16:50:45Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12473866', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473866', - numResponses: 0, - numRecommends: 3, - isHighlighted: false, - userProfile: { - userId: '4368868', - displayName: 'kitenet', - webUrl: 'https://profile.theguardian.com/user/id/4368868', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4368868', - avatar: 'https://avatar.guim.co.uk/user/4368868', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4368868', - badge: [], - }, - }, - { - id: 12473958, - body: '

To most of us, there is no story at all here, just a photo of a man pulling up some weeds and having a rant about them. My neighbours, colleagues, friends,... do the same thing every single weekend.

And he even has the sense of humour to laugh at himself in the comments on that facebook page.

But a few people want to make a fuss and vandalise his facebook page. Unfortunately that is all to common these days too. That says more about those people though than it does about the Minister.

', - date: '19 September 2011 5:57pm', - isoDateTime: '2011-09-19T16:57:16Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12473958', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473958', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '3699054', - displayName: 'NeverMindTheBollocks', - webUrl: 'https://profile.theguardian.com/user/id/3699054', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3699054', - avatar: 'https://avatar.guim.co.uk/user/3699054', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3699054', - badge: [], - }, - }, - { - id: 12473992, - body: '

cinnebar moths are beautiful pink moths and are a natural way of reducing ragwort since the caterpillars can be seen in abundance feeding on them, little yellow and balck striped beauties that can decimate a whole plant in hours apparently.

ignorant people irritate when they talk about stuff they know nothing about. me i try and enjoy the beauty that is there.http://www.flickr.com/photos/martin_black/5967445057/in/set-72157622416904918

', - date: '19 September 2011 5:59pm', - isoDateTime: '2011-09-19T16:59:24Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12473992', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12473992', - numResponses: 0, - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '4212243', - displayName: 'grumpygrowlygirlie', - webUrl: 'https://profile.theguardian.com/user/id/4212243', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4212243', - avatar: 'https://avatar.guim.co.uk/user/4212243', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4212243', - badge: [], - }, - }, - { - id: 12474633, - body: '

@kitenet

This site appears to provide proper sources for its statements:
http://www.ragwort.org.uk/

Thanks very much for this useful link. It confirms many of my impressions. I\'ve have been baffled by Ragwort hysteria for a long time. Whilst it is a bit of a pre-occupation in equine circles, I was always a bit baffled because I wasn\'t aware of any specific cases where horses had definitely become ill due to Ragwort poisoning. Whereas I was aware of many examples of other types of poisoning such as horses eating large amounts of acorns. Although I am wary of these diagnoses, because often it appears to be more of a guess, and is often not confirmed by a post-morten.

A particular problem with concerns about plant toxicity, is that just because compounds are in plants, does not necessarily mean that they will be ingested in high enough levels to cause illness.

', - date: '19 September 2011 6:56pm', - isoDateTime: '2011-09-19T17:56:40Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12474633', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12474633', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '4311896', - displayName: 'SteB1', - webUrl: 'https://profile.theguardian.com/user/id/4311896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', - avatar: 'https://avatar.guim.co.uk/user/4311896', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', - badge: [], - }, - }, - { - id: 12474814, - body: '

I am the author of the http://www.ragwort.org.uk/ , I did a lot research because I was made scared by press and repeated misinformation and I am a horse owner, I asked experts to help my cause some didn\'t look right for me, this expersts did help me with my website to discover facts and/or myths. ( most was myths)
I also made a picture gallery of the importance for biodiversity ( that is only visible on my Dutch website)
There are a lot of insects, butterflys etc feeding at ragwort, I think a lot more than catlle http://www.jakobskruiskruid.com/website/index.php?option=com_rsgallery2&Itemid=48
On the gallery tehere are also a lot of yellow plants where people make mistakes, some very common plant, but also some rare. Not any yellow is ragwort.

', - date: '19 September 2011 7:15pm', - isoDateTime: '2011-09-19T18:15:28Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12474814', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12474814', - numResponses: 0, - numRecommends: 6, - isHighlighted: false, - userProfile: { - userId: '4741862', - displayName: 'EstherHegt', - webUrl: 'https://profile.theguardian.com/user/id/4741862', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', - avatar: 'https://avatar.guim.co.uk/user/4741862', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', - badge: [], - }, - }, - { - id: 12475107, - body: "

@NMTB

To most of us, there is no story at all here, just a photo of a man pulling up some weeds and having a rant about them. My neighbours, colleagues, friends,... do the same thing every single weekend.

That's not really accurate is it? The man pulling up the \"weeds\" happened to be the Minister resonsible for biodiversity, and here he was calling a native wildflower, which supports a significant amount of biodiversity, a \"vile weed\" - saying \"I hate ragwort. It may not be the issue of the moment but I am on the warpath for those who let this vile weed spread\". These comments were made in a public context on his facebook page which makes his ministerial role clear.

Additionally, both my experience, and what I have read in the scientific literature in the past, indicates that the supposed problems Ragwort causes are grossly over-exaggerated, with there being little evidence for the widespread problems attributed to it.

But a few people want to make a fuss and vandalise his facebook page. Unfortunately that is all to common these days too. That says more about those people though than it does about the Minister.

You don't explain exactly what you mean by vandalise his facebook page. We can't cross check this because he removed the thread, presumably to hide his embarrassment. Do you just mean people pointed out that Richard Benyon doesn't appear to have any understanding of the ecological role Ragwort plays in supporting biodiversity? As he is the Minister responsible for biodiversity it was incumbent on those who understand the subject to point out that the Minister's comments were ill-informed, and showed an incredible degree ecological illiteracy for someone in such a role - a clear matter of public concern. Your comment is more like spin for the Minister than anything else. After all you've not said anything to support the validity of the Minister's ill-informed rant.

", - date: '19 September 2011 7:44pm', - isoDateTime: '2011-09-19T18:44:27Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12475107', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475107', - numResponses: 0, - numRecommends: 4, - isHighlighted: false, - userProfile: { - userId: '4311896', - displayName: 'SteB1', - webUrl: 'https://profile.theguardian.com/user/id/4311896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', - avatar: 'https://avatar.guim.co.uk/user/4311896', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', - badge: [], - }, - }, - { - id: 12475117, - body: '

If, as has been suggests that 2000+ horse suffered from liver failure last year and died due to Ragwort consumption then someone needs to drop this chap a line for the facts..

If ragwort is poisonous and horses eat it and die that is not a good thing.

This is not hysteria.

The horses and their owners will be very grateful if someone gets to the truth here.
I haven\'t set up a website. But the equation would seem to be,

Ragwort + ragwort munching horse = dead horse not munching anything.

', - date: '19 September 2011 7:45pm', - isoDateTime: '2011-09-19T18:45:49Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12475117', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475117', - numResponses: 0, - numRecommends: 3, - isHighlighted: false, - userProfile: { - userId: '4641408', - displayName: 'MrRatfan1976', - webUrl: 'https://profile.theguardian.com/user/id/4641408', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4641408', - avatar: 'https://avatar.guim.co.uk/user/4641408', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4641408', - badge: [], - }, - }, - { - id: 12475461, - body: '

"There is very very clear science on meta-population dynamics that shows that habitat loss with in a patchwork of habitats has a very severe effect"

YAWN.

', - date: '19 September 2011 8:25pm', - isoDateTime: '2011-09-19T19:25:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12475461', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475461', - numResponses: 0, - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4487660', - displayName: 'MrPiggles', - webUrl: 'https://profile.theguardian.com/user/id/4487660', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4487660', - avatar: 'https://avatar.guim.co.uk/user/4487660', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4487660', - badge: [], - }, - }, - { - id: 12475751, - body: '

Ragwort is a noxious weed in agricultural situations.

http://www.sac.ac.uk/mainrep/pdfs/tn570ragwortpoisoning.pdf

Although it is also important for biodiversity, its not exactly a rare plant.

I would far rather pull it, as Benyon is doing, when infestations in problem areas are light and easily controlled, rather than allow things to get out of hand and then use herbicides which will needlessly cause huge collateral damage on many harmless and beneficial grassland species.

', - date: '19 September 2011 8:58pm', - isoDateTime: '2011-09-19T19:58:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12475751', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475751', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '2411079', - displayName: 'antipodean1', - webUrl: 'https://profile.theguardian.com/user/id/2411079', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2411079', - avatar: 'https://avatar.guim.co.uk/user/2411079', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2411079', - badge: [], - }, - }, - { - id: 12475801, - body: '

@ MrRatfan1976

If, as has been suggests that 2000+ horse suffered from liver failure last year and died due to Ragwort consumption then someone needs to drop this chap a line for the facts..

We did, we wrote the chap a email and that is our page about the myth of skin absorption http://www.ragwort.org.uk/facts-or-myths/7-i/13-ragwort-poisoning-through-skin-absorption-fact-or-fiction

', - date: '19 September 2011 9:02pm', - isoDateTime: '2011-09-19T20:02:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12475801', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475801', - numResponses: 0, - numRecommends: 4, - isHighlighted: false, - userProfile: { - userId: '4741862', - displayName: 'EstherHegt', - webUrl: 'https://profile.theguardian.com/user/id/4741862', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', - avatar: 'https://avatar.guim.co.uk/user/4741862', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', - badge: [], - }, - }, - { - id: 12475922, - body: "

I was one of those who posted comments on the minister's Facebook page. I don't believe I was 'aggressive' but I was most certainly was alarmed by Mr Benyon's total lack of knowledge.

One of the worst problems with ragwort is that people don't read the code of practice. Since his own department is responsible for the COP it is not unreasonable to expect Mr Benyon to have read it.

The photograph makes it clear he hasn't because there are five ways in which what he is doing is not in accordance with the advice in the COP. I blogged about all five the other day.

", - date: '19 September 2011 9:14pm', - isoDateTime: '2011-09-19T20:14:33Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12475922', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12475922', - numResponses: 0, - numRecommends: 4, - isHighlighted: false, - userProfile: { - userId: '4323663', - displayName: 'thepoisongarden', - webUrl: 'https://profile.theguardian.com/user/id/4323663', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4323663', - avatar: 'https://avatar.guim.co.uk/user/4323663', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4323663', - badge: [], - }, - }, - { - id: 12476305, - body: "

At first , I'm a horse owner and have no fear for ragwort at all !!

<quote>
MrRatfan1976\n\n19 September 2011 7:45PM\n\nIf, as has been suggests that 2000+ horse suffered from liver failure last year and died due to Ragwort consumption then someone needs to drop this chap a line for the facts.. </quote>

That's done as you can see above...by EstherHegt and her experts

By the way...
Did you know , in those time's and also today there is still NO test that can make you sure it is ragwort that has killed a horse?
Besides... the guy Knottenbelt in you're link isn't even a toxicologist, and the same guy admitted in an other site that those numbers where.... a gamble.

", - date: '19 September 2011 9:47pm', - isoDateTime: '2011-09-19T20:47:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12476305', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476305', - numResponses: 0, - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '4742115', - displayName: 'NickAltena', - webUrl: 'https://profile.theguardian.com/user/id/4742115', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4742115', - avatar: 'https://avatar.guim.co.uk/user/4742115', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4742115', - badge: [], - }, - }, - { - id: 12476413, - body: "

It's just another myth that any flowering Ragwortplant wil grow overnight, the majority of ragwortplants needs 2 full growing seasons to get in a flowering state, it takes a bit more of skills to regognise the vegetative state , but an important one, because this is also the most effective state to use succesfully in destroying the plant, bij apropiate chemical herbicides.


it will allways be the horseowners who puts a horse in a certain field, horses can't speak for themselfs, keep them safe from contact with poisionous plants is just one of many, many horsemanship tasks to put in good practice!
Ragwort is just one of many not to tollerate plants in a horsefield or paddock, and it is one of many you don't want in hay or other feed.

", - date: '19 September 2011 9:57pm', - isoDateTime: '2011-09-19T20:57:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12476413', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476413', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '4741862', - displayName: 'EstherHegt', - webUrl: 'https://profile.theguardian.com/user/id/4741862', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', - avatar: 'https://avatar.guim.co.uk/user/4741862', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', - badge: [], - }, - }, - { - id: 12476758, - body: '

@antipodean1

Ragwort is a noxious weed in agricultural situations.

http://www.sac.ac.uk/mainrep/pdfs/tn570ragwortpoisoning.pdf
Although it is also important for biodiversity, its not exactly a rare plant.

I would far rather pull it, as Benyon is doing, when infestations in problem areas are light and easily controlled, rather than allow things to get out of hand and then use herbicides which will needlessly cause huge collateral damage on many harmless and beneficial grassland species.

I don\'t often find myself disagreeing with you. The reference you gave just gives a series of assertions and doesn\'t support or reference them.

I\'ve known about the supposed toxicity of Ragwort throughout most of my life. Several people in my family have been horse owners, and it is a big pre-occupation in the equine world. Also I knew about it because the caterpillars of Cinnabar moths supposedly were unpalatable because of a concentration of the Ragworts toxins. Initially I just accepted this as fact because it was repeated so much. However I started become sceptical because despite the equine world\'s pre-occupation with Ragwort I never knew of a definite Ragwort poisoning case. Yet I knew of other cases of horses being poisoned by eating other things, but not Ragwort. This was baffling given the prevalence of Ragwort in fields grazed by horses and in pasture cut for hay. I started to become suspicious that this was a "factoid" - an inaccurate assertion that gains credence over time by its repetition.

When I tried reading up on it some while back when I had access to an academic library I could find very little direct information about the supposed problem of Ragwort toxicity. Most of it just appeared to be unsupported assertions, and the anecdotal accounts weren\'t backed up by post-morten results. However, it was not enough of an issue for me to pursue it any further.

This is why I find @EstherHegt\'s comments and website so interesting, because it confirms my suspicions. At the very least the problem appears to be somewhat overstated.
http://www.ragwort.org.uk/

On the subject of Ragwort\'s importance for supporting biodiversity. Yes you are right that it is not a rare plant. However, the groups of pollinating insects, to which Ragwort is important, are in serious decline. So it is the volume of food sources (flowers) important to this biodiversity component, and not just whether it is there or not. Photographing flower feeding insects has given me a lot of insight into which flower food sources are the most popular with feeding insects, and which are the most widespread and used. In my experience Ragwort is one of the most important single plants. In my experience perhaps only Hogweed supports more feeding insects, and is more widespread. I think the shot below is of a hoverfly on Ragwort. Although I don\'t use Ragwort too much for my photography as I use flash, and the smaller flowers mean you tend to get a black background. Here I managed to get a few flowers behind to prevent this.
http://farm5.static.flickr.com/4018/4396328430_78f4045739_o.jpg

', - date: '19 September 2011 10:31pm', - isoDateTime: '2011-09-19T21:31:48Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12476758', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476758', - numResponses: 0, - numRecommends: 3, - isHighlighted: false, - userProfile: { - userId: '4311896', - displayName: 'SteB1', - webUrl: 'https://profile.theguardian.com/user/id/4311896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', - avatar: 'https://avatar.guim.co.uk/user/4311896', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', - badge: [], - }, - }, - { - id: 12476847, - body: '

I have no fear of ragwort but for the sake of the nice old horses i ask the key question.

Is ragwort a risk for horses?

Can someone qualified pitch in with an answer. Otherwise we\'ll be chewing on the question for days, unlike the horses who wont know.

I don\'t really give a monkey\'s about this old boy tory and his facebook troll hell. However 30 years ago i was removing ragwort from fields so the old horsie wasn\'t at any risk, i was brought up with "Ragwort is poisonous for the horse"

@Esher "horses can\'t speak for themselves, keep them safe". Spot on.

Can we have some science please. Is Ragwort a danger to a horse and if it is what are we going to do about it. Defra, NFU, BHF, Mr Toxicologist. What is your best guideline?

', - date: '19 September 2011 10:41pm', - isoDateTime: '2011-09-19T21:41:03Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12476847', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12476847', - numResponses: 0, - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '4641408', - displayName: 'MrRatfan1976', - webUrl: 'https://profile.theguardian.com/user/id/4641408', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4641408', - avatar: 'https://avatar.guim.co.uk/user/4641408', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4641408', - badge: [], - }, - }, - { - id: 12477021, - body: "

Just to clarify the point I am making. I'm not suggesting that those with livestock and who want to take precautions shouldn't control Ragwort in their pastures. What I am concerned about is the demonization of plants like Ragwort. This can lead to pointless wars waged against certain plants everywhere, with little thought about what this is meant to achieve, or the effect it has on other biodiversity. I often find interesting places to photograph insects. I return and everything has been cut down or sprayed (not particularly Ragwort). There doesn't appear to be any clear rationale for this, as often these places have no other purpose to serve, that the vegetation cut down or sprayed prevents. When I have asked about this, I often get puzzled looks, and told they are weeds, or need to be tidied up. A weed is only a plant growing where someone doesn't want it to grow. Unfortunately, many people who don't understand this concept appear to believe that being a weed, makes a plant inherently bad wherever it is, and it is necessary to wage constant war on weeds, regardless of where they are growing.

", - date: '19 September 2011 10:59pm', - isoDateTime: '2011-09-19T21:59:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12477021', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477021', - numResponses: 0, - numRecommends: 3, - isHighlighted: false, - userProfile: { - userId: '4311896', - displayName: 'SteB1', - webUrl: 'https://profile.theguardian.com/user/id/4311896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4311896', - avatar: 'https://avatar.guim.co.uk/user/4311896', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4311896', - badge: [], - }, - }, - { - id: 12477166, - body: '

Common ragwort (Senecio jacobaea), a risk to the livers of both horses and cows too folks.

Keep it away from them and them away from it would seem to be a wise move.

Here\'s the science - bit.

A wise move from Mr Benyon here and that cow up there is moost grateful.

', - date: '19 September 2011 11:14pm', - isoDateTime: '2011-09-19T22:14:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12477166', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477166', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '4641408', - displayName: 'MrRatfan1976', - webUrl: 'https://profile.theguardian.com/user/id/4641408', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4641408', - avatar: 'https://avatar.guim.co.uk/user/4641408', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4641408', - badge: [], - }, - }, - { - id: 12477257, - body: '

There are 6000 plantspecies who produce PAs (3 % of all flowering plants.

', - date: '19 September 2011 11:23pm', - isoDateTime: '2011-09-19T22:23:06Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12477257', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477257', - numResponses: 0, - numRecommends: 3, - isHighlighted: false, - userProfile: { - userId: '4741862', - displayName: 'EstherHegt', - webUrl: 'https://profile.theguardian.com/user/id/4741862', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', - avatar: 'https://avatar.guim.co.uk/user/4741862', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', - badge: [], - }, - }, - { - id: 12477258, - body: '

Ragwort can be poison for a horse!
It should not be in the pasture...it should not be in de hey....
However,...the horse also should not get both of it from the owner ;)

This "minister" is a joker, but not responsible.
The only person who is responsible (in MY eye\'s) is the owner of the horse who puts the horse in a pasture with a lot of ragwort or giving them hay with this ragwort in it !
A piece of ragwort doesn\'t hurt...but a lot of it or regular is dangerous.

', - date: '19 September 2011 11:23pm', - isoDateTime: '2011-09-19T22:23:12Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12477258', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477258', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '4742115', - displayName: 'NickAltena', - webUrl: 'https://profile.theguardian.com/user/id/4742115', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4742115', - avatar: 'https://avatar.guim.co.uk/user/4742115', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4742115', - badge: [], - }, - }, - { - id: 12477552, - body: '

@SteB1

I don\'t often find myself disagreeing with you.


If you read my post carefully - I dont think we actually disagree much on this.
The link i gave was merely illustrative of the agricultural approach.

Farmers and horse-keepers understandably wish to control ragwort on their land, so that their valuable animals, their source of income (and often their lifetimes work) are not put in jeopardy by an unfortunate poisoning incident.

Yes - demonisation of plants is silly.

The code of practise is detailed & IMHO pretty good.

http://www.defra.gov.uk/publications/files/pb9840-cop-ragwort.pdf

A careful eye and judicious pulling of ragwort where there are low populations, can prevent a major issue arising and unnecessary herbicide use.

', - date: '19 September 2011 11:55pm', - isoDateTime: '2011-09-19T22:55:39Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12477552', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12477552', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '2411079', - displayName: 'antipodean1', - webUrl: 'https://profile.theguardian.com/user/id/2411079', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2411079', - avatar: 'https://avatar.guim.co.uk/user/2411079', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2411079', - badge: [], - }, - }, - { - id: 12478723, - body: "

I'm no supporter of Benyon, but at least, I assume, he thinks he is doing the right thing? Seems harsh from Dusty, et al, given it is still a widespread practice.

Many conservation organisations are still pulling ragwort on SSSIs so DEFRA will know that this is happening. If it is unnecessary why isn't the guidance flitering down to on the ground staff?

There may also be an issue that in order to get grazing, you have to remove ragwort otherwise grazers won't allow their stock on site.

", - date: '20 September 2011 6:30am', - isoDateTime: '2011-09-20T05:30:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12478723', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12478723', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '3237256', - displayName: 'PizzaRe', - webUrl: 'https://profile.theguardian.com/user/id/3237256', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3237256', - avatar: 'https://avatar.guim.co.uk/user/3237256', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3237256', - badge: [], - }, - }, - { - id: 12479039, - body: '

MrRatfan1976

You say you want the science and then link to two sites offering some of the information.

It\'s far easier to get the DEFRA Code of Practice and follow the advice given there.

That is what Mr Benyon didn\'t do and that is why he has been criticised.

', - date: '20 September 2011 8:13am', - isoDateTime: '2011-09-20T07:13:14Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12479039', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12479039', - numResponses: 0, - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '4323663', - displayName: 'thepoisongarden', - webUrl: 'https://profile.theguardian.com/user/id/4323663', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4323663', - avatar: 'https://avatar.guim.co.uk/user/4323663', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4323663', - badge: [], - }, - }, - { - id: 12480749, - body: '

His advisor probably thought that killing Japanese knotweed might be perceived as racist? Putting it on Facebook, eh? Oh yes, that viral branding stuff central office is always going on about.

', - date: '20 September 2011 10:44am', - isoDateTime: '2011-09-20T09:44:50Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12480749', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12480749', - numResponses: 0, - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '2456210', - displayName: 'paulhs', - webUrl: 'https://profile.theguardian.com/user/id/2456210', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2456210', - avatar: 'https://avatar.guim.co.uk/user/2456210', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2456210', - badge: [], - }, - }, - { - id: 12482898, - body: "

SteB1


To most of us, there is no story at all here, just a photo of a man pulling up some weeds and having a rant about them. My neighbours, colleagues, friends,... do the same thing every single weekend.

That's not really accurate is it?

Which bit isn't accurate?

It is a photo of a man pulling up weeds
He did have a rant about them.
And lots of people do the same thing every single weekend.

You don't explain exactly what you mean by vandalise his facebook page. We can't cross check this because he removed the thread, presumably to hide his embarrassment

How ironic!

So my comment, following on examples from above, is incorrect, whereas your \"presumption\" that he removed (some of) the comments because you allege he was embarrassed and wanted to hide this has some validity.

", - date: '20 September 2011 12:45pm', - isoDateTime: '2011-09-20T11:45:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12482898', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12482898', - numResponses: 0, - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '3699054', - displayName: 'NeverMindTheBollocks', - webUrl: 'https://profile.theguardian.com/user/id/3699054', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3699054', - avatar: 'https://avatar.guim.co.uk/user/3699054', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3699054', - badge: [], - }, - }, - { - id: 12483012, - body: '

Can we have a campaign against Japanese Knotweed.
This stuff is a real pest and many people are unaware of the damage it causes, taking over whole areas of land, wiping out other plants.

Fortunately a few of us locally who know of the issue, spray and cut it down where we find it, helped by the local children who also have some fun trampling it down.

', - date: '20 September 2011 12:50pm', - isoDateTime: '2011-09-20T11:50:38Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12483012', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12483012', - numResponses: 0, - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '3938636', - displayName: 'lxy001', - webUrl: 'https://profile.theguardian.com/user/id/3938636', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3938636', - avatar: 'https://avatar.guim.co.uk/user/3938636', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3938636', - badge: [], - }, - }, - { - id: 12491080, - body: "

As a horse owner I would say o the minister and horse owners
Ragwort seeding from joining fields have their own excellent law in the UK, that's what the act of parliament is about. but don't blame this when it isn't the solution, your own fields could have a seedbank from the years beyond. even then there is a good posibility to make this a lesser problem for new growth of ragwort.
So taken care of your neighbours land doesn't mean allways your problem is over, covering every empty spot and reseeding with grass is a good working way to go.
There are excellent ways to use spot on chemicals to spare any other plants. don't look for excuses, spend your energy in solutions!

When you blame only ragwort for all causes of liverproblems in horses, you taken a risk with the horses that stay behind, what if it is just one of many other causes or options you could treat. Knowledge could spare other animals, assumptions can let others die unnecessary.
With ragwort there is a easy way out, don't let it go near a horse or other grazing animals, where it can be eaten!

", - date: '20 September 2011 9:55pm', - isoDateTime: '2011-09-20T20:55:45Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/12491080', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/12491080', - numResponses: 0, - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '4741862', - displayName: 'EstherHegt', - webUrl: 'https://profile.theguardian.com/user/id/4741862', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4741862', - avatar: 'https://avatar.guim.co.uk/user/4741862', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4741862', - badge: [], - }, - }, - ], - }, -}; diff --git a/dotcom-rendering/src/discussion-rendering/fixtures/noTopPicks.ts b/dotcom-rendering/src/discussion-rendering/fixtures/noTopPicks.ts deleted file mode 100644 index 0e71dc600ce..00000000000 --- a/dotcom-rendering/src/discussion-rendering/fixtures/noTopPicks.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { DiscussionResponse } from '../discussionTypes'; - -export const noTopPicks: DiscussionResponse = { - status: 'ok', - page: 1, - pages: 1, - pageSize: 50, - orderBy: 'oldest', - discussion: { - key: '/p/39f5z', - webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5z', - commentCount: 496, - topLevelCommentCount: 405, - isClosedForComments: false, - isClosedForRecommendation: false, - isThreaded: true, - title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', - comments: [], - }, -}; diff --git a/dotcom-rendering/src/discussion-rendering/fixtures/topPicks.ts b/dotcom-rendering/src/discussion-rendering/fixtures/topPicks.ts deleted file mode 100644 index a6821b4daac..00000000000 --- a/dotcom-rendering/src/discussion-rendering/fixtures/topPicks.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { DiscussionResponse } from '../discussionTypes'; - -export const topPicks: DiscussionResponse = { - status: 'ok', - page: 1, - pages: 1, - pageSize: 50, - orderBy: 'oldest', - discussion: { - key: '/p/39f5z', - webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5z', - commentCount: 496, - topLevelCommentCount: 405, - isClosedForComments: false, - isClosedForRecommendation: false, - isThreaded: true, - title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', - comments: [ - { - id: 37678414, - body: '

This is how code looks. And this is how strikethrough looks

strong

italic

blockquote

link to mydomain.com

And this is what get withareallyreallyreallylonglonglongwordthatissupersuperlonglikelonnnnngggggggggImeanreallylong

', - date: '02 July 2014 11:20am', - isoDateTime: '2014-07-02T10:20:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/37678414', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37678414', - numRecommends: 0, - isHighlighted: false, - userProfile: { - userId: '2310959', - displayName: 'jamesgorrie', - webUrl: 'https://profile.theguardian.com/user/id/2310959', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', - avatar: 'https://avatar.guim.co.uk/user/2310959', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - { - id: 37772513, - body: '

Lovely chickens! https://www.supersupersuperlongdomainnameImeanitneverstopsatallevereveritmakesyouwonderiftheremightbealimittothesethings.com

', - date: '04 July 2014 1:57pm', - isoDateTime: '2014-07-04T12:57:48Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/37772513', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37772513', - numRecommends: 1, - isHighlighted: false, - userProfile: { - userId: '2310959', - displayName: 'jamesgorrie', - webUrl: 'https://profile.theguardian.com/user/id/2310959', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', - avatar: 'https://avatar.guim.co.uk/user/2310959', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', - badge: [ - { - name: 'Staff', - }, - ], - }, - }, - ], - }, -}; diff --git a/dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts b/dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts deleted file mode 100644 index 4058d1f05ce..00000000000 --- a/dotcom-rendering/src/discussion-rendering/lib/mockFetchCalls.ts +++ /dev/null @@ -1,169 +0,0 @@ -import fetchMock from 'fetch-mock'; -import { comment } from '../fixtures/comment'; -import { discussion } from '../fixtures/discussion'; -import { discussionWithNoComments } from '../fixtures/discussionWithNoComments'; -import { discussionWithTwoComments } from '../fixtures/discussionWithTwoComments'; -import { legacyDiscussionWithoutThreading } from '../fixtures/legacyDiscussionWithoutThreading'; -import { noTopPicks } from '../fixtures/noTopPicks'; -import { topPicks } from '../fixtures/topPicks'; - -export const mockedMessageID = '123456'; - -export const mockFetchCalls = (): typeof fetchMock => { - fetchMock - .restore() - // Comment count - .get(/.*api.nextgen.guardianapps.co.uk\/discussion\/comment-counts.*/, { - status: 200, - body: { - counts: [ - { - id: '/p/ddp96', - count: 432, - }, - ], - }, - }) - .get(/\/discussion\/comments\/count.*/, { - status: 200, - body: { - counts: [ - { - id: '/p/ddp96', - count: 432, - }, - ], - }, - }) - // Get discussion 39f5z - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5z\?.*/, - { - status: 200, - body: discussion, - }, - ) - .get(/.*\/discussion\/p\/39f5z\/topcomments.*/, { - status: 200, - body: topPicks, - }) - - // Get discussion 39f5x - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5x\?.*/, - { - status: 200, - body: discussionWithNoComments, - }, - ) - .get(/.*\/discussion\/p\/39f5x\/topcomments.*/, { - status: 200, - body: noTopPicks, - }) - - // Get discussion 39f5a - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5a\?.*/, - { - status: 200, - body: discussionWithTwoComments, - }, - ) - .get(/.*\/discussion\/p\/39f5a\/topcomments.*/, { - status: 200, - body: noTopPicks, - }) - - // Get discussion 32255 - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/32255\?.*/, - { - status: 200, - body: legacyDiscussionWithoutThreading, - }, - ) - .get(/.*\/discussion\/p\/32255\/topcomments.*/, { - status: 200, - body: noTopPicks, - }) - - // Get discussion abc123 - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/abc123\?.*/, - { - status: 200, - body: discussion, - }, - ) - .get(/.*\/discussion\/p\/abc123\/topcomments.*/, { - status: 200, - body: noTopPicks, - }) - - // Get more replies - .get(/.*discussion.theguardian.com\/discussion-api\/comment\/.*/, { - status: 200, - body: { - status: 'ok', - comment, - }, - }) - - // Recommend - .post( - /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/recommend/, - { - status: 200, - body: { - status: 'ok', - }, - }, - ) - - // Abuse form - .post( - /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/reportAbuse/, - { - status: 200, - body: { - status: 'ok', - }, - }, - ) - - // Login redirect - .get( - /.*profile\.theguardian\.com\/signin\?INTCMP=DOTCOM_NEWHEADER_SIGNIN/, - { - status: 200, - }, - ) - .post(/.*profile\.theguardian\.com\/actions\/signInSecondStepCurrent/, { - status: 200, - }) - - //https://discussion.theguardian.com/discussion-api/discussion/p/g8g7v/comment?api-key=dotcom-rendering - // This returns a mocked error for a story 97d6eab4a98917f63bc96a7ac64f7ca7 - .post( - /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/g8g7v\/.*/, - { - status: 400, - body: { - status: 'error', - message: 'API: Username Missing', - errorCode: 'USERNAME_MISSING', - }, - }, - ) - - // Post comment - .post(/.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, { - status: 200, - body: { - status: 'ok', - message: mockedMessageID, - }, - }); - - return fetchMock; -}; diff --git a/dotcom-rendering/src/lib/mockRESTCalls.ts b/dotcom-rendering/src/lib/mockRESTCalls.ts index 94dfa05726f..fe362702cb2 100644 --- a/dotcom-rendering/src/lib/mockRESTCalls.ts +++ b/dotcom-rendering/src/lib/mockRESTCalls.ts @@ -127,356 +127,361 @@ const richLinkCard = { }, }; -export const mockRESTCalls = (): void => { - fetchMock - .restore() - // Intercept Logs - .post(/logs\.(code.dev-)?guardianapis\.com\/log/, { - status: 204, - }) - // Most read by Geo - .get( - /.*api.nextgen.guardianapps.co.uk\/most-read-geo.*/, - { - status: 200, - body: mostReadGeo, - }, - { overwriteRoutes: false }, - ) - // Comment count - .get( - /.*api.nextgen.guardianapps.co.uk\/discussion\/comment-counts.*/, - { - status: 200, - body: { - counts: [ - { - id: '/p/4k83z', - count: 432, - }, - ], - }, - }, - { overwriteRoutes: false }, - ) - .get( - /\/discussion\/comments\/count.*/, - { - status: 200, - body: { - counts: [ - { - id: '/p/4k83z', - count: 432, - }, - ], - }, - }, - { overwriteRoutes: false }, - ) - // Most read by category - .get( - /.*api.nextgen.guardianapps.co.uk\/most-read.*/, - { - status: 200, - body: mostRead, - }, - { overwriteRoutes: false }, - ) - // Related - .get( - /.*api.nextgen.guardianapps.co.uk\/related.*/, - { - status: 200, - body: related, - }, - { overwriteRoutes: false }, - ) - // Popular in tag - .get( - /.*api.nextgen.guardianapps.co.uk\/popular-in-tag.*/, - { - status: 200, - body: related, - }, - { overwriteRoutes: false }, - ) - // Series - .get( - /.*api.nextgen.guardianapps.co.uk\/series.*/, - { - status: 200, - body: series, - }, - { overwriteRoutes: false }, - ) - // Story package - .get( - /.*api.nextgen.guardianapps.co.uk\/story-package.*/, - { - status: 200, - body: storyPackage, - }, - { overwriteRoutes: false }, - ) - // Rich link - .get( - /.*api.nextgen.guardianapps.co.uk\/embed\/card.*/, - { - status: 200, - body: richLinkCard, - }, - { overwriteRoutes: false }, - ) - // Article share count - .get( - /.*api.nextgen.guardianapps.co.uk\/sharecount.*/, - { - status: 200, - body: { - path: 'money/2017/mar/10/ministers-to-criminalise-use-of-ticket-tout-harvesting-software', - share_count: 273, - refreshStatus: true, - }, - }, - { overwriteRoutes: false }, - ) - // Get 'short' discussion - top comments - .get( - /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/4v8kk\/topcomments/, - { - status: 200, - body: discussionNoTopComments, - }, - { overwriteRoutes: false }, - ) - // Get 'short' discussion - .get( - /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/4v8kk/, - { - status: 200, - body: shortDiscussion, - }, - { overwriteRoutes: false }, - ) - // Get country code - .get( - /.*api.nextgen.guardianapps.co.uk\/geolocation.*/, - { - status: 200, - body: { country: 'GB' }, - }, - { overwriteRoutes: false }, - ) - // Match report data - .get( - /.*api.nextgen.guardianapps.co.uk\/football\/api.*/, - { - status: 200, - body: matchReport, - }, - { overwriteRoutes: false }, - ) +export const mockRESTCalls = (): typeof fetchMock => { + return ( + fetchMock + .restore() + // Intercept Logs + .post(/logs\.(code.dev-)?guardianapis\.com\/log/, { + status: 204, + }) + // Most read by Geo + .get( + /.*api.nextgen.guardianapps.co.uk\/most-read-geo.*/, + { + status: 200, + body: mostReadGeo, + }, + { overwriteRoutes: false }, + ) + // Comment count + .get( + /.*api.nextgen.guardianapps.co.uk\/discussion\/comment-counts.*/, + { + status: 200, + body: { + counts: [ + { + id: '/p/4k83z', + count: 432, + }, + ], + }, + }, + { overwriteRoutes: false }, + ) + .get( + /\/discussion\/comments\/count.*/, + { + status: 200, + body: { + counts: [ + { + id: '/p/4k83z', + count: 432, + }, + ], + }, + }, + { overwriteRoutes: false }, + ) + // Most read by category + .get( + /.*api.nextgen.guardianapps.co.uk\/most-read.*/, + { + status: 200, + body: mostRead, + }, + { overwriteRoutes: false }, + ) + // Related + .get( + /.*api.nextgen.guardianapps.co.uk\/related.*/, + { + status: 200, + body: related, + }, + { overwriteRoutes: false }, + ) + // Popular in tag + .get( + /.*api.nextgen.guardianapps.co.uk\/popular-in-tag.*/, + { + status: 200, + body: related, + }, + { overwriteRoutes: false }, + ) + // Series + .get( + /.*api.nextgen.guardianapps.co.uk\/series.*/, + { + status: 200, + body: series, + }, + { overwriteRoutes: false }, + ) + // Story package + .get( + /.*api.nextgen.guardianapps.co.uk\/story-package.*/, + { + status: 200, + body: storyPackage, + }, + { overwriteRoutes: false }, + ) + // Rich link + .get( + /.*api.nextgen.guardianapps.co.uk\/embed\/card.*/, + { + status: 200, + body: richLinkCard, + }, + { overwriteRoutes: false }, + ) + // Article share count + .get( + /.*api.nextgen.guardianapps.co.uk\/sharecount.*/, + { + status: 200, + body: { + path: 'money/2017/mar/10/ministers-to-criminalise-use-of-ticket-tout-harvesting-software', + share_count: 273, + refreshStatus: true, + }, + }, + { overwriteRoutes: false }, + ) + // Get 'short' discussion - top comments + .get( + /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/4v8kk\/topcomments/, + { + status: 200, + body: discussionNoTopComments, + }, + { overwriteRoutes: false }, + ) + // Get 'short' discussion + .get( + /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/4v8kk/, + { + status: 200, + body: shortDiscussion, + }, + { overwriteRoutes: false }, + ) + // Get country code + .get( + /.*api.nextgen.guardianapps.co.uk\/geolocation.*/, + { + status: 200, + body: { country: 'GB' }, + }, + { overwriteRoutes: false }, + ) + // Match report data + .get( + /.*api.nextgen.guardianapps.co.uk\/football\/api.*/, + { + status: 200, + body: matchReport, + }, + { overwriteRoutes: false }, + ) - // Get user discussion api (used for myAccount dropdown) - .get( - /discussionApiUrl\/profile\/me\?strict_sanctions_check=false/, - { - status: 200, - body: { - status: 'ok', - userProfile: { - userId: '123', - displayName: 'Guardian User', - webUrl: 'https://profile.test-theguardian.com/user/id/123', - apiUrl: 'http://discussion.test-guardianapis.com/discussion-api/profile/123', - avatar: 'https://avatar.test-guimcode.co.uk/user/123', - secureAvatarUrl: - 'https://avatar.test-guimcode.co.uk/user/123', - badge: [], - privateFields: { - canPostComment: true, - isPremoderated: false, - hasCommented: false, + // Get user discussion api (used for myAccount dropdown) + .get( + /discussionApiUrl\/profile\/me\?strict_sanctions_check=false/, + { + status: 200, + body: { + status: 'ok', + userProfile: { + userId: '123', + displayName: 'Guardian User', + webUrl: 'https://profile.test-theguardian.com/user/id/123', + apiUrl: 'http://discussion.test-guardianapis.com/discussion-api/profile/123', + avatar: 'https://avatar.test-guimcode.co.uk/user/123', + secureAvatarUrl: + 'https://avatar.test-guimcode.co.uk/user/123', + badge: [], + privateFields: { + canPostComment: true, + isPremoderated: false, + hasCommented: false, + }, }, }, }, - }, - { overwriteRoutes: false }, - ) - // Get discussion 39f5z - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5z\?.*/, - { - status: 200, - body: discussion, - }, - { overwriteRoutes: false }, - ) - .get( - /.*\/discussion\/p\/39f5z\/topcomments.*/, - { - status: 200, - body: topPicks, - }, - { overwriteRoutes: false }, - ) + { overwriteRoutes: false }, + ) + // Get discussion 39f5z + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5z\?.*/, + { + status: 200, + body: discussion, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/39f5z\/topcomments.*/, + { + status: 200, + body: topPicks, + }, + { overwriteRoutes: false }, + ) - // Get discussion 39f5x - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5x\?.*/, - { - status: 200, - body: discussionWithNoComments, - }, - { overwriteRoutes: false }, - ) - .get( - /.*\/discussion\/p\/39f5x\/topcomments.*/, - { - status: 200, - body: noTopPicks, - }, - { overwriteRoutes: false }, - ) + // Get discussion 39f5x + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5x\?.*/, + { + status: 200, + body: discussionWithNoComments, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/39f5x\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) - // Get discussion 39f5a - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5a\?.*/, - { - status: 200, - body: discussionWithTwoComments, - }, - { overwriteRoutes: false }, - ) - .get( - /.*\/discussion\/p\/39f5a\/topcomments.*/, - { - status: 200, - body: noTopPicks, - }, - { overwriteRoutes: false }, - ) + // Get discussion 39f5a + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/39f5a\?.*/, + { + status: 200, + body: discussionWithTwoComments, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/39f5a\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) - // Get discussion 32255 - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/32255\?.*/, - { - status: 200, - body: legacyDiscussionWithoutThreading, - }, - { overwriteRoutes: false }, - ) - .get( - /.*\/discussion\/p\/32255\/topcomments.*/, - { - status: 200, - body: noTopPicks, - }, - { overwriteRoutes: false }, - ) + // Get discussion 32255 + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/32255\?.*/, + { + status: 200, + body: legacyDiscussionWithoutThreading, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/32255\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) - // Get discussion abc123 - .get( - /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/abc123\?.*/, - { - status: 200, - body: discussion, - }, - { overwriteRoutes: false }, - ) - .get( - /.*\/discussion\/p\/abc123\/topcomments.*/, - { - status: 200, - body: noTopPicks, - }, - { overwriteRoutes: false }, - ) + // Get discussion abc123 + .get( + /.*\/discussion.theguardian.com\/discussion-api\/discussion\/p\/abc123\?.*/, + { + status: 200, + body: discussion, + }, + { overwriteRoutes: false }, + ) + .get( + /.*\/discussion\/p\/abc123\/topcomments.*/, + { + status: 200, + body: noTopPicks, + }, + { overwriteRoutes: false }, + ) - // Get more replies - .get( - /.*discussion.theguardian.com\/discussion-api\/comment\/.*/, - { - status: 200, - body: { - status: 'ok', - comment, - }, - }, - { overwriteRoutes: false }, - ) + // Get more replies + .get( + /.*discussion.theguardian.com\/discussion-api\/comment\/.*/, + { + status: 200, + body: { + status: 'ok', + comment, + }, + }, + { overwriteRoutes: false }, + ) - // Recommend - .post( - /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/recommend/, - { - status: 200, - body: { - status: 'ok', - }, - }, - { overwriteRoutes: false }, - ) + // Recommend + .post( + /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/recommend/, + { + status: 200, + body: { + status: 'ok', + }, + }, + { overwriteRoutes: false }, + ) - // Abuse form - .post( - /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/reportAbuse/, - { - status: 200, - body: { - status: 'ok', - }, - }, - { overwriteRoutes: false }, - ) + // Abuse form + .post( + /.*discussion.theguardian.com\/discussion-api\/comment\/.*\/reportAbuse/, + { + status: 200, + body: { + status: 'ok', + }, + }, + { overwriteRoutes: false }, + ) - // Login redirect - .get( - /.*profile\.theguardian\.com\/signin\?INTCMP=DOTCOM_NEWHEADER_SIGNIN/, - { - status: 200, - }, - { overwriteRoutes: false }, - ) - .post(/.*profile\.theguardian\.com\/actions\/signInSecondStepCurrent/, { - status: 200, - }) + // Login redirect + .get( + /.*profile\.theguardian\.com\/signin\?INTCMP=DOTCOM_NEWHEADER_SIGNIN/, + { + status: 200, + }, + { overwriteRoutes: false }, + ) + .post( + /.*profile\.theguardian\.com\/actions\/signInSecondStepCurrent/, + { + status: 200, + }, + ) - //https://discussion.theguardian.com/discussion-api/discussion/p/g8g7v/comment?api-key=dotcom-rendering - // This returns a mocked error for a story 97d6eab4a98917f63bc96a7ac64f7ca7 - .post( - /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/g8g7v\/.*/, - { - status: 400, - body: { - status: 'error', - message: 'API: Username Missing', - errorCode: 'USERNAME_MISSING', - }, - }, - { overwriteRoutes: false }, - ) + //https://discussion.theguardian.com/discussion-api/discussion/p/g8g7v/comment?api-key=dotcom-rendering + // This returns a mocked error for a story 97d6eab4a98917f63bc96a7ac64f7ca7 + .post( + /.*discussion.theguardian.com\/discussion-api\/discussion\/p\/g8g7v\/.*/, + { + status: 400, + body: { + status: 'error', + message: 'API: Username Missing', + errorCode: 'USERNAME_MISSING', + }, + }, + { overwriteRoutes: false }, + ) - // Post comment - .post( - /.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, - { - status: 200, - body: { - status: 'ok', - message: mockedMessageID, - }, - }, - { overwriteRoutes: false }, - ) - // Get discussion - .get( - /.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, - { - status: 200, - body: discussion, - }, - { overwriteRoutes: false }, - ); + // Post comment + .post( + /.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, + { + status: 200, + body: { + status: 'ok', + message: mockedMessageID, + }, + }, + { overwriteRoutes: false }, + ) + // Get discussion + .get( + /.*discussion.theguardian.com\/discussion-api\/discussion\/.*/, + { + status: 200, + body: discussion, + }, + { overwriteRoutes: false }, + ) + ); }; From 237656de9d2e270619a8e06633e1f960bca77f30 Mon Sep 17 00:00:00 2001 From: George B <705427+georgeblahblah@users.noreply.github.com> Date: Thu, 29 Jun 2023 17:17:05 +0100 Subject: [PATCH 060/147] replace discussion fixture with a shorter one --- .../fixtures/manual/discussion.ts | 10137 ++-------------- 1 file changed, 961 insertions(+), 9176 deletions(-) diff --git a/dotcom-rendering/fixtures/manual/discussion.ts b/dotcom-rendering/fixtures/manual/discussion.ts index 2674347d191..70a6c43f741 100644 --- a/dotcom-rendering/fixtures/manual/discussion.ts +++ b/dotcom-rendering/fixtures/manual/discussion.ts @@ -1,9397 +1,1182 @@ export const discussion = { status: 'ok', - currentPage: 1, - pages: 4, + page: 1, + pages: 9, pageSize: 50, orderBy: 'oldest', discussion: { - key: '/p/4k83z', - webUrl: 'https://www.theguardian.com/commentisfree/2020/mar/09/coronavirus-outbreak-nhs-staff-shortages', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion/p/4k83z', - commentCount: 782, - topLevelCommentCount: 198, - isClosedForComments: true, + key: '/p/39f5z', + webUrl: 'https://www.theguardian.com/science/grrlscientist/2012/aug/07/3', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/39f5z', + commentCount: 496, + topLevelCommentCount: 405, + isClosedForComments: false, isClosedForRecommendation: false, isThreaded: true, - title: 'Even a starved NHS is still our best defence against the coronavirus', + title: 'Mystery bird: black-and-red broadbill, Cymbirhynchus macrorhynchos story', comments: [ { - id: 138809269, - body: "

I have absolute faith in the good people in the NHS to do the best they can with what is available.

I just hope it's enough

", - date: '09 March 2020 7:09pm', - isoDateTime: '2020-03-09T19:09:11Z', + id: 23628300, + body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", + date: '17 May 2013 3:15pm', + isoDateTime: '2013-05-17T14:15:14Z', + status: 'blocked', + webUrl: 'https://discussion.theguardian.com/comment-permalink/23628300', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/23628300', + numRecommends: 2, + isHighlighted: false, + userProfile: { + userId: '10427346', + displayName: 'User751903', + webUrl: 'https://profile.theguardian.com/user/id/10427346', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10427346', + avatar: 'https://avatar.guim.co.uk/user/10427346', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/10427346', + badge: [], + }, + }, + { + id: 37678414, + body: '

This is how code looks. And this is how strikethrough looks

strong

italic

blockquote

link to mydomain.com

And this is what get withareallyreallyreallylonglonglongwordthatissupersuperlonglikelonnnnngggggggggImeanreallylong

', + date: '02 July 2014 11:20am', + isoDateTime: '2014-07-02T10:20:56Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/37678414', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37678414', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '2310959', + displayName: 'jamesgorrie', + webUrl: 'https://profile.theguardian.com/user/id/2310959', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', + avatar: 'https://avatar.guim.co.uk/user/2310959', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 37772513, + body: '

Lovely chickens! https://www.supersupersuperlongdomainnameImeanitneverstopsatallevereveritmakesyouwonderiftheremightbealimittothesethings.com

', + date: '04 July 2014 1:57pm', + isoDateTime: '2014-07-04T12:57:48Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809269', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809269', - numRecommends: 66, + webUrl: 'https://discussion.theguardian.com/comment-permalink/37772513', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/37772513', + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '2310959', + displayName: 'jamesgorrie', + webUrl: 'https://profile.theguardian.com/user/id/2310959', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2310959', + avatar: 'https://avatar.guim.co.uk/user/2310959', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/2310959', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 42979860, + body: '

test

', + date: '30 October 2014 5:24pm', + isoDateTime: '2014-10-30T17:24:16Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/42979860', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/42979860', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/11635482', + userId: '1186733', + displayName: 'GideonGoldberg', + webUrl: 'https://profile.theguardian.com/user/id/1186733', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', + avatar: 'https://avatar.guim.co.uk/user/1186733', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', badge: [], }, - responses: [ - { - id: 138809367, - body: '

I have absolute faith in the good people in the NHS to do the best they can with what is available.

I just hope it\'s enough

I do too.

I am however rather skeptical.

The reason for that skepticism is I have very little trust in this governments ability to manage the situation. I also came across to following Twitter feed today which was posted by a doctor in Italy.

https://twitter.com/silviast9/status/1236933818654896129

It paints a rather start picture of what is happening in Italy and the health service in Italy is better resourced than ours.

Then there is obviously the fact that the health service staff in Italy do the best that they can just like our own health professionals do so that alone will not carry us in the event of a large scale situation with this virus.

I honestly hope my skepticism is unfounded but I am struggling to see that it is.

', - date: '09 March 2020 7:17pm', - isoDateTime: '2020-03-09T19:17:06Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809367', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809367', - numRecommends: 33, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809269', - isoDateTime: '2020-03-09T19:09:11Z', - date: '09 March 2020 7:09pm', - commentId: '138809269', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809269', - }, - userProfile: { - userId: '10085855', - displayName: 'bifess', - webUrl: 'https://profile.theguardian.com/user/id/10085855', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10085855', - avatar: 'https://avatar.guim.co.uk/user/10085855', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10085855', - badge: [], - }, - }, - { - id: 138809454, - body: '

They will. They always do.

As do firefighters and all other people involved. Be they hospital porters or cleaners or whoever.

Then they will be praised for their efforts.

The government knows all these good people will do what they can.

In fact, the government relies on it, just as the 5th richest country in the world always relies on charity and the kindness of its people.

', - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809454', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809454', - numRecommends: 32, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809269', - isoDateTime: '2020-03-09T19:09:11Z', - date: '09 March 2020 7:09pm', - commentId: '138809269', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809269', - }, - userProfile: { - userId: '15685187', - displayName: 'andersen100', - webUrl: 'https://profile.theguardian.com/user/id/15685187', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15685187', - avatar: 'https://avatar.guim.co.uk/user/15685187', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15685187', - badge: [], - }, - }, - { - id: 138809504, - body: '

True, these NHS workers are the real patriots of our country. It’s an absolute disgrace how this government of shysters continually undermine the work they do.

', - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:50Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809504', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809504', - numRecommends: 48, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809269', - isoDateTime: '2020-03-09T19:09:11Z', - date: '09 March 2020 7:09pm', - commentId: '138809269', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809269', - }, - userProfile: { - userId: '12561963', - displayName: 'foralltime', - webUrl: 'https://profile.theguardian.com/user/id/12561963', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12561963', - avatar: 'https://avatar.guim.co.uk/user/12561963', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12561963', - badge: [], - }, - }, - { - id: 138809565, - body: "

Let's start with getting all the HCPs employed by Crapita, Maximus and ATOS doing what they were trained for rather than making life shitter for sick and disabled people.
They are all registered, after all!

", - date: '09 March 2020 7:29pm', - isoDateTime: '2020-03-09T19:29:25Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809565', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809565', - numRecommends: 14, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809269', - isoDateTime: '2020-03-09T19:09:11Z', - date: '09 March 2020 7:09pm', - commentId: '138809269', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809269', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809589, - body: '

But then who would torment the sick and disabled?

', - date: '09 March 2020 7:30pm', - isoDateTime: '2020-03-09T19:30:55Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809589', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809589', - numRecommends: 11, - isHighlighted: false, - responseTo: { - displayName: 'justamentalpatient', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809565', - isoDateTime: '2020-03-09T19:29:25Z', - date: '09 March 2020 7:29pm', - commentId: '138809565', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809565', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809713, - body: '

Most people don’t realise it’s NHS resources they should be worrying about.

', - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:17Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809713', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809713', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'bifess', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809367', - isoDateTime: '2020-03-09T19:17:06Z', - date: '09 March 2020 7:17pm', - commentId: '138809367', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809367', - }, - userProfile: { - userId: '15463361', - displayName: 'Daniel Oneill', - webUrl: 'https://profile.theguardian.com/user/id/15463361', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15463361', - avatar: 'https://avatar.guim.co.uk/user/15463361', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15463361', - badge: [], - }, - }, - { - id: 138809914, - body: '

The DWP will still have "decision makers" and "auditors".

', - date: '09 March 2020 7:49pm', - isoDateTime: '2020-03-09T19:49:12Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809914', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809914', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809589', - isoDateTime: '2020-03-09T19:30:55Z', - date: '09 March 2020 7:30pm', - commentId: '138809589', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809589', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138810072, - body: '

How can our unvaccinated NHS staff possibly deal with an influx of huge numbers of infectious and seriously ill patients?

', - date: '09 March 2020 7:58pm', - isoDateTime: '2020-03-09T19:58:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810072', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810072', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809269', - isoDateTime: '2020-03-09T19:09:11Z', - date: '09 March 2020 7:09pm', - commentId: '138809269', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809269', - }, - userProfile: { - userId: '101756861', - displayName: 'Bebo21', - webUrl: 'https://profile.theguardian.com/user/id/101756861', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101756861', - avatar: 'https://avatar.guim.co.uk/user/101756861', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101756861', - badge: [], - }, - }, - { - id: 138810102, - body: '

Care to point out where I made that argument

', - date: '09 March 2020 8:00pm', - isoDateTime: '2020-03-09T20:00:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810102', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810102', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'Bebo21', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810072', - isoDateTime: '2020-03-09T19:58:52Z', - date: '09 March 2020 7:58pm', - commentId: '138810072', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810072', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138810410, - body: "

Jeremy Hunt's treatment of the Junior Doctors should be a stark reminder of the Tories attitude towards health workers. If they truly appreciated the hard work and dedication of NHS staff this Government would have ensured proper funding.
Now that we are at the early stages of a potential health crisis I, and no doubt many others, await real and substantial funding to ensure the people of this Country receive the care they need during these very worrying times.
Takes a deep intake of breath before exhaling!

", - date: '09 March 2020 8:17pm', - isoDateTime: '2020-03-09T20:17:16Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810410', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810410', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'foralltime', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809504', - isoDateTime: '2020-03-09T19:25:50Z', - date: '09 March 2020 7:25pm', - commentId: '138809504', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809504', - }, - userProfile: { - userId: '4260062', - displayName: 'daffers56', - webUrl: 'https://profile.theguardian.com/user/id/4260062', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4260062', - avatar: 'https://avatar.guim.co.uk/user/4260062', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4260062', - badge: [], - }, - }, - { - id: 138810430, - body: '

We will do our best but other patients will suffer . Operation will be cancelled, treatments delayed and emergencies moved around away from local hospitals.

', - date: '09 March 2020 8:18pm', - isoDateTime: '2020-03-09T20:18:30Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810430', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810430', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809269', - isoDateTime: '2020-03-09T19:09:11Z', - date: '09 March 2020 7:09pm', - commentId: '138809269', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809269', - }, - userProfile: { - userId: '13830442', - displayName: 'kingtwist', - webUrl: 'https://profile.theguardian.com/user/id/13830442', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13830442', - avatar: 'https://avatar.guim.co.uk/user/13830442', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13830442', - badge: [], - }, - }, - ], - metaData: { - commentCount: 12, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 11, + }, + { + id: 46810367, + body: '

Test from the API -1503725237

', + date: '29 January 2015 11:38am', + isoDateTime: '2015-01-29T11:38:56Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/46810367', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/46810367', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809272, - body: '

Begone ye self-serving Tory isolationists.

Never has there been a more significant time for Big Government and public health provision. Nature has spoken.

', - date: '09 March 2020 7:09pm', - isoDateTime: '2020-03-09T19:09:28Z', + id: 47135441, + body: '

Another comment

', + date: '05 February 2015 2:53pm', + isoDateTime: '2015-02-05T14:53:38Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809272', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - numRecommends: 45, + webUrl: 'https://discussion.theguardian.com/comment-permalink/47135441', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47135441', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '13239086', - displayName: 'blipvert', - webUrl: 'https://profile.theguardian.com/user/id/13239086', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13239086', - avatar: 'https://avatar.guim.co.uk/user/13239086', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13239086', + userId: '10187427', + displayName: 'Jholder112233', + webUrl: 'https://profile.theguardian.com/user/id/10187427', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', + avatar: 'https://avatar.guim.co.uk/user/10187427', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', badge: [], }, - responses: [ - { - id: 138809396, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:19pm', - isoDateTime: '2020-03-09T19:19:03Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809396', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809396', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'blipvert', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - isoDateTime: '2020-03-09T19:09:28Z', - date: '09 March 2020 7:09pm', - commentId: '138809272', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809272', - }, - userProfile: { - userId: '13093174', - displayName: 'Cricketnut', - webUrl: 'https://profile.theguardian.com/user/id/13093174', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13093174', - avatar: 'https://avatar.guim.co.uk/user/13093174', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13093174', - badge: [], - }, - }, - { - id: 138809487, - body: '

There are few Libertarians and small government advocates during pandemics.

', - date: '09 March 2020 7:24pm', - isoDateTime: '2020-03-09T19:24:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809487', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809487', - numRecommends: 30, - isHighlighted: false, - responseTo: { - displayName: 'blipvert', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - isoDateTime: '2020-03-09T19:09:28Z', - date: '09 March 2020 7:09pm', - commentId: '138809272', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809272', - }, - userProfile: { - userId: '100102208', - displayName: 'AJVC1991', - webUrl: 'https://profile.theguardian.com/user/id/100102208', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100102208', - avatar: 'https://avatar.guim.co.uk/user/100102208', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100102208', - badge: [], - }, - }, - { - id: 138809896, - body: '

What?

', - date: '09 March 2020 7:48pm', - isoDateTime: '2020-03-09T19:48:31Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809896', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809896', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'blipvert', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809272', - isoDateTime: '2020-03-09T19:09:28Z', - date: '09 March 2020 7:09pm', - commentId: '138809272', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809272', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810191, - body: '

Or at least, they don\'t flaunt their allegiance to Britannia Unchained and Rand quite so obviously. What awaits if we continue to act as if "there are individual men and women and there are families" and no responsibility to a wider society?

', - date: '09 March 2020 8:05pm', - isoDateTime: '2020-03-09T20:05:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810191', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810191', - numRecommends: 20, - isHighlighted: false, - responseTo: { - displayName: 'AJVC1991', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809487', - isoDateTime: '2020-03-09T19:24:46Z', - date: '09 March 2020 7:24pm', - commentId: '138809487', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809487', - }, - userProfile: { - userId: '12298092', - displayName: '_jhfta_', - webUrl: 'https://profile.theguardian.com/user/id/12298092', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12298092', - avatar: 'https://avatar.guim.co.uk/user/12298092', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12298092', - badge: [], - }, - }, - ], - metaData: { - commentCount: 5, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 1, - responseCount: 4, + }, + { + id: 47135508, + body: '

Final comment here

', + date: '05 February 2015 2:54pm', + isoDateTime: '2015-02-05T14:54:50Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/47135508', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47135508', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '10187427', + displayName: 'Jholder112233', + webUrl: 'https://profile.theguardian.com/user/id/10187427', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', + avatar: 'https://avatar.guim.co.uk/user/10187427', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', + badge: [], }, }, { - id: 138809276, - body: "

You're a worthy champion of the NHS Polly. Bravo.

", - date: '09 March 2020 7:10pm', - isoDateTime: '2020-03-09T19:10:13Z', + id: 47512449, + body: '

Test comment.

', + date: '13 February 2015 2:11pm', + isoDateTime: '2015-02-13T14:11:54Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809276', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809276', - numRecommends: 38, + webUrl: 'https://discussion.theguardian.com/comment-permalink/47512449', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47512449', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '2031734', - displayName: 'crosby99', - webUrl: 'https://profile.theguardian.com/user/id/2031734', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2031734', - avatar: 'https://avatar.guim.co.uk/user/2031734', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/2031734', + userId: '10187427', + displayName: 'Jholder112233', + webUrl: 'https://profile.theguardian.com/user/id/10187427', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', + avatar: 'https://avatar.guim.co.uk/user/10187427', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', badge: [], }, }, { - id: 138809278, - body: "

Why don't The Guardian (and all other high quality papers), concurrently and with equal vigor, report on flu deaths, cancer deaths, car crashes? Or for that matter, freak accidents? How many freak accidents have occurred since the 5 people have died of Coronavirus?

", - date: '09 March 2020 7:10pm', - isoDateTime: '2020-03-09T19:10:45Z', + id: 47512495, + body: '

And another

', + date: '13 February 2015 2:12pm', + isoDateTime: '2015-02-13T14:12:42Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809278', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - numRecommends: 50, + webUrl: 'https://discussion.theguardian.com/comment-permalink/47512495', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/47512495', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '1787464', - displayName: 'bravobravoboooo', - webUrl: 'https://profile.theguardian.com/user/id/1787464', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1787464', - avatar: 'https://avatar.guim.co.uk/user/1787464', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1787464', - badge: [], - }, - responses: [ - { - id: 138809343, - body: "

Flu's reported on when it strains our NHS. This will be much worse for the NHS in affected areas if/when we get numbers like China and Italy.

", - date: '09 March 2020 7:15pm', - isoDateTime: '2020-03-09T19:15:47Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809343', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809343', - numRecommends: 42, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '12567954', - displayName: 'sausageweasel', - webUrl: 'https://profile.theguardian.com/user/id/12567954', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12567954', - avatar: 'https://avatar.guim.co.uk/user/12567954', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12567954', - badge: [], - }, - }, - { - id: 138809360, - body: '

Are freak accidents catching?

', - date: '09 March 2020 7:16pm', - isoDateTime: '2020-03-09T19:16:43Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809360', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809360', - numRecommends: 71, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '2966817', - displayName: 'philipphilip99', - webUrl: 'https://profile.theguardian.com/user/id/2966817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2966817', - avatar: 'https://avatar.guim.co.uk/user/2966817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2966817', - badge: [], - }, - }, - { - id: 138809390, - body: '

Anything to take the focus off our desperately poor government and the oaf pretending to be pm

', - date: '09 March 2020 7:18pm', - isoDateTime: '2020-03-09T19:18:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809390', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809390', - numRecommends: 46, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '12360820', - displayName: 'drragon', - webUrl: 'https://profile.theguardian.com/user/id/12360820', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12360820', - avatar: 'https://avatar.guim.co.uk/user/12360820', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12360820', - badge: [], - }, - }, - { - id: 138809393, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:18pm', - isoDateTime: '2020-03-09T19:18:54Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809393', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809393', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '101763863', - displayName: 'DarthRaider', - webUrl: 'https://profile.theguardian.com/user/id/101763863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101763863', - avatar: 'https://avatar.guim.co.uk/user/101763863', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101763863', - badge: [], - }, - }, - { - id: 138809457, - body: "

Coalition, Tory majority, brexit, bigger Tory majority

I'd say accidents and foolhardiness is proving to be catching

", - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809457', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809457', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809360', - isoDateTime: '2020-03-09T19:16:43Z', - date: '09 March 2020 7:16pm', - commentId: '138809360', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809360', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809460, - body: '

Anything to take the focus off our desperately poor government and the oaf pretending to be pm

Exactly, drragon, exactly. ;-)

', - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:38Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809460', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809460', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'drragon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809390', - isoDateTime: '2020-03-09T19:18:35Z', - date: '09 March 2020 7:18pm', - commentId: '138809390', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809390', - }, - userProfile: { - userId: '10801728', - displayName: 'UnrepentantPunk', - webUrl: 'https://profile.theguardian.com/user/id/10801728', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10801728', - avatar: 'https://avatar.guim.co.uk/user/10801728', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10801728', - badge: [], - }, - }, - { - id: 138809466, - body: "

'freak accidents'

i think your comment counts as one such event.

", - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:57Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809466', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809466', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '4636148', - displayName: 'DismantleTrident', - webUrl: 'https://profile.theguardian.com/user/id/4636148', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4636148', - avatar: 'https://avatar.guim.co.uk/user/4636148', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4636148', - badge: [], - }, - }, - { - id: 138809493, - body: '

Agreed. The media are ripping apart our society with greater vigour than the disease itself. This is NUTS!

', - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:06Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809493', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809493', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '11992544', - displayName: 'Wiretrip', - webUrl: 'https://profile.theguardian.com/user/id/11992544', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11992544', - avatar: 'https://avatar.guim.co.uk/user/11992544', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11992544', - badge: [], - }, - }, - { - id: 138809495, - body: '

None of those are going to result in 20% of the working population being off sick at the same time.

', - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809495', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809495', - numRecommends: 26, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '15322830', - displayName: 'Anonymous_John', - webUrl: 'https://profile.theguardian.com/user/id/15322830', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15322830', - avatar: 'https://avatar.guim.co.uk/user/15322830', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15322830', - badge: [], - }, - }, - { - id: 138809506, - body: '

"Are freak accidents catching?" No but rank stupidity appears to be...

', - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:55Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809506', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809506', - numRecommends: 11, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809360', - isoDateTime: '2020-03-09T19:16:43Z', - date: '09 March 2020 7:16pm', - commentId: '138809360', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809360', - }, - userProfile: { - userId: '11992544', - displayName: 'Wiretrip', - webUrl: 'https://profile.theguardian.com/user/id/11992544', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11992544', - avatar: 'https://avatar.guim.co.uk/user/11992544', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11992544', - badge: [], - }, - }, - { - id: 138809507, - body: '

This is a pandemic. It’s an airborne virus. Very contagious. Most of the population will contract it over the coming weeks/months. It will affect MOST of the population. Do you not understand?

', - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:59Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809507', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809507', - numRecommends: 31, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '2660419', - displayName: 'Wilsonbeans', - webUrl: 'https://profile.theguardian.com/user/id/2660419', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2660419', - avatar: 'https://avatar.guim.co.uk/user/2660419', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2660419', - badge: [], - }, - }, - { - id: 138809511, - body: '

Thanks dude. You always show these sociopaths for what they are. Keep well

', - date: '09 March 2020 7:26pm', - isoDateTime: '2020-03-09T19:26:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809511', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809511', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'UnrepentantPunk', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809460', - isoDateTime: '2020-03-09T19:22:38Z', - date: '09 March 2020 7:22pm', - commentId: '138809460', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809460', - }, - userProfile: { - userId: '12360820', - displayName: 'drragon', - webUrl: 'https://profile.theguardian.com/user/id/12360820', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12360820', - avatar: 'https://avatar.guim.co.uk/user/12360820', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12360820', - badge: [], - }, - }, - { - id: 138809520, - body: '

And yours is the tailigating car that causes the pileup...

', - date: '09 March 2020 7:26pm', - isoDateTime: '2020-03-09T19:26:53Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809520', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809520', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'DismantleTrident', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809466', - isoDateTime: '2020-03-09T19:22:57Z', - date: '09 March 2020 7:22pm', - commentId: '138809466', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809466', - }, - userProfile: { - userId: '11992544', - displayName: 'Wiretrip', - webUrl: 'https://profile.theguardian.com/user/id/11992544', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11992544', - avatar: 'https://avatar.guim.co.uk/user/11992544', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11992544', - badge: [], - }, - }, - { - id: 138809543, - body: "

Deaths in Italy are now running at 100 per day.

Our diagnosed cases are growing at the same rate as Italy's did, just two weeks later.

Will you come back on here in the weeks time and laugh off those extra 1000 deaths?

", - date: '09 March 2020 7:28pm', - isoDateTime: '2020-03-09T19:28:16Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809543', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809543', - numRecommends: 30, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '13268043', - displayName: 'Bicbiro', - webUrl: 'https://profile.theguardian.com/user/id/13268043', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13268043', - avatar: 'https://avatar.guim.co.uk/user/13268043', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13268043', - badge: [], - }, - }, - { - id: 138809993, - body: "

Agreed. The media are ripping apart our society with greater vigour than the disease itself. This is NUTS!

From my perspective the media along with the Tories have been ripping this country apart for a long time now.

The strivers versus skivers rhetoric has been used to rip away income from those at the bottom of our society.

Brexit has been used to rip apart our society in many different ways.

This kind of thing has been happening lots and lots and to my way of thinking it is about time that the Tories manned up and accepted the responsibility that they have for the impact that they have had on those at the bottom of our society.

Funny isn't it that when the government wants to tear apart society it is all for it yet when the narrative turns against them all of a sudden it is a different story.

", - date: '09 March 2020 7:54pm', - isoDateTime: '2020-03-09T19:54:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809993', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809993', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'Wiretrip', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809493', - isoDateTime: '2020-03-09T19:25:06Z', - date: '09 March 2020 7:25pm', - commentId: '138809493', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809493', - }, - userProfile: { - userId: '10085855', - displayName: 'bifess', - webUrl: 'https://profile.theguardian.com/user/id/10085855', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10085855', - avatar: 'https://avatar.guim.co.uk/user/10085855', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10085855', - badge: [], - }, - }, - { - id: 138810023, - body: '

Agreed!

', - date: '09 March 2020 7:56pm', - isoDateTime: '2020-03-09T19:56:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810023', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810023', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'bifess', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809993', - isoDateTime: '2020-03-09T19:54:51Z', - date: '09 March 2020 7:54pm', - commentId: '138809993', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809993', - }, - userProfile: { - userId: '11992544', - displayName: 'Wiretrip', - webUrl: 'https://profile.theguardian.com/user/id/11992544', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11992544', - avatar: 'https://avatar.guim.co.uk/user/11992544', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11992544', - badge: [], - }, - }, - { - id: 138810086, - body: '

"Deaths in Italy are now running at 100 per day." Stop it! That\'s exactly the way the tabloid media would present it. There were 97 deaths today. That is not the same a "per day". If 100 people die there tomorrow, then you can come back to me.

', - date: '09 March 2020 7:59pm', - isoDateTime: '2020-03-09T19:59:50Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810086', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810086', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'Bicbiro', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809543', - isoDateTime: '2020-03-09T19:28:16Z', - date: '09 March 2020 7:28pm', - commentId: '138809543', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809543', - }, - userProfile: { - userId: '11992544', - displayName: 'Wiretrip', - webUrl: 'https://profile.theguardian.com/user/id/11992544', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11992544', - avatar: 'https://avatar.guim.co.uk/user/11992544', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11992544', - badge: [], - }, - }, - { - id: 138810238, - body: "

Because it's difficult to make political capital from those. Whereas whipping up irresponsible levels of fear and panic is justified in their eyes as it provides opportunity for Tory bashing.

", - date: '09 March 2020 8:08pm', - isoDateTime: '2020-03-09T20:08:29Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810238', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810238', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '100456937', - displayName: 'Testament235', - webUrl: 'https://profile.theguardian.com/user/id/100456937', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100456937', - avatar: 'https://avatar.guim.co.uk/user/100456937', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100456937', - badge: [], - }, - }, - { - id: 138810275, - body: '

Your post is pure hyperbole.

', - date: '09 March 2020 8:10pm', - isoDateTime: '2020-03-09T20:10:19Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810275', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810275', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'Wilsonbeans', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809507', - isoDateTime: '2020-03-09T19:25:59Z', - date: '09 March 2020 7:25pm', - commentId: '138809507', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809507', - }, - userProfile: { - userId: '100456937', - displayName: 'Testament235', - webUrl: 'https://profile.theguardian.com/user/id/100456937', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100456937', - avatar: 'https://avatar.guim.co.uk/user/100456937', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100456937', - badge: [], - }, - }, - { - id: 138810411, - body: "

I had to attend a ladder training course today, laid on by American company. Apparently, according to the video, 6000 Americans die every year falling of a ladder. Puts coronavirus into perspective, but it won't sell a single newspaper.

", - date: '09 March 2020 8:17pm', - isoDateTime: '2020-03-09T20:17:17Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810411', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810411', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '11926516', - displayName: 'theseligsussex', - webUrl: 'https://profile.theguardian.com/user/id/11926516', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11926516', - avatar: 'https://avatar.guim.co.uk/user/11926516', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11926516', - badge: [], - }, - }, - { - id: 138810541, - body: '

Please read this posted by someone above: https://mobile.twitter.com/silviast9/status/1236933818654896129

This disease is very, very serious and people trying to minimise what is going to happen are going to make it worse as people will ignore medical advice to self-isolate and avoid social contact.

There is no need for most people to worry too much, but it is absolutely vital that people are extremely clear that if the spread of the disease is not controlled by them personally following medical advice, the NHS will not be able to cope.

', - date: '09 March 2020 8:23pm', - isoDateTime: '2020-03-09T20:23:58Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810541', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810541', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '12611808', - displayName: 'Shortordercook', - webUrl: 'https://profile.theguardian.com/user/id/12611808', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12611808', - avatar: 'https://avatar.guim.co.uk/user/12611808', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12611808', - badge: [], - }, - }, - { - id: 138810661, - body: "

Thanks, drragon, as do you. I believe that's the attraction between us. *blush* *runs out*

", - date: '09 March 2020 8:30pm', - isoDateTime: '2020-03-09T20:30:16Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810661', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810661', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'drragon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809511', - isoDateTime: '2020-03-09T19:26:08Z', - date: '09 March 2020 7:26pm', - commentId: '138809511', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809511', - }, - userProfile: { - userId: '10801728', - displayName: 'UnrepentantPunk', - webUrl: 'https://profile.theguardian.com/user/id/10801728', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10801728', - avatar: 'https://avatar.guim.co.uk/user/10801728', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10801728', - badge: [], - }, - }, - { - id: 138810864, - body: "

I had to attend a ladder training course today, laid on by American company. Apparently, according to the video, 6000 Americans die every year falling of a ladder. Puts coronavirus into perspective, but it won't sell a single newspaper.

*points and laughs* You can't catch 'falling off a ladder' from others, can you?

", - date: '09 March 2020 8:42pm', - isoDateTime: '2020-03-09T20:42:38Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810864', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810864', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'theseligsussex', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810411', - isoDateTime: '2020-03-09T20:17:17Z', - date: '09 March 2020 8:17pm', - commentId: '138810411', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810411', - }, - userProfile: { - userId: '10801728', - displayName: 'UnrepentantPunk', - webUrl: 'https://profile.theguardian.com/user/id/10801728', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10801728', - avatar: 'https://avatar.guim.co.uk/user/10801728', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10801728', - badge: [], - }, - }, - { - id: 138810955, - body: '

Yes, car crashes are so contagious...

And you can cure cancer by washing your hands.

', - date: '09 March 2020 8:46pm', - isoDateTime: '2020-03-09T20:46:40Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810955', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810955', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'bravobravoboooo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809278', - isoDateTime: '2020-03-09T19:10:45Z', - date: '09 March 2020 7:10pm', - commentId: '138809278', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809278', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - { - id: 138811091, - body: "

It was 133 yesterday. That's averaging over 100 per day.

If you want to make the case you could say it's going down now but with today's lockdown I guess you don't want to do that.

", - date: '09 March 2020 8:54pm', - isoDateTime: '2020-03-09T20:54:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811091', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811091', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'Wiretrip', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810086', - isoDateTime: '2020-03-09T19:59:50Z', - date: '09 March 2020 7:59pm', - commentId: '138810086', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810086', - }, - userProfile: { - userId: '13268043', - displayName: 'Bicbiro', - webUrl: 'https://profile.theguardian.com/user/id/13268043', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13268043', - avatar: 'https://avatar.guim.co.uk/user/13268043', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13268043', - badge: [], - }, - }, - { - id: 138811422, - body: '

OK fair enough. I stand corrected.

', - date: '09 March 2020 9:11pm', - isoDateTime: '2020-03-09T21:11:59Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811422', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811422', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Bicbiro', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811091', - isoDateTime: '2020-03-09T20:54:08Z', - date: '09 March 2020 8:54pm', - commentId: '138811091', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811091', - }, - userProfile: { - userId: '11992544', - displayName: 'Wiretrip', - webUrl: 'https://profile.theguardian.com/user/id/11992544', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11992544', - avatar: 'https://avatar.guim.co.uk/user/11992544', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11992544', - badge: [], - }, - }, - ], - metaData: { - commentCount: 27, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 1, - responseCount: 26, - }, - }, - { - id: 138809284, - body: '

40,000 new hospitals and 50 new nurses any day now

', - date: '09 March 2020 7:11pm', - isoDateTime: '2020-03-09T19:11:18Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809284', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809284', - numRecommends: 108, - isHighlighted: false, - userProfile: { - userId: '11113939', - displayName: 'MaoZedongInCheek', - webUrl: 'https://profile.theguardian.com/user/id/11113939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11113939', - avatar: 'https://avatar.guim.co.uk/user/11113939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/11113939', - badge: [], - }, - responses: [ - { - id: 138809541, - body: '

To go with the extra £350 million a week we were promised.

', - date: '09 March 2020 7:28pm', - isoDateTime: '2020-03-09T19:28:09Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809541', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809541', - numRecommends: 83, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809284', - isoDateTime: '2020-03-09T19:11:18Z', - date: '09 March 2020 7:11pm', - commentId: '138809284', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809284', - }, - userProfile: { - userId: '4255554', - displayName: 'Strummered', - webUrl: 'https://profile.theguardian.com/user/id/4255554', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4255554', - avatar: 'https://avatar.guim.co.uk/user/4255554', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4255554', - badge: [], - }, - }, - { - id: 138809609, - body: '

Countervaccines ordered by the home office

', - date: '09 March 2020 7:31pm', - isoDateTime: '2020-03-09T19:31:58Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809609', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809609', - numRecommends: 30, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809284', - isoDateTime: '2020-03-09T19:11:18Z', - date: '09 March 2020 7:11pm', - commentId: '138809284', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809284', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809766, - body: '

Soon we can stop paying for prescriptions. Gisela Stuart said we could.

', - date: '09 March 2020 7:41pm', - isoDateTime: '2020-03-09T19:41:04Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809766', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809766', - numRecommends: 28, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809284', - isoDateTime: '2020-03-09T19:11:18Z', - date: '09 March 2020 7:11pm', - commentId: '138809284', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809284', - }, - userProfile: { - userId: '15264988', - displayName: 'SueSharpe', - webUrl: 'https://profile.theguardian.com/user/id/15264988', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15264988', - avatar: 'https://avatar.guim.co.uk/user/15264988', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15264988', - badge: [], - }, - }, - { - id: 138809927, - body: '

Ha!

', - date: '09 March 2020 7:50pm', - isoDateTime: '2020-03-09T19:50:32Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809927', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809927', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809609', - isoDateTime: '2020-03-09T19:31:58Z', - date: '09 March 2020 7:31pm', - commentId: '138809609', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809609', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138811578, - body: "

Stop paying prescriptions? - I haven't paid for a prescription in a nearly a decade!

Oh, hold on. I'm in Scotland, and Nicola Sturgeon who introduced this policy as health secretary in 2011.... following Wales in 2007, and Ireland in 2010. So it is only 1/4 of the UK nations that pays for prescriptions................

", - date: '09 March 2020 9:19pm', - isoDateTime: '2020-03-09T21:19:00Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811578', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811578', - numRecommends: 14, - isHighlighted: false, - responseTo: { - displayName: 'SueSharpe', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809766', - isoDateTime: '2020-03-09T19:41:04Z', - date: '09 March 2020 7:41pm', - commentId: '138809766', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809766', - }, - userProfile: { - userId: '14318311', - displayName: 'abonimouse', - webUrl: 'https://profile.theguardian.com/user/id/14318311', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14318311', - avatar: 'https://avatar.guim.co.uk/user/14318311', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14318311', - badge: [], - }, - }, - ], - metaData: { - commentCount: 6, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 5, - }, - }, - { - id: 138809294, - body: '

Oh and no cooperation with those evil Europeans who want to work together in mutual interests

', - date: '09 March 2020 7:12pm', - isoDateTime: '2020-03-09T19:12:10Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809294', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809294', - numRecommends: 95, - isHighlighted: false, - userProfile: { - userId: '11113939', - displayName: 'MaoZedongInCheek', - webUrl: 'https://profile.theguardian.com/user/id/11113939', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11113939', - avatar: 'https://avatar.guim.co.uk/user/11113939', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/11113939', - badge: [], - }, - responses: [ - { - id: 138809318, - body: '

And we are leaving the EU December 2020- and walking out of negotiations in June!
We are all alone, in a ditch with Boris

', - date: '09 March 2020 7:14pm', - isoDateTime: '2020-03-09T19:14:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809318', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809318', - numRecommends: 68, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809294', - isoDateTime: '2020-03-09T19:12:10Z', - date: '09 March 2020 7:12pm', - commentId: '138809294', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809294', - }, - userProfile: { - userId: '17964816', - displayName: 'Waterllili', - webUrl: 'https://profile.theguardian.com/user/id/17964816', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17964816', - avatar: 'https://avatar.guim.co.uk/user/17964816', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17964816', - badge: [], - }, - }, - { - id: 138809370, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:17pm', - isoDateTime: '2020-03-09T19:17:12Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809370', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809370', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809294', - isoDateTime: '2020-03-09T19:12:10Z', - date: '09 March 2020 7:12pm', - commentId: '138809294', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809294', - }, - userProfile: { - userId: '101763863', - displayName: 'DarthRaider', - webUrl: 'https://profile.theguardian.com/user/id/101763863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101763863', - avatar: 'https://avatar.guim.co.uk/user/101763863', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101763863', - badge: [], - }, - }, - { - id: 138809437, - body: "

yeah it's their fault the medicines agency upped sticks and moved across the ditch...

", - date: '09 March 2020 7:21pm', - isoDateTime: '2020-03-09T19:21:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809437', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809437', - numRecommends: 14, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809294', - isoDateTime: '2020-03-09T19:12:10Z', - date: '09 March 2020 7:12pm', - commentId: '138809294', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809294', - }, - userProfile: { - userId: '4636148', - displayName: 'DismantleTrident', - webUrl: 'https://profile.theguardian.com/user/id/4636148', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4636148', - avatar: 'https://avatar.guim.co.uk/user/4636148', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4636148', - badge: [], - }, - }, - { - id: 138809445, - body: "

Can you imagine the state of the country in the event of a hard Brexit? We've had a glimpse and it isn't pretty. It will be horrific.

", - date: '09 March 2020 7:21pm', - isoDateTime: '2020-03-09T19:21:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809445', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809445', - numRecommends: 20, - isHighlighted: false, - responseTo: { - displayName: 'Waterllili', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809318', - isoDateTime: '2020-03-09T19:14:23Z', - date: '09 March 2020 7:14pm', - commentId: '138809318', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809318', - }, - userProfile: { - userId: '4255554', - displayName: 'Strummered', - webUrl: 'https://profile.theguardian.com/user/id/4255554', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4255554', - avatar: 'https://avatar.guim.co.uk/user/4255554', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4255554', - badge: [], - }, - }, - { - id: 138809492, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:02Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809492', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809492', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809445', - isoDateTime: '2020-03-09T19:21:35Z', - date: '09 March 2020 7:21pm', - commentId: '138809445', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809445', - }, - userProfile: { - userId: '101763863', - displayName: 'DarthRaider', - webUrl: 'https://profile.theguardian.com/user/id/101763863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101763863', - avatar: 'https://avatar.guim.co.uk/user/101763863', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101763863', - badge: [], - }, - }, - { - id: 138809553, - body: '

If only we could get additional doctors and nurses from Northern Italy!

', - date: '09 March 2020 7:28pm', - isoDateTime: '2020-03-09T19:28:49Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809553', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809553', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809294', - isoDateTime: '2020-03-09T19:12:10Z', - date: '09 March 2020 7:12pm', - commentId: '138809294', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809294', - }, - userProfile: { - userId: '101586975', - displayName: 'Asifbymagic', - webUrl: 'https://profile.theguardian.com/user/id/101586975', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101586975', - avatar: 'https://avatar.guim.co.uk/user/101586975', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101586975', - badge: [], - }, - }, - { - id: 138809617, - body: '

They say Crises are a good time to bury bad news. The unrelenting undermining of EU/UK negotiations by this Gov is under way and no one is crying wolf- just Lisa Nandy did today mention a delay.

', - date: '09 March 2020 7:32pm', - isoDateTime: '2020-03-09T19:32:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809617', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809617', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'DismantleTrident', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809437', - isoDateTime: '2020-03-09T19:21:23Z', - date: '09 March 2020 7:21pm', - commentId: '138809437', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809437', - }, - userProfile: { - userId: '17964816', - displayName: 'Waterllili', - webUrl: 'https://profile.theguardian.com/user/id/17964816', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17964816', - avatar: 'https://avatar.guim.co.uk/user/17964816', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17964816', - badge: [], - }, - }, - { - id: 138809656, - body: '

Did de pfeffel and Cummins come up with this? Brexit first, send home the dirty furriners next followed by release the virus then hire all the unskilled, unemployed as nurses and doctors on zhc. Genius!

', - date: '09 March 2020 7:34pm', - isoDateTime: '2020-03-09T19:34:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809656', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809656', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809294', - isoDateTime: '2020-03-09T19:12:10Z', - date: '09 March 2020 7:12pm', - commentId: '138809294', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809294', - }, - userProfile: { - userId: '12698069', - displayName: 'simjim091011', - webUrl: 'https://profile.theguardian.com/user/id/12698069', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12698069', - avatar: 'https://avatar.guim.co.uk/user/12698069', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12698069', - badge: [], - }, - }, - { - id: 138809661, - body: "

I'd love them to announce a delay. It'd be like the scene at the end of Kingsman with brexiteers exploding

Luckily I have 42 loo rolls to help tidy up

", - date: '09 March 2020 7:35pm', - isoDateTime: '2020-03-09T19:35:12Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809661', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809661', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'Waterllili', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809617', - isoDateTime: '2020-03-09T19:32:42Z', - date: '09 March 2020 7:32pm', - commentId: '138809617', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809617', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809805, - body: '

Luckily I have 42 loo rolls to help tidy up

That would not even cover the fall out from Johnson alone let alone all the others.

', - date: '09 March 2020 7:43pm', - isoDateTime: '2020-03-09T19:43:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809805', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809805', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809661', - isoDateTime: '2020-03-09T19:35:12Z', - date: '09 March 2020 7:35pm', - commentId: '138809661', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809661', - }, - userProfile: { - userId: '10085855', - displayName: 'bifess', - webUrl: 'https://profile.theguardian.com/user/id/10085855', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10085855', - avatar: 'https://avatar.guim.co.uk/user/10085855', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10085855', - badge: [], - }, - }, - { - id: 138809845, - body: "

I only picked 42 because it's hitchhiker's guide day. I have no intention of cleaning up after brexiteers :D

", - date: '09 March 2020 7:45pm', - isoDateTime: '2020-03-09T19:45:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809845', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809845', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'bifess', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809805', - isoDateTime: '2020-03-09T19:43:23Z', - date: '09 March 2020 7:43pm', - commentId: '138809805', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809805', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809866, - body: '

42 rolls? I only have 8!
It is going to be a mess up here in Scotland.

', - date: '09 March 2020 7:47pm', - isoDateTime: '2020-03-09T19:47:03Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809866', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809866', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809661', - isoDateTime: '2020-03-09T19:35:12Z', - date: '09 March 2020 7:35pm', - commentId: '138809661', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809661', - }, - userProfile: { - userId: '17964816', - displayName: 'Waterllili', - webUrl: 'https://profile.theguardian.com/user/id/17964816', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17964816', - avatar: 'https://avatar.guim.co.uk/user/17964816', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17964816', - badge: [], - }, - }, - { - id: 138809977, - body: "

to be fair, Germany and France banned exports of medical supplies. German customs officers just stopped lorries full of surgical masks at their border with Switzerland, despite they were part of a shipment going to Swiss hospitals from manufacturers in the Far East.

Don't place too much hope on European cooperation. It's all well when the weather is fine, but when it's “Germany first” when worst comes to worst.

", - date: '09 March 2020 7:53pm', - isoDateTime: '2020-03-09T19:53:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809977', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809977', - numRecommends: 23, - isHighlighted: false, - responseTo: { - displayName: 'MaoZedongInCheek', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809294', - isoDateTime: '2020-03-09T19:12:10Z', - date: '09 March 2020 7:12pm', - commentId: '138809294', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809294', - }, - userProfile: { - userId: '16876782', - displayName: '30624700', - webUrl: 'https://profile.theguardian.com/user/id/16876782', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16876782', - avatar: 'https://avatar.guim.co.uk/user/16876782', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16876782', - badge: [], - }, - }, - { - id: 138810132, - body: "

I think I have nine, I bought a new pack a week or so ago. Can't remember if I've opened it yet.

So nah na nah na na

", - date: '09 March 2020 8:02pm', - isoDateTime: '2020-03-09T20:02:29Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810132', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810132', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'Waterllili', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809866', - isoDateTime: '2020-03-09T19:47:03Z', - date: '09 March 2020 7:47pm', - commentId: '138809866', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809866', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138810223, - body: "

How can they do that, they aren't independent sovereign nations are they.

", - date: '09 March 2020 8:07pm', - isoDateTime: '2020-03-09T20:07:43Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810223', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: '30624700', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809977', - isoDateTime: '2020-03-09T19:53:46Z', - date: '09 March 2020 7:53pm', - commentId: '138809977', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809977', - }, - userProfile: { - userId: '101693558', - displayName: 'BritInStuttgart', - webUrl: 'https://profile.theguardian.com/user/id/101693558', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101693558', - avatar: 'https://avatar.guim.co.uk/user/101693558', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101693558', - badge: [], - }, - }, - { - id: 138810401, - body: '

Switzerland is not in Europe last time I looked

', - date: '09 March 2020 8:16pm', - isoDateTime: '2020-03-09T20:16:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810401', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810401', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: '30624700', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809977', - isoDateTime: '2020-03-09T19:53:46Z', - date: '09 March 2020 7:53pm', - commentId: '138809977', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809977', - }, - userProfile: { - userId: '100760659', - displayName: 'ajhisc', - webUrl: 'https://profile.theguardian.com/user/id/100760659', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100760659', - avatar: 'https://avatar.guim.co.uk/user/100760659', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100760659', - badge: [], - }, - }, - { - id: 138810519, - body: "

I've noticed the pound has fallen 6 cents in a fortnight, despite the crap that Italy (and to a lesser extent France) are going through.

", - date: '09 March 2020 8:23pm', - isoDateTime: '2020-03-09T20:23:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810519', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810519', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'Waterllili', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809617', - isoDateTime: '2020-03-09T19:32:42Z', - date: '09 March 2020 7:32pm', - commentId: '138809617', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809617', - }, - userProfile: { - userId: '3578530', - displayName: 'EnviroCapitalist', - webUrl: 'https://profile.theguardian.com/user/id/3578530', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3578530', - avatar: 'https://avatar.guim.co.uk/user/3578530', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3578530', - badge: [], - }, - }, - { - id: 138810569, - body: '

What

', - date: '09 March 2020 8:25pm', - isoDateTime: '2020-03-09T20:25:34Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810569', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810569', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'ajhisc', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810401', - isoDateTime: '2020-03-09T20:16:46Z', - date: '09 March 2020 8:16pm', - commentId: '138810401', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810401', - }, - userProfile: { - userId: '101821137', - displayName: 'ScotchWoodcock', - webUrl: 'https://profile.theguardian.com/user/id/101821137', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101821137', - avatar: 'https://avatar.guim.co.uk/user/101821137', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101821137', - badge: [], - }, - }, - { - id: 138810611, - body: '

And why would we specifically want to get them from one particular part of another country?

', - date: '09 March 2020 8:27pm', - isoDateTime: '2020-03-09T20:27:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810611', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810611', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'Asifbymagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809553', - isoDateTime: '2020-03-09T19:28:49Z', - date: '09 March 2020 7:28pm', - commentId: '138809553', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809553', - }, - userProfile: { - userId: '100789525', - displayName: 'slimepants', - webUrl: 'https://profile.theguardian.com/user/id/100789525', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100789525', - avatar: 'https://avatar.guim.co.uk/user/100789525', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100789525', - badge: [], - }, - }, - { - id: 138810627, - body: "

I'm presuming he/she meant the EU

", - date: '09 March 2020 8:28pm', - isoDateTime: '2020-03-09T20:28:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810627', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810627', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'ScotchWoodcock', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810569', - isoDateTime: '2020-03-09T20:25:34Z', - date: '09 March 2020 8:25pm', - commentId: '138810569', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810569', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138810737, - body: '

Oh thank god I was fucking panicking

', - date: '09 March 2020 8:35pm', - isoDateTime: '2020-03-09T20:35:04Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810737', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810737', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810627', - isoDateTime: '2020-03-09T20:28:44Z', - date: '09 March 2020 8:28pm', - commentId: '138810627', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810627', - }, - userProfile: { - userId: '101821137', - displayName: 'ScotchWoodcock', - webUrl: 'https://profile.theguardian.com/user/id/101821137', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101821137', - avatar: 'https://avatar.guim.co.uk/user/101821137', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101821137', - badge: [], - }, - }, - { - id: 138810798, - body: "

I'm only guessing. Switzerland may have moved, I don't keep up with geographical news

", - date: '09 March 2020 8:38pm', - isoDateTime: '2020-03-09T20:38:19Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810798', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810798', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'ScotchWoodcock', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810737', - isoDateTime: '2020-03-09T20:35:04Z', - date: '09 March 2020 8:35pm', - commentId: '138810737', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810737', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138810916, - body: '

Taking back control, putting their country first - isn’t that want everyone voted for?
And yet when another country does that you imply it is not fair?

', - date: '09 March 2020 8:45pm', - isoDateTime: '2020-03-09T20:45:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810916', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810916', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: '30624700', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809977', - isoDateTime: '2020-03-09T19:53:46Z', - date: '09 March 2020 7:53pm', - commentId: '138809977', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809977', - }, - userProfile: { - userId: '17629940', - displayName: 'HephzibahTurner', - webUrl: 'https://profile.theguardian.com/user/id/17629940', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17629940', - avatar: 'https://avatar.guim.co.uk/user/17629940', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17629940', - badge: [], - }, - }, - { - id: 138811183, - body: '

Switzerland is not in Europe last time I looked

Well, geographically it is. It\'s not a member of the EU, but as Wiki puts it: "...it participates in the Schengen Area and the European Single Market through bilateral treaties." It would be nice if the UK could negotiate similar treaties, but the demented approach of this government might well result in us crashing out with a No Deal Brexit. In which case, all bets are off.', - date: '09 March 2020 8:59pm', - isoDateTime: '2020-03-09T20:59:02Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811183', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811183', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'ajhisc', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810401', - isoDateTime: '2020-03-09T20:16:46Z', - date: '09 March 2020 8:16pm', - commentId: '138810401', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810401', - }, - userProfile: { - userId: '4300010', - displayName: 'Lycidas', - webUrl: 'https://profile.theguardian.com/user/id/4300010', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4300010', - avatar: 'https://avatar.guim.co.uk/user/4300010', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4300010', - badge: [], - }, - }, - { - id: 138811241, - body: '

might well

may well', - date: '09 March 2020 9:01pm', - isoDateTime: '2020-03-09T21:01:57Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811241', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811241', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'Lycidas', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811183', - isoDateTime: '2020-03-09T20:59:02Z', - date: '09 March 2020 8:59pm', - commentId: '138811183', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811183', - }, - userProfile: { - userId: '4300010', - displayName: 'Lycidas', - webUrl: 'https://profile.theguardian.com/user/id/4300010', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4300010', - avatar: 'https://avatar.guim.co.uk/user/4300010', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4300010', - badge: [], - }, - }, - { - id: 138811686, - body: '

Last time I looked it was in Europe , maybe not the EU .

', - date: '09 March 2020 9:23pm', - isoDateTime: '2020-03-09T21:23:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811686', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811686', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'ajhisc', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810401', - isoDateTime: '2020-03-09T20:16:46Z', - date: '09 March 2020 8:16pm', - commentId: '138810401', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810401', - }, - userProfile: { - userId: '13472066', - displayName: 'innriver', - webUrl: 'https://profile.theguardian.com/user/id/13472066', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13472066', - avatar: 'https://avatar.guim.co.uk/user/13472066', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13472066', - badge: [], - }, - }, - ], - metaData: { - commentCount: 27, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 2, - responseCount: 26, - }, - }, - { - id: 138809295, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:12pm', - isoDateTime: '2020-03-09T19:12:21Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809295', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809295', - numRecommends: 3, - isHighlighted: false, - userProfile: { - userId: '14815427', - displayName: 'NotWokeHere', - webUrl: 'https://profile.theguardian.com/user/id/14815427', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14815427', - avatar: 'https://avatar.guim.co.uk/user/14815427', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14815427', - badge: [], - }, - }, - { - id: 138809314, - body: "

Take its pulse and it’s short of 100,000 doctors and nurses, with 17,000 beds lost since 2010. Germany has eight beds per 1,000 people , UK only 2.5.

It's utterly disgraceful what the Tories have done to the NHS and country these last ten years. If the NHS and the country manages to cope it will be despite them as the PM and cabinet are neither use nor ornament. In fact they should come with a health warning.

", - date: '09 March 2020 7:13pm', - isoDateTime: '2020-03-09T19:13:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809314', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - numRecommends: 115, - isHighlighted: false, - userProfile: { - userId: '4255554', - displayName: 'Strummered', - webUrl: 'https://profile.theguardian.com/user/id/4255554', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4255554', - avatar: 'https://avatar.guim.co.uk/user/4255554', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4255554', - badge: [], - }, - responses: [ - { - id: 138809359, - body: '

Privatisation by stealth.

US healthcare coming to a location near you.

Soon.

', - date: '09 March 2020 7:16pm', - isoDateTime: '2020-03-09T19:16:43Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809359', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809359', - numRecommends: 57, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '15685187', - displayName: 'andersen100', - webUrl: 'https://profile.theguardian.com/user/id/15685187', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15685187', - avatar: 'https://avatar.guim.co.uk/user/15685187', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15685187', - badge: [], - }, - }, - { - id: 138809473, - body: '

The question is: Would the different level of ICU beds really make a differene when 10.000 patients may need one? We may see triages in both countries.

The political issue will be more ugly in UK, the demographic not.

', - date: '09 March 2020 7:23pm', - isoDateTime: '2020-03-09T19:23:49Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809473', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809473', - numRecommends: 23, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '11314558', - displayName: 'Ulenspiegel', - webUrl: 'https://profile.theguardian.com/user/id/11314558', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11314558', - avatar: 'https://avatar.guim.co.uk/user/11314558', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11314558', - badge: [], - }, - }, - { - id: 138809522, - body: '

Well said

', - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809522', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809522', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '12360820', - displayName: 'drragon', - webUrl: 'https://profile.theguardian.com/user/id/12360820', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12360820', - avatar: 'https://avatar.guim.co.uk/user/12360820', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12360820', - badge: [], - }, - }, - { - id: 138809559, - body: '

And the rot started in 1997 when the NHS had 205,000 beds, but by 2010 had 170,000 beds.

If it is disgraceful that the conservatives lost 17,000 beds, is it disgraceful that Labour lost 35,000 beds?

https://www.kingsfund.org.uk/audio-video/key-facts-figures-nhsat

', - date: '09 March 2020 7:29pm', - isoDateTime: '2020-03-09T19:29:04Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809559', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809559', - numRecommends: 28, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '2596777', - displayName: 'thewhofan', - webUrl: 'https://profile.theguardian.com/user/id/2596777', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2596777', - avatar: 'https://avatar.guim.co.uk/user/2596777', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2596777', - badge: [], - }, - }, - { - id: 138809581, - body: '

How many beds were there under Labour? Would be useful to know.

', - date: '09 March 2020 7:30pm', - isoDateTime: '2020-03-09T19:30:25Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809581', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809581', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '14756178', - displayName: 'hhowells', - webUrl: 'https://profile.theguardian.com/user/id/14756178', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14756178', - avatar: 'https://avatar.guim.co.uk/user/14756178', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14756178', - badge: [], - }, - }, - { - id: 138809629, - body: '

That is the wrong sort of fact. You know that, as always for a PT article, this is an anti-Tory rant!

I am no supporter of the Tories (or of Labour for that matter) but this is too serious a topic for points scoring.

', - date: '09 March 2020 7:33pm', - isoDateTime: '2020-03-09T19:33:37Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809629', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809629', - numRecommends: 21, - isHighlighted: false, - responseTo: { - displayName: 'thewhofan', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809559', - isoDateTime: '2020-03-09T19:29:04Z', - date: '09 March 2020 7:29pm', - commentId: '138809559', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809559', - }, - userProfile: { - userId: '3298302', - displayName: 'Swan17', - webUrl: 'https://profile.theguardian.com/user/id/3298302', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3298302', - avatar: 'https://avatar.guim.co.uk/user/3298302', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3298302', - badge: [], - }, - }, - { - id: 138809641, - body: '

I think the fact that ICU beds are under pressure before it even gets started is a bit of a difference.

', - date: '09 March 2020 7:34pm', - isoDateTime: '2020-03-09T19:34:17Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809641', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809641', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'Ulenspiegel', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809473', - isoDateTime: '2020-03-09T19:23:49Z', - date: '09 March 2020 7:23pm', - commentId: '138809473', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809473', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809684, - body: '

I am always fascinated by all the claims and counterclaims about the NHS, and how more is always needed and how terrible it is. A little bit of googling suggest 1,500,000 people work for that organisation and it receives £145,000,000,000 per year. You can always spend more however you could probably divert all of the country’s wealth and for some that still would not be enough, however whenever I’ve come across the NHS, it is generally excellent.

', - date: '09 March 2020 7:36pm', - isoDateTime: '2020-03-09T19:36:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809684', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809684', - numRecommends: 24, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '11840136', - displayName: 'imnotaleftie', - webUrl: 'https://profile.theguardian.com/user/id/11840136', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11840136', - avatar: 'https://avatar.guim.co.uk/user/11840136', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11840136', - badge: [], - }, - }, - { - id: 138809702, - body: '

Both can be wrong, you also have to consider what is a safe stable number to stop cutting at

', - date: '09 March 2020 7:37pm', - isoDateTime: '2020-03-09T19:37:29Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809702', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809702', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'thewhofan', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809559', - isoDateTime: '2020-03-09T19:29:04Z', - date: '09 March 2020 7:29pm', - commentId: '138809559', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809559', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138810097, - body: '

So should you .... https://fullfact.org/health/number-hospital-beds-falling/

', - date: '09 March 2020 8:00pm', - isoDateTime: '2020-03-09T20:00:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810097', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810097', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '100945565', - displayName: 'Ivorte', - webUrl: 'https://profile.theguardian.com/user/id/100945565', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100945565', - avatar: 'https://avatar.guim.co.uk/user/100945565', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100945565', - badge: [], - }, - }, - { - id: 138810337, - body: '

Read my comment, the figures are there.

What is important is the number of beds lost.

', - date: '09 March 2020 8:13pm', - isoDateTime: '2020-03-09T20:13:38Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810337', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810337', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'hhowells', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809581', - isoDateTime: '2020-03-09T19:30:25Z', - date: '09 March 2020 7:30pm', - commentId: '138809581', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809581', - }, - userProfile: { - userId: '2596777', - displayName: 'thewhofan', - webUrl: 'https://profile.theguardian.com/user/id/2596777', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2596777', - avatar: 'https://avatar.guim.co.uk/user/2596777', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2596777', - badge: [], - }, - }, - { - id: 138810380, - body: "

I agree, but it doesn't alter the fact that under both parties, substantial numbers of hospital beds were lost between 1997 and 2020.

", - date: '09 March 2020 8:15pm', - isoDateTime: '2020-03-09T20:15:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810380', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810380', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809702', - isoDateTime: '2020-03-09T19:37:29Z', - date: '09 March 2020 7:37pm', - commentId: '138809702', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809702', - }, - userProfile: { - userId: '2596777', - displayName: 'thewhofan', - webUrl: 'https://profile.theguardian.com/user/id/2596777', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2596777', - avatar: 'https://avatar.guim.co.uk/user/2596777', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2596777', - badge: [], - }, - }, - { - id: 138810413, - body: "

I agree, but if only some facts are put forward, you don't get the full picture.

", - date: '09 March 2020 8:17pm', - isoDateTime: '2020-03-09T20:17:34Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810413', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810413', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'Swan17', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809629', - isoDateTime: '2020-03-09T19:33:37Z', - date: '09 March 2020 7:33pm', - commentId: '138809629', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809629', - }, - userProfile: { - userId: '2596777', - displayName: 'thewhofan', - webUrl: 'https://profile.theguardian.com/user/id/2596777', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2596777', - avatar: 'https://avatar.guim.co.uk/user/2596777', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2596777', - badge: [], - }, - }, - { - id: 138810421, - body: '

Good to see the great German system that incorporates private health care (30%) working to good effect.

', - date: '09 March 2020 8:17pm', - isoDateTime: '2020-03-09T20:17:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810421', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810421', - numRecommends: 19, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '18213257', - displayName: 'Farcemultiplier', - webUrl: 'https://profile.theguardian.com/user/id/18213257', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18213257', - avatar: 'https://avatar.guim.co.uk/user/18213257', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18213257', - badge: [], - }, - }, - { - id: 138810462, - body: '

Triage already occurs in A & E in the UK and I suspect it does in many other countries.

', - date: '09 March 2020 8:20pm', - isoDateTime: '2020-03-09T20:20:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810462', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810462', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'Ulenspiegel', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809473', - isoDateTime: '2020-03-09T19:23:49Z', - date: '09 March 2020 7:23pm', - commentId: '138809473', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809473', - }, - userProfile: { - userId: '2596777', - displayName: 'thewhofan', - webUrl: 'https://profile.theguardian.com/user/id/2596777', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2596777', - avatar: 'https://avatar.guim.co.uk/user/2596777', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2596777', - badge: [], - }, - }, - { - id: 138810734, - body: '

"It\'s utterly disgraceful what the Tories have done to the NHS and country these last ten years"

I know. Increasing expenditure on NHS England every single year, despite the financial constraints placed on them by the Global Financial Crisis and by Gordon Brown spending like a drunken sailor between 2005 and 2010, leaving the economy in ruins.

', - date: '09 March 2020 8:34pm', - isoDateTime: '2020-03-09T20:34:41Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810734', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810734', - numRecommends: 28, - isHighlighted: false, - responseTo: { - displayName: 'Strummered', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809314', - isoDateTime: '2020-03-09T19:13:54Z', - date: '09 March 2020 7:13pm', - commentId: '138809314', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809314', - }, - userProfile: { - userId: '15673053', - displayName: 'fordprefect100', - webUrl: 'https://profile.theguardian.com/user/id/15673053', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15673053', - avatar: 'https://avatar.guim.co.uk/user/15673053', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15673053', - badge: [], - }, - }, - ], - metaData: { - commentCount: 17, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 16, - }, - }, - { - id: 138809321, - body: "

I agree we need the NHS 100% during this event. However it can not deal with this virus. The Uk does not have the resources or manpower to do what the Chinese did. No nation on earth apart from china can do that. The UK's response shpuld have been a phase before containment called prevention.

Prevention of the virus entering the UK. The scientists quoted Italy saying that suspending flights from China didn't prevent it in Italy. Well that's correct. But suspending all g;obal flights for a month mights have done something!

Our esteemed world leaders decided otherwise. The blame for this virus in the UK lies fairly and squarley with the imbediles in Govt and those advising them. They allowed it to enter the UK.

", - date: '09 March 2020 7:14pm', - isoDateTime: '2020-03-09T19:14:28Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809321', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809321', - numRecommends: 15, - isHighlighted: false, - userProfile: { - userId: '102156531', - displayName: 'Leeming20', - webUrl: 'https://profile.theguardian.com/user/id/102156531', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102156531', - avatar: 'https://avatar.guim.co.uk/user/102156531', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/102156531', - badge: [], - }, - responses: [ - { - id: 138809388, - body: "

Great sentiment, but just not practical. There are Brits away in every country on earth, you can't just not let them come home for a month (and vice versa for other countries)

", - date: '09 March 2020 7:18pm', - isoDateTime: '2020-03-09T19:18:32Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809388', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809388', - numRecommends: 22, - isHighlighted: false, - responseTo: { - displayName: 'Leeming20', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809321', - isoDateTime: '2020-03-09T19:14:28Z', - date: '09 March 2020 7:14pm', - commentId: '138809321', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809321', - }, - userProfile: { - userId: '13093174', - displayName: 'Cricketnut', - webUrl: 'https://profile.theguardian.com/user/id/13093174', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13093174', - avatar: 'https://avatar.guim.co.uk/user/13093174', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13093174', - badge: [], - }, - }, - { - id: 138809562, - body: "

But China made most people stay at home - by force. They didn't have the beds or doctors. The numbers are just too big.

", - date: '09 March 2020 7:29pm', - isoDateTime: '2020-03-09T19:29:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809562', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809562', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Leeming20', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809321', - isoDateTime: '2020-03-09T19:14:28Z', - date: '09 March 2020 7:14pm', - commentId: '138809321', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809321', - }, - userProfile: { - userId: '14756178', - displayName: 'hhowells', - webUrl: 'https://profile.theguardian.com/user/id/14756178', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14756178', - avatar: 'https://avatar.guim.co.uk/user/14756178', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14756178', - badge: [], - }, - }, - { - id: 138809776, - body: '

If your are going to call somebody an imbecile it is probably a good idea to spell the word in question correctly, just a thought. Also I’d love to know how you could possible prevent the spread of a virus with a long incubation period?

', - date: '09 March 2020 7:41pm', - isoDateTime: '2020-03-09T19:41:32Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809776', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809776', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'Leeming20', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809321', - isoDateTime: '2020-03-09T19:14:28Z', - date: '09 March 2020 7:14pm', - commentId: '138809321', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809321', - }, - userProfile: { - userId: '11840136', - displayName: 'imnotaleftie', - webUrl: 'https://profile.theguardian.com/user/id/11840136', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11840136', - avatar: 'https://avatar.guim.co.uk/user/11840136', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11840136', - badge: [], - }, - }, - { - id: 138810899, - body: '

What are the full implications of stopping all "global" flights? (I assume by you mean with one end in the UK).

', - date: '09 March 2020 8:44pm', - isoDateTime: '2020-03-09T20:44:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810899', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810899', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Leeming20', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809321', - isoDateTime: '2020-03-09T19:14:28Z', - date: '09 March 2020 7:14pm', - commentId: '138809321', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809321', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - ], - metaData: { - commentCount: 5, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 4, - }, - }, - { - id: 138809347, - body: '

Any Polly Toynbee article: read between the red lines...

', - date: '09 March 2020 7:16pm', - isoDateTime: '2020-03-09T19:16:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809347', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809347', - numRecommends: 15, - isHighlighted: false, - userProfile: { - userId: '13093174', - displayName: 'Cricketnut', - webUrl: 'https://profile.theguardian.com/user/id/13093174', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13093174', - avatar: 'https://avatar.guim.co.uk/user/13093174', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/13093174', - badge: [], - }, - }, - { - id: 138809350, - body: '

To face Covid-19, unity is strength. I call on our European partners to take urgent action to coordinate health measures, research efforts and our economic response. Let us act together now.

Macron

', - date: '09 March 2020 7:16pm', - isoDateTime: '2020-03-09T19:16:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809350', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809350', - numRecommends: 11, - isHighlighted: false, - userProfile: { - userId: '12701863', - displayName: '112131966523', - webUrl: 'https://profile.theguardian.com/user/id/12701863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12701863', - avatar: 'https://avatar.guim.co.uk/user/12701863', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/12701863', - badge: [], - }, - responses: [ - { - id: 138810104, - body: '

So said the person who requisitioned every single surgical mask in France and forced a manufacturer to cancel orders from the UK NHS.

I always think UK has behaved more European than France, but French politicians have always been keener to trumpet the European ideal - without actually practising it - than their shy UK counterparts.

', - date: '09 March 2020 8:00pm', - isoDateTime: '2020-03-09T20:00:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810104', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810104', - numRecommends: 20, - isHighlighted: false, - responseTo: { - displayName: '112131966523', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809350', - isoDateTime: '2020-03-09T19:16:21Z', - date: '09 March 2020 7:16pm', - commentId: '138809350', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809350', - }, - userProfile: { - userId: '16876782', - displayName: '30624700', - webUrl: 'https://profile.theguardian.com/user/id/16876782', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16876782', - avatar: 'https://avatar.guim.co.uk/user/16876782', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16876782', - badge: [], - }, - }, - { - id: 138810226, - body: '

Well you reap what you sow. Why not buy them from Trump. He is your lots saviour.

', - date: '09 March 2020 8:07pm', - isoDateTime: '2020-03-09T20:07:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810226', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810226', - numRecommends: 19, - isHighlighted: false, - responseTo: { - displayName: '30624700', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810104', - isoDateTime: '2020-03-09T20:00:46Z', - date: '09 March 2020 8:00pm', - commentId: '138810104', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810104', - }, - userProfile: { - userId: '12701863', - displayName: '112131966523', - webUrl: 'https://profile.theguardian.com/user/id/12701863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12701863', - avatar: 'https://avatar.guim.co.uk/user/12701863', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12701863', - badge: [], - }, - }, - ], - metaData: { - commentCount: 3, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 2, - }, - }, - { - id: 138809351, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:16pm', - isoDateTime: '2020-03-09T19:16:23Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809351', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809351', - numRecommends: 2, - isHighlighted: false, - userProfile: { - userId: '101763863', - displayName: 'DarthRaider', - webUrl: 'https://profile.theguardian.com/user/id/101763863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101763863', - avatar: 'https://avatar.guim.co.uk/user/101763863', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/101763863', - badge: [], - }, - }, - { - id: 138809356, - body: "

We have members of the family who work for the NHS and can we just repeat what should be self evident to anyone with a brain cell right now. If you feel unwell with a fever, cough, or flu like symptoms, DO NOT go into your doctor's surgery or A&E where you will be putting health workers and vulnerable patients at risk, RING 111.
In some countries there are real penalties for those who should be self isolating actually putting others at risk. I think that should be adopted here.

", - date: '09 March 2020 7:16pm', - isoDateTime: '2020-03-09T19:16:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809356', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809356', - numRecommends: 160, - isHighlighted: true, - userProfile: { - userId: '14293232', - displayName: 'BabylonianSheDevil03', - webUrl: 'https://profile.theguardian.com/user/id/14293232', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14293232', - avatar: 'https://avatar.guim.co.uk/user/14293232', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14293232', - badge: [], - }, - responses: [ - { - id: 138809402, - body: "

Have you ever rang 111? It's largely useless even without a national crisis.

", - date: '09 March 2020 7:19pm', - isoDateTime: '2020-03-09T19:19:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809402', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - numRecommends: 73, - isHighlighted: false, - responseTo: { - displayName: 'BabylonianSheDevil03', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809356', - isoDateTime: '2020-03-09T19:16:35Z', - date: '09 March 2020 7:16pm', - commentId: '138809356', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809356', - }, - userProfile: { - userId: '2966817', - displayName: 'philipphilip99', - webUrl: 'https://profile.theguardian.com/user/id/2966817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2966817', - avatar: 'https://avatar.guim.co.uk/user/2966817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2966817', - badge: [], - }, - }, - { - id: 138809455, - body: "

I hear you, but people must self isolate until they manage to get through to 111 or alternatively ring their doctor's surgery and get advice, perhaps even speak to their doctor on the phone. Nobody should be leaving their homes if they feel unwell as described in my original post.

", - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:26Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809455', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809455', - numRecommends: 86, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '14293232', - displayName: 'BabylonianSheDevil03', - webUrl: 'https://profile.theguardian.com/user/id/14293232', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14293232', - avatar: 'https://avatar.guim.co.uk/user/14293232', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14293232', - badge: [], - }, - }, - { - id: 138809530, - body: "

Maybe, but it's still better than risking spreading any infection.

Besides they announced 700 more people to work there so I'm sure it's fixed now

", - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:37Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809530', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809530', - numRecommends: 40, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809576, - body: '

Yes I have.
Three times in the last two months : firstly when an elderly relative collapsed on the bathroom floor, the second time concerning a possible heart attack and the third concerning an angina attack.

In each case the 111 staff were calm, professional and full of helpful advice

', - date: '09 March 2020 7:30pm', - isoDateTime: '2020-03-09T19:30:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809576', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809576', - numRecommends: 59, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '16332843', - displayName: 'dougmeyberry', - webUrl: 'https://profile.theguardian.com/user/id/16332843', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16332843', - avatar: 'https://avatar.guim.co.uk/user/16332843', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16332843', - badge: [], - }, - }, - { - id: 138809634, - body: '

Was it go to hospital or call 999 in all three cases?

', - date: '09 March 2020 7:33pm', - isoDateTime: '2020-03-09T19:33:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809634', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809634', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'dougmeyberry', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809576', - isoDateTime: '2020-03-09T19:30:13Z', - date: '09 March 2020 7:30pm', - commentId: '138809576', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809576', - }, - userProfile: { - userId: '2966817', - displayName: 'philipphilip99', - webUrl: 'https://profile.theguardian.com/user/id/2966817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2966817', - avatar: 'https://avatar.guim.co.uk/user/2966817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2966817', - badge: [], - }, - }, - { - id: 138809693, - body: "

We have called them when my wife thought I was having a heart attack (thankfully only a very bad chest infection). They were professional, got a qualified Nurse to talk to us almost immediately and got an ambulance dispatched.

What are your qualifications or experience to cal the 111 service 'largely useless'?

", - date: '09 March 2020 7:36pm', - isoDateTime: '2020-03-09T19:36:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809693', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809693', - numRecommends: 37, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '3298302', - displayName: 'Swan17', - webUrl: 'https://profile.theguardian.com/user/id/3298302', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3298302', - avatar: 'https://avatar.guim.co.uk/user/3298302', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3298302', - badge: [], - }, - }, - { - id: 138809732, - body: '

No not at all

They described in one case actions to take before the ambulance arrived, in another symptoms to look out for to see if the angina was intensifying and in the third case helped make arrangements for an emergency appointment at my local GP to have an ECG scan

Do you want me to go through the entire conversation and relive life-threatening situations for myself and my family before you believe my point of view or are you happy to accept that not everyone is deserving of your pitiful would-be withering scorn.?

', - date: '09 March 2020 7:39pm', - isoDateTime: '2020-03-09T19:39:00Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809732', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809732', - numRecommends: 35, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809634', - isoDateTime: '2020-03-09T19:33:46Z', - date: '09 March 2020 7:33pm', - commentId: '138809634', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809634', - }, - userProfile: { - userId: '16332843', - displayName: 'dougmeyberry', - webUrl: 'https://profile.theguardian.com/user/id/16332843', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16332843', - avatar: 'https://avatar.guim.co.uk/user/16332843', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16332843', - badge: [], - }, - }, - { - id: 138809757, - body: "

If you're wife thought you were having a heart attack she should've called 999 immediately.

OP seems to think potentially seriously ill people or their relatives will be content to call 111 and then try to deal with it at home?

", - date: '09 March 2020 7:40pm', - isoDateTime: '2020-03-09T19:40:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809757', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809757', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'Swan17', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809693', - isoDateTime: '2020-03-09T19:36:44Z', - date: '09 March 2020 7:36pm', - commentId: '138809693', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809693', - }, - userProfile: { - userId: '2966817', - displayName: 'philipphilip99', - webUrl: 'https://profile.theguardian.com/user/id/2966817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2966817', - avatar: 'https://avatar.guim.co.uk/user/2966817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2966817', - badge: [], - }, - }, - { - id: 138809822, - body: '

Presumably they’re just reading from a script anyway.

', - date: '09 March 2020 7:44pm', - isoDateTime: '2020-03-09T19:44:24Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809822', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809822', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138809835, - body: '

Paranoia will help.

', - date: '09 March 2020 7:45pm', - isoDateTime: '2020-03-09T19:45:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809835', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809835', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809822', - isoDateTime: '2020-03-09T19:44:24Z', - date: '09 March 2020 7:44pm', - commentId: '138809822', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809822', - }, - userProfile: { - userId: '2966817', - displayName: 'philipphilip99', - webUrl: 'https://profile.theguardian.com/user/id/2966817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2966817', - avatar: 'https://avatar.guim.co.uk/user/2966817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2966817', - badge: [], - }, - }, - { - id: 138809839, - body: '

Why not 999/112 out of interest?

', - date: '09 March 2020 7:45pm', - isoDateTime: '2020-03-09T19:45:33Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809839', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809839', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'Swan17', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809693', - isoDateTime: '2020-03-09T19:36:44Z', - date: '09 March 2020 7:36pm', - commentId: '138809693', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809693', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138809916, - body: "

What does calling 112 get you to in the UK?

And you call 111 as the govt and NHS advice is that 999 is for emergencies. In each of the cases I mentioned it was not clear at the outset that the event was a medical emergency, so we followed govt advice and the procedures worked well.

What's your expertise to be able to comment so carpingly? The 111 team use scripts as they have been designed by medical staff to get to a good diagnosis asap. What's your problem with that?

", - date: '09 March 2020 7:49pm', - isoDateTime: '2020-03-09T19:49:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809916', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809916', - numRecommends: 20, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809839', - isoDateTime: '2020-03-09T19:45:33Z', - date: '09 March 2020 7:45pm', - commentId: '138809839', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809839', - }, - userProfile: { - userId: '16332843', - displayName: 'dougmeyberry', - webUrl: 'https://profile.theguardian.com/user/id/16332843', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16332843', - avatar: 'https://avatar.guim.co.uk/user/16332843', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16332843', - badge: [], - }, - }, - { - id: 138809944, - body: '

I think 112 is also emergencies.

', - date: '09 March 2020 7:51pm', - isoDateTime: '2020-03-09T19:51:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809944', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809944', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'dougmeyberry', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809916', - isoDateTime: '2020-03-09T19:49:13Z', - date: '09 March 2020 7:49pm', - commentId: '138809916', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809916', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809950, - body: '

Fair enough. But I suspect the helpline numbers will be the first things to crash of there is a surge of cases.

', - date: '09 March 2020 7:51pm', - isoDateTime: '2020-03-09T19:51:47Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809950', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809950', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'dougmeyberry', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809732', - isoDateTime: '2020-03-09T19:39:00Z', - date: '09 March 2020 7:39pm', - commentId: '138809732', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809732', - }, - userProfile: { - userId: '2966817', - displayName: 'philipphilip99', - webUrl: 'https://profile.theguardian.com/user/id/2966817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2966817', - avatar: 'https://avatar.guim.co.uk/user/2966817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2966817', - badge: [], - }, - }, - { - id: 138810150, - body: '

As most cases are likely to be contagious but not deadly, 111 is exactly the right number to call. They will assess if testing is necessary and arrange for a test in a "pod", if need be.
They can be contacted if things change and arrange for a properly equipped ambulance to take someone to a pre-warned hospital, if appropriate.

The last thing the ambulance service, A&E, or GPs need is people just turning up.

', - date: '09 March 2020 8:03pm', - isoDateTime: '2020-03-09T20:03:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810150', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810150', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138810322, - body: "

112 is a number that will put you through to the 999 service. It seems to have been introduced so people didn't have to remember different numbers in different EU countries. I don't know that all countries have introduced it, though.

", - date: '09 March 2020 8:12pm', - isoDateTime: '2020-03-09T20:12:53Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810322', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810322', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'dougmeyberry', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809916', - isoDateTime: '2020-03-09T19:49:13Z', - date: '09 March 2020 7:49pm', - commentId: '138809916', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809916', - }, - userProfile: { - userId: '11547449', - displayName: 'starsmurf', - webUrl: 'https://profile.theguardian.com/user/id/11547449', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11547449', - avatar: 'https://avatar.guim.co.uk/user/11547449', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11547449', - badge: [], - }, - }, - { - id: 138810369, - body: '

Correct. 112 is the international 999.

', - date: '09 March 2020 8:15pm', - isoDateTime: '2020-03-09T20:15:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810369', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810369', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809944', - isoDateTime: '2020-03-09T19:51:35Z', - date: '09 March 2020 7:51pm', - commentId: '138809944', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809944', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138810579, - body: '

In some countries there are real penalties for those who should be self isolating actually putting others at risk

UK criminal code classifies knowingly infecting someone with a potentially lethal disease as GBH. It is a criminal record offence with a maximum jail term of 50 years.

', - date: '09 March 2020 8:26pm', - isoDateTime: '2020-03-09T20:26:10Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810579', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810579', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'BabylonianSheDevil03', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809356', - isoDateTime: '2020-03-09T19:16:35Z', - date: '09 March 2020 7:16pm', - commentId: '138809356', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809356', - }, - userProfile: { - userId: '17596616', - displayName: 'kotbegemotuk', - webUrl: 'https://profile.theguardian.com/user/id/17596616', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17596616', - avatar: 'https://avatar.guim.co.uk/user/17596616', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17596616', - badge: [], - }, - }, - { - id: 138810657, - body: '

Penalise the employers or benefit agency then. We have a culture of people being exposed to drag themselves into work off their death beds.

', - date: '09 March 2020 8:30pm', - isoDateTime: '2020-03-09T20:30:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810657', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810657', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'BabylonianSheDevil03', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809356', - isoDateTime: '2020-03-09T19:16:35Z', - date: '09 March 2020 7:16pm', - commentId: '138809356', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809356', - }, - userProfile: { - userId: '100789525', - displayName: 'slimepants', - webUrl: 'https://profile.theguardian.com/user/id/100789525', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100789525', - avatar: 'https://avatar.guim.co.uk/user/100789525', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100789525', - badge: [], - }, - }, - { - id: 138810871, - body: '

It is a criminal record offence with a maximum jail term of 50 years.

Missed the "." - 5.0 years.

If it leads to death, it is manslaughter, that a nice 8.0.

', - date: '09 March 2020 8:42pm', - isoDateTime: '2020-03-09T20:42:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810871', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810871', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'kotbegemotuk', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810579', - isoDateTime: '2020-03-09T20:26:10Z', - date: '09 March 2020 8:26pm', - commentId: '138810579', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810579', - }, - userProfile: { - userId: '17596616', - displayName: 'kotbegemotuk', - webUrl: 'https://profile.theguardian.com/user/id/17596616', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17596616', - avatar: 'https://avatar.guim.co.uk/user/17596616', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17596616', - badge: [], - }, - }, - { - id: 138811012, - body: "

112 is the standard emergency number for GSM mobile phones worldwide.

I've never tried it from a landline.

", - date: '09 March 2020 8:49pm', - isoDateTime: '2020-03-09T20:49:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811012', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811012', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'justamentalpatient', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810369', - isoDateTime: '2020-03-09T20:15:08Z', - date: '09 March 2020 8:15pm', - commentId: '138810369', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810369', - }, - userProfile: { - userId: '3664141', - displayName: 'Karl1976', - webUrl: 'https://profile.theguardian.com/user/id/3664141', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3664141', - avatar: 'https://avatar.guim.co.uk/user/3664141', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3664141', - badge: [], - }, - }, - { - id: 138811045, - body: '

Would also love to penalise employers, benefits agencies, believe me, and right now the government should be announcing that employers or benefit agencies insisting that employees turn up for work when feeling ill will be punished for endangering the lives of others. Bottom line, people are dying and there will more.

', - date: '09 March 2020 8:51pm', - isoDateTime: '2020-03-09T20:51:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811045', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811045', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'slimepants', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810657', - isoDateTime: '2020-03-09T20:30:05Z', - date: '09 March 2020 8:30pm', - commentId: '138810657', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810657', - }, - userProfile: { - userId: '14293232', - displayName: 'BabylonianSheDevil03', - webUrl: 'https://profile.theguardian.com/user/id/14293232', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14293232', - avatar: 'https://avatar.guim.co.uk/user/14293232', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14293232', - badge: [], - }, - }, - { - id: 138811160, - body: '

I have once rung 111. The number was chosen to reflect the number of times most people want to ring them: once. A non-medical call handler went through a vast number of questions: not fun when you are in severe pain and worried. A service I hope never to use again.

', - date: '09 March 2020 8:57pm', - isoDateTime: '2020-03-09T20:57:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811160', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811160', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '761674', - displayName: 'MatthewHenson', - webUrl: 'https://profile.theguardian.com/user/id/761674', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/761674', - avatar: 'https://avatar.guim.co.uk/user/761674', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/761674', - badge: [], - }, - }, - { - id: 138811218, - body: '

I think it also works on landlines in most of Europe. But not sure.

', - date: '09 March 2020 9:00pm', - isoDateTime: '2020-03-09T21:00:45Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811218', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811218', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'Karl1976', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811012', - isoDateTime: '2020-03-09T20:49:11Z', - date: '09 March 2020 8:49pm', - commentId: '138811012', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811012', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138811434, - body: "

Or call 111 and get advice? One Saturday afternoon I developed a pain in my left side. It got so bad that I took my daughter's advice and phoned 111. (I didn't want to bother anyone on a Saturday.)
After answering a series of questions I was advised to go to the walk-in GP centre or the GP unit at the hospital. I chose the GP unit at the hospital and was given an appointment for 2 hours later. The GP saw me on time, told me I had a kidney stone and sent me to A&E on the same site. Within 3 hours I'd had morphine, a CT scan and was admitted. Things got complicated and I spent a week in hospital. I have no complaints - only gratitude.

", - date: '09 March 2020 9:12pm', - isoDateTime: '2020-03-09T21:12:41Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811434', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811434', - numRecommends: 21, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809757', - isoDateTime: '2020-03-09T19:40:22Z', - date: '09 March 2020 7:40pm', - commentId: '138809757', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809757', - }, - userProfile: { - userId: '2590067', - displayName: 'normaleila', - webUrl: 'https://profile.theguardian.com/user/id/2590067', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2590067', - avatar: 'https://avatar.guim.co.uk/user/2590067', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2590067', - badge: [], - }, - }, - { - id: 138811707, - body: '

Nonsense! 111 provides a good service.

', - date: '09 March 2020 9:25pm', - isoDateTime: '2020-03-09T21:25:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811707', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811707', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809402', - isoDateTime: '2020-03-09T19:19:20Z', - date: '09 March 2020 7:19pm', - commentId: '138809402', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809402', - }, - userProfile: { - userId: '16300334', - displayName: 'MaggieMaggieB', - webUrl: 'https://profile.theguardian.com/user/id/16300334', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16300334', - avatar: 'https://avatar.guim.co.uk/user/16300334', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16300334', - badge: [], - }, - }, - { - id: 138811763, - body: '

Paranoia will help.

Actually you are correct: if everyone washes their hands all the time thanks to paranoia and people self-isolate out of panic, the spread will be reduced enormously.

I urge everyone to be paranoid.

', - date: '09 March 2020 9:27pm', - isoDateTime: '2020-03-09T21:27:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811763', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811763', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'philipphilip99', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809835', - isoDateTime: '2020-03-09T19:45:20Z', - date: '09 March 2020 7:45pm', - commentId: '138809835', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809835', - }, - userProfile: { - userId: '10807524', - displayName: 'RazorUser', - webUrl: 'https://profile.theguardian.com/user/id/10807524', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10807524', - avatar: 'https://avatar.guim.co.uk/user/10807524', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10807524', - badge: [], - }, - }, - ], - metaData: { - commentCount: 28, - staffCommenterCount: 0, - editorsPickCount: 1, - blockedCount: 0, - responseCount: 27, - }, - }, - { - id: 138809363, - body: '

nonsense...the last thing you need is the NHS.
everyone believing they should be looked after and turning up to hospitals regardless.
look at how people are looting the shops - not a thought that if there isnt enough soap for evryone, it spreads.

This is a period for stoic agency. The NHS is the complete opposite.

', - date: '09 March 2020 7:16pm', - isoDateTime: '2020-03-09T19:16:53Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809363', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809363', - numRecommends: 13, - isHighlighted: false, - userProfile: { - userId: '15275664', - displayName: 'Brainingtree', - webUrl: 'https://profile.theguardian.com/user/id/15275664', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15275664', - avatar: 'https://avatar.guim.co.uk/user/15275664', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/15275664', - badge: [], - }, - responses: [ - { - id: 138809459, - body: "

Sorry I don't understand. You're saying if people are ill they should not go and see a doctor as that will make them worse? Is that some sort of joke?

", - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:37Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809459', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809459', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'Brainingtree', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809363', - isoDateTime: '2020-03-09T19:16:53Z', - date: '09 March 2020 7:16pm', - commentId: '138809363', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809363', - }, - userProfile: { - userId: '17406124', - displayName: 'Jabo4523', - webUrl: 'https://profile.theguardian.com/user/id/17406124', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17406124', - avatar: 'https://avatar.guim.co.uk/user/17406124', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17406124', - badge: [], - }, - }, - { - id: 138809683, - body: '

There has been looting? Where?

', - date: '09 March 2020 7:36pm', - isoDateTime: '2020-03-09T19:36:14Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809683', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809683', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'Brainingtree', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809363', - isoDateTime: '2020-03-09T19:16:53Z', - date: '09 March 2020 7:16pm', - commentId: '138809363', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809363', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809806, - body: '

The DWP budget for helping those in need has been looted

', - date: '09 March 2020 7:43pm', - isoDateTime: '2020-03-09T19:43:27Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809806', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809806', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'justamentalpatient', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809683', - isoDateTime: '2020-03-09T19:36:14Z', - date: '09 March 2020 7:36pm', - commentId: '138809683', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809683', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138809941, - body: '

So rather than a national health service, you believe a cure-all for medical conditions is stoicism?

', - date: '09 March 2020 7:51pm', - isoDateTime: '2020-03-09T19:51:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809941', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809941', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'Brainingtree', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809363', - isoDateTime: '2020-03-09T19:16:53Z', - date: '09 March 2020 7:16pm', - commentId: '138809363', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809363', - }, - userProfile: { - userId: '1330048', - displayName: 'JekyllMoon', - webUrl: 'https://profile.theguardian.com/user/id/1330048', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1330048', - avatar: 'https://avatar.guim.co.uk/user/1330048', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/1330048', - badge: [], - }, - }, - { - id: 138810130, - body: '

The advice is to self isolate. Not to go into seek medical care at hospitals because of contagion.
It’s hilarious you didn’t know that considering your position

', - date: '09 March 2020 8:02pm', - isoDateTime: '2020-03-09T20:02:10Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810130', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810130', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'Jabo4523', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809459', - isoDateTime: '2020-03-09T19:22:37Z', - date: '09 March 2020 7:22pm', - commentId: '138809459', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809459', - }, - userProfile: { - userId: '15275664', - displayName: 'Brainingtree', - webUrl: 'https://profile.theguardian.com/user/id/15275664', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15275664', - avatar: 'https://avatar.guim.co.uk/user/15275664', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15275664', - badge: [], - }, - }, - { - id: 138810207, - body: "

How long have we been telling people that a five week wait for UC is no good for people on low incomes?
Even now, with so many in the gig economy at risk of contracting and spreading Covid-19, UKGOV still doesn't fucking get it!

", - date: '09 March 2020 8:07pm', - isoDateTime: '2020-03-09T20:07:00Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810207', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810207', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809806', - isoDateTime: '2020-03-09T19:43:27Z', - date: '09 March 2020 7:43pm', - commentId: '138809806', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809806', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138810327, - body: '

This is a period of self care and personal responsibility.
The nhs is finite. Now we will really experience that. After we might ask whether we could look after ourselves better.
We are not the wartime generation. The opposite in fact. But This is going to be a brutal wake up call and a defining moment for our country.
Either we deal with it or destroy each other and the nhs by demanding it save us.

', - date: '09 March 2020 8:13pm', - isoDateTime: '2020-03-09T20:13:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810327', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810327', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'JekyllMoon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809941', - isoDateTime: '2020-03-09T19:51:23Z', - date: '09 March 2020 7:51pm', - commentId: '138809941', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809941', - }, - userProfile: { - userId: '15275664', - displayName: 'Brainingtree', - webUrl: 'https://profile.theguardian.com/user/id/15275664', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15275664', - avatar: 'https://avatar.guim.co.uk/user/15275664', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15275664', - badge: [], - }, - }, - { - id: 138810353, - body: '

They should just use their trust fund, duh common sense ™

', - date: '09 March 2020 8:14pm', - isoDateTime: '2020-03-09T20:14:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810353', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810353', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'justamentalpatient', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810207', - isoDateTime: '2020-03-09T20:07:00Z', - date: '09 March 2020 8:07pm', - commentId: '138810207', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810207', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138810392, - body: '

If people have the symptoms, they should call 111.

', - date: '09 March 2020 8:16pm', - isoDateTime: '2020-03-09T20:16:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810392', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810392', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'Jabo4523', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809459', - isoDateTime: '2020-03-09T19:22:37Z', - date: '09 March 2020 7:22pm', - commentId: '138809459', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809459', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138810438, - body: '

Must be male.

', - date: '09 March 2020 8:19pm', - isoDateTime: '2020-03-09T20:19:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810438', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810438', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'JekyllMoon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809941', - isoDateTime: '2020-03-09T19:51:23Z', - date: '09 March 2020 7:51pm', - commentId: '138809941', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809941', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810440, - body: '

Are you feeling ok?

', - date: '09 March 2020 8:19pm', - isoDateTime: '2020-03-09T20:19:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810440', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810440', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'Brainingtree', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809363', - isoDateTime: '2020-03-09T19:16:53Z', - date: '09 March 2020 7:16pm', - commentId: '138809363', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809363', - }, - userProfile: { - userId: '15739675', - displayName: 'establishmentlies', - webUrl: 'https://profile.theguardian.com/user/id/15739675', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15739675', - avatar: 'https://avatar.guim.co.uk/user/15739675', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15739675', - badge: [], - }, - }, - { - id: 138810587, - body: '

How many spare icu beds are free in the Uk?

', - date: '09 March 2020 8:26pm', - isoDateTime: '2020-03-09T20:26:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810587', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810587', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'establishmentlies', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810440', - isoDateTime: '2020-03-09T20:19:15Z', - date: '09 March 2020 8:19pm', - commentId: '138810440', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810440', - }, - userProfile: { - userId: '15275664', - displayName: 'Brainingtree', - webUrl: 'https://profile.theguardian.com/user/id/15275664', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15275664', - avatar: 'https://avatar.guim.co.uk/user/15275664', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15275664', - badge: [], - }, - }, - { - id: 138810729, - body: "

not a thought that if there isnt enough soap for evryone, it spreads.

It is still rational to stock up, since one person's actions will have little effect on the total position.

", - date: '09 March 2020 8:34pm', - isoDateTime: '2020-03-09T20:34:25Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810729', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810729', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Brainingtree', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809363', - isoDateTime: '2020-03-09T19:16:53Z', - date: '09 March 2020 7:16pm', - commentId: '138809363', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809363', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - ], - metaData: { - commentCount: 14, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 13, - }, - }, - { - id: 138809368, - body: '

Short staffed NHS, perhaps the health of the nation should be addressed more seriously on every level than just getting in staff to shore up those who become ill from poor quality life styles. Walk more, eat less, try harder, learn how to be healthy, meditate, stress less, quit boozing, quit meat, quit sugars and wheats. I see at my local surgery people who are unfit and still under 10 years old. We do not need more healthcare we need more health training.

', - date: '09 March 2020 7:17pm', - isoDateTime: '2020-03-09T19:17:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809368', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809368', - numRecommends: 10, - isHighlighted: false, - userProfile: { - userId: '16314139', - displayName: 'Harvestingkarma', - webUrl: 'https://profile.theguardian.com/user/id/16314139', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16314139', - avatar: 'https://avatar.guim.co.uk/user/16314139', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/16314139', - badge: [], - }, - responses: [ - { - id: 138809434, - body: '

Yep, if everyone helped themselves and took basic measures we would be in a lot better shape

', - date: '09 March 2020 7:21pm', - isoDateTime: '2020-03-09T19:21:04Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809434', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809434', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'Harvestingkarma', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809368', - isoDateTime: '2020-03-09T19:17:08Z', - date: '09 March 2020 7:17pm', - commentId: '138809368', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809368', - }, - userProfile: { - userId: '13093174', - displayName: 'Cricketnut', - webUrl: 'https://profile.theguardian.com/user/id/13093174', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13093174', - avatar: 'https://avatar.guim.co.uk/user/13093174', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13093174', - badge: [], - }, - }, - { - id: 138809700, - body: '

The coalition shoved public health onto LAs and then cut their budget.
Go figure.

', - date: '09 March 2020 7:37pm', - isoDateTime: '2020-03-09T19:37:24Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809700', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809700', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'Harvestingkarma', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809368', - isoDateTime: '2020-03-09T19:17:08Z', - date: '09 March 2020 7:17pm', - commentId: '138809368', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809368', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809878, - body: '

I agree with much of the above, but we need to deal with the matter in hand, namely the epidemic. Giving up wheat: why, unless one has an allergy to it? Sugars? We need carbs to fuel all that walking, running and cycling that you advocate. And to hell with giving up booze. Having a few pints or the odd glass of red is the only thing keeping us sane at the moment!

', - date: '09 March 2020 7:47pm', - isoDateTime: '2020-03-09T19:47:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809878', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809878', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'Harvestingkarma', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809368', - isoDateTime: '2020-03-09T19:17:08Z', - date: '09 March 2020 7:17pm', - commentId: '138809368', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809368', - }, - userProfile: { - userId: '3067983', - displayName: 'ludachris', - webUrl: 'https://profile.theguardian.com/user/id/3067983', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3067983', - avatar: 'https://avatar.guim.co.uk/user/3067983', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3067983', - badge: [], - }, - }, - ], - metaData: { - commentCount: 4, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 3, - }, - }, - { - id: 138809372, - body: "

There is no effective treatment for Coronavirus. The best/only defence we currently have against it is our own immune systems. That's why makes this virus scary, if you have an underlying health condition there's not much that can be done to help you, regardless of whether your country's healthcare is free at point of use or not.

", - date: '09 March 2020 7:17pm', - isoDateTime: '2020-03-09T19:17:31Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809372', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809372', - numRecommends: 19, - isHighlighted: false, - userProfile: { - userId: '14495786', - displayName: 'Trumbledon', - webUrl: 'https://profile.theguardian.com/user/id/14495786', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14495786', - avatar: 'https://avatar.guim.co.uk/user/14495786', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14495786', - badge: [], - }, - responses: [ - { - id: 138809728, - body: "

Oh, I dunno. It's probably easier to monitor and allow people to self isolate if you aren't fucking charging people to get tested!

", - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809728', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809728', - numRecommends: 19, - isHighlighted: false, - responseTo: { - displayName: 'Trumbledon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809372', - isoDateTime: '2020-03-09T19:17:31Z', - date: '09 March 2020 7:17pm', - commentId: '138809372', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809372', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809814, - body: '

Oh please God, enough bullshit and bollocks. If you don’t know what you are talking about, then shut up.

', - date: '09 March 2020 7:43pm', - isoDateTime: '2020-03-09T19:43:55Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809814', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809814', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'Trumbledon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809372', - isoDateTime: '2020-03-09T19:17:31Z', - date: '09 March 2020 7:17pm', - commentId: '138809372', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809372', - }, - userProfile: { - userId: '3613711', - displayName: 'andrewcm', - webUrl: 'https://profile.theguardian.com/user/id/3613711', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3613711', - avatar: 'https://avatar.guim.co.uk/user/3613711', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3613711', - badge: [], - }, - }, - { - id: 138809872, - body: "

That's why makes this virus scary, if you have an underlying health condition there's not much that can be done to help you, regardless of whether your country's healthcare is free at point of use or not.

Tell me if you were living from a poverty level of income in the US and you came down with a headache and fever would and did not have the money to be able to get tested would you go and get a test or would you try and wait it out to see if you got better?

", - date: '09 March 2020 7:47pm', - isoDateTime: '2020-03-09T19:47:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809872', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809872', - numRecommends: 14, - isHighlighted: false, - responseTo: { - displayName: 'Trumbledon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809372', - isoDateTime: '2020-03-09T19:17:31Z', - date: '09 March 2020 7:17pm', - commentId: '138809372', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809372', - }, - userProfile: { - userId: '10085855', - displayName: 'bifess', - webUrl: 'https://profile.theguardian.com/user/id/10085855', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10085855', - avatar: 'https://avatar.guim.co.uk/user/10085855', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10085855', - badge: [], - }, - }, - { - id: 138810371, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 8:15pm', - isoDateTime: '2020-03-09T20:15:13Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810371', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810371', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'andrewcm', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809814', - isoDateTime: '2020-03-09T19:43:55Z', - date: '09 March 2020 7:43pm', - commentId: '138809814', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809814', - }, - userProfile: { - userId: '14495786', - displayName: 'Trumbledon', - webUrl: 'https://profile.theguardian.com/user/id/14495786', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14495786', - avatar: 'https://avatar.guim.co.uk/user/14495786', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14495786', - badge: [], - }, - }, - { - id: 138810481, - body: "

I would probably wait it out and see if I got better, which might result in fewer people becoming infected than would've been the case had I gone out to get tested and infected them.

I mean frankly, even though I live in the UK and have an NHS hospital ten minutes away, I'd still probably stay at home rather than going out to get tested. I'm in my 30s and in good health, the risk of me dying of Coronavirus is quite low - certainly relative to the risk of me thinking \"I'll go and get tested. Why not, as it's free?\" and infecting a bunch of vulnerable elderly people.

", - date: '09 March 2020 8:20pm', - isoDateTime: '2020-03-09T20:20:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810481', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810481', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'bifess', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809872', - isoDateTime: '2020-03-09T19:47:20Z', - date: '09 March 2020 7:47pm', - commentId: '138809872', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809872', - }, - userProfile: { - userId: '14495786', - displayName: 'Trumbledon', - webUrl: 'https://profile.theguardian.com/user/id/14495786', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14495786', - avatar: 'https://avatar.guim.co.uk/user/14495786', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14495786', - badge: [], - }, - }, - { - id: 138810664, - body: "

Which part of what I've said do you disagree with, leftist?

", - date: '09 March 2020 8:30pm', - isoDateTime: '2020-03-09T20:30:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810664', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810664', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'andrewcm', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809814', - isoDateTime: '2020-03-09T19:43:55Z', - date: '09 March 2020 7:43pm', - commentId: '138809814', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809814', - }, - userProfile: { - userId: '14495786', - displayName: 'Trumbledon', - webUrl: 'https://profile.theguardian.com/user/id/14495786', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14495786', - avatar: 'https://avatar.guim.co.uk/user/14495786', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14495786', - badge: [], - }, - }, - { - id: 138810672, - body: "

That's why makes this virus scary, if you have an underlying health condition there's not much that can be done to help you,

I reckon you'd be better off in intensive care than just in bed at home.

", - date: '09 March 2020 8:30pm', - isoDateTime: '2020-03-09T20:30:37Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810672', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810672', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'Trumbledon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809372', - isoDateTime: '2020-03-09T19:17:31Z', - date: '09 March 2020 7:17pm', - commentId: '138809372', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809372', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - { - id: 138810676, - body: '

And if you have to work to survive?

', - date: '09 March 2020 8:30pm', - isoDateTime: '2020-03-09T20:30:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810676', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810676', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Trumbledon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810481', - isoDateTime: '2020-03-09T20:20:56Z', - date: '09 March 2020 8:20pm', - commentId: '138810481', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810481', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138810929, - body: "

Hopefully the government will ensure you're provided for by means of forthcoming emergency legislation.

On this occasion, I feel relatively confident the government will in fact deliver. Failure to do so could be a political misstep on par with the Iraq war.

", - date: '09 March 2020 8:45pm', - isoDateTime: '2020-03-09T20:45:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810929', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810929', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'MadBloris', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810676', - isoDateTime: '2020-03-09T20:30:44Z', - date: '09 March 2020 8:30pm', - commentId: '138810676', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810676', - }, - userProfile: { - userId: '14495786', - displayName: 'Trumbledon', - webUrl: 'https://profile.theguardian.com/user/id/14495786', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14495786', - avatar: 'https://avatar.guim.co.uk/user/14495786', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14495786', - badge: [], - }, - }, - { - id: 138811035, - body: "

Maybe you're right but I can't see it.

My partner has already had to have a week off due to self isolation

", - date: '09 March 2020 8:50pm', - isoDateTime: '2020-03-09T20:50:45Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811035', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811035', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Trumbledon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810929', - isoDateTime: '2020-03-09T20:45:46Z', - date: '09 March 2020 8:45pm', - commentId: '138810929', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810929', - }, - userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11635482', - badge: [], - }, - }, - { - id: 138811150, - body: "

The virus leaves 20% of cases in need of some level of respiratory support, whether that be full-on artificial blood oxygenation or oxygen masks. That's a large number of people who, if the hospitals are overwhelmed and can't provide that care, may end up dying or suffering life-changing injuries. This death rate of 1 - 2% isn't handed down from god - our actions can change it.

", - date: '09 March 2020 8:57pm', - isoDateTime: '2020-03-09T20:57:25Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811150', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811150', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'Trumbledon', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809372', - isoDateTime: '2020-03-09T19:17:31Z', - date: '09 March 2020 7:17pm', - commentId: '138809372', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809372', - }, - userProfile: { - userId: '12611808', - displayName: 'Shortordercook', - webUrl: 'https://profile.theguardian.com/user/id/12611808', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12611808', - avatar: 'https://avatar.guim.co.uk/user/12611808', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12611808', - badge: [], - }, - }, - { - id: 138811178, - body: '

Oh please God, enough bullshit and bollocks. If you don’t know what you are talking about, then shut up.

Do you have a cure or an inoculation?

', - date: '09 March 2020 8:58pm', - isoDateTime: '2020-03-09T20:58:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811178', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811178', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'andrewcm', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809814', - isoDateTime: '2020-03-09T19:43:55Z', - date: '09 March 2020 7:43pm', - commentId: '138809814', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809814', - }, - userProfile: { - userId: '102190698', - displayName: 'Yoriks', - webUrl: 'https://profile.theguardian.com/user/id/102190698', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102190698', - avatar: 'https://avatar.guim.co.uk/user/102190698', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/102190698', - badge: [], - }, - }, - { - id: 138811721, - body: "

I'd imagine his cure/inoculation is probably to vote Labour

", - date: '09 March 2020 9:25pm', - isoDateTime: '2020-03-09T21:25:31Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811721', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811721', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'Yoriks', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811178', - isoDateTime: '2020-03-09T20:58:51Z', - date: '09 March 2020 8:58pm', - commentId: '138811178', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811178', - }, - userProfile: { - userId: '14495786', - displayName: 'Trumbledon', - webUrl: 'https://profile.theguardian.com/user/id/14495786', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14495786', - avatar: 'https://avatar.guim.co.uk/user/14495786', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14495786', - badge: [], - }, - }, - ], - metaData: { - commentCount: 14, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 1, - responseCount: 13, - }, - }, - { - id: 138809386, - body: '

Just a suggestion. Every member of NHS management should spend 30% of their day on caring for coronavirus patients. Should solve the staffing problem in 10 minutes.

', - date: '09 March 2020 7:18pm', - isoDateTime: '2020-03-09T19:18:29Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809386', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809386', - numRecommends: 19, - isHighlighted: false, - userProfile: { - userId: '14349188', - displayName: 'Sonderzug', - webUrl: 'https://profile.theguardian.com/user/id/14349188', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14349188', - avatar: 'https://avatar.guim.co.uk/user/14349188', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14349188', - badge: [], - }, - responses: [ - { - id: 138809451, - body: '

Please show your workings out!!

', - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:12Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809451', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809451', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'Sonderzug', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809386', - isoDateTime: '2020-03-09T19:18:29Z', - date: '09 March 2020 7:18pm', - commentId: '138809386', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809386', - }, - userProfile: { - userId: '102204439', - displayName: 'Oraclebyname', - webUrl: 'https://profile.theguardian.com/user/id/102204439', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102204439', - avatar: 'https://avatar.guim.co.uk/user/102204439', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/102204439', - badge: [], - }, - }, - { - id: 138809471, - body: "

Good idea. The last thing a hospital needs is someone knowing what's going on.

", - date: '09 March 2020 7:23pm', - isoDateTime: '2020-03-09T19:23:23Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809471', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809471', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'Sonderzug', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809386', - isoDateTime: '2020-03-09T19:18:29Z', - date: '09 March 2020 7:18pm', - commentId: '138809386', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809386', - }, - userProfile: { - userId: '2966817', - displayName: 'philipphilip99', - webUrl: 'https://profile.theguardian.com/user/id/2966817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2966817', - avatar: 'https://avatar.guim.co.uk/user/2966817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2966817', - badge: [], - }, - }, - { - id: 138809724, - body: "

Ridiculous. One of the NHS's biggest problem is lack of capable senior administrative staff.

As a comparative, an economically and commercially astute Finance Manager/Business Partner is offered a salary of £58K in the NHS - in the private sector, the base pay for this sort of role is around £80-£90K PLUS bonus.

Same with all support staff.

", - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:49Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809724', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809724', - numRecommends: 11, - isHighlighted: false, - responseTo: { - displayName: 'Sonderzug', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809386', - isoDateTime: '2020-03-09T19:18:29Z', - date: '09 March 2020 7:18pm', - commentId: '138809386', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809386', - }, - userProfile: { - userId: '4019545', - displayName: 'TheRedThreat', - webUrl: 'https://profile.theguardian.com/user/id/4019545', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4019545', - avatar: 'https://avatar.guim.co.uk/user/4019545', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4019545', - badge: [], - }, - }, - { - id: 138809743, - body: '

So even the unqualified administrators like my wife? What value would that have to the patients and how would the hospital run without a third of its staff (possibly more if they also get ill as they do not know how to protect themselves the way qualified staff do)?

Is there any value to your suggestion?

', - date: '09 March 2020 7:39pm', - isoDateTime: '2020-03-09T19:39:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809743', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809743', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'Sonderzug', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809386', - isoDateTime: '2020-03-09T19:18:29Z', - date: '09 March 2020 7:18pm', - commentId: '138809386', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809386', - }, - userProfile: { - userId: '3298302', - displayName: 'Swan17', - webUrl: 'https://profile.theguardian.com/user/id/3298302', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3298302', - avatar: 'https://avatar.guim.co.uk/user/3298302', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3298302', - badge: [], - }, - }, - { - id: 138810424, - body: "

Yes. Amateurs, that's the answer. We'll have no experts here!
But you probably don't realise that the NHS is less top heavy on the management front than most private companies.

", - date: '09 March 2020 8:18pm', - isoDateTime: '2020-03-09T20:18:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810424', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810424', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'Sonderzug', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809386', - isoDateTime: '2020-03-09T19:18:29Z', - date: '09 March 2020 7:18pm', - commentId: '138809386', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809386', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138810426, - body: "

As a % of the the workforce in the NHS, management make up about 6.5%
In private industry it's around 12%, nice try but massive fail... sorry.

", - date: '09 March 2020 8:18pm', - isoDateTime: '2020-03-09T20:18:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810426', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810426', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Sonderzug', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809386', - isoDateTime: '2020-03-09T19:18:29Z', - date: '09 March 2020 7:18pm', - commentId: '138809386', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809386', - }, - userProfile: { - userId: '15739675', - displayName: 'establishmentlies', - webUrl: 'https://profile.theguardian.com/user/id/15739675', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15739675', - avatar: 'https://avatar.guim.co.uk/user/15739675', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15739675', - badge: [], - }, - }, - ], - metaData: { - commentCount: 7, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 6, - }, - }, - { - id: 138809404, - body: '

A shocking must read thread. What’s really happening in northern Italy:
Silvia Stringhini
@silviast9
1/ I may be repeating myself, but I want to fight this sense of security that I see outside of the epicenters, as if nothing was going to happen "here". The media in Europe are reassuring, politicians are reassuring, while there\'s little to be reassured of. #COVID19 #coronavirus

https://twitter.com/silviast9/status/1236933818654896129

', - date: '09 March 2020 7:19pm', - isoDateTime: '2020-03-09T19:19:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809404', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809404', - numRecommends: 5, - isHighlighted: false, - userProfile: { - userId: '12561963', - displayName: 'foralltime', - webUrl: 'https://profile.theguardian.com/user/id/12561963', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12561963', - avatar: 'https://avatar.guim.co.uk/user/12561963', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/12561963', - badge: [], - }, - }, - { - id: 138809405, - body: "

The NHS will have to do as its the only healthcare model we have.

This article does not contribute anything to the argument that that model is the best model.

We'll see how Japan, Australia, Canada and the Swiss perform with their various models - none of whom have a state monopoly on healthcare.

", - date: '09 March 2020 7:19pm', - isoDateTime: '2020-03-09T19:19:37Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809405', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809405', - numRecommends: 34, - isHighlighted: false, - userProfile: { - userId: '4019545', - displayName: 'TheRedThreat', - webUrl: 'https://profile.theguardian.com/user/id/4019545', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4019545', - avatar: 'https://avatar.guim.co.uk/user/4019545', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4019545', - badge: [], - }, - responses: [ - { - id: 138809622, - body: '

Agreed. Best defence? Well it’s all we have.

', - date: '09 March 2020 7:33pm', - isoDateTime: '2020-03-09T19:33:03Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809622', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809622', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'TheRedThreat', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809405', - isoDateTime: '2020-03-09T19:19:37Z', - date: '09 March 2020 7:19pm', - commentId: '138809405', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809405', - }, - userProfile: { - userId: '14853428', - displayName: 'vulgarius', - webUrl: 'https://profile.theguardian.com/user/id/14853428', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14853428', - avatar: 'https://avatar.guim.co.uk/user/14853428', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14853428', - badge: [], - }, - }, - { - id: 138811448, - body: "

you can't call anything owned and run by the state a monopoly. monopoly providers within the nhs such as the one jeremy hunt made his fortune from, yes.
the nhs itself NO.

", - date: '09 March 2020 9:13pm', - isoDateTime: '2020-03-09T21:13:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811448', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811448', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'TheRedThreat', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809405', - isoDateTime: '2020-03-09T19:19:37Z', - date: '09 March 2020 7:19pm', - commentId: '138809405', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809405', - }, - userProfile: { - userId: '10020201', - displayName: 'philmill', - webUrl: 'https://profile.theguardian.com/user/id/10020201', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10020201', - avatar: 'https://avatar.guim.co.uk/user/10020201', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10020201', - badge: [], - }, - }, - ], - metaData: { - commentCount: 3, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 2, - }, - }, - { - id: 138809408, - body: '

"Kasaraneni would “keep them in the NHS by paying off their student loans”.

So is this old Labour pledge to include ALL student loans, or just those in the medical profession?

', - date: '09 March 2020 7:19pm', - isoDateTime: '2020-03-09T19:19:44Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809408', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809408', - numRecommends: 13, - isHighlighted: false, - userProfile: { - userId: '101586975', - displayName: 'Asifbymagic', - webUrl: 'https://profile.theguardian.com/user/id/101586975', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101586975', - avatar: 'https://avatar.guim.co.uk/user/101586975', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/101586975', - badge: [], - }, - responses: [ - { - id: 138809532, - body: "

Maybe ask him that question when he's trying to stop you from dying from a collapsed respiratory system?

", - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:47Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809532', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809532', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'Asifbymagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809408', - isoDateTime: '2020-03-09T19:19:44Z', - date: '09 March 2020 7:19pm', - commentId: '138809408', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809408', - }, - userProfile: { - userId: '14622750', - displayName: 'hawkeye63', - webUrl: 'https://profile.theguardian.com/user/id/14622750', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14622750', - avatar: 'https://avatar.guim.co.uk/user/14622750', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14622750', - badge: [], - }, - }, - { - id: 138809621, - body: "

Not being an elderly person with serious underlying medical problems that's thankfully highly unlikely.

Now how about you answer my perfectly reasonable and serious question without being fatuous.

", - date: '09 March 2020 7:32pm', - isoDateTime: '2020-03-09T19:32:57Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809621', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809621', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'hawkeye63', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809532', - isoDateTime: '2020-03-09T19:27:47Z', - date: '09 March 2020 7:27pm', - commentId: '138809532', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809532', - }, - userProfile: { - userId: '101586975', - displayName: 'Asifbymagic', - webUrl: 'https://profile.theguardian.com/user/id/101586975', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101586975', - avatar: 'https://avatar.guim.co.uk/user/101586975', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101586975', - badge: [], - }, - }, - { - id: 138809775, - body: '

Would that pledge come with any conditions? I would support the idea if, for example, the medical staff agreed to work for the NHS exclusively for a period of time (5 or 10 years maybe).

', - date: '09 March 2020 7:41pm', - isoDateTime: '2020-03-09T19:41:30Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809775', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809775', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'Asifbymagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809408', - isoDateTime: '2020-03-09T19:19:44Z', - date: '09 March 2020 7:19pm', - commentId: '138809408', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809408', - }, - userProfile: { - userId: '3298302', - displayName: 'Swan17', - webUrl: 'https://profile.theguardian.com/user/id/3298302', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3298302', - avatar: 'https://avatar.guim.co.uk/user/3298302', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3298302', - badge: [], - }, - }, - { - id: 138810270, - body: "

I'd support that and suggest it could be extended to teachers too.

", - date: '09 March 2020 8:10pm', - isoDateTime: '2020-03-09T20:10:01Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810270', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810270', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'Swan17', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809775', - isoDateTime: '2020-03-09T19:41:30Z', - date: '09 March 2020 7:41pm', - commentId: '138809775', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809775', - }, - userProfile: { - userId: '101586975', - displayName: 'Asifbymagic', - webUrl: 'https://profile.theguardian.com/user/id/101586975', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101586975', - avatar: 'https://avatar.guim.co.uk/user/101586975', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101586975', - badge: [], - }, - }, - { - id: 138810551, - body: "

I thought you were asking Dr Kasaraneni. I have no idea what's in his head. I missed the bit of the article which outlined his political affiliations.

You alighted on that one statement in the article to write an asinine disguised push about Labour's election policies on student debt. Fatuous comments deserve a fatuous reply.

", - date: '09 March 2020 8:24pm', - isoDateTime: '2020-03-09T20:24:33Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810551', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810551', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'Asifbymagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809621', - isoDateTime: '2020-03-09T19:32:57Z', - date: '09 March 2020 7:32pm', - commentId: '138809621', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809621', - }, - userProfile: { - userId: '14622750', - displayName: 'hawkeye63', - webUrl: 'https://profile.theguardian.com/user/id/14622750', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14622750', - avatar: 'https://avatar.guim.co.uk/user/14622750', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14622750', - badge: [], - }, - }, - { - id: 138810732, - body: "

No it was an open question. Given that two paragraphs are devoted to the apparent importance and relevance of Dr Kadaraneni and his views and experiences, what's fatuous about requesting clarification of such a potentially contentious statement he's made?

", - date: '09 March 2020 8:34pm', - isoDateTime: '2020-03-09T20:34:40Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810732', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810732', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'hawkeye63', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810551', - isoDateTime: '2020-03-09T20:24:33Z', - date: '09 March 2020 8:24pm', - commentId: '138810551', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810551', - }, - userProfile: { - userId: '101586975', - displayName: 'Asifbymagic', - webUrl: 'https://profile.theguardian.com/user/id/101586975', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101586975', - avatar: 'https://avatar.guim.co.uk/user/101586975', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101586975', - badge: [], - }, - }, - { - id: 138810888, - body: "

I don't believe you. Sorry.

", - date: '09 March 2020 8:44pm', - isoDateTime: '2020-03-09T20:44:04Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810888', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810888', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'Asifbymagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810732', - isoDateTime: '2020-03-09T20:34:40Z', - date: '09 March 2020 8:34pm', - commentId: '138810732', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810732', - }, - userProfile: { - userId: '14622750', - displayName: 'hawkeye63', - webUrl: 'https://profile.theguardian.com/user/id/14622750', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14622750', - avatar: 'https://avatar.guim.co.uk/user/14622750', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14622750', - badge: [], - }, - }, - { - id: 138811036, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 8:50pm', - isoDateTime: '2020-03-09T20:50:48Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811036', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811036', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'hawkeye63', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810888', - isoDateTime: '2020-03-09T20:44:04Z', - date: '09 March 2020 8:44pm', - commentId: '138810888', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810888', - }, - userProfile: { - userId: '102190698', - displayName: 'Yoriks', - webUrl: 'https://profile.theguardian.com/user/id/102190698', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102190698', - avatar: 'https://avatar.guim.co.uk/user/102190698', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/102190698', - badge: [], - }, - }, - { - id: 138811309, - body: '

Depends how you define "highly unlikely". 20% of cases need some form of medical support for respiration ranging from oxygen masks to full-on intensive care. Even many of the 80% of "mild" cases will have pneumonia which, while not serious enough to get you a spot in hospital, will be enough to keep you in bed for up to a couple of weeks wishing you\'d never heard of coronavirus.

', - date: '09 March 2020 9:05pm', - isoDateTime: '2020-03-09T21:05:39Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811309', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811309', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'Asifbymagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809621', - isoDateTime: '2020-03-09T19:32:57Z', - date: '09 March 2020 7:32pm', - commentId: '138809621', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809621', - }, - userProfile: { - userId: '12611808', - displayName: 'Shortordercook', - webUrl: 'https://profile.theguardian.com/user/id/12611808', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12611808', - avatar: 'https://avatar.guim.co.uk/user/12611808', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12611808', - badge: [], - }, - }, - ], - metaData: { - commentCount: 10, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 1, - responseCount: 9, - }, - }, - { - id: 138809409, - body: "

Thankfully we aren't like the US where you can become bankrupt without health insurance. Thankfully we still have our nhs despite it being on the ropes caused by tory ideology. Can't blame the tory gov for coronavirus, but certainly for the effect they've had on our nhs. No doubt there will be heroic efforts made by staff working within it, which is about the only thing that keeps it going since the tories came to power in 2010.

", - date: '09 March 2020 7:19pm', - isoDateTime: '2020-03-09T19:19:48Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809409', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809409', - numRecommends: 40, - isHighlighted: false, - userProfile: { - userId: '10127231', - displayName: 'irreverentnurse', - webUrl: 'https://profile.theguardian.com/user/id/10127231', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10127231', - avatar: 'https://avatar.guim.co.uk/user/10127231', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10127231', - badge: [], - }, - }, - { - id: 138809421, - body: "

Stand by for the usual deluge of tory loving Brexiters. They just love Polly's nail on head articles.

", - date: '09 March 2020 7:20pm', - isoDateTime: '2020-03-09T19:20:33Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809421', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809421', - numRecommends: 39, - isHighlighted: false, - userProfile: { - userId: '16836085', - displayName: 'HammerJ', - webUrl: 'https://profile.theguardian.com/user/id/16836085', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16836085', - avatar: 'https://avatar.guim.co.uk/user/16836085', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/16836085', - badge: [], - }, - responses: [ - { - id: 138809736, - body: '

And how many of those per annum are we treated to?

', - date: '09 March 2020 7:39pm', - isoDateTime: '2020-03-09T19:39:22Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809736', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809736', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'HammerJ', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809421', - isoDateTime: '2020-03-09T19:20:33Z', - date: '09 March 2020 7:20pm', - commentId: '138809421', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809421', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138809741, - body: "

They're heeere...

", - date: '09 March 2020 7:39pm', - isoDateTime: '2020-03-09T19:39:41Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809741', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809741', - numRecommends: 21, - isHighlighted: false, - responseTo: { - displayName: 'HammerJ', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809421', - isoDateTime: '2020-03-09T19:20:33Z', - date: '09 March 2020 7:20pm', - commentId: '138809421', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809421', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809742, - body: "

There was a perfect opportunity there to comment on the NHS, the Tory's mismanagement of the NHS, the hardworking staff of the NHS...

Shame you chose not to do that, especially when there is so much to be said.

", - date: '09 March 2020 7:39pm', - isoDateTime: '2020-03-09T19:39:43Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809742', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809742', - numRecommends: 11, - isHighlighted: false, - responseTo: { - displayName: 'HammerJ', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809421', - isoDateTime: '2020-03-09T19:20:33Z', - date: '09 March 2020 7:20pm', - commentId: '138809421', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809421', - }, - userProfile: { - userId: '102241453', - displayName: 'HarryVederci', - webUrl: 'https://profile.theguardian.com/user/id/102241453', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102241453', - avatar: 'https://avatar.guim.co.uk/user/102241453', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/102241453', - badge: [], - }, - }, - ], - metaData: { - commentCount: 4, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 3, - }, - }, - { - id: 138809427, - body: '

So if Britain defeats the virus, it will be thanks to the NHS, but if not, it will be the fault of the government, have I understood correctly?

', - date: '09 March 2020 7:20pm', - isoDateTime: '2020-03-09T19:20:53Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809427', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - numRecommends: 51, - isHighlighted: false, - userProfile: { - userId: '15673053', - displayName: 'fordprefect100', - webUrl: 'https://profile.theguardian.com/user/id/15673053', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15673053', - avatar: 'https://avatar.guim.co.uk/user/15673053', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/15673053', - badge: [], - }, - responses: [ - { - id: 138809469, - body: "

Britain won't defeat the virus. Britain will pay a high price. For it's underfunded NHS.

", - date: '09 March 2020 7:23pm', - isoDateTime: '2020-03-09T19:23:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809469', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809469', - numRecommends: 49, - isHighlighted: false, - responseTo: { - displayName: 'fordprefect100', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - isoDateTime: '2020-03-09T19:20:53Z', - date: '09 March 2020 7:20pm', - commentId: '138809427', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809427', - }, - userProfile: { - userId: '100701140', - displayName: 'Arcais', - webUrl: 'https://profile.theguardian.com/user/id/100701140', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100701140', - avatar: 'https://avatar.guim.co.uk/user/100701140', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100701140', - badge: [], - }, - }, - { - id: 138809717, - body: "

It's not about defeating the virus...its about minimizing its effect. Unfortunately for all pro Tories, and all those in need of the health service, the NHS is in its worst state for decades which is a political choice.

", - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:32Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809717', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809717', - numRecommends: 38, - isHighlighted: false, - responseTo: { - displayName: 'fordprefect100', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - isoDateTime: '2020-03-09T19:20:53Z', - date: '09 March 2020 7:20pm', - commentId: '138809427', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809427', - }, - userProfile: { - userId: '12214978', - displayName: 'SeeLifeDifferently', - webUrl: 'https://profile.theguardian.com/user/id/12214978', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12214978', - avatar: 'https://avatar.guim.co.uk/user/12214978', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12214978', - badge: [], - }, - }, - { - id: 138809727, - body: '

Broadly speaking yes.

', - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809727', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809727', - numRecommends: 18, - isHighlighted: false, - responseTo: { - displayName: 'fordprefect100', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - isoDateTime: '2020-03-09T19:20:53Z', - date: '09 March 2020 7:20pm', - commentId: '138809427', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809427', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138809804, - body: '

Yes. Why is that so difficult to understand? NHS is staffed by heroes go are constantly running on empty and pulling a service out of thin air. If it collapses,it will not be the staff

', - date: '09 March 2020 7:43pm', - isoDateTime: '2020-03-09T19:43:17Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809804', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809804', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'fordprefect100', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - isoDateTime: '2020-03-09T19:20:53Z', - date: '09 March 2020 7:20pm', - commentId: '138809427', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809427', - }, - userProfile: { - userId: '12673774', - displayName: 'Jim987', - webUrl: 'https://profile.theguardian.com/user/id/12673774', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12673774', - avatar: 'https://avatar.guim.co.uk/user/12673774', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12673774', - badge: [], - }, - }, - { - id: 138809885, - body: "

So if Britain defeats the virus, it will be thanks to the NHS, but if not, it will be the fault of the government, have I understood correctly?

What's your argument exactly, that the NHS should be blamed for Coronavirus deaths?

", - date: '09 March 2020 7:47pm', - isoDateTime: '2020-03-09T19:47:55Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809885', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809885', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'fordprefect100', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - isoDateTime: '2020-03-09T19:20:53Z', - date: '09 March 2020 7:20pm', - commentId: '138809427', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809427', - }, - userProfile: { - userId: '101821137', - displayName: 'ScotchWoodcock', - webUrl: 'https://profile.theguardian.com/user/id/101821137', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101821137', - avatar: 'https://avatar.guim.co.uk/user/101821137', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101821137', - badge: [], - }, - }, - { - id: 138810236, - body: '

"So if Britain defeats the virus, it will be thanks to the NHS, but if not, it will be the fault of the government, have I understood correctly?"
Yep. I think that\'s about it.

', - date: '09 March 2020 8:08pm', - isoDateTime: '2020-03-09T20:08:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810236', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810236', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'fordprefect100', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - isoDateTime: '2020-03-09T19:20:53Z', - date: '09 March 2020 7:20pm', - commentId: '138809427', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809427', - }, - userProfile: { - userId: '2461954', - displayName: 'musubi', - webUrl: 'https://profile.theguardian.com/user/id/2461954', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2461954', - avatar: 'https://avatar.guim.co.uk/user/2461954', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2461954', - badge: [], - }, - }, - { - id: 138810756, - body: '

Makes sense, since the Govt. rations NHS resources.

', - date: '09 March 2020 8:35pm', - isoDateTime: '2020-03-09T20:35:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810756', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810756', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'fordprefect100', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809427', - isoDateTime: '2020-03-09T19:20:53Z', - date: '09 March 2020 7:20pm', - commentId: '138809427', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809427', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - { - id: 138811641, - body: '

No, my argument is that the situation is rather more complex than - NHS: saintly, must not be criticised; Tory government: evil, to blame for every ill.

', - date: '09 March 2020 9:21pm', - isoDateTime: '2020-03-09T21:21:31Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811641', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811641', - numRecommends: 18, - isHighlighted: false, - responseTo: { - displayName: 'ScotchWoodcock', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809885', - isoDateTime: '2020-03-09T19:47:55Z', - date: '09 March 2020 7:47pm', - commentId: '138809885', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809885', - }, - userProfile: { - userId: '15673053', - displayName: 'fordprefect100', - webUrl: 'https://profile.theguardian.com/user/id/15673053', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15673053', - avatar: 'https://avatar.guim.co.uk/user/15673053', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15673053', - badge: [], - }, - }, - ], - metaData: { - commentCount: 9, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 8, - }, - }, - { - id: 138809438, - body: '

Patriotic exhortations will not help. Just think of it - Lombardia hospitals, collapsing under stress of the epidemia, have five times more intensive care beds per head than the English NHS.

', - date: '09 March 2020 7:21pm', - isoDateTime: '2020-03-09T19:21:24Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809438', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809438', - numRecommends: 14, - isHighlighted: false, - userProfile: { - userId: '4532385', - displayName: 'ladyga', - webUrl: 'https://profile.theguardian.com/user/id/4532385', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4532385', - avatar: 'https://avatar.guim.co.uk/user/4532385', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4532385', - badge: [], - }, - }, - { - id: 138809450, - body: '

18 months ago my life was saved by the wonderful NHS and I will always be in their debt for their love and care. While in hospital I got a glimpse of the terrible state of things brought about as a deliberate choice by the Tories, who are always smirking at us. This latest incarnation us an insult to us all

', - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809450', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809450', - numRecommends: 89, - isHighlighted: false, - userProfile: { - userId: '12360820', - displayName: 'drragon', - webUrl: 'https://profile.theguardian.com/user/id/12360820', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12360820', - avatar: 'https://avatar.guim.co.uk/user/12360820', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/12360820', + userId: '10187427', + displayName: 'Jholder112233', + webUrl: 'https://profile.theguardian.com/user/id/10187427', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10187427', + avatar: 'https://avatar.guim.co.uk/user/10187427', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/10187427', badge: [], }, }, { - id: 138809456, - body: "

It's the best because it's the only one.

", - date: '09 March 2020 7:22pm', - isoDateTime: '2020-03-09T19:22:28Z', + id: 48058272, + body: '

beautiful colours.

', + date: '25 February 2015 2:37pm', + isoDateTime: '2015-02-25T14:37:51Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809456', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809456', - numRecommends: 1, + webUrl: 'https://discussion.theguardian.com/comment-permalink/48058272', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/48058272', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '15484688', - displayName: 'Kropotkin72', - webUrl: 'https://profile.theguardian.com/user/id/15484688', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15484688', - avatar: 'https://avatar.guim.co.uk/user/15484688', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/15484688', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809470, - body: "

I tried asking Alexa what I should do, she shut down and hasn't come back

", - date: '09 March 2020 7:23pm', - isoDateTime: '2020-03-09T19:23:23Z', + id: 48058400, + body: '

love this bird

', + date: '25 February 2015 2:41pm', + isoDateTime: '2015-02-25T14:41:31Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809470', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809470', - numRecommends: 11, + webUrl: 'https://discussion.theguardian.com/comment-permalink/48058400', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/48058400', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '11635482', - displayName: 'MadBloris', - webUrl: 'https://profile.theguardian.com/user/id/11635482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11635482', - avatar: 'https://avatar.guim.co.uk/user/11635482', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/11635482', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, - { - id: 138809476, - body: "

Germany has eight beds per 1,000 people , UK only 2.5.

Why is that? Well one reason is that with NHS and care funding in the UK ithere is complete lack of transparency. The money given to the health service and for care is entirely dependent on what politicians deem they should receive when it should really have nothing whatsoever to do with politics.

Compare NHS funding with the German (Bismarck) model whereby healthcare is funded by employee, employer and state contributions. Everyone has health insurance contributions taken out of their wages, salaries, pensions or unemployment benefits and this money, along with the employer's contribution, is paid into a state-approved health fund (Krankenkasse) of the contributor's own choice. This money can only be used for healthcare and absolutely nothing else. Care insurance is likewise also taken directly from wages, salaries, pensions or unemployment benefits and cannot be used for any other purpose but for care. Social insurance and tax are other, separate funds.

With the NHS model, national insurance is simply another tax which the government can, and does, spend as it pleases and on whatever it pleases such as roads, HS2, right to buy schemes, tax breaks for the rich etc. and the NHS is given whatever funding the government and the politicians feel they can get away with, and that is clearly wrong to everybody except some brainwashed Brits.

", - date: '09 March 2020 7:24pm', - isoDateTime: '2020-03-09T19:24:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809476', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809476', - numRecommends: 59, - isHighlighted: false, - userProfile: { - userId: '16708568', - displayName: 'SteveInBavaria', - webUrl: 'https://profile.theguardian.com/user/id/16708568', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16708568', - avatar: 'https://avatar.guim.co.uk/user/16708568', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/16708568', - badge: [], - }, - responses: [ - { - id: 138809503, - body: '

Germany spend way more per capita than uk

', - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:46Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809503', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809503', - numRecommends: 31, - isHighlighted: false, - responseTo: { - displayName: 'SteveInBavaria', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809476', - isoDateTime: '2020-03-09T19:24:05Z', - date: '09 March 2020 7:24pm', - commentId: '138809476', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809476', - }, - userProfile: { - userId: '12567954', - displayName: 'sausageweasel', - webUrl: 'https://profile.theguardian.com/user/id/12567954', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12567954', - avatar: 'https://avatar.guim.co.uk/user/12567954', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12567954', - badge: [], - }, - }, - { - id: 138809523, - body: '

“ With the NHS model, national insurance is simply another tax which the government can, and does, spend as it pleases and on whatever it pleases”

Utterly wrong, unfortunately. Good comment apart from that.

', - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:11Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809523', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809523', - numRecommends: 11, - isHighlighted: false, - responseTo: { - displayName: 'SteveInBavaria', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809476', - isoDateTime: '2020-03-09T19:24:05Z', - date: '09 March 2020 7:24pm', - commentId: '138809476', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809476', - }, - userProfile: { - userId: '17639802', - displayName: 'AstutiorTe', - webUrl: 'https://profile.theguardian.com/user/id/17639802', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17639802', - avatar: 'https://avatar.guim.co.uk/user/17639802', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17639802', - badge: [], - }, - }, - { - id: 138809528, - body: '

Well, looks like this could make some sense. !Way more" btw is about 20% more.

', - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809528', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809528', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'sausageweasel', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809503', - isoDateTime: '2020-03-09T19:25:46Z', - date: '09 March 2020 7:25pm', - commentId: '138809503', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809503', - }, - userProfile: { - userId: '100701140', - displayName: 'Arcais', - webUrl: 'https://profile.theguardian.com/user/id/100701140', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100701140', - avatar: 'https://avatar.guim.co.uk/user/100701140', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100701140', - badge: [], - }, - }, - { - id: 138809720, - body: '

The NHS is vastly underfunded compared to the German system. If we funded our NHS to the same level as the Germans we would have a vastly superior.

', - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:39Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809720', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809720', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'SteveInBavaria', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809476', - isoDateTime: '2020-03-09T19:24:05Z', - date: '09 March 2020 7:24pm', - commentId: '138809476', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809476', - }, - userProfile: { - userId: '12673774', - displayName: 'Jim987', - webUrl: 'https://profile.theguardian.com/user/id/12673774', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12673774', - avatar: 'https://avatar.guim.co.uk/user/12673774', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12673774', - badge: [], - }, - }, - { - id: 138809750, - body: '

Germany spend way more per capita than uk

In Germany everyone has to pay Krankenkasse contributions, even pensioners. I recently started recieving my UK pension and have to pay a 7.3% out of it to the Krankenkasse for healthcare and a 3.3% for care insurance.

', - date: '09 March 2020 7:39pm', - isoDateTime: '2020-03-09T19:39:52Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809750', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809750', - numRecommends: 19, - isHighlighted: false, - responseTo: { - displayName: 'sausageweasel', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809503', - isoDateTime: '2020-03-09T19:25:46Z', - date: '09 March 2020 7:25pm', - commentId: '138809503', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809503', - }, - userProfile: { - userId: '16708568', - displayName: 'SteveInBavaria', - webUrl: 'https://profile.theguardian.com/user/id/16708568', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16708568', - avatar: 'https://avatar.guim.co.uk/user/16708568', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16708568', - badge: [], - }, - }, - { - id: 138809972, - body: "

''The money given to the health service and for care is entirely dependent on what politicians deem they should receive when it should really have nothing whatsoever to do with politics.''

Agree.

NHS and social care funding should be one and ringfenced.

", - date: '09 March 2020 7:53pm', - isoDateTime: '2020-03-09T19:53:25Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809972', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809972', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'SteveInBavaria', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809476', - isoDateTime: '2020-03-09T19:24:05Z', - date: '09 March 2020 7:24pm', - commentId: '138809476', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809476', - }, - userProfile: { - userId: '10127231', - displayName: 'irreverentnurse', - webUrl: 'https://profile.theguardian.com/user/id/10127231', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10127231', - avatar: 'https://avatar.guim.co.uk/user/10127231', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10127231', - badge: [], - }, - }, - { - id: 138810520, - body: '

S/he was Wrong De Jure, correct De Facto. The Govt. can "borrow" from the fund as it sees fit.

', - date: '09 March 2020 8:23pm', - isoDateTime: '2020-03-09T20:23:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810520', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810520', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'AstutiorTe', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809523', - isoDateTime: '2020-03-09T19:27:11Z', - date: '09 March 2020 7:27pm', - commentId: '138809523', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809523', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - { - id: 138810621, - body: '

more like 60% more https://data.oecd.org/healthres/health-spending.htm

', - date: '09 March 2020 8:28pm', - isoDateTime: '2020-03-09T20:28:15Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810621', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810621', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'Arcais', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809528', - isoDateTime: '2020-03-09T19:27:35Z', - date: '09 March 2020 7:27pm', - commentId: '138809528', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809528', - }, - userProfile: { - userId: '12567954', - displayName: 'sausageweasel', - webUrl: 'https://profile.theguardian.com/user/id/12567954', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12567954', - avatar: 'https://avatar.guim.co.uk/user/12567954', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12567954', - badge: [], - }, - }, - { - id: 138810751, - body: '

Nnope. True.

', - date: '09 March 2020 8:35pm', - isoDateTime: '2020-03-09T20:35:34Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810751', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810751', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'AstutiorTe', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809523', - isoDateTime: '2020-03-09T19:27:11Z', - date: '09 March 2020 7:27pm', - commentId: '138809523', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809523', - }, - userProfile: { - userId: '101530003', - displayName: 'Docklie', - webUrl: 'https://profile.theguardian.com/user/id/101530003', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101530003', - avatar: 'https://avatar.guim.co.uk/user/101530003', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101530003', - badge: [], - }, - }, - { - id: 138811386, - body: '

It also depends on the definition of an ICU bed - have a feeling it may be different. Also, threshold for referral is lower in Germany, whilst UK doctors are much less likely to refer to ITU.

', - date: '09 March 2020 9:09pm', - isoDateTime: '2020-03-09T21:09:26Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811386', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811386', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'SteveInBavaria', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809476', - isoDateTime: '2020-03-09T19:24:05Z', - date: '09 March 2020 7:24pm', - commentId: '138809476', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809476', - }, - userProfile: { - userId: '12132582', - displayName: 'fingerlickin', - webUrl: 'https://profile.theguardian.com/user/id/12132582', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12132582', - avatar: 'https://avatar.guim.co.uk/user/12132582', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12132582', - badge: [], - }, - }, - ], - metaData: { - commentCount: 11, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 10, + { + id: 49450704, + body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", + date: '25 March 2015 3:06pm', + isoDateTime: '2015-03-25T15:06:53Z', + status: 'blocked', + webUrl: 'https://discussion.theguardian.com/comment-permalink/49450704', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49450704', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809480, - body: '

Fear not. Cummings and his incel mates are working on an AI solution.

', - date: '09 March 2020 7:24pm', - isoDateTime: '2020-03-09T19:24:20Z', + id: 49505722, + body: '

Test from the API 1133942872

', + date: '26 March 2015 4:09pm', + isoDateTime: '2015-03-26T16:09:13Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809480', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809480', - numRecommends: 9, + webUrl: 'https://discussion.theguardian.com/comment-permalink/49505722', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49505722', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '15834048', - displayName: 'Pinkie123', - webUrl: 'https://profile.theguardian.com/user/id/15834048', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15834048', - avatar: 'https://avatar.guim.co.uk/user/15834048', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/15834048', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, - responses: [ - { - id: 138811504, - body: '

Any evidence that any of his mates are incels or is just a dig at geeks? Did it make you feel like one if the big kids?

', - date: '09 March 2020 9:16pm', - isoDateTime: '2020-03-09T21:16:09Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811504', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811504', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Pinkie123', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809480', - isoDateTime: '2020-03-09T19:24:20Z', - date: '09 March 2020 7:24pm', - commentId: '138809480', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809480', - }, - userProfile: { - userId: '102347730', - displayName: 'Donkeydoo', - webUrl: 'https://profile.theguardian.com/user/id/102347730', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102347730', - avatar: 'https://avatar.guim.co.uk/user/102347730', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/102347730', - badge: [], - }, - }, - { - id: 138811713, - body: '

Yarp.

', - date: '09 March 2020 9:25pm', - isoDateTime: '2020-03-09T21:25:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811713', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811713', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Donkeydoo', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811504', - isoDateTime: '2020-03-09T21:16:09Z', - date: '09 March 2020 9:16pm', - commentId: '138811504', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811504', - }, - userProfile: { - userId: '15834048', - displayName: 'Pinkie123', - webUrl: 'https://profile.theguardian.com/user/id/15834048', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15834048', - avatar: 'https://avatar.guim.co.uk/user/15834048', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15834048', - badge: [], - }, - }, - ], - metaData: { - commentCount: 3, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 2, + }, + { + id: 49773224, + body: '

Test from the API -2124514465

', + date: '01 April 2015 12:53pm', + isoDateTime: '2015-04-01T11:53:54Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/49773224', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49773224', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809485, - body: "

NHS inpatient beds operate at almost 100% capacity. In order for NHS to deal with any crisis requiring more inpatient treatment it has to discharge more patients and cancel elective procedures. As each year passes and each year brings new crises the NHS slowly deteriorates. As the NHS slowly deteriorates staff morale drops. As opportunities arise for staff to go elsewhere increases, vacancies increase. The NHS is being slowly wound down. Each new crisis is slightly worse than the last. It is already de rigueur to have top up / queue jumping (those cancelled elective procedures) health insurance for those who can afford it. Eventually like slowly boiling a frog the Tory plan will come to fruition. The NHS won't be there with universal healthcare for all and a lot of insurance companies will be quids in....

", - date: '09 March 2020 7:24pm', - isoDateTime: '2020-03-09T19:24:34Z', + id: 49828269, + body: '

Test from the API 2008701699

', + date: '02 April 2015 3:17pm', + isoDateTime: '2015-04-02T14:17:27Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809485', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809485', - numRecommends: 17, + webUrl: 'https://discussion.theguardian.com/comment-permalink/49828269', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49828269', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '14094571', - displayName: 'GuardianFodder', - webUrl: 'https://profile.theguardian.com/user/id/14094571', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14094571', - avatar: 'https://avatar.guim.co.uk/user/14094571', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14094571', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809498, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:25pm', - isoDateTime: '2020-03-09T19:25:39Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809498', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809498', + id: 49835646, + body: '

test post

', + date: '02 April 2015 5:53pm', + isoDateTime: '2015-04-02T16:53:22Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/49835646', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/49835646', numRecommends: 0, isHighlighted: false, userProfile: { - userId: '101763863', - displayName: 'DarthRaider', - webUrl: 'https://profile.theguardian.com/user/id/101763863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101763863', - avatar: 'https://avatar.guim.co.uk/user/101763863', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/101763863', + userId: '13068528', + displayName: 'User489362', + webUrl: 'https://profile.theguardian.com/user/id/13068528', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13068528', + avatar: 'https://avatar.guim.co.uk/user/13068528', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13068528', badge: [], }, }, { - id: 138809509, - body: '

Does any reasonably-sized country in the world run a health service that has sufficient beds for, say, 10% of the population? In the UK we would be looking at about 6 million. This problem is beyond the normal arguments of funding a health system.

', - date: '09 March 2020 7:26pm', - isoDateTime: '2020-03-09T19:26:06Z', + id: 50178110, + body: '

Test from the API 24995912

', + date: '09 April 2015 11:39am', + isoDateTime: '2015-04-09T10:39:28Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809509', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809509', - numRecommends: 51, + webUrl: 'https://discussion.theguardian.com/comment-permalink/50178110', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50178110', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '14756178', - displayName: 'hhowells', - webUrl: 'https://profile.theguardian.com/user/id/14756178', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14756178', - avatar: 'https://avatar.guim.co.uk/user/14756178', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14756178', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, - responses: [ - { - id: 138809557, - body: '

Record amounts spent on the bottomless pit . Just way too much demand and pressure under numbers of people.

', - date: '09 March 2020 7:29pm', - isoDateTime: '2020-03-09T19:29:00Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809557', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809557', - numRecommends: 23, - isHighlighted: false, - responseTo: { - displayName: 'hhowells', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809509', - isoDateTime: '2020-03-09T19:26:06Z', - date: '09 March 2020 7:26pm', - commentId: '138809509', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809509', - }, - userProfile: { - userId: '101763863', - displayName: 'DarthRaider', - webUrl: 'https://profile.theguardian.com/user/id/101763863', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101763863', - avatar: 'https://avatar.guim.co.uk/user/101763863', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101763863', - badge: [], - }, - }, - { - id: 138809602, - body: "

Enough of the bail out of bankers following 2008.

What's your take on the health situation?

", - date: '09 March 2020 7:31pm', - isoDateTime: '2020-03-09T19:31:41Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809602', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809602', - numRecommends: 52, - isHighlighted: false, - responseTo: { - displayName: 'DarthRaider', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809557', - isoDateTime: '2020-03-09T19:29:00Z', - date: '09 March 2020 7:29pm', - commentId: '138809557', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809557', - }, - userProfile: { - userId: '16332843', - displayName: 'dougmeyberry', - webUrl: 'https://profile.theguardian.com/user/id/16332843', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16332843', - avatar: 'https://avatar.guim.co.uk/user/16332843', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16332843', - badge: [], - }, - }, - { - id: 138809639, - body: "

Absolutely daft argument. The health service has been struggling over and beyond anything seen elsewhere in western Europe for at least 10 years. Other countries are indeed better equipped but obviously they'll struggle -- just not as much as UK. Understand now?!

", - date: '09 March 2020 7:34pm', - isoDateTime: '2020-03-09T19:34:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809639', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809639', - numRecommends: 36, - isHighlighted: false, - responseTo: { - displayName: 'hhowells', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809509', - isoDateTime: '2020-03-09T19:26:06Z', - date: '09 March 2020 7:26pm', - commentId: '138809509', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809509', - }, - userProfile: { - userId: '12214978', - displayName: 'SeeLifeDifferently', - webUrl: 'https://profile.theguardian.com/user/id/12214978', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12214978', - avatar: 'https://avatar.guim.co.uk/user/12214978', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12214978', - badge: [], - }, - }, - { - id: 138809658, - body: '

How does our beds per capita compare comparable countries?

', - date: '09 March 2020 7:35pm', - isoDateTime: '2020-03-09T19:35:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809658', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809658', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'DarthRaider', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809557', - isoDateTime: '2020-03-09T19:29:00Z', - date: '09 March 2020 7:29pm', - commentId: '138809557', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809557', - }, - userProfile: { - userId: '12673774', - displayName: 'Jim987', - webUrl: 'https://profile.theguardian.com/user/id/12673774', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12673774', - avatar: 'https://avatar.guim.co.uk/user/12673774', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12673774', - badge: [], - }, - }, - { - id: 138809692, - body: '

This problem is beyond the normal arguments of funding a health system.


Still...

Thanks to @Foralltime for having shared this earlier.

Number of hospital beds per 1,000 people:
JAP 13.5
RUS 8.05
GER 8.0
HUN 7.O2
CZE 6.63
POL 6.62
FRA 5.98
BEL 5.76
LUX 4.66
SWI 4.53
CHI 4.34
GRE 4.21
NOR 3.6
POR 3.39
NETH 3.32
FIN 3.28
ITA 3.18
SPA 2.97
IRE 2.96
USA 2.77
DEN 2.61
UK 2.54

Source: OECD

', - date: '09 March 2020 7:36pm', - isoDateTime: '2020-03-09T19:36:42Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809692', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809692', - numRecommends: 18, - isHighlighted: false, - responseTo: { - displayName: 'hhowells', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809509', - isoDateTime: '2020-03-09T19:26:06Z', - date: '09 March 2020 7:26pm', - commentId: '138809509', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809509', - }, - userProfile: { - userId: '18538747', - displayName: 'IfItsMagic', - webUrl: 'https://profile.theguardian.com/user/id/18538747', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18538747', - avatar: 'https://avatar.guim.co.uk/user/18538747', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18538747', - badge: [], - }, - }, - { - id: 138809769, - body: "

SO, about the same as The Guardian's promised land of Denmark then?

What's the problem here, other than other countries seemingly wasting money on more beds than Denmark, so anyone, needs?

Also, it's silly to focus on single metrics.

Would you rather catch Covid-19 here or in Russia? Apparently you'd prefer to be in Russia.

", - date: '09 March 2020 7:41pm', - isoDateTime: '2020-03-09T19:41:19Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809769', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809769', - numRecommends: 17, - isHighlighted: false, - responseTo: { - displayName: 'IfItsMagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809692', - isoDateTime: '2020-03-09T19:36:42Z', - date: '09 March 2020 7:36pm', - commentId: '138809692', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809692', - }, - userProfile: { - userId: '16022312', - displayName: 'Aloonatron', - webUrl: 'https://profile.theguardian.com/user/id/16022312', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16022312', - avatar: 'https://avatar.guim.co.uk/user/16022312', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16022312', - badge: [], - }, - }, - { - id: 138809791, - body: '

More like Daft Ada.

', - date: '09 March 2020 7:42pm', - isoDateTime: '2020-03-09T19:42:40Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809791', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809791', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'DarthRaider', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809557', - isoDateTime: '2020-03-09T19:29:00Z', - date: '09 March 2020 7:29pm', - commentId: '138809557', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809557', - }, - userProfile: { - userId: '10127231', - displayName: 'irreverentnurse', - webUrl: 'https://profile.theguardian.com/user/id/10127231', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10127231', - avatar: 'https://avatar.guim.co.uk/user/10127231', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10127231', - badge: [], - }, - }, - { - id: 138809831, - body: "

I do not disagree with the point you make. But do all these health care systems provide the same range of services? (I don't know).
And in 2010, after 13 years of Labour, there were 2.9 beds per 1000 people. It ain't just the Tories.

", - date: '09 March 2020 7:45pm', - isoDateTime: '2020-03-09T19:45:09Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809831', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809831', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'IfItsMagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809692', - isoDateTime: '2020-03-09T19:36:42Z', - date: '09 March 2020 7:36pm', - commentId: '138809692', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809692', - }, - userProfile: { - userId: '14756178', - displayName: 'hhowells', - webUrl: 'https://profile.theguardian.com/user/id/14756178', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14756178', - avatar: 'https://avatar.guim.co.uk/user/14756178', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14756178', - badge: [], - }, - }, - { - id: 138809858, - body: "

Also, it's silly to focus on single metrics.

Would you rather catch Covid-19 here or in Russia? Apparently you'd prefer to be in Russia.


I'm just sharing official figures.

Btw maybe Denmark has a solid system to cure people at home?

", - date: '09 March 2020 7:46pm', - isoDateTime: '2020-03-09T19:46:24Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809858', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809858', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'Aloonatron', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809769', - isoDateTime: '2020-03-09T19:41:19Z', - date: '09 March 2020 7:41pm', - commentId: '138809769', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809769', - }, - userProfile: { - userId: '18538747', - displayName: 'IfItsMagic', - webUrl: 'https://profile.theguardian.com/user/id/18538747', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18538747', - avatar: 'https://avatar.guim.co.uk/user/18538747', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18538747', - badge: [], - }, - }, - { - id: 138809908, - body: "

I do not disagree with the point you make.


I'm not making any point.", - date: '09 March 2020 7:49pm', - isoDateTime: '2020-03-09T19:49:04Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809908', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809908', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'hhowells', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809831', - isoDateTime: '2020-03-09T19:45:09Z', - date: '09 March 2020 7:45pm', - commentId: '138809831', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809831', - }, - userProfile: { - userId: '18538747', - displayName: 'IfItsMagic', - webUrl: 'https://profile.theguardian.com/user/id/18538747', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18538747', - avatar: 'https://avatar.guim.co.uk/user/18538747', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18538747', - badge: [], - }, - }, - { - id: 138809931, - body: "

What's the problem here, other than other countries seemingly wasting money on more beds than Denmark, so anyone, needs?


Wasting money? Could you expand?", - date: '09 March 2020 7:50pm', - isoDateTime: '2020-03-09T19:50:47Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809931', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809931', - numRecommends: 11, - isHighlighted: false, - responseTo: { - displayName: 'Aloonatron', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809769', - isoDateTime: '2020-03-09T19:41:19Z', - date: '09 March 2020 7:41pm', - commentId: '138809769', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809769', - }, - userProfile: { - userId: '18538747', - displayName: 'IfItsMagic', - webUrl: 'https://profile.theguardian.com/user/id/18538747', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18538747', - avatar: 'https://avatar.guim.co.uk/user/18538747', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18538747', - badge: [], - }, - }, - { - id: 138810201, - body: '

They are all bad if your metric of choice is whether they can count with a large-scale
epidemic.

', - date: '09 March 2020 8:06pm', - isoDateTime: '2020-03-09T20:06:38Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810201', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810201', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Jim987', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809658', - isoDateTime: '2020-03-09T19:35:05Z', - date: '09 March 2020 7:35pm', - commentId: '138809658', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809658', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810387, - body: '

UK almost the same as Denmark...ususally seen as a progressive socially aware country. I suspect raw numbers are not the full story.

', - date: '09 March 2020 8:16pm', - isoDateTime: '2020-03-09T20:16:16Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810387', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810387', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'IfItsMagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809692', - isoDateTime: '2020-03-09T19:36:42Z', - date: '09 March 2020 7:36pm', - commentId: '138809692', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809692', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - { - id: 138810416, - body: '

I suspect raw numbers are not the full story.


Indeed. Maybe Denmark has a solid system to cure people at home.', - date: '09 March 2020 8:17pm', - isoDateTime: '2020-03-09T20:17:41Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810416', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810416', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'ManuelSantiago', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810387', - isoDateTime: '2020-03-09T20:16:16Z', - date: '09 March 2020 8:16pm', - commentId: '138810387', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810387', - }, - userProfile: { - userId: '18538747', - displayName: 'IfItsMagic', - webUrl: 'https://profile.theguardian.com/user/id/18538747', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18538747', - avatar: 'https://avatar.guim.co.uk/user/18538747', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18538747', - badge: [], - }, - }, - { - id: 138810482, - body: '

Sticking my neck out I would say how much per capital spent would be an indicator of how successful they are at fighting Coronavirus

', - date: '09 March 2020 8:20pm', - isoDateTime: '2020-03-09T20:20:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810482', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810482', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810201', - isoDateTime: '2020-03-09T20:06:38Z', - date: '09 March 2020 8:06pm', - commentId: '138810201', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810201', - }, - userProfile: { - userId: '12673774', - displayName: 'Jim987', - webUrl: 'https://profile.theguardian.com/user/id/12673774', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12673774', - avatar: 'https://avatar.guim.co.uk/user/12673774', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12673774', - badge: [], - }, - }, - { - id: 138811550, - body: '

https://fullfact.org/health/do-we-have-fewer-hospital-beds-most-europe/

They say one reason for the low value in the UK is increased care in the community.

', - date: '09 March 2020 9:17pm', - isoDateTime: '2020-03-09T21:17:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811550', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811550', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'IfItsMagic', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810416', - isoDateTime: '2020-03-09T20:17:41Z', - date: '09 March 2020 8:17pm', - commentId: '138810416', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810416', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - { - id: 138811754, - body: '

Hmmm...

But thanks for the link :)

', - date: '09 March 2020 9:27pm', - isoDateTime: '2020-03-09T21:27:01Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811754', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811754', - numRecommends: 1, - isHighlighted: false, - responseTo: { - displayName: 'ManuelSantiago', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811550', - isoDateTime: '2020-03-09T21:17:56Z', - date: '09 March 2020 9:17pm', - commentId: '138811550', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811550', - }, - userProfile: { - userId: '18538747', - displayName: 'IfItsMagic', - webUrl: 'https://profile.theguardian.com/user/id/18538747', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18538747', - avatar: 'https://avatar.guim.co.uk/user/18538747', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18538747', - badge: [], - }, - }, - ], - metaData: { - commentCount: 18, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 17, + }, + { + id: 50185580, + body: '

Test from the API 1730167644

', + date: '09 April 2015 1:44pm', + isoDateTime: '2015-04-09T12:44:24Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/50185580', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50185580', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 50230774, + body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", + date: '10 April 2015 10:43am', + isoDateTime: '2015-04-10T09:43:27Z', + status: 'blocked', + webUrl: 'https://discussion.theguardian.com/comment-permalink/50230774', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50230774', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 50438395, + body: '

Test from the API 672270292

', + date: '14 April 2015 3:30pm', + isoDateTime: '2015-04-14T14:30:27Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/50438395', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50438395', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809512, - body: "

This is getting serious.
It's time to call on the odd bods and the misfits!!
It's time to call upon the super forecasters!!

", - date: '09 March 2020 7:26pm', - isoDateTime: '2020-03-09T19:26:14Z', + id: 50534761, + body: '

My favourite bird!

', + date: '16 April 2015 12:10pm', + isoDateTime: '2015-04-16T11:10:36Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809512', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809512', - numRecommends: 4, + webUrl: 'https://discussion.theguardian.com/comment-permalink/50534761', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50534761', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '102204439', - displayName: 'Oraclebyname', - webUrl: 'https://profile.theguardian.com/user/id/102204439', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102204439', - avatar: 'https://avatar.guim.co.uk/user/102204439', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/102204439', + userId: '14779990', + displayName: 'User461881', + webUrl: 'https://profile.theguardian.com/user/id/14779990', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14779990', + avatar: 'https://avatar.guim.co.uk/user/14779990', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14779990', badge: [], }, - responses: [ - { - id: 138811307, - body: "

It's time to call on the odd bods and the misfits!!
It's time to call upon the super forecasters!!


Could we maybe not call on the ones who defined nurses, physiotherapists etc as “unskilled workers” .", - date: '09 March 2020 9:05pm', - isoDateTime: '2020-03-09T21:05:33Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811307', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811307', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'Oraclebyname', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809512', - isoDateTime: '2020-03-09T19:26:14Z', - date: '09 March 2020 7:26pm', - commentId: '138809512', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809512', - }, - userProfile: { - userId: '101956088', - displayName: 'coultetscandi', - webUrl: 'https://profile.theguardian.com/user/id/101956088', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101956088', - avatar: 'https://avatar.guim.co.uk/user/101956088', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101956088', - badge: [], - }, - }, - ], - metaData: { - commentCount: 2, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 1, - }, }, { - id: 138809521, - body: '

Another change of tune. Make up your mind.

', - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:00Z', + id: 50540517, + body: '

Cool Broadbill

', + date: '16 April 2015 1:53pm', + isoDateTime: '2015-04-16T12:53:01Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809521', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809521', - numRecommends: 4, + webUrl: 'https://discussion.theguardian.com/comment-permalink/50540517', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50540517', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '14976192', - displayName: 'EbonyPericarp', - webUrl: 'https://profile.theguardian.com/user/id/14976192', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14976192', - avatar: 'https://avatar.guim.co.uk/user/14976192', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14976192', + userId: '14780375', + displayName: 'User435746', + webUrl: 'https://profile.theguardian.com/user/id/14780375', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14780375', + avatar: 'https://avatar.guim.co.uk/user/14780375', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14780375', badge: [], }, - responses: [ - { - id: 138809605, - body: '

At least she has a mind to make up.

', - date: '09 March 2020 7:31pm', - isoDateTime: '2020-03-09T19:31:47Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809605', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809605', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'EbonyPericarp', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809521', - isoDateTime: '2020-03-09T19:27:00Z', - date: '09 March 2020 7:27pm', - commentId: '138809521', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809521', - }, - userProfile: { - userId: '12214978', - displayName: 'SeeLifeDifferently', - webUrl: 'https://profile.theguardian.com/user/id/12214978', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12214978', - avatar: 'https://avatar.guim.co.uk/user/12214978', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12214978', - badge: [], - }, - }, - { - id: 138809722, - body: "

Or just makes things up and doesn't mind?

", - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:43Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809722', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809722', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'SeeLifeDifferently', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809605', - isoDateTime: '2020-03-09T19:31:47Z', - date: '09 March 2020 7:31pm', - commentId: '138809605', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809605', - }, - userProfile: { - userId: '16022312', - displayName: 'Aloonatron', - webUrl: 'https://profile.theguardian.com/user/id/16022312', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16022312', - avatar: 'https://avatar.guim.co.uk/user/16022312', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16022312', - badge: [], - }, - }, - { - id: 138809761, - body: '

So...please inform us all which things in particular Polly has made up?? Or are you blinded by prejudice?

', - date: '09 March 2020 7:40pm', - isoDateTime: '2020-03-09T19:40:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809761', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809761', - numRecommends: 14, - isHighlighted: false, - responseTo: { - displayName: 'Aloonatron', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809722', - isoDateTime: '2020-03-09T19:38:43Z', - date: '09 March 2020 7:38pm', - commentId: '138809722', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809722', - }, - userProfile: { - userId: '12214978', - displayName: 'SeeLifeDifferently', - webUrl: 'https://profile.theguardian.com/user/id/12214978', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12214978', - avatar: 'https://avatar.guim.co.uk/user/12214978', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12214978', - badge: [], - }, - }, - { - id: 138810190, - body: '

By definition it can’t be prejudice, unless you’re suggesting they’ve never read her articles. Subjectivity perhaps. Or, shock horror, even a little joke?
Examples are readily available in the archives of a misuse of statistics (try clicking the hyperlinks on a few of her articles, although she’s not as bad at this as Monbiot); human error would no doubt be the excuse there. Exaggeration aplenty too but at what point would you consider exaggeration becomes fabrication? Perhaps even for objective unprejudiced little you that depends on who wrote the price.

', - date: '09 March 2020 8:05pm', - isoDateTime: '2020-03-09T20:05:47Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810190', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810190', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'SeeLifeDifferently', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809761', - isoDateTime: '2020-03-09T19:40:36Z', - date: '09 March 2020 7:40pm', - commentId: '138809761', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809761', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810279, - body: "

What odds are you offering on didn't read the article? I'm in for a fiver.

", - date: '09 March 2020 8:10pm', - isoDateTime: '2020-03-09T20:10:30Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810279', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810279', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810190', - isoDateTime: '2020-03-09T20:05:47Z', - date: '09 March 2020 8:05pm', - commentId: '138810190', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810190', - }, - userProfile: { - userId: '11642858', - displayName: 'OrangeLagoon', - webUrl: 'https://profile.theguardian.com/user/id/11642858', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11642858', - avatar: 'https://avatar.guim.co.uk/user/11642858', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11642858', - badge: [], - }, - }, - { - id: 138810344, - body: '

Interpretations of data can be biased by prejudices held at the time of reading.

', - date: '09 March 2020 8:14pm', - isoDateTime: '2020-03-09T20:14:02Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810344', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810344', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810190', - isoDateTime: '2020-03-09T20:05:47Z', - date: '09 March 2020 8:05pm', - commentId: '138810190', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810190', - }, - userProfile: { - userId: '100548223', - displayName: 'ManuelSantiago', - webUrl: 'https://profile.theguardian.com/user/id/100548223', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100548223', - avatar: 'https://avatar.guim.co.uk/user/100548223', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/100548223', - badge: [], - }, - }, - ], - metaData: { - commentCount: 7, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 6, + }, + { + id: 50540563, + body: '

Cool broadbill

', + date: '16 April 2015 1:53pm', + isoDateTime: '2015-04-16T12:53:43Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/50540563', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50540563', + numRecommends: 1, + isHighlighted: false, + userProfile: { + userId: '14780375', + displayName: 'User435746', + webUrl: 'https://profile.theguardian.com/user/id/14780375', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14780375', + avatar: 'https://avatar.guim.co.uk/user/14780375', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14780375', + badge: [], }, }, { - id: 138809524, - body: "

I've tried hard to remain rational and circumspect but, as time passes, and we watch the epidemic/pandemic unfold, my anxiety levels are escalating.

In short, I'm becoming frightened.

I'm frightened by reports out of Italy indicating that Covid-19 has a higher mortality rate than we've been advised.

I'm frightened by data suggesting that roughly 10 percent of infected people will need ICU treatment.

I'm frightened that the risks to younger people appear more elevated than initially asserted.

Most of all, I'm frightened for my parents, who fit every category for elevated risk identified.

Leo Varadkar has announced sick pay levels roughly three times the rate of our own statutory sick pay. Furthermore, Varadkar's guaranteed this will be paid to all workers who fall ill.

Everywhere we look, leaders are taking more strident measures than the UK to protect their people.

We're going to need a Hurculean effort from our wonderful NHS staff, because I have little faith in our government. I'm so very grateful that our NHS staff are there.

", - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:29Z', + id: 50543198, + body: '

Nice bill!

', + date: '16 April 2015 2:44pm', + isoDateTime: '2015-04-16T13:44:21Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809524', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - numRecommends: 110, - isHighlighted: true, + webUrl: 'https://discussion.theguardian.com/comment-permalink/50543198', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50543198', + numRecommends: 1, + isHighlighted: false, userProfile: { - userId: '18080588', - displayName: 'Smolker', - webUrl: 'https://profile.theguardian.com/user/id/18080588', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18080588', - avatar: 'https://avatar.guim.co.uk/user/18080588', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/18080588', + userId: '14780616', + displayName: 'User727613', + webUrl: 'https://profile.theguardian.com/user/id/14780616', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14780616', + avatar: 'https://avatar.guim.co.uk/user/14780616', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14780616', badge: [], }, - responses: [ - { - id: 138809697, - body: '

Keep trying to remain rational; fear, and especially dwelling on it, doesn’t do any good.

', - date: '09 March 2020 7:37pm', - isoDateTime: '2020-03-09T19:37:04Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809697', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809697', - numRecommends: 36, - isHighlighted: false, - responseTo: { - displayName: 'Smolker', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - isoDateTime: '2020-03-09T19:27:29Z', - date: '09 March 2020 7:27pm', - commentId: '138809524', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809524', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810338, - body: '

On the bright side:
- Young people appear to be not very effected
- Most healthy people recover
- Even in Wuhan, only a small proportion of the population caught the illness (or lots more caught it, which means the death rate is lower)
- Local precautions can reduce the chance of catching the illness.

', - date: '09 March 2020 8:13pm', - isoDateTime: '2020-03-09T20:13:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810338', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810338', - numRecommends: 33, - isHighlighted: false, - responseTo: { - displayName: 'Smolker', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - isoDateTime: '2020-03-09T19:27:29Z', - date: '09 March 2020 7:27pm', - commentId: '138809524', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809524', - }, - userProfile: { - userId: '3578530', - displayName: 'EnviroCapitalist', - webUrl: 'https://profile.theguardian.com/user/id/3578530', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3578530', - avatar: 'https://avatar.guim.co.uk/user/3578530', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3578530', - badge: [], - }, - }, - { - id: 138810472, - body: '

I think people panicking too much are causing further problems unnecessarily. This virus is not that bad. Many people have already made full recovery.

', - date: '09 March 2020 8:20pm', - isoDateTime: '2020-03-09T20:20:34Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810472', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810472', - numRecommends: 25, - isHighlighted: false, - responseTo: { - displayName: 'Smolker', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - isoDateTime: '2020-03-09T19:27:29Z', - date: '09 March 2020 7:27pm', - commentId: '138809524', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809524', - }, - userProfile: { - userId: '17989970', - displayName: 'Omarvellous', - webUrl: 'https://profile.theguardian.com/user/id/17989970', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/17989970', - avatar: 'https://avatar.guim.co.uk/user/17989970', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/17989970', - badge: [], - }, - }, - { - id: 138810475, - body: "

Everywhere we look, leaders are taking more strident measures than the UK to protect their people.

Come to America, where our bloviated shitgibbon in chief's lies grow ever more delusional pathetic by the day and the guy he put in charge of overseeing the US's fight against the virus thinks you can pray away gay.

", - date: '09 March 2020 8:20pm', - isoDateTime: '2020-03-09T20:20:41Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810475', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810475', - numRecommends: 28, - isHighlighted: false, - responseTo: { - displayName: 'Smolker', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - isoDateTime: '2020-03-09T19:27:29Z', - date: '09 March 2020 7:27pm', - commentId: '138809524', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809524', - }, - userProfile: { - userId: '10936148', - displayName: 'ObstreperousRabbit', - webUrl: 'https://profile.theguardian.com/user/id/10936148', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10936148', - avatar: 'https://avatar.guim.co.uk/user/10936148', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10936148', - badge: [], - }, - }, - { - id: 138810521, - body: "

I think dwelling on it for as long as you need to to make a plan does do good. The only way you can face this is by looking at the risks you can mitigate (not those you can't) and working out a plan for dealing with them.

How can you protect your parents, what can you do for them, arrange for them? What are their thoughts about how to protect themselves? What matters, and what doesn't?

People should probably start to re-think their lives and responsibilities in an ordered way, and in the context of a post-Covid landscape.

For instance, if you miss your rent, mortgage, council tax, because you need to pay for food and utility bills, you will only be the same as millions of others. So focus on having enough money for bare essentials, because the banks and councils won't even have the staff to chase you and the millions of others. Not to say you won't pay your way in the end, but leave it til after the whole thing has died down - don't stress about it and force yourself into an unsafe work scenario, or put your parents at risk by keeping yourself on the hamster wheel.

It looks like we will end up having a break from capitalism, economics - everything we know. So focus on staying alive. Take your kids out of school when you feel the risk of them bringing something home is greater than the benefit of their education. Don't wait for the school to close - choose your moment. Do what feels right - nobody will blame you.

Fear comes from thinking that you have no control over the situation, so take control, and prepare to step outside the bounds of how we normally do things. Make your own plan.

", - date: '09 March 2020 8:23pm', - isoDateTime: '2020-03-09T20:23:17Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810521', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810521', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'Smolker', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - isoDateTime: '2020-03-09T19:27:29Z', - date: '09 March 2020 7:27pm', - commentId: '138809524', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809524', - }, - userProfile: { - userId: '10340595', - displayName: 'ValerieSelden', - webUrl: 'https://profile.theguardian.com/user/id/10340595', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10340595', - avatar: 'https://avatar.guim.co.uk/user/10340595', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10340595', - badge: [], - }, - }, - { - id: 138810542, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 8:24pm', - isoDateTime: '2020-03-09T20:24:00Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810542', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810542', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'ObstreperousRabbit', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810475', - isoDateTime: '2020-03-09T20:20:41Z', - date: '09 March 2020 8:20pm', - commentId: '138810475', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810475', - }, - userProfile: { - userId: '10936148', - displayName: 'ObstreperousRabbit', - webUrl: 'https://profile.theguardian.com/user/id/10936148', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10936148', - avatar: 'https://avatar.guim.co.uk/user/10936148', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/10936148', - badge: [], - }, - }, - { - id: 138810741, - body: '

Good advice thank you.

', - date: '09 March 2020 8:35pm', - isoDateTime: '2020-03-09T20:35:09Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810741', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810741', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'ValerieSelden', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810521', - isoDateTime: '2020-03-09T20:23:17Z', - date: '09 March 2020 8:23pm', - commentId: '138810521', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810521', - }, - userProfile: { - userId: '101509753', - displayName: 'PatMc1984', - webUrl: 'https://profile.theguardian.com/user/id/101509753', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101509753', - avatar: 'https://avatar.guim.co.uk/user/101509753', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101509753', - badge: [], - }, - }, - { - id: 138810812, - body: "

Fear comes from thinking that you have no control over the situation

Thanks for your considered post.

I think the level of control we have is limited. We can take some measures but, in truth, it's a game of roulette.

In extremis I could lock down for 3-4 months and completely self-isolate. That makes me more fortunate then most, perhaps.

I'd likely have no job afterwards. Even then there would be no guarantee I'd avoid exposure and infection. Moreover, locking down for 3-4 months would do nothing to help my parents, or my disabled brother.

Looking out for (and after) each other is probably the best we can do, particularly since we can't rely on government to place people before capital interests. That's what lies behind government inaction.

", - date: '09 March 2020 8:38pm', - isoDateTime: '2020-03-09T20:38:55Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810812', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810812', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'ValerieSelden', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810521', - isoDateTime: '2020-03-09T20:23:17Z', - date: '09 March 2020 8:23pm', - commentId: '138810521', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810521', - }, - userProfile: { - userId: '18080588', - displayName: 'Smolker', - webUrl: 'https://profile.theguardian.com/user/id/18080588', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18080588', - avatar: 'https://avatar.guim.co.uk/user/18080588', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/18080588', - badge: [], - }, - }, - { - id: 138811215, - body: '

It is entirely rational to be afraid. Smolker has touched— with impeccable clarity — on several good reasons to be afraid. This level of articulacy, it does help people think straight, instead of feeling an inchoate dread every time we hear the word “virus” or hear a cough. It helps us think through the issues and think before we respond, instead of rushing outto buy a hundred rolls of bogpaper or Pay £25 for a bottle of alcohol gel that is less effective than a dod of Fairy Liquid and a bottle of water over the gutter in the supermarket car park.

Smolker identified fears that are in a sense irreducible and fears that we can take action, not to merely assuage, but to make ourselves as individuals and as a society safer.

The paltry, and in about a fifth of cases non-existent, statutory sick pay, for example: less than £100 a week, or zilch, for the nation’s commuter-conveyors, providers of food and shovellers of shit, in comparison with c£265 guaranteed in Ireland.

It makes me think, hang on, what was that Johnson was saying about fundamental economic robustness? Why, then, is he doing nothing to enable people in key virus-opportunity roles to refrain from being super-spreaders?

These are things we can act upon to make less dangerous, not just less scary.

Smolker, and people like Smolker play an important role in identifying and articulating elephants in rooms that our leaders are either blind to (which, given that our Genius poshboy wanktankers conflate low-paid, low-skilled and low-strategic-value workers, wouldn’t surprise me) or which they don’t want us to think about.
Being the party of shock doctrine as they are.

', - date: '09 March 2020 9:00pm', - isoDateTime: '2020-03-09T21:00:30Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811215', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811215', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809697', - isoDateTime: '2020-03-09T19:37:04Z', - date: '09 March 2020 7:37pm', - commentId: '138809697', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809697', - }, - userProfile: { - userId: '101956088', - displayName: 'coultetscandi', - webUrl: 'https://profile.theguardian.com/user/id/101956088', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101956088', - avatar: 'https://avatar.guim.co.uk/user/101956088', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101956088', - badge: [], - }, - }, - { - id: 138811323, - body: "

Many have, but a huge number have not recovered (yet). I find this worrying. If you look at today's global figures there are currently 113,584 confirmed cases. Of those 62,496 have recovered. So not much more than half have recovered so far in an outbreak which has been going on since late last year. Of course hopefully most will recover, but the time taken and the medical support needed to do so in many cases is clearly significant

", - date: '09 March 2020 9:06pm', - isoDateTime: '2020-03-09T21:06:17Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811323', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811323', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'Omarvellous', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810472', - isoDateTime: '2020-03-09T20:20:34Z', - date: '09 March 2020 8:20pm', - commentId: '138810472', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810472', - }, - userProfile: { - userId: '4332161', - displayName: 'jessthecrip', - webUrl: 'https://profile.theguardian.com/user/id/4332161', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4332161', - avatar: 'https://avatar.guim.co.uk/user/4332161', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4332161', - badge: [], - }, - }, - { - id: 138811436, - body: "

Please ignore all those telling you not to panic. I see no panic in your post. You are simply stating the current concerning issues correctly. I am in the age group supposed to react in the worst way to this. I am taking every precaution. There is nothing else I can do ie staying away from crowds, wearing gloves on public transport, frequent hand washing etc.. If I was younger and not retired I would consider working from home if I could and would be extra cautious on my commute if not. A key point you make is that our Government is amateurish and incompetent and many of us already know that. So we have to look after ourselves. But some people seem to need to be terrified and in panic mode before they are even prepared to remember to wash their hands. So if that's what they need I'm happy to supply it (We're all gonna die!!) I don't need that I see the logic and act on it but hey! Best of luck to you and your parents. You'll probably all be fine because you are taking it seriously and following advice.

", - date: '09 March 2020 9:12pm', - isoDateTime: '2020-03-09T21:12:55Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811436', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811436', - numRecommends: 6, - isHighlighted: false, - responseTo: { - displayName: 'Smolker', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - isoDateTime: '2020-03-09T19:27:29Z', - date: '09 March 2020 7:27pm', - commentId: '138809524', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809524', - }, - userProfile: { - userId: '4085816', - displayName: 'geraldinemitchell', - webUrl: 'https://profile.theguardian.com/user/id/4085816', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4085816', - avatar: 'https://avatar.guim.co.uk/user/4085816', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4085816', - badge: [], - }, - }, - { - id: 138811585, - body: '

People saying, against all evidence, that this virus is "not that bad" are far, far more dangerous than anyone supposedly causing panic by saying they\'re worried about it.

Our response to the virus, which will determine whether the health service is able to cope or not and hence the rates of death and life-changing injury, is to a large extent dependent on people following government advice on self-isolation, avoiding social contact, hygiene and other things.

If people think "oh, it\'s not that bad", they won\'t do the things the health service needs them to do and the epidemic will be worse than it would otherwise be.

Please think about that before the next time you post about this virus.

', - date: '09 March 2020 9:19pm', - isoDateTime: '2020-03-09T21:19:13Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811585', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811585', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'Omarvellous', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810472', - isoDateTime: '2020-03-09T20:20:34Z', - date: '09 March 2020 8:20pm', - commentId: '138810472', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810472', - }, - userProfile: { - userId: '12611808', - displayName: 'Shortordercook', - webUrl: 'https://profile.theguardian.com/user/id/12611808', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12611808', - avatar: 'https://avatar.guim.co.uk/user/12611808', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12611808', - badge: [], - }, - }, - { - id: 138811762, - body: "

I'm sorry for your situation and I feel your fear, it sounds awful; but you should seek help for the anxiety because it certainly won't help your situation.

I've been chronic anxiety sufferer for much of my life, though thankfully on an upward curve these days. For other health reasons I'm in high risk group, however from personal history I know worrying about covid19 is probably the worst thing I can do.

The one thing I can affirm is that anxiety prevents us from making good, reasoned decisions, and obsessing about things that might get done in an ideal world but which we both know won't happen here, is really not going to help. Go and to talk to someone, and get your real fears whatever they are (having to care for your parent?) off your chest. And best of luck!

", - date: '09 March 2020 9:27pm', - isoDateTime: '2020-03-09T21:27:20Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811762', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811762', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'Smolker', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809524', - isoDateTime: '2020-03-09T19:27:29Z', - date: '09 March 2020 7:27pm', - commentId: '138809524', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809524', - }, - userProfile: { - userId: '11130177', - displayName: 'michaelmichael', - webUrl: 'https://profile.theguardian.com/user/id/11130177', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11130177', - avatar: 'https://avatar.guim.co.uk/user/11130177', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/11130177', - badge: [], - }, - }, - ], - metaData: { - commentCount: 14, - staffCommenterCount: 0, - editorsPickCount: 1, - blockedCount: 1, - responseCount: 13, + }, + { + id: 50789974, + body: '

Test from the API -1474918202

', + date: '21 April 2015 11:36am', + isoDateTime: '2015-04-21T10:36:59Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/50789974', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50789974', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809534, - body: '

It makes a change to see so much impotent rage on here.

', - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:50Z', + id: 50793031, + body: '

Test from the API -932163313

', + date: '21 April 2015 12:26pm', + isoDateTime: '2015-04-21T11:26:42Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809534', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809534', - numRecommends: 13, + webUrl: 'https://discussion.theguardian.com/comment-permalink/50793031', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/50793031', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '102219459', - displayName: 'Antiindoctrntn', - webUrl: 'https://profile.theguardian.com/user/id/102219459', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/102219459', - avatar: 'https://avatar.guim.co.uk/user/102219459', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/102219459', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809537, - body: '

Is there any way of bringing those politicians to justice? Surely what they did must fit the profile of some crime.

', - date: '09 March 2020 7:27pm', - isoDateTime: '2020-03-09T19:27:58Z', + id: 51153735, + body: '

What glorious plumage!

', + date: '28 April 2015 9:48am', + isoDateTime: '2015-04-28T08:48:07Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809537', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809537', - numRecommends: 18, + webUrl: 'https://discussion.theguardian.com/comment-permalink/51153735', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51153735', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '1353727', - displayName: 'MichaelBulley', - webUrl: 'https://profile.theguardian.com/user/id/1353727', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1353727', - avatar: 'https://avatar.guim.co.uk/user/1353727', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1353727', + userId: '14802426', + displayName: 'User941136', + webUrl: 'https://profile.theguardian.com/user/id/14802426', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', + avatar: 'https://avatar.guim.co.uk/user/14802426', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', badge: [], }, - responses: [ - { - id: 138809705, - body: "

Yes, arrest all politicians that you don't agree with.

You are the last bastion of freedom.... to agree with The Guardian or else.

", - date: '09 March 2020 7:37pm', - isoDateTime: '2020-03-09T19:37:43Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809705', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809705', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'MichaelBulley', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809537', - isoDateTime: '2020-03-09T19:27:58Z', - date: '09 March 2020 7:27pm', - commentId: '138809537', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809537', - }, - userProfile: { - userId: '16022312', - displayName: 'Aloonatron', - webUrl: 'https://profile.theguardian.com/user/id/16022312', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16022312', - avatar: 'https://avatar.guim.co.uk/user/16022312', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16022312', - badge: [], - }, - }, - { - id: 138809820, - body: '

There should be a way of holding them to account when they fuck up. Or they will continue to spaff money up the wall on invisible bridges, probation fuck ups, and pizza ferries.

', - date: '09 March 2020 7:44pm', - isoDateTime: '2020-03-09T19:44:08Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809820', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809820', - numRecommends: 18, - isHighlighted: false, - responseTo: { - displayName: 'Aloonatron', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809705', - isoDateTime: '2020-03-09T19:37:43Z', - date: '09 March 2020 7:37pm', - commentId: '138809705', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809705', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809904, - body: "

It's not about agreement, it's if a decision has real consequences. I disagree completely with Vince Cable selling off Royal Mail, but his punishment should be the voters rejecting his party.

However why should Grayling get away with pissing away loads of money? Or Truss allowing breaches of the law to sell more arms to the Saudis? And no doubt there will be similar examples during Labour's run in power.

", - date: '09 March 2020 7:48pm', - isoDateTime: '2020-03-09T19:48:54Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809904', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809904', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'Aloonatron', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809705', - isoDateTime: '2020-03-09T19:37:43Z', - date: '09 March 2020 7:37pm', - commentId: '138809705', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809705', - }, - userProfile: { - userId: '101851698', - displayName: 'ShipShipShipShip', - webUrl: 'https://profile.theguardian.com/user/id/101851698', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/101851698', - avatar: 'https://avatar.guim.co.uk/user/101851698', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/101851698', - badge: [], - }, - }, - { - id: 138810114, - body: '

Some political actions can be considered from a legal standpoint. There have been politicians who have been judged guilty of crimes against their own citizens and against humanity. I think you can argue that the avoidable policy of recent Conservative governments caused the deaths of people who, but for those policies, would have lived much longer. That seems to me to getting into legal waters.
Your approach would lead to saying that Nazism, for example, was just a political choice that you might agree with or disagree with, with no moral aspect to it.

', - date: '09 March 2020 8:01pm', - isoDateTime: '2020-03-09T20:01:14Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810114', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810114', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'Aloonatron', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809705', - isoDateTime: '2020-03-09T19:37:43Z', - date: '09 March 2020 7:37pm', - commentId: '138809705', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809705', - }, - userProfile: { - userId: '1353727', - displayName: 'MichaelBulley', - webUrl: 'https://profile.theguardian.com/user/id/1353727', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1353727', - avatar: 'https://avatar.guim.co.uk/user/1353727', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/1353727', - badge: [], - }, - }, - { - id: 138810138, - body: '

You can vote them out.

', - date: '09 March 2020 8:02pm', - isoDateTime: '2020-03-09T20:02:49Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810138', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810138', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'MichaelBulley', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809537', - isoDateTime: '2020-03-09T19:27:58Z', - date: '09 March 2020 7:27pm', - commentId: '138809537', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809537', - }, - userProfile: { - userId: '4085816', - displayName: 'geraldinemitchell', - webUrl: 'https://profile.theguardian.com/user/id/4085816', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4085816', - avatar: 'https://avatar.guim.co.uk/user/4085816', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4085816', - badge: [], - }, - }, - { - id: 138811039, - body: '

I think the point is that, once you have voted them in, they have a responsibility to act in the interests of the nation. No one voted for the policies that Toynbee is criticising in her article. Sadly, once in, a government in Britain is pretty much free to do whatever it likes.

', - date: '09 March 2020 8:50pm', - isoDateTime: '2020-03-09T20:50:57Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811039', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811039', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'geraldinemitchell', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810138', - isoDateTime: '2020-03-09T20:02:49Z', - date: '09 March 2020 8:02pm', - commentId: '138810138', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810138', - }, - userProfile: { - userId: '1353727', - displayName: 'MichaelBulley', - webUrl: 'https://profile.theguardian.com/user/id/1353727', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1353727', - avatar: 'https://avatar.guim.co.uk/user/1353727', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/1353727', - badge: [], - }, - }, - { - id: 138811173, - body: "

But they have voted in one who is well documented as not 'doing' responsibility in any area of his life. Their personal psychological protection system against their stupidity , with which they must be familiar, is to cry 'Project Fear' and 'Fake News' and finally , pathetically ' Why didn't anyone tell us?'

", - date: '09 March 2020 8:58pm', - isoDateTime: '2020-03-09T20:58:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811173', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811173', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'MichaelBulley', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811039', - isoDateTime: '2020-03-09T20:50:57Z', - date: '09 March 2020 8:50pm', - commentId: '138811039', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811039', - }, - userProfile: { - userId: '4085816', - displayName: 'geraldinemitchell', - webUrl: 'https://profile.theguardian.com/user/id/4085816', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4085816', - avatar: 'https://avatar.guim.co.uk/user/4085816', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4085816', - badge: [], - }, - }, - ], - metaData: { - commentCount: 8, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 7, - }, }, { - id: 138809587, - body: '

Prof John Appleby, chief economist at the Nuffield Trust, asks: “A blank cheque, really? Does the Treasury ever?” He rehearses the financial tourniquet that has strangled the NHS: it’s had 1.5% a year, compared with an average 4% since 1948, in a decade when over-65s rose by 25%.

And the majority of over-65s think that Brexit is a great idea for the economy.
LOL

', - date: '09 March 2020 7:30pm', - isoDateTime: '2020-03-09T19:30:54Z', + id: 51153843, + body: '

Indeed

', + date: '28 April 2015 9:49am', + isoDateTime: '2015-04-28T08:49:53Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809587', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809587', - numRecommends: 20, + webUrl: 'https://discussion.theguardian.com/comment-permalink/51153843', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51153843', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '16376046', - displayName: 'Soufflet', - webUrl: 'https://profile.theguardian.com/user/id/16376046', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16376046', - avatar: 'https://avatar.guim.co.uk/user/16376046', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/16376046', + userId: '14802426', + displayName: 'User941136', + webUrl: 'https://profile.theguardian.com/user/id/14802426', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', + avatar: 'https://avatar.guim.co.uk/user/14802426', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', badge: [], }, - responses: [ - { - id: 138811105, - body: "

Well, I'm not 65 yet and I never thought Brexit was good for the economy by any means, but I am gobsmacked at a government who doesn't appear to realise that people age. It isn't like they didn't see it coming. What a poor excuse for not funding the NHS properly.

", - date: '09 March 2020 8:54pm', - isoDateTime: '2020-03-09T20:54:53Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811105', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811105', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'Soufflet', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809587', - isoDateTime: '2020-03-09T19:30:54Z', - date: '09 March 2020 7:30pm', - commentId: '138809587', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809587', - }, - userProfile: { - userId: '2850963', - displayName: 'Bluejil', - webUrl: 'https://profile.theguardian.com/user/id/2850963', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2850963', - avatar: 'https://avatar.guim.co.uk/user/2850963', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2850963', - badge: [], - }, - }, - ], - metaData: { - commentCount: 2, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 1, - }, }, { - id: 138809592, - body: '

£350m p/w should fix it ... err ...

', - date: '09 March 2020 7:31pm', - isoDateTime: '2020-03-09T19:31:07Z', + id: 51177701, + body: '

Test

', + date: '28 April 2015 4:29pm', + isoDateTime: '2015-04-28T15:29:05Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809592', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809592', - numRecommends: 14, + webUrl: 'https://discussion.theguardian.com/comment-permalink/51177701', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51177701', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '4772503', - displayName: 'dirtygumshield', - webUrl: 'https://profile.theguardian.com/user/id/4772503', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4772503', - avatar: 'https://avatar.guim.co.uk/user/4772503', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/4772503', + userId: '14802426', + displayName: 'User941136', + webUrl: 'https://profile.theguardian.com/user/id/14802426', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', + avatar: 'https://avatar.guim.co.uk/user/14802426', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', badge: [], }, - responses: [ - { - id: 138809659, - body: '

How many millions per week does the recently announced additional investment in the NHS amount to? Have you done the sums?

', - date: '09 March 2020 7:35pm', - isoDateTime: '2020-03-09T19:35:07Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809659', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809659', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'dirtygumshield', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809592', - isoDateTime: '2020-03-09T19:31:07Z', - date: '09 March 2020 7:31pm', - commentId: '138809592', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809592', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810105, - body: '

The Conservatives have committed to building 40 new hospitals in England by 2030. Only six of these – which will receive £2.7bn and should be ready by 2025 – have been identified so far.

LOL

', - date: '09 March 2020 8:00pm', - isoDateTime: '2020-03-09T20:00:51Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810105', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810105', - numRecommends: 13, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809659', - isoDateTime: '2020-03-09T19:35:07Z', - date: '09 March 2020 7:35pm', - commentId: '138809659', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809659', - }, - userProfile: { - userId: '16376046', - displayName: 'Soufflet', - webUrl: 'https://profile.theguardian.com/user/id/16376046', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16376046', - avatar: 'https://avatar.guim.co.uk/user/16376046', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16376046', - badge: [], - }, - }, - { - id: 138810240, - body: '

Morons are still blaming Labour.

', - date: '09 March 2020 8:08pm', - isoDateTime: '2020-03-09T20:08:38Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810240', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810240', - numRecommends: 10, - isHighlighted: false, - responseTo: { - displayName: 'dirtygumshield', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809592', - isoDateTime: '2020-03-09T19:31:07Z', - date: '09 March 2020 7:31pm', - commentId: '138809592', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809592', - }, - userProfile: { - userId: '15463361', - displayName: 'Daniel Oneill', - webUrl: 'https://profile.theguardian.com/user/id/15463361', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15463361', - avatar: 'https://avatar.guim.co.uk/user/15463361', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15463361', - badge: [], - }, - }, - { - id: 138810394, - body: '

Not what I was talking about though is it?

', - date: '09 March 2020 8:16pm', - isoDateTime: '2020-03-09T20:16:24Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810394', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810394', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'Soufflet', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810105', - isoDateTime: '2020-03-09T20:00:51Z', - date: '09 March 2020 8:00pm', - commentId: '138810105', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810105', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138811675, - body: '

Perhaps your sums should extend to the years of deliberate under-funding of the NHS. The recent monies allocated are a drop in the ocean of need.

', - date: '09 March 2020 9:23pm', - isoDateTime: '2020-03-09T21:23:12Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811675', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811675', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'Delius', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138810394', - isoDateTime: '2020-03-09T20:16:24Z', - date: '09 March 2020 8:16pm', - commentId: '138810394', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138810394', - }, - userProfile: { - userId: '15127769', - displayName: 'JerryPymer', - webUrl: 'https://profile.theguardian.com/user/id/15127769', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15127769', - avatar: 'https://avatar.guim.co.uk/user/15127769', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15127769', - badge: [], - }, - }, - ], - metaData: { - commentCount: 6, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 5, - }, }, { - id: 138809603, - body: "

Given the calamitous list of historic upreparedness by a neglected and resource starved NHS waiting to fight the coronavirus threat - as gloriously and enthusiastically paraded here....it really does make you wonder why the Labour party thought it prudent to deliberately increase immigration from a 20,000 per year norm to over 300,000 and rising without any thought to the country's infrastructure, housing, social services, wage depression, society cohesion and NHS resources to manage such an influx? We are now at 500,000 and Polly thinks the problem with the NHS is money. Here's an idea....how about making the NHS a National Health Service and not an International Health Service which liberals everywhere think is desirable? Once you have re-organised the NHS to what a country can actually cope with you can write articles like this.

", - date: '09 March 2020 7:31pm', - isoDateTime: '2020-03-09T19:31:41Z', + id: 51177755, + body: '

Test Post

', + date: '28 April 2015 4:30pm', + isoDateTime: '2015-04-28T15:30:02Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809603', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - numRecommends: 30, + webUrl: 'https://discussion.theguardian.com/comment-permalink/51177755', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51177755', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '14692190', - displayName: 'LarryClackety', - webUrl: 'https://profile.theguardian.com/user/id/14692190', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14692190', - avatar: 'https://avatar.guim.co.uk/user/14692190', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14692190', + userId: '14802426', + displayName: 'User941136', + webUrl: 'https://profile.theguardian.com/user/id/14802426', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', + avatar: 'https://avatar.guim.co.uk/user/14802426', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', badge: [], }, - responses: [ - { - id: 138809825, - body: '

You have, of course, made a detailed study of both how much those immigrants benefit our economy compared to the benefits they extract and, too, how many of them work not only for the NHS but also in social care?

', - date: '09 March 2020 7:44pm', - isoDateTime: '2020-03-09T19:44:36Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809825', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809825', - numRecommends: 32, - isHighlighted: false, - responseTo: { - displayName: 'LarryClackety', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - isoDateTime: '2020-03-09T19:31:41Z', - date: '09 March 2020 7:31pm', - commentId: '138809603', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809603', - }, - userProfile: { - userId: '13952083', - displayName: 'fraser48', - webUrl: 'https://profile.theguardian.com/user/id/13952083', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13952083', - avatar: 'https://avatar.guim.co.uk/user/13952083', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/13952083', - badge: [], - }, - }, - { - id: 138809836, - body: '

The NHS is abused more by non-resident Brits than Johnny Foreigner

', - date: '09 March 2020 7:45pm', - isoDateTime: '2020-03-09T19:45:21Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809836', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809836', - numRecommends: 16, - isHighlighted: false, - responseTo: { - displayName: 'LarryClackety', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - isoDateTime: '2020-03-09T19:31:41Z', - date: '09 March 2020 7:31pm', - commentId: '138809603', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809603', - }, - userProfile: { - userId: '12197200', - displayName: 'justamentalpatient', - webUrl: 'https://profile.theguardian.com/user/id/12197200', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12197200', - avatar: 'https://avatar.guim.co.uk/user/12197200', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12197200', - badge: [], - }, - }, - { - id: 138809853, - body: "

Without high levels of immigration our economy would collapse. Combination of ageing population and lack of state investment in training. And if you told the immigrants who are here they can't use the NHS, that increases societal issues tenfold. But it's easier not to think of that - or think at all. Just blame immigrants and a Labour party 10 years out of power for the state of the NHS, rather than the party you repeatedly vote into government.

", - date: '09 March 2020 7:46pm', - isoDateTime: '2020-03-09T19:46:09Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809853', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809853', - numRecommends: 29, - isHighlighted: false, - responseTo: { - displayName: 'LarryClackety', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - isoDateTime: '2020-03-09T19:31:41Z', - date: '09 March 2020 7:31pm', - commentId: '138809603', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809603', - }, - userProfile: { - userId: '1330048', - displayName: 'JekyllMoon', - webUrl: 'https://profile.theguardian.com/user/id/1330048', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1330048', - avatar: 'https://avatar.guim.co.uk/user/1330048', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/1330048', - badge: [], - }, - }, - { - id: 138810155, - body: '

Here\'s an idea....how about making the NHS a National Health Service and not an International Health Service which liberals everywhere think is desirable

I assume you know how the Immigrant Health Surcharge works? Immigrants from outside the EEA have to pay into the NHS as part of their visa application; it is in no way a free service for them.

', - date: '09 March 2020 8:03pm', - isoDateTime: '2020-03-09T20:03:49Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810155', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810155', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'LarryClackety', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - isoDateTime: '2020-03-09T19:31:41Z', - date: '09 March 2020 7:31pm', - commentId: '138809603', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809603', - }, - userProfile: { - userId: '57038', - displayName: 'AdamTut', - webUrl: 'https://profile.theguardian.com/user/id/57038', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/57038', - avatar: 'https://avatar.guim.co.uk/user/57038', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/57038', - badge: [], - }, - }, - { - id: 138810221, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 8:07pm', - isoDateTime: '2020-03-09T20:07:41Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810221', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810221', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'LarryClackety', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - isoDateTime: '2020-03-09T19:31:41Z', - date: '09 March 2020 7:31pm', - commentId: '138809603', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809603', - }, - userProfile: { - userId: '15463361', - displayName: 'Daniel Oneill', - webUrl: 'https://profile.theguardian.com/user/id/15463361', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15463361', - avatar: 'https://avatar.guim.co.uk/user/15463361', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15463361', - badge: [], - }, - }, - { - id: 138810290, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 8:11pm', - isoDateTime: '2020-03-09T20:11:06Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810290', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810290', - numRecommends: 0, - isHighlighted: false, - responseTo: { - displayName: 'LarryClackety', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - isoDateTime: '2020-03-09T19:31:41Z', - date: '09 March 2020 7:31pm', - commentId: '138809603', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809603', - }, - userProfile: { - userId: '15739675', - displayName: 'establishmentlies', - webUrl: 'https://profile.theguardian.com/user/id/15739675', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15739675', - avatar: 'https://avatar.guim.co.uk/user/15739675', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/15739675', - badge: [], - }, - }, - { - id: 138810468, - body: "

i'm so sorry to sorry have to tell you this, there is no cure for your kind of stupid, regardless of how the NHS is doing.

", - date: '09 March 2020 8:20pm', - isoDateTime: '2020-03-09T20:20:28Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810468', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810468', - numRecommends: 12, - isHighlighted: false, - responseTo: { - displayName: 'LarryClackety', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809603', - isoDateTime: '2020-03-09T19:31:41Z', - date: '09 March 2020 7:31pm', - commentId: '138809603', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809603', - }, - userProfile: { - userId: '3302412', - displayName: 'grammyc', - webUrl: 'https://profile.theguardian.com/user/id/3302412', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3302412', - avatar: 'https://avatar.guim.co.uk/user/3302412', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3302412', - badge: [], - }, - }, - ], - metaData: { - commentCount: 8, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 2, - responseCount: 7, + }, + { + id: 51213229, + body: '

Test 6751

', + date: '29 April 2015 9:21am', + isoDateTime: '2015-04-29T08:21:42Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/51213229', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51213229', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '14802426', + displayName: 'User941136', + webUrl: 'https://profile.theguardian.com/user/id/14802426', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', + avatar: 'https://avatar.guim.co.uk/user/14802426', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', + badge: [], }, }, { - id: 138809625, - body: '

Polly Toynbee thank you for a rational article explaining clearly and precisely the situation within the NHS to cope with coronavirus. A stark contrast to John Snow on Channel 4 news going out now who seems to be in a state of hysterical excitement. Thank goodness that the people he is interviewing are, like yourself, rational, sensible and do understand what they are talking about.

', - date: '09 March 2020 7:33pm', - isoDateTime: '2020-03-09T19:33:22Z', + id: 51214557, + body: '

Test 8067

', + date: '29 April 2015 9:44am', + isoDateTime: '2015-04-29T08:44:15Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809625', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809625', - numRecommends: 7, + webUrl: 'https://discussion.theguardian.com/comment-permalink/51214557', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/51214557', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '16502817', - displayName: 'BritInEurope', - webUrl: 'https://profile.theguardian.com/user/id/16502817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16502817', - avatar: 'https://avatar.guim.co.uk/user/16502817', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/16502817', + userId: '10455474', + displayName: 'User174774', + webUrl: 'https://profile.theguardian.com/user/id/10455474', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10455474', + avatar: 'https://avatar.guim.co.uk/user/10455474', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/10455474', badge: [], }, - responses: [ - { - id: 138809685, - body: '

Snow is now comparing the outbreak with Embola!!!!! Snow would be well advised to focus on the facts.

', - date: '09 March 2020 7:36pm', - isoDateTime: '2020-03-09T19:36:18Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809685', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809685', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: 'BritInEurope', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809625', - isoDateTime: '2020-03-09T19:33:22Z', - date: '09 March 2020 7:33pm', - commentId: '138809625', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809625', - }, - userProfile: { - userId: '16502817', - displayName: 'BritInEurope', - webUrl: 'https://profile.theguardian.com/user/id/16502817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16502817', - avatar: 'https://avatar.guim.co.uk/user/16502817', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16502817', - badge: [], - }, - }, - ], - metaData: { - commentCount: 2, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 1, - }, }, { - id: 138809633, - body: '

This virus will teach us the value of our public services. It will also brutally expose the idiocy of the free-market fundamentalists who have dominated thinking for so long. Good.

', - date: '09 March 2020 7:33pm', - isoDateTime: '2020-03-09T19:33:42Z', + id: 52013677, + body: '

Acknowledgement Test

', + date: '12 May 2015 10:39am', + isoDateTime: '2015-05-12T09:39:07Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809633', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809633', - numRecommends: 20, + webUrl: 'https://discussion.theguardian.com/comment-permalink/52013677', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52013677', + numRecommends: 1, isHighlighted: false, userProfile: { - userId: '3265666', - displayName: 'Skybluewater', - webUrl: 'https://profile.theguardian.com/user/id/3265666', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3265666', - avatar: 'https://avatar.guim.co.uk/user/3265666', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/3265666', + userId: '14802426', + displayName: 'User941136', + webUrl: 'https://profile.theguardian.com/user/id/14802426', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14802426', + avatar: 'https://avatar.guim.co.uk/user/14802426', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/14802426', badge: [], }, - responses: [ - { - id: 138809850, - body: '

Ironic then that the free-market fundamentalists\' B/Wankers were saved by State Aid in the form of Quantitative Easing - a monetary laxative.

', - date: '09 March 2020 7:45pm', - isoDateTime: '2020-03-09T19:45:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809850', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809850', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'Skybluewater', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809633', - isoDateTime: '2020-03-09T19:33:42Z', - date: '09 March 2020 7:33pm', - commentId: '138809633', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809633', - }, - userProfile: { - userId: '14118384', - displayName: 'Speak4Self', - webUrl: 'https://profile.theguardian.com/user/id/14118384', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14118384', - avatar: 'https://avatar.guim.co.uk/user/14118384', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/14118384', - badge: [], - }, - }, - { - id: 138811079, - body: '

Ironic indeed, because those same beneficiaries of state aid denounce it as socialism if applied to other sectors.

', - date: '09 March 2020 8:53pm', - isoDateTime: '2020-03-09T20:53:35Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811079', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811079', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'Speak4Self', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809850', - isoDateTime: '2020-03-09T19:45:56Z', - date: '09 March 2020 7:45pm', - commentId: '138809850', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809850', - }, - userProfile: { - userId: '12298092', - displayName: '_jhfta_', - webUrl: 'https://profile.theguardian.com/user/id/12298092', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12298092', - avatar: 'https://avatar.guim.co.uk/user/12298092', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12298092', - badge: [], - }, - }, - ], - metaData: { - commentCount: 3, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 2, + }, + { + id: 52412694, + body: '

I love this bird

', + date: '19 May 2015 10:56am', + isoDateTime: '2015-05-19T09:56:02Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/52412694', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52412694', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '1186733', + displayName: 'GideonGoldberg', + webUrl: 'https://profile.theguardian.com/user/id/1186733', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', + avatar: 'https://avatar.guim.co.uk/user/1186733', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', + badge: [], }, }, { - id: 138809649, + id: 52412721, body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:34pm', - isoDateTime: '2020-03-09T19:34:36Z', + date: '19 May 2015 10:56am', + isoDateTime: '2015-05-19T09:56:47Z', status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809649', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809649', - numRecommends: 4, + webUrl: 'https://discussion.theguardian.com/comment-permalink/52412721', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52412721', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '10127231', - displayName: 'irreverentnurse', - webUrl: 'https://profile.theguardian.com/user/id/10127231', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/10127231', - avatar: 'https://avatar.guim.co.uk/user/10127231', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/10127231', + userId: '1186733', + displayName: 'GideonGoldberg', + webUrl: 'https://profile.theguardian.com/user/id/1186733', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1186733', + avatar: 'https://avatar.guim.co.uk/user/1186733', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/1186733', badge: [], }, }, { - id: 138809672, - body: '

NHS can barely cope with seasonal flu, this will not be pretty

', - date: '09 March 2020 7:35pm', - isoDateTime: '2020-03-09T19:35:36Z', + id: 52412791, + body: '

Test from the API 1236505540

', + date: '19 May 2015 10:58am', + isoDateTime: '2015-05-19T09:58:34Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809672', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809672', - numRecommends: 21, + webUrl: 'https://discussion.theguardian.com/comment-permalink/52412791', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/52412791', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '1475398', - displayName: 'sadbowler', - webUrl: 'https://profile.theguardian.com/user/id/1475398', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/1475398', - avatar: 'https://avatar.guim.co.uk/user/1475398', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/1475398', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, - responses: [ - { - id: 138811574, - body: "

Obviously attention is going to be focussed on Tory failures with the NHS over the coming weeks and it definitely should be. There is also an argument that no one is really prepared for a pandemic like this. You just cannot have thousands of extra workers and capacity on stand by for a once-in-a-century event.

What makes me nervous about this is when you run the numbers on it. Let's say only 1% of the population catches it. That's 600,000 people. Let's say 20% of them are critically ill and hospitalised. That's 120,000 new critically ill patients requiring beds. Where the hell is that going to come from? And that is only at a meagre 1% of the population getting infected.

", - date: '09 March 2020 9:18pm', - isoDateTime: '2020-03-09T21:18:55Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811574', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811574', - numRecommends: 8, - isHighlighted: false, - responseTo: { - displayName: 'sadbowler', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809672', - isoDateTime: '2020-03-09T19:35:36Z', - date: '09 March 2020 7:35pm', - commentId: '138809672', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809672', - }, - userProfile: { - userId: '4579967', - displayName: 'csjjl1', - webUrl: 'https://profile.theguardian.com/user/id/4579967', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4579967', - avatar: 'https://avatar.guim.co.uk/user/4579967', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/4579967', - badge: [], - }, - }, - { - id: 138811794, - body: "

The real shortage is intensive care. Italy currently has 800 patients in intensive care with the virus. That's equal to the total number of normally free intensive care beds in the whole of the UK. From just 7000 cases.

Obviously more beds can be freed up, but basically it looks like the entire intensive care system and more is going to be completely taken up for several months.

Don't get run over or have a heart attack is my advice.

", - date: '09 March 2020 9:28pm', - isoDateTime: '2020-03-09T21:28:37Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811794', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811794', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'csjjl1', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138811574', - isoDateTime: '2020-03-09T21:18:55Z', - date: '09 March 2020 9:18pm', - commentId: '138811574', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138811574', - }, - userProfile: { - userId: '12611808', - displayName: 'Shortordercook', - webUrl: 'https://profile.theguardian.com/user/id/12611808', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12611808', - avatar: 'https://avatar.guim.co.uk/user/12611808', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/12611808', - badge: [], - }, - }, - ], - metaData: { - commentCount: 3, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 0, - responseCount: 2, + }, + { + id: 53902608, + body: '

nice article

', + date: '16 June 2015 1:54pm', + isoDateTime: '2015-06-16T12:54:05Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/53902608', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53902608', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809690, - body: "

Yup - Labour's PFI gutted the finances of the NHS like many a public body. We can but thank RLB for her efforts there.

You might have thought too our 250k a year GP's would invest a few quid in their businesses too. No chance of that - they are too busy giving up on this or that segment of care.

Much better to live somewhere with a proper health system somewhere in the EU.

", - date: '09 March 2020 7:36pm', - isoDateTime: '2020-03-09T19:36:39Z', + id: 53980488, + body: '

very interesting article

', + date: '17 June 2015 4:59pm', + isoDateTime: '2015-06-17T15:59:12Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809690', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809690', - numRecommends: 6, + webUrl: 'https://discussion.theguardian.com/comment-permalink/53980488', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53980488', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '14893509', - displayName: 'Liberclown', - webUrl: 'https://profile.theguardian.com/user/id/14893509', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/14893509', - avatar: 'https://avatar.guim.co.uk/user/14893509', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/14893509', - badge: [], + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, responses: [ { - id: 138809800, - body: "

up - Labour's PFI gutted the finances of the NHS like many a public body

PFI was taken on board under Majors tory government , however you seem to have forgotten the last 10 years of tory under funding for the NHS ,the lack of nurses and doctors .

Yes read that again ............10 whole years of neglect

", - date: '09 March 2020 7:43pm', - isoDateTime: '2020-03-09T19:43:09Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809800', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809800', - numRecommends: 15, - isHighlighted: false, - responseTo: { - displayName: 'Liberclown', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809690', - isoDateTime: '2020-03-09T19:36:39Z', - date: '09 March 2020 7:36pm', - commentId: '138809690', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809690', - }, - userProfile: { - userId: '3869480', - displayName: 'jazzdrum', - webUrl: 'https://profile.theguardian.com/user/id/3869480', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3869480', - avatar: 'https://avatar.guim.co.uk/user/3869480', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3869480', - badge: [], - }, - }, - { - id: 138809807, - body: "

You might have thought our 500K a year business folk and 500M a year businesses would pay their fair share of tax to help shoulder the burden...but no, it's all Attlee's fault as per.

", - date: '09 March 2020 7:43pm', - isoDateTime: '2020-03-09T19:43:33Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809807', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809807', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'Liberclown', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809690', - isoDateTime: '2020-03-09T19:36:39Z', - date: '09 March 2020 7:36pm', - commentId: '138809690', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809690', - }, - userProfile: { - userId: '16332843', - displayName: 'dougmeyberry', - webUrl: 'https://profile.theguardian.com/user/id/16332843', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16332843', - avatar: 'https://avatar.guim.co.uk/user/16332843', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16332843', - badge: [], - }, - }, - { - id: 138809817, - body: '

somewhere with a proper health system somewhere in the EU.


Guardian: French medics warn health service is on brink of collapse
Guardian: Romanian hospitals in crisis as emigration takes its toll', - date: '09 March 2020 7:44pm', - isoDateTime: '2020-03-09T19:44:05Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809817', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809817', - numRecommends: 9, - isHighlighted: false, - responseTo: { - displayName: 'Liberclown', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809690', - isoDateTime: '2020-03-09T19:36:39Z', - date: '09 March 2020 7:36pm', - commentId: '138809690', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809690', - }, - userProfile: { - userId: '3596416', - displayName: '1nn1t', - webUrl: 'https://profile.theguardian.com/user/id/3596416', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3596416', - avatar: 'https://avatar.guim.co.uk/user/3596416', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3596416', - badge: [], - }, - }, - { - id: 138810033, - body: "

Yup - Labour's PFI gutted the finances of the NHS like many a public body

PFI payments represent 2% of the annual NHS budget, if that's what you mean by gutted.

", - date: '09 March 2020 7:56pm', - isoDateTime: '2020-03-09T19:56:56Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810033', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810033', - numRecommends: 7, - isHighlighted: false, - responseTo: { - displayName: 'Liberclown', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809690', - isoDateTime: '2020-03-09T19:36:39Z', - date: '09 March 2020 7:36pm', - commentId: '138809690', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809690', - }, - userProfile: { - userId: '16376046', - displayName: 'Soufflet', - webUrl: 'https://profile.theguardian.com/user/id/16376046', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16376046', - avatar: 'https://avatar.guim.co.uk/user/16376046', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/16376046', - badge: [], - }, - }, - { - id: 138810048, - body: '

If you know of “500K a year business folk” who’ve been skipping their taxes (actually up rather a lot since the Tories came in) then please do your civic duty and report them to HMRC.

', - date: '09 March 2020 7:57pm', - isoDateTime: '2020-03-09T19:57:32Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810048', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810048', - numRecommends: 2, - isHighlighted: false, - responseTo: { - displayName: 'dougmeyberry', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809807', - isoDateTime: '2020-03-09T19:43:33Z', - date: '09 March 2020 7:43pm', - commentId: '138809807', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809807', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810057, - body: '

Has anyone ever suggested Romania has a “proper health service”?

', - date: '09 March 2020 7:58pm', - isoDateTime: '2020-03-09T19:58:14Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810057', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810057', - numRecommends: 5, - isHighlighted: false, - responseTo: { - displayName: '1nn1t', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809817', - isoDateTime: '2020-03-09T19:44:05Z', - date: '09 March 2020 7:44pm', - commentId: '138809817', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809817', - }, - userProfile: { - userId: '2611744', - displayName: 'Delius', - webUrl: 'https://profile.theguardian.com/user/id/2611744', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744', - avatar: 'https://avatar.guim.co.uk/user/2611744', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2611744', - badge: [], - }, - }, - { - id: 138810855, - body: "

GP's don't get £250k a year.

NAH figures show the minimum salary is £60,000 or so up to an average £113,000 a year.

Frankly, I doubt if anyone would complain if GP 's did get £250,000 a year, if they were able to do their jobs without interferenc e.

", - date: '09 March 2020 8:41pm', - isoDateTime: '2020-03-09T20:41:48Z', - status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138810855', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810855', - numRecommends: 3, - isHighlighted: false, - responseTo: { - displayName: 'Liberclown', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809690', - isoDateTime: '2020-03-09T19:36:39Z', - date: '09 March 2020 7:36pm', - commentId: '138809690', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809690', - }, - userProfile: { - userId: '2596777', - displayName: 'thewhofan', - webUrl: 'https://profile.theguardian.com/user/id/2596777', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2596777', - avatar: 'https://avatar.guim.co.uk/user/2596777', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2596777', - badge: [], - }, - }, - { - id: 138811205, - body: "

PFI might have been devised by Major's government, but Blair and Brown's 3 governments set up over 700 PFI deals, most of which are in the NHS.

One notable example was the trust that included my constituency where two hospitals with A & E's were closed in order to fund the PFI hospital built under Labour, whose own A & E was designed to serve a city and ended up serving a county.

Still, we pointed out to Labour what we thought of their actions and booted the incumbent Labour MP out for two terms and elected a retired Doctor who tried to get some services restored.

Sadly, he coukdn't, and we ended up with the odious Mark Garnier as NO who'd done nothing to help.

", - date: '09 March 2020 9:00pm', - isoDateTime: '2020-03-09T21:00:02Z', + id: 53980521, + body: '

although that was just for testing commenting

', + date: '17 June 2015 4:59pm', + isoDateTime: '2015-06-17T15:59:53Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138811205', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138811205', - numRecommends: 1, + webUrl: 'https://discussion.theguardian.com/comment-permalink/53980521', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53980521', + numRecommends: 0, isHighlighted: false, responseTo: { - displayName: 'jazzdrum', + displayName: 'John Duffell', commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809800', - isoDateTime: '2020-03-09T19:43:09Z', - date: '09 March 2020 7:43pm', - commentId: '138809800', + 'https://discussion.guardianapis.com/discussion-api/comment/53980488', + isoDateTime: '2015-06-17T15:59:12Z', + date: '17 June 2015 4:59pm', + commentId: '53980488', commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809800', + 'https://discussion.theguardian.com/comment-permalink/53980488', }, userProfile: { - userId: '2596777', - displayName: 'thewhofan', - webUrl: 'https://profile.theguardian.com/user/id/2596777', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2596777', - avatar: 'https://avatar.guim.co.uk/user/2596777', + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', secureAvatarUrl: - 'https://avatar.guim.co.uk/user/2596777', - badge: [], + 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, }, ], metaData: { - commentCount: 9, - staffCommenterCount: 0, + commentCount: 2, + staffCommenterCount: 1, editorsPickCount: 0, blockedCount: 0, - responseCount: 8, + responseCount: 1, }, }, { - id: 138809696, + id: 53984125, body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:37pm', - isoDateTime: '2020-03-09T19:37:00Z', + date: '17 June 2015 6:08pm', + isoDateTime: '2015-06-17T17:08:32Z', status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809696', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809696', - numRecommends: 2, + webUrl: 'https://discussion.theguardian.com/comment-permalink/53984125', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53984125', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '100078210', - displayName: 'glasshalffull2', - webUrl: 'https://profile.theguardian.com/user/id/100078210', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100078210', - avatar: 'https://avatar.guim.co.uk/user/100078210', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/100078210', - badge: [], + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, - responses: [ - { - id: 138809754, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:40pm', - isoDateTime: '2020-03-09T19:40:13Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809754', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809754', - numRecommends: 4, - isHighlighted: false, - responseTo: { - displayName: 'glasshalffull2', - commentApiUrl: - 'https://discussion.guardianapis.com/discussion-api/comment/138809696', - isoDateTime: '2020-03-09T19:37:00Z', - date: '09 March 2020 7:37pm', - commentId: '138809696', - commentWebUrl: - 'https://discussion.theguardian.com/comment-permalink/138809696', - }, - userProfile: { - userId: '3869480', - displayName: 'jazzdrum', - webUrl: 'https://profile.theguardian.com/user/id/3869480', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/3869480', - avatar: 'https://avatar.guim.co.uk/user/3869480', - secureAvatarUrl: - 'https://avatar.guim.co.uk/user/3869480', - badge: [], - }, - }, - ], - metaData: { - commentCount: 2, - staffCommenterCount: 0, - editorsPickCount: 0, - blockedCount: 2, - responseCount: 1, + }, + { + id: 53984175, + body: "

It's nice to comment on an article again

", + date: '17 June 2015 6:09pm', + isoDateTime: '2015-06-17T17:09:51Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/53984175', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/53984175', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809699, - body: '

Unless they can create ICU beds out of thin air when this gets in full swing then anyone considered ready for scrap heap is screwed im afraid. If Italy - a country with more ICU beds per capita in the EU - is on the verge of a crisis we are well and truly fecked. You’re safest best is working from home and hoping for the best.

', - date: '09 March 2020 7:37pm', - isoDateTime: '2020-03-09T19:37:11Z', + id: 54096779, + body: '

interesting article

', + date: '19 June 2015 2:07pm', + isoDateTime: '2015-06-19T13:07:13Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809699', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809699', - numRecommends: 9, + webUrl: 'https://discussion.theguardian.com/comment-permalink/54096779', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54096779', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '15463361', - displayName: 'Daniel Oneill', - webUrl: 'https://profile.theguardian.com/user/id/15463361', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/15463361', - avatar: 'https://avatar.guim.co.uk/user/15463361', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/15463361', - badge: [], + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809709, - body: '

In honesty and fairness you cannot design and support an NHS appropriately equipped to deal with what may be coming down the line. But the fact is it is currently NOT adequately supported or equipped to deal with the normal demands made upon it.
Our heroes are likely to "fall in the battle" when it commences. The intensity of exposure may well put many in self isolation.. at best.
A HUGE responsibility lies with the "worried"public to stay well away from medics and their workplaces. The virally very sick, the accident victims, the heart attack and stroke victims etc desperately need as many of our medics and nurses to keep being able to turn up for work.

', - date: '09 March 2020 7:37pm', - isoDateTime: '2020-03-09T19:37:59Z', + id: 54096834, + body: '

this article is quite good

', + date: '19 June 2015 2:08pm', + isoDateTime: '2015-06-19T13:08:02Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809709', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809709', - numRecommends: 6, + webUrl: 'https://discussion.theguardian.com/comment-permalink/54096834', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54096834', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '16408524', - displayName: 'GayeMurray', - webUrl: 'https://profile.theguardian.com/user/id/16408524', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/16408524', - avatar: 'https://avatar.guim.co.uk/user/16408524', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/16408524', - badge: [], + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809729, - body: "This comment was removed by a moderator because it didn't abide by our community standards. Replies may also be deleted. For more detail see our FAQs.", - date: '09 March 2020 7:38pm', - isoDateTime: '2020-03-09T19:38:54Z', - status: 'blocked', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809729', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809729', - numRecommends: 2, + id: 54297937, + body: '

nice article

', + date: '23 June 2015 12:48pm', + isoDateTime: '2015-06-23T11:48:17Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/54297937', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54297937', + numRecommends: 1, isHighlighted: false, userProfile: { - userId: '11920192', - displayName: 'billcody', - webUrl: 'https://profile.theguardian.com/user/id/11920192', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/11920192', - avatar: 'https://avatar.guim.co.uk/user/11920192', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/11920192', - badge: [], + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], }, }, { - id: 138809733, - body: "

Again, a lot of war vocabulary.
Shouldn't be the case should it

", - date: '09 March 2020 7:39pm', - isoDateTime: '2020-03-09T19:39:03Z', + id: 54304818, + body: '

Test from the API -1673717805

', + date: '23 June 2015 2:49pm', + isoDateTime: '2015-06-23T13:49:30Z', status: 'visible', - webUrl: 'https://discussion.theguardian.com/comment-permalink/138809733', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809733', - numRecommends: 9, + webUrl: 'https://discussion.theguardian.com/comment-permalink/54304818', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54304818', + numRecommends: 0, isHighlighted: false, userProfile: { - userId: '18538747', - displayName: 'IfItsMagic', - webUrl: 'https://profile.theguardian.com/user/id/18538747', - apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/18538747', - avatar: 'https://avatar.guim.co.uk/user/18538747', - secureAvatarUrl: 'https://avatar.guim.co.uk/user/18538747', - badge: [], + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 54305016, + body: '

this article is cool

', + date: '23 June 2015 2:53pm', + isoDateTime: '2015-06-23T13:53:29Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/54305016', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305016', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 54305061, + body: "

I'd like to make a comment here

", + date: '23 June 2015 2:54pm', + isoDateTime: '2015-06-23T13:54:22Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/54305061', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305061', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 54305123, + body: '

lovely stuff

', + date: '23 June 2015 2:55pm', + isoDateTime: '2015-06-23T13:55:32Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/54305123', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305123', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 54305139, + body: '

testing dicussion

', + date: '23 June 2015 2:55pm', + isoDateTime: '2015-06-23T13:55:46Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/54305139', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305139', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 54305287, + body: '

testing again

', + date: '23 June 2015 2:58pm', + isoDateTime: '2015-06-23T13:58:51Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/54305287', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54305287', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '13552794', + displayName: 'User780375', + webUrl: 'https://profile.theguardian.com/user/id/13552794', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13552794', + avatar: 'https://avatar.guim.co.uk/user/13552794', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/13552794', + badge: [ + { + name: 'Staff', + }, + ], + }, + }, + { + id: 54351807, + body: '

Test from the API 1634173951

', + date: '24 June 2015 10:31am', + isoDateTime: '2015-06-24T09:31:02Z', + status: 'visible', + webUrl: 'https://discussion.theguardian.com/comment-permalink/54351807', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/54351807', + numRecommends: 0, + isHighlighted: false, + userProfile: { + userId: '4339939', + displayName: 'GideonGoldberg1', + webUrl: 'https://profile.theguardian.com/user/id/4339939', + apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/4339939', + avatar: 'https://avatar.guim.co.uk/user/4339939', + secureAvatarUrl: 'https://avatar.guim.co.uk/user/4339939', + badge: [ + { + name: 'Staff', + }, + ], }, }, ], From 78a5f8353437b258b1170189e266ecf09837a9c3 Mon Sep 17 00:00:00 2001 From: Georges Lebreton Date: Fri, 30 Jun 2023 11:41:41 +0100 Subject: [PATCH 061/147] updated timestamp stories to an appropriate time relative to dcr timestamp --- .../components/Timestamp/Timestamp.stories.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dotcom-rendering/src/discussion-rendering/components/Timestamp/Timestamp.stories.tsx b/dotcom-rendering/src/discussion-rendering/components/Timestamp/Timestamp.stories.tsx index a93734031fd..15c0123f771 100644 --- a/dotcom-rendering/src/discussion-rendering/components/Timestamp/Timestamp.stories.tsx +++ b/dotcom-rendering/src/discussion-rendering/components/Timestamp/Timestamp.stories.tsx @@ -6,7 +6,7 @@ export default { component: Timestamp, title: 'Timestamp' }; export const TwoMonths = () => ( {}} @@ -16,7 +16,7 @@ TwoMonths.storyName = 'Two months'; export const OneHour = () => ( {}} @@ -26,7 +26,7 @@ OneHour.storyName = 'One Hour'; export const TwentyThreeHours = () => ( {}} @@ -36,7 +36,7 @@ TwentyThreeHours.storyName = 'Twenty three hours'; export const TwentyFiveHours = () => ( {}} From 19b9111115622269399bdbda9754e874555028bf Mon Sep 17 00:00:00 2001 From: Ioanna Kokkini Date: Wed, 28 Jun 2023 18:24:46 +0100 Subject: [PATCH 062/147] Add "most-popular" Ophan ID in `MostViewedFotter` --- dotcom-rendering/src/components/MostViewedFooter.importable.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/dotcom-rendering/src/components/MostViewedFooter.importable.tsx b/dotcom-rendering/src/components/MostViewedFooter.importable.tsx index e1c3602a6ad..c78ca6cf39d 100644 --- a/dotcom-rendering/src/components/MostViewedFooter.importable.tsx +++ b/dotcom-rendering/src/components/MostViewedFooter.importable.tsx @@ -59,6 +59,7 @@ export const MostViewedFooter = ({ data-cy="mostviewed-footer" data-cy-ab-user-in-variant={abTestCypressDataAttr} data-cy-ab-runnable-test={variantFromRunnable} + data-link-name="most popular" > Date: Fri, 30 Jun 2023 15:45:56 +0100 Subject: [PATCH 063/147] fix: Fix some Ophan component IDs * For CardStyle Feature (when the article has /tone/feature): https://github.com/guardian/content-api-scala-client/blob/d923dc5/client/src/main/scala/com.gu.contentapi.client/utils/CapiModelEnrichment.scala#L81. This can differ from the format. * For the video container's next and prev buttons. I broke them here: https://github.com/guardian/dotcom-rendering/pull/8061 --- .../src/components/Carousel.importable.tsx | 26 +++++++------------ dotcom-rendering/src/lib/getDataLinkName.ts | 1 + 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dotcom-rendering/src/components/Carousel.importable.tsx b/dotcom-rendering/src/components/Carousel.importable.tsx index b7b2407f566..627d2aac892 100644 --- a/dotcom-rendering/src/components/Carousel.importable.tsx +++ b/dotcom-rendering/src/components/Carousel.importable.tsx @@ -363,13 +363,9 @@ const titleStyle = ( const getDataLinkNameCarouselButton = ( direction: string, arrowName: string, - collectionType?: string, + isVideoContainer: boolean, ): string => { - return `${ - collectionType && collectionType === 'fixed/video' - ? 'video-container' - : arrowName - }-${direction}`; + return `${isVideoContainer ? 'video-container' : arrowName}-${direction}`; }; const Title = ({ @@ -600,6 +596,9 @@ export const Carousel = ({ const isCuratedContent = onwardsSource === 'curated-content'; + const isVideoContainer = + 'collectionType' in props && props.collectionType === 'fixed/video'; + const notPresentation = (el: HTMLElement): boolean => el.getAttribute('role') !== 'presentation'; @@ -701,12 +700,7 @@ export const Carousel = ({
@@ -778,9 +772,9 @@ export const Carousel = ({ ), ]} data-link-name={getDataLinkNameCarouselButton( - heading, 'next', arrowName, + isVideoContainer, )} > @@ -824,9 +818,9 @@ export const Carousel = ({ ), ]} data-link-name={getDataLinkNameCarouselButton( - heading, 'prev', arrowName, + isVideoContainer, )} > @@ -850,9 +844,9 @@ export const Carousel = ({ ), ]} data-link-name={getDataLinkNameCarouselButton( - heading, 'next', arrowName, + isVideoContainer, )} > diff --git a/dotcom-rendering/src/lib/getDataLinkName.ts b/dotcom-rendering/src/lib/getDataLinkName.ts index 43705f20083..8dfaab153d1 100644 --- a/dotcom-rendering/src/lib/getDataLinkName.ts +++ b/dotcom-rendering/src/lib/getDataLinkName.ts @@ -9,6 +9,7 @@ const getLinkType = ( cardStyle?: FEFrontCardStyle, ): RichLinkCardType => { if (cardStyle === 'ExternalLink') return 'external'; + if (cardStyle === 'Feature') return 'feature'; switch (theme) { case ArticleSpecial.SpecialReport: From 198de20a5408b3253660ff55d5fe7dda97bfc58f Mon Sep 17 00:00:00 2001 From: Max Duval Date: Thu, 29 Jun 2023 14:48:21 +0100 Subject: [PATCH 064/147] refactor(SharedAdTargeting): define type this removes an `any` and creates an explicit relationship between parsing and consumption --- dotcom-rendering/index.d.ts | 21 ------------------ dotcom-rendering/src/lib/ad-targeting.ts | 4 +++- .../src/model/article-schema.json | 6 +++-- dotcom-rendering/src/model/front-schema.json | 6 +++-- .../src/model/tag-front-schema.json | 6 +++-- .../src/server/index.article.web.ts | 2 +- .../src/server/render.article.web.tsx | 2 +- dotcom-rendering/src/types/config.ts | 3 ++- dotcom-rendering/src/types/front.ts | 3 ++- dotcom-rendering/src/types/frontend.ts | 22 +++++++++++++++++++ dotcom-rendering/src/types/newslettersPage.ts | 2 +- 11 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dotcom-rendering/index.d.ts b/dotcom-rendering/index.d.ts index 2cc3669c7b1..b5d5b838932 100644 --- a/dotcom-rendering/index.d.ts +++ b/dotcom-rendering/index.d.ts @@ -277,27 +277,6 @@ interface FENavType { type StageType = 'DEV' | 'CODE' | 'PROD'; -/** - * BlocksRequest is the expected body format for POST requests made to /Blocks - */ -interface FEBlocksRequest { - blocks: Block[]; - format: FEFormat; - host?: string; - pageId: string; - webTitle: string; - ajaxUrl: string; - isAdFreeUser: boolean; - isSensitive: boolean; - edition: string; - section: string; - sharedAdTargeting: Record; - adUnit: string; - videoDuration?: number; - switches: { [key: string]: boolean }; - keywordIds: string; -} - /** * KeyEventsRequest is the expected body format for POST requests made to /KeyEvents */ diff --git a/dotcom-rendering/src/lib/ad-targeting.ts b/dotcom-rendering/src/lib/ad-targeting.ts index 15481f87202..7334943c3d5 100644 --- a/dotcom-rendering/src/lib/ad-targeting.ts +++ b/dotcom-rendering/src/lib/ad-targeting.ts @@ -1,5 +1,7 @@ import { isString } from '@guardian/libs'; +export type SharedAdTargeting = Record; + // TODO: this function already exists in commercial-core, consider exporting it to avoid duplication const getUrlKeywords = (url: string): string[] => { const lastSegment = url @@ -23,7 +25,7 @@ export const buildAdTargeting = ({ isSensitive: boolean; edition: string; section: string; - sharedAdTargeting: Record; + sharedAdTargeting: SharedAdTargeting; adUnit: string; videoDuration?: number; }): AdTargeting => { diff --git a/dotcom-rendering/src/model/article-schema.json b/dotcom-rendering/src/model/article-schema.json index fe88874d74f..4f0575a5b1d 100644 --- a/dotcom-rendering/src/model/article-schema.json +++ b/dotcom-rendering/src/model/article-schema.json @@ -4122,8 +4122,7 @@ "type": "string" }, "sharedAdTargeting": { - "type": "object", - "additionalProperties": {} + "$ref": "#/definitions/SharedAdTargeting" }, "isPaidContent": { "type": "boolean" @@ -4260,6 +4259,9 @@ ], "type": "string" }, + "SharedAdTargeting": { + "type": "object" + }, "FETrailType": { "type": "object", "properties": { diff --git a/dotcom-rendering/src/model/front-schema.json b/dotcom-rendering/src/model/front-schema.json index fdb81e948d6..dcb7fa9d020 100644 --- a/dotcom-rendering/src/model/front-schema.json +++ b/dotcom-rendering/src/model/front-schema.json @@ -59,8 +59,7 @@ "type": "string" }, "sharedAdTargeting": { - "type": "object", - "additionalProperties": {} + "$ref": "#/definitions/SharedAdTargeting" }, "buildNumber": { "type": "string" @@ -3204,6 +3203,9 @@ "type": "boolean" } }, + "SharedAdTargeting": { + "type": "object" + }, "StageType": { "enum": [ "CODE", diff --git a/dotcom-rendering/src/model/tag-front-schema.json b/dotcom-rendering/src/model/tag-front-schema.json index e8cb77397c1..b3732d5bf20 100644 --- a/dotcom-rendering/src/model/tag-front-schema.json +++ b/dotcom-rendering/src/model/tag-front-schema.json @@ -866,8 +866,7 @@ "type": "string" }, "sharedAdTargeting": { - "type": "object", - "additionalProperties": {} + "$ref": "#/definitions/SharedAdTargeting" }, "buildNumber": { "type": "string" @@ -1550,6 +1549,9 @@ "type": "boolean" } }, + "SharedAdTargeting": { + "type": "object" + }, "StageType": { "enum": [ "CODE", diff --git a/dotcom-rendering/src/server/index.article.web.ts b/dotcom-rendering/src/server/index.article.web.ts index 7aa639aecc6..0ac907efaa4 100644 --- a/dotcom-rendering/src/server/index.article.web.ts +++ b/dotcom-rendering/src/server/index.article.web.ts @@ -7,7 +7,7 @@ import { enhanceTableOfContents } from '../model/enhanceTableOfContents'; import { validateAsArticleType } from '../model/validate'; import { recordTypeAndPlatform } from '../server/lib/logging-store'; import type { FEArticleBadgeType } from '../types/badge'; -import type { FEArticleType } from '../types/frontend'; +import type { FEArticleType, FEBlocksRequest } from '../types/frontend'; import { renderBlocks, renderHtml, diff --git a/dotcom-rendering/src/server/render.article.web.tsx b/dotcom-rendering/src/server/render.article.web.tsx index d0f2c2f64f1..2cfd117fb37 100644 --- a/dotcom-rendering/src/server/render.article.web.tsx +++ b/dotcom-rendering/src/server/render.article.web.tsx @@ -23,7 +23,7 @@ import { extractGA } from '../model/extract-ga'; import { extractNAV } from '../model/extract-nav'; import { makeWindowGuardian } from '../model/window-guardian'; import type { FEElement } from '../types/content'; -import type { FEArticleType } from '../types/frontend'; +import type { FEArticleType, FEBlocksRequest } from '../types/frontend'; import type { TagType } from '../types/tag'; import { htmlPageTemplate } from './htmlPageTemplate'; import { recipeSchema } from './temporaryRecipeStructuredData'; diff --git a/dotcom-rendering/src/types/config.ts b/dotcom-rendering/src/types/config.ts index 3efcf645833..22e8ec58cf4 100644 --- a/dotcom-rendering/src/types/config.ts +++ b/dotcom-rendering/src/types/config.ts @@ -1,3 +1,4 @@ +import type { SharedAdTargeting } from '../lib/ad-targeting'; import type { EditionId } from '../lib/edition'; export interface CommercialConfigType { @@ -61,7 +62,7 @@ export interface ConfigType extends CommercialConfigType { edition: EditionId; section: string; - sharedAdTargeting: { [key: string]: any }; + sharedAdTargeting: SharedAdTargeting; isPaidContent?: boolean; keywordIds: string; showRelatedContent: boolean; diff --git a/dotcom-rendering/src/types/front.ts b/dotcom-rendering/src/types/front.ts index cb2c3c30781..2cc8c45c966 100644 --- a/dotcom-rendering/src/types/front.ts +++ b/dotcom-rendering/src/types/front.ts @@ -1,4 +1,5 @@ import type { ArticlePillar, ArticleSpecial } from '@guardian/libs'; +import type { SharedAdTargeting } from '../lib/ad-targeting'; import type { EditionId } from '../lib/edition'; import type { DCRBadgeType } from './badge'; import type { Branding } from './branding'; @@ -399,7 +400,7 @@ export type FEFrontConfigType = { section: string; keywordIds: string; locationapiurl: string; - sharedAdTargeting: { [key: string]: unknown }; + sharedAdTargeting: SharedAdTargeting; buildNumber: string; abTests: ServerSideTests; pbIndexSites: { [key: string]: unknown }[]; diff --git a/dotcom-rendering/src/types/frontend.ts b/dotcom-rendering/src/types/frontend.ts index f464e4c845b..e93e38c4e16 100644 --- a/dotcom-rendering/src/types/frontend.ts +++ b/dotcom-rendering/src/types/frontend.ts @@ -1,3 +1,4 @@ +import type { SharedAdTargeting } from '../lib/ad-targeting'; import type { EditionId } from '../lib/edition'; import type { FEArticleBadgeType } from './badge'; import type { CommercialProperties } from './commercial'; @@ -126,3 +127,24 @@ export interface TableOfContentsItem { id: string; title: string; } + +/** + * BlocksRequest is the expected body format for POST requests made to /Blocks + */ +export interface FEBlocksRequest { + blocks: Block[]; + format: FEFormat; + host?: string; + pageId: string; + webTitle: string; + ajaxUrl: string; + isAdFreeUser: boolean; + isSensitive: boolean; + edition: string; + section: string; + sharedAdTargeting: SharedAdTargeting; + adUnit: string; + videoDuration?: number; + switches: { [key: string]: boolean }; + keywordIds: string; +} diff --git a/dotcom-rendering/src/types/newslettersPage.ts b/dotcom-rendering/src/types/newslettersPage.ts index dde45f86be0..46db55c9f43 100644 --- a/dotcom-rendering/src/types/newslettersPage.ts +++ b/dotcom-rendering/src/types/newslettersPage.ts @@ -26,7 +26,7 @@ type FENewslettersConfigType = { // videoDuration?: number; edition: EditionId; // section: string; - // sharedAdTargeting: { [key: string]: any }; + // sharedAdTargeting: SharedAdTargeting; idApiUrl: string; discussionApiUrl: string; // discussionD2Uid: string; From 7fb99cd84557eef25eee332e0fb5b1894e0dde9e Mon Sep 17 00:00:00 2001 From: Max Duval Date: Fri, 30 Jun 2023 14:25:15 +0100 Subject: [PATCH 065/147] refactor(isServer): extract duplicated logic This ensures alignment for all code that checks for server or client. No longer checks against `document`, only `window` --- .../src/components/EnhancePinnedPost.importable.tsx | 3 +-- dotcom-rendering/src/components/Liveness.importable.tsx | 3 +-- .../src/components/RecipeMultiplier.importable.tsx | 5 ++--- .../src/components/SecureSignupIframe.importable.tsx | 3 +-- .../src/components/SignInGate/componentEventTracking.tsx | 3 +-- dotcom-rendering/src/lib/isServer.ts | 1 + 6 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 dotcom-rendering/src/lib/isServer.ts diff --git a/dotcom-rendering/src/components/EnhancePinnedPost.importable.tsx b/dotcom-rendering/src/components/EnhancePinnedPost.importable.tsx index 025b4f7548b..5cd3ef34b6f 100644 --- a/dotcom-rendering/src/components/EnhancePinnedPost.importable.tsx +++ b/dotcom-rendering/src/components/EnhancePinnedPost.importable.tsx @@ -1,10 +1,9 @@ import { useEffect, useRef, useState } from 'react'; import { initPerf } from '../client/initPerf'; import { submitComponentEvent } from '../client/ophan/ophan'; +import { isServer } from '../lib/isServer'; import { useIsInView } from '../lib/useIsInView'; -const isServer = typeof window === 'undefined'; - const pinnedPost: HTMLElement | null = !isServer ? window.document.querySelector('[data-gu-marker=pinned-post]') : null; diff --git a/dotcom-rendering/src/components/Liveness.importable.tsx b/dotcom-rendering/src/components/Liveness.importable.tsx index 6bf6cf05f6f..e06634a6b1d 100644 --- a/dotcom-rendering/src/components/Liveness.importable.tsx +++ b/dotcom-rendering/src/components/Liveness.importable.tsx @@ -2,6 +2,7 @@ import { useCallback, useEffect, useState } from 'react'; import ReactDOM from 'react-dom'; import { initHydration } from '../client/islands/initHydration'; import { updateTimeElement } from '../client/relativeTime/updateTimeElements'; +import { isServer } from '../lib/isServer'; import { useApi } from '../lib/useApi'; import { Toast } from './Toast'; @@ -19,8 +20,6 @@ type Props = { selectedTopics?: Topic[]; }; -const isServer = typeof window === 'undefined'; - const topOfBlog: Element | null = !isServer ? window.document.getElementById('top-of-blog') : null; diff --git a/dotcom-rendering/src/components/RecipeMultiplier.importable.tsx b/dotcom-rendering/src/components/RecipeMultiplier.importable.tsx index d5b5c6ad2ff..cbfcb83508d 100644 --- a/dotcom-rendering/src/components/RecipeMultiplier.importable.tsx +++ b/dotcom-rendering/src/components/RecipeMultiplier.importable.tsx @@ -4,6 +4,7 @@ import { lifestyle, space, textSans } from '@guardian/source-foundations'; import { Button, SvgMinus, SvgPlus } from '@guardian/source-react-components'; import type { ChangeEventHandler } from 'react'; import { useEffect, useState } from 'react'; +import { isServer } from '../lib/isServer'; import { useOnce } from '../lib/useOnce'; const colours = ` @@ -34,8 +35,6 @@ const isUnit = (unit: string): unit is (typeof units)[number] => //@ts-expect-error -- custom type guard units.includes(unit); -const isServer = typeof document === 'undefined'; - /** These values should not update based on servings */ const constants = [ 's', @@ -156,7 +155,7 @@ export const RecipeMultiplier = () => { if (!(node instanceof Text)) continue; const match = - node.nodeValue?.match(RECIPE_ELEMENTS) ?? undefined; + node.nodeValue.match(RECIPE_ELEMENTS) ?? undefined; if (!match) continue; diff --git a/dotcom-rendering/src/components/SecureSignupIframe.importable.tsx b/dotcom-rendering/src/components/SecureSignupIframe.importable.tsx index a7d06cf7ac0..c4a4e5dfae0 100644 --- a/dotcom-rendering/src/components/SecureSignupIframe.importable.tsx +++ b/dotcom-rendering/src/components/SecureSignupIframe.importable.tsx @@ -16,8 +16,7 @@ import { getOphanRecordFunction, submitComponentEvent, } from '../client/ophan/ophan'; - -const isServer = typeof window === 'undefined'; +import { isServer } from '../lib/isServer'; // The Google documentation specifies that if the 'recaptcha-badge' is hidden, // their T+C's must be displayed instead. While this component hides the diff --git a/dotcom-rendering/src/components/SignInGate/componentEventTracking.tsx b/dotcom-rendering/src/components/SignInGate/componentEventTracking.tsx index e6cbf3a7437..2ab4665a1bb 100644 --- a/dotcom-rendering/src/components/SignInGate/componentEventTracking.tsx +++ b/dotcom-rendering/src/components/SignInGate/componentEventTracking.tsx @@ -1,8 +1,7 @@ import type { OphanComponent, OphanComponentEvent } from '@guardian/libs'; +import { isServer } from '../../lib/isServer'; import type { CurrentSignInGateABTest } from './types'; -const isServer = typeof window === 'undefined'; - export type ComponentEventParams = { componentType: string; componentId?: string; diff --git a/dotcom-rendering/src/lib/isServer.ts b/dotcom-rendering/src/lib/isServer.ts new file mode 100644 index 00000000000..df6bd5693a1 --- /dev/null +++ b/dotcom-rendering/src/lib/isServer.ts @@ -0,0 +1 @@ +export const isServer = typeof window === 'undefined'; From b203c3581f74d277c479278dcc1d08e98e7d255d Mon Sep 17 00:00:00 2001 From: Max Duval Date: Fri, 30 Jun 2023 15:52:41 +0100 Subject: [PATCH 066/147] chore(deps): bump atoms-rendering this enables asynchronous ad targeting --- dotcom-rendering/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index 02668c61ec2..0f100a97540 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -62,7 +62,7 @@ "@emotion/react": "11.10.5", "@emotion/server": "11.10.0", "@guardian/ab-core": "4.0.0", - "@guardian/atoms-rendering": "31.0.0", + "@guardian/atoms-rendering": "32.2.0", "@guardian/braze-components": "13.3.0", "@guardian/bridget": "2.3.0", "@guardian/browserslist-config": "5.0.0", diff --git a/yarn.lock b/yarn.lock index 9012c4a6f61..54a4e262406 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3489,10 +3489,10 @@ resolved "https://registry.yarnpkg.com/@guardian/ab-core/-/ab-core-5.0.0.tgz#cce32ff4cdfb6b24c013723bf352dcd61135d34d" integrity sha512-Td5gtK2sARl+fXj1Qe6RuFqf/zxuZjW1q2Jck09zXPIfMgU+sJoTi549zbNeC1cldCBhPWy/qPQ0r+8klfF7jg== -"@guardian/atoms-rendering@31.0.0": - version "31.0.0" - resolved "https://registry.yarnpkg.com/@guardian/atoms-rendering/-/atoms-rendering-31.0.0.tgz#31e0f727b574e3385ef6688767a507ea18c3a9b6" - integrity sha512-dWhTI/djARS0qhtvMmpa91Rcyz/O82KHFWNCXsQLOg74Na96p+ibl6mDUOW5M/xBiL5TbF5Ac/ZbWdspWsiwWA== +"@guardian/atoms-rendering@32.2.0": + version "32.2.0" + resolved "https://registry.yarnpkg.com/@guardian/atoms-rendering/-/atoms-rendering-32.2.0.tgz#00db2120252060e5e0c5b3b4b45897d18864cec4" + integrity sha512-14BFR+rb6iQ4qYcqX/aPt/C3iVYSfKrHZj5ps9EbDeOx8dKejohsLyPiPKaNkPj+M0CTH42r8kcOjatx4Yx1yw== dependencies: is-mobile "3.1.1" From d36891e43099104a121aa653763427674a680652 Mon Sep 17 00:00:00 2001 From: Max Duval Date: Thu, 29 Jun 2023 15:03:56 +0100 Subject: [PATCH 067/147] feat(adTargeting): use SWR to share targetting This simplifies the logic of handling ad targetting across all Islands by setting it once via SWR. --- .../src/components/ArticleBody.tsx | 4 -- .../src/components/ArticlePage.tsx | 15 ++++++ dotcom-rendering/src/components/FrontPage.tsx | 14 ++++++ .../src/components/LiveBlock.stories.tsx | 48 ------------------- dotcom-rendering/src/components/LiveBlock.tsx | 3 -- .../components/LiveBlogBlocksAndAdverts.tsx | 4 -- dotcom-rendering/src/components/MainMedia.tsx | 3 -- .../src/components/PinnedPost.stories.tsx | 28 ----------- .../components/SetAdTargeting.importable.tsx | 18 +++++++ .../src/components/TagFrontPage.tsx | 14 ++++++ .../YoutubeBlockComponent.importable.tsx | 5 +- .../src/layouts/CommentLayout.tsx | 13 ----- .../src/layouts/FullPageInteractiveLayout.tsx | 1 - .../src/layouts/ImmersiveLayout.tsx | 13 ----- .../src/layouts/InteractiveLayout.tsx | 13 ----- dotcom-rendering/src/layouts/LiveLayout.tsx | 14 ------ .../src/layouts/NewsletterSignupLayout.tsx | 14 +----- .../src/layouts/ShowcaseLayout.tsx | 13 ----- .../src/layouts/StandardLayout.tsx | 13 ----- dotcom-rendering/src/lib/ArticleRenderer.tsx | 3 -- dotcom-rendering/src/lib/LiveBlogRenderer.tsx | 4 -- dotcom-rendering/src/lib/renderElement.tsx | 5 -- dotcom-rendering/src/lib/useAdTargeting.ts | 33 +++++++++++++ .../src/server/render.article.web.tsx | 16 ------- 24 files changed, 99 insertions(+), 212 deletions(-) create mode 100644 dotcom-rendering/src/components/SetAdTargeting.importable.tsx create mode 100644 dotcom-rendering/src/lib/useAdTargeting.ts diff --git a/dotcom-rendering/src/components/ArticleBody.tsx b/dotcom-rendering/src/components/ArticleBody.tsx index 797004a8fe1..2d7e127e4ad 100644 --- a/dotcom-rendering/src/components/ArticleBody.tsx +++ b/dotcom-rendering/src/components/ArticleBody.tsx @@ -20,7 +20,6 @@ type Props = { format: ArticleFormat; blocks: Block[]; pinnedPost?: Block; - adTargeting: AdTargeting; host?: string; pageId: string; webTitle: string; @@ -123,7 +122,6 @@ export const ArticleBody = ({ format, blocks, pinnedPost, - adTargeting, host, pageId, webTitle, @@ -183,7 +181,6 @@ export const ArticleBody = ({ format={format} blocks={blocks} pinnedPost={pinnedPost} - adTargeting={adTargeting} host={host} pageId={pageId} webTitle={webTitle} @@ -239,7 +236,6 @@ export const ArticleBody = ({ { const { article, format, renderingTarget } = props; + + const adTargeting = buildAdTargeting({ + isAdFreeUser: article.isAdFreeUser, + isSensitive: article.config.isSensitive, + edition: article.config.edition, + section: article.config.section, + sharedAdTargeting: article.config.sharedAdTargeting, + adUnit: article.config.adUnit, + }); + return ( { isDev={!!article.config.isDev} /> + + + )} {renderingTarget === 'Apps' ? ( diff --git a/dotcom-rendering/src/components/FrontPage.tsx b/dotcom-rendering/src/components/FrontPage.tsx index cb2e80d58c4..65d336a3e49 100644 --- a/dotcom-rendering/src/components/FrontPage.tsx +++ b/dotcom-rendering/src/components/FrontPage.tsx @@ -2,6 +2,7 @@ import { css, Global } from '@emotion/react'; import { brandAlt, focusHalo, neutral } from '@guardian/source-foundations'; import { StrictMode } from 'react'; import { FrontLayout } from '../layouts/FrontLayout'; +import { buildAdTargeting } from '../lib/ad-targeting'; import { filterABTestSwitches } from '../model/enhance-switches'; import type { NavType } from '../model/extract-nav'; import type { DCRFrontType } from '../types/front'; @@ -12,6 +13,7 @@ import { FocusStyles } from './FocusStyles.importable'; import { Island } from './Island'; import { Metrics } from './Metrics.importable'; import { SetABTests } from './SetABTests.importable'; +import { SetAdTargeting } from './SetAdTargeting.importable'; import { ShowHideContainers } from './ShowHideContainers.importable'; import { SkipTo } from './SkipTo'; @@ -29,6 +31,15 @@ type Props = { * @param {NAVType} props.NAV - The article JSON data * */ export const FrontPage = ({ front, NAV }: Props) => { + const adTargeting = buildAdTargeting({ + isAdFreeUser: front.isAdFreeUser, + isSensitive: front.config.isSensitive, + edition: front.config.edition, + section: front.config.section, + sharedAdTargeting: front.config.sharedAdTargeting, + adUnit: front.config.adUnit, + }); + return ( { isDev={!!front.config.isDev} /> + + + ); diff --git a/dotcom-rendering/src/components/LiveBlock.stories.tsx b/dotcom-rendering/src/components/LiveBlock.stories.tsx index 31c31201b4a..bbd8a201bd5 100644 --- a/dotcom-rendering/src/components/LiveBlock.stories.tsx +++ b/dotcom-rendering/src/components/LiveBlock.stories.tsx @@ -64,10 +64,6 @@ export const VideoAsSecond = () => { return ( { return ( { return ( { return ( { return ( { return ( { return ( { return ( { return ( { return ( { return ( { return ( { { { { { { { { + if (isServer) { + throw new Error('SetAdTargeting is client only'); + } + + setAdTargeting(adTargeting); + log('commercial', '🎯 Ad targeting', adTargeting); + + return null; +}; diff --git a/dotcom-rendering/src/components/TagFrontPage.tsx b/dotcom-rendering/src/components/TagFrontPage.tsx index d186de41777..e694d8cdab6 100644 --- a/dotcom-rendering/src/components/TagFrontPage.tsx +++ b/dotcom-rendering/src/components/TagFrontPage.tsx @@ -2,6 +2,7 @@ import { css, Global } from '@emotion/react'; import { brandAlt, focusHalo, neutral } from '@guardian/source-foundations'; import { StrictMode } from 'react'; import { TagFrontLayout } from '../layouts/TagFrontLayout'; +import { buildAdTargeting } from '../lib/ad-targeting'; import { filterABTestSwitches } from '../model/enhance-switches'; import type { NavType } from '../model/extract-nav'; import type { DCRTagFrontType } from '../types/tagFront'; @@ -12,6 +13,7 @@ import { FocusStyles } from './FocusStyles.importable'; import { Island } from './Island'; import { Metrics } from './Metrics.importable'; import { SetABTests } from './SetABTests.importable'; +import { SetAdTargeting } from './SetAdTargeting.importable'; import { SkipTo } from './SkipTo'; type Props = { @@ -28,6 +30,15 @@ type Props = { * @param {NAVType} props.NAV - The article JSON data * */ export const TagFrontPage = ({ tagFront, NAV }: Props) => { + const adTargeting = buildAdTargeting({ + isAdFreeUser: tagFront.isAdFreeUser, + isSensitive: tagFront.config.isSensitive, + edition: tagFront.config.edition, + section: tagFront.config.section, + sharedAdTargeting: tagFront.config.sharedAdTargeting, + adUnit: tagFront.config.adUnit, + }); + return ( { isDev={!!tagFront.config.isDev} /> + + + ); diff --git a/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx b/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx index c71a456c143..b006f7b514d 100644 --- a/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx @@ -7,6 +7,7 @@ import { useEffect, useState } from 'react'; import { trackVideoInteraction } from '../client/ga/ga'; import { record } from '../client/ophan/ophan'; import { useAB } from '../lib/useAB'; +import { useAdTargeting } from '../lib/useAdTargeting'; import type { RoleType } from '../types/content'; import { Caption } from './Caption'; @@ -25,7 +26,6 @@ type Props = { url: string; width: number; }[]; - adTargeting?: AdTargeting; isMainMedia?: boolean; height?: number; width?: number; @@ -83,7 +83,6 @@ export const YoutubeBlockComponent = ({ posterImage, expired, role, - adTargeting, isMainMedia, height = 259, width = 460, @@ -95,6 +94,8 @@ export const YoutubeBlockComponent = ({ undefined, ); + const adTargeting = useAdTargeting(duration); + const abTests = useAB(); const abTestsApi = abTests?.api; const imaEnabled = diff --git a/dotcom-rendering/src/layouts/CommentLayout.tsx b/dotcom-rendering/src/layouts/CommentLayout.tsx index 964412cea21..57f133f5781 100644 --- a/dotcom-rendering/src/layouts/CommentLayout.tsx +++ b/dotcom-rendering/src/layouts/CommentLayout.tsx @@ -39,7 +39,6 @@ import { Standfirst } from '../components/Standfirst'; import { StickyBottomBanner } from '../components/StickyBottomBanner.importable'; import { SubMeta } from '../components/SubMeta'; import { SubNav } from '../components/SubNav.importable'; -import { buildAdTargeting } from '../lib/ad-targeting'; import { getSoleContributor } from '../lib/byline'; import { canRenderAds } from '../lib/canRenderAds'; import { getContributionsServiceUrl } from '../lib/contributions'; @@ -279,16 +278,6 @@ export const CommentLayout = ({ const isInEuropeTest = article.config.abTests.europeNetworkFrontVariant === 'variant'; - const adTargeting: AdTargeting = buildAdTargeting({ - isAdFreeUser: article.isAdFreeUser, - isSensitive: article.config.isSensitive, - videoDuration: article.config.videoDuration, - edition: article.config.edition, - section: article.config.section, - sharedAdTargeting: article.config.sharedAdTargeting, - adUnit: article.config.adUnit, - }); - const showBodyEndSlot = parse(article.slotMachineFlags ?? '').showBodyEnd || article.config.switches.slotBodyEnd; @@ -449,7 +438,6 @@ export const CommentLayout = ({ { const isInEuropeTest = article.config.abTests.europeNetworkFrontVariant === 'variant'; - const adTargeting: AdTargeting = buildAdTargeting({ - isAdFreeUser: article.isAdFreeUser, - isSensitive: article.config.isSensitive, - videoDuration: article.config.videoDuration, - edition: article.config.edition, - section: article.config.section, - sharedAdTargeting: article.config.sharedAdTargeting, - adUnit: article.config.adUnit, - }); const contributionsServiceUrl = getContributionsServiceUrl(article); const palette = decidePalette(format); @@ -493,7 +484,6 @@ export const NewsletterSignupLayout = ({ article, NAV, format }: Props) => { { const isInEuropeTest = article.config.abTests.europeNetworkFrontVariant === 'variant'; - const adTargeting: AdTargeting = buildAdTargeting({ - isAdFreeUser: article.isAdFreeUser, - isSensitive: article.config.isSensitive, - videoDuration: article.config.videoDuration, - edition: article.config.edition, - section: article.config.section, - sharedAdTargeting: article.config.sharedAdTargeting, - adUnit: article.config.adUnit, - }); - const showBodyEndSlot = parse(article.slotMachineFlags ?? '').showBodyEnd || article.config.switches.slotBodyEnd; @@ -537,7 +526,6 @@ export const StandardLayout = (props: WebProps | AppProps) => { { format={format} blocks={article.blocks} pinnedPost={article.pinnedPost} - adTargeting={adTargeting} host={host} pageId={article.pageId} webTitle={article.webTitle} diff --git a/dotcom-rendering/src/lib/ArticleRenderer.tsx b/dotcom-rendering/src/lib/ArticleRenderer.tsx index 2cf2f75988f..5346f59f464 100644 --- a/dotcom-rendering/src/lib/ArticleRenderer.tsx +++ b/dotcom-rendering/src/lib/ArticleRenderer.tsx @@ -27,7 +27,6 @@ const adStylesDynamic = css` type Props = { format: ArticleFormat; elements: FEElement[]; - adTargeting?: AdTargeting; host?: string; pageId: string; webTitle: string; @@ -49,7 +48,6 @@ type Props = { export const ArticleRenderer = ({ format, elements, - adTargeting, host, pageId, webTitle, @@ -74,7 +72,6 @@ export const ArticleRenderer = ({ key={index} format={format} element={element} - adTargeting={adTargeting} ajaxUrl={ajaxUrl} host={host} index={index} diff --git a/dotcom-rendering/src/lib/LiveBlogRenderer.tsx b/dotcom-rendering/src/lib/LiveBlogRenderer.tsx index b65ede4f590..2c114b8f5f2 100644 --- a/dotcom-rendering/src/lib/LiveBlogRenderer.tsx +++ b/dotcom-rendering/src/lib/LiveBlogRenderer.tsx @@ -17,7 +17,6 @@ import type { TagType } from '../types/tag'; type Props = { format: ArticleFormat; blocks: Block[]; - adTargeting: AdTargeting; pinnedPost?: Block; host?: string; pageId: string; @@ -45,7 +44,6 @@ export const LiveBlogRenderer = ({ format, blocks, pinnedPost, - adTargeting, host, pageId, webTitle, @@ -83,7 +81,6 @@ export const LiveBlogRenderer = ({ block={pinnedPost} pageId={pageId} webTitle={webTitle} - adTargeting={adTargeting} host={host} ajaxUrl={ajaxUrl} isLiveUpdate={isLiveUpdate} @@ -137,7 +134,6 @@ export const LiveBlogRenderer = ({ format={format} pageId={pageId} webTitle={webTitle} - adTargeting={adTargeting} host={host} ajaxUrl={ajaxUrl} isLiveUpdate={isLiveUpdate} diff --git a/dotcom-rendering/src/lib/renderElement.tsx b/dotcom-rendering/src/lib/renderElement.tsx index fd7ee6dc680..2a641604ccb 100644 --- a/dotcom-rendering/src/lib/renderElement.tsx +++ b/dotcom-rendering/src/lib/renderElement.tsx @@ -71,7 +71,6 @@ import { decidePalette } from './decidePalette'; type Props = { format: ArticleFormat; element: FEElement; - adTargeting?: AdTargeting; host?: string; index: number; isMainMedia: boolean; @@ -126,7 +125,6 @@ const updateRole = (el: FEElement, format: ArticleFormat): FEElement => { export const renderElement = ({ format, element, - adTargeting, host, index, hideCaption, @@ -736,7 +734,6 @@ export const renderElement = ({ key={index} hideCaption={hideCaption} role="inline" - adTargeting={adTargeting} isMainMedia={isMainMedia} id={element.id} elementId={element.elementId} @@ -784,7 +781,6 @@ const bareElements = new Set([ export const RenderArticleElement = ({ format, element, - adTargeting, ajaxUrl, host, index, @@ -804,7 +800,6 @@ export const RenderArticleElement = ({ const el = renderElement({ format, element: withUpdatedRole, - adTargeting, ajaxUrl, host, index, diff --git a/dotcom-rendering/src/lib/useAdTargeting.ts b/dotcom-rendering/src/lib/useAdTargeting.ts new file mode 100644 index 00000000000..1c5c319eeec --- /dev/null +++ b/dotcom-rendering/src/lib/useAdTargeting.ts @@ -0,0 +1,33 @@ +import { log } from '@guardian/libs'; +import { mutate } from 'swr'; +import useSWRImmutable from 'swr/immutable'; + +const key = 'ad-targeting'; +const apiPromise = new Promise(() => { + /* this never resolves */ +}); + +/** + * A hook which returns the Ad Targeting for a given page. + * + * @param videoLength allows overriding video length, when there are multiple videos on a page + */ +export const useAdTargeting = ( + videoLength?: number, +): AdTargeting | undefined => { + const { data } = useSWRImmutable(key, () => apiPromise); + + if (data && !data.disableAds && typeof videoLength === 'number') { + data.customParams['vl'] = videoLength; + log( + 'commercial', + `🎯 Ad Targeting – video length (vl) overriden to ${videoLength}`, + ); + } + + return data; +}; + +export const setAdTargeting = (adTargeting: AdTargeting): void => { + void mutate(key, adTargeting, false); +}; diff --git a/dotcom-rendering/src/server/render.article.web.tsx b/dotcom-rendering/src/server/render.article.web.tsx index 2cfd117fb37..9c32aa1c6f8 100644 --- a/dotcom-rendering/src/server/render.article.web.tsx +++ b/dotcom-rendering/src/server/render.article.web.tsx @@ -6,7 +6,6 @@ import { import { ArticlePage } from '../components/ArticlePage'; import { isAmpSupported } from '../components/Elements.amp'; import { KeyEventsContainer } from '../components/KeyEventsContainer'; -import { buildAdTargeting } from '../lib/ad-targeting'; import { ASSET_ORIGIN, generateScriptTags, @@ -261,31 +260,16 @@ export const renderBlocks = ({ ajaxUrl, isAdFreeUser, isSensitive, - videoDuration, - edition, section, - sharedAdTargeting, - adUnit, switches, keywordIds, }: FEBlocksRequest): string => { const format: ArticleFormat = decideFormat(FEFormat); - const adTargeting: AdTargeting = buildAdTargeting({ - isAdFreeUser, - isSensitive, - videoDuration, - edition, - section, - sharedAdTargeting, - adUnit, - }); - const { html, extractedCss } = renderToStringWithEmotion( Date: Mon, 3 Jul 2023 00:49:33 +0100 Subject: [PATCH 068/147] Add decideAdSlot to fronts fixed/video container --- dotcom-rendering/src/layouts/FrontLayout.tsx | 96 +++++++++++-------- .../src/lib/getAdPositions.test.ts | 34 +++++++ 2 files changed, 89 insertions(+), 41 deletions(-) diff --git a/dotcom-rendering/src/layouts/FrontLayout.tsx b/dotcom-rendering/src/layouts/FrontLayout.tsx index c4ef4d94b24..2af6ad6e9ef 100644 --- a/dotcom-rendering/src/layouts/FrontLayout.tsx +++ b/dotcom-rendering/src/layouts/FrontLayout.tsx @@ -454,47 +454,61 @@ export const FrontLayout = ({ front, NAV }: Props) => { const containerOverrides = decideContainerOverrides(containerPalette); return ( -
0} - padContent={false} - url={collection.href} - containerPalette={containerPalette} - showDateHeader={ - collection.config.showDateHeader - } - editionId={front.editionId} - backgroundColour={ - containerOverrides.background.containerOuter - } - innerBackgroundColour={ - containerOverrides.background.container - } - hasPageSkin={hasPageSkin} - > - - - -
+ <> +
0} + padContent={false} + url={collection.href} + containerPalette={containerPalette} + showDateHeader={ + collection.config.showDateHeader + } + editionId={front.editionId} + backgroundColour={ + containerOverrides.background + .containerOuter + } + innerBackgroundColour={ + containerOverrides.background.container + } + hasPageSkin={hasPageSkin} + > + + + +
+ {decideAdSlot( + renderAds, + index, + front.isNetworkFront, + front.pressedPage.collections.length, + front.pressedPage.frontProperties + .isPaidContent, + mobileAdPositions, + hasPageSkin, + )} + ); } diff --git a/dotcom-rendering/src/lib/getAdPositions.test.ts b/dotcom-rendering/src/lib/getAdPositions.test.ts index 282c587659f..fb2ed8cca3a 100644 --- a/dotcom-rendering/src/lib/getAdPositions.test.ts +++ b/dotcom-rendering/src/lib/getAdPositions.test.ts @@ -116,6 +116,40 @@ describe('Mobile Ads', () => { expect(mobileAdPositions).toEqual([0, 2, 6, 9, 12, 16, 18, 20, 22]); }); + // We used https://www.theguardian.com/international as a blueprint + it('International Network Front, with more than 4 collections, with thrashers at various places', () => { + const merchHighPosition = 3; + const testCollections: Pick[] = [ + { collectionType: 'dynamic/fast' }, // 0 headlines (top-above-nav) + { collectionType: 'fixed/small/slow-IV' }, // 1 ukraine + { collectionType: 'dynamic/slow' }, // 2 spotlight (m1) + { collectionType: 'dynamic/slow-mpu' }, // 3 opinion (merch-high) + { collectionType: 'dynamic/slow' }, // 4 sport + { collectionType: 'fixed/thrasher' }, // 5 wordiply + { collectionType: 'fixed/small/slow-IV' }, // 6 europe (mobile-2) + { collectionType: 'dynamic/fast' }, // 7 world + { collectionType: 'fixed/small/slow-IV' }, // 8 climate + { collectionType: 'fixed/thrasher' }, // 9 tip us off (mobile-3) + { collectionType: 'dynamic/slow-mpu' }, // 10 culture + { collectionType: 'fixed/thrasher' }, // 11 cotton capital + { collectionType: 'dynamic/slow-mpu' }, // 12 lifestyle + { collectionType: 'fixed/thrasher' }, // 13 documentaries (mobile-4) + { collectionType: 'dynamic/slow-mpu' }, // 14 explore + { collectionType: 'fixed/small/slow-IV' }, // 15 take part (mobile-5) + { collectionType: 'fixed/small/slow-IV' }, // 16 podcasts + { collectionType: 'fixed/video' }, // 17 videos (mobile-6) + { collectionType: 'fixed/medium/slow-VI' }, // 18 in pictures + { collectionType: 'news/most-popular' }, // 19 most popular + ]; + + const mobileAdPositions = getMobileAdPositions( + testCollections, + merchHighPosition, + ); + + expect(mobileAdPositions).toEqual([0, 2, 6, 9, 13, 15, 17]); + }); + // We used https://www.theguardian.com/us as a blueprint it('US Network Front, with more than 4 collections, with thrashers at various places', () => { const merchHighPosition = 3; From 262d04963db142143e0e25913c01228f6a0b903e Mon Sep 17 00:00:00 2001 From: Max Duval Date: Mon, 3 Jul 2023 08:44:10 +0100 Subject: [PATCH 069/147] chore(enhanceBlocks): remove unused import the recipe enhancer is no longer a thing --- dotcom-rendering/src/model/enhanceBlocks.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dotcom-rendering/src/model/enhanceBlocks.ts b/dotcom-rendering/src/model/enhanceBlocks.ts index 907288b997c..d9a0b65254b 100644 --- a/dotcom-rendering/src/model/enhanceBlocks.ts +++ b/dotcom-rendering/src/model/enhanceBlocks.ts @@ -8,10 +8,6 @@ import { enhanceH3s } from './enhance-H3s'; import { enhanceImages } from './enhance-images'; import { enhanceInteractiveContentsElements } from './enhance-interactive-contents-elements'; import { enhanceNumberedLists } from './enhance-numbered-lists'; -/** - * Removing this enhancer temporarily because it's causing a bug in production - */ -// import { enhanceRecipes } from './enhance-recipes'; import { enhanceTweets } from './enhance-tweets'; import { insertPromotedNewsletter } from './insertPromotedNewsletter'; import { validateAsBlock } from './validate'; From 4e06ddaab220f1bde0bbbe3614035e5390369a66 Mon Sep 17 00:00:00 2001 From: Ravi <7014230+arelra@users.noreply.github.com> Date: Mon, 3 Jul 2023 09:03:10 +0100 Subject: [PATCH 070/147] Fix fragment key --- dotcom-rendering/src/layouts/FrontLayout.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dotcom-rendering/src/layouts/FrontLayout.tsx b/dotcom-rendering/src/layouts/FrontLayout.tsx index 2af6ad6e9ef..ad9ae920037 100644 --- a/dotcom-rendering/src/layouts/FrontLayout.tsx +++ b/dotcom-rendering/src/layouts/FrontLayout.tsx @@ -454,9 +454,8 @@ export const FrontLayout = ({ front, NAV }: Props) => { const containerOverrides = decideContainerOverrides(containerPalette); return ( - <> +
{ mobileAdPositions, hasPageSkin, )} - + ); } From f772abcbfa3b6db709b088ddca029769baff86f2 Mon Sep 17 00:00:00 2001 From: Ashleigh Carr Date: Mon, 3 Jul 2023 10:49:26 +0100 Subject: [PATCH 071/147] Fix linting errors in `Snap.tsx` --- dotcom-rendering/src/components/Snap.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotcom-rendering/src/components/Snap.tsx b/dotcom-rendering/src/components/Snap.tsx index 5e5d6ba9382..ba70e958cdc 100644 --- a/dotcom-rendering/src/components/Snap.tsx +++ b/dotcom-rendering/src/components/Snap.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; import type { DCRSnapType } from '../types/front'; +// Some thrashers don't have "width: 100%" applied to their first element which causes them to not correctly take up their space const snapStyles = css` overflow: hidden; position: relative; display: flex; - // Some thrashers don't have "width: 100%" applied to their first element which causes them to not correctly take up their space > * { width: 100%; } From ab2634988b4491d4b07f448fc63b3f0c82ef29fa Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Mon, 3 Jul 2023 11:07:10 +0100 Subject: [PATCH 072/147] Don't show age on the cards of the newsletters section --- dotcom-rendering/src/components/Card/Card.tsx | 2 +- dotcom-rendering/src/layouts/FrontLayout.tsx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dotcom-rendering/src/components/Card/Card.tsx b/dotcom-rendering/src/components/Card/Card.tsx index 0c89b6348d8..728add73cb0 100644 --- a/dotcom-rendering/src/components/Card/Card.tsx +++ b/dotcom-rendering/src/components/Card/Card.tsx @@ -294,7 +294,7 @@ export const Card = ({ containerPalette={containerPalette} displayLines={displayLines} age={ - webPublicationDate ? ( + showAge && webPublicationDate ? ( { containerPalette={ collection.containerPalette } + showAge={ + collection.displayName !== 'Newsletters' + } adIndex={desktopAdPositions.indexOf(index)} renderAds={renderAds} /> From 6f11d5ae02a27a1db5598ed6fe4bedc08dcc5a43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 11:23:47 +0100 Subject: [PATCH 073/147] Bump sanitize-html and @types/sanitize-html (#8108) Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) and [@types/sanitize-html](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sanitize-html). These dependencies needed to be updated together. Updates `sanitize-html` from 2.9.0 to 2.11.0 - [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md) - [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.9.0...2.11.0) Updates `@types/sanitize-html` from 2.8.0 to 2.9.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sanitize-html) --- updated-dependencies: - dependency-name: sanitize-html dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: "@types/sanitize-html" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dotcom-rendering/package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index 0f100a97540..83836140cc1 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -132,7 +132,7 @@ "@types/relateurl": "0.2.29", "@types/response-time": "2.3.5", "@types/rimraf": "3.0.2", - "@types/sanitize-html": "2.8.0", + "@types/sanitize-html": "2.9.0", "@types/scheduler": "0.16.2", "@types/serve-static": "1.15.0", "@types/testing-library__jest-dom": "5.14.5", @@ -238,7 +238,7 @@ "require-from-string": "2.0.2", "response-time": "2.3.2", "rimraf": "3.0.2", - "sanitize-html": "2.9.0", + "sanitize-html": "2.11.0", "scheduler": "0.23.0", "serve-static": "1.15.0", "simple-progress-webpack-plugin": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 54a4e262406..5fd0e608322 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6213,10 +6213,10 @@ "@types/glob" "*" "@types/node" "*" -"@types/sanitize-html@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.8.0.tgz#c53d3114d832734fc299568a3458a49f9edc1eef" - integrity sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg== +"@types/sanitize-html@2.9.0": + version "2.9.0" + resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.9.0.tgz#5b609f7592de22ef80a0930c39670329753dca1b" + integrity sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg== dependencies: htmlparser2 "^8.0.0" @@ -16780,10 +16780,10 @@ safe-stable-stringify@^2.2.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-html@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.9.0.tgz#f4829557b0175df9059d90fe972d5e6facb8565c" - integrity sha512-KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg== +sanitize-html@2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.11.0.tgz#9a6434ee8fcaeddc740d8ae7cd5dd71d3981f8f6" + integrity sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA== dependencies: deepmerge "^4.2.2" escape-string-regexp "^4.0.0" From f1c6ab0a274896e706507bd13bfcaa4f4ca1cdc5 Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Mon, 3 Jul 2023 11:23:48 +0100 Subject: [PATCH 074/147] fix show more show age logic --- .../src/components/FrontSection.tsx | 18 +++++++++--------- .../src/components/LabsSection.tsx | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dotcom-rendering/src/components/FrontSection.tsx b/dotcom-rendering/src/components/FrontSection.tsx index f2b9a7a2ae5..b7809d4a8f6 100644 --- a/dotcom-rendering/src/components/FrontSection.tsx +++ b/dotcom-rendering/src/components/FrontSection.tsx @@ -474,7 +474,7 @@ export const FrontSection = ({ hasPageSkin && pageSkinContainer, css` background-color: ${decideBackgroundColour( - overrides?.background?.container, + overrides?.background.container, hasPageSkin, )}; `, @@ -482,7 +482,7 @@ export const FrontSection = ({ >
@@ -502,7 +502,7 @@ export const FrontSection = ({
@@ -619,7 +619,7 @@ export const FrontSection = ({ ajaxUrl={ajaxUrl} editionId={editionId} containerPalette={containerPalette} - showAge={title === 'Headlines'} + showAge={title !== 'Newsletters'} /> ) : null} @@ -638,8 +638,8 @@ export const FrontSection = ({
)} diff --git a/dotcom-rendering/src/components/LabsSection.tsx b/dotcom-rendering/src/components/LabsSection.tsx index c650290eaec..c192e6e668a 100644 --- a/dotcom-rendering/src/components/LabsSection.tsx +++ b/dotcom-rendering/src/components/LabsSection.tsx @@ -397,23 +397,23 @@ export const LabsSection = ({ >
@@ -428,7 +428,7 @@ export const LabsSection = ({ {children} @@ -441,7 +441,7 @@ export const LabsSection = ({ pageId={pageId} ajaxUrl={ajaxUrl} containerPalette={'Branded'} - showAge={false} + showAge={true} /> )} @@ -449,7 +449,7 @@ export const LabsSection = ({
Paid for by From 3bea825ce8f52ba6ea1caa9499f54382968f944e Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Mon, 3 Jul 2023 12:32:02 +0100 Subject: [PATCH 075/147] add some more containers that we don't want to show the age --- dotcom-rendering/src/components/FrontSection.tsx | 3 ++- dotcom-rendering/src/layouts/FrontLayout.tsx | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dotcom-rendering/src/components/FrontSection.tsx b/dotcom-rendering/src/components/FrontSection.tsx index b7809d4a8f6..bbf605c5181 100644 --- a/dotcom-rendering/src/components/FrontSection.tsx +++ b/dotcom-rendering/src/components/FrontSection.tsx @@ -10,6 +10,7 @@ import { until, } from '@guardian/source-foundations'; import { Hide } from '@guardian/source-react-components'; +import { dontShowAge } from '../layouts/FrontLayout'; import { pageSkinContainer } from '../layouts/lib/pageSkin'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { EditionId } from '../lib/edition'; @@ -619,7 +620,7 @@ export const FrontSection = ({ ajaxUrl={ajaxUrl} editionId={editionId} containerPalette={containerPalette} - showAge={title !== 'Newsletters'} + showAge={!dontShowAge.includes(title)} /> ) : null} diff --git a/dotcom-rendering/src/layouts/FrontLayout.tsx b/dotcom-rendering/src/layouts/FrontLayout.tsx index 725505959e8..68220261402 100644 --- a/dotcom-rendering/src/layouts/FrontLayout.tsx +++ b/dotcom-rendering/src/layouts/FrontLayout.tsx @@ -109,6 +109,13 @@ const decideAdSlot = ( return null; }; +export const dontShowAge = [ + 'Newsletters', + 'Showcase', + 'How to listen to Podcasts', + 'Get in touch', +]; + export const FrontLayout = ({ front, NAV }: Props) => { const { config: { abTests, isPaidContent, hasPageSkin }, @@ -545,7 +552,9 @@ export const FrontLayout = ({ front, NAV }: Props) => { collection.containerPalette } showAge={ - collection.displayName !== 'Newsletters' + !dontShowAge.includes( + collection.displayName, + ) } adIndex={desktopAdPositions.indexOf(index)} renderAds={renderAds} From 58aee857e268fe7299905ae550590e7c3c5a665e Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Mon, 3 Jul 2023 12:56:30 +0100 Subject: [PATCH 076/147] update name --- dotcom-rendering/src/components/FrontSection.tsx | 4 ++-- dotcom-rendering/src/layouts/FrontLayout.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dotcom-rendering/src/components/FrontSection.tsx b/dotcom-rendering/src/components/FrontSection.tsx index bbf605c5181..b0cbd84f793 100644 --- a/dotcom-rendering/src/components/FrontSection.tsx +++ b/dotcom-rendering/src/components/FrontSection.tsx @@ -10,7 +10,7 @@ import { until, } from '@guardian/source-foundations'; import { Hide } from '@guardian/source-react-components'; -import { dontShowAge } from '../layouts/FrontLayout'; +import { hideAge } from '../layouts/FrontLayout'; import { pageSkinContainer } from '../layouts/lib/pageSkin'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { EditionId } from '../lib/edition'; @@ -620,7 +620,7 @@ export const FrontSection = ({ ajaxUrl={ajaxUrl} editionId={editionId} containerPalette={containerPalette} - showAge={!dontShowAge.includes(title)} + showAge={!hideAge.includes(title)} /> ) : null} diff --git a/dotcom-rendering/src/layouts/FrontLayout.tsx b/dotcom-rendering/src/layouts/FrontLayout.tsx index 68220261402..d1513ce3eb9 100644 --- a/dotcom-rendering/src/layouts/FrontLayout.tsx +++ b/dotcom-rendering/src/layouts/FrontLayout.tsx @@ -109,7 +109,7 @@ const decideAdSlot = ( return null; }; -export const dontShowAge = [ +export const hideAge = [ 'Newsletters', 'Showcase', 'How to listen to Podcasts', @@ -552,7 +552,7 @@ export const FrontLayout = ({ front, NAV }: Props) => { collection.containerPalette } showAge={ - !dontShowAge.includes( + !hideAge.includes( collection.displayName, ) } From f52addcc0731b53e7fb080dbd995cf225e376660 Mon Sep 17 00:00:00 2001 From: DanielCliftonGuardian <110032454+DanielCliftonGuardian@users.noreply.github.com> Date: Mon, 3 Jul 2023 15:15:01 +0100 Subject: [PATCH 077/147] refactor for lint --- dotcom-rendering/src/components/FrontSection.tsx | 2 +- dotcom-rendering/src/layouts/FrontLayout.tsx | 8 +------- dotcom-rendering/src/lib/hideAge.ts | 6 ++++++ 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 dotcom-rendering/src/lib/hideAge.ts diff --git a/dotcom-rendering/src/components/FrontSection.tsx b/dotcom-rendering/src/components/FrontSection.tsx index b0cbd84f793..a50abc7da7b 100644 --- a/dotcom-rendering/src/components/FrontSection.tsx +++ b/dotcom-rendering/src/components/FrontSection.tsx @@ -10,10 +10,10 @@ import { until, } from '@guardian/source-foundations'; import { Hide } from '@guardian/source-react-components'; -import { hideAge } from '../layouts/FrontLayout'; import { pageSkinContainer } from '../layouts/lib/pageSkin'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { EditionId } from '../lib/edition'; +import { hideAge } from '../lib/hideAge'; import type { DCRBadgeType } from '../types/badge'; import type { DCRContainerPalette, TreatType } from '../types/front'; import type { DCRFrontPagination } from '../types/tagFront'; diff --git a/dotcom-rendering/src/layouts/FrontLayout.tsx b/dotcom-rendering/src/layouts/FrontLayout.tsx index d1513ce3eb9..723b1e8e725 100644 --- a/dotcom-rendering/src/layouts/FrontLayout.tsx +++ b/dotcom-rendering/src/layouts/FrontLayout.tsx @@ -38,6 +38,7 @@ import { getMerchHighPosition, getMobileAdPositions, } from '../lib/getAdPositions'; +import { hideAge } from '../lib/hideAge'; import type { NavType } from '../model/extract-nav'; import type { DCRCollectionType, DCRFrontType } from '../types/front'; import { pageSkinContainer } from './lib/pageSkin'; @@ -109,13 +110,6 @@ const decideAdSlot = ( return null; }; -export const hideAge = [ - 'Newsletters', - 'Showcase', - 'How to listen to Podcasts', - 'Get in touch', -]; - export const FrontLayout = ({ front, NAV }: Props) => { const { config: { abTests, isPaidContent, hasPageSkin }, diff --git a/dotcom-rendering/src/lib/hideAge.ts b/dotcom-rendering/src/lib/hideAge.ts new file mode 100644 index 00000000000..5b554e13c96 --- /dev/null +++ b/dotcom-rendering/src/lib/hideAge.ts @@ -0,0 +1,6 @@ +export const hideAge = [ + 'Newsletters', + 'Showcase', + 'How to listen to Podcasts', + 'Get in touch', +]; From bb6acf6fc7be9a65788bb119531b3ebf1e76c7c1 Mon Sep 17 00:00:00 2001 From: Charlotte Emms <43961396+cemms1@users.noreply.github.com> Date: Mon, 3 Jul 2023 16:19:02 +0100 Subject: [PATCH 078/147] Add expanded Nav story for Chromatic (#8113) * upgrade storybook/testing-library * add expanded nav story * fix linting issues with async play func --- dotcom-rendering/package.json | 2 +- ...anTerritorySwitcher.importable.stories.tsx | 4 +- .../src/components/Nav/Nav.stories.tsx | 38 +++++++++++++ .../src/components/ShowMore.stories.tsx | 4 +- yarn.lock | 55 +++---------------- 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index 0b0ecdb4981..ef3a326e9f3 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -93,7 +93,7 @@ "@storybook/core-events": "7.0.2", "@storybook/react": "7.0.2", "@storybook/react-webpack5": "7.0.2", - "@storybook/testing-library": "0.0.14-next.2", + "@storybook/testing-library": "0.2.0", "@storybook/theming": "7.0.10", "@swc/cli": "0.1.62", "@swc/core": "1.3.38", diff --git a/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.stories.tsx b/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.stories.tsx index f9325dd23d2..a4ef8986efe 100644 --- a/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.stories.tsx +++ b/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.stories.tsx @@ -18,8 +18,8 @@ export const Queensland = () => ( * Clicks the “Not in Queensland” button so that Chromatic can capture * it the component in its `expanded` state. */ -Queensland.play = ({ canvasElement }: { canvasElement: HTMLElement }) => { +Queensland.play = async ({ canvasElement }: { canvasElement: HTMLElement }) => { const canvas = within(canvasElement); - userEvent.click(canvas.getByRole('button')); + await userEvent.click(canvas.getByRole('button')); }; Queensland.storyName = 'Queensland (expanded)'; diff --git a/dotcom-rendering/src/components/Nav/Nav.stories.tsx b/dotcom-rendering/src/components/Nav/Nav.stories.tsx index 9db0e773884..a9aa3c0b79d 100644 --- a/dotcom-rendering/src/components/Nav/Nav.stories.tsx +++ b/dotcom-rendering/src/components/Nav/Nav.stories.tsx @@ -1,5 +1,6 @@ import { ArticlePillar } from '@guardian/libs'; import { brandBackground, brandBorder } from '@guardian/source-foundations'; +import { userEvent, within } from '@storybook/testing-library'; import { Section } from '../Section'; import { Nav } from './Nav'; import { nav } from './Nav.mock'; @@ -99,3 +100,40 @@ export const ImmersiveStory = () => { ); }; ImmersiveStory.storyName = 'Immersive'; + +export const ExpandedMenuStory = () => { + return ( +
+
+ ); +}; + +/** + * Clicks the “More" button so that Chromatic can capture the component in its `expanded` state. + */ +ExpandedMenuStory.play = async ({ + canvasElement, +}: { + canvasElement: HTMLElement; +}) => { + const canvas = within(canvasElement); + await userEvent.click(canvas.getByLabelText(/More/)); +}; +ExpandedMenuStory.storyName = 'ExpandedMenu'; diff --git a/dotcom-rendering/src/components/ShowMore.stories.tsx b/dotcom-rendering/src/components/ShowMore.stories.tsx index 18880609977..fd164ba26c6 100644 --- a/dotcom-rendering/src/components/ShowMore.stories.tsx +++ b/dotcom-rendering/src/components/ShowMore.stories.tsx @@ -7,9 +7,9 @@ import { ShowMore } from './ShowMore.importable'; * Clicks the 'show more' button so that Chromatic can capture it the component * in its 'open' state. */ -const play = ({ canvasElement }: { canvasElement: HTMLElement }) => { +const play = async ({ canvasElement }: { canvasElement: HTMLElement }) => { const canvas = within(canvasElement); - userEvent.click(canvas.getByRole('button')); + await userEvent.click(canvas.getByRole('button')); }; const title = 'Opinion'; diff --git a/yarn.lock b/yarn.lock index b7c2c5a9615..ab7849bf792 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4989,7 +4989,7 @@ "@storybook/client-logger" "7.0.2" "@storybook/preview-api" "7.0.2" -"@storybook/client-logger@7.0.10", "@storybook/client-logger@^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": +"@storybook/client-logger@7.0.10": version "7.0.10" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.10.tgz#941f6cf54638a422732b40ec31b2414872cdf4a8" integrity sha512-hb8tO+w28ErzjEw69ERMtZT81Xyg835FQjH6Y42ejoGcBA9Z0W6RZmx4RgkcIUOlYXkU6lSnNVne9gXodV4/Hw== @@ -5186,17 +5186,6 @@ resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed" integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ== -"@storybook/instrumenter@^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@storybook/instrumenter/-/instrumenter-7.0.2.tgz#a94031d3678d7a7829e6ebe0d07e2b986f96593a" - integrity sha512-zr9/fuaYtGVUtcL8XgjA4Iq5jtzdcqQyOSH4XLXtz6JtSad3lkRagbJo2Vzbw7dO/4vzjfTMxEzvWjUuPxLOhA== - dependencies: - "@storybook/channels" "7.0.2" - "@storybook/client-logger" "7.0.2" - "@storybook/core-events" "7.0.2" - "@storybook/global" "^5.0.0" - "@storybook/preview-api" "7.0.2" - "@storybook/manager-api@7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.0.2.tgz#2b1c509be94b644cfec9dd817f62394f2788a287" @@ -5378,15 +5367,13 @@ nanoid "^3.3.1" read-pkg-up "^7.0.1" -"@storybook/testing-library@0.0.14-next.2": - version "0.0.14-next.2" - resolved "https://registry.yarnpkg.com/@storybook/testing-library/-/testing-library-0.0.14-next.2.tgz#458e6c7623118e24826ba73b80db0a887f3f57e8" - integrity sha512-i/SLSGm0o978ELok/SB4Qg1sZ3zr+KuuCkzyFqcCD0r/yf+bG35aQGkFqqxfSAdDxuQom0NO02FE+qys5Eapdg== +"@storybook/testing-library@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@storybook/testing-library/-/testing-library-0.2.0.tgz#09202b90ea5bd67b503dbb1a0b1f3ab3eb005d04" + integrity sha512-Ff6jNnrsosmDshgCf0Eb5Cz7IA34p/1Ps5N3Kp3598kfXpBSccSkQQvVFUXC3kIHw/isIXWPqntZuKqnWUz7Gw== dependencies: - "@storybook/client-logger" "^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0" - "@storybook/instrumenter" "^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0" - "@testing-library/dom" "^8.3.0" - "@testing-library/user-event" "^13.2.1" + "@testing-library/dom" "^9.0.0" + "@testing-library/user-event" "^14.0.0" ts-dedent "^2.2.0" "@storybook/theming@7.0.10": @@ -5526,20 +5513,6 @@ lz-string "^1.5.0" pretty-format "^27.0.2" -"@testing-library/dom@^8.3.0": - version "8.20.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.20.0.tgz#914aa862cef0f5e89b98cc48e3445c4c921010f6" - integrity sha512-d9ULIT+a4EXLX3UU8FBjauG9NnsZHkHztXoIcTsOKoOw030fyjheN9svkTULjJxtYag9DZz5Jz5qkWZDPxTFwA== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/runtime" "^7.12.5" - "@types/aria-query" "^5.0.1" - aria-query "^5.0.0" - chalk "^4.1.0" - dom-accessibility-api "^0.5.9" - lz-string "^1.4.4" - pretty-format "^27.0.2" - "@testing-library/jest-dom@5.16.5": version "5.16.5" resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e" @@ -5564,18 +5537,11 @@ "@testing-library/dom" "^9.0.0" "@types/react-dom" "^18.0.0" -"@testing-library/user-event@14.4.3": +"@testing-library/user-event@14.4.3", "@testing-library/user-event@^14.0.0": version "14.4.3" resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591" integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q== -"@testing-library/user-event@^13.2.1": - version "13.5.0" - resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-13.5.0.tgz#69d77007f1e124d55314a2b73fd204b333b13295" - integrity sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg== - dependencies: - "@babel/runtime" "^7.12.5" - "@textlint/ast-node-types@^12.6.1": version "12.6.1" resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz#35ecefe74e701d7f632c083d4fda89cab1b89012" @@ -13756,11 +13722,6 @@ lru_map@^0.3.3: resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ== -lz-string@^1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" - integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== - lz-string@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941" From 4f3928ccfff32bd3d772bd7fd5010947f58928d7 Mon Sep 17 00:00:00 2001 From: Alex Sanders Date: Thu, 29 Jun 2023 14:19:52 +0100 Subject: [PATCH 079/147] add `make storybook-dev` --- dotcom-rendering/makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dotcom-rendering/makefile b/dotcom-rendering/makefile index a2c8c01ee64..229eba0c290 100644 --- a/dotcom-rendering/makefile +++ b/dotcom-rendering/makefile @@ -99,6 +99,12 @@ dev-debug: clear clean-dist install $(call log, "Open chrome://inspect in Chrome to attach to the debugger") @NODE_ENV=development NODE_OPTIONS="--inspect" webpack serve --config ./scripts/webpack/webpack.config.js +# storybook ######################################### + +storybook-dev: clear clean-dist install + $(call log, "starting Storybook DEV server") + yarn storybook + # tests ##################################### cypress: clear clean-dist install build From 56ebd595d150fd94aa76a51e3bec64c78b62dc5f Mon Sep 17 00:00:00 2001 From: Alex Sanders Date: Thu, 29 Jun 2023 14:51:47 +0100 Subject: [PATCH 080/147] add `WeatherWidget` --- .../src/components/Weather.stories.tsx | 161 +++++++++++++ .../src/components/WeatherWidget.tsx | 220 ++++++++++++++++++ .../src/components/WeatherWidgetSlot.tsx | 173 ++++++++++++++ .../src/static/icons/external-link.svg | 1 + .../src/static/icons/weather/weather-1.svg | 1 + .../src/static/icons/weather/weather-11.svg | 1 + .../src/static/icons/weather/weather-12.svg | 1 + .../src/static/icons/weather/weather-13.svg | 1 + .../src/static/icons/weather/weather-14.svg | 1 + .../src/static/icons/weather/weather-15.svg | 1 + .../src/static/icons/weather/weather-16.svg | 1 + .../src/static/icons/weather/weather-17.svg | 1 + .../src/static/icons/weather/weather-18.svg | 1 + .../src/static/icons/weather/weather-19.svg | 1 + .../src/static/icons/weather/weather-2.svg | 1 + .../src/static/icons/weather/weather-20.svg | 1 + .../src/static/icons/weather/weather-21.svg | 1 + .../src/static/icons/weather/weather-22.svg | 1 + .../src/static/icons/weather/weather-23.svg | 1 + .../src/static/icons/weather/weather-24.svg | 1 + .../src/static/icons/weather/weather-25.svg | 1 + .../src/static/icons/weather/weather-26.svg | 1 + .../src/static/icons/weather/weather-29.svg | 1 + .../src/static/icons/weather/weather-3.svg | 1 + .../src/static/icons/weather/weather-30.svg | 1 + .../src/static/icons/weather/weather-31.svg | 1 + .../src/static/icons/weather/weather-32.svg | 1 + .../src/static/icons/weather/weather-33.svg | 1 + .../src/static/icons/weather/weather-34.svg | 1 + .../src/static/icons/weather/weather-35.svg | 1 + .../src/static/icons/weather/weather-36.svg | 1 + .../src/static/icons/weather/weather-37.svg | 1 + .../src/static/icons/weather/weather-38.svg | 1 + .../src/static/icons/weather/weather-39.svg | 1 + .../src/static/icons/weather/weather-4.svg | 1 + .../src/static/icons/weather/weather-40.svg | 1 + .../src/static/icons/weather/weather-41.svg | 1 + .../src/static/icons/weather/weather-42.svg | 1 + .../src/static/icons/weather/weather-43.svg | 1 + .../src/static/icons/weather/weather-44.svg | 1 + .../src/static/icons/weather/weather-5.svg | 1 + .../src/static/icons/weather/weather-6.svg | 1 + .../src/static/icons/weather/weather-7.svg | 1 + .../src/static/icons/weather/weather-8.svg | 1 + 44 files changed, 595 insertions(+) create mode 100644 dotcom-rendering/src/components/Weather.stories.tsx create mode 100644 dotcom-rendering/src/components/WeatherWidget.tsx create mode 100644 dotcom-rendering/src/components/WeatherWidgetSlot.tsx create mode 100644 dotcom-rendering/src/static/icons/external-link.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-1.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-11.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-12.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-13.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-14.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-15.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-16.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-17.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-18.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-19.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-2.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-20.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-21.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-22.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-23.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-24.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-25.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-26.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-29.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-3.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-30.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-31.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-32.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-33.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-34.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-35.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-36.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-37.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-38.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-39.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-4.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-40.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-41.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-42.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-43.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-44.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-5.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-6.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-7.svg create mode 100644 dotcom-rendering/src/static/icons/weather/weather-8.svg diff --git a/dotcom-rendering/src/components/Weather.stories.tsx b/dotcom-rendering/src/components/Weather.stories.tsx new file mode 100644 index 00000000000..a2ddb1b774f --- /dev/null +++ b/dotcom-rendering/src/components/Weather.stories.tsx @@ -0,0 +1,161 @@ +import type { StoryFn } from '@storybook/react'; +import type { WeatherWidgetProps } from './WeatherWidget'; +import { WeatherWidget } from './WeatherWidget'; + +export default { + component: WeatherWidget, + title: 'Components/WeatherWidget', + args: { + edition: 'UK', + location: 'Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch', + now: { + icon: 1, + description: 'Sunny', + temperature: { + metric: { + value: 10, + unit: 'C', + }, + imperial: { + value: 50, + unit: 'F', + }, + }, + link: 'https://www.accuweather.com/en/gb/llanfair-pwllgwyngyll/ll61-5/current-weather/328819?lang=en-us&partner=web_guardian_adc', + }, + forecast: [ + { + icon: 19, + description: 'Sleet', + temperature: { + metric: { + value: 20, + unit: 'C', + }, + imperial: { + value: 68, + unit: 'F', + }, + }, + time: '2023-06-27T00:00:00.000Z', + }, + { + icon: 25, + description: 'Hail', + temperature: { + metric: { + value: 25, + unit: 'C', + }, + imperial: { + value: 77, + unit: 'F', + }, + }, + time: '2023-06-27T04:00:00.000Z', + }, + { + icon: 32, + description: 'Wind', + temperature: { + metric: { + value: 30, + unit: 'C', + }, + imperial: { + value: 89, + unit: 'F', + }, + }, + time: '2023-06-27T08:00:00.000Z', + }, + { + icon: 44, + description: 'Night snow', + temperature: { + metric: { + value: 40, + unit: 'C', + }, + imperial: { + value: 104, + unit: 'F', + }, + }, + time: '2023-06-27T12:00:00.000Z', + }, + ], + }, +}; + +const Template: StoryFn = (args: WeatherWidgetProps) => ( + +); + +export const Mobile = Template.bind({}); +Mobile.parameters = { + viewport: { + defaultViewport: 'mobile', + }, +}; + +export const MobileMedium = Template.bind({}); +MobileMedium.parameters = { + viewport: { + defaultViewport: 'mobileMedium', + }, +}; + +export const MobileLandscape = Template.bind({}); +MobileLandscape.parameters = { + viewport: { + defaultViewport: 'mobileLandscape', + }, +}; + +export const Phablet = Template.bind({}); +Phablet.parameters = { + viewport: { + defaultViewport: 'phablet', + }, +}; + +export const Tablet = Template.bind({}); +Tablet.parameters = { + viewport: { + defaultViewport: 'tablet', + }, +}; + +export const Desktop = Template.bind({}); +Desktop.parameters = { + viewport: { + defaultViewport: 'desktop', + }, +}; + +export const LeftCol = Template.bind({}); +LeftCol.parameters = { + viewport: { + defaultViewport: 'leftCol', + }, +}; + +export const Wide = Template.bind({}); +Wide.parameters = { + viewport: { + defaultViewport: 'wide', + }, +}; + +// just checks US special case +export const US = Template.bind({}); +US.args = { + edition: 'US', +}; +// make it easy to see on most screens +US.parameters = { + viewport: { + defaultViewport: 'mobileLandscape', + }, +}; diff --git a/dotcom-rendering/src/components/WeatherWidget.tsx b/dotcom-rendering/src/components/WeatherWidget.tsx new file mode 100644 index 00000000000..4fb270e865b --- /dev/null +++ b/dotcom-rendering/src/components/WeatherWidget.tsx @@ -0,0 +1,220 @@ +import { css, keyframes } from '@emotion/react'; +import { + between, + from, + textSans, + until, + visuallyHidden, +} from '@guardian/source-foundations'; +import { SvgExternal } from '@guardian/source-react-components'; +import type { FEFrontConfigType } from '../types/front'; +import { WeatherWidgetSlot } from './WeatherWidgetSlot'; + +const visuallyHiddenCSS = css` + ${visuallyHidden} +`; + +const widgetCSS = css` + animation: ${keyframes`from { opacity: 0; } to { opacity: 1; }`} 250ms; + --border: 1px solid #dcdcdc; + width: 100%; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + letter-spacing: -0.56px; +`; + +const locationCSS = css` + flex: 1; + ${textSans.medium()}; + padding: 12px 0; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + + ${until.tablet} { + flex-basis: 100%; + border-bottom: var(--border); + } + + ${between.tablet.and.leftCol} { + padding-right: 1ch; + } + + ${from.leftCol} { + flex-basis: 100%; + border-bottom: var(--border); + } +`; + +const nowCSS = css` + ${until.tablet} { + justify-content: flex-end; + flex-basis: 100%; + border-bottom: var(--border); + order: -1; + padding-bottom: 4px; + } + + ${from.leftCol} { + flex-basis: 100%; + border-bottom: var(--border); + padding-top: 8px; + padding-bottom: 24px; + } +`; + +const slotCSS = css` + display: flex; + flex: 1; + padding-top: 4px; + + border-left: var(--border); + padding-left: 4px; + + ${until.mobileLandscape} { + &.forecast-4 { + display: none; + } + } + + ${until.tablet} { + &.now, + &.forecast-1 { + border-left: none; + } + } + + ${between.tablet.and.desktop} { + padding-left: 4px; + + &.forecast-3, + &.forecast-4 { + display: none; + } + } + + ${between.desktop.and.wide} { + &.forecast-4 { + display: none; + } + } + + ${from.leftCol} { + &.now, + &.forecast-1 { + border-left: none; + } + } +`; + +const linkCSS = css` + a { + ${textSans.small()}; + color: #121212; + text-decoration: none; + display: block; + display: flex; + flex-direction: row; + align-items: center; + + &:hover { + text-decoration: underline; + } + } + + ${until.tablet} { + flex-basis: 100%; + padding-top: 12px; + } + + ${from.leftCol} { + padding-top: 24px; + flex-basis: 100%; + } +`; + +const ExternalLinkIcon = () => ( +
+ +
+); + +export type TemperatureProps = { + value: number; + unit: 'C' | 'F'; +}; + +type ForecastProps = { + icon: number; + description: string; + link: string; + temperature: { + metric: TemperatureProps; + imperial: TemperatureProps; + }; + time?: string; +}; + +export interface WeatherWidgetProps { + location: string; + now: ForecastProps; + forecast: [ForecastProps, ForecastProps, ForecastProps, ForecastProps]; + edition: FEFrontConfigType['edition']; +} + +export const WeatherWidget = ({ + location, + now, + forecast, + edition, +}: WeatherWidgetProps) => { + const isUS = edition === 'US'; + return ( + + ); +}; diff --git a/dotcom-rendering/src/components/WeatherWidgetSlot.tsx b/dotcom-rendering/src/components/WeatherWidgetSlot.tsx new file mode 100644 index 00000000000..8cb70531fdc --- /dev/null +++ b/dotcom-rendering/src/components/WeatherWidgetSlot.tsx @@ -0,0 +1,173 @@ +import type { SerializedStyles } from '@emotion/react'; +import { css, keyframes } from '@emotion/react'; +import { isUndefined } from '@guardian/libs'; +import { + from, + textSans, + until, + visuallyHidden, +} from '@guardian/source-foundations'; +import { lazy, Suspense } from 'react'; +import type { TemperatureProps } from './WeatherWidget'; + +const formatTemperature = ({ value, unit }: TemperatureProps) => + `${value}°${unit.toLocaleUpperCase()}`; + +const formatTime = (time: string, isUS: boolean) => + isUS + ? new Date(time).toLocaleTimeString('en-US', { + hour: 'numeric', + }) + : new Date(time).toLocaleTimeString(undefined, { + hour: '2-digit', + minute: '2-digit', + }); + +const visuallyHiddenCSS = css` + ${visuallyHidden} +`; + +const slotCSS = css` + animation: ${keyframes`from { opacity: 0; } to { opacity: 1; }`} 250ms; + position: relative; + display: inline-flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + padding-left: 40px; + min-height: 40px; /* icon height (32) + 4 + 4 */ + + ${from.leftCol} { + padding-left: 0; + } +`; + +const timeCSS = css` + ${textSans.xxsmall()}; + display: block; +`; + +const nowCSS = [ + timeCSS, + css` + ${until.tablet} { + display: none; + } + + ${from.leftCol} { + padding-bottom: 4px; + } + `, +]; + +const tempCSS = (isNow: boolean) => [ + css` + display: block; + ${textSans.medium()}; + + ${from.leftCol} { + order: 1; + padding-top: 4px; + } + `, + isNow && + css` + ${from.leftCol} { + ${textSans.xlarge()}; + line-height: 1; + } + ${from.leftCol} { + ${textSans.xlarge()}; + line-height: 1; + } + `, +]; + +const iconCSS = css` + position: absolute; + top: 50%; + left: 0px; + margin-top: -16px; + + ${from.leftCol} { + position: static; + margin-top: 0; + } +`; + +const LoadingIcon = () => ( + +); + +export type WeatherWidgetSlotProps = { + icon: number; + description: string; + link: string; + temperature: { + metric: TemperatureProps; + imperial: TemperatureProps; + }; + time?: string; + isUS: boolean; + css?: SerializedStyles; +}; + +export const WeatherWidgetSlot = ({ + icon, + temperature, + time, + description, + isUS, + ...props +}: WeatherWidgetSlotProps) => { + const isNow = isUndefined(time); + + const Icon = lazy(() => + import(`../static/icons/weather/weather-${icon}.svg`).then( + ({ default: Component }) => { + return { + default: () => ( + + ), + }; + }, + ), + ); + + return ( +

+ + {isNow ? 'The current weather' : 'The forecast for'} + + {isNow ? ( + + Now + + ) : ( + + )} + is + + {formatTemperature( + isUS ? temperature.imperial : temperature.metric, + )} + + , {description.toLowerCase()}. + }> + + +

+ ); +}; diff --git a/dotcom-rendering/src/static/icons/external-link.svg b/dotcom-rendering/src/static/icons/external-link.svg new file mode 100644 index 00000000000..46a1a10c50e --- /dev/null +++ b/dotcom-rendering/src/static/icons/external-link.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-1.svg b/dotcom-rendering/src/static/icons/weather/weather-1.svg new file mode 100644 index 00000000000..950cafa9308 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-1.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-11.svg b/dotcom-rendering/src/static/icons/weather/weather-11.svg new file mode 100644 index 00000000000..e2435fdcf43 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-11.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-12.svg b/dotcom-rendering/src/static/icons/weather/weather-12.svg new file mode 100644 index 00000000000..d54f62c9cf8 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-12.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-13.svg b/dotcom-rendering/src/static/icons/weather/weather-13.svg new file mode 100644 index 00000000000..d54f62c9cf8 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-13.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-14.svg b/dotcom-rendering/src/static/icons/weather/weather-14.svg new file mode 100644 index 00000000000..7e60c63fafb --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-14.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-15.svg b/dotcom-rendering/src/static/icons/weather/weather-15.svg new file mode 100644 index 00000000000..56096f22f73 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-15.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-16.svg b/dotcom-rendering/src/static/icons/weather/weather-16.svg new file mode 100644 index 00000000000..56096f22f73 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-16.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-17.svg b/dotcom-rendering/src/static/icons/weather/weather-17.svg new file mode 100644 index 00000000000..9191f05d570 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-17.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-18.svg b/dotcom-rendering/src/static/icons/weather/weather-18.svg new file mode 100644 index 00000000000..ef5d7004f40 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-18.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-19.svg b/dotcom-rendering/src/static/icons/weather/weather-19.svg new file mode 100644 index 00000000000..957f0115e04 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-19.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-2.svg b/dotcom-rendering/src/static/icons/weather/weather-2.svg new file mode 100644 index 00000000000..94faae84cc7 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-2.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-20.svg b/dotcom-rendering/src/static/icons/weather/weather-20.svg new file mode 100644 index 00000000000..957f0115e04 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-20.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-21.svg b/dotcom-rendering/src/static/icons/weather/weather-21.svg new file mode 100644 index 00000000000..79a4808126b --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-21.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-22.svg b/dotcom-rendering/src/static/icons/weather/weather-22.svg new file mode 100644 index 00000000000..c6a4e528072 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-22.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-23.svg b/dotcom-rendering/src/static/icons/weather/weather-23.svg new file mode 100644 index 00000000000..597d131d7b3 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-23.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-24.svg b/dotcom-rendering/src/static/icons/weather/weather-24.svg new file mode 100644 index 00000000000..9ddda9ab0a5 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-24.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-25.svg b/dotcom-rendering/src/static/icons/weather/weather-25.svg new file mode 100644 index 00000000000..e085f7ec4d0 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-25.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-26.svg b/dotcom-rendering/src/static/icons/weather/weather-26.svg new file mode 100644 index 00000000000..e085f7ec4d0 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-26.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-29.svg b/dotcom-rendering/src/static/icons/weather/weather-29.svg new file mode 100644 index 00000000000..957f0115e04 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-29.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-3.svg b/dotcom-rendering/src/static/icons/weather/weather-3.svg new file mode 100644 index 00000000000..94faae84cc7 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-3.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-30.svg b/dotcom-rendering/src/static/icons/weather/weather-30.svg new file mode 100644 index 00000000000..443d1073406 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-30.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-31.svg b/dotcom-rendering/src/static/icons/weather/weather-31.svg new file mode 100644 index 00000000000..7ef71805ac0 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-31.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-32.svg b/dotcom-rendering/src/static/icons/weather/weather-32.svg new file mode 100644 index 00000000000..b1192102655 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-32.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-33.svg b/dotcom-rendering/src/static/icons/weather/weather-33.svg new file mode 100644 index 00000000000..d7c6b8b3e32 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-33.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-34.svg b/dotcom-rendering/src/static/icons/weather/weather-34.svg new file mode 100644 index 00000000000..774107faab9 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-34.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-35.svg b/dotcom-rendering/src/static/icons/weather/weather-35.svg new file mode 100644 index 00000000000..342d7188e8e --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-35.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-36.svg b/dotcom-rendering/src/static/icons/weather/weather-36.svg new file mode 100644 index 00000000000..7304bf99b77 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-36.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-37.svg b/dotcom-rendering/src/static/icons/weather/weather-37.svg new file mode 100644 index 00000000000..4972674c618 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-37.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-38.svg b/dotcom-rendering/src/static/icons/weather/weather-38.svg new file mode 100644 index 00000000000..7304bf99b77 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-38.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-39.svg b/dotcom-rendering/src/static/icons/weather/weather-39.svg new file mode 100644 index 00000000000..7a6a109aed4 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-39.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-4.svg b/dotcom-rendering/src/static/icons/weather/weather-4.svg new file mode 100644 index 00000000000..d375d156128 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-4.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-40.svg b/dotcom-rendering/src/static/icons/weather/weather-40.svg new file mode 100644 index 00000000000..7a6a109aed4 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-40.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-41.svg b/dotcom-rendering/src/static/icons/weather/weather-41.svg new file mode 100644 index 00000000000..82a0c13f89c --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-41.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-42.svg b/dotcom-rendering/src/static/icons/weather/weather-42.svg new file mode 100644 index 00000000000..82a0c13f89c --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-42.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-43.svg b/dotcom-rendering/src/static/icons/weather/weather-43.svg new file mode 100644 index 00000000000..5c5a7674c60 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-43.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-44.svg b/dotcom-rendering/src/static/icons/weather/weather-44.svg new file mode 100644 index 00000000000..7d71da3a95a --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-44.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-5.svg b/dotcom-rendering/src/static/icons/weather/weather-5.svg new file mode 100644 index 00000000000..090f9ec9141 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-5.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-6.svg b/dotcom-rendering/src/static/icons/weather/weather-6.svg new file mode 100644 index 00000000000..a978836ca09 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-6.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-7.svg b/dotcom-rendering/src/static/icons/weather/weather-7.svg new file mode 100644 index 00000000000..79f9206ec76 --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-7.svg @@ -0,0 +1 @@ + diff --git a/dotcom-rendering/src/static/icons/weather/weather-8.svg b/dotcom-rendering/src/static/icons/weather/weather-8.svg new file mode 100644 index 00000000000..15a46b8989f --- /dev/null +++ b/dotcom-rendering/src/static/icons/weather/weather-8.svg @@ -0,0 +1 @@ + From 4bf4a0952c02bdd090cfc94b064188093ba9ac23 Mon Sep 17 00:00:00 2001 From: Alex Sanders Date: Thu, 29 Jun 2023 15:57:54 +0100 Subject: [PATCH 081/147] add max widths to stories `leftCol` etc dont actually display full width. I should have done this ages ago --- .../src/components/Weather.stories.tsx | 57 ++++++++++++++----- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/dotcom-rendering/src/components/Weather.stories.tsx b/dotcom-rendering/src/components/Weather.stories.tsx index a2ddb1b774f..a00a9c1b904 100644 --- a/dotcom-rendering/src/components/Weather.stories.tsx +++ b/dotcom-rendering/src/components/Weather.stories.tsx @@ -1,4 +1,3 @@ -import type { StoryFn } from '@storybook/react'; import type { WeatherWidgetProps } from './WeatherWidget'; import { WeatherWidget } from './WeatherWidget'; @@ -88,60 +87,88 @@ export default { }, }; -const Template: StoryFn = (args: WeatherWidgetProps) => ( - +export const Mobile = (args: WeatherWidgetProps) => ( +
+ +
); - -export const Mobile = Template.bind({}); Mobile.parameters = { viewport: { defaultViewport: 'mobile', }, }; -export const MobileMedium = Template.bind({}); +export const MobileMedium = (args: WeatherWidgetProps) => ( +
+ +
+); MobileMedium.parameters = { viewport: { defaultViewport: 'mobileMedium', }, }; -export const MobileLandscape = Template.bind({}); +export const MobileLandscape = (args: WeatherWidgetProps) => ( +
+ +
+); MobileLandscape.parameters = { viewport: { defaultViewport: 'mobileLandscape', }, }; -export const Phablet = Template.bind({}); +export const Phablet = (args: WeatherWidgetProps) => ( +
+ +
+); Phablet.parameters = { viewport: { defaultViewport: 'phablet', }, }; -export const Tablet = Template.bind({}); +export const Tablet = (args: WeatherWidgetProps) => ( +
+ +
+); Tablet.parameters = { viewport: { defaultViewport: 'tablet', }, }; -export const Desktop = Template.bind({}); +export const Desktop = (args: WeatherWidgetProps) => ( +
+ +
+); Desktop.parameters = { viewport: { defaultViewport: 'desktop', }, }; -export const LeftCol = Template.bind({}); +export const LeftCol = (args: WeatherWidgetProps) => ( +
+ +
+); LeftCol.parameters = { viewport: { defaultViewport: 'leftCol', }, }; -export const Wide = Template.bind({}); +export const Wide = (args: WeatherWidgetProps) => ( +
+ +
+); Wide.parameters = { viewport: { defaultViewport: 'wide', @@ -149,7 +176,11 @@ Wide.parameters = { }; // just checks US special case -export const US = Template.bind({}); +export const US = (args: WeatherWidgetProps) => ( +
+ +
+); US.args = { edition: 'US', }; From b472392bef678bd5828b6f0ccf47bb07689f9890 Mon Sep 17 00:00:00 2001 From: Alex Sanders Date: Thu, 29 Jun 2023 17:04:48 +0100 Subject: [PATCH 082/147] use correct `location` data structure --- .../src/components/Weather.stories.tsx | 15 +++++++++++++- .../src/components/WeatherWidget.tsx | 20 ++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dotcom-rendering/src/components/Weather.stories.tsx b/dotcom-rendering/src/components/Weather.stories.tsx index a00a9c1b904..bab780eb31e 100644 --- a/dotcom-rendering/src/components/Weather.stories.tsx +++ b/dotcom-rendering/src/components/Weather.stories.tsx @@ -6,7 +6,20 @@ export default { title: 'Components/WeatherWidget', args: { edition: 'UK', - location: 'Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch', + location: { + key: '328819', + localizedName: + 'Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch', + country: { + id: 'GB', + localizedName: 'United Kingdom', + }, + administrativeArea: { + id: 'GWN', + localizedName: 'Gwynedd', + }, + type: 'city', + }, now: { icon: 1, description: 'Sunny', diff --git a/dotcom-rendering/src/components/WeatherWidget.tsx b/dotcom-rendering/src/components/WeatherWidget.tsx index 4fb270e865b..f26301e9002 100644 --- a/dotcom-rendering/src/components/WeatherWidget.tsx +++ b/dotcom-rendering/src/components/WeatherWidget.tsx @@ -173,7 +173,19 @@ type ForecastProps = { }; export interface WeatherWidgetProps { - location: string; + location: { + key: string; + localizedName: string; + country: { + id: string; + localizedName: string; + }; + administrativeArea: { + id: string; + localizedName: string; + }; + type: string; + }; now: ForecastProps; forecast: [ForecastProps, ForecastProps, ForecastProps, ForecastProps]; edition: FEFrontConfigType['edition']; @@ -188,9 +200,11 @@ export const WeatherWidget = ({ const isUS = edition === 'US'; return (