From 2cbdf709dae63294dd8a9cbaa474ba5fce61028b Mon Sep 17 00:00:00 2001 From: Richard Bangay Date: Fri, 24 May 2024 17:03:29 +0100 Subject: [PATCH 1/3] update source-react-components, source-foundations and source-react-components-development-kitchen dependencies --- .eslintrc.js | 2 - .nvmrc | 2 +- .../helpCentre/BackToHelpCentreLink.tsx | 4 +- client/components/helpCentre/HelpCentre.tsx | 2 +- .../helpCentre/HelpCentreArticle.tsx | 4 +- .../helpCentre/HelpCentreContactOptions.tsx | 4 +- .../helpCentre/HelpCentreEmailAndLiveChat.tsx | 2 +- .../HelpCentreLandingMoreTopics.tsx | 2 +- .../helpCentre/HelpCentreLoadingContent.tsx | 2 +- .../helpCentre/HelpCentreMoreTopics.tsx | 2 +- .../components/helpCentre/HelpCentreNav.tsx | 2 +- .../helpCentre/HelpCentrePhoneNumbers.tsx | 2 +- .../helpCentre/HelpCentreSingleTopic.tsx | 2 +- .../helpCentre/HelpCentreStyles.tsx | 2 +- client/components/helpCentre/HelpTopicBox.tsx | 4 +- client/components/helpCentre/KnownIssues.tsx | 2 +- .../helpCentre/contactUs/ContactUs.tsx | 2 +- .../contactUs/SelfServicePrompt.tsx | 4 +- .../helpCentre/contactUs/SubTopicForm.tsx | 4 +- .../helpCentre/contactUs/TechIcon.tsx | 2 +- .../helpCentre/contactUs/TopicButton.tsx | 2 +- .../helpCentre/contactUs/TopicForm.tsx | 4 +- .../helpCentre/contactUs/TopicIcon.tsx | 2 +- .../helpCentre/contactUs/UploadFileInput.tsx | 4 +- .../helpCentre/contactUs/contactUsForm.tsx | 4 +- .../DiagnosticInformation.tsx | 4 +- .../helpCentre/liveChat/LiveChat.tsx | 2 +- .../liveChat/LiveChatPrivacyNotice.tsx | 2 +- .../liveChat/liveChatCssOverrides.ts | 2 +- client/components/mma/MMAPage.tsx | 2 +- client/components/mma/Page.tsx | 2 +- .../mma/accountoverview/AccountOverview.tsx | 4 +- .../accountoverview/CancelledProductCard.tsx | 4 +- .../accountoverview/EmptyAccountOverview.tsx | 2 +- .../mma/accountoverview/GiftRibbon.tsx | 2 +- .../mma/accountoverview/InAppPurchaseCard.tsx | 6 +- .../mma/accountoverview/ManageProduct.tsx | 2 +- .../NewsletterOptinSection.tsx | 4 +- .../accountoverview/PersonalisedHeader.tsx | 2 +- .../mma/accountoverview/ProductCard.tsx | 6 +- .../ProductCardConfiguration.ts | 2 +- .../mma/accountoverview/ProductCardStyles.ts | 2 +- .../SingleContributionCard.tsx | 4 +- .../manageProducts/ManageProductV2.tsx | 43 +- .../ContributionUpdateAmountForm.tsx | 4 +- .../SupporterPlusUpdateAmountForm.tsx | 4 +- .../updateAmount/UpdateAmount.tsx | 2 +- client/components/mma/billing/Billing.tsx | 2 +- .../mma/billing/InvoiceTableYearSelect.tsx | 4 +- .../components/mma/billing/InvoicesTable.tsx | 2 +- .../mma/cancel/CancellationReasonReview.tsx | 4 +- .../cancel/CancellationReasonSelection.tsx | 4 +- .../mma/cancel/CancellationSummary.tsx | 2 +- .../mma/cancel/ContactUsToCancel.tsx | 4 +- .../mma/cancel/ResubscribeThrasher.tsx | 2 +- .../mma/cancel/cancellationConstants.ts | 2 +- .../cancellationContributionReminder.tsx | 4 +- .../cancellationSaves/CancellationLanding.tsx | 4 +- .../cancel/cancellationSaves/SelectReason.tsx | 4 +- .../digipack/ConfirmDigiSubCancellation.tsx | 4 +- .../digipack/DigiSubDiscountConfirmed.tsx | 4 +- .../digipack/DigiSubThankYouOffer.tsx | 6 +- .../ConfirmMembershipCancellation.tsx | 4 +- .../ContinueMembershipConfirmation.tsx | 4 +- .../membership/MembershipSwitch.tsx | 6 +- .../membership/SaveOptions.tsx | 4 +- .../membership/SaveStyles.ts | 2 +- .../membership/SwitchThankYou.tsx | 2 +- .../membership/ValueOfSupport.tsx | 4 +- .../ContributionsCancellationFeedbackForm.tsx | 2 +- ...utionsCancellationFeedbackFormThankYou.tsx | 2 +- ...nsCancellationFlowFinancialSaveAttempt.tsx | 4 +- ...ancellationFlowPaymentIssueSaveAttempt.tsx | 4 +- .../ContributionsCancellationFlowStart.tsx | 2 +- .../DigipackCancellationFlowStart.tsx | 2 +- .../mma/cancel/gw/GwCancellationFlowStart.tsx | 2 +- .../MembershipCancellationFlowStart.tsx | 2 +- .../mma/cancel/stages/ExecuteCancellation.tsx | 4 +- .../mma/cancel/stages/SavedCancellation.tsx | 4 +- .../SupporterplusCancellationFlowStart.tsx | 2 +- .../voucher/VoucherCancellationFlowStart.tsx | 2 +- .../CookiesOnTheBrowserSection.tsx | 2 +- .../mma/dataPrivacy/DataPrivacy.styles.ts | 2 +- .../mma/dataPrivacy/DataPrivacyPage.tsx | 2 +- .../DeliveryAddressChangeContainer.tsx | 2 +- .../address/DeliveryAddressConfirmation.tsx | 4 +- .../address/DeliveryAddressDisplay.tsx | 2 +- .../delivery/address/DeliveryAddressForm.tsx | 4 +- .../address/DeliveryAddressReview.tsx | 4 +- .../mma/delivery/address/Select.tsx | 2 +- .../delivery/records/DeliveryAddressStep.tsx | 4 +- .../delivery/records/DeliveryRecordCard.tsx | 4 +- .../records/DeliveryRecordInstructions.tsx | 2 +- .../delivery/records/DeliveryRecordStatus.tsx | 2 +- .../mma/delivery/records/DeliveryRecords.tsx | 4 +- .../records/DeliveryRecordsAddress.tsx | 2 +- .../records/DeliveryRecordsPaginationNav.tsx | 2 +- .../DeliveryRecordsProblemConfirmation.tsx | 4 +- .../records/DeliveryRecordsProblemForm.tsx | 4 +- .../records/DeliveryRecordsProblemReview.tsx | 4 +- .../delivery/records/ProductDetailsTable.tsx | 2 +- .../records/ReadOnlyAddressDisplay.tsx | 4 +- .../mma/delivery/records/UserPhoneNumber.tsx | 4 +- client/components/mma/help/Help.tsx | 4 +- .../holiday/ExistingHolidayStopActions.tsx | 2 +- .../HolidayAnniversaryDateExplainerModal.tsx | 2 +- .../mma/holiday/HolidayCalendarTable.tsx | 2 +- .../mma/holiday/HolidayCalendarTables.tsx | 4 +- .../mma/holiday/HolidayConfirmed.tsx | 4 +- .../mma/holiday/HolidayDateChooser.tsx | 4 +- .../components/mma/holiday/HolidayReview.tsx | 4 +- .../mma/holiday/HolidaySelectionInfo.tsx | 2 +- .../mma/holiday/HolidaysOverview.tsx | 4 +- client/components/mma/holiday/Modal.tsx | 4 +- .../components/mma/holiday/SummaryTable.tsx | 2 +- client/components/mma/identity/DropMenu.tsx | 2 +- .../mma/identity/GenericErrorMessage.tsx | 2 +- .../mma/identity/MarketingToggle.tsx | 2 +- .../mma/identity/NewsletterPreference.tsx | 2 +- .../components/mma/identity/PageSection.tsx | 2 +- .../EmailSettingsSection.tsx | 2 +- .../emailAndMarketing/NewsletterSection.tsx | 2 +- .../identity/publicProfile/AvatarSection.tsx | 4 +- .../identity/settings/SettingsFormSection.tsx | 2 +- .../components/mma/identity/sharedStyles.ts | 2 +- .../mma/maintenance/Maintenance.tsx | 2 +- .../mma/paymentUpdate/ContactUs.tsx | 2 +- .../paymentUpdate/CurrentPaymentDetail.tsx | 4 +- .../mma/paymentUpdate/FieldWrapper.tsx | 16 +- .../mma/paymentUpdate/PaymentDetailUpdate.tsx | 6 +- .../PaymentDetailUpdateConfirmation.tsx | 6 +- .../mma/paymentUpdate/PaymentFailed.tsx | 4 +- .../paymentUpdate/card/FlexCardElement.tsx | 2 +- .../mma/paymentUpdate/card/Recaptcha.tsx | 2 +- .../card/stripeCardInputForm.tsx | 6 +- .../paymentUpdate/dd/DirectDebitInputForm.tsx | 14 +- .../mma/paymentUpdate/dd/DirectDebitLegal.tsx | 2 +- .../dd/NewDirectDebitPaymentMethodDetail.tsx | 2 +- .../mma/reminders/CreateReminder.tsx | 2 +- .../components/mma/shared/Button.stories.tsx | 2 +- client/components/mma/shared/Buttons.tsx | 2 +- .../mma/shared/CallCentrePrompt.tsx | 4 +- client/components/mma/shared/Card.tsx | 2 +- client/components/mma/shared/CardDisplay.tsx | 2 +- client/components/mma/shared/Checkbox.tsx | 2 +- client/components/mma/shared/DateInput.tsx | 2 +- client/components/mma/shared/DatePicker.tsx | 2 +- .../mma/shared/DirectDebitDisplay.tsx | 2 +- client/components/mma/shared/Heading.tsx | 2 +- client/components/mma/shared/InfoSection.tsx | 2 +- .../mma/shared/LinkButton.stories.tsx | 2 +- .../mma/shared/NextPaymentDetails.tsx | 2 +- .../components/mma/shared/OverlayLoader.tsx | 2 +- client/components/mma/shared/Pagination.tsx | 4 +- .../mma/shared/PaymentDetailsTable.tsx | 2 +- client/components/mma/shared/ProblemAlert.tsx | 2 +- .../shared/ProductDescriptionListTable.tsx | 2 +- .../mma/shared/ProductInfoTableV2.tsx | 2 +- .../mma/shared/ProgressIndicator.tsx | 2 +- .../components/mma/shared/ProgressStepper.tsx | 2 +- .../mma/shared/SupporterPlusTsAndCs.tsx | 2 +- .../mma/shared/assets/AccountOverviewIcon.tsx | 2 +- .../mma/shared/assets/CommentsIcon.tsx | 2 +- .../mma/shared/assets/CreditCardIcon.tsx | 2 +- .../mma/shared/assets/DeliveryIcon.tsx | 2 +- .../mma/shared/assets/EmailPrefIcon.tsx | 2 +- .../mma/shared/assets/ErrorIcon.tsx | 2 +- .../components/mma/shared/assets/GiftIcon.tsx | 2 +- .../mma/shared/assets/GridRoundel.tsx | 2 +- .../components/mma/shared/assets/HelpIcon.tsx | 2 +- .../mma/shared/assets/LoadingCircleIcon.tsx | 2 +- .../mma/shared/assets/NewspaperIcon.tsx | 2 +- .../shared/assets/NewspaperVoucherIcon.tsx | 2 +- .../mma/shared/assets/OtherIcon.tsx | 2 +- .../mma/shared/assets/ProfileIcon.tsx | 2 +- .../components/mma/shared/assets/Roundel.tsx | 2 +- .../mma/shared/assets/SettingsIcon.tsx | 2 +- .../mma/shared/assets/ShieldIcon.tsx | 2 +- .../mma/shared/assets/SignoutIcon.tsx | 2 +- .../shared/assets/SwitchOffsetPaymentIcon.tsx | 8 +- .../mma/shared/assets/TheGuardianLogo.tsx | 2 +- .../mma/shared/assets/ThumbsUpIcon.tsx | 2 +- .../mma/shared/benefits/BenefitsCard.tsx | 4 +- .../mma/shared/benefits/BenefitsSection.tsx | 2 +- .../mma/shared/benefits/BenefitsStyles.tsx | 2 +- .../mma/shared/benefits/BenefitsToggle.tsx | 2 +- .../mma/signInError/SignInError.tsx | 4 +- .../mma/switch/complete/SwitchComplete.tsx | 4 +- .../mma/switch/complete/SwitchSignInImage.tsx | 2 +- .../mma/switch/options/SwitchOptions.tsx | 6 +- .../mma/switch/review/SwitchReview.tsx | 4 +- client/components/mma/upgrade/ConfirmForm.tsx | 6 +- .../components/mma/upgrade/UpgradeSupport.tsx | 4 +- .../mma/upgrade/UpgradeSupportAmountForm.tsx | 4 +- .../mma/upgrade/UpgradeSupportStyles.ts | 2 +- .../upgrade/UpgradeSupportSwitchThankYou.tsx | 4 +- .../mma/upgrade/UpgradeSupportThankYou.tsx | 4 +- .../shared/CallCenterEmailAndNumbers.tsx | 2 +- .../components/shared/CallCentreAccordion.tsx | 4 +- .../components/shared/CallCentreNumbers.tsx | 2 +- client/components/shared/FormError.tsx | 2 +- client/components/shared/Header.tsx | 2 +- client/components/shared/Input.tsx | 2 +- client/components/shared/Main.tsx | 2 +- client/components/shared/SectionContent.tsx | 4 +- client/components/shared/SectionHeader.tsx | 2 +- client/components/shared/SignIn.tsx | 2 +- .../shared/SupportTheGuardianButton.tsx | 2 +- client/components/shared/footer/Footer.tsx | 4 +- .../shared/footer/MinimalFooter.tsx | 2 +- client/components/shared/nav/DropdownNav.tsx | 2 +- client/components/shared/nav/LeftSideNav.tsx | 2 +- .../productSwitch/SwitchErrorSummary.tsx | 2 +- .../productSwitch/SwitchPaymentInfo.tsx | 2 +- client/styles/ButtonStyles.ts | 2 +- client/styles/ErrorStyles.ts | 2 +- client/styles/GenericStyles.ts | 2 +- client/styles/grid.ts | 2 +- package.json | 9 +- yarn.lock | 769 ++++++++++++------ 220 files changed, 887 insertions(+), 570 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 71521fc0b..60881518e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,8 +7,6 @@ module.exports = { 'plugin:react/recommended', 'plugin:react/jsx-runtime', 'plugin:jest/recommended', - 'plugin:@guardian/source-foundations/recommended', - 'plugin:@guardian/source-react-components/recommended', ], plugins: ['react', 'jest'], settings: { diff --git a/.nvmrc b/.nvmrc index 4b5ebaf0f..561a1e9a8 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.6.0 +18.20.3 diff --git a/client/components/helpCentre/BackToHelpCentreLink.tsx b/client/components/helpCentre/BackToHelpCentreLink.tsx index 134972e95..f58f5b601 100644 --- a/client/components/helpCentre/BackToHelpCentreLink.tsx +++ b/client/components/helpCentre/BackToHelpCentreLink.tsx @@ -4,8 +4,8 @@ import { palette, space, textSans, -} from '@guardian/source-foundations'; -import { SvgChevronLeftSingle } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgChevronLeftSingle } from '@guardian/source/react-components'; import { Link } from 'react-router-dom'; const dividerCss = css` diff --git a/client/components/helpCentre/HelpCentre.tsx b/client/components/helpCentre/HelpCentre.tsx index 09fdd0685..5cf5f8090 100644 --- a/client/components/helpCentre/HelpCentre.tsx +++ b/client/components/helpCentre/HelpCentre.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, headline, neutral, space } from '@guardian/source-foundations'; +import { from, headline, neutral, space } from '@guardian/source/foundations'; import { helpCentreConfig } from './HelpCentreConfig'; import { HelpCentreContactOptions } from './HelpCentreContactOptions'; import { HelpCentreLandingMoreTopics } from './HelpCentreLandingMoreTopics'; diff --git a/client/components/helpCentre/HelpCentreArticle.tsx b/client/components/helpCentre/HelpCentreArticle.tsx index 829f600e2..c92b4363e 100644 --- a/client/components/helpCentre/HelpCentreArticle.tsx +++ b/client/components/helpCentre/HelpCentreArticle.tsx @@ -6,8 +6,8 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { captureException, captureMessage } from '@sentry/browser'; import { useEffect, useState } from 'react'; import * as React from 'react'; diff --git a/client/components/helpCentre/HelpCentreContactOptions.tsx b/client/components/helpCentre/HelpCentreContactOptions.tsx index 774331ff1..cf307c516 100644 --- a/client/components/helpCentre/HelpCentreContactOptions.tsx +++ b/client/components/helpCentre/HelpCentreContactOptions.tsx @@ -5,8 +5,8 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { useState } from 'react'; import { CallCentreEmailAndNumbers } from '../shared/CallCenterEmailAndNumbers'; import { HelpCentreEmailAndLiveChat } from './HelpCentreEmailAndLiveChat'; diff --git a/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx b/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx index e1cccdea5..865156e9c 100644 --- a/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx +++ b/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; import type { ReactNode } from 'react'; import { useState } from 'react'; import { ErrorIcon } from '../mma/shared/assets/ErrorIcon'; diff --git a/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx b/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx index e41aa0e0f..abf0f28c9 100644 --- a/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx +++ b/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral, space, textSans, until } from '@guardian/source-foundations'; +import { neutral, space, textSans, until } from '@guardian/source/foundations'; import { useState } from 'react'; import { Link } from 'react-router-dom'; import { trackEvent } from '../../utilities/analytics'; diff --git a/client/components/helpCentre/HelpCentreLoadingContent.tsx b/client/components/helpCentre/HelpCentreLoadingContent.tsx index 144e39f1a..8643c8aa9 100644 --- a/client/components/helpCentre/HelpCentreLoadingContent.tsx +++ b/client/components/helpCentre/HelpCentreLoadingContent.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { Spinner } from '../shared/Spinner'; import { WithStandardTopMargin } from '../shared/WithStandardTopMargin'; diff --git a/client/components/helpCentre/HelpCentreMoreTopics.tsx b/client/components/helpCentre/HelpCentreMoreTopics.tsx index cae0eaf8f..257d0404b 100644 --- a/client/components/helpCentre/HelpCentreMoreTopics.tsx +++ b/client/components/helpCentre/HelpCentreMoreTopics.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral, space, textSans, until } from '@guardian/source-foundations'; +import { neutral, space, textSans, until } from '@guardian/source/foundations'; import { useState } from 'react'; import { Link } from 'react-router-dom'; import { trackEvent } from '../../utilities/analytics'; diff --git a/client/components/helpCentre/HelpCentreNav.tsx b/client/components/helpCentre/HelpCentreNav.tsx index 6181decbb..c55659915 100644 --- a/client/components/helpCentre/HelpCentreNav.tsx +++ b/client/components/helpCentre/HelpCentreNav.tsx @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useState } from 'react'; import { Link } from 'react-router-dom'; import { helpCentreNavConfig } from './HelpCentreConfig'; diff --git a/client/components/helpCentre/HelpCentrePhoneNumbers.tsx b/client/components/helpCentre/HelpCentrePhoneNumbers.tsx index a386a606f..4257f07a9 100644 --- a/client/components/helpCentre/HelpCentrePhoneNumbers.tsx +++ b/client/components/helpCentre/HelpCentrePhoneNumbers.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, neutral, space, textSans } from '@guardian/source-foundations'; +import { from, neutral, space, textSans } from '@guardian/source/foundations'; import { getHelpSectionIcon } from '../mma/shared/assets/HelpSectionIcons'; import { CallCentreEmailAndNumbers } from '../shared/CallCenterEmailAndNumbers'; diff --git a/client/components/helpCentre/HelpCentreSingleTopic.tsx b/client/components/helpCentre/HelpCentreSingleTopic.tsx index 68b6292cc..548abb88e 100644 --- a/client/components/helpCentre/HelpCentreSingleTopic.tsx +++ b/client/components/helpCentre/HelpCentreSingleTopic.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { Link } from 'react-router-dom'; import { trackEvent } from '../../utilities/analytics'; import { diff --git a/client/components/helpCentre/HelpCentreStyles.tsx b/client/components/helpCentre/HelpCentreStyles.tsx index 41b870c39..5c9b42d8f 100644 --- a/client/components/helpCentre/HelpCentreStyles.tsx +++ b/client/components/helpCentre/HelpCentreStyles.tsx @@ -5,7 +5,7 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; export const linkAnchorStyle = css` display: inline-block; diff --git a/client/components/helpCentre/HelpTopicBox.tsx b/client/components/helpCentre/HelpTopicBox.tsx index 912d6eaa4..d459bfef2 100644 --- a/client/components/helpCentre/HelpTopicBox.tsx +++ b/client/components/helpCentre/HelpTopicBox.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, neutral, space, textSans } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { from, neutral, space, textSans } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { Link, useNavigate } from 'react-router-dom'; import { trackEvent } from '../../utilities/analytics'; import { getHelpSectionIcon } from '../mma/shared/assets/HelpSectionIcons'; diff --git a/client/components/helpCentre/KnownIssues.tsx b/client/components/helpCentre/KnownIssues.tsx index 8086a3b19..8b7a61f3c 100644 --- a/client/components/helpCentre/KnownIssues.tsx +++ b/client/components/helpCentre/KnownIssues.tsx @@ -5,7 +5,7 @@ import { palette, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import type { MembersDataApiResponse } from '../../../shared/productResponse'; import { isProduct } from '../../../shared/productResponse'; diff --git a/client/components/helpCentre/contactUs/ContactUs.tsx b/client/components/helpCentre/contactUs/ContactUs.tsx index 78c24570e..0e4860950 100644 --- a/client/components/helpCentre/contactUs/ContactUs.tsx +++ b/client/components/helpCentre/contactUs/ContactUs.tsx @@ -5,7 +5,7 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { captureException } from '@sentry/browser'; import { useNavigate, useParams } from 'react-router-dom'; import { contactUsConfig } from '../../../../shared/contactUsConfig'; diff --git a/client/components/helpCentre/contactUs/SelfServicePrompt.tsx b/client/components/helpCentre/contactUs/SelfServicePrompt.tsx index 6671aafb5..aa351ce71 100644 --- a/client/components/helpCentre/contactUs/SelfServicePrompt.tsx +++ b/client/components/helpCentre/contactUs/SelfServicePrompt.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { brand, space, textSans } from '@guardian/source-foundations'; -import { LinkButton } from '@guardian/source-react-components'; +import { brand, space, textSans } from '@guardian/source/foundations'; +import { LinkButton } from '@guardian/source/react-components'; import { trackEvent } from '../../../utilities/analytics'; import { InfoIconDark } from '../../mma/shared/assets/InfoIconDark'; import { CallCentreEmailAndNumbers } from '../../shared/CallCenterEmailAndNumbers'; diff --git a/client/components/helpCentre/contactUs/SubTopicForm.tsx b/client/components/helpCentre/contactUs/SubTopicForm.tsx index aa3a46e11..b9a10d573 100644 --- a/client/components/helpCentre/contactUs/SubTopicForm.tsx +++ b/client/components/helpCentre/contactUs/SubTopicForm.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, neutral, space, textSans } from '@guardian/source-foundations'; -import { Button, Radio, RadioGroup } from '@guardian/source-react-components'; +import { from, neutral, space, textSans } from '@guardian/source/foundations'; +import { Button, Radio, RadioGroup } from '@guardian/source/react-components'; import type { ChangeEvent, FormEvent } from 'react'; import { useState } from 'react'; import type { SubTopic } from '../../../../shared/contactUsTypes'; diff --git a/client/components/helpCentre/contactUs/TechIcon.tsx b/client/components/helpCentre/contactUs/TechIcon.tsx index 1c8d8364f..f9bae7c36 100644 --- a/client/components/helpCentre/contactUs/TechIcon.tsx +++ b/client/components/helpCentre/contactUs/TechIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface TechIconProps { overrideFillColor?: string; diff --git a/client/components/helpCentre/contactUs/TopicButton.tsx b/client/components/helpCentre/contactUs/TopicButton.tsx index 339530876..e48d0ebbe 100644 --- a/client/components/helpCentre/contactUs/TopicButton.tsx +++ b/client/components/helpCentre/contactUs/TopicButton.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, space, textSans } from '@guardian/source-foundations'; +import { from, space, textSans } from '@guardian/source/foundations'; import type { Topic } from '../../../../shared/contactUsTypes'; import { TopicIcon } from './TopicIcon'; diff --git a/client/components/helpCentre/contactUs/TopicForm.tsx b/client/components/helpCentre/contactUs/TopicForm.tsx index b63c842f4..58c4f6b38 100644 --- a/client/components/helpCentre/contactUs/TopicForm.tsx +++ b/client/components/helpCentre/contactUs/TopicForm.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, headline, neutral, space } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { from, headline, neutral, space } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { useState } from 'react'; import type { Topic } from '../../../../shared/contactUsTypes'; import { TopicButton } from './TopicButton'; diff --git a/client/components/helpCentre/contactUs/TopicIcon.tsx b/client/components/helpCentre/contactUs/TopicIcon.tsx index df34c0b00..230b05594 100644 --- a/client/components/helpCentre/contactUs/TopicIcon.tsx +++ b/client/components/helpCentre/contactUs/TopicIcon.tsx @@ -1,4 +1,4 @@ -import { neutral } from '@guardian/source-foundations'; +import { neutral } from '@guardian/source/foundations'; import { CommentsIcon } from '../../mma/shared/assets/CommentsIcon'; import { CreditCardIcon } from '../../mma/shared/assets/CreditCardIcon'; import { DeliveryIcon } from '../../mma/shared/assets/DeliveryIcon'; diff --git a/client/components/helpCentre/contactUs/UploadFileInput.tsx b/client/components/helpCentre/contactUs/UploadFileInput.tsx index cc595ff87..d74ffe38f 100644 --- a/client/components/helpCentre/contactUs/UploadFileInput.tsx +++ b/client/components/helpCentre/contactUs/UploadFileInput.tsx @@ -9,8 +9,8 @@ import { text, textSans, transitions, -} from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import type * as React from 'react'; import { ErrorIcon } from '../../mma/shared/assets/ErrorIcon'; diff --git a/client/components/helpCentre/contactUs/contactUsForm.tsx b/client/components/helpCentre/contactUs/contactUsForm.tsx index f989b0d13..b6cdceaa9 100644 --- a/client/components/helpCentre/contactUs/contactUsForm.tsx +++ b/client/components/helpCentre/contactUs/contactUsForm.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import type { ChangeEvent, FormEvent } from 'react'; import { useEffect, useState } from 'react'; import type { ContactUsFormPayload } from '../../../../shared/contactUsTypes'; diff --git a/client/components/helpCentre/diagnosticInformation/DiagnosticInformation.tsx b/client/components/helpCentre/diagnosticInformation/DiagnosticInformation.tsx index f08ad8b5b..6208b4ab8 100644 --- a/client/components/helpCentre/diagnosticInformation/DiagnosticInformation.tsx +++ b/client/components/helpCentre/diagnosticInformation/DiagnosticInformation.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { useRef, useState } from 'react'; import { h2Css } from '../HelpCentreStyles'; import { AccountInformation } from './AccountInformation'; diff --git a/client/components/helpCentre/liveChat/LiveChat.tsx b/client/components/helpCentre/liveChat/LiveChat.tsx index 83922e7d7..ce4258470 100644 --- a/client/components/helpCentre/liveChat/LiveChat.tsx +++ b/client/components/helpCentre/liveChat/LiveChat.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import { Button, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { Dispatch, SetStateAction } from 'react'; import { useState } from 'react'; import { conf } from '../../../../server/config'; diff --git a/client/components/helpCentre/liveChat/LiveChatPrivacyNotice.tsx b/client/components/helpCentre/liveChat/LiveChatPrivacyNotice.tsx index 7ef948a6c..bccb64600 100644 --- a/client/components/helpCentre/liveChat/LiveChatPrivacyNotice.tsx +++ b/client/components/helpCentre/liveChat/LiveChatPrivacyNotice.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, from, space, textSans } from '@guardian/source-foundations'; +import { brand, from, space, textSans } from '@guardian/source/foundations'; import { conf } from '../../../../server/config'; export const LiveChatPrivacyNotice = () => { diff --git a/client/components/helpCentre/liveChat/liveChatCssOverrides.ts b/client/components/helpCentre/liveChat/liveChatCssOverrides.ts index a4377af1d..2a78bc243 100644 --- a/client/components/helpCentre/liveChat/liveChatCssOverrides.ts +++ b/client/components/helpCentre/liveChat/liveChatCssOverrides.ts @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; export const liveChatCss = css` .embeddedServiceSidebar.layout-docked .dockableContainer, diff --git a/client/components/mma/MMAPage.tsx b/client/components/mma/MMAPage.tsx index 547a6b675..061541ae5 100644 --- a/client/components/mma/MMAPage.tsx +++ b/client/components/mma/MMAPage.tsx @@ -1,6 +1,6 @@ import { css, Global } from '@emotion/react'; import { ABProvider, useAB } from '@guardian/ab-react'; -import { breakpoints, from, space } from '@guardian/source-foundations'; +import { breakpoints, from, space } from '@guardian/source/foundations'; import type { ReactNode } from 'react'; import { lazy, Suspense, useEffect, useState } from 'react'; import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom'; diff --git a/client/components/mma/Page.tsx b/client/components/mma/Page.tsx index 9fcaab380..f45bc693b 100644 --- a/client/components/mma/Page.tsx +++ b/client/components/mma/Page.tsx @@ -6,7 +6,7 @@ import { palette, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { ReactElement } from 'react'; import { useContext, useEffect } from 'react'; import { gridBase, gridColumns, gridItemPlacement } from '../../styles/grid'; diff --git a/client/components/mma/accountoverview/AccountOverview.tsx b/client/components/mma/accountoverview/AccountOverview.tsx index 2c0da5b2e..c3684f50f 100644 --- a/client/components/mma/accountoverview/AccountOverview.tsx +++ b/client/components/mma/accountoverview/AccountOverview.tsx @@ -5,8 +5,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { Stack } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Stack } from '@guardian/source/react-components'; import { capitalize } from 'lodash'; import { Fragment } from 'react'; import { featureSwitches } from '../../../../shared/featureSwitches'; diff --git a/client/components/mma/accountoverview/CancelledProductCard.tsx b/client/components/mma/accountoverview/CancelledProductCard.tsx index 2ff6f5cbf..e59adca57 100644 --- a/client/components/mma/accountoverview/CancelledProductCard.tsx +++ b/client/components/mma/accountoverview/CancelledProductCard.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { LinkButton, Stack } from '@guardian/source-react-components'; -import { InfoSummary } from '@guardian/source-react-components-development-kitchen'; +import { LinkButton, Stack } from '@guardian/source/react-components'; +import { InfoSummary } from '@guardian/source-development-kitchen/react-components'; import { parseDate } from '@/shared/dates'; import type { CancelledProductDetail } from '@/shared/productResponse'; import { GROUPED_PRODUCT_TYPES } from '@/shared/productTypes'; diff --git a/client/components/mma/accountoverview/EmptyAccountOverview.tsx b/client/components/mma/accountoverview/EmptyAccountOverview.tsx index bb11e145e..9ad451550 100644 --- a/client/components/mma/accountoverview/EmptyAccountOverview.tsx +++ b/client/components/mma/accountoverview/EmptyAccountOverview.tsx @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useState } from 'react'; import { CallCentreEmailAndNumbers } from '../../shared/CallCenterEmailAndNumbers'; import { SupportTheGuardianButton } from '../../shared/SupportTheGuardianButton'; diff --git a/client/components/mma/accountoverview/GiftRibbon.tsx b/client/components/mma/accountoverview/GiftRibbon.tsx index 485ad2b40..6a3589999 100644 --- a/client/components/mma/accountoverview/GiftRibbon.tsx +++ b/client/components/mma/accountoverview/GiftRibbon.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; export const GiftRibbon = ({ inverted }: { inverted?: boolean }) => { const colourText = inverted ? palette.brand[400] : palette.brandAlt[400]; diff --git a/client/components/mma/accountoverview/InAppPurchaseCard.tsx b/client/components/mma/accountoverview/InAppPurchaseCard.tsx index 5e02706e5..90a8d42d4 100644 --- a/client/components/mma/accountoverview/InAppPurchaseCard.tsx +++ b/client/components/mma/accountoverview/InAppPurchaseCard.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; -import { space, textSans } from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; -import { InfoSummary } from '@guardian/source-react-components-development-kitchen'; +import { space, textSans } from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; +import { InfoSummary } from '@guardian/source-development-kitchen/react-components'; import { capitalize } from 'lodash'; import { useNavigate } from 'react-router'; import { dateString } from '../../../../shared/dates'; diff --git a/client/components/mma/accountoverview/ManageProduct.tsx b/client/components/mma/accountoverview/ManageProduct.tsx index 68201222e..e1bbf0671 100644 --- a/client/components/mma/accountoverview/ManageProduct.tsx +++ b/client/components/mma/accountoverview/ManageProduct.tsx @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useState } from 'react'; import { Link, Navigate, useLocation } from 'react-router-dom'; import { featureSwitches } from '@/shared/featureSwitches'; diff --git a/client/components/mma/accountoverview/NewsletterOptinSection.tsx b/client/components/mma/accountoverview/NewsletterOptinSection.tsx index 567f4bd6c..56813947c 100644 --- a/client/components/mma/accountoverview/NewsletterOptinSection.tsx +++ b/client/components/mma/accountoverview/NewsletterOptinSection.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { neutral, space, textSans } from '@guardian/source-foundations'; -import { Button, Checkbox } from '@guardian/source-react-components'; +import { neutral, space, textSans } from '@guardian/source/foundations'; +import { Button, Checkbox } from '@guardian/source/react-components'; import * as Sentry from '@sentry/browser'; import type { ChangeEvent, FormEvent } from 'react'; import { Fragment, useEffect, useState } from 'react'; diff --git a/client/components/mma/accountoverview/PersonalisedHeader.tsx b/client/components/mma/accountoverview/PersonalisedHeader.tsx index 9845cf7b3..d9a0fed04 100644 --- a/client/components/mma/accountoverview/PersonalisedHeader.tsx +++ b/client/components/mma/accountoverview/PersonalisedHeader.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headline, space } from '@guardian/source-foundations'; +import { headline, space } from '@guardian/source/foundations'; import { min } from 'date-fns'; import { dateString } from '@/shared/dates'; import type { MPAPIResponse } from '@/shared/mpapiResponse'; diff --git a/client/components/mma/accountoverview/ProductCard.tsx b/client/components/mma/accountoverview/ProductCard.tsx index 20ee62796..dfc18de10 100644 --- a/client/components/mma/accountoverview/ProductCard.tsx +++ b/client/components/mma/accountoverview/ProductCard.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; -import { palette, textSans } from '@guardian/source-foundations'; +import { palette, textSans } from '@guardian/source/foundations'; import { Button, Stack, SvgInfoRound, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; -import { InfoSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { InfoSummary } from '@guardian/source-development-kitchen/react-components'; import { useNavigate } from 'react-router'; import { cancellationFormatDate, diff --git a/client/components/mma/accountoverview/ProductCardConfiguration.ts b/client/components/mma/accountoverview/ProductCardConfiguration.ts index 423a0facc..e322adcd9 100644 --- a/client/components/mma/accountoverview/ProductCardConfiguration.ts +++ b/client/components/mma/accountoverview/ProductCardConfiguration.ts @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { ProductTypeKeys } from '../../../../shared/productTypes'; export const textColour = { diff --git a/client/components/mma/accountoverview/ProductCardStyles.ts b/client/components/mma/accountoverview/ProductCardStyles.ts index fbae9ad15..eb5b1b2e5 100644 --- a/client/components/mma/accountoverview/ProductCardStyles.ts +++ b/client/components/mma/accountoverview/ProductCardStyles.ts @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, headline, space, textSans } from '@guardian/source-foundations'; +import { from, headline, space, textSans } from '@guardian/source/foundations'; import { textColour } from './ProductCardConfiguration'; export const productCardTitleCss = (dark?: boolean) => css` diff --git a/client/components/mma/accountoverview/SingleContributionCard.tsx b/client/components/mma/accountoverview/SingleContributionCard.tsx index a15005709..0ff3d67ce 100644 --- a/client/components/mma/accountoverview/SingleContributionCard.tsx +++ b/client/components/mma/accountoverview/SingleContributionCard.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { useNavigate } from 'react-router'; import { convertTimestampToDate } from '../../../../shared/dates'; import type { SingleProductDetail } from '../../../../shared/productResponse'; diff --git a/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx b/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx index 89c72918f..bceb2491d 100644 --- a/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx +++ b/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, LinkButton, @@ -13,7 +13,7 @@ import { SvgCalendar, SvgClock, SvgCreditCard, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useLocation, useNavigate } from 'react-router-dom'; import { PageContainer } from '@/client/components/mma/Page'; import { ErrorIcon } from '@/client/components/mma/shared/assets/ErrorIcon'; @@ -93,7 +93,8 @@ const InnerContent = ({ const hasCancellationPending = productDetail.subscription.cancelledAt; - const isSelfServeCancellationAllowed = productDetail.selfServiceCancellation.isAllowed; + const isSelfServeCancellationAllowed = + productDetail.selfServiceCancellation.isAllowed; const cancelledCopy = specificProductType.cancelledCopy || groupedProductType.cancelledCopy; @@ -252,24 +253,26 @@ const InnerContent = ({ margin-left: ${space[5]}px; `} > - {!hasCancellationPending && isSelfServeCancellationAllowed && ( - - )} + ); + }} + > + Cancel {groupedProductType.friendlyName()} + + )} diff --git a/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx b/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx index 670a17e77..8c48ec219 100644 --- a/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx +++ b/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source-foundations'; +import { palette, space, textSans } from '@guardian/source/foundations'; import { Button, ChoiceCard, ChoiceCardGroup, InlineError, TextInput, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { capitalize } from 'lodash'; import { useEffect, useState } from 'react'; import type { PaidSubscriptionPlan } from '../../../../../shared/productResponse'; diff --git a/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx b/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx index f14c3b565..6a2c13c22 100644 --- a/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx +++ b/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, space, textSans, until } from '@guardian/source-foundations'; +import { palette, space, textSans, until } from '@guardian/source/foundations'; import { Button, ChoiceCard, @@ -9,7 +9,7 @@ import { SvgInfoRound, TextInput, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import type { PaidSubscriptionPlan } from '../../../../../shared/productResponse'; import { getBillingPeriodAdjective } from '../../../../../shared/productTypes'; diff --git a/client/components/mma/accountoverview/updateAmount/UpdateAmount.tsx b/client/components/mma/accountoverview/updateAmount/UpdateAmount.tsx index bc939cd0a..0d63a89c0 100644 --- a/client/components/mma/accountoverview/updateAmount/UpdateAmount.tsx +++ b/client/components/mma/accountoverview/updateAmount/UpdateAmount.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, space } from '@guardian/source-foundations'; +import { palette, space } from '@guardian/source/foundations'; import { capitalize } from 'lodash'; import type { Dispatch, SetStateAction } from 'react'; import { useState } from 'react'; diff --git a/client/components/mma/billing/Billing.tsx b/client/components/mma/billing/Billing.tsx index 1a3586ec5..215e7d312 100644 --- a/client/components/mma/billing/Billing.tsx +++ b/client/components/mma/billing/Billing.tsx @@ -7,7 +7,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { capitalize } from 'lodash'; import { Fragment } from 'react'; import { parseDate } from '../../../../shared/dates'; diff --git a/client/components/mma/billing/InvoiceTableYearSelect.tsx b/client/components/mma/billing/InvoiceTableYearSelect.tsx index 32b95cf19..7a89116dd 100644 --- a/client/components/mma/billing/InvoiceTableYearSelect.tsx +++ b/client/components/mma/billing/InvoiceTableYearSelect.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { headline, neutral, space, until } from '@guardian/source-foundations'; -import { SvgChevronDownSingle } from '@guardian/source-react-components'; +import { headline, neutral, space, until } from '@guardian/source/foundations'; +import { SvgChevronDownSingle } from '@guardian/source/react-components'; import type { ChangeEvent, Dispatch, SetStateAction } from 'react'; import { trackEvent } from '../../../utilities/analytics'; diff --git a/client/components/mma/billing/InvoicesTable.tsx b/client/components/mma/billing/InvoicesTable.tsx index 3e3cb29e4..d73911cf1 100644 --- a/client/components/mma/billing/InvoicesTable.tsx +++ b/client/components/mma/billing/InvoicesTable.tsx @@ -6,7 +6,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useState } from 'react'; import { parseDate } from '@/shared/dates'; import type { InvoiceDataApiItem } from '@/shared/productResponse'; diff --git a/client/components/mma/cancel/CancellationReasonReview.tsx b/client/components/mma/cancel/CancellationReasonReview.tsx index d46728e42..41e35790f 100644 --- a/client/components/mma/cancel/CancellationReasonReview.tsx +++ b/client/components/mma/cancel/CancellationReasonReview.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; -import { palette, space, until } from '@guardian/source-foundations'; +import { palette, space, until } from '@guardian/source/foundations'; import { Button, InlineError, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { ChangeEvent, FC } from 'react'; import { useContext, useState } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/cancel/CancellationReasonSelection.tsx b/client/components/mma/cancel/CancellationReasonSelection.tsx index ebfbf9d2c..a3e26f53b 100644 --- a/client/components/mma/cancel/CancellationReasonSelection.tsx +++ b/client/components/mma/cancel/CancellationReasonSelection.tsx @@ -5,14 +5,14 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, InlineError, Radio, RadioGroup, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { FormEvent } from 'react'; import { useContext, useState } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/cancel/CancellationSummary.tsx b/client/components/mma/cancel/CancellationSummary.tsx index 2c33b2e63..4702fc86f 100644 --- a/client/components/mma/cancel/CancellationSummary.tsx +++ b/client/components/mma/cancel/CancellationSummary.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, space } from '@guardian/source-foundations'; +import { brand, space } from '@guardian/source/foundations'; import { Link } from 'react-router-dom'; import { cancellationFormatDate } from '../../../../shared/dates'; import type { diff --git a/client/components/mma/cancel/ContactUsToCancel.tsx b/client/components/mma/cancel/ContactUsToCancel.tsx index e48b7bc78..dd3342bbe 100644 --- a/client/components/mma/cancel/ContactUsToCancel.tsx +++ b/client/components/mma/cancel/ContactUsToCancel.tsx @@ -6,8 +6,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { LinkButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { LinkButton } from '@guardian/source/react-components'; import type { SelfServiceCancellation } from '../../../../shared/productResponse'; import type { GroupedProductType } from '../../../../shared/productTypes'; import { CallCentreEmailAndNumbers } from '../../shared/CallCenterEmailAndNumbers'; diff --git a/client/components/mma/cancel/ResubscribeThrasher.tsx b/client/components/mma/cancel/ResubscribeThrasher.tsx index eb72d1f8a..94c17bfb6 100644 --- a/client/components/mma/cancel/ResubscribeThrasher.tsx +++ b/client/components/mma/cancel/ResubscribeThrasher.tsx @@ -1,4 +1,4 @@ -import { from, palette } from '@guardian/source-foundations'; +import { from, palette } from '@guardian/source/foundations'; import type { ReactNode } from 'react'; import { getScopeFromRequestPathOrEmptyString, diff --git a/client/components/mma/cancel/cancellationConstants.ts b/client/components/mma/cancel/cancellationConstants.ts index 65b4ef550..d30a461e0 100644 --- a/client/components/mma/cancel/cancellationConstants.ts +++ b/client/components/mma/cancel/cancellationConstants.ts @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; export const standardAlternateFeedbackIntro = 'Please share any further thoughts you have about cancelling — you can help us improve. Thank you.'; diff --git a/client/components/mma/cancel/cancellationContributionReminder.tsx b/client/components/mma/cancel/cancellationContributionReminder.tsx index db22c3c7c..9d075f2e5 100644 --- a/client/components/mma/cancel/cancellationContributionReminder.tsx +++ b/client/components/mma/cancel/cancellationContributionReminder.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { Button, Radio, RadioGroup } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { Button, Radio, RadioGroup } from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import type * as React from 'react'; import { useNavigate } from 'react-router'; diff --git a/client/components/mma/cancel/cancellationSaves/CancellationLanding.tsx b/client/components/mma/cancel/cancellationSaves/CancellationLanding.tsx index a90728c7a..3510bfee6 100644 --- a/client/components/mma/cancel/cancellationSaves/CancellationLanding.tsx +++ b/client/components/mma/cancel/cancellationSaves/CancellationLanding.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space, textSans } from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +import { space, textSans } from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { useContext } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router'; import { CallCentreAccordion } from '@/client/components/shared/CallCentreAccordion'; diff --git a/client/components/mma/cancel/cancellationSaves/SelectReason.tsx b/client/components/mma/cancel/cancellationSaves/SelectReason.tsx index b3f92a1ec..ed30e4292 100644 --- a/client/components/mma/cancel/cancellationSaves/SelectReason.tsx +++ b/client/components/mma/cancel/cancellationSaves/SelectReason.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; import { Button, InlineError, Radio, RadioGroup, Stack, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { FormEvent } from 'react'; import { useContext, useState } from 'react'; import { useLocation, useNavigate } from 'react-router'; diff --git a/client/components/mma/cancel/cancellationSaves/digipack/ConfirmDigiSubCancellation.tsx b/client/components/mma/cancel/cancellationSaves/digipack/ConfirmDigiSubCancellation.tsx index 49b91548f..222d0d892 100644 --- a/client/components/mma/cancel/cancellationSaves/digipack/ConfirmDigiSubCancellation.tsx +++ b/client/components/mma/cancel/cancellationSaves/digipack/ConfirmDigiSubCancellation.tsx @@ -5,8 +5,8 @@ import { palette, space, textSans, -} from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import { useLocation, useNavigate } from 'react-router'; import type { CancellationContextInterface } from '@/client/components/mma/cancel/CancellationContainer'; diff --git a/client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirmed.tsx b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirmed.tsx index 466648191..f9b409e56 100644 --- a/client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirmed.tsx +++ b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubDiscountConfirmed.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source-foundations'; +import { palette, space, textSans } from '@guardian/source/foundations'; import { LinkButton, Stack, SvgCalendar, SvgEnvelope, SvgGift, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { captureException } from '@sentry/browser'; import { useContext, useEffect } from 'react'; import { useLocation } from 'react-router'; diff --git a/client/components/mma/cancel/cancellationSaves/digipack/DigiSubThankYouOffer.tsx b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubThankYouOffer.tsx index b347c6dab..c4bc93718 100644 --- a/client/components/mma/cancel/cancellationSaves/digipack/DigiSubThankYouOffer.tsx +++ b/client/components/mma/cancel/cancellationSaves/digipack/DigiSubThankYouOffer.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; -import { from, headline, space, textSans } from '@guardian/source-foundations'; +import { from, headline, space, textSans } from '@guardian/source/foundations'; import { Button, Stack, SvgTickRound, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import { useContext, useEffect, useState } from 'react'; import { useLocation, useNavigate } from 'react-router'; import { diff --git a/client/components/mma/cancel/cancellationSaves/membership/ConfirmMembershipCancellation.tsx b/client/components/mma/cancel/cancellationSaves/membership/ConfirmMembershipCancellation.tsx index c550fa84b..4ba030d5b 100644 --- a/client/components/mma/cancel/cancellationSaves/membership/ConfirmMembershipCancellation.tsx +++ b/client/components/mma/cancel/cancellationSaves/membership/ConfirmMembershipCancellation.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +import { palette, space, textSans } from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import { useLocation, useNavigate } from 'react-router'; import { MDA_TEST_USER_HEADER } from '../../../../../../shared/productResponse'; diff --git a/client/components/mma/cancel/cancellationSaves/membership/ContinueMembershipConfirmation.tsx b/client/components/mma/cancel/cancellationSaves/membership/ContinueMembershipConfirmation.tsx index 2c85c33d1..a2d655f74 100644 --- a/client/components/mma/cancel/cancellationSaves/membership/ContinueMembershipConfirmation.tsx +++ b/client/components/mma/cancel/cancellationSaves/membership/ContinueMembershipConfirmation.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, space, textSans } from '@guardian/source-foundations'; -import { Button, LinkButton, Stack } from '@guardian/source-react-components'; +import { from, space, textSans } from '@guardian/source/foundations'; +import { Button, LinkButton, Stack } from '@guardian/source/react-components'; import { useContext } from 'react'; import { useNavigate } from 'react-router'; import { cancellationFormatDate } from '../../../../../../shared/dates'; diff --git a/client/components/mma/cancel/cancellationSaves/membership/MembershipSwitch.tsx b/client/components/mma/cancel/cancellationSaves/membership/MembershipSwitch.tsx index a35cc29df..508155440 100644 --- a/client/components/mma/cancel/cancellationSaves/membership/MembershipSwitch.tsx +++ b/client/components/mma/cancel/cancellationSaves/membership/MembershipSwitch.tsx @@ -1,13 +1,13 @@ import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source-foundations'; +import { palette, space, textSans } from '@guardian/source/foundations'; import { Button, Stack, SvgClock, SvgCreditCard, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import { useContext, useEffect, useState } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router'; import { dateString, parseDate } from '../../../../../../shared/dates'; diff --git a/client/components/mma/cancel/cancellationSaves/membership/SaveOptions.tsx b/client/components/mma/cancel/cancellationSaves/membership/SaveOptions.tsx index a32ac90b9..8b5f3f3f3 100644 --- a/client/components/mma/cancel/cancellationSaves/membership/SaveOptions.tsx +++ b/client/components/mma/cancel/cancellationSaves/membership/SaveOptions.tsx @@ -5,12 +5,12 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, Stack, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useContext } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router'; import type { PaidSubscriptionPlan } from '../../../../../../shared/productResponse'; diff --git a/client/components/mma/cancel/cancellationSaves/membership/SaveStyles.ts b/client/components/mma/cancel/cancellationSaves/membership/SaveStyles.ts index a2e0fa4e5..7fadf0c6f 100644 --- a/client/components/mma/cancel/cancellationSaves/membership/SaveStyles.ts +++ b/client/components/mma/cancel/cancellationSaves/membership/SaveStyles.ts @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; export const cardSectionCss = css` margin-top: ${space[5]}px; diff --git a/client/components/mma/cancel/cancellationSaves/membership/SwitchThankYou.tsx b/client/components/mma/cancel/cancellationSaves/membership/SwitchThankYou.tsx index 5da4b4697..51aa85a8f 100644 --- a/client/components/mma/cancel/cancellationSaves/membership/SwitchThankYou.tsx +++ b/client/components/mma/cancel/cancellationSaves/membership/SwitchThankYou.tsx @@ -4,7 +4,7 @@ import { Stack, SvgCalendar, SvgEnvelope, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useContext, useEffect } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router'; import { diff --git a/client/components/mma/cancel/cancellationSaves/membership/ValueOfSupport.tsx b/client/components/mma/cancel/cancellationSaves/membership/ValueOfSupport.tsx index ec16410b6..3efe6164f 100644 --- a/client/components/mma/cancel/cancellationSaves/membership/ValueOfSupport.tsx +++ b/client/components/mma/cancel/cancellationSaves/membership/ValueOfSupport.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space, textSans } from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +import { space, textSans } from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { useContext } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router'; import { dateString } from '../../../../../../shared/dates'; diff --git a/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackForm.tsx b/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackForm.tsx index e5961997f..dde4842b6 100644 --- a/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackForm.tsx +++ b/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackForm.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { Button } from '@guardian/source-react-components'; +import { Button } from '@guardian/source/react-components'; import { useState } from 'react'; import type * as React from 'react'; import { CaseUpdateAsyncLoader, getUpdateCasePromise } from '../caseUpdate'; diff --git a/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackFormThankYou.tsx b/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackFormThankYou.tsx index 33d3eca07..d81c9622e 100644 --- a/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackFormThankYou.tsx +++ b/client/components/mma/cancel/contributions/ContributionsCancellationFeedbackFormThankYou.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral, space } from '@guardian/source-foundations'; +import { neutral, space } from '@guardian/source/foundations'; import type * as React from 'react'; const containerStyles = css` diff --git a/client/components/mma/cancel/contributions/ContributionsCancellationFlowFinancialSaveAttempt.tsx b/client/components/mma/cancel/contributions/ContributionsCancellationFlowFinancialSaveAttempt.tsx index c6af482ca..6b2e8bc0a 100644 --- a/client/components/mma/cancel/contributions/ContributionsCancellationFlowFinancialSaveAttempt.tsx +++ b/client/components/mma/cancel/contributions/ContributionsCancellationFlowFinancialSaveAttempt.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { Button, LinkButton, SvgArrowLeftStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import * as Sentry from '@sentry/browser'; import { useContext, useState } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/cancel/contributions/ContributionsCancellationFlowPaymentIssueSaveAttempt.tsx b/client/components/mma/cancel/contributions/ContributionsCancellationFlowPaymentIssueSaveAttempt.tsx index 72021e29a..f0c38ee53 100644 --- a/client/components/mma/cancel/contributions/ContributionsCancellationFlowPaymentIssueSaveAttempt.tsx +++ b/client/components/mma/cancel/contributions/ContributionsCancellationFlowPaymentIssueSaveAttempt.tsx @@ -1,11 +1,11 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { Button, LinkButton, Stack, SvgArrowLeftStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import * as Sentry from '@sentry/browser'; import { useContext, useState } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/cancel/contributions/ContributionsCancellationFlowStart.tsx b/client/components/mma/cancel/contributions/ContributionsCancellationFlowStart.tsx index 2d19c7042..563f06da0 100644 --- a/client/components/mma/cancel/contributions/ContributionsCancellationFlowStart.tsx +++ b/client/components/mma/cancel/contributions/ContributionsCancellationFlowStart.tsx @@ -1,4 +1,4 @@ -import { Stack } from '@guardian/source-react-components'; +import { Stack } from '@guardian/source/react-components'; import { measure } from '../../../../styles/typography'; import { Heading } from '../../shared/Heading'; diff --git a/client/components/mma/cancel/digipack/DigipackCancellationFlowStart.tsx b/client/components/mma/cancel/digipack/DigipackCancellationFlowStart.tsx index 87da53c8f..77e1bebdc 100644 --- a/client/components/mma/cancel/digipack/DigipackCancellationFlowStart.tsx +++ b/client/components/mma/cancel/digipack/DigipackCancellationFlowStart.tsx @@ -1,4 +1,4 @@ -import { Stack } from '@guardian/source-react-components'; +import { Stack } from '@guardian/source/react-components'; import { measure } from '../../../../styles/typography'; import { Heading } from '../../shared/Heading'; diff --git a/client/components/mma/cancel/gw/GwCancellationFlowStart.tsx b/client/components/mma/cancel/gw/GwCancellationFlowStart.tsx index 4d65902d0..c759a8a55 100644 --- a/client/components/mma/cancel/gw/GwCancellationFlowStart.tsx +++ b/client/components/mma/cancel/gw/GwCancellationFlowStart.tsx @@ -1,4 +1,4 @@ -import { Stack } from '@guardian/source-react-components'; +import { Stack } from '@guardian/source/react-components'; import { measure } from '../../../../styles/typography'; import { trackEvent } from '../../../../utilities/analytics'; import { Heading } from '../../shared/Heading'; diff --git a/client/components/mma/cancel/membership/MembershipCancellationFlowStart.tsx b/client/components/mma/cancel/membership/MembershipCancellationFlowStart.tsx index e4c2197dc..1ca73a734 100644 --- a/client/components/mma/cancel/membership/MembershipCancellationFlowStart.tsx +++ b/client/components/mma/cancel/membership/MembershipCancellationFlowStart.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { ProductDetail } from '../../../../../shared/productResponse'; import { trackEvent } from '../../../../utilities/analytics'; import { WithStandardTopMargin } from '../../../shared/WithStandardTopMargin'; diff --git a/client/components/mma/cancel/stages/ExecuteCancellation.tsx b/client/components/mma/cancel/stages/ExecuteCancellation.tsx index fbcd69d47..f34dace15 100644 --- a/client/components/mma/cancel/stages/ExecuteCancellation.tsx +++ b/client/components/mma/cancel/stages/ExecuteCancellation.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import type { ReactNode } from 'react'; import { useContext } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/cancel/stages/SavedCancellation.tsx b/client/components/mma/cancel/stages/SavedCancellation.tsx index 3271431e5..32a56d665 100644 --- a/client/components/mma/cancel/stages/SavedCancellation.tsx +++ b/client/components/mma/cancel/stages/SavedCancellation.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { LinkButton, SvgArrowLeftStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import * as Sentry from '@sentry/browser'; import { useContext } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/cancel/supporterplus/SupporterplusCancellationFlowStart.tsx b/client/components/mma/cancel/supporterplus/SupporterplusCancellationFlowStart.tsx index 47e23bdcc..d2bf5176d 100644 --- a/client/components/mma/cancel/supporterplus/SupporterplusCancellationFlowStart.tsx +++ b/client/components/mma/cancel/supporterplus/SupporterplusCancellationFlowStart.tsx @@ -1,4 +1,4 @@ -import { Stack } from '@guardian/source-react-components'; +import { Stack } from '@guardian/source/react-components'; import { measure } from '../../../../styles/typography'; import { Heading } from '../../shared/Heading'; diff --git a/client/components/mma/cancel/voucher/VoucherCancellationFlowStart.tsx b/client/components/mma/cancel/voucher/VoucherCancellationFlowStart.tsx index 30fe447c5..e3763e597 100644 --- a/client/components/mma/cancel/voucher/VoucherCancellationFlowStart.tsx +++ b/client/components/mma/cancel/voucher/VoucherCancellationFlowStart.tsx @@ -1,4 +1,4 @@ -import { Stack } from '@guardian/source-react-components'; +import { Stack } from '@guardian/source/react-components'; import type { ProductDetail } from '../../../../../shared/productResponse'; import { getMainPlan } from '../../../../../shared/productResponse'; import { measure } from '../../../../styles/typography'; diff --git a/client/components/mma/dataPrivacy/CookiesOnTheBrowserSection.tsx b/client/components/mma/dataPrivacy/CookiesOnTheBrowserSection.tsx index 14173a15f..2e9ba0e4d 100644 --- a/client/components/mma/dataPrivacy/CookiesOnTheBrowserSection.tsx +++ b/client/components/mma/dataPrivacy/CookiesOnTheBrowserSection.tsx @@ -1,4 +1,4 @@ -import { Button } from '@guardian/source-react-components'; +import { Button } from '@guardian/source/react-components'; import { dataPrivacyHeadingCss, dataPrivacyParagraphCss, diff --git a/client/components/mma/dataPrivacy/DataPrivacy.styles.ts b/client/components/mma/dataPrivacy/DataPrivacy.styles.ts index 11d7217ae..dbb327b80 100644 --- a/client/components/mma/dataPrivacy/DataPrivacy.styles.ts +++ b/client/components/mma/dataPrivacy/DataPrivacy.styles.ts @@ -6,7 +6,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { gridColumns } from '../../../styles/grid'; export const dataPrivacyHeadingCss = css` diff --git a/client/components/mma/dataPrivacy/DataPrivacyPage.tsx b/client/components/mma/dataPrivacy/DataPrivacyPage.tsx index e7c7f678c..cdde6fabe 100644 --- a/client/components/mma/dataPrivacy/DataPrivacyPage.tsx +++ b/client/components/mma/dataPrivacy/DataPrivacyPage.tsx @@ -1,5 +1,5 @@ import type { CMP } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import { gridItemPlacement } from '../../../styles/grid'; import { fetchWithDefaultParameters } from '../../../utilities/fetch'; diff --git a/client/components/mma/delivery/address/DeliveryAddressChangeContainer.tsx b/client/components/mma/delivery/address/DeliveryAddressChangeContainer.tsx index ffce82d67..fd4d69a9f 100644 --- a/client/components/mma/delivery/address/DeliveryAddressChangeContainer.tsx +++ b/client/components/mma/delivery/address/DeliveryAddressChangeContainer.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { useState } from 'react'; import { Outlet } from 'react-router-dom'; import type { MembersDataApiResponse } from '../../../../../shared/productResponse'; diff --git a/client/components/mma/delivery/address/DeliveryAddressConfirmation.tsx b/client/components/mma/delivery/address/DeliveryAddressConfirmation.tsx index 181116708..6ad0c68fe 100644 --- a/client/components/mma/delivery/address/DeliveryAddressConfirmation.tsx +++ b/client/components/mma/delivery/address/DeliveryAddressConfirmation.tsx @@ -7,8 +7,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { Stack } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Stack } from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import { Navigate, useLocation } from 'react-router-dom'; import { dateString } from '../../../../../shared/dates'; diff --git a/client/components/mma/delivery/address/DeliveryAddressDisplay.tsx b/client/components/mma/delivery/address/DeliveryAddressDisplay.tsx index 9fe9b3886..b51432590 100644 --- a/client/components/mma/delivery/address/DeliveryAddressDisplay.tsx +++ b/client/components/mma/delivery/address/DeliveryAddressDisplay.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans } from '@guardian/source-foundations'; +import { textSans } from '@guardian/source/foundations'; import type { DeliveryAddress } from '@/shared/productResponse'; import { COUNTRIES } from '../../identity/models'; diff --git a/client/components/mma/delivery/address/DeliveryAddressForm.tsx b/client/components/mma/delivery/address/DeliveryAddressForm.tsx index 6e553f7a2..f8a1bef7c 100644 --- a/client/components/mma/delivery/address/DeliveryAddressForm.tsx +++ b/client/components/mma/delivery/address/DeliveryAddressForm.tsx @@ -6,13 +6,13 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, Checkbox, CheckboxGroup, Stack, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { ChangeEvent, Dispatch, FormEvent, SetStateAction } from 'react'; import { useContext, useState } from 'react'; import { Link, useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/delivery/address/DeliveryAddressReview.tsx b/client/components/mma/delivery/address/DeliveryAddressReview.tsx index c637ae9bb..e10f9d46e 100644 --- a/client/components/mma/delivery/address/DeliveryAddressReview.tsx +++ b/client/components/mma/delivery/address/DeliveryAddressReview.tsx @@ -7,8 +7,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import { Link, Navigate, useLocation, useNavigate } from 'react-router-dom'; import type { diff --git a/client/components/mma/delivery/address/Select.tsx b/client/components/mma/delivery/address/Select.tsx index a8693a42c..c05fb783e 100644 --- a/client/components/mma/delivery/address/Select.tsx +++ b/client/components/mma/delivery/address/Select.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { focusHalo, palette, textSans } from '@guardian/source-foundations'; +import { focusHalo, palette, textSans } from '@guardian/source/foundations'; import type * as React from 'react'; import { ErrorIcon } from '../../shared/assets/ErrorIcon'; diff --git a/client/components/mma/delivery/records/DeliveryAddressStep.tsx b/client/components/mma/delivery/records/DeliveryAddressStep.tsx index 12de9c6f4..9812d3749 100644 --- a/client/components/mma/delivery/records/DeliveryAddressStep.tsx +++ b/client/components/mma/delivery/records/DeliveryAddressStep.tsx @@ -5,12 +5,12 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, Checkbox, CheckboxGroup, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import Color from 'color'; import type { ChangeEvent, Dispatch, FormEvent, SetStateAction } from 'react'; import { useContext, useState } from 'react'; diff --git a/client/components/mma/delivery/records/DeliveryRecordCard.tsx b/client/components/mma/delivery/records/DeliveryRecordCard.tsx index 51089a9d5..931a03d8f 100644 --- a/client/components/mma/delivery/records/DeliveryRecordCard.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordCard.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; -import { Checkbox, CheckboxGroup } from '@guardian/source-react-components'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; +import { Checkbox, CheckboxGroup } from '@guardian/source/react-components'; import type { FormEvent } from 'react'; import { dateIsAfter, parseDate } from '@/shared/dates'; import type { DeliveryRecordApiItem } from '@/shared/productResponse'; diff --git a/client/components/mma/delivery/records/DeliveryRecordInstructions.tsx b/client/components/mma/delivery/records/DeliveryRecordInstructions.tsx index 326a57184..7b6d76bcc 100644 --- a/client/components/mma/delivery/records/DeliveryRecordInstructions.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordInstructions.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, from, textSans } from '@guardian/source-foundations'; +import { brand, from, textSans } from '@guardian/source/foundations'; import { useState } from 'react'; interface DeliveryRecordInstructionsProps { diff --git a/client/components/mma/delivery/records/DeliveryRecordStatus.tsx b/client/components/mma/delivery/records/DeliveryRecordStatus.tsx index 42279be25..2fc759d27 100644 --- a/client/components/mma/delivery/records/DeliveryRecordStatus.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordStatus.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, space } from '@guardian/source-foundations'; +import { brand, space } from '@guardian/source/foundations'; import { capitalize } from 'lodash'; import { ErrorIcon } from '../../shared/assets/ErrorIcon'; import { HolidayStopIcon } from '../../shared/assets/HolidayStopIcon'; diff --git a/client/components/mma/delivery/records/DeliveryRecords.tsx b/client/components/mma/delivery/records/DeliveryRecords.tsx index 9f1f7bac4..103fcc451 100644 --- a/client/components/mma/delivery/records/DeliveryRecords.tsx +++ b/client/components/mma/delivery/records/DeliveryRecords.tsx @@ -7,8 +7,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { capitalize } from 'lodash'; import { useContext, useEffect, useState } from 'react'; import { useNavigate } from 'react-router'; diff --git a/client/components/mma/delivery/records/DeliveryRecordsAddress.tsx b/client/components/mma/delivery/records/DeliveryRecordsAddress.tsx index 902a6d271..e77684cdb 100644 --- a/client/components/mma/delivery/records/DeliveryRecordsAddress.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordsAddress.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, from, textSans } from '@guardian/source-foundations'; +import { brand, from, textSans } from '@guardian/source/foundations'; import { useState } from 'react'; import type { DeliveryAddress } from '../../../../../shared/productResponse'; import { COUNTRIES } from '../../identity/models'; diff --git a/client/components/mma/delivery/records/DeliveryRecordsPaginationNav.tsx b/client/components/mma/delivery/records/DeliveryRecordsPaginationNav.tsx index 8ef4f2010..893e85bea 100644 --- a/client/components/mma/delivery/records/DeliveryRecordsPaginationNav.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordsPaginationNav.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans } from '@guardian/source-foundations'; +import { textSans } from '@guardian/source/foundations'; import type * as React from 'react'; type PaginationChangeCallBack = () => void; diff --git a/client/components/mma/delivery/records/DeliveryRecordsProblemConfirmation.tsx b/client/components/mma/delivery/records/DeliveryRecordsProblemConfirmation.tsx index ad98bdb6e..67e3477b6 100755 --- a/client/components/mma/delivery/records/DeliveryRecordsProblemConfirmation.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordsProblemConfirmation.tsx @@ -6,8 +6,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { LinkButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { LinkButton } from '@guardian/source/react-components'; import { useContext } from 'react'; import { Navigate, useLocation } from 'react-router-dom'; import { DATE_FNS_SHORT_OUTPUT_FORMAT, dateString } from '@/shared/dates'; diff --git a/client/components/mma/delivery/records/DeliveryRecordsProblemForm.tsx b/client/components/mma/delivery/records/DeliveryRecordsProblemForm.tsx index c3aff9366..e1666ebb9 100644 --- a/client/components/mma/delivery/records/DeliveryRecordsProblemForm.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordsProblemForm.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; -import { Button, Radio, RadioGroup } from '@guardian/source-react-components'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; +import { Button, Radio, RadioGroup } from '@guardian/source/react-components'; import { capitalize } from 'lodash'; import type { FormEvent } from 'react'; import { useEffect, useState } from 'react'; diff --git a/client/components/mma/delivery/records/DeliveryRecordsProblemReview.tsx b/client/components/mma/delivery/records/DeliveryRecordsProblemReview.tsx index 603c2db3b..478de0cc7 100755 --- a/client/components/mma/delivery/records/DeliveryRecordsProblemReview.tsx +++ b/client/components/mma/delivery/records/DeliveryRecordsProblemReview.tsx @@ -6,8 +6,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { Button, Stack } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Stack } from '@guardian/source/react-components'; import { capitalize } from 'lodash'; import { useContext, useState } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; diff --git a/client/components/mma/delivery/records/ProductDetailsTable.tsx b/client/components/mma/delivery/records/ProductDetailsTable.tsx index 0b61d6b18..cc9f37c79 100644 --- a/client/components/mma/delivery/records/ProductDetailsTable.tsx +++ b/client/components/mma/delivery/records/ProductDetailsTable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; import { GiftIcon } from '../../shared/assets/GiftIcon'; interface ProductDetailsTableProps { diff --git a/client/components/mma/delivery/records/ReadOnlyAddressDisplay.tsx b/client/components/mma/delivery/records/ReadOnlyAddressDisplay.tsx index 34a9d50e3..2a44190cf 100644 --- a/client/components/mma/delivery/records/ReadOnlyAddressDisplay.tsx +++ b/client/components/mma/delivery/records/ReadOnlyAddressDisplay.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { brand, from, space, textSans } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { brand, from, space, textSans } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import Color from 'color'; import type { DeliveryAddress } from '../../../../../shared/productResponse'; import { DeliveryAddressDisplay } from '../address/DeliveryAddressDisplay'; diff --git a/client/components/mma/delivery/records/UserPhoneNumber.tsx b/client/components/mma/delivery/records/UserPhoneNumber.tsx index 8940faf45..beb4f3e7c 100644 --- a/client/components/mma/delivery/records/UserPhoneNumber.tsx +++ b/client/components/mma/delivery/records/UserPhoneNumber.tsx @@ -5,8 +5,8 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; -import { Button, TextInput } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, TextInput } from '@guardian/source/react-components'; import { useState } from 'react'; import * as React from 'react'; import { InfoIconDark } from '../../shared/assets/InfoIconDark'; diff --git a/client/components/mma/help/Help.tsx b/client/components/mma/help/Help.tsx index f3cf1e3b4..a4253ea52 100644 --- a/client/components/mma/help/Help.tsx +++ b/client/components/mma/help/Help.tsx @@ -6,8 +6,8 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; -import { LinkButton, Stack } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { LinkButton, Stack } from '@guardian/source/react-components'; import { useState } from 'react'; import { trackEvent } from '../../../utilities/analytics'; import { CallCentreEmailAndNumbers } from '../../shared/CallCenterEmailAndNumbers'; diff --git a/client/components/mma/holiday/ExistingHolidayStopActions.tsx b/client/components/mma/holiday/ExistingHolidayStopActions.tsx index 6c3ab2b07..bc0433556 100644 --- a/client/components/mma/holiday/ExistingHolidayStopActions.tsx +++ b/client/components/mma/holiday/ExistingHolidayStopActions.tsx @@ -1,4 +1,4 @@ -import { Button } from '@guardian/source-react-components'; +import { Button } from '@guardian/source/react-components'; import { useState } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; import { DATE_FNS_LONG_OUTPUT_FORMAT } from '../../../../shared/dates'; diff --git a/client/components/mma/holiday/HolidayAnniversaryDateExplainerModal.tsx b/client/components/mma/holiday/HolidayAnniversaryDateExplainerModal.tsx index 350dedf27..b6a8d2369 100644 --- a/client/components/mma/holiday/HolidayAnniversaryDateExplainerModal.tsx +++ b/client/components/mma/holiday/HolidayAnniversaryDateExplainerModal.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { Modal } from './Modal'; interface HolidayAnniversaryDateExplainerModalProps { diff --git a/client/components/mma/holiday/HolidayCalendarTable.tsx b/client/components/mma/holiday/HolidayCalendarTable.tsx index 0867b4be2..18e96815a 100644 --- a/client/components/mma/holiday/HolidayCalendarTable.tsx +++ b/client/components/mma/holiday/HolidayCalendarTable.tsx @@ -7,7 +7,7 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { dateAddDays, getWeekDay, diff --git a/client/components/mma/holiday/HolidayCalendarTables.tsx b/client/components/mma/holiday/HolidayCalendarTables.tsx index 861499109..dcffb1dab 100644 --- a/client/components/mma/holiday/HolidayCalendarTables.tsx +++ b/client/components/mma/holiday/HolidayCalendarTables.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; -import { from, space } from '@guardian/source-foundations'; +import { from, space } from '@guardian/source/foundations'; import { Button, SvgArrowLeftStraight, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import type { DateStates } from '../../../../shared/dates'; import { diff --git a/client/components/mma/holiday/HolidayConfirmed.tsx b/client/components/mma/holiday/HolidayConfirmed.tsx index 65b07b3c5..46c2a61bb 100644 --- a/client/components/mma/holiday/HolidayConfirmed.tsx +++ b/client/components/mma/holiday/HolidayConfirmed.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { useContext } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; import { isProduct } from '../../../../shared/productResponse'; diff --git a/client/components/mma/holiday/HolidayDateChooser.tsx b/client/components/mma/holiday/HolidayDateChooser.tsx index f1d7f92e0..b56dfd84d 100644 --- a/client/components/mma/holiday/HolidayDateChooser.tsx +++ b/client/components/mma/holiday/HolidayDateChooser.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, neutral, space, until } from '@guardian/source-foundations'; -import { Button, InlineError } from '@guardian/source-react-components'; +import { from, neutral, space, until } from '@guardian/source/foundations'; +import { Button, InlineError } from '@guardian/source/react-components'; import * as Sentry from '@sentry/browser'; import { startCase } from 'lodash'; import { createContext, useContext, useEffect, useState } from 'react'; diff --git a/client/components/mma/holiday/HolidayReview.tsx b/client/components/mma/holiday/HolidayReview.tsx index 9578bcf52..38e761b86 100644 --- a/client/components/mma/holiday/HolidayReview.tsx +++ b/client/components/mma/holiday/HolidayReview.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space, until } from '@guardian/source-foundations'; -import { Button, InlineError } from '@guardian/source-react-components'; +import { space, until } from '@guardian/source/foundations'; +import { Button, InlineError } from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import { Link, Navigate, useLocation } from 'react-router-dom'; import type { DateRange } from '../../../../shared/dates'; diff --git a/client/components/mma/holiday/HolidaySelectionInfo.tsx b/client/components/mma/holiday/HolidaySelectionInfo.tsx index eb119c4c0..89074017c 100644 --- a/client/components/mma/holiday/HolidaySelectionInfo.tsx +++ b/client/components/mma/holiday/HolidaySelectionInfo.tsx @@ -1,4 +1,4 @@ -import { error, until } from '@guardian/source-foundations'; +import { error, until } from '@guardian/source/foundations'; import type * as React from 'react'; import type { DateRange } from '../../../../shared/dates'; import { diff --git a/client/components/mma/holiday/HolidaysOverview.tsx b/client/components/mma/holiday/HolidaysOverview.tsx index 7b08d59d0..b09b593e9 100644 --- a/client/components/mma/holiday/HolidaysOverview.tsx +++ b/client/components/mma/holiday/HolidaysOverview.tsx @@ -1,5 +1,5 @@ -import { from, until } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { from, until } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import type * as React from 'react'; import { useContext } from 'react'; import { useNavigate } from 'react-router'; diff --git a/client/components/mma/holiday/Modal.tsx b/client/components/mma/holiday/Modal.tsx index e15659a37..ae1e21492 100644 --- a/client/components/mma/holiday/Modal.tsx +++ b/client/components/mma/holiday/Modal.tsx @@ -1,5 +1,5 @@ -import { palette } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { palette } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { useState } from 'react'; export type HideFunction = () => void; diff --git a/client/components/mma/holiday/SummaryTable.tsx b/client/components/mma/holiday/SummaryTable.tsx index 79794c9fd..2ca96a581 100644 --- a/client/components/mma/holiday/SummaryTable.tsx +++ b/client/components/mma/holiday/SummaryTable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, until } from '@guardian/source-foundations'; +import { from, palette, until } from '@guardian/source/foundations'; import type { DateRange } from '../../../../shared/dates'; import { DATE_FNS_LONG_OUTPUT_FORMAT, diff --git a/client/components/mma/identity/DropMenu.tsx b/client/components/mma/identity/DropMenu.tsx index c36d344c2..e66b80312 100644 --- a/client/components/mma/identity/DropMenu.tsx +++ b/client/components/mma/identity/DropMenu.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { FC, ReactNode } from 'react'; import { useState } from 'react'; import { serif } from '../../../styles/fonts'; diff --git a/client/components/mma/identity/GenericErrorMessage.tsx b/client/components/mma/identity/GenericErrorMessage.tsx index 2b1bc0834..aff2e5ae5 100644 --- a/client/components/mma/identity/GenericErrorMessage.tsx +++ b/client/components/mma/identity/GenericErrorMessage.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { forwardRef } from 'react'; import { errorMessageCss } from './sharedStyles'; diff --git a/client/components/mma/identity/MarketingToggle.tsx b/client/components/mma/identity/MarketingToggle.tsx index c1fd77fa2..4cb6e89ac 100644 --- a/client/components/mma/identity/MarketingToggle.tsx +++ b/client/components/mma/identity/MarketingToggle.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { ToggleSwitch } from '@guardian/source-react-components-development-kitchen'; +import { ToggleSwitch } from '@guardian/source-development-kitchen/react-components'; import type { FC } from 'react'; import { standardSansText, toggleDescriptionPadding } from './sharedStyles'; diff --git a/client/components/mma/identity/NewsletterPreference.tsx b/client/components/mma/identity/NewsletterPreference.tsx index 3da47cc80..a08466f74 100644 --- a/client/components/mma/identity/NewsletterPreference.tsx +++ b/client/components/mma/identity/NewsletterPreference.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { FC } from 'react'; import { sans } from '../../../styles/fonts'; import { Checkbox } from '../shared/Checkbox'; diff --git a/client/components/mma/identity/PageSection.tsx b/client/components/mma/identity/PageSection.tsx index 1c8ca66b2..a9a2e35f6 100644 --- a/client/components/mma/identity/PageSection.tsx +++ b/client/components/mma/identity/PageSection.tsx @@ -1,4 +1,4 @@ -import { from, palette } from '@guardian/source-foundations'; +import { from, palette } from '@guardian/source/foundations'; import type { FC, ReactNode } from 'react'; import { sans } from '../../../styles/fonts'; diff --git a/client/components/mma/identity/emailAndMarketing/EmailSettingsSection.tsx b/client/components/mma/identity/emailAndMarketing/EmailSettingsSection.tsx index 57c302198..a456fc30a 100644 --- a/client/components/mma/identity/emailAndMarketing/EmailSettingsSection.tsx +++ b/client/components/mma/identity/emailAndMarketing/EmailSettingsSection.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { FC } from 'react'; import { sans } from '@/client/styles/fonts'; import { Button } from '../../shared/Buttons'; diff --git a/client/components/mma/identity/emailAndMarketing/NewsletterSection.tsx b/client/components/mma/identity/emailAndMarketing/NewsletterSection.tsx index 4aa339cb4..dba39f30c 100644 --- a/client/components/mma/identity/emailAndMarketing/NewsletterSection.tsx +++ b/client/components/mma/identity/emailAndMarketing/NewsletterSection.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import uniq from 'lodash/uniq'; import type { FC } from 'react'; import { DropMenu } from '../DropMenu'; diff --git a/client/components/mma/identity/publicProfile/AvatarSection.tsx b/client/components/mma/identity/publicProfile/AvatarSection.tsx index 3648dde52..dd78930b4 100644 --- a/client/components/mma/identity/publicProfile/AvatarSection.tsx +++ b/client/components/mma/identity/publicProfile/AvatarSection.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import * as Sentry from '@sentry/browser'; import { Form, Formik } from 'formik'; import { useEffect } from 'react'; @@ -138,7 +138,7 @@ export const AvatarSection: FC = (props) => { ); -// eslint-disable-next-line @typescript-eslint/no-explicit-any -- the argument object might lack a message attribute + // eslint-disable-next-line @typescript-eslint/no-explicit-any -- the argument object might lack a message attribute const getErrorMessage = (error: any) => { let message; if (error.type && error.type === ErrorTypes.VALIDATION) { diff --git a/client/components/mma/identity/settings/SettingsFormSection.tsx b/client/components/mma/identity/settings/SettingsFormSection.tsx index 3ae7b820e..f08606691 100644 --- a/client/components/mma/identity/settings/SettingsFormSection.tsx +++ b/client/components/mma/identity/settings/SettingsFormSection.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette } from '@guardian/source-foundations'; +import { from, palette } from '@guardian/source/foundations'; import type { FormikProps, FormikState } from 'formik'; import { Form, withFormik } from 'formik'; import type { FC } from 'react'; diff --git a/client/components/mma/identity/sharedStyles.ts b/client/components/mma/identity/sharedStyles.ts index 3dca56ffa..9ba9c87bb 100644 --- a/client/components/mma/identity/sharedStyles.ts +++ b/client/components/mma/identity/sharedStyles.ts @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { sans } from '../../../styles/fonts'; export const textSmall = css({ diff --git a/client/components/mma/maintenance/Maintenance.tsx b/client/components/mma/maintenance/Maintenance.tsx index 5dd2e7a3c..bea2f8fae 100644 --- a/client/components/mma/maintenance/Maintenance.tsx +++ b/client/components/mma/maintenance/Maintenance.tsx @@ -6,7 +6,7 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; const containerStyle = css` max-width: ${breakpoints.wide}px; diff --git a/client/components/mma/paymentUpdate/ContactUs.tsx b/client/components/mma/paymentUpdate/ContactUs.tsx index 98e2034e2..4a18297a7 100644 --- a/client/components/mma/paymentUpdate/ContactUs.tsx +++ b/client/components/mma/paymentUpdate/ContactUs.tsx @@ -5,7 +5,7 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; const privacyNoticeLinkCss = css` color: ${brand[500]}; diff --git a/client/components/mma/paymentUpdate/CurrentPaymentDetail.tsx b/client/components/mma/paymentUpdate/CurrentPaymentDetail.tsx index fe17a20c9..dd0595ccd 100644 --- a/client/components/mma/paymentUpdate/CurrentPaymentDetail.tsx +++ b/client/components/mma/paymentUpdate/CurrentPaymentDetail.tsx @@ -5,8 +5,8 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; -import { InlineError } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { InlineError } from '@guardian/source/react-components'; import type { ProductDetail } from '../../../../shared/productResponse'; import { getMainPlan } from '../../../../shared/productResponse'; import { GROUPED_PRODUCT_TYPES } from '../../../../shared/productTypes'; diff --git a/client/components/mma/paymentUpdate/FieldWrapper.tsx b/client/components/mma/paymentUpdate/FieldWrapper.tsx index c2008d237..983f0c43d 100644 --- a/client/components/mma/paymentUpdate/FieldWrapper.tsx +++ b/client/components/mma/paymentUpdate/FieldWrapper.tsx @@ -5,18 +5,23 @@ import { FocusStyleManager, neutral, textSans, -} from '@guardian/source-foundations'; -import { InlineError } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { InlineError } from '@guardian/source/react-components'; import type { StripeError } from '@stripe/stripe-js'; import * as React from 'react'; FocusStyleManager.onlyShowFocusOnTabs(); + +export interface FieldChangeEvent extends React.ChangeEvent { + error: StripeError; +} + interface FieldWrapperProps { label: string; width: string; children: JSX.Element; cornerHint?: JSX.Element; - onChange?: (event: React.ChangeEvent) => void; + onChange?: (event: FieldChangeEvent) => void; } interface FieldWrapperState { @@ -126,9 +131,8 @@ export class FieldWrapper extends React.Component< } private validateField = - // eslint-disable-next-line @typescript-eslint/no-explicit-any -- we're assuming the argument object is an event object? - (otherOnChange?: (event: any) => void) => - (field: { error: StripeError }) => { + (otherOnChange?: (event: FieldChangeEvent) => void) => + (field: FieldChangeEvent) => { if (otherOnChange) { otherOnChange(field); } diff --git a/client/components/mma/paymentUpdate/PaymentDetailUpdate.tsx b/client/components/mma/paymentUpdate/PaymentDetailUpdate.tsx index ddb68252b..e205cd176 100644 --- a/client/components/mma/paymentUpdate/PaymentDetailUpdate.tsx +++ b/client/components/mma/paymentUpdate/PaymentDetailUpdate.tsx @@ -7,14 +7,14 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, Radio, RadioGroup, SvgArrowRightStraight, -} from '@guardian/source-react-components'; -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import * as Sentry from '@sentry/browser'; import type * as React from 'react'; import { useContext, useState } from 'react'; diff --git a/client/components/mma/paymentUpdate/PaymentDetailUpdateConfirmation.tsx b/client/components/mma/paymentUpdate/PaymentDetailUpdateConfirmation.tsx index 6f2c412b6..6a05a0dac 100644 --- a/client/components/mma/paymentUpdate/PaymentDetailUpdateConfirmation.tsx +++ b/client/components/mma/paymentUpdate/PaymentDetailUpdateConfirmation.tsx @@ -6,13 +6,13 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, LinkButton, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; -import { InfoSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { InfoSummary } from '@guardian/source-development-kitchen/react-components'; import { useContext } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router-dom'; import { buttonCentredCss } from '@/client/styles/ButtonStyles'; diff --git a/client/components/mma/paymentUpdate/PaymentFailed.tsx b/client/components/mma/paymentUpdate/PaymentFailed.tsx index 2b531c457..cc5b1e5c6 100644 --- a/client/components/mma/paymentUpdate/PaymentFailed.tsx +++ b/client/components/mma/paymentUpdate/PaymentFailed.tsx @@ -5,11 +5,11 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { Navigate, useLocation, useNavigate } from 'react-router'; import { CallCentreNumbers } from '../../shared/CallCentreNumbers'; diff --git a/client/components/mma/paymentUpdate/card/FlexCardElement.tsx b/client/components/mma/paymentUpdate/card/FlexCardElement.tsx index 6a91eec71..0e26fae6a 100644 --- a/client/components/mma/paymentUpdate/card/FlexCardElement.tsx +++ b/client/components/mma/paymentUpdate/card/FlexCardElement.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, space } from '@guardian/source-foundations'; +import { from, space } from '@guardian/source/foundations'; import { CardCvcElement, CardExpiryElement, diff --git a/client/components/mma/paymentUpdate/card/Recaptcha.tsx b/client/components/mma/paymentUpdate/card/Recaptcha.tsx index 181c721e5..b84bd31e7 100644 --- a/client/components/mma/paymentUpdate/card/Recaptcha.tsx +++ b/client/components/mma/paymentUpdate/card/Recaptcha.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, textSans } from '@guardian/source-foundations'; +import { space, textSans } from '@guardian/source/foundations'; import type { Stripe } from '@stripe/stripe-js'; import { useEffect } from 'react'; import type { Grecaptcha } from '../../../../utilities/captcha'; diff --git a/client/components/mma/paymentUpdate/card/stripeCardInputForm.tsx b/client/components/mma/paymentUpdate/card/stripeCardInputForm.tsx index 2a1c083f3..024ed468b 100644 --- a/client/components/mma/paymentUpdate/card/stripeCardInputForm.tsx +++ b/client/components/mma/paymentUpdate/card/stripeCardInputForm.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; -import { space, until } from '@guardian/source-foundations'; +import { space, until } from '@guardian/source/foundations'; import { Button, SvgArrowRightStraight, -} from '@guardian/source-react-components'; -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import * as Sentry from '@sentry/browser'; import { CardNumberElement, diff --git a/client/components/mma/paymentUpdate/dd/DirectDebitInputForm.tsx b/client/components/mma/paymentUpdate/dd/DirectDebitInputForm.tsx index 4d3a47dff..4eaf6aed5 100644 --- a/client/components/mma/paymentUpdate/dd/DirectDebitInputForm.tsx +++ b/client/components/mma/paymentUpdate/dd/DirectDebitInputForm.tsx @@ -1,16 +1,16 @@ import { css } from '@emotion/react'; -import { from, space, until } from '@guardian/source-foundations'; +import { from, space, until } from '@guardian/source/foundations'; import { Button, Checkbox, SvgArrowRightStraight, -} from '@guardian/source-react-components'; -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import { useState } from 'react'; -import type * as React from 'react'; import { sans } from '../../../../styles/fonts'; import { processResponse } from '../../../../utilities/utils'; import { cleanSortCode } from '../../shared/DirectDebitDisplay'; +import type { FieldChangeEvent } from '../FieldWrapper'; import { FieldWrapper } from '../FieldWrapper'; import type { NewPaymentMethodDetail } from '../NewPaymentMethodDetail'; import { DirectDebitLegal } from './DirectDebitLegal'; @@ -142,7 +142,7 @@ export const DirectDebitInputForm = (props: DirectDebitUpdateFormProps) => { ) => + onChange={(event: FieldChangeEvent) => setAccountName(event.target.value) } > @@ -170,7 +170,7 @@ export const DirectDebitInputForm = (props: DirectDebitUpdateFormProps) => { ) => + onChange={(event: FieldChangeEvent) => setSortCode(cleanSortCode(event.target.value)) } > @@ -188,7 +188,7 @@ export const DirectDebitInputForm = (props: DirectDebitUpdateFormProps) => { ) => + onChange={(event: FieldChangeEvent) => setAccountNumber(event.target.value) } > diff --git a/client/components/mma/paymentUpdate/dd/DirectDebitLegal.tsx b/client/components/mma/paymentUpdate/dd/DirectDebitLegal.tsx index f5d54218f..e7f3a0562 100644 --- a/client/components/mma/paymentUpdate/dd/DirectDebitLegal.tsx +++ b/client/components/mma/paymentUpdate/dd/DirectDebitLegal.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import * as React from 'react'; import { sans } from '../../../../styles/fonts'; diff --git a/client/components/mma/paymentUpdate/dd/NewDirectDebitPaymentMethodDetail.tsx b/client/components/mma/paymentUpdate/dd/NewDirectDebitPaymentMethodDetail.tsx index 62a6c5d41..84c4e4b06 100644 --- a/client/components/mma/paymentUpdate/dd/NewDirectDebitPaymentMethodDetail.tsx +++ b/client/components/mma/paymentUpdate/dd/NewDirectDebitPaymentMethodDetail.tsx @@ -1,4 +1,4 @@ -import { from, until } from '@guardian/source-foundations'; +import { from, until } from '@guardian/source/foundations'; import type { DirectDebitDetails, Subscription, diff --git a/client/components/mma/reminders/CreateReminder.tsx b/client/components/mma/reminders/CreateReminder.tsx index 99b7c37e3..741a96b3c 100644 --- a/client/components/mma/reminders/CreateReminder.tsx +++ b/client/components/mma/reminders/CreateReminder.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import * as Sentry from '@sentry/browser'; import { useEffect, useState } from 'react'; import type { ReminderType } from '../identity/idapi/supportReminders'; diff --git a/client/components/mma/shared/Button.stories.tsx b/client/components/mma/shared/Button.stories.tsx index 3c98544ba..7999d94d1 100644 --- a/client/components/mma/shared/Button.stories.tsx +++ b/client/components/mma/shared/Button.stories.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { Meta } from '@storybook/react'; import { Button } from './Buttons'; diff --git a/client/components/mma/shared/Buttons.tsx b/client/components/mma/shared/Buttons.tsx index 7eac740df..80f57e539 100644 --- a/client/components/mma/shared/Buttons.tsx +++ b/client/components/mma/shared/Buttons.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brandAlt, neutral, space } from '@guardian/source-foundations'; +import { brandAlt, neutral, space } from '@guardian/source/foundations'; import Color from 'color'; import type * as React from 'react'; import { Link } from 'react-router-dom'; diff --git a/client/components/mma/shared/CallCentrePrompt.tsx b/client/components/mma/shared/CallCentrePrompt.tsx index e93d36f26..a063be56a 100644 --- a/client/components/mma/shared/CallCentrePrompt.tsx +++ b/client/components/mma/shared/CallCentrePrompt.tsx @@ -1,5 +1,5 @@ -import { ButtonLink, Stack } from '@guardian/source-react-components'; -import { InfoSummary } from '@guardian/source-react-components-development-kitchen'; +import { ButtonLink, Stack } from '@guardian/source/react-components'; +import { InfoSummary } from '@guardian/source-development-kitchen/react-components'; import { useState } from 'react'; import { CallCentreEmailAndNumbers } from '@/client/components/shared/CallCenterEmailAndNumbers'; diff --git a/client/components/mma/shared/Card.tsx b/client/components/mma/shared/Card.tsx index 914ab9bec..8343ab2b7 100644 --- a/client/components/mma/shared/Card.tsx +++ b/client/components/mma/shared/Card.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space } from '@guardian/source-foundations'; +import { from, palette, space } from '@guardian/source/foundations'; import type { ReactNode } from 'react'; export const Card = (props: { children: ReactNode }) => { diff --git a/client/components/mma/shared/CardDisplay.tsx b/client/components/mma/shared/CardDisplay.tsx index 79d5252a8..63eaf05be 100644 --- a/client/components/mma/shared/CardDisplay.tsx +++ b/client/components/mma/shared/CardDisplay.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { Inlineable } from './inlineable'; interface CardExpiryDetails { diff --git a/client/components/mma/shared/Checkbox.tsx b/client/components/mma/shared/Checkbox.tsx index e592013b9..a592bad0b 100644 --- a/client/components/mma/shared/Checkbox.tsx +++ b/client/components/mma/shared/Checkbox.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type * as React from 'react'; export interface CheckboxProps { diff --git a/client/components/mma/shared/DateInput.tsx b/client/components/mma/shared/DateInput.tsx index 5d2abf28e..de334019c 100644 --- a/client/components/mma/shared/DateInput.tsx +++ b/client/components/mma/shared/DateInput.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, until } from '@guardian/source-foundations'; +import { palette, until } from '@guardian/source/foundations'; import { sans } from '../../../styles/fonts'; const inputBoxCss = css({ diff --git a/client/components/mma/shared/DatePicker.tsx b/client/components/mma/shared/DatePicker.tsx index 068550b29..76bbbccfa 100644 --- a/client/components/mma/shared/DatePicker.tsx +++ b/client/components/mma/shared/DatePicker.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, until } from '@guardian/source-foundations'; +import { from, palette, until } from '@guardian/source/foundations'; import type * as React from 'react'; import type { DateRange } from '../../../../shared/dates'; import { diff --git a/client/components/mma/shared/DirectDebitDisplay.tsx b/client/components/mma/shared/DirectDebitDisplay.tsx index 066ec587b..f17d00451 100644 --- a/client/components/mma/shared/DirectDebitDisplay.tsx +++ b/client/components/mma/shared/DirectDebitDisplay.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette } from '@guardian/source-foundations'; +import { from, palette } from '@guardian/source/foundations'; import type { DirectDebitDetails } from '../../../../shared/productResponse'; import { DirectDebitLogo } from './assets/DirectDebitLogo'; import type { Inlineable } from './inlineable'; diff --git a/client/components/mma/shared/Heading.tsx b/client/components/mma/shared/Heading.tsx index 015b4af0b..dbd92ab92 100644 --- a/client/components/mma/shared/Heading.tsx +++ b/client/components/mma/shared/Heading.tsx @@ -5,7 +5,7 @@ import { headline, palette, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { ReactNode } from 'react'; interface HeadingProps { diff --git a/client/components/mma/shared/InfoSection.tsx b/client/components/mma/shared/InfoSection.tsx index 620548f99..6d067ffca 100644 --- a/client/components/mma/shared/InfoSection.tsx +++ b/client/components/mma/shared/InfoSection.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, neutral, space, textSans } from '@guardian/source-foundations'; +import { brand, neutral, space, textSans } from '@guardian/source/foundations'; import type * as React from 'react'; import { InfoIconDark } from './assets/InfoIconDark'; diff --git a/client/components/mma/shared/LinkButton.stories.tsx b/client/components/mma/shared/LinkButton.stories.tsx index 841071d77..22994cb8a 100644 --- a/client/components/mma/shared/LinkButton.stories.tsx +++ b/client/components/mma/shared/LinkButton.stories.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { Meta } from '@storybook/react'; import { ReactRouterDecorator } from '@/.storybook/ReactRouterDecorator'; import { LinkButton } from './Buttons'; diff --git a/client/components/mma/shared/NextPaymentDetails.tsx b/client/components/mma/shared/NextPaymentDetails.tsx index 704c9ed88..bb5dd0dc4 100644 --- a/client/components/mma/shared/NextPaymentDetails.tsx +++ b/client/components/mma/shared/NextPaymentDetails.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, space } from '@guardian/source-foundations'; +import { brand, space } from '@guardian/source/foundations'; import { parseDate } from '../../../../shared/dates'; import type { Subscription, diff --git a/client/components/mma/shared/OverlayLoader.tsx b/client/components/mma/shared/OverlayLoader.tsx index f8ecc782e..3740dc24e 100644 --- a/client/components/mma/shared/OverlayLoader.tsx +++ b/client/components/mma/shared/OverlayLoader.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans } from '@guardian/source-foundations'; +import { textSans } from '@guardian/source/foundations'; import { Spinner } from '../../shared/Spinner'; const overlay = css` diff --git a/client/components/mma/shared/Pagination.tsx b/client/components/mma/shared/Pagination.tsx index d0bf224c8..767186df8 100644 --- a/client/components/mma/shared/Pagination.tsx +++ b/client/components/mma/shared/Pagination.tsx @@ -1,10 +1,10 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { neutral, space, textSans } from '@guardian/source-foundations'; +import { neutral, space, textSans } from '@guardian/source/foundations'; import { SvgChevronLeftSingle, SvgChevronRightSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { Dispatch, MouseEvent, SetStateAction } from 'react'; import { createContext, useContext, useEffect, useState } from 'react'; diff --git a/client/components/mma/shared/PaymentDetailsTable.tsx b/client/components/mma/shared/PaymentDetailsTable.tsx index 666836103..ba875f49c 100644 --- a/client/components/mma/shared/PaymentDetailsTable.tsx +++ b/client/components/mma/shared/PaymentDetailsTable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral } from '@guardian/source-foundations'; +import { neutral } from '@guardian/source/foundations'; import type { ProductDetail } from '../../../../shared/productResponse'; import { PaypalLogo } from './assets/PaypalLogo'; import { CardDisplay } from './CardDisplay'; diff --git a/client/components/mma/shared/ProblemAlert.tsx b/client/components/mma/shared/ProblemAlert.tsx index ac372493d..d0f8ddad5 100644 --- a/client/components/mma/shared/ProblemAlert.tsx +++ b/client/components/mma/shared/ProblemAlert.tsx @@ -6,7 +6,7 @@ import { palette, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { ProductDetail } from '../../../../shared/productResponse'; import { ErrorIcon } from './assets/ErrorIcon'; import { LinkButton } from './Buttons'; diff --git a/client/components/mma/shared/ProductDescriptionListTable.tsx b/client/components/mma/shared/ProductDescriptionListTable.tsx index 25df11dd6..2e705aafc 100644 --- a/client/components/mma/shared/ProductDescriptionListTable.tsx +++ b/client/components/mma/shared/ProductDescriptionListTable.tsx @@ -6,7 +6,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { ReactElement } from 'react'; export interface ProductDescriptionListKeyValue { diff --git a/client/components/mma/shared/ProductInfoTableV2.tsx b/client/components/mma/shared/ProductInfoTableV2.tsx index d41407429..105eb0618 100644 --- a/client/components/mma/shared/ProductInfoTableV2.tsx +++ b/client/components/mma/shared/ProductInfoTableV2.tsx @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { parseDate } from '@/shared/dates'; import type { ProductDetail } from '@/shared/productResponse'; diff --git a/client/components/mma/shared/ProgressIndicator.tsx b/client/components/mma/shared/ProgressIndicator.tsx index a6c570e5d..b700bba24 100644 --- a/client/components/mma/shared/ProgressIndicator.tsx +++ b/client/components/mma/shared/ProgressIndicator.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { brand, from, neutral, textSans } from '@guardian/source-foundations'; +import { brand, from, neutral, textSans } from '@guardian/source/foundations'; import { TickInCircle } from './assets/TickInCircle'; interface Step { diff --git a/client/components/mma/shared/ProgressStepper.tsx b/client/components/mma/shared/ProgressStepper.tsx index 5f2e3624f..fafd524ef 100644 --- a/client/components/mma/shared/ProgressStepper.tsx +++ b/client/components/mma/shared/ProgressStepper.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source-foundations'; +import { palette, space, textSans } from '@guardian/source/foundations'; import { TickInCircle } from './assets/TickInCircle'; interface Step { diff --git a/client/components/mma/shared/SupporterPlusTsAndCs.tsx b/client/components/mma/shared/SupporterPlusTsAndCs.tsx index abd878391..2c7f4a2d7 100644 --- a/client/components/mma/shared/SupporterPlusTsAndCs.tsx +++ b/client/components/mma/shared/SupporterPlusTsAndCs.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, textSans } from '@guardian/source-foundations'; +import { space, textSans } from '@guardian/source/foundations'; import * as Sentry from '@sentry/browser'; import { Link } from 'react-router-dom'; import { getBillingPeriodAdjective } from '../../../../shared/productTypes'; diff --git a/client/components/mma/shared/assets/AccountOverviewIcon.tsx b/client/components/mma/shared/assets/AccountOverviewIcon.tsx index 68111809e..58b2c68b5 100644 --- a/client/components/mma/shared/assets/AccountOverviewIcon.tsx +++ b/client/components/mma/shared/assets/AccountOverviewIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface AccountOverviewIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/CommentsIcon.tsx b/client/components/mma/shared/assets/CommentsIcon.tsx index 68381aa53..033f3c135 100644 --- a/client/components/mma/shared/assets/CommentsIcon.tsx +++ b/client/components/mma/shared/assets/CommentsIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface CommentsIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/CreditCardIcon.tsx b/client/components/mma/shared/assets/CreditCardIcon.tsx index c8813d14e..758ddbf5f 100644 --- a/client/components/mma/shared/assets/CreditCardIcon.tsx +++ b/client/components/mma/shared/assets/CreditCardIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface CreditCardIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/DeliveryIcon.tsx b/client/components/mma/shared/assets/DeliveryIcon.tsx index f762783bd..6c95df6e8 100644 --- a/client/components/mma/shared/assets/DeliveryIcon.tsx +++ b/client/components/mma/shared/assets/DeliveryIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface DeliveryIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/EmailPrefIcon.tsx b/client/components/mma/shared/assets/EmailPrefIcon.tsx index 2d9f25bbd..6ff79e13a 100644 --- a/client/components/mma/shared/assets/EmailPrefIcon.tsx +++ b/client/components/mma/shared/assets/EmailPrefIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface EmailPrefsIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/ErrorIcon.tsx b/client/components/mma/shared/assets/ErrorIcon.tsx index 9e54da480..5e2047053 100644 --- a/client/components/mma/shared/assets/ErrorIcon.tsx +++ b/client/components/mma/shared/assets/ErrorIcon.tsx @@ -1,5 +1,5 @@ import type { SerializedStyles } from '@emotion/react'; -import { brandAlt, news } from '@guardian/source-foundations'; +import { brandAlt, news } from '@guardian/source/foundations'; interface ErrorIconProps { fill?: string; diff --git a/client/components/mma/shared/assets/GiftIcon.tsx b/client/components/mma/shared/assets/GiftIcon.tsx index c8d1ee7a8..b2f00e8ad 100644 --- a/client/components/mma/shared/assets/GiftIcon.tsx +++ b/client/components/mma/shared/assets/GiftIcon.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans } from '@guardian/source-foundations'; +import { textSans } from '@guardian/source/foundations'; type GiftArrowAlign = 'left' | 'right'; diff --git a/client/components/mma/shared/assets/GridRoundel.tsx b/client/components/mma/shared/assets/GridRoundel.tsx index c088a3457..cb8fe143f 100644 --- a/client/components/mma/shared/assets/GridRoundel.tsx +++ b/client/components/mma/shared/assets/GridRoundel.tsx @@ -1,4 +1,4 @@ -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { gridItemPlacement } from '../../../../styles/grid'; import type { RoundelProps } from './Roundel'; import { Roundel } from './Roundel'; diff --git a/client/components/mma/shared/assets/HelpIcon.tsx b/client/components/mma/shared/assets/HelpIcon.tsx index 2d2b84b3d..3f15379ab 100644 --- a/client/components/mma/shared/assets/HelpIcon.tsx +++ b/client/components/mma/shared/assets/HelpIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface HelpIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/LoadingCircleIcon.tsx b/client/components/mma/shared/assets/LoadingCircleIcon.tsx index 8849028df..d33921b48 100644 --- a/client/components/mma/shared/assets/LoadingCircleIcon.tsx +++ b/client/components/mma/shared/assets/LoadingCircleIcon.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface LoadingCircleIconProps { additionalCss?: SerializedStyles; diff --git a/client/components/mma/shared/assets/NewspaperIcon.tsx b/client/components/mma/shared/assets/NewspaperIcon.tsx index 12ef00b1f..6b0de3e07 100644 --- a/client/components/mma/shared/assets/NewspaperIcon.tsx +++ b/client/components/mma/shared/assets/NewspaperIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface NewspaperIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/NewspaperVoucherIcon.tsx b/client/components/mma/shared/assets/NewspaperVoucherIcon.tsx index cc232e65c..2d7b61731 100644 --- a/client/components/mma/shared/assets/NewspaperVoucherIcon.tsx +++ b/client/components/mma/shared/assets/NewspaperVoucherIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface NewspaperVoucherIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/OtherIcon.tsx b/client/components/mma/shared/assets/OtherIcon.tsx index df67b238f..249ed5d96 100644 --- a/client/components/mma/shared/assets/OtherIcon.tsx +++ b/client/components/mma/shared/assets/OtherIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface OtherIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/ProfileIcon.tsx b/client/components/mma/shared/assets/ProfileIcon.tsx index 1eebbdf5a..0dff9a0a3 100644 --- a/client/components/mma/shared/assets/ProfileIcon.tsx +++ b/client/components/mma/shared/assets/ProfileIcon.tsx @@ -1,5 +1,5 @@ import type { SerializedStyles } from '@emotion/react'; -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface ProfileIconProps { additionalCss?: SerializedStyles; diff --git a/client/components/mma/shared/assets/Roundel.tsx b/client/components/mma/shared/assets/Roundel.tsx index 969e15de8..15dd8b3db 100644 --- a/client/components/mma/shared/assets/Roundel.tsx +++ b/client/components/mma/shared/assets/Roundel.tsx @@ -1,4 +1,4 @@ -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; export interface RoundelProps { size?: number; diff --git a/client/components/mma/shared/assets/SettingsIcon.tsx b/client/components/mma/shared/assets/SettingsIcon.tsx index 9683bb442..5619053bb 100644 --- a/client/components/mma/shared/assets/SettingsIcon.tsx +++ b/client/components/mma/shared/assets/SettingsIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface SettingsIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/ShieldIcon.tsx b/client/components/mma/shared/assets/ShieldIcon.tsx index 6bd814637..44fbf8e0a 100644 --- a/client/components/mma/shared/assets/ShieldIcon.tsx +++ b/client/components/mma/shared/assets/ShieldIcon.tsx @@ -1,4 +1,4 @@ -import { brand } from '@guardian/source-foundations'; +import { brand } from '@guardian/source/foundations'; interface ShieldIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/SignoutIcon.tsx b/client/components/mma/shared/assets/SignoutIcon.tsx index f28d62e08..449ecefc1 100644 --- a/client/components/mma/shared/assets/SignoutIcon.tsx +++ b/client/components/mma/shared/assets/SignoutIcon.tsx @@ -1,4 +1,4 @@ -import { from, neutral } from '@guardian/source-foundations'; +import { from, neutral } from '@guardian/source/foundations'; interface SignoutIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/assets/SwitchOffsetPaymentIcon.tsx b/client/components/mma/shared/assets/SwitchOffsetPaymentIcon.tsx index 825ad93af..069fd0ae3 100644 --- a/client/components/mma/shared/assets/SwitchOffsetPaymentIcon.tsx +++ b/client/components/mma/shared/assets/SwitchOffsetPaymentIcon.tsx @@ -1,5 +1,5 @@ -import { iconSize } from '@guardian/source-foundations'; -import type { IconProps } from '@guardian/source-react-components'; +import { iconSize } from '@guardian/source/foundations'; +import type { IconProps } from '@guardian/source/react-components'; export const SwitchOffsetPaymentIcon = ({ size }: IconProps) => ( ( xmlns="http://www.w3.org/2000/svg" focusable={false} > - - + + ); diff --git a/client/components/mma/shared/assets/TheGuardianLogo.tsx b/client/components/mma/shared/assets/TheGuardianLogo.tsx index d7fe6a794..99bc7f993 100644 --- a/client/components/mma/shared/assets/TheGuardianLogo.tsx +++ b/client/components/mma/shared/assets/TheGuardianLogo.tsx @@ -1,4 +1,4 @@ -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; interface TheGuardianLogoProps { width?: number; diff --git a/client/components/mma/shared/assets/ThumbsUpIcon.tsx b/client/components/mma/shared/assets/ThumbsUpIcon.tsx index 04f152dd8..4ec590ce4 100644 --- a/client/components/mma/shared/assets/ThumbsUpIcon.tsx +++ b/client/components/mma/shared/assets/ThumbsUpIcon.tsx @@ -1,4 +1,4 @@ -import { neutral } from '@guardian/source-foundations'; +import { neutral } from '@guardian/source/foundations'; interface ThumbsUpIconProps { overrideFillColor?: string; diff --git a/client/components/mma/shared/benefits/BenefitsCard.tsx b/client/components/mma/shared/benefits/BenefitsCard.tsx index 11c1b431f..ea9bf3f5b 100644 --- a/client/components/mma/shared/benefits/BenefitsCard.tsx +++ b/client/components/mma/shared/benefits/BenefitsCard.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space, textSans } from '@guardian/source-foundations'; -import { SvgCrossRound, SvgTickRound } from '@guardian/source-react-components'; +import { space, textSans } from '@guardian/source/foundations'; +import { SvgCrossRound, SvgTickRound } from '@guardian/source/react-components'; import type { ProductBenefit } from './BenefitsConfiguration'; import { benefitsCss, unavailableBenefitsCss } from './BenefitsStyles'; diff --git a/client/components/mma/shared/benefits/BenefitsSection.tsx b/client/components/mma/shared/benefits/BenefitsSection.tsx index 09af7581a..900655d9e 100644 --- a/client/components/mma/shared/benefits/BenefitsSection.tsx +++ b/client/components/mma/shared/benefits/BenefitsSection.tsx @@ -2,7 +2,7 @@ import { Hide, SvgCrossRound, SvgTickRound, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { ProductBenefit } from './BenefitsConfiguration'; import { benefitsCss, unavailableBenefitsCss } from './BenefitsStyles'; diff --git a/client/components/mma/shared/benefits/BenefitsStyles.tsx b/client/components/mma/shared/benefits/BenefitsStyles.tsx index 1b4709cd1..3ee9540fd 100644 --- a/client/components/mma/shared/benefits/BenefitsStyles.tsx +++ b/client/components/mma/shared/benefits/BenefitsStyles.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; export const benefitsCss = css` ${textSans.medium()}; diff --git a/client/components/mma/shared/benefits/BenefitsToggle.tsx b/client/components/mma/shared/benefits/BenefitsToggle.tsx index 2a096713e..2ea506878 100644 --- a/client/components/mma/shared/benefits/BenefitsToggle.tsx +++ b/client/components/mma/shared/benefits/BenefitsToggle.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { useState } from 'react'; import type { ProductTypeKeys } from '../../../../../shared/productTypes'; import { expanderButtonCss } from '../../../shared/ExpanderButton'; diff --git a/client/components/mma/signInError/SignInError.tsx b/client/components/mma/signInError/SignInError.tsx index a5a0b710d..96406c6a8 100644 --- a/client/components/mma/signInError/SignInError.tsx +++ b/client/components/mma/signInError/SignInError.tsx @@ -6,8 +6,8 @@ import { neutral, space, textSans, -} from '@guardian/source-foundations'; -import { LinkButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { LinkButton } from '@guardian/source/react-components'; import { conf } from '@/server/config'; const containerStyle = css` diff --git a/client/components/mma/switch/complete/SwitchComplete.tsx b/client/components/mma/switch/complete/SwitchComplete.tsx index 44d450085..9457fb88e 100644 --- a/client/components/mma/switch/complete/SwitchComplete.tsx +++ b/client/components/mma/switch/complete/SwitchComplete.tsx @@ -6,7 +6,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { LinkButton, Stack, @@ -14,7 +14,7 @@ import { SvgClock, SvgEnvelope, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useContext } from 'react'; import { Navigate, useLocation } from 'react-router'; import type { PaidSubscriptionPlan } from '../../../../../shared/productResponse'; diff --git a/client/components/mma/switch/complete/SwitchSignInImage.tsx b/client/components/mma/switch/complete/SwitchSignInImage.tsx index d5396cc7d..180807117 100644 --- a/client/components/mma/switch/complete/SwitchSignInImage.tsx +++ b/client/components/mma/switch/complete/SwitchSignInImage.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; export const SwitchSignInImage = () => ( <> diff --git a/client/components/mma/switch/options/SwitchOptions.tsx b/client/components/mma/switch/options/SwitchOptions.tsx index 5649a6ef6..f0c03ddaf 100644 --- a/client/components/mma/switch/options/SwitchOptions.tsx +++ b/client/components/mma/switch/options/SwitchOptions.tsx @@ -1,11 +1,11 @@ import { css } from '@emotion/react'; -import { palette, space, textSans, until } from '@guardian/source-foundations'; +import { palette, space, textSans, until } from '@guardian/source/foundations'; import { Button, Stack, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import { useContext, useEffect, useRef, useState } from 'react'; import { useLocation, useNavigate } from 'react-router'; import { Link } from 'react-router-dom'; diff --git a/client/components/mma/switch/review/SwitchReview.tsx b/client/components/mma/switch/review/SwitchReview.tsx index eec2ddf4e..05555f8a2 100644 --- a/client/components/mma/switch/review/SwitchReview.tsx +++ b/client/components/mma/switch/review/SwitchReview.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; import { Button, Stack, SvgClock, SvgCreditCard, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import { Navigate, useLocation, useNavigate } from 'react-router'; import { SwitchErrorSummary } from '@/client/components/shared/productSwitch/SwitchErrorSummary'; diff --git a/client/components/mma/upgrade/ConfirmForm.tsx b/client/components/mma/upgrade/ConfirmForm.tsx index 8bc569459..d674b9e47 100644 --- a/client/components/mma/upgrade/ConfirmForm.tsx +++ b/client/components/mma/upgrade/ConfirmForm.tsx @@ -5,7 +5,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, Stack, @@ -13,8 +13,8 @@ import { SvgCreditCard, SvgReload, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; -import { ToggleSwitch } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { ToggleSwitch } from '@guardian/source-development-kitchen/react-components'; import type { Dispatch, SetStateAction } from 'react'; import { useContext, useState } from 'react'; import { useNavigate } from 'react-router'; diff --git a/client/components/mma/upgrade/UpgradeSupport.tsx b/client/components/mma/upgrade/UpgradeSupport.tsx index 57f397fbe..fa8e1afe5 100644 --- a/client/components/mma/upgrade/UpgradeSupport.tsx +++ b/client/components/mma/upgrade/UpgradeSupport.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { headline, space, textSans, until } from '@guardian/source-foundations'; -import { Stack } from '@guardian/source-react-components'; +import { headline, space, textSans, until } from '@guardian/source/foundations'; +import { Stack } from '@guardian/source/react-components'; import { useContext, useState } from 'react'; import { formatAmount } from '@/client/utilities/utils'; import type { PreviewResponse } from '../../../../shared/productSwitchTypes'; diff --git a/client/components/mma/upgrade/UpgradeSupportAmountForm.tsx b/client/components/mma/upgrade/UpgradeSupportAmountForm.tsx index 8a9466614..6a77c4c0d 100644 --- a/client/components/mma/upgrade/UpgradeSupportAmountForm.tsx +++ b/client/components/mma/upgrade/UpgradeSupportAmountForm.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { Button, ChoiceCard, @@ -7,7 +7,7 @@ import { Stack, TextInput, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { Dispatch, SetStateAction } from 'react'; import { useContext, useEffect, useState } from 'react'; import { diff --git a/client/components/mma/upgrade/UpgradeSupportStyles.ts b/client/components/mma/upgrade/UpgradeSupportStyles.ts index d28e4178a..abd4e5a86 100644 --- a/client/components/mma/upgrade/UpgradeSupportStyles.ts +++ b/client/components/mma/upgrade/UpgradeSupportStyles.ts @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, textSans } from '@guardian/source-foundations'; +import { from, palette, textSans } from '@guardian/source/foundations'; export const linkCss = css` ${textSans.medium()}; diff --git a/client/components/mma/upgrade/UpgradeSupportSwitchThankYou.tsx b/client/components/mma/upgrade/UpgradeSupportSwitchThankYou.tsx index aa3879362..1b705e2ba 100644 --- a/client/components/mma/upgrade/UpgradeSupportSwitchThankYou.tsx +++ b/client/components/mma/upgrade/UpgradeSupportSwitchThankYou.tsx @@ -5,14 +5,14 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { LinkButton, Stack, SvgCalendar, SvgClock, SvgEnvelope, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useContext } from 'react'; import { useLocation } from 'react-router'; import { formatAmount } from '@/client/utilities/utils'; diff --git a/client/components/mma/upgrade/UpgradeSupportThankYou.tsx b/client/components/mma/upgrade/UpgradeSupportThankYou.tsx index f42d57879..392b3ab75 100644 --- a/client/components/mma/upgrade/UpgradeSupportThankYou.tsx +++ b/client/components/mma/upgrade/UpgradeSupportThankYou.tsx @@ -5,13 +5,13 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { LinkButton, Stack, SvgCalendar, SvgEnvelope, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useContext } from 'react'; import { useLocation } from 'react-router'; import { formatAmount } from '@/client/utilities/utils'; diff --git a/client/components/shared/CallCenterEmailAndNumbers.tsx b/client/components/shared/CallCenterEmailAndNumbers.tsx index 7bd497c68..ea5b4e1aa 100644 --- a/client/components/shared/CallCenterEmailAndNumbers.tsx +++ b/client/components/shared/CallCenterEmailAndNumbers.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; import { useState } from 'react'; import type { PhoneRegionKey } from '@/shared/productResponse'; import { customerHelpEmailAddress, phoneData } from './callCentreData'; diff --git a/client/components/shared/CallCentreAccordion.tsx b/client/components/shared/CallCentreAccordion.tsx index 0265ecf85..76784e027 100644 --- a/client/components/shared/CallCentreAccordion.tsx +++ b/client/components/shared/CallCentreAccordion.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; -import { textSans } from '@guardian/source-foundations'; +import { textSans } from '@guardian/source/foundations'; import { Accordion, AccordionRow, Stack, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { PhoneRegionKey } from '@/shared/productResponse'; import { customerHelpEmailAddress, phoneData } from './callCentreData'; diff --git a/client/components/shared/CallCentreNumbers.tsx b/client/components/shared/CallCentreNumbers.tsx index 2891e35e4..bc24bb51f 100644 --- a/client/components/shared/CallCentreNumbers.tsx +++ b/client/components/shared/CallCentreNumbers.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; export const ukPhoneNumberWithoutPrefix = '0330 333 6790'; diff --git a/client/components/shared/FormError.tsx b/client/components/shared/FormError.tsx index 2449dd2b1..0b5cf404d 100644 --- a/client/components/shared/FormError.tsx +++ b/client/components/shared/FormError.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source-foundations'; +import { palette, space, textSans } from '@guardian/source/foundations'; import type { ReactElement } from 'react'; import { ErrorIcon } from '../mma/shared/assets/ErrorIcon'; diff --git a/client/components/shared/Header.tsx b/client/components/shared/Header.tsx index cb4e1a4bf..7c84fea15 100644 --- a/client/components/shared/Header.tsx +++ b/client/components/shared/Header.tsx @@ -4,7 +4,7 @@ import { from, palette, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { SignInStatus } from '../../utilities/signInStatus'; import { TheGuardianLogo } from '../mma/shared/assets/TheGuardianLogo'; import { DropdownNav } from './nav/DropdownNav'; diff --git a/client/components/shared/Input.tsx b/client/components/shared/Input.tsx index c97d04ebe..b1693fa21 100644 --- a/client/components/shared/Input.tsx +++ b/client/components/shared/Input.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { focusHalo, palette, textSans } from '@guardian/source-foundations'; +import { focusHalo, palette, textSans } from '@guardian/source/foundations'; import { useEffect, useRef } from 'react'; import type * as React from 'react'; import { ErrorIcon } from '../mma/shared/assets/ErrorIcon'; diff --git a/client/components/shared/Main.tsx b/client/components/shared/Main.tsx index c65c3cb0b..b61a55075 100644 --- a/client/components/shared/Main.tsx +++ b/client/components/shared/Main.tsx @@ -1,4 +1,4 @@ -import { palette, textSansSizes } from '@guardian/source-foundations'; +import { palette, textSansSizes } from '@guardian/source/foundations'; import type { Context, Dispatch, SetStateAction } from 'react'; import { createContext, useState } from 'react'; import { serif } from '../../styles/fonts'; diff --git a/client/components/shared/SectionContent.tsx b/client/components/shared/SectionContent.tsx index d09173f6b..63a6e2a4c 100644 --- a/client/components/shared/SectionContent.tsx +++ b/client/components/shared/SectionContent.tsx @@ -5,7 +5,7 @@ import { palette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Dispatch, ReactNode, SetStateAction } from 'react'; import { createContext, useState } from 'react'; import { gridBase, gridItemPlacement } from '../../styles/grid'; @@ -84,7 +84,7 @@ const divCss = (hasNav: boolean | undefined) => css` export const SelectedTopicObjectContext = createContext< Dispatch> ->(undefined!); +>(undefined!); export const SectionContent = (props: SectionContentProps) => { const [selectedTopicId, setSelectedTopicId] = useState( diff --git a/client/components/shared/SectionHeader.tsx b/client/components/shared/SectionHeader.tsx index 49a27ed2c..289d507d4 100644 --- a/client/components/shared/SectionHeader.tsx +++ b/client/components/shared/SectionHeader.tsx @@ -7,7 +7,7 @@ import { space, textSans, titlepiece, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import Color from 'color'; import { Link } from 'react-router-dom'; import { gridBase, gridItemPlacement } from '../../styles/grid'; diff --git a/client/components/shared/SignIn.tsx b/client/components/shared/SignIn.tsx index 1462af256..2cdef65e9 100644 --- a/client/components/shared/SignIn.tsx +++ b/client/components/shared/SignIn.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source-foundations'; +import { from, palette, space, textSans } from '@guardian/source/foundations'; export const signInCss = css` display: grid; diff --git a/client/components/shared/SupportTheGuardianButton.tsx b/client/components/shared/SupportTheGuardianButton.tsx index 5935fbb13..437b4ab66 100644 --- a/client/components/shared/SupportTheGuardianButton.tsx +++ b/client/components/shared/SupportTheGuardianButton.tsx @@ -5,7 +5,7 @@ import { themeButton, themeButtonReaderRevenueBrand, themeButtonReaderRevenueBrandAlt, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { conf } from '../../../server/config'; import { trackEvent } from '../../utilities/analytics'; diff --git a/client/components/shared/footer/Footer.tsx b/client/components/shared/footer/Footer.tsx index 6668a3711..4a2179dfc 100644 --- a/client/components/shared/footer/Footer.tsx +++ b/client/components/shared/footer/Footer.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import type { CMP } from '@guardian/libs'; -import { from, palette } from '@guardian/source-foundations'; -import { BackToTop } from '@guardian/source-react-components'; +import { from, palette } from '@guardian/source/foundations'; +import { BackToTop } from '@guardian/source/react-components'; import type { SyntheticEvent } from 'react'; import { useEffect, useState } from 'react'; import { headline } from '../../../styles/fonts'; diff --git a/client/components/shared/footer/MinimalFooter.tsx b/client/components/shared/footer/MinimalFooter.tsx index eaa466aef..5e6aded00 100644 --- a/client/components/shared/footer/MinimalFooter.tsx +++ b/client/components/shared/footer/MinimalFooter.tsx @@ -1,7 +1,7 @@ import { FooterLinks, FooterWithContents, -} from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source-development-kitchen/react-components'; export const MinimalFooter = () => { return ( diff --git a/client/components/shared/nav/DropdownNav.tsx b/client/components/shared/nav/DropdownNav.tsx index 4cf65689e..706f44fc6 100644 --- a/client/components/shared/nav/DropdownNav.tsx +++ b/client/components/shared/nav/DropdownNav.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brand, from, neutral, space } from '@guardian/source-foundations'; +import { brand, from, neutral, space } from '@guardian/source/foundations'; import { useEffect, useRef, useState } from 'react'; import { Link } from 'react-router-dom'; import { gridItemPlacement } from '../../../styles/grid'; diff --git a/client/components/shared/nav/LeftSideNav.tsx b/client/components/shared/nav/LeftSideNav.tsx index e8da2dd3b..31b366bd6 100644 --- a/client/components/shared/nav/LeftSideNav.tsx +++ b/client/components/shared/nav/LeftSideNav.tsx @@ -5,7 +5,7 @@ import { from, neutral, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Link } from 'react-router-dom'; import { sans } from '../../../styles/fonts'; import type { MenuSpecificNavItem, NavItem } from './NavConfig'; diff --git a/client/components/shared/productSwitch/SwitchErrorSummary.tsx b/client/components/shared/productSwitch/SwitchErrorSummary.tsx index 5a13853f1..9dcd833ba 100644 --- a/client/components/shared/productSwitch/SwitchErrorSummary.tsx +++ b/client/components/shared/productSwitch/SwitchErrorSummary.tsx @@ -1,4 +1,4 @@ -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import { Link } from 'react-router-dom'; import { errorSummaryBlockLinkCss, diff --git a/client/components/shared/productSwitch/SwitchPaymentInfo.tsx b/client/components/shared/productSwitch/SwitchPaymentInfo.tsx index e5fd631b4..31fecce76 100644 --- a/client/components/shared/productSwitch/SwitchPaymentInfo.tsx +++ b/client/components/shared/productSwitch/SwitchPaymentInfo.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { getBillingPeriodAdjective } from '../../../../shared/productTypes'; import { formatAmount } from '../../../utilities/utils'; diff --git a/client/styles/ButtonStyles.ts b/client/styles/ButtonStyles.ts index a9b67d260..54785a856 100644 --- a/client/styles/ButtonStyles.ts +++ b/client/styles/ButtonStyles.ts @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, space, until } from '@guardian/source-foundations'; +import { from, space, until } from '@guardian/source/foundations'; export const buttonCentredCss = css` justify-content: center; diff --git a/client/styles/ErrorStyles.ts b/client/styles/ErrorStyles.ts index d3bc4f39a..f0bffc286 100644 --- a/client/styles/ErrorStyles.ts +++ b/client/styles/ErrorStyles.ts @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, until } from '@guardian/source-foundations'; +import { space, until } from '@guardian/source/foundations'; export const errorSummaryOverrideCss = css` ${until.tablet} { diff --git a/client/styles/GenericStyles.ts b/client/styles/GenericStyles.ts index 8ce8ae2ee..33d68e30d 100644 --- a/client/styles/GenericStyles.ts +++ b/client/styles/GenericStyles.ts @@ -6,7 +6,7 @@ import { space, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; export const sectionSpacing = css` margin-top: ${space[6]}px; diff --git a/client/styles/grid.ts b/client/styles/grid.ts index 14b9e2610..626643fbb 100644 --- a/client/styles/grid.ts +++ b/client/styles/grid.ts @@ -1,4 +1,4 @@ -import { from, space } from '@guardian/source-foundations'; +import { from, space } from '@guardian/source/foundations'; export const gridColumns = { default: 4, diff --git a/package.json b/package.json index bc7875bc9..90c84a743 100644 --- a/package.json +++ b/package.json @@ -65,9 +65,7 @@ "@cypress/webpack-preprocessor": "5.11.1", "@emotion/babel-plugin": "11.9.2", "@emotion/jest": "11.9.1", - "@guardian/eslint-config-typescript": "9.0.2", - "@guardian/eslint-plugin-source-foundations": "17.0.1", - "@guardian/eslint-plugin-source-react-components": "24.0.1", + "@guardian/eslint-config-typescript": "10.0.1", "@guardian/node-riffraff-artifact": "0.2.2", "@guardian/prettier": "1.0.0", "@guardian/tsconfig": "0.1.6", @@ -149,9 +147,8 @@ "@guardian/ab-react": "2.0.1", "@guardian/commercial": "17.9.0", "@guardian/libs": "16.1.0", - "@guardian/source-foundations": "16.0.0", - "@guardian/source-react-components": "25.0.0", - "@guardian/source-react-components-development-kitchen": "21.0.0", + "@guardian/source": "1.0.2", + "@guardian/source-development-kitchen": "1.0.0", "@okta/jwt-verifier": "3.0.1", "@sentry/browser": "5.22.3", "@sentry/node": "5.22.3", diff --git a/yarn.lock b/yarn.lock index d331836e5..e92dd70a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2949,43 +2949,26 @@ web-vitals "^3.3.2" wolfy87-eventemitter "^5.2.9" -"@guardian/eslint-config-typescript@9.0.2": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@guardian/eslint-config-typescript/-/eslint-config-typescript-9.0.2.tgz#14268ad939bd23327b4c59313a16d08817d48404" - integrity sha512-UkuEDeEpIZ7njAK9pZm5RIGECfBFdqsOnY+HIB1XntUMG42VRd43XaNjgsblJ7aOO2L4opOauDUUyOycWxgFww== - dependencies: - "@guardian/eslint-config" "7.0.1" - "@typescript-eslint/eslint-plugin" "6.18.0" - "@typescript-eslint/parser" "6.18.0" +"@guardian/eslint-config-typescript@10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@guardian/eslint-config-typescript/-/eslint-config-typescript-10.0.1.tgz#fcaf57c6fb359ffec391e4e4b4a56174a03d523a" + integrity sha512-Y9QBfonXbiILuifudDOb96nYN+lwFhejPHda4ZzbGqRjcQbALQAmT/RMl0gubZTbIuXbRH+RZ7mWHGs/wxOuog== + dependencies: + "@guardian/eslint-config" "8.0.1" + "@typescript-eslint/eslint-plugin" "7.3.1" + "@typescript-eslint/parser" "7.3.1" eslint-import-resolver-typescript "3.6.1" eslint-plugin-import "2.29.1" -"@guardian/eslint-config@7.0.1": - version "7.0.1" - resolved "https://registry.yarnpkg.com/@guardian/eslint-config/-/eslint-config-7.0.1.tgz#0464b2f64ed359b7731284673b959d66456f619e" - integrity sha512-9MX0Xj2vaXWLQvjnk0QJKYXaCABwkaZx6ZAOGiGOb4KiadN5guFOgV2ki+YuDqcd5k/R1F3bUyBh/L3+gk0ouQ== +"@guardian/eslint-config@8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@guardian/eslint-config/-/eslint-config-8.0.1.tgz#a3ead2eed851f1a9c6271d1dac33de4fb95fda4e" + integrity sha512-pvXXJhtRqsBW7RxeWIFcXro0Y7hV7rQ4wJYiNiTtBRHo1cmML9lHLFNkIuAncVcc6YodgqCRWAeljaAJrGJJLQ== dependencies: eslint-config-prettier "9.1.0" eslint-plugin-eslint-comments "3.2.0" eslint-plugin-import "2.29.1" -"@guardian/eslint-plugin-source-foundations@17.0.1": - version "17.0.1" - resolved "https://registry.yarnpkg.com/@guardian/eslint-plugin-source-foundations/-/eslint-plugin-source-foundations-17.0.1.tgz#256215287ec29e6bbdd7e46e8d753498ef5e0075" - integrity sha512-2JNXsFuTSpl8M/IfRWcBs3N+dgTLMKCx4e3nF6gYdvUozbKKVgXZ866+9L5mQTK8PSDslcIy5fYdCFb7H+ccqw== - dependencies: - "@typescript-eslint/eslint-plugin" "6.18.0" - "@typescript-eslint/parser" "6.18.0" - eslint-plugin-import "2.29.1" - -"@guardian/eslint-plugin-source-react-components@24.0.1": - version "24.0.1" - resolved "https://registry.yarnpkg.com/@guardian/eslint-plugin-source-react-components/-/eslint-plugin-source-react-components-24.0.1.tgz#e70ce2b8e249bb6790d10be2e3c91223a6c802d1" - integrity sha512-2opgruOKoCp1tAW2vdhl+UpHq2osoN4DAQqrtNsWUCqXtdqAxsXLM9jWqwUzTY68EjFoqg3whxJrbFYWByILCQ== - dependencies: - "@typescript-eslint/eslint-plugin" "6.21.0" - "@typescript-eslint/parser" "6.21.0" - "@guardian/libs@16.1.0": version "16.1.0" resolved "https://registry.yarnpkg.com/@guardian/libs/-/libs-16.1.0.tgz#70d986a312a04e609a89ef1a631f6a3000e322da" @@ -3043,23 +3026,18 @@ resolved "https://registry.yarnpkg.com/@guardian/prettier/-/prettier-1.0.0.tgz#a5dd832e2ce31c6f723f0af77fe116b32b4695ff" integrity sha512-srnhPn3hcSv14mDotFQN0CfN3k8MaGsXdK8BXAG95QQxM69Ybi16o4/Xqe361fwDEp7m+9jf03sETcMi8WsDlA== -"@guardian/source-foundations@16.0.0": - version "16.0.0" - resolved "https://registry.yarnpkg.com/@guardian/source-foundations/-/source-foundations-16.0.0.tgz#dd4821dffa8aabcfb21d3fc76b0f416bf67aa577" - integrity sha512-bdRcJTEJ6tGmibGRwhQcY70NMACHCcsnNsiWRwW1fSPpvcAuR4xvXmn3UlaL1U/RO4Yk1YvJjPiV/n9WHnjbjQ== +"@guardian/source-development-kitchen@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@guardian/source-development-kitchen/-/source-development-kitchen-1.0.0.tgz#9ac7efe9b28cb33170ed97c67eba1c25dc10a227" + integrity sha512-nZYJuHici8Bja7bKs3GZY5UzNCnbWOq1OCYclC6rhvpkcXdrtP+zyqX6YwJKWMgEKg+aL/l595OubBdGenn7OA== + +"@guardian/source@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@guardian/source/-/source-1.0.2.tgz#d3910fa625694437fb425b19897376d85238cab4" + integrity sha512-BoGkx6tDcQwDxfQ5dYPzpmSqf2SFTgNPDG7bwLPeeL0F6Up5EK5yIlfNslOS8KSh6a4SNBOU52DedQ9mFQkQhA== dependencies: mini-svg-data-uri "1.4.4" -"@guardian/source-react-components-development-kitchen@21.0.0": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@guardian/source-react-components-development-kitchen/-/source-react-components-development-kitchen-21.0.0.tgz#8f428c9506289fd8e26dd6381f9f82158547f8f4" - integrity sha512-rhh9wv9PsNqkOJGWWc7iqoGvhvPPYaKDA3TF6xIpV6KVQAuESIkBmL7NrbEyBO2btStJ6UMTtGd0kpCZPrRr5Q== - -"@guardian/source-react-components@25.0.0": - version "25.0.0" - resolved "https://registry.yarnpkg.com/@guardian/source-react-components/-/source-react-components-25.0.0.tgz#c4c8ac53b92a7ed4ebde6823c8f7d80151f8375a" - integrity sha512-9llnT6DUiLmdhklciMO75SBC9DbBqLw+jBWxhu60J+uAyw7B2WqG9Bmk8wPBCSrRe4hNvsosJyVMI+KiRb48Bw== - "@guardian/tsconfig@0.1.6": version "0.1.6" resolved "https://registry.yarnpkg.com/@guardian/tsconfig/-/tsconfig-0.1.6.tgz#2cc3ecce09e84b6bcaea8a1150c7b590e908d2a9" @@ -5558,33 +5536,16 @@ resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.23.tgz#00721a3b675e7609e5bcccb94234e86b754bcd04" integrity sha512-+tipAL6prdInS/avA6QityIFBDvHnqk1Tv9L5JMEws5IZC6agymBGAoDsrPyYp42wGcktyQtYKv9kvGPEKd4Qg== -"@typescript-eslint/eslint-plugin@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.18.0.tgz#94b86f3c25b468c714a04bd490017ecec2fd3746" - integrity sha512-3lqEvQUdCozi6d1mddWqd+kf8KxmGq2Plzx36BlkjuQe3rSTm/O98cLf0A4uDO+a5N1KD2SeEEl6fW97YHY+6w== - dependencies: - "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.18.0" - "@typescript-eslint/type-utils" "6.18.0" - "@typescript-eslint/utils" "6.18.0" - "@typescript-eslint/visitor-keys" "6.18.0" - debug "^4.3.4" - graphemer "^1.4.0" - ignore "^5.2.4" - natural-compare "^1.4.0" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/eslint-plugin@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3" - integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA== +"@typescript-eslint/eslint-plugin@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.3.1.tgz#0d8f38a6c8a1802139e62184ee7a68ed024f30a1" + integrity sha512-STEDMVQGww5lhCuNXVSQfbfuNII5E08QWkvAw5Qwf+bj2WT+JkG1uc+5/vXA3AOYMDHVOSpL+9rcbEUiHIm2dw== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/type-utils" "6.21.0" - "@typescript-eslint/utils" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/scope-manager" "7.3.1" + "@typescript-eslint/type-utils" "7.3.1" + "@typescript-eslint/utils" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -5592,26 +5553,15 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.0.tgz#d494161d64832e869f0a6acc6000a2cdff858383" - integrity sha512-v6uR68SFvqhNQT41frCMCQpsP+5vySy6IdgjlzUWoo7ALCnpaWYcz/Ij2k4L8cEsL0wkvOviCMpjmtRtHNOKzA== +"@typescript-eslint/parser@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.3.1.tgz#c4ba7dc2744318a5e4506596cbc3a0086255c526" + integrity sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw== dependencies: - "@typescript-eslint/scope-manager" "6.18.0" - "@typescript-eslint/types" "6.18.0" - "@typescript-eslint/typescript-estree" "6.18.0" - "@typescript-eslint/visitor-keys" "6.18.0" - debug "^4.3.4" - -"@typescript-eslint/parser@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b" - integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ== - dependencies: - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/typescript-estree" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" + "@typescript-eslint/scope-manager" "7.3.1" + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/typescript-estree" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" debug "^4.3.4" "@typescript-eslint/scope-manager@5.60.0": @@ -5622,39 +5572,21 @@ "@typescript-eslint/types" "5.60.0" "@typescript-eslint/visitor-keys" "5.60.0" -"@typescript-eslint/scope-manager@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.0.tgz#24ca6fc1f4a2afa71122dcfca9282878687d9997" - integrity sha512-o/UoDT2NgOJ2VfHpfr+KBY2ErWvCySNUIX/X7O9g8Zzt/tXdpfEU43qbNk8LVuWUT2E0ptzTWXh79i74PP0twA== - dependencies: - "@typescript-eslint/types" "6.18.0" - "@typescript-eslint/visitor-keys" "6.18.0" - -"@typescript-eslint/scope-manager@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1" - integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg== - dependencies: - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" - -"@typescript-eslint/type-utils@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.18.0.tgz#a492da599da5c38c70aa9ff9bfb473961b8ae663" - integrity sha512-ZeMtrXnGmTcHciJN1+u2CigWEEXgy1ufoxtWcHORt5kGvpjjIlK9MUhzHm4RM8iVy6dqSaZA/6PVkX6+r+ChjQ== +"@typescript-eslint/scope-manager@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.3.1.tgz#73fd0cb4211a7be23e49e5b6efec8820caa6ec36" + integrity sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag== dependencies: - "@typescript-eslint/typescript-estree" "6.18.0" - "@typescript-eslint/utils" "6.18.0" - debug "^4.3.4" - ts-api-utils "^1.0.1" + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" -"@typescript-eslint/type-utils@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e" - integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag== +"@typescript-eslint/type-utils@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.3.1.tgz#cbf90d3d7e788466aa8a5c0ab3f46103f098aa0d" + integrity sha512-iFhaysxFsMDQlzJn+vr3OrxN8NmdQkHks4WaqD4QBnt5hsq234wcYdyQ9uquzJJIDAj5W4wQne3yEsYA6OmXGw== dependencies: - "@typescript-eslint/typescript-estree" "6.21.0" - "@typescript-eslint/utils" "6.21.0" + "@typescript-eslint/typescript-estree" "7.3.1" + "@typescript-eslint/utils" "7.3.1" debug "^4.3.4" ts-api-utils "^1.0.1" @@ -5663,15 +5595,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.60.0.tgz#3179962b28b4790de70e2344465ec97582ce2558" integrity sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA== -"@typescript-eslint/types@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.0.tgz#ffce610a1540c17cf7d8ecf2bb34b8b0e2e77101" - integrity sha512-/RFVIccwkwSdW/1zeMx3hADShWbgBxBnV/qSrex6607isYjj05t36P6LyONgqdUrNLl5TYU8NIKdHUYpFvExkA== - -"@typescript-eslint/types@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" - integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== +"@typescript-eslint/types@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.3.1.tgz#ae104de8efa4227a462c0874d856602c5994413c" + integrity sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw== "@typescript-eslint/typescript-estree@5.60.0": version "5.60.0" @@ -5686,13 +5613,13 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.0.tgz#1c357c3ca435c3cfa2af6b9daf45ca0bc2bb059a" - integrity sha512-klNvl+Ql4NsBNGB4W9TZ2Od03lm7aGvTbs0wYaFYsplVPhr+oeXjlPZCDI4U9jgJIDK38W1FKhacCFzCC+nbIg== +"@typescript-eslint/typescript-estree@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.3.1.tgz#598848195fad34c7aa73f548bd00a4d4e5f5e2bb" + integrity sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ== dependencies: - "@typescript-eslint/types" "6.18.0" - "@typescript-eslint/visitor-keys" "6.18.0" + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -5700,44 +5627,17 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/typescript-estree@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" - integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ== - dependencies: - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - minimatch "9.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/utils@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.18.0.tgz#4d07c9c08f84b9939a1aca7aef98c8f378936142" - integrity sha512-wiKKCbUeDPGaYEYQh1S580dGxJ/V9HI7K5sbGAVklyf+o5g3O+adnS4UNJajplF4e7z2q0uVBaTdT/yLb4XAVA== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.18.0" - "@typescript-eslint/types" "6.18.0" - "@typescript-eslint/typescript-estree" "6.18.0" - semver "^7.5.4" - -"@typescript-eslint/utils@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" - integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ== +"@typescript-eslint/utils@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.3.1.tgz#fc28fd508ccf89495012561b7c02a6fdad162460" + integrity sha512-jIERm/6bYQ9HkynYlNZvXpzmXWZGhMbrOvq3jJzOSOlKXsVjrrolzWBjDW6/TvT5Q3WqaN4EkmcfdQwi9tDjBQ== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/typescript-estree" "6.21.0" + "@typescript-eslint/scope-manager" "7.3.1" + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/typescript-estree" "7.3.1" semver "^7.5.4" "@typescript-eslint/utils@^5.10.0": @@ -5762,20 +5662,12 @@ "@typescript-eslint/types" "5.60.0" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.0.tgz#3c8733737786fa6c78a347b4fa306ae7155b560f" - integrity sha512-1wetAlSZpewRDb2h9p/Q8kRjdGuqdTAQbkJIOUMLug2LBLG+QOjiWoSj6/3B/hA9/tVTFFdtiKvAYoYnSRW/RA== - dependencies: - "@typescript-eslint/types" "6.18.0" - eslint-visitor-keys "^3.4.1" - -"@typescript-eslint/visitor-keys@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47" - integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A== +"@typescript-eslint/visitor-keys@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.3.1.tgz#6ddef14a3ce2a79690f01176f5305c34d7b93d8c" + integrity sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw== dependencies: - "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/types" "7.3.1" eslint-visitor-keys "^3.4.1" "@webassemblyjs/ast@1.11.1": @@ -6352,6 +6244,14 @@ array-buffer-byte-length@^1.0.0: call-bind "^1.0.2" is-array-buffer "^3.0.1" +array-buffer-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== + dependencies: + call-bind "^1.0.5" + is-array-buffer "^3.0.4" + array-differ@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1" @@ -6379,14 +6279,15 @@ array-includes@^3.1.5: is-string "^1.0.7" array-includes@^3.1.7: - version "3.1.7" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" - integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" + version "3.1.8" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" + integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.4" is-string "^1.0.7" array-union@^1.0.2: @@ -6407,15 +6308,16 @@ array-uniq@^1.0.1: integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q== array.prototype.findlastindex@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" - integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d" + integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - get-intrinsic "^1.2.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-shim-unscopables "^1.0.2" array.prototype.flat@^1.2.3, array.prototype.flat@^1.3.2: version "1.3.2" @@ -6460,6 +6362,20 @@ arraybuffer.prototype.slice@^1.0.2: is-array-buffer "^3.0.2" is-shared-array-buffer "^1.0.2" +arraybuffer.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== + dependencies: + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" + is-shared-array-buffer "^1.0.2" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -6565,6 +6481,13 @@ 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== +available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" + aws-sdk@2.1500.0, aws-sdk@^2.946.0: version "2.1500.0" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1500.0.tgz#b26fb96055f28510ae0eacd2263a020d15072eb1" @@ -7172,6 +7095,17 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" +call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" @@ -8127,6 +8061,33 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" +data-view-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" + integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" + integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" + integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + date-fns@2.16.1: version "2.16.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b" @@ -8256,12 +8217,21 @@ define-data-property@^1.0.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-lazy-prop@^2.0.0: version "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-properties@^1.2.0: +define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -8633,7 +8603,7 @@ endent@^2.0.1: fast-json-parse "^1.0.3" objectorarray "^1.0.5" -enhanced-resolve@^5.10.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.15.0: +enhanced-resolve@^5.10.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== @@ -8641,6 +8611,14 @@ enhanced-resolve@^5.10.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.15.0: graceful-fs "^4.2.4" tapable "^2.2.0" +enhanced-resolve@^5.12.0: + version "5.16.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567" + integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + enquirer@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56" @@ -8735,6 +8713,70 @@ es-abstract@^1.20.4, es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.11" +es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2: + version "1.23.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" + integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== + dependencies: + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + data-view-buffer "^1.0.1" + data-view-byte-length "^1.0.1" + data-view-byte-offset "^1.0.0" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-set-tostringtag "^2.0.3" + es-to-primitive "^1.2.1" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" + globalthis "^1.0.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" + has-symbols "^1.0.3" + hasown "^2.0.2" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" + is-callable "^1.2.7" + is-data-view "^1.0.1" + is-negative-zero "^2.0.3" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.3" + is-string "^1.0.7" + is-typed-array "^1.1.13" + is-weakref "^1.0.2" + object-inspect "^1.13.1" + object-keys "^1.1.1" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.2" + safe-regex-test "^1.0.3" + string.prototype.trim "^1.2.9" + string.prototype.trimend "^1.0.8" + string.prototype.trimstart "^1.0.8" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.6" + unbox-primitive "^1.0.2" + which-typed-array "^1.1.15" + +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.2.1, es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + 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" @@ -8760,6 +8802,13 @@ es-module-lexer@^1.2.1: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== +es-object-atoms@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" + integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== + dependencies: + es-errors "^1.3.0" + 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" @@ -8769,6 +8818,15 @@ es-set-tostringtag@^2.0.1: has "^1.0.3" has-tostringtag "^1.0.0" +es-set-tostringtag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== + dependencies: + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" + es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -8776,6 +8834,13 @@ es-shim-unscopables@^1.0.0: dependencies: has "^1.0.3" +es-shim-unscopables@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" + integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== + dependencies: + hasown "^2.0.0" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -8889,9 +8954,9 @@ eslint-import-resolver-typescript@3.6.1: is-glob "^4.0.3" eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== + version "2.8.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34" + integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q== dependencies: debug "^3.2.7" @@ -9816,6 +9881,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@ has-proto "^1.0.1" has-symbols "^1.0.3" +get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-nonce@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3" @@ -9873,10 +9949,19 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-symbol-description@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== + dependencies: + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + get-tsconfig@^4.5.0: - version "4.7.2" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce" - integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A== + version "4.7.5" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.5.tgz#5e012498579e9a6947511ed0cd403272c7acbbaf" + integrity sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw== dependencies: resolve-pkg-maps "^1.0.0" @@ -10087,11 +10172,23 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" @@ -10104,6 +10201,13 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" +has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== + dependencies: + has-symbols "^1.0.3" + has@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" @@ -10126,10 +10230,10 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== +hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== dependencies: function-bind "^1.1.2" @@ -10473,7 +10577,12 @@ ignore@^3.3.7: resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== -ignore@^5.0.5, ignore@^5.2.0: +ignore@^5.0.5: + version "5.3.1" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" + integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== + +ignore@^5.2.0: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== @@ -10570,6 +10679,15 @@ internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5: has "^1.0.3" side-channel "^1.0.4" +internal-slot@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== + dependencies: + es-errors "^1.3.0" + hasown "^2.0.0" + side-channel "^1.0.4" + interpret@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" @@ -10624,6 +10742,14 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: get-intrinsic "^1.2.0" is-typed-array "^1.1.10" +is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -10675,14 +10801,14 @@ is-ci@^3.0.0, is-ci@^3.0.1: dependencies: ci-info "^3.2.0" -is-core-module@^2.11.0, is-core-module@^2.13.0: +is-core-module@^2.11.0: version "2.13.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== dependencies: has "^1.0.3" -is-core-module@^2.13.1: +is-core-module@^2.13.0, is-core-module@^2.13.1: version "2.13.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== @@ -10696,6 +10822,13 @@ is-core-module@^2.9.0: dependencies: has "^1.0.3" +is-data-view@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" + integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== + dependencies: + is-typed-array "^1.1.13" + is-date-object@^1.0.1, is-date-object@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" @@ -10800,6 +10933,11 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +is-negative-zero@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== + is-node-process@^1.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/is-node-process/-/is-node-process-1.2.0.tgz#ea02a1b90ddb3934a19aea414e88edef7e11d134" @@ -10874,6 +11012,13 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" +is-shared-array-buffer@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== + dependencies: + call-bind "^1.0.7" + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -10917,6 +11062,13 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.3, is-typed- dependencies: which-typed-array "^1.1.11" +is-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== + dependencies: + which-typed-array "^1.1.14" + is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -12709,6 +12861,11 @@ object-inspect@^1.12.2, object-inspect@^1.12.3: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== +object-inspect@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + object-inspect@^1.9.0: version "1.13.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.0.tgz#42695d3879e1cd5bda6df5062164d80c996e23e2" @@ -12737,6 +12894,16 @@ object.assign@^4.1.3, object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" +object.assign@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + has-symbols "^1.0.3" + object-keys "^1.1.1" + object.entries@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23" @@ -12756,23 +12923,23 @@ object.fromentries@^2.0.5: es-abstract "^1.20.4" object.fromentries@^2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" - integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== + version "2.0.8" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65" + integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" object.groupby@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" - integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== + version "1.0.3" + resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e" + integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" object.hasown@^1.1.1: version "1.1.2" @@ -12782,7 +12949,7 @@ object.hasown@^1.1.1: define-properties "^1.1.4" es-abstract "^1.20.4" -object.values@^1.1.5, object.values@^1.1.7: +object.values@^1.1.5: version "1.1.7" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== @@ -12791,6 +12958,15 @@ object.values@^1.1.5, object.values@^1.1.7: define-properties "^1.2.0" es-abstract "^1.22.1" +object.values@^1.1.7: + version "1.2.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" + integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + objectorarray@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.5.tgz#2c05248bbefabd8f43ad13b41085951aac5e68a5" @@ -13298,6 +13474,11 @@ polished@^4.2.2: dependencies: "@babel/runtime" "^7.17.8" +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" @@ -14004,6 +14185,16 @@ regexp.prototype.flags@^1.5.0: define-properties "^1.2.0" functions-have-names "^1.2.3" +regexp.prototype.flags@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" + integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== + dependencies: + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" + regexpu-core@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" @@ -14138,9 +14329,9 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.2 supports-preserve-symlinks-flag "^1.0.0" resolve@^1.22.4: - version "1.22.6" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.6.tgz#dd209739eca3aef739c626fea1b4f3c506195362" - integrity sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw== + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== dependencies: is-core-module "^2.13.0" path-parse "^1.0.7" @@ -14246,6 +14437,16 @@ safe-array-concat@^1.0.1: has-symbols "^1.0.3" isarray "^2.0.5" +safe-array-concat@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" + integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== + dependencies: + call-bind "^1.0.7" + get-intrinsic "^1.2.4" + has-symbols "^1.0.3" + isarray "^2.0.5" + 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" @@ -14265,6 +14466,15 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" +safe-regex-test@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-regex "^1.1.4" + safe-stable-stringify@^2.3.1: version "2.4.3" resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" @@ -14440,6 +14650,18 @@ set-cookie-parser@^2.4.6: resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51" integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ== +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + set-function-name@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" @@ -14449,6 +14671,16 @@ set-function-name@^2.0.0: functions-have-names "^1.2.3" has-property-descriptors "^1.0.0" +set-function-name@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.2" + setimmediate@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -14899,6 +15131,16 @@ string.prototype.trim@^1.2.8: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trim@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" + integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.0" + es-object-atoms "^1.0.0" + string.prototype.trimend@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" @@ -14908,6 +15150,15 @@ string.prototype.trimend@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trimend@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" + integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + string.prototype.trimstart@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" @@ -14917,6 +15168,15 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trimstart@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde" + integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + string_decoder@^1.1.1, string_decoder@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -15482,6 +15742,15 @@ typed-array-buffer@^1.0.0: get-intrinsic "^1.2.1" is-typed-array "^1.1.10" +typed-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-typed-array "^1.1.13" + typed-array-byte-length@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" @@ -15492,6 +15761,17 @@ typed-array-byte-length@^1.0.0: has-proto "^1.0.1" is-typed-array "^1.1.10" +typed-array-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + typed-array-byte-offset@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" @@ -15503,6 +15783,18 @@ typed-array-byte-offset@^1.0.0: has-proto "^1.0.1" is-typed-array "^1.1.10" +typed-array-byte-offset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + typed-array-length@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" @@ -15512,6 +15804,18 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" +typed-array-length@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3" + integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -16166,6 +16470,17 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.2, which-typed-array@^1.1.9: gopd "^1.0.1" has-tostringtag "^1.0.0" +which-typed-array@^1.1.14, which-typed-array@^1.1.15: + version "1.1.15" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" + integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.2" + which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" From af1a67ca70f5002a7410774f0f5389897205a794 Mon Sep 17 00:00:00 2001 From: Richard Bangay Date: Mon, 27 May 2024 22:09:58 +0100 Subject: [PATCH 2/3] fix deprecated source resources, update Typescript to latest currently used minor version --- .storybook/viewport.ts | 2 +- .../helpCentre/BackToHelpCentreLink.tsx | 12 ++--- client/components/helpCentre/HelpCentre.tsx | 9 +++- .../helpCentre/HelpCentreArticle.tsx | 20 ++++---- .../helpCentre/HelpCentreContactOptions.tsx | 12 ++--- .../helpCentre/HelpCentreEmailAndLiveChat.tsx | 12 +++-- .../HelpCentreLandingMoreTopics.tsx | 11 +++-- .../helpCentre/HelpCentreMoreTopics.tsx | 15 ++++-- .../components/helpCentre/HelpCentreNav.tsx | 21 ++++---- .../helpCentre/HelpCentrePhoneNumbers.tsx | 20 +++++--- .../helpCentre/HelpCentreStyles.tsx | 38 +++++++------- client/components/helpCentre/HelpTopicBox.tsx | 13 +++-- client/components/helpCentre/KnownIssues.tsx | 7 +-- .../helpCentre/contactUs/ContactUs.tsx | 12 ++--- .../contactUs/SelfServicePrompt.tsx | 10 ++-- .../helpCentre/contactUs/SubTopicForm.tsx | 18 ++++--- .../helpCentre/contactUs/TopicButton.tsx | 4 +- .../helpCentre/contactUs/TopicForm.tsx | 11 +++-- .../helpCentre/contactUs/UploadFileInput.tsx | 16 +++--- .../helpCentre/contactUs/contactUsForm.tsx | 32 +++++++----- .../liveChat/LiveChatPrivacyNotice.tsx | 18 ++++--- .../liveChat/liveChatCssOverrides.ts | 46 +++++++++-------- client/components/mma/Page.tsx | 13 ++--- .../mma/accountoverview/AccountOverview.tsx | 8 +-- .../accountoverview/EmptyAccountOverview.tsx | 15 +++--- .../mma/accountoverview/InAppPurchaseCard.tsx | 4 +- .../mma/accountoverview/ManageProduct.tsx | 21 ++++---- .../NewsletterOptinSection.tsx | 6 +-- .../accountoverview/PersonalisedHeader.tsx | 10 ++-- .../mma/accountoverview/ProductCard.tsx | 8 +-- .../mma/accountoverview/ProductCardStyles.ts | 17 +++++-- .../manageProducts/ManageProductV2.tsx | 16 +++--- .../ContributionUpdateAmountForm.tsx | 6 +-- .../SupporterPlusUpdateAmountForm.tsx | 14 ++++-- client/components/mma/billing/Billing.tsx | 35 +++++++------ .../mma/billing/InvoiceTableYearSelect.tsx | 13 +++-- .../components/mma/billing/InvoicesTable.tsx | 15 +++--- .../cancel/CancellationReasonSelection.tsx | 6 +-- .../mma/cancel/CancellationSummary.tsx | 10 ++-- .../mma/cancel/ContactUsToCancel.tsx | 13 +++-- .../cancellationSaves/CancellationLanding.tsx | 8 +-- .../cancel/cancellationSaves/SelectReason.tsx | 12 +++-- .../digipack/ConfirmDigiSubCancellation.tsx | 16 +++--- .../digipack/DigiSubDiscountConfirmed.tsx | 4 +- .../digipack/DigiSubThankYouOffer.tsx | 19 ++++--- .../ConfirmMembershipCancellation.tsx | 6 +-- .../ContinueMembershipConfirmation.tsx | 4 +- .../membership/MembershipSwitch.tsx | 8 +-- .../membership/SaveOptions.tsx | 11 +++-- .../membership/SaveStyles.ts | 7 +-- .../membership/ValueOfSupport.tsx | 4 +- .../mma/dataPrivacy/DataPrivacy.styles.ts | 13 ++--- .../address/DeliveryAddressConfirmation.tsx | 18 +++---- .../address/DeliveryAddressDisplay.tsx | 4 +- .../delivery/address/DeliveryAddressForm.tsx | 24 ++++----- .../address/DeliveryAddressReview.tsx | 35 +++++++------ .../mma/delivery/address/Select.tsx | 13 +++-- .../delivery/records/DeliveryAddressStep.tsx | 44 +++++++++-------- .../delivery/records/DeliveryRecordCard.tsx | 6 +-- .../records/DeliveryRecordInstructions.tsx | 8 +-- .../delivery/records/DeliveryRecordStatus.tsx | 7 ++- .../mma/delivery/records/DeliveryRecords.tsx | 49 ++++++++++--------- .../records/DeliveryRecordsAddress.tsx | 10 ++-- .../records/DeliveryRecordsPaginationNav.tsx | 6 +-- .../DeliveryRecordsProblemConfirmation.tsx | 23 ++++----- .../records/DeliveryRecordsProblemForm.tsx | 19 ++++--- .../records/DeliveryRecordsProblemReview.tsx | 27 +++++----- .../delivery/records/ProductDetailsTable.tsx | 4 +- .../records/ReadOnlyAddressDisplay.tsx | 21 ++++---- .../mma/delivery/records/UserPhoneNumber.tsx | 25 +++++----- client/components/mma/help/Help.tsx | 30 ++++++------ .../mma/holiday/HolidayCalendarTable.tsx | 46 ++++++++++------- .../mma/holiday/HolidayDateChooser.tsx | 10 ++-- .../mma/maintenance/Maintenance.tsx | 16 +++--- .../mma/paymentUpdate/ContactUs.tsx | 16 ++---- .../paymentUpdate/CurrentPaymentDetail.tsx | 7 +-- .../mma/paymentUpdate/FieldWrapper.tsx | 10 ++-- .../mma/paymentUpdate/PaymentDetailUpdate.tsx | 37 +++++++------- .../PaymentDetailUpdateConfirmation.tsx | 12 ++--- .../mma/paymentUpdate/PaymentFailed.tsx | 20 +++----- .../mma/paymentUpdate/card/Recaptcha.tsx | 10 ++-- .../mma/shared/DirectDebitDisplay.tsx | 6 +-- client/components/mma/shared/Heading.tsx | 15 +++--- client/components/mma/shared/InfoSection.tsx | 8 +-- .../mma/shared/NextPaymentDetails.tsx | 4 +- .../components/mma/shared/OverlayLoader.tsx | 4 +- client/components/mma/shared/Pagination.tsx | 4 +- client/components/mma/shared/ProblemAlert.tsx | 10 ++-- .../shared/ProductDescriptionListTable.tsx | 11 +++-- .../mma/shared/ProductInfoTableV2.tsx | 6 +-- .../mma/shared/ProgressIndicator.tsx | 26 +++++----- .../components/mma/shared/ProgressStepper.tsx | 6 +-- .../mma/shared/SupporterPlusTsAndCs.tsx | 4 +- .../mma/shared/assets/AccountOverviewIcon.tsx | 4 +- .../mma/shared/assets/CommentsIcon.tsx | 4 +- .../mma/shared/assets/CreditCardIcon.tsx | 4 +- .../mma/shared/assets/DeliveryIcon.tsx | 4 +- .../mma/shared/assets/EmailPrefIcon.tsx | 6 +-- .../components/mma/shared/assets/GiftIcon.tsx | 4 +- .../components/mma/shared/assets/HelpIcon.tsx | 4 +- .../mma/shared/assets/LoadingCircleIcon.tsx | 4 +- .../mma/shared/assets/NewspaperIcon.tsx | 4 +- .../shared/assets/NewspaperVoucherIcon.tsx | 4 +- .../mma/shared/assets/OtherIcon.tsx | 4 +- .../mma/shared/assets/ProfileIcon.tsx | 4 +- .../mma/shared/assets/SettingsIcon.tsx | 4 +- .../mma/shared/assets/ShieldIcon.tsx | 4 +- .../mma/shared/benefits/BenefitsCard.tsx | 4 +- .../mma/shared/benefits/BenefitsStyles.tsx | 12 +++-- .../mma/signInError/SignInError.tsx | 16 +++--- .../mma/switch/complete/SwitchComplete.tsx | 21 ++++---- .../mma/switch/options/SwitchOptions.tsx | 24 ++++++--- .../mma/switch/review/SwitchReview.tsx | 14 ++++-- client/components/mma/upgrade/ConfirmForm.tsx | 15 +++--- .../components/mma/upgrade/UpgradeSupport.tsx | 14 ++++-- .../mma/upgrade/UpgradeSupportStyles.ts | 4 +- .../upgrade/UpgradeSupportSwitchThankYou.tsx | 14 +++--- .../mma/upgrade/UpgradeSupportThankYou.tsx | 14 +++--- .../shared/CallCenterEmailAndNumbers.tsx | 18 ++++--- .../components/shared/CallCentreAccordion.tsx | 6 +-- client/components/shared/FormError.tsx | 4 +- client/components/shared/Input.tsx | 8 +-- client/components/shared/Main.tsx | 4 +- client/components/shared/SectionHeader.tsx | 16 +++--- client/components/shared/SignIn.tsx | 12 +++-- client/components/shared/nav/DropdownNav.tsx | 10 ++-- client/components/shared/nav/LeftSideNav.tsx | 22 ++++----- client/styles/GenericStyles.ts | 20 ++++---- client/utilities/hooks/useFetch.ts | 12 +++-- package.json | 2 +- yarn.lock | 8 +-- 131 files changed, 939 insertions(+), 775 deletions(-) diff --git a/.storybook/viewport.ts b/.storybook/viewport.ts index 21dffb4ec..31ee07781 100644 --- a/.storybook/viewport.ts +++ b/.storybook/viewport.ts @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; const viewportMeta = { mobile: { diff --git a/client/components/helpCentre/BackToHelpCentreLink.tsx b/client/components/helpCentre/BackToHelpCentreLink.tsx index f58f5b601..837639b1f 100644 --- a/client/components/helpCentre/BackToHelpCentreLink.tsx +++ b/client/components/helpCentre/BackToHelpCentreLink.tsx @@ -1,24 +1,18 @@ import { css } from '@emotion/react'; -import { - neutral, - palette, - space, - textSans, -} from '@guardian/source/foundations'; +import { palette, space, textSans17 } from '@guardian/source/foundations'; import { SvgChevronLeftSingle } from '@guardian/source/react-components'; import { Link } from 'react-router-dom'; const dividerCss = css` margin-top: ${space[12]}px; padding-top: ${space[9]}px; - border-top: 1px solid ${neutral['86']}; + border-top: 1px solid ${palette.neutral['86']}; `; const linkCss = css` display: flex; align-items: center; - ${textSans.medium()}; - color: ${palette.brand[500]}; + ${textSans17}: color: ${palette.brand[500]}; &:hover, &:focus { text-decoration: underline; diff --git a/client/components/helpCentre/HelpCentre.tsx b/client/components/helpCentre/HelpCentre.tsx index 5cf5f8090..327ee57f6 100644 --- a/client/components/helpCentre/HelpCentre.tsx +++ b/client/components/helpCentre/HelpCentre.tsx @@ -1,5 +1,10 @@ import { css } from '@emotion/react'; -import { from, headline, neutral, space } from '@guardian/source/foundations'; +import { + from, + headlineBold28, + neutral, + space, +} from '@guardian/source/foundations'; import { helpCentreConfig } from './HelpCentreConfig'; import { HelpCentreContactOptions } from './HelpCentreContactOptions'; import { HelpCentreLandingMoreTopics } from './HelpCentreLandingMoreTopics'; @@ -8,7 +13,7 @@ import { HelpTopicBox } from './HelpTopicBox'; const subtitleStyles = css` margin-top: 30px; margin-bottom: ${space[6]}px; - ${headline.small({ fontWeight: 'bold' })}; + ${headlineBold28}; border-top: 1px solid ${neutral['86']}; ${from.tablet} { margin-bottom: ${space[6]}px; diff --git a/client/components/helpCentre/HelpCentreArticle.tsx b/client/components/helpCentre/HelpCentreArticle.tsx index c92b4363e..690b8ac4a 100644 --- a/client/components/helpCentre/HelpCentreArticle.tsx +++ b/client/components/helpCentre/HelpCentreArticle.tsx @@ -1,11 +1,11 @@ import { css } from '@emotion/react'; import { - brand, from, - headline, - neutral, + headlineBold20, + palette, space, - textSans, + textSans15, + textSansBold17, } from '@guardian/source/foundations'; import { Button } from '@guardian/source/react-components'; import { captureException, captureMessage } from '@sentry/browser'; @@ -66,7 +66,7 @@ export const HelpCentreArticle = () => { const articleContainerCss = css` max-width: 620px; - color: ${neutral['7']}; + color: ${palette.neutral['7']}; `; setPageTitle(article?.title); @@ -133,7 +133,7 @@ interface ArticleBodyProps { const ArticleBody = (props: ArticleBodyProps) => { const aCss = css` - color: ${brand[500]}; + color: ${palette.brand[500]}; text-decoration: underline; `; const ulCss = css` @@ -155,7 +155,7 @@ const ArticleBody = (props: ArticleBodyProps) => { } `; const articleBodyH2Css = css` - ${headline.xxsmall({ fontWeight: 'bold' })}; + ${headlineBold20}; margin: ${space[6]}px 0 ${space[2]}px; b { font-weight: 700; @@ -252,7 +252,7 @@ const ArticleBody = (props: ArticleBodyProps) => { const articleFeedbackWidgetCss = css` display: flex; flex-direction: column; - border: 1px solid ${neutral[86]}; + border: 1px solid ${palette.neutral[86]}; padding: ${space[4]}px ${space[3]}px; margin: 36px 0 48px; ${from.desktop} { @@ -265,7 +265,7 @@ const articleFeedbackWidgetCss = css` } & p { margin: 0; - ${textSans.medium({ fontWeight: 'bold' })} + ${textSansBold17}; } & .buttonDiv { min-height: 36px; @@ -282,7 +282,7 @@ const articleFeedbackWidgetCss = css` } } & p { - ${textSans.small({ fontWeight: 'regular' })} + ${textSans15}; } } `; diff --git a/client/components/helpCentre/HelpCentreContactOptions.tsx b/client/components/helpCentre/HelpCentreContactOptions.tsx index cf307c516..39dd9de9a 100644 --- a/client/components/helpCentre/HelpCentreContactOptions.tsx +++ b/client/components/helpCentre/HelpCentreContactOptions.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; import { from, - headline, - neutral, + headlineBold28, + palette, space, - textSans, + textSans17, } from '@guardian/source/foundations'; import { Button } from '@guardian/source/react-components'; import { useState } from 'react'; @@ -23,9 +23,9 @@ interface HelpCentreContactOptionsProps { } const baseSubtitleStyles = css` - border-top: 1px solid ${neutral['86']}; + border-top: 1px solid ${palette.neutral['86']}; margin-top: 30px; - ${headline.small({ fontWeight: 'bold' })}; + ${headlineBold28}; `; const subtitleStyles = css` @@ -47,7 +47,7 @@ const liveChatSubtitleStyles = css` `; const emailAndLiveChatSubheadingCss = css` - ${textSans.medium()}; + ${textSans17}; margin-bottom: ${space[1]}px; max-width: 320px; ${from.tablet} { diff --git a/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx b/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx index 865156e9c..1b350a9d8 100644 --- a/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx +++ b/client/components/helpCentre/HelpCentreEmailAndLiveChat.tsx @@ -1,5 +1,11 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source/foundations'; +import { + from, + palette, + space, + textSans17, + textSansBold20, +} from '@guardian/source/foundations'; import type { ReactNode } from 'react'; import { useState } from 'react'; import { ErrorIcon } from '../mma/shared/assets/ErrorIcon'; @@ -19,14 +25,14 @@ const contactBoxContainerCss = css` display: flex; flex-direction: column; border: 1px solid ${palette.neutral[86]}; - ${textSans.medium()}; + ${textSans17}; ${from.phablet} { width: calc(50% - ${space[5] / 2}px); } `; const contactBoxHeadingCss = css` - ${textSans.large({ fontWeight: 'bold' })}; + ${textSansBold20}; color: ${palette.neutral[20]}; position: relative; margin: 0; diff --git a/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx b/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx index abf0f28c9..7f4959c55 100644 --- a/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx +++ b/client/components/helpCentre/HelpCentreLandingMoreTopics.tsx @@ -1,5 +1,10 @@ import { css } from '@emotion/react'; -import { neutral, space, textSans, until } from '@guardian/source/foundations'; +import { + palette, + space, + textSans14, + until, +} from '@guardian/source/foundations'; import { useState } from 'react'; import { Link } from 'react-router-dom'; import { trackEvent } from '../../utilities/analytics'; @@ -22,7 +27,7 @@ const moreTopicsStyles = css({ }); const showHideCss = css` - ${textSans.xsmall()}; + ${textSans14}; margin-left: ${space[3]}px; ${until.mobileMedium} { display: none; @@ -31,7 +36,7 @@ const showHideCss = css` const liStyles = (index: number, length: number) => css` ${innerSectionDivCss}; - ${index < length - 1 && `border-bottom: 1px solid ${neutral[86]}`}; + ${index < length - 1 && `border-bottom: 1px solid ${palette.neutral[86]}`}; `; export const HelpCentreLandingMoreTopics = () => { diff --git a/client/components/helpCentre/HelpCentreMoreTopics.tsx b/client/components/helpCentre/HelpCentreMoreTopics.tsx index 257d0404b..bb7a3f724 100644 --- a/client/components/helpCentre/HelpCentreMoreTopics.tsx +++ b/client/components/helpCentre/HelpCentreMoreTopics.tsx @@ -1,5 +1,10 @@ import { css } from '@emotion/react'; -import { neutral, space, textSans, until } from '@guardian/source/foundations'; +import { + palette, + space, + textSans14, + until, +} from '@guardian/source/foundations'; import { useState } from 'react'; import { Link } from 'react-router-dom'; import { trackEvent } from '../../utilities/analytics'; @@ -22,7 +27,7 @@ const moreTopicsStyles = css` `; const showHideCss = css` - ${textSans.xsmall()}; + ${textSans14}; margin-left: ${space[3]}px; ${until.mobileMedium} { display: none; @@ -31,7 +36,7 @@ const showHideCss = css` const liStyles = (index: number, length: number) => css` ${innerSectionDivCss}; - ${index < length - 1 && `border-bottom: 1px solid ${neutral[86]}`}; + ${index < length - 1 && `border-bottom: 1px solid ${palette.neutral[86]}`}; `; interface HelpCentreMoreTopicsProps { @@ -43,8 +48,8 @@ export const HelpCentreMoreTopics = (props: HelpCentreMoreTopicsProps) => { const [openSection, setOpenSection] = useState(); const moreTopicContainterCss = css` width: 100%; - border-top: 1px solid ${neutral['86']}; - border-bottom: 1px solid ${neutral['86']}; + border-top: 1px solid ${palette.neutral['86']}; + border-bottom: 1px solid ${palette.neutral['86']}; `; return ( <> diff --git a/client/components/helpCentre/HelpCentreNav.tsx b/client/components/helpCentre/HelpCentreNav.tsx index c55659915..809ee87c7 100644 --- a/client/components/helpCentre/HelpCentreNav.tsx +++ b/client/components/helpCentre/HelpCentreNav.tsx @@ -1,9 +1,10 @@ import { css } from '@emotion/react'; import { from, - neutral, + palette, space, - textSans, + textSans17, + textSansBold20, until, } from '@guardian/source/foundations'; import { useState } from 'react'; @@ -33,25 +34,27 @@ const desktopUlCss = css` `; const desktopLiCss = (isSelectedTopic: boolean, isFirstTopic: boolean) => css` - ${textSans.medium()}; - color: ${neutral['7']}; + ${textSans17}; + color: ${palette.neutral['7']}; border-left: ${isSelectedTopic ? `${space[2]}px solid #121212` : `${space[2]}px solid #dcdcdc`}; font-weight: ${isSelectedTopic ? '700' : 'normal'}; cursor: pointer; :hover { - background-color: ${isSelectedTopic ? 'transparent' : neutral['93']}; + background-color: ${isSelectedTopic + ? 'transparent' + : palette.neutral['93']}; } ::after { content: ''; display: block; - border-bottom: 1px solid ${neutral['86']}; + border-bottom: 1px solid ${palette.neutral['86']}; } ::before { content: ''; display: ${isFirstTopic ? 'block' : 'none'}; - border-top: 1px solid ${neutral['86']}; + border-top: 1px solid ${palette.neutral['86']}; } `; @@ -68,7 +71,7 @@ const mobileLiCss = (topicIndex: number) => css` const divCss = css` width: 100%; - border: 1px solid ${neutral['86']}; + border: 1px solid ${palette.neutral['86']}; ${from.desktop} { display: none; } @@ -89,7 +92,7 @@ export const HelpCentreNav = (props: HelpCentreNavProps) => { const h2Css = css` ${sectionTitleCss(open, false)}; - ${textSans.large({ fontWeight: 'bold' })}; + ${textSansBold20}; ${from.tablet} { padding: ${space[3]}px ${space[3] * 2 + 15}px ${space[3]}px ${space[5]}px; diff --git a/client/components/helpCentre/HelpCentrePhoneNumbers.tsx b/client/components/helpCentre/HelpCentrePhoneNumbers.tsx index 4257f07a9..7830c9471 100644 --- a/client/components/helpCentre/HelpCentrePhoneNumbers.tsx +++ b/client/components/helpCentre/HelpCentrePhoneNumbers.tsx @@ -1,17 +1,23 @@ import { css } from '@emotion/react'; -import { from, neutral, space, textSans } from '@guardian/source/foundations'; +import { + from, + palette, + space, + textSans17, + textSansBold20, +} from '@guardian/source/foundations'; import { getHelpSectionIcon } from '../mma/shared/assets/HelpSectionIcons'; import { CallCentreEmailAndNumbers } from '../shared/CallCenterEmailAndNumbers'; const containerCss = css` - border-top: 1px solid ${neutral['86']}; - border-left: 1px solid ${neutral['86']}; - border-right: 1px solid ${neutral['86']}; + border-top: 1px solid ${palette.neutral['86']}; + border-left: 1px solid ${palette.neutral['86']}; + border-right: 1px solid ${palette.neutral['86']}; `; const headingCss = css` - ${textSans.large({ fontWeight: 'bold' })}; - color: ${neutral[20]}; + ${textSansBold20}; + color: ${palette.neutral[20]}; position: relative; margin: 0; padding: 18px 0 18px 60px; @@ -38,7 +44,7 @@ const headingIconWideCss = css` const subtitleCss = css` display: none; - ${textSans.medium()}; + ${textSans17}; padding: 0 ${space[4]}px ${space[4]}px ${space[4]}px; margin: 0; `; diff --git a/client/components/helpCentre/HelpCentreStyles.tsx b/client/components/helpCentre/HelpCentreStyles.tsx index 5c9b42d8f..4d012eeb1 100644 --- a/client/components/helpCentre/HelpCentreStyles.tsx +++ b/client/components/helpCentre/HelpCentreStyles.tsx @@ -1,19 +1,19 @@ import { css } from '@emotion/react'; import { from, - headline, - neutral, + headlineBold28, + palette, space, - textSans, + textSans17, } from '@guardian/source/foundations'; export const linkAnchorStyle = css` display: inline-block; width: 100%; - ${textSans.medium()}; - color: ${neutral['7']}; + ${textSans17}; + color: ${palette.neutral['7']}; :visited { - color: ${neutral['7']}; + color: ${palette.neutral['7']}; } `; @@ -21,8 +21,8 @@ export const linkArrowStyle = css` display: block; width: 7px; height: 7px; - border-top: 2px solid ${neutral['7']}; - border-right: 2px solid ${neutral['7']}; + border-top: 2px solid ${palette.neutral['7']}; + border-right: 2px solid ${palette.neutral['7']}; position: absolute; top: 50%; transform: translateY(-50%) rotate(45deg); @@ -37,13 +37,13 @@ export const linksListStyle = css` export const linkListItemStyle = css` padding: ${space[3]}px ${space[5]}px ${space[3]}px 0; - border-bottom: 1px solid ${neutral['86']}; + border-bottom: 1px solid ${palette.neutral['86']}; position: relative; `; export const containterCss = css` width: 100%; - border: 1px solid ${neutral['86']}; + border: 1px solid ${palette.neutral['86']}; `; export const sectionTitleCss = ( @@ -53,8 +53,8 @@ export const sectionTitleCss = ( display: flex; justify-content: space-between; align-items: center; - color: ${neutral['7']}; - ${textSans.medium()}; + color: ${palette.neutral['7']}; + ${textSans17}; margin: 0; padding: ${space[4]}px 14px ${space[4]}px ${space[3]}px; ${from.desktop} { @@ -67,8 +67,8 @@ export const sectionTitleCss = ( display: block; width: 7px; height: 7px; - border-top: 2px solid ${neutral['7']}; - border-right: 2px solid ${neutral['7']}; + border-top: 2px solid ${palette.neutral['7']}; + border-right: 2px solid ${palette.neutral['7']}; position: absolute; top: 50%; transform: translateY(${isOpen ? '-10%' : '-50%'}) @@ -89,13 +89,13 @@ export const sectionTitleCss = ( left: 0px; width: 100%; height: 1px; - background-color: ${neutral['86']} + background-color: ${palette.neutral['86']} } `} `; export const innerSectionDivCss = css` - ${textSans.medium()}; + ${textSans17}; margin-bottom: 0; padding: ${space[4]}px ${space[5]}px ${space[4]}px 0; margin: 0 ${space[3]}px; @@ -108,15 +108,15 @@ export const innerSectionCss = (isOpen: boolean) => css` padding: 0; list-style: none; background-color: rgba(193, 216, 252, 0.3); - border-top: 1px solid ${neutral[86]}; + border-top: 1px solid ${palette.neutral[86]}; `; export const h2Css = css` margin-top: 0; margin-bottom: ${space[6]}px; padding-top: 2px; - border-top: 1px solid ${neutral['86']}; - ${headline.small({ fontWeight: 'bold' })}; + border-top: 1px solid ${palette.neutral['86']}; + ${headlineBold28}; ${from.desktop} { font-size: 32px; } diff --git a/client/components/helpCentre/HelpTopicBox.tsx b/client/components/helpCentre/HelpTopicBox.tsx index d459bfef2..9eefd0a30 100644 --- a/client/components/helpCentre/HelpTopicBox.tsx +++ b/client/components/helpCentre/HelpTopicBox.tsx @@ -1,5 +1,10 @@ import { css } from '@emotion/react'; -import { from, neutral, space, textSans } from '@guardian/source/foundations'; +import { + from, + palette, + space, + textSansBold17, +} from '@guardian/source/foundations'; import { Button } from '@guardian/source/react-components'; import { Link, useNavigate } from 'react-router-dom'; import { trackEvent } from '../../utilities/analytics'; @@ -17,7 +22,7 @@ interface HelpTopicBoxProps { } const boxHolderStyle = css` - border: 1px solid ${neutral['86']}; + border: 1px solid ${palette.neutral['86']}; flex-basis: 100%; display: flex; flex-direction: column; @@ -33,12 +38,12 @@ const boxHolderStyle = css` `; const boxTitleStyle = css` - ${textSans.medium({ fontWeight: 'bold' })}; + ${textSansBold17}; color: #333333; position: relative; margin: 0; padding: 18px 0 18px 60px; - border-bottom: 1px solid ${neutral['86']}; + border-bottom: 1px solid ${palette.neutral['86']}; width: 100%; `; diff --git a/client/components/helpCentre/KnownIssues.tsx b/client/components/helpCentre/KnownIssues.tsx index 8b7a61f3c..adf00b409 100644 --- a/client/components/helpCentre/KnownIssues.tsx +++ b/client/components/helpCentre/KnownIssues.tsx @@ -4,7 +4,8 @@ import { from, palette, space, - textSans, + textSans17, + textSansBold17, } from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import type { MembersDataApiResponse } from '../../../shared/productResponse'; @@ -127,13 +128,13 @@ export const KnownIssues = (props: KnownIssuesProp) => { `; const h4Css = css` - ${textSans.medium({ fontWeight: 'bold' })}; + ${textSansBold17}; color: ${palette.error[400]}; margin: 0; `; const aCss = css` - ${textSans.medium()}; + ${textSans17}; text-decoration: underline; color: ${palette.neutral[0]}; `; diff --git a/client/components/helpCentre/contactUs/ContactUs.tsx b/client/components/helpCentre/contactUs/ContactUs.tsx index 0e4860950..5b23bf016 100644 --- a/client/components/helpCentre/contactUs/ContactUs.tsx +++ b/client/components/helpCentre/contactUs/ContactUs.tsx @@ -1,10 +1,10 @@ import { css } from '@emotion/react'; import { from, - headline, - neutral, + headlineBold20, + palette, space, - textSans, + textSans17, } from '@guardian/source/foundations'; import { captureException } from '@sentry/browser'; import { useNavigate, useParams } from 'react-router-dom'; @@ -167,9 +167,9 @@ export const ContactUs = () => {

{

diff --git a/client/components/helpCentre/contactUs/SelfServicePrompt.tsx b/client/components/helpCentre/contactUs/SelfServicePrompt.tsx index aa351ce71..b96ad1985 100644 --- a/client/components/helpCentre/contactUs/SelfServicePrompt.tsx +++ b/client/components/helpCentre/contactUs/SelfServicePrompt.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { brand, space, textSans } from '@guardian/source/foundations'; +import { palette, space, textSansBold17 } from '@guardian/source/foundations'; import { LinkButton } from '@guardian/source/react-components'; import { trackEvent } from '../../../utilities/analytics'; import { InfoIconDark } from '../../mma/shared/assets/InfoIconDark'; @@ -19,8 +19,8 @@ interface SelfServicePromptProps { export const SelfServicePrompt = (props: SelfServicePromptProps) => { const divCss = css` display: block; - ${textSans.medium({ fontWeight: 'bold' })}; - border: 4px solid ${brand[500]}; + ${textSansBold17}; + border: 4px solid ${palette.brand[500]}; padding: ${space[5]}px ${space[5]}px ${space[5]}px 53px; margin: ${space[3]}px 0; position: relative; @@ -37,7 +37,7 @@ export const SelfServicePrompt = (props: SelfServicePromptProps) => { margin-top: ${space[5]}px; text-decoration: underline; font-weight: normal; - color: ${brand[500]}; + color: ${palette.brand[500]}; `; const onServicelinkClick = () => @@ -58,7 +58,7 @@ export const SelfServicePrompt = (props: SelfServicePromptProps) => { left: ${space[5]}px; `} > - + {props.copy.map((paragraph, index) => (

diff --git a/client/components/helpCentre/contactUs/SubTopicForm.tsx b/client/components/helpCentre/contactUs/SubTopicForm.tsx index b9a10d573..aae002240 100644 --- a/client/components/helpCentre/contactUs/SubTopicForm.tsx +++ b/client/components/helpCentre/contactUs/SubTopicForm.tsx @@ -1,5 +1,11 @@ import { css } from '@emotion/react'; -import { from, neutral, space, textSans } from '@guardian/source/foundations'; +import { + from, + palette, + space, + textSans17, + textSansBold17, +} from '@guardian/source/foundations'; import { Button, Radio, RadioGroup } from '@guardian/source/react-components'; import type { ChangeEvent, FormEvent } from 'react'; import { useState } from 'react'; @@ -35,7 +41,7 @@ export const SubTopicForm = (props: SubTopicFormProps) => { >

{ margin: 0; padding: ${space[3]}px; float: left; - background-color: ${neutral['97']}; - border-bottom: 1px solid ${neutral['86']}; - ${textSans.medium({ fontWeight: 'bold' })}; + background-color: ${palette.neutral['97']}; + border-bottom: 1px solid ${palette.neutral['86']}; + ${textSansBold17}; ${from.tablet} { padding: ${space[3]}px ${space[5]}px; } @@ -79,7 +85,7 @@ export const SubTopicForm = (props: SubTopicFormProps) => {
  • ( border-radius: 4px; background-color: ${props.isSelected ? '#e3f6ff' : '#F6F6F6'}; padding: ${space[5]}px ${space[3]}px; - ${textSans.medium({ fontWeight: 'bold' })}; + ${textSansBold17}; color: #052962; text-align: center; cursor: ${props.isSelected ? 'auto' : 'pointer'}; diff --git a/client/components/helpCentre/contactUs/TopicForm.tsx b/client/components/helpCentre/contactUs/TopicForm.tsx index 58c4f6b38..90a7ec2c4 100644 --- a/client/components/helpCentre/contactUs/TopicForm.tsx +++ b/client/components/helpCentre/contactUs/TopicForm.tsx @@ -1,5 +1,10 @@ import { css } from '@emotion/react'; -import { from, headline, neutral, space } from '@guardian/source/foundations'; +import { + from, + headlineBold20, + palette, + space, +} from '@guardian/source/foundations'; import { Button } from '@guardian/source/react-components'; import { useState } from 'react'; import type { Topic } from '../../../../shared/contactUsTypes'; @@ -24,8 +29,8 @@ export const TopicForm = (props: TopicFormProps) => { <>

    { css={css` display: block; color: ${palette.neutral['7']}; - ${textSans.medium()}; - font-weight: bold; + ${textSansBold17}; ${props.additionalCss} `} > @@ -113,8 +111,8 @@ export const UploadFileInput = (props: UploadFileUploadProps) => { align-items: center; box-sizing: border-box; border: none; - background-color: ${background.ctaSecondary}; - color: ${text.ctaSecondary}; + background-color: ${palette.brand[800]}; + color: ${palette.brand[400]}; cursor: pointer; transition: ${transitions.medium}; text-decoration: none; @@ -123,7 +121,9 @@ export const UploadFileInput = (props: UploadFileUploadProps) => { ${focusHalo}; } &:hover { - background-color: ${background.ctaSecondaryHover}; + background-color: ${Color(palette.brand[800], 'hex') + .darken(0.1) + .string()}; } `} > diff --git a/client/components/helpCentre/contactUs/contactUsForm.tsx b/client/components/helpCentre/contactUs/contactUsForm.tsx index b6cdceaa9..93ee71241 100644 --- a/client/components/helpCentre/contactUs/contactUsForm.tsx +++ b/client/components/helpCentre/contactUs/contactUsForm.tsx @@ -1,6 +1,13 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { from, palette, space, textSans } from '@guardian/source/foundations'; +import { + from, + palette, + space, + textSans15, + textSans17, + textSansBold17, +} from '@guardian/source/foundations'; import { Button } from '@guardian/source/react-components'; import type { ChangeEvent, FormEvent } from 'react'; import { useEffect, useState } from 'react'; @@ -228,7 +235,7 @@ export const ContactUsForm = (props: ContactUsFormProps) => { float: left; background-color: ${palette.neutral[97]}; border-bottom: 1px solid ${palette.neutral[86]}; - ${textSans.medium({ fontWeight: 'bold' })}; + ${textSansBold17}; ${from.tablet} { padding: ${space[3]}px ${space[5]}px; } @@ -238,7 +245,7 @@ export const ContactUsForm = (props: ContactUsFormProps) => {

    { setName(newName.substr(0, 50))} + changeSetState={(newName) => + setName(newName.substring(0, 50)) + } value={name} additionalCss={css` margin: ${space[5]}px; @@ -272,7 +281,7 @@ export const ContactUsForm = (props: ContactUsFormProps) => { secondaryLabel="If you are contacting us regarding an account you hold with us you must use the email you registered with" width={50} changeSetState={(newEmail) => - setEmail(newEmail.substr(0, 50)) + setEmail(newEmail.substring(0, 50)) } value={email} additionalCss={css` @@ -290,7 +299,7 @@ export const ContactUsForm = (props: ContactUsFormProps) => { type="text" width={50} changeSetState={(newSubject) => - setSubject(newSubject.substr(0, 100)) + setSubject(newSubject.substring(0, 100)) } value={subject} additionalCss={css` @@ -307,7 +316,7 @@ export const ContactUsForm = (props: ContactUsFormProps) => { css={css` display: block; color: ${palette.neutral[7]}; - ${textSans.medium({ fontWeight: 'bold' })}; + ${textSansBold17}; max-width: 50ch; margin: ${space[5]}px; `} @@ -327,7 +336,7 @@ export const ContactUsForm = (props: ContactUsFormProps) => { css={css` display: block; color: ${palette.neutral[7]}; - ${textSans.medium({ fontWeight: 'bold' })}; + ${textSansBold17}; max-width: 50ch; margin: ${space[5]}px; `} @@ -372,14 +381,14 @@ export const ContactUsForm = (props: ContactUsFormProps) => { : `2px solid ${palette.neutral[60]}`}; padding: 12px; resize: vertical; - ${textSans.medium()}; + ${textSans17}; `} /> @@ -439,8 +448,7 @@ export const ContactUsForm = (props: ContactUsFormProps) => { css={css` display: block; color: ${palette.error[400]}; - ${textSans.medium({ fontWeight: 'bold' })}; - font-weight: normal; + ${textSans17}; `} > { @@ -20,14 +26,14 @@ export const LiveChatPrivacyNotice = () => { `; const titleCss = css` margin: 0; - ${textSans.small({ fontWeight: 'bold' })}; + ${textSansBold15}; `; const paragraphCss = css` - ${textSans.small()}; + ${textSans15}; max-width: 830px; margin: 0; a { - color: ${brand[500]}; + color: ${palette.brand[500]}; text-decoration: underline; } `; @@ -60,8 +66,8 @@ export const LiveChatPrivacyNoticeLink = () => { margin-bottom: ${space[2]}px; text-align: right; a { - ${textSans.small()}; - color: ${brand[500]}; + ${textSans15}; + color: ${palette.brand[500]}; text-decoration: underline; } `; diff --git a/client/components/helpCentre/liveChat/liveChatCssOverrides.ts b/client/components/helpCentre/liveChat/liveChatCssOverrides.ts index 2a78bc243..3e8205bc7 100644 --- a/client/components/helpCentre/liveChat/liveChatCssOverrides.ts +++ b/client/components/helpCentre/liveChat/liveChatCssOverrides.ts @@ -1,9 +1,8 @@ import { css } from '@emotion/react'; import { - brand, - neutral, + palette, space, - textSans, + textSans14, until, } from '@guardian/source/foundations'; @@ -53,12 +52,12 @@ export const liveChatCss = css` } .waitingStateButtonContainer .waitingCancelChat { border-radius: 0; - border: 1px solid ${brand['500']}; - background-color: ${neutral['100']}; + border: 1px solid ${palette.brand['500']}; + background-color: ${palette.neutral['100']}; font-weight: bold; } .waitingStateButtonContainer .waitingCancelChat .label { - color: ${brand['500']}; + color: ${palette.brand['500']}; } .waitingStateButtonContainer .waitingCancelChat:focus { text-decoration: none; @@ -102,36 +101,36 @@ export const liveChatCss = css` border-radius: 0; } .dialogButtonContainer button:nth-of-type(odd) { - background: ${brand['500']}; + background: ${palette.brand['500']}; } .dialogButtonContainer button:nth-of-type(odd):hover { - background: ${brand['400']}; + background: ${palette.brand['400']}; } .dialogButtonContainer button .label { font-weight: bold; } .dialogButtonContainer button:nth-of-type(odd) .label { - color: ${neutral['100']}; + color: ${palette.neutral['100']}; } .dialogButtonContainer button:nth-of-type(odd):focus { text-decoration: none; } .dialogButtonContainer button:nth-of-type(even) { - border: 1px solid ${brand['500']}; - background: ${neutral['100']}; + border: 1px solid ${palette.brand['500']}; + background: ${palette.neutral['100']}; } .embeddedServiceSidebarButton.uiButton--inverse:not(:disabled):focus, .embeddedServiceSidebarButton.uiButton--inverse:not(:disabled):hover { - background: ${neutral['100']}; + background: ${palette.neutral['100']}; } .dialogButtonContainer button:nth-of-type(even):hover { - border: 1px solid ${brand['400']}; + border: 1px solid ${palette.brand['400']}; } .dialogButtonContainer button:nth-of-type(even) span { - color: ${brand['500']}; + color: ${palette.brand['500']}; } .dialogButtonContainer button:nth-of-type(even):hover span { - color: ${brand['400']}; + color: ${palette.brand['400']}; } .embeddedServiceLiveAgentStateWaiting .embeddedServiceLoadingBalls { align-self: normal; @@ -144,14 +143,13 @@ export const liveChatCss = css` .dialogTextContainer #dialogTextTitle, .dialogTextContainer #dialogTextBody, .prechat--no-agents-msg-holder p { - ${textSans.medium()}; + ${textSans14}; text-align: left; - color: ${neutral['46']}; - font-size: 14px; + color: ${palette.neutral['46']}; padding: 0; } .prechat--no-agents-msg-holder p a { - color: ${brand['500']}; + color: ${palette.brand['500']}; } .waitingStateContent .waitingGreetingContent, .dialogTextContainer { @@ -171,7 +169,7 @@ export const liveChatCss = css` text-align: left; margin-left: 0; margin-right: 0; - color: ${neutral['46']}; + color: ${palette.neutral['46']}; } .endChatContainer button { font-weight: bold; @@ -180,21 +178,21 @@ export const liveChatCss = css` margin-top: ${space[3]}px; } .endChatContainer button:nth-of-type(even) .label { - color: ${brand['500']}; + color: ${palette.brand['500']}; text-decoration: underline; } .endChatContainer .endChatButton:focus { - background: ${brand['500']}; + background: ${palette.brand['500']}; text-decoration: none; } .embeddedServiceLiveAgentStateChatEventMessage .eventMessage, .messageArea .chatSessionStartTime { font-size: 13px; - color: ${neutral['46']}; + color: ${palette.neutral['46']}; } .chatContent .chat-content.agent a { - color: ${neutral['100']}; + color: ${palette.neutral['100']}; text-decoration: underline; } `; diff --git a/client/components/mma/Page.tsx b/client/components/mma/Page.tsx index f45bc693b..3dac3fb85 100644 --- a/client/components/mma/Page.tsx +++ b/client/components/mma/Page.tsx @@ -2,10 +2,11 @@ import { css } from '@emotion/react'; import { breakpoints, from, - headline, + headlineBold24, + headlineBold42, palette, space, - textSans, + textSansBold15, } from '@guardian/source/foundations'; import type { ReactElement } from 'react'; import { useContext, useEffect } from 'react'; @@ -92,7 +93,7 @@ const PageHeaderContainer = (props: PageHeaderContainerProps) => { `; const titleCss = css` - ${headline.xsmall({ fontWeight: 'bold' })}; + ${headlineBold24}; font-size: 1.4375rem; grid-column: 1 / -1; margin-top: 28px; @@ -101,7 +102,7 @@ const PageHeaderContainer = (props: PageHeaderContainerProps) => { ${props.compactTitle && ` - ${textSans.small({ fontWeight: 'bold' })}; + ${textSansBold15}; margin-top: ${space[1]}px; margin-bottom: ${space[1]}px; `} @@ -113,14 +114,14 @@ const PageHeaderContainer = (props: PageHeaderContainerProps) => { ${from.tablet} { ${props.compactTitle && ` - ${headline.xsmall({ fontWeight: 'bold' })}; + ${headlineBold24}; margin-top: 28px; margin-bottom: ${space[2]}px; `} } ${from.desktop} { - ${headline.large({ fontWeight: 'bold' })}; + ${headlineBold42}; grid-column: 5 / span 8; margin: 0; padding: ${space[1]}px ${space[2]}px; diff --git a/client/components/mma/accountoverview/AccountOverview.tsx b/client/components/mma/accountoverview/AccountOverview.tsx index c3684f50f..7be6c3d78 100644 --- a/client/components/mma/accountoverview/AccountOverview.tsx +++ b/client/components/mma/accountoverview/AccountOverview.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/react'; import { - headline, + headlineBold28, palette, space, - textSans, + textSans17, until, } from '@guardian/source/foundations'; import { Stack } from '@guardian/source/react-components'; @@ -64,7 +64,7 @@ type AccountOverviewResponse = [ const subHeadingCss = css` margin: ${space[12]}px 0 ${space[6]}px; border-top: 1px solid ${palette.neutral['86']}; - ${headline.small({ fontWeight: 'bold' })}; + ${headlineBold28}; ${until.tablet} { font-size: 1.25rem; line-height: 1.6; @@ -241,7 +241,7 @@ const AccountOverviewPage = ({ isFromApp }: IsFromAppProps) => {

    { diff --git a/client/components/mma/accountoverview/EmptyAccountOverview.tsx b/client/components/mma/accountoverview/EmptyAccountOverview.tsx index 9ad451550..66af5696e 100644 --- a/client/components/mma/accountoverview/EmptyAccountOverview.tsx +++ b/client/components/mma/accountoverview/EmptyAccountOverview.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/react'; import { - headline, + headlineBold28, palette, space, - textSans, + textSans17, until, } from '@guardian/source/foundations'; import { useState } from 'react'; @@ -26,8 +26,7 @@ export const EmptyAccountOverview = () => { css={css` margin-top: 50px; border-top: 1px solid ${palette.neutral['86']}; - ${headline.small()}; - font-weight: bold; + ${headlineBold28}; ${until.tablet} { font-size: 1.25rem; line-height: 1.6; @@ -38,7 +37,7 @@ export const EmptyAccountOverview = () => {

    When you subscribe or contribute, you’ll be able to see your @@ -48,7 +47,7 @@ export const EmptyAccountOverview = () => {

    {

    @@ -110,7 +109,7 @@ export const EmptyAccountOverview = () => { css={css` margin: 0; padding: 0; - ${textSans.medium()} + ${textSans17}; `} > If you are already supporting the Guardian, it may be linked diff --git a/client/components/mma/accountoverview/InAppPurchaseCard.tsx b/client/components/mma/accountoverview/InAppPurchaseCard.tsx index 90a8d42d4..0faeb5f25 100644 --- a/client/components/mma/accountoverview/InAppPurchaseCard.tsx +++ b/client/components/mma/accountoverview/InAppPurchaseCard.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, textSans } from '@guardian/source/foundations'; +import { space, textSans17 } from '@guardian/source/foundations'; import { Button, Stack } from '@guardian/source/react-components'; import { InfoSummary } from '@guardian/source-development-kitchen/react-components'; import { capitalize } from 'lodash'; @@ -78,7 +78,7 @@ export const InAppPurchaseCard = ({ >

    You have unlimited access to the Guardian{' '} diff --git a/client/components/mma/accountoverview/ManageProduct.tsx b/client/components/mma/accountoverview/ManageProduct.tsx index e1bbf0671..442146385 100644 --- a/client/components/mma/accountoverview/ManageProduct.tsx +++ b/client/components/mma/accountoverview/ManageProduct.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/react'; import { - headline, + headlineBold28, palette, space, - textSans, + textSans17, until, } from '@guardian/source/foundations'; import { useState } from 'react'; @@ -56,8 +56,7 @@ import { SixForSixExplainerIfApplicable } from './SixForSixExplainer'; import { UpdateAmount } from './updateAmount/UpdateAmount'; const subHeadingTitleCss = ` - ${headline.small()}; - font-weight: bold; + ${headlineBold28}; ${until.tablet} { font-size: 1.25rem; line-height: 1.6; @@ -146,7 +145,7 @@ const InnerContent = ({ {hasCancellationPending && (

    @@ -193,7 +192,7 @@ const InnerContent = ({

    • Check delivery history and report an issue. @@ -317,7 +316,7 @@ const InnerContent = ({

    Don’t fret - you can manage your suspensions by @@ -349,7 +348,7 @@ const InnerContent = ({

    To renew this one-off{' '} @@ -359,7 +358,7 @@ const InnerContent = ({

    Alternatively, if you would prefer to start a @@ -407,7 +406,7 @@ const CancellationCTA = (props: CancellationCTAProps) => {

    diff --git a/client/components/mma/accountoverview/NewsletterOptinSection.tsx b/client/components/mma/accountoverview/NewsletterOptinSection.tsx index 56813947c..c5806bb86 100644 --- a/client/components/mma/accountoverview/NewsletterOptinSection.tsx +++ b/client/components/mma/accountoverview/NewsletterOptinSection.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral, space, textSans } from '@guardian/source/foundations'; +import { palette, space, textSans17 } from '@guardian/source/foundations'; import { Button, Checkbox } from '@guardian/source/react-components'; import * as Sentry from '@sentry/browser'; import type { ChangeEvent, FormEvent } from 'react'; @@ -158,7 +158,7 @@ export const NewsletterOptinSection = (props: NewsletterOptinSectionProps) => {

    {newsletter.description} @@ -170,7 +170,7 @@ export const NewsletterOptinSection = (props: NewsletterOptinSectionProps) => {

    diff --git a/client/components/mma/accountoverview/PersonalisedHeader.tsx b/client/components/mma/accountoverview/PersonalisedHeader.tsx index d9a0fed04..096b61503 100644 --- a/client/components/mma/accountoverview/PersonalisedHeader.tsx +++ b/client/components/mma/accountoverview/PersonalisedHeader.tsx @@ -1,5 +1,9 @@ import { css } from '@emotion/react'; -import { headline, space } from '@guardian/source/foundations'; +import { + headlineBold42, + headlineMedium17, + space, +} from '@guardian/source/foundations'; import { min } from 'date-fns'; import { dateString } from '@/shared/dates'; import type { MPAPIResponse } from '@/shared/mpapiResponse'; @@ -54,7 +58,7 @@ export const PersonalisedHeader = ({ >

    Thank you for funding the Guardian since {supportStartYear} diff --git a/client/components/mma/accountoverview/ProductCard.tsx b/client/components/mma/accountoverview/ProductCard.tsx index dfc18de10..ee7a23beb 100644 --- a/client/components/mma/accountoverview/ProductCard.tsx +++ b/client/components/mma/accountoverview/ProductCard.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans } from '@guardian/source/foundations'; +import { palette, textSans17 } from '@guardian/source/foundations'; import { Button, Stack, @@ -49,7 +49,7 @@ const PaymentMethod = ({ }) => (

    @@ -165,7 +165,7 @@ export const ProductCard = ({ productCardConfiguration[specificProductType.productType]; const benefitsTextCss = css` - ${textSans.medium()} + ${textSans17}; margin: 0; max-width: 35ch; `; @@ -456,7 +456,7 @@ export const ProductCard = ({

    Payment

    diff --git a/client/components/mma/accountoverview/ProductCardStyles.ts b/client/components/mma/accountoverview/ProductCardStyles.ts index eb5b1b2e5..943e9ee62 100644 --- a/client/components/mma/accountoverview/ProductCardStyles.ts +++ b/client/components/mma/accountoverview/ProductCardStyles.ts @@ -1,21 +1,28 @@ import { css } from '@emotion/react'; -import { from, headline, space, textSans } from '@guardian/source/foundations'; +import { + from, + headlineBold20, + headlineBold28, + space, + textSans17, + textSansBold17, +} from '@guardian/source/foundations'; import { textColour } from './ProductCardConfiguration'; export const productCardTitleCss = (dark?: boolean) => css` - ${headline.xxsmall({ fontWeight: 'bold' })}; + ${headlineBold20}; color: ${dark ? textColour.dark : textColour.light}; margin-top: 0; margin-bottom: ${space[1]}px; max-width: calc(100% - 97px); // Leave space for gift ribbon ${from.tablet} { - ${headline.small({ fontWeight: 'bold' })}; + ${headlineBold28}; } `; export const sectionHeadingCss = css` - ${textSans.medium({ fontWeight: 'bold' })}; + ${textSansBold17}; margin-top: 0; margin-bottom: ${space[2]}px; `; @@ -37,7 +44,7 @@ export const productDetailLayoutCss = css` `; export const keyValueCss = css` - ${textSans.medium()}; + ${textSans17}; margin: 0; div + div { diff --git a/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx b/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx index bceb2491d..a4b44a1ec 100644 --- a/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx +++ b/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx @@ -1,9 +1,11 @@ import { css } from '@emotion/react'; import { - headline, + headlineBold20, + headlineBold34, palette, space, - textSans, + textSans17, + textSansBold17, until, } from '@guardian/source/foundations'; import { @@ -52,11 +54,9 @@ import { } from '@/shared/productTypes'; const subHeadingTitleCss = ` - ${headline.medium()}; - font-weight: bold; + ${headlineBold34}; ${until.tablet} { - ${headline.xxsmall()}; - font-weight: bold; + ${headlineBold20}; }; `; const subHeadingBorderTopCss = ` @@ -128,7 +128,7 @@ const InnerContent = ({ {hasCancellationPending && (

    @@ -153,7 +153,7 @@ const InnerContent = ({

    Payment diff --git a/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx b/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx index 8c48ec219..b5e05c5e0 100644 --- a/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx +++ b/client/components/mma/accountoverview/updateAmount/ContributionUpdateAmountForm.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source/foundations'; +import { palette, space, textSans17 } from '@guardian/source/foundations'; import { Button, ChoiceCard, @@ -240,7 +240,7 @@ export const ContributionUpdateAmountForm = ( padding: ${space[3]}px ${space[5]}px; margin: 0; border-bottom: 1px solid ${palette.neutral[20]}; - ${textSans.medium()}; + ${textSans17}; `} >
    diff --git a/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx b/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx index 6a2c13c22..affe4e300 100644 --- a/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx +++ b/client/components/mma/accountoverview/updateAmount/SupporterPlusUpdateAmountForm.tsx @@ -1,5 +1,11 @@ import { css } from '@emotion/react'; -import { palette, space, textSans, until } from '@guardian/source/foundations'; +import { + palette, + space, + textSans14, + textSans17, + until, +} from '@guardian/source/foundations'; import { Button, ChoiceCard, @@ -21,7 +27,7 @@ import { JsonResponseHandler } from '../../shared/asyncComponents/DefaultApiResp import { DefaultLoadingView } from '../../shared/asyncComponents/DefaultLoadingView'; const smallPrintCss = css` - ${textSans.xsmall()}; + ${textSans14}; margin-top: 0; margin-bottom: 0; color: #606060; @@ -220,7 +226,7 @@ export const SupporterPlusUpdateAmountForm = ( padding: ${space[3]}px ${space[5]}px; margin: 0; border-bottom: 1px solid ${palette.neutral[20]}; - ${textSans.medium()}; + ${textSans17}; `} >
    diff --git a/client/components/mma/billing/Billing.tsx b/client/components/mma/billing/Billing.tsx index 215e7d312..f6822e981 100644 --- a/client/components/mma/billing/Billing.tsx +++ b/client/components/mma/billing/Billing.tsx @@ -1,11 +1,10 @@ import { css } from '@emotion/react'; import { - brand, - brandAlt, - headline, - neutral, + headlineBold20, + headlineBold28, + palette, space, - textSans, + textSans17, until, } from '@guardian/source/foundations'; import { capitalize } from 'lodash'; @@ -73,7 +72,7 @@ type BillingResponse = [ ]; const subHeadingTitleCss = ` -${headline.small({ fontWeight: 'bold' })}; +${headlineBold28}; ${until.tablet} { font-size: 1.25rem; line-height: 1.6; @@ -81,7 +80,7 @@ ${until.tablet} { `; const subHeadingBorderTopCss = css` - border-top: 1px solid ${neutral['86']}; + border-top: 1px solid ${palette.neutral['86']}; margin: ${space[12]}px 0 ${space[5]}px; `; @@ -221,10 +220,10 @@ function renderProductBillingInfo([mmaCategory, productDetails]: [ {hasCancellationPending && (

    - +

    { const selectCss = css` - ${headline.xxsmall({ fontWeight: 'bold' })}; - color: ${neutral[7]}; + ${headlineBold20}; + color: ${palette.neutral[7]}; display: block; padding: 0 ${space[5]}px 0 10px; margin: 0; @@ -37,7 +42,7 @@ export const InvoiceTableYearSelect = (props: InvoiceTableYearSelectProps) => { css={css` position: relative; display: inline-block; - border-left: 1px solid ${neutral[86]}; + border-left: 1px solid ${palette.neutral[86]}; `} >