From ffe2eb9b68fbbc4a4445251bc871321b1747774a Mon Sep 17 00:00:00 2001 From: Alex Sanders Date: Thu, 23 May 2024 15:38:30 +0100 Subject: [PATCH] Use new `@guardian/source` and `@guardian/source-development-kitchen` packages (#11399) --- .vscode/dcr.code-snippets | 2 +- apps-rendering/.storybook/preview.js | 2 +- apps-rendering/config/.eslintrc.js | 1 - apps-rendering/package.json | 6 +- apps-rendering/src/adSlot.tsx | 4 +- .../Accordion/Accordion.stories.tsx | 2 +- .../src/components/Accordion/index.tsx | 4 +- .../src/components/Anchor/index.tsx | 2 +- .../src/components/ArticleBody/index.tsx | 2 +- .../src/components/Avatar/index.tsx | 2 +- .../src/components/Blockquote/index.tsx | 2 +- .../BodyImage/BodyImage.defaults.tsx | 4 +- .../components/BodyImage/GalleryBodyImage.tsx | 2 +- .../src/components/BodyImage/index.tsx | 2 +- .../src/components/Byline/AnalysisByline.tsx | 2 +- .../src/components/Byline/Byline.defaults.tsx | 2 +- .../src/components/Byline/CommentByline.tsx | 2 +- .../src/components/Byline/DeadBlogByline.tsx | 2 +- .../src/components/Byline/GalleryByline.tsx | 2 +- .../src/components/Byline/LabsByline.tsx | 2 +- .../src/components/Byline/LiveBlogByline.tsx | 2 +- .../src/components/BylineCard/index.tsx | 4 +- .../src/components/Callout/calloutBlock.tsx | 2 +- .../src/components/Callout/calloutContact.tsx | 2 +- .../src/components/Callout/calloutForm.tsx | 2 +- .../src/components/Callout/formFields.tsx | 4 +- .../src/components/Callout/index.tsx | 4 +- .../src/components/Callout/shareLink.tsx | 2 +- .../src/components/Callout/styles.ts | 2 +- .../src/components/Callout/theme.ts | 4 +- .../src/components/CaptionIcon/index.tsx | 4 +- apps-rendering/src/components/Card/index.tsx | 4 +- .../src/components/CheckboxInput/index.tsx | 2 +- .../ClickToView/ClickToView.test.tsx | 2 +- .../src/components/ClickToView/index.tsx | 4 +- .../CommentCount/CommentCount.stories.tsx | 2 +- .../src/components/CommentCount/index.tsx | 2 +- .../src/components/Credit/index.tsx | 2 +- .../src/components/Dateline/index.tsx | 2 +- .../src/components/Deadline/index.tsx | 2 +- .../src/components/Deadline/styles.ts | 2 +- .../src/components/DesignTag/index.tsx | 2 +- .../src/components/EmailSignup/index.tsx | 2 +- .../src/components/EmailSignupForm/index.tsx | 4 +- apps-rendering/src/components/Epic/index.tsx | 2 +- .../src/components/EpicContent/index.tsx | 2 +- .../src/components/FigCaption/index.tsx | 2 +- .../src/components/FirstPublished/index.tsx | 4 +- .../src/components/Follow/index.tsx | 2 +- .../src/components/FollowStatus/index.tsx | 2 +- .../src/components/FootballScores/index.tsx | 2 +- .../src/components/Footer/Footer.defaults.tsx | 2 +- .../src/components/Footer/GalleryFooter.tsx | 2 +- .../src/components/Footer/ImmersiveFooter.tsx | 2 +- .../src/components/GenericEmbed/index.tsx | 2 +- .../HeadingTwo/HeadingTwo.defaults.tsx | 2 +- .../HeadingTwo/ImmersiveHeadingTwo.tsx | 2 +- .../components/HeadingTwo/LabsHeadingTwo.tsx | 2 +- .../src/components/Headline/BlogHeadline.tsx | 2 +- .../components/Headline/CommentHeadline.tsx | 2 +- .../components/Headline/FeatureHeadline.tsx | 2 +- .../components/Headline/GalleryHeadline.tsx | 2 +- .../components/Headline/Headline.defaults.tsx | 2 +- .../components/Headline/ImmersiveHeadline.tsx | 2 +- .../components/Headline/InterviewHeadline.tsx | 2 +- .../src/components/Headline/LabsHeadline.tsx | 2 +- .../src/components/Headline/MediaHeadline.tsx | 2 +- .../components/Headline/ReviewHeadline.tsx | 2 +- .../src/components/HeadlineByline/index.tsx | 2 +- .../src/components/HorizontalRule/index.tsx | 2 +- apps-rendering/src/components/Img/index.tsx | 2 +- .../src/components/ImgAlt/index.tsx | 2 +- .../NotSupportedMessage.tsx | 2 +- .../InPageNewsletterSignup/index.tsx | 2 +- .../components/InlineSkipToWrapper/index.tsx | 2 +- .../src/components/Interactive/index.tsx | 2 +- .../src/components/InteractiveAtom/index.tsx | 2 +- .../src/components/KeyEvents/index.tsx | 4 +- .../src/components/Kicker/index.tsx | 2 +- .../src/components/LabsLogo/index.tsx | 2 +- .../src/components/LastUpdated/index.tsx | 2 +- .../src/components/Layout/AnalysisLayout.tsx | 4 +- .../src/components/Layout/CommentLayout.tsx | 4 +- .../src/components/Layout/ImmersiveLayout.tsx | 4 +- .../src/components/Layout/LabsLayout.tsx | 4 +- .../src/components/Layout/Layout.stories.tsx | 2 +- .../src/components/Layout/LetterLayout.tsx | 4 +- .../src/components/Layout/LiveLayout.tsx | 2 +- .../Layout/NewsletterSignUpLayout.tsx | 4 +- .../src/components/Layout/StandardLayout.tsx | 4 +- .../src/components/Layout/index.tsx | 2 +- apps-rendering/src/components/List/index.tsx | 2 +- .../src/components/ListItem/index.tsx | 2 +- .../components/LiveBlockContainer/index.tsx | 2 +- .../src/components/LiveDateline/index.tsx | 2 +- .../src/components/LiveEventLink/index.tsx | 4 +- .../src/components/LiveblogHeader/index.tsx | 4 +- .../LiveblogMetadataLines/index.tsx | 4 +- apps-rendering/src/components/Logo/index.tsx | 2 +- .../components/MainMedia/GalleryCaption.tsx | 2 +- .../components/MainMedia/ImmersiveCaption.tsx | 2 +- .../MainMediaImage/BlogMainMediaImage.tsx | 2 +- .../MainMediaImage/CommentMainMediaImage.tsx | 2 +- .../MainMediaImage/GalleryMainMediaImage.tsx | 2 +- .../ImmersiveMainMediaImage.tsx | 2 +- .../InterviewMainMediaImage.tsx | 2 +- .../MainMediaImage.defaults.tsx | 2 +- .../NewsletterSignupMainMediaImage.tsx | 2 +- .../MainMedia/MainMediaVideo/index.tsx | 2 +- .../components/MainMediaCaption/Caption.tsx | 2 +- .../MainMediaCaption.defaults.tsx | 4 +- .../src/components/MatchStatusIcon/index.tsx | 2 +- .../components/Metadata/ExtendedMetadata.tsx | 2 +- .../components/Metadata/GalleryMetadata.tsx | 2 +- .../components/Metadata/ImmersiveMetadata.tsx | 2 +- .../components/Metadata/LiveBlogMetadata.tsx | 4 +- .../components/Metadata/Metadata.defaults.tsx | 2 +- .../components/Metadata/Metadata.stories.tsx | 2 +- .../src/components/Metadata/ShortMetadata.tsx | 2 +- .../NewsletterSignup/PrivacyWording.tsx | 4 +- .../src/components/NewsletterSignup/index.tsx | 4 +- .../src/components/OrderedList/index.tsx | 2 +- .../Pagination/Pagination.stories.tsx | 2 +- .../src/components/Pagination/index.tsx | 4 +- .../src/components/Paragraph/index.tsx | 2 +- .../PinnedPost/PinnedPost.stories.tsx | 2 +- .../src/components/PinnedPost/index.tsx | 4 +- .../src/components/Pullquote/index.tsx | 4 +- .../src/components/RadioInput/index.tsx | 2 +- .../RelatedContent/GalleryRelatedContent.tsx | 2 +- .../ImmersiveRelatedContent.tsx | 2 +- .../RelatedContent.defaults.tsx | 2 +- .../components/RichLink/RichLink.stories.tsx | 2 +- .../src/components/RichLink/index.tsx | 4 +- .../src/components/Series/GallerySeries.tsx | 2 +- .../src/components/Series/ImmersiveSeries.tsx | 2 +- .../src/components/Series/index.tsx | 2 +- .../components/SpecialReportAltAtom/index.tsx | 4 +- .../Standfirst/AnalysisStandfirst.tsx | 2 +- .../Standfirst/DeadBlogStandfirst.tsx | 2 +- .../Standfirst/ExplainerStandfirst.tsx | 2 +- .../Standfirst/GalleryStandfirst.tsx | 2 +- .../Standfirst/ImmersiveLabsStandfirst.tsx | 2 +- .../Standfirst/ImmersiveStandfirst.tsx | 2 +- .../Standfirst/InterviewStandfirst.tsx | 2 +- .../components/Standfirst/LabsStandfirst.tsx | 2 +- .../Standfirst/LiveBlogStandfirst.tsx | 2 +- .../components/Standfirst/MediaStandfirst.tsx | 2 +- .../Standfirst/NewsletterSignupStandfirst.tsx | 2 +- .../Standfirst/ReviewStandfirst.tsx | 2 +- .../Standfirst/Standfirst.defaults.tsx | 2 +- .../src/components/StarRating/index.tsx | 4 +- .../src/components/TableOfContents/index.tsx | 4 +- .../src/components/Tags/GalleryTags.tsx | 2 +- .../src/components/Tags/ImmersiveTags.tsx | 2 +- .../src/components/Tags/Tags.defaults.tsx | 2 +- .../src/components/TeamScore/index.tsx | 2 +- apps-rendering/src/components/Video/index.tsx | 2 +- .../src/components/WithAgeWarning/index.tsx | 4 +- .../src/components/caption/caption.tsx | 2 +- .../src/components/editions/byline/index.tsx | 4 +- .../src/components/editions/cartoon/index.tsx | 2 +- .../editions/footballScores/index.tsx | 2 +- .../editions/galleryImage/index.tsx | 2 +- .../src/components/editions/header/index.tsx | 2 +- .../editions/headerImageCaption.tsx | 4 +- .../components/editions/headerMedia/index.tsx | 2 +- .../components/editions/headline/index.tsx | 6 +- .../src/components/editions/layout/index.tsx | 2 +- .../editions/layout/layout.stories.tsx | 2 +- .../src/components/editions/lines.tsx | 2 +- .../components/editions/pullquote/index.tsx | 4 +- .../src/components/editions/series/index.tsx | 2 +- .../components/editions/standfirst/index.tsx | 4 +- .../standfirst/standfirst.stories.tsx | 2 +- .../components/editions/starRating/index.tsx | 4 +- .../src/components/editions/styles.ts | 2 +- .../components/editions/teamScore/index.tsx | 2 +- .../src/components/editions/video/index.tsx | 4 +- .../src/components/media/articleBody.tsx | 2 +- .../src/components/media/articleSeries.tsx | 2 +- .../src/components/media/byline.tsx | 2 +- apps-rendering/src/components/media/tags.tsx | 2 +- apps-rendering/src/grid/LeftCentreBorder.tsx | 2 +- apps-rendering/src/grid/grid.ts | 2 +- apps-rendering/src/image/sizes.test.tsx | 2 +- apps-rendering/src/image/sizes.ts | 4 +- apps-rendering/src/palette/background.ts | 2 +- apps-rendering/src/palette/border.ts | 2 +- apps-rendering/src/palette/fill.ts | 2 +- apps-rendering/src/palette/hover.ts | 2 +- apps-rendering/src/palette/text.ts | 2 +- apps-rendering/src/renderer.ts | 4 +- apps-rendering/src/server/editionsPage.tsx | 2 +- apps-rendering/src/server/page.tsx | 2 +- apps-rendering/src/styles.ts | 2 +- dotcom-rendering/.eslintrc.js | 1 - .../.storybook/decorators/grid.ts | 2 +- .../.storybook/decorators/gridDecorators.tsx | 2 +- .../decorators/splitThemeDecorator.tsx | 2 +- .../.storybook/decorators/themeDecorator.tsx | 2 +- dotcom-rendering/.storybook/preview.ts | 2 +- dotcom-rendering/package.json | 6 +- .../src/components/Accordion.stories.tsx | 2 +- dotcom-rendering/src/components/Accordion.tsx | 4 +- .../src/components/AdBlockAsk.importable.tsx | 2 +- .../src/components/AdPortals.importable.tsx | 4 +- .../src/components/AdSlot.apps.stories.tsx | 2 +- .../src/components/AdSlot.apps.tsx | 4 +- .../src/components/AdSlot.web.tsx | 4 +- .../src/components/AffiliateDisclaimer.tsx | 4 +- .../src/components/AgeWarning.tsx | 2 +- .../src/components/Answers.stories.tsx | 2 +- dotcom-rendering/src/components/Answers.tsx | 4 +- .../src/components/AppsEpic.importable.tsx | 2 +- .../src/components/AppsFooter.importable.tsx | 4 +- .../src/components/ArticleBody.tsx | 2 +- .../src/components/ArticleContainer.tsx | 2 +- .../components/ArticleHeadline.stories.tsx | 2 +- .../src/components/ArticleHeadline.tsx | 2 +- .../src/components/ArticleLastUpdated.tsx | 2 +- .../components/ArticleMeta.apps.stories.tsx | 2 +- .../src/components/ArticleMeta.apps.tsx | 4 +- .../src/components/ArticleMeta.stories.tsx | 2 +- .../src/components/ArticleMeta.tsx | 4 +- .../src/components/ArticlePage.amp.tsx | 2 +- .../src/components/ArticleTitle.tsx | 2 +- .../src/components/AudioAtom/AudioAtom.tsx | 2 +- ...AustralianTerritorySwitcher.importable.tsx | 4 +- dotcom-rendering/src/components/BackToTop.tsx | 2 +- dotcom-rendering/src/components/Badge.tsx | 2 +- .../src/components/BigNumber.stories.tsx | 2 +- .../components/BlockquoteBlockComponent.tsx | 2 +- .../src/components/Blocks.amp.tsx | 2 +- .../src/components/BodyArticle.amp.tsx | 2 +- .../src/components/BodyLiveblog.amp.tsx | 2 +- dotcom-rendering/src/components/Border.tsx | 2 +- .../src/components/Branding.amp.tsx | 2 +- .../src/components/Branding.importable.tsx | 2 +- dotcom-rendering/src/components/Byline.tsx | 2 +- .../src/components/BylineLink.tsx | 4 +- .../src/components/CPScottHeader.tsx | 4 +- .../src/components/Callout/Callout.tsx | 6 +- .../components/Callout/CalloutComponents.tsx | 4 +- .../src/components/Callout/Deadline.tsx | 4 +- .../src/components/Callout/Form.tsx | 6 +- .../src/components/Callout/FormField.tsx | 4 +- .../src/components/Callout/MessageUs.tsx | 4 +- .../CalloutBlockComponent.importable.tsx | 2 +- .../src/components/CalloutEmbed/Form.tsx | 4 +- .../FormFields/CheckboxSelect.tsx | 2 +- .../CalloutEmbed/FormFields/FieldLabel.tsx | 2 +- .../CalloutEmbed/FormFields/FileUpload.tsx | 2 +- .../CalloutEmbed/FormFields/RadioSelect.tsx | 2 +- .../CalloutEmbed/FormFields/Select.tsx | 2 +- .../CalloutEmbed/FormFields/TextArea.tsx | 4 +- .../CalloutEmbed/FormFields/TextInput.tsx | 4 +- .../CalloutEmbedBlockComponent.importable.tsx | 4 +- .../src/components/Caption.amp.tsx | 2 +- .../src/components/Caption.stories.tsx | 2 +- dotcom-rendering/src/components/Caption.tsx | 2 +- .../src/components/Card/Card.stories.tsx | 2 +- dotcom-rendering/src/components/Card/Card.tsx | 6 +- .../Card/components/AvatarContainer.tsx | 2 +- .../components/Card/components/CardAge.tsx | 2 +- .../Card/components/CardBranding.tsx | 2 +- .../components/Card/components/CardFooter.tsx | 2 +- .../components/Card/components/CardLayout.tsx | 2 +- .../components/Card/components/CardLink.tsx | 2 +- .../Card/components/CardWrapper.tsx | 2 +- .../Card/components/ContentWrapper.tsx | 2 +- .../Card/components/HeadlineWrapper.tsx | 2 +- .../Card/components/ImageWrapper.tsx | 2 +- .../src/components/Card/components/LI.tsx | 2 +- .../components/Card/components/PlayIcon.tsx | 6 +- .../Card/components/TrailTextWrapper.tsx | 2 +- .../src/components/Card/components/UL.tsx | 2 +- .../CardCommentCount.importable.stories.tsx | 2 +- .../CardCommentCount.importable.tsx | 2 +- .../src/components/CardHeadline.stories.tsx | 2 +- .../src/components/CardHeadline.tsx | 6 +- .../src/components/CardPicture.tsx | 2 +- .../src/components/Carousel.importable.tsx | 2 +- .../src/components/Carousel.stories.tsx | 2 +- .../CarouselForNewsletters.importable.tsx | 2 +- .../src/components/CartoonComponent.tsx | 2 +- .../src/components/ChartAtom.importable.tsx | 2 +- .../src/components/ClickToView.stories.tsx | 2 +- .../src/components/ClickToView.tsx | 4 +- .../src/components/CodeBlockComponent.tsx | 2 +- .../components/CommentBlockComponent.amp.tsx | 2 +- .../src/components/CommentBlockComponent.tsx | 2 +- .../components/CommentCount.importable.tsx | 2 +- .../src/components/ContainerOverrides.tsx | 2 +- .../src/components/ContainerTitle.tsx | 2 +- .../src/components/Contributor.tsx | 2 +- .../src/components/ContributorAvatar.tsx | 2 +- .../components/CricketScoreboard.stories.tsx | 2 +- .../src/components/CricketScoreboard.tsx | 2 +- .../src/components/DarkModeMessage.tsx | 2 +- .../src/components/DateTime.stories.tsx | 2 +- dotcom-rendering/src/components/Dateline.tsx | 2 +- .../DecideContainerByTrails.stories.tsx | 2 +- .../src/components/DecideFrontsAdSlots.tsx | 4 +- .../src/components/DecideLines.tsx | 2 +- dotcom-rendering/src/components/DesignTag.tsx | 4 +- dotcom-rendering/src/components/Details.tsx | 4 +- .../src/components/Discussion.tsx | 4 +- .../components/Discussion/AbuseReportForm.tsx | 4 +- .../src/components/Discussion/Badges.tsx | 2 +- .../src/components/Discussion/Comment.tsx | 4 +- .../Discussion/CommentContainer.tsx | 4 +- .../src/components/Discussion/CommentForm.tsx | 6 +- .../Discussion/CommentReplyPreview.tsx | 4 +- .../src/components/Discussion/Comments.tsx | 2 +- .../src/components/Discussion/Dropdown.tsx | 2 +- .../src/components/Discussion/Filters.tsx | 2 +- .../Discussion/FirstCommentWelcome.tsx | 4 +- .../components/Discussion/LoadingComments.tsx | 2 +- .../components/Discussion/LoadingPicks.tsx | 2 +- .../src/components/Discussion/Pagination.tsx | 6 +- .../Discussion/PillarButton.stories.tsx | 4 +- .../components/Discussion/PillarButton.tsx | 4 +- .../src/components/Discussion/Preview.tsx | 2 +- .../Discussion/RecommendationCount.tsx | 4 +- .../src/components/Discussion/Timestamp.tsx | 2 +- .../src/components/Discussion/TopPick.tsx | 4 +- .../src/components/Discussion/TopPicks.tsx | 2 +- .../src/components/DiscussionLayout.tsx | 2 +- .../src/components/Distribution.tsx | 2 +- .../src/components/DividerBlockComponent.tsx | 2 +- .../DocumentBlockComponent.importable.tsx | 2 +- .../src/components/Doughnut.stories.tsx | 2 +- dotcom-rendering/src/components/Doughnut.tsx | 2 +- dotcom-rendering/src/components/DropCap.tsx | 2 +- .../src/components/Dropcap.stories.tsx | 2 +- .../src/components/Dropdown.stories.tsx | 2 +- dotcom-rendering/src/components/Dropdown.tsx | 2 +- .../src/components/DynamicFast.stories.tsx | 2 +- .../src/components/DynamicPackage.stories.tsx | 2 +- .../src/components/DynamicSlow.stories.tsx | 2 +- .../src/components/DynamicSlowMPU.stories.tsx | 2 +- .../src/components/ElementContainer.tsx | 2 +- .../src/components/EmailSignup.stories.tsx | 2 +- .../src/components/EmailSignup.tsx | 2 +- .../EmbedBlockComponent.importable.tsx | 2 +- dotcom-rendering/src/components/Epic.amp.tsx | 2 +- .../src/components/EpicContent.apps.tsx | 2 +- .../src/components/Expandable.amp.tsx | 2 +- .../src/components/ExpandableAtom/Body.tsx | 4 +- .../components/ExpandableAtom/Container.tsx | 2 +- .../src/components/ExpandableAtom/Footer.tsx | 2 +- .../src/components/ExpandableAtom/Summary.tsx | 4 +- .../src/components/ExplainerAtom.tsx | 2 +- .../src/components/Figure.stories.tsx | 2 +- dotcom-rendering/src/components/Figure.tsx | 2 +- .../FilterKeyEventsToggle.importable.tsx | 4 +- .../src/components/FilterLink.stories.tsx | 2 +- .../src/components/FilterLink.tsx | 4 +- .../src/components/FirstPublished.tsx | 4 +- .../components/FixedLargeSlowXIV.stories.tsx | 2 +- .../components/FixedMediumFastXI.stories.tsx | 2 +- .../components/FixedMediumFastXII.stories.tsx | 2 +- .../components/FixedMediumSlowVI.stories.tsx | 2 +- .../components/FixedMediumSlowVII.stories.tsx | 2 +- .../FixedMediumSlowXIIMPU.stories.tsx | 2 +- .../components/FixedSmallFastVIII.stories.tsx | 2 +- .../components/FixedSmallSlowI.stories.tsx | 2 +- .../components/FixedSmallSlowIII.stories.tsx | 2 +- .../components/FixedSmallSlowIV.stories.tsx | 2 +- .../FixedSmallSlowVHalf.stories.tsx | 2 +- .../components/FixedSmallSlowVMPU.stories.tsx | 2 +- .../FixedSmallSlowVThird.stories.tsx | 2 +- .../src/components/FocusStyles.importable.tsx | 2 +- .../src/components/FollowButtons.tsx | 4 +- .../components/FollowWrapper.importable.tsx | 2 +- .../src/components/Footer.amp.tsx | 2 +- .../src/components/Footer.stories.tsx | 2 +- dotcom-rendering/src/components/Footer.tsx | 4 +- .../src/components/FrontPagination.tsx | 4 +- .../src/components/FrontSection.stories.tsx | 2 +- .../src/components/FrontSection.tsx | 2 +- .../src/components/FrontSectionTitle.tsx | 4 +- .../src/components/GetMatchNav.importable.tsx | 2 +- .../src/components/GoalAttempts.tsx | 2 +- .../src/components/GroupedNewsletterList.tsx | 2 +- .../src/components/GuardianLabsLines.tsx | 4 +- .../src/components/GuardianRoundel.tsx | 2 +- .../src/components/Header.amp.tsx | 4 +- dotcom-rendering/src/components/Header.tsx | 2 +- .../src/components/HeaderAdSlot.tsx | 2 +- .../components/HeaderTopBar.importable.tsx | 2 +- .../HeaderTopBarEditionDropdown.tsx | 2 +- .../src/components/HeaderTopBarMyAccount.tsx | 2 +- .../HeaderTopBarPrintSubscriptions.tsx | 2 +- .../src/components/HeaderTopBarSearch.tsx | 2 +- .../src/components/HeaderTopBarSearchCapi.tsx | 2 +- .../src/components/HeaderTopBarSearchJobs.tsx | 2 +- .../src/components/HeadlineByline.tsx | 2 +- dotcom-rendering/src/components/Hide.tsx | 4 +- .../components/HighlightBlockComponent.tsx | 2 +- .../components/ImageBlockComponent.amp.tsx | 2 +- .../src/components/ImageComponent.tsx | 2 +- .../src/components/InlineSkipToWrapper.tsx | 2 +- .../InteractiveBlockComponent.importable.tsx | 2 +- ...ctiveContentsBlockComponent.importable.tsx | 4 +- .../InteractiveSupportButton.importable.tsx | 4 +- .../src/components/ItemLinkBlockElement.tsx | 2 +- .../src/components/KeyEventCard.stories.tsx | 2 +- .../src/components/KeyEventCard.tsx | 4 +- .../src/components/KeyEvents.amp.tsx | 2 +- .../KeyEventsCarousel.importable.tsx | 4 +- .../components/KeyEventsCarousel.stories.tsx | 2 +- .../src/components/KeyTakeaways.tsx | 2 +- .../KnowledgeQuizAtom.importable.tsx | 4 +- .../src/components/LabsHeader.stories.tsx | 2 +- .../src/components/LabsHeader.tsx | 4 +- .../src/components/LabsSection.stories.tsx | 2 +- .../src/components/LabsSection.tsx | 4 +- .../src/components/LastUpdated.tsx | 2 +- .../LatestLinks.importable.stories.tsx | 2 +- .../src/components/LatestLinks.importable.tsx | 2 +- .../src/components/LeftColumn.tsx | 2 +- .../src/components/Lightbox.stories.tsx | 2 +- .../src/components/LightboxCaption.tsx | 2 +- .../src/components/LightboxImages.tsx | 6 +- .../src/components/LightboxJavascript.tsx | 2 +- .../components/LightboxLayout.importable.tsx | 4 +- .../src/components/LightboxLink.tsx | 4 +- .../src/components/LightboxLoader.tsx | 2 +- dotcom-rendering/src/components/Lineup.tsx | 2 +- .../src/components/LinkHeadline.tsx | 2 +- .../src/components/LiveBlock.stories.tsx | 2 +- .../src/components/LiveBlockContainer.tsx | 2 +- .../components/LiveBlogEpic.importable.tsx | 2 +- .../src/components/LiveBlogRenderer.tsx | 2 +- .../src/components/Logo.stories.tsx | 2 +- dotcom-rendering/src/components/Logo.tsx | 4 +- .../src/components/MainMedia.amp.tsx | 2 +- dotcom-rendering/src/components/MainMedia.tsx | 2 +- .../ManyNewsletterSignUp.importable.tsx | 4 +- .../src/components/ManyNewslettersForm.tsx | 4 +- dotcom-rendering/src/components/MatchNav.tsx | 2 +- .../src/components/MatchStats.tsx | 2 +- dotcom-rendering/src/components/MatchTabs.tsx | 2 +- .../src/components/MediaDuration.tsx | 4 +- dotcom-rendering/src/components/MediaMeta.tsx | 2 +- dotcom-rendering/src/components/MiniCard.tsx | 4 +- .../src/components/MostPopularFooterGrid.tsx | 4 +- .../src/components/MostViewedFooterGrid.tsx | 2 +- .../src/components/MostViewedFooterItem.tsx | 2 +- .../src/components/MostViewedFooterLayout.tsx | 4 +- .../src/components/MostViewedRight.tsx | 4 +- .../src/components/MostViewedRightItem.tsx | 2 +- .../components/MultiImageBlockComponent.tsx | 2 +- .../Nav/ExpandedMenu/CollapseColumnButton.tsx | 2 +- .../components/Nav/ExpandedMenu/Column.tsx | 2 +- .../components/Nav/ExpandedMenu/Columns.tsx | 4 +- .../Nav/ExpandedMenu/ExpandedMenu.tsx | 2 +- .../Nav/ExpandedMenu/MoreColumn.tsx | 2 +- .../Nav/ExpandedMenu/ReaderRevenueLinks.tsx | 2 +- .../Nav/ExpandedMenu/ShowMoreMenu.tsx | 4 +- .../Nav/ExpandedMenu/VeggieBurgerMenu.tsx | 2 +- .../src/components/Nav/Nav.stories.tsx | 2 +- dotcom-rendering/src/components/Nav/Nav.tsx | 2 +- .../src/components/NavList.stories.tsx | 2 +- dotcom-rendering/src/components/NavList.tsx | 2 +- .../src/components/NewsletterBadge.tsx | 2 +- .../src/components/NewsletterCard.tsx | 4 +- .../src/components/NewsletterDetail.tsx | 4 +- .../src/components/NewsletterFrequency.tsx | 4 +- .../src/components/NewsletterPageHeading.tsx | 4 +- .../components/NewsletterPrivacyMessage.tsx | 4 +- .../NumberedTitleBlockComponent.tsx | 2 +- .../src/components/OnwardContainer.amp.tsx | 2 +- .../src/components/Pagination.amp.tsx | 2 +- .../src/components/Pagination.stories.tsx | 2 +- .../src/components/Pagination.tsx | 4 +- .../src/components/PaidForBand.amp.tsx | 2 +- .../src/components/Palettes.stories.tsx | 2 +- .../PersonalityQuizAtom.importable.tsx | 4 +- dotcom-rendering/src/components/Picture.tsx | 2 +- dotcom-rendering/src/components/Pillars.tsx | 2 +- .../src/components/PinnedPost.stories.tsx | 2 +- .../src/components/PinnedPost.tsx | 4 +- .../src/components/Placeholder.tsx | 2 +- .../PrivacySettingsLink.importable.tsx | 4 +- .../PullQuoteBlockComponent.stories.tsx | 2 +- .../components/PullQuoteBlockComponent.tsx | 2 +- .../PullquoteBlockComponent.amp.tsx | 2 +- .../components/ReaderRevenueButton.amp.tsx | 2 +- .../ReaderRevenueLinks.importable.tsx | 2 +- .../components/ReaderRevenueLinks.stories.tsx | 2 +- dotcom-rendering/src/components/RichLink.tsx | 4 +- .../components/RichLinkBlockComponent.amp.tsx | 2 +- .../src/components/RightColumn.tsx | 4 +- dotcom-rendering/src/components/Score.tsx | 2 +- .../src/components/Section.stories.tsx | 2 +- dotcom-rendering/src/components/Section.tsx | 2 +- .../components/SecureSignup.importable.tsx | 4 +- .../components/SendAMessage.importable.tsx | 6 +- .../src/components/SeriesLink.amp.tsx | 2 +- .../src/components/SeriesSectionLink.tsx | 2 +- .../src/components/ShareButton.importable.tsx | 6 +- .../src/components/ShareIcons.amp.tsx | 2 +- .../src/components/SharingIcons.tsx | 6 +- .../src/components/ShowHideButton.tsx | 4 +- .../src/components/ShowMore.importable.tsx | 4 +- .../src/components/ShowMoreButton.amp.tsx | 2 +- .../src/components/Sidebar.amp.tsx | 2 +- .../SignInGateCustomizableText.tsx | 2 +- .../gateDesigns/SignInGateFakeSocial.tsx | 4 +- .../SignInGate/gateDesigns/SignInGateMain.tsx | 2 +- .../SignInGateMainCheckoutComplete.tsx | 4 +- .../SignInGate/gateDesigns/shared.tsx | 2 +- .../src/components/SignedInAs.tsx | 4 +- dotcom-rendering/src/components/SkipTo.tsx | 2 +- .../src/components/Slideshow.stories.tsx | 2 +- dotcom-rendering/src/components/Slideshow.tsx | 2 +- .../src/components/Standfirst.amp.tsx | 2 +- .../src/components/Standfirst.stories.tsx | 2 +- .../src/components/Standfirst.tsx | 2 +- .../src/components/StarRating/StarRating.tsx | 2 +- .../src/components/StickyAd.amp.tsx | 2 +- .../src/components/SubMeta.amp.tsx | 2 +- dotcom-rendering/src/components/SubMeta.tsx | 4 +- .../src/components/SubNav.importable.tsx | 2 +- .../src/components/Subheading.tsx | 4 +- .../SubheadingBlockComponent.amp.tsx | 2 +- .../src/components/SupportTheG.importable.tsx | 2 +- .../components/SupportingContent.stories.tsx | 2 +- .../src/components/SupportingContent.tsx | 2 +- .../components/SvgGuardianAustraliaLogo.tsx | 2 +- .../SvgGuardianBestNewspaperLogo.tsx | 2 +- .../SvgGuardianNewsProviderLogo.tsx | 2 +- .../src/components/TableBlockComponent.tsx | 2 +- .../components/TableOfContents.importable.tsx | 4 +- .../src/components/TagPageHeader.tsx | 2 +- .../src/components/TextBlockComponent.amp.tsx | 2 +- .../src/components/TextBlockComponent.tsx | 2 +- dotcom-rendering/src/components/Timeline.tsx | 2 +- .../src/components/TimelineAtom.amp.tsx | 2 +- .../components/TimelineAtom.importable.tsx | 2 +- .../src/components/Toast.stories.tsx | 2 +- dotcom-rendering/src/components/Toast.tsx | 6 +- .../src/components/TopBar.importable.tsx | 4 +- .../src/components/TopBarLink.tsx | 2 +- .../src/components/TopBarMyAccount.tsx | 2 +- .../src/components/TopMetaAnalysis.amp.tsx | 2 +- .../src/components/TopMetaExtras.amp.tsx | 2 +- .../src/components/TopMetaLiveblog.amp.tsx | 2 +- .../src/components/TopMetaNews.amp.tsx | 2 +- .../src/components/TopMetaOpinion.amp.tsx | 2 +- .../src/components/TopMetaPaidContent.amp.tsx | 2 +- .../src/components/TopicFilterBank.tsx | 2 +- dotcom-rendering/src/components/Treats.tsx | 4 +- .../src/components/TrendingTopics.tsx | 4 +- .../TweetBlockComponent.importable.tsx | 2 +- .../components/TwitterBlockComponent.amp.tsx | 2 +- .../VineBlockComponent.importable.tsx | 2 +- dotcom-rendering/src/components/Weather.tsx | 4 +- .../src/components/WeatherSlot.tsx | 2 +- .../src/components/WitnessBlockComponent.tsx | 2 +- .../YoutubeAtom/YoutubeAtomOverlay.tsx | 2 +- .../YoutubeAtom/YoutubeAtomPicture.tsx | 2 +- .../YoutubeAtom/YoutubeAtomSticky.tsx | 4 +- .../YoutubeBlockComponent.importable.tsx | 4 +- .../marketing/epics/BylineWithHeadshot.tsx | 2 +- .../marketing/epics/ContributionsEpic.tsx | 6 +- ...butionsEpicArticleCountAboveWithOptOut.tsx | 6 +- .../epics/ContributionsEpicButtons.tsx | 2 +- .../epics/ContributionsEpicChoiceCards.tsx | 4 +- .../ContributionsEpicNewsletterSignup.tsx | 2 +- .../ContributionsEpicReminderSignedIn.tsx | 6 +- .../ContributionsEpicReminderSignedOut.tsx | 6 +- .../epics/ContributionsEpicSignInCta.tsx | 4 +- .../epics/ContributionsEpicTicker.tsx | 2 +- .../epics/ContributionsLiveblogEpic.tsx | 8 +- .../components/marketing/epics/EpicButton.tsx | 4 +- .../components/marketing/header/Header.tsx | 4 +- .../marketing/header/SignInPromptHeader.tsx | 4 +- .../header/common/HeaderDecorator.tsx | 2 +- .../shared/ArticleCountOptOutOverlay.tsx | 4 +- .../shared/ArticleCountOptOutPopup.tsx | 2 +- .../AllEditorialNewslettersPageLayout.tsx | 4 +- .../src/layouts/CommentLayout.tsx | 4 +- .../src/layouts/DecideLayout.stories.tsx | 2 +- dotcom-rendering/src/layouts/FrontLayout.tsx | 4 +- .../src/layouts/FullPageInteractiveLayout.tsx | 2 +- .../src/layouts/ImmersiveLayout.tsx | 4 +- .../src/layouts/InteractiveLayout.tsx | 6 +- dotcom-rendering/src/layouts/LiveLayout.tsx | 6 +- .../src/layouts/NewsletterSignupLayout.tsx | 6 +- .../src/layouts/PictureLayout.tsx | 6 +- .../src/layouts/ShowcaseLayout.tsx | 6 +- .../src/layouts/StandardLayout.tsx | 6 +- .../src/layouts/TagPageLayout.tsx | 4 +- .../layouts/lib/interactiveLegacyStyling.ts | 2 +- dotcom-rendering/src/layouts/lib/pageSkin.ts | 2 +- dotcom-rendering/src/lib/center.ts | 2 +- .../src/lib/decideContainerOverrides.ts | 2 +- dotcom-rendering/src/lib/decidePalette.ts | 2 +- dotcom-rendering/src/lib/pillars.ts | 2 +- dotcom-rendering/src/lib/rootStyles.ts | 2 +- dotcom-rendering/src/lib/verticalDivider.ts | 2 +- .../lib/verticalDividerWithBottomOffset.ts | 2 +- dotcom-rendering/src/palette.ts | 6 +- .../src/server/htmlPageTemplate.ts | 2 +- .../src/server/render.article.amp.tsx | 2 +- pnpm-lock.yaml | 382 ++++++------------ 610 files changed, 923 insertions(+), 1075 deletions(-) diff --git a/.vscode/dcr.code-snippets b/.vscode/dcr.code-snippets index 746b09cb0df..de748bf28e4 100644 --- a/.vscode/dcr.code-snippets +++ b/.vscode/dcr.code-snippets @@ -17,7 +17,7 @@ // } "Import neutral": { "prefix": "neutral", - "body": ["import { neutral } from '@guardian/source-foundations';"], + "body": ["import { neutral } from '@guardian/source/foundations';"], "description": "Import for neutral" }, "React wrapper component": { diff --git a/apps-rendering/.storybook/preview.js b/apps-rendering/.storybook/preview.js index 1edd1396d2f..42f9164ea87 100644 --- a/apps-rendering/.storybook/preview.js +++ b/apps-rendering/.storybook/preview.js @@ -4,7 +4,7 @@ import isChromatic from 'chromatic/isChromatic'; import MockDate from 'mockdate'; import { getFontsCss } from './fonts-css'; -import { resets } from '@guardian/source-foundations'; +import { resets } from '@guardian/source/foundations'; if (isChromatic()) { // Fix the date to prevent false negatives diff --git a/apps-rendering/config/.eslintrc.js b/apps-rendering/config/.eslintrc.js index 3ac889a2b0d..ac3a82a00be 100644 --- a/apps-rendering/config/.eslintrc.js +++ b/apps-rendering/config/.eslintrc.js @@ -9,7 +9,6 @@ module.exports = { 'plugin:react/recommended', 'plugin:jsx-a11y/recommended', '@guardian/eslint-config-typescript', - 'plugin:@guardian/source-react-components/recommended', ], parserOptions: { // Allows for the parsing of modern ECMAScript features diff --git a/apps-rendering/package.json b/apps-rendering/package.json index 622baafe6b3..4a28dc40766 100644 --- a/apps-rendering/package.json +++ b/apps-rendering/package.json @@ -48,12 +48,10 @@ "@guardian/content-atom-model": "4.0.1", "@guardian/eslint-config": "7.0.1", "@guardian/eslint-config-typescript": "9.0.1", - "@guardian/eslint-plugin-source-react-components": "24.0.0", "@guardian/libs": "16.1.0", "@guardian/renditions": "0.2.0", - "@guardian/source-foundations": "14.2.2", - "@guardian/source-react-components": "22.1.0", - "@guardian/source-react-components-development-kitchen": "19.0.0", + "@guardian/source": "1.0.0", + "@guardian/source-development-kitchen": "1.0.0", "@smithy/property-provider": "2.0.16", "@storybook/addon-essentials": "7.6.18", "@storybook/addons": "7.6.18", diff --git a/apps-rendering/src/adSlot.tsx b/apps-rendering/src/adSlot.tsx index 3d1da8f8871..3200d28e287 100644 --- a/apps-rendering/src/adSlot.tsx +++ b/apps-rendering/src/adSlot.tsx @@ -7,8 +7,8 @@ import { remSpace, textSans14, until, -} from '@guardian/source-foundations'; -import { Button, buttonThemeBrandAlt } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, buttonThemeBrandAlt } from '@guardian/source/react-components'; import { background, text } from 'palette'; import type { FC, ReactElement } from 'react'; import { darkModeCss, wideContentWidth } from 'styles'; diff --git a/apps-rendering/src/components/Accordion/Accordion.stories.tsx b/apps-rendering/src/components/Accordion/Accordion.stories.tsx index 621853e8afe..e948ab5fd32 100644 --- a/apps-rendering/src/components/Accordion/Accordion.stories.tsx +++ b/apps-rendering/src/components/Accordion/Accordion.stories.tsx @@ -8,7 +8,7 @@ import { from, neutral, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; import Accordion from '.'; diff --git a/apps-rendering/src/components/Accordion/index.tsx b/apps-rendering/src/components/Accordion/index.tsx index 62a80df21b0..076f91cec7c 100644 --- a/apps-rendering/src/components/Accordion/index.tsx +++ b/apps-rendering/src/components/Accordion/index.tsx @@ -10,11 +10,11 @@ import { line, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgChevronDownSingle, SvgChevronUpSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { FC, ReactNode } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Anchor/index.tsx b/apps-rendering/src/components/Anchor/index.tsx index e737938c067..f8108257a51 100644 --- a/apps-rendering/src/components/Anchor/index.tsx +++ b/apps-rendering/src/components/Anchor/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleSpecial } from '@guardian/libs'; -import { labs, neutral } from '@guardian/source-foundations'; +import { labs, neutral } from '@guardian/source/foundations'; import { text } from 'palette'; import type { FC, ReactNode } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/ArticleBody/index.tsx b/apps-rendering/src/components/ArticleBody/index.tsx index bc8439945ac..fb5488f3750 100644 --- a/apps-rendering/src/components/ArticleBody/index.tsx +++ b/apps-rendering/src/components/ArticleBody/index.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { palette, remSpace } from '@guardian/source-foundations'; +import { palette, remSpace } from '@guardian/source/foundations'; import type { BodyElement } from 'bodyElement'; import { background } from 'palette'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Avatar/index.tsx b/apps-rendering/src/components/Avatar/index.tsx index 114181621cc..04577bb7d3a 100644 --- a/apps-rendering/src/components/Avatar/index.tsx +++ b/apps-rendering/src/components/Avatar/index.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import Img from 'components/Img'; import { isSingleContributor } from 'contributor'; diff --git a/apps-rendering/src/components/Blockquote/index.tsx b/apps-rendering/src/components/Blockquote/index.tsx index d479d8f85cd..cf8cd7c244f 100644 --- a/apps-rendering/src/components/Blockquote/index.tsx +++ b/apps-rendering/src/components/Blockquote/index.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import { fill } from 'palette'; import type { FC, ReactNode } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/BodyImage/BodyImage.defaults.tsx b/apps-rendering/src/components/BodyImage/BodyImage.defaults.tsx index 43680191acd..b8716ca4913 100644 --- a/apps-rendering/src/components/BodyImage/BodyImage.defaults.tsx +++ b/apps-rendering/src/components/BodyImage/BodyImage.defaults.tsx @@ -3,8 +3,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import { ArticleElementRole } from '@guardian/libs'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; -import type { Breakpoint } from '@guardian/source-foundations'; +import { from, remSpace } from '@guardian/source/foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { none, some, withDefault } from '../../../vendor/@guardian/types/index'; import { CaptionIconVariant } from 'components/CaptionIcon'; diff --git a/apps-rendering/src/components/BodyImage/GalleryBodyImage.tsx b/apps-rendering/src/components/BodyImage/GalleryBodyImage.tsx index 6c9215adfb5..67e98238c57 100644 --- a/apps-rendering/src/components/BodyImage/GalleryBodyImage.tsx +++ b/apps-rendering/src/components/BodyImage/GalleryBodyImage.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, headline, textSans14 } from '@guardian/source-foundations'; +import { from, headline, textSans14 } from '@guardian/source/foundations'; import { CaptionIconVariant } from 'components/CaptionIcon'; import FigCaption from 'components/FigCaption'; import Img from 'components/ImgAlt'; diff --git a/apps-rendering/src/components/BodyImage/index.tsx b/apps-rendering/src/components/BodyImage/index.tsx index e5be3ef78ca..da8a719b58b 100644 --- a/apps-rendering/src/components/BodyImage/index.tsx +++ b/apps-rendering/src/components/BodyImage/index.tsx @@ -1,6 +1,6 @@ // ----- Imports ----- // import { ArticleDesign } from '@guardian/libs'; -import type { Breakpoint } from '@guardian/source-foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { none } from '../../../vendor/@guardian/types/index'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Byline/AnalysisByline.tsx b/apps-rendering/src/components/Byline/AnalysisByline.tsx index 36d623afa52..344f1fe32d5 100644 --- a/apps-rendering/src/components/Byline/AnalysisByline.tsx +++ b/apps-rendering/src/components/Byline/AnalysisByline.tsx @@ -6,7 +6,7 @@ import { headlineLightItalic34, remSpace, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { text } from 'palette'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Byline/Byline.defaults.tsx b/apps-rendering/src/components/Byline/Byline.defaults.tsx index 052643a5bb4..856ed7061f8 100644 --- a/apps-rendering/src/components/Byline/Byline.defaults.tsx +++ b/apps-rendering/src/components/Byline/Byline.defaults.tsx @@ -4,7 +4,7 @@ import type { ArticleFormat } from '@guardian/libs'; import { headlineBold17, headlineMediumItalic17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { withDefault } from '../../../vendor/@guardian/types/index'; import type { Option } from '../../../vendor/@guardian/types/index'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/Byline/CommentByline.tsx b/apps-rendering/src/components/Byline/CommentByline.tsx index 3e885de6521..ec0728a6787 100644 --- a/apps-rendering/src/components/Byline/CommentByline.tsx +++ b/apps-rendering/src/components/Byline/CommentByline.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { between, headlineLightItalic34 } from '@guardian/source-foundations'; +import { between, headlineLightItalic34 } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { text } from 'palette'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Byline/DeadBlogByline.tsx b/apps-rendering/src/components/Byline/DeadBlogByline.tsx index 3ff00263d03..601b8a3bba9 100644 --- a/apps-rendering/src/components/Byline/DeadBlogByline.tsx +++ b/apps-rendering/src/components/Byline/DeadBlogByline.tsx @@ -3,7 +3,7 @@ import type { ArticleFormat } from '@guardian/libs'; import { headlineBold17, headlineMediumItalic17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { DefaultByline } from './Byline.defaults'; import { blogColor } from './LiveBlogByline'; diff --git a/apps-rendering/src/components/Byline/GalleryByline.tsx b/apps-rendering/src/components/Byline/GalleryByline.tsx index 59447011083..8fc13757d9c 100644 --- a/apps-rendering/src/components/Byline/GalleryByline.tsx +++ b/apps-rendering/src/components/Byline/GalleryByline.tsx @@ -5,7 +5,7 @@ import { headline, headlineMediumItalic17, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { grid } from 'grid/grid'; import { border, text } from 'palette'; diff --git a/apps-rendering/src/components/Byline/LabsByline.tsx b/apps-rendering/src/components/Byline/LabsByline.tsx index 12cad49cef7..74906d922a0 100644 --- a/apps-rendering/src/components/Byline/LabsByline.tsx +++ b/apps-rendering/src/components/Byline/LabsByline.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { labs, textSansItalic17 } from '@guardian/source-foundations'; +import { labs, textSansItalic17 } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { darkModeCss } from 'styles'; import { DefaultByline } from './Byline.defaults'; diff --git a/apps-rendering/src/components/Byline/LiveBlogByline.tsx b/apps-rendering/src/components/Byline/LiveBlogByline.tsx index 9d46d752f4b..260254f9fda 100644 --- a/apps-rendering/src/components/Byline/LiveBlogByline.tsx +++ b/apps-rendering/src/components/Byline/LiveBlogByline.tsx @@ -5,7 +5,7 @@ import { from, headlineBold17, headlineMediumItalic17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { text } from 'palette'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/BylineCard/index.tsx b/apps-rendering/src/components/BylineCard/index.tsx index c53c48ee58c..6b114689747 100644 --- a/apps-rendering/src/components/BylineCard/index.tsx +++ b/apps-rendering/src/components/BylineCard/index.tsx @@ -8,8 +8,8 @@ import { headlineMedium20, remSpace, textSans15, -} from '@guardian/source-foundations'; -import { SvgQuote } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgQuote } from '@guardian/source/react-components'; import type { Option } from '../../../vendor/@guardian/types/index'; import { fromNullable, diff --git a/apps-rendering/src/components/Callout/calloutBlock.tsx b/apps-rendering/src/components/Callout/calloutBlock.tsx index 6fa382d583d..7ac106aa43d 100644 --- a/apps-rendering/src/components/Callout/calloutBlock.tsx +++ b/apps-rendering/src/components/Callout/calloutBlock.tsx @@ -1,7 +1,7 @@ import type { Contact } from '@guardian/apps-rendering-api-models/contact'; import type { FormField } from '@guardian/apps-rendering-api-models/formField'; import type { ArticleFormat } from '@guardian/libs'; -import { Tabs } from '@guardian/source-react-components-development-kitchen'; +import { Tabs } from '@guardian/source-development-kitchen/react-components'; import { useState } from 'react'; import type { FC, ReactElement } from 'react'; import { renderCalloutDescriptionText } from 'renderer'; diff --git a/apps-rendering/src/components/Callout/calloutContact.tsx b/apps-rendering/src/components/Callout/calloutContact.tsx index 53e0e767623..80ade501d83 100644 --- a/apps-rendering/src/components/Callout/calloutContact.tsx +++ b/apps-rendering/src/components/Callout/calloutContact.tsx @@ -4,7 +4,7 @@ import { SvgSignalBrand, SvgTelegramBrand, SvgWhatsAppBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { FC, ReactElement } from 'react'; import { calloutLinkContainer, calloutPrimaryButton, info } from './styles'; diff --git a/apps-rendering/src/components/Callout/calloutForm.tsx b/apps-rendering/src/components/Callout/calloutForm.tsx index 54a631c89d8..f2ee2f2483b 100644 --- a/apps-rendering/src/components/Callout/calloutForm.tsx +++ b/apps-rendering/src/components/Callout/calloutForm.tsx @@ -4,7 +4,7 @@ import { InlineError, Link, SvgTickRound, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useState } from 'react'; import type { FC } from 'react'; import { ContactText, Disclaimer } from './calloutComponents'; diff --git a/apps-rendering/src/components/Callout/formFields.tsx b/apps-rendering/src/components/Callout/formFields.tsx index 108b4df4449..a9f80849180 100644 --- a/apps-rendering/src/components/Callout/formFields.tsx +++ b/apps-rendering/src/components/Callout/formFields.tsx @@ -4,8 +4,8 @@ import { Select, TextArea, TextInput, -} from '@guardian/source-react-components'; -import { FileInput } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { FileInput } from '@guardian/source-development-kitchen/react-components'; import CheckboxInput from 'components/CheckboxInput'; import RadioInput from 'components/RadioInput'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Callout/index.tsx b/apps-rendering/src/components/Callout/index.tsx index 206941d25ba..00b6c076658 100644 --- a/apps-rendering/src/components/Callout/index.tsx +++ b/apps-rendering/src/components/Callout/index.tsx @@ -2,8 +2,8 @@ import { css, ThemeProvider } from '@emotion/react'; import type { Contact } from '@guardian/apps-rendering-api-models/contact'; import type { FormField } from '@guardian/apps-rendering-api-models/formField'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; -import { ExpandingWrapper } from '@guardian/source-react-components-development-kitchen'; +import { remSpace } from '@guardian/source/foundations'; +import { ExpandingWrapper } from '@guardian/source-development-kitchen/react-components'; import { isElement } from 'lib'; import type { FC, ReactElement } from 'react'; import { createElement as h } from 'react'; diff --git a/apps-rendering/src/components/Callout/shareLink.tsx b/apps-rendering/src/components/Callout/shareLink.tsx index 7dd2c51730b..859ef82adbd 100644 --- a/apps-rendering/src/components/Callout/shareLink.tsx +++ b/apps-rendering/src/components/Callout/shareLink.tsx @@ -2,7 +2,7 @@ import { Button, SvgShare, SvgTickRound, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useState } from 'react'; import type { FC } from 'react'; import { diff --git a/apps-rendering/src/components/Callout/styles.ts b/apps-rendering/src/components/Callout/styles.ts index 81955f568a0..d2f3ffbf113 100644 --- a/apps-rendering/src/components/Callout/styles.ts +++ b/apps-rendering/src/components/Callout/styles.ts @@ -15,7 +15,7 @@ import { textSans14, textSans15, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { darkModeCss } from 'styles'; // Callout block styles diff --git a/apps-rendering/src/components/Callout/theme.ts b/apps-rendering/src/components/Callout/theme.ts index e72a43e64f3..88d3e68562c 100644 --- a/apps-rendering/src/components/Callout/theme.ts +++ b/apps-rendering/src/components/Callout/theme.ts @@ -5,12 +5,12 @@ import { focus, neutral, success, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { expandingWrapperDarkTheme, fileInputDarkTheme, tabsDarkTheme, -} from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source-development-kitchen/react-components'; const labelDarkTheme = { textLabel: neutral[97], diff --git a/apps-rendering/src/components/CaptionIcon/index.tsx b/apps-rendering/src/components/CaptionIcon/index.tsx index 90e82dddedd..049ee752068 100644 --- a/apps-rendering/src/components/CaptionIcon/index.tsx +++ b/apps-rendering/src/components/CaptionIcon/index.tsx @@ -1,8 +1,8 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; -import { SvgCamera, SvgVideo } from '@guardian/source-react-components'; +import { remSpace } from '@guardian/source/foundations'; +import { SvgCamera, SvgVideo } from '@guardian/source/react-components'; import { fill } from 'palette'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Card/index.tsx b/apps-rendering/src/components/Card/index.tsx index 4ed5688dd66..08684322bb7 100644 --- a/apps-rendering/src/components/Card/index.tsx +++ b/apps-rendering/src/components/Card/index.tsx @@ -17,13 +17,13 @@ import { textSans15, textSans17, textSans20, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgAudio, SvgCamera, SvgQuote, SvgVideo, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { fromNullable, map, diff --git a/apps-rendering/src/components/CheckboxInput/index.tsx b/apps-rendering/src/components/CheckboxInput/index.tsx index 5dd659ed79b..a892518d41e 100644 --- a/apps-rendering/src/components/CheckboxInput/index.tsx +++ b/apps-rendering/src/components/CheckboxInput/index.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import type { FormField } from '@guardian/apps-rendering-api-models/formField'; -import { Checkbox, CheckboxGroup } from '@guardian/source-react-components'; +import { Checkbox, CheckboxGroup } from '@guardian/source/react-components'; import type { ReactElement } from 'react'; interface CheckboxInputProps { diff --git a/apps-rendering/src/components/ClickToView/ClickToView.test.tsx b/apps-rendering/src/components/ClickToView/ClickToView.test.tsx index 9b921762112..b6bc0c2c1be 100644 --- a/apps-rendering/src/components/ClickToView/ClickToView.test.tsx +++ b/apps-rendering/src/components/ClickToView/ClickToView.test.tsx @@ -1,4 +1,4 @@ -import { Button } from '@guardian/source-react-components'; +import { Button } from '@guardian/source/react-components'; import { none, some } from '../../../vendor/@guardian/types/index'; import renderer from 'react-test-renderer'; import ClickToView from './'; diff --git a/apps-rendering/src/components/ClickToView/index.tsx b/apps-rendering/src/components/ClickToView/index.tsx index b237e526ad2..5f885e3585c 100644 --- a/apps-rendering/src/components/ClickToView/index.tsx +++ b/apps-rendering/src/components/ClickToView/index.tsx @@ -9,8 +9,8 @@ import { textSans17, textSansBold17, textSansBold20, -} from '@guardian/source-foundations'; -import { Button, SvgCheckmark } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, SvgCheckmark } from '@guardian/source/react-components'; import type { Option } from '../../../vendor/@guardian/types/index'; import { OptionKind, withDefault } from '../../../vendor/@guardian/types/index'; import { fold } from 'lib'; diff --git a/apps-rendering/src/components/CommentCount/CommentCount.stories.tsx b/apps-rendering/src/components/CommentCount/CommentCount.stories.tsx index 6b2acc2b9d1..1eba41f951d 100644 --- a/apps-rendering/src/components/CommentCount/CommentCount.stories.tsx +++ b/apps-rendering/src/components/CommentCount/CommentCount.stories.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { some } from '../../../vendor/@guardian/types/index'; import { getAllThemes, getThemeNameAsString } from 'fixtures/article'; import type { FC, ReactElement } from 'react'; diff --git a/apps-rendering/src/components/CommentCount/index.tsx b/apps-rendering/src/components/CommentCount/index.tsx index e263340ebbe..f565e0b6482 100644 --- a/apps-rendering/src/components/CommentCount/index.tsx +++ b/apps-rendering/src/components/CommentCount/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { from, remSpace, textSansBold17 } from '@guardian/source-foundations'; +import { from, remSpace, textSansBold17 } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import { pipe } from 'lib'; diff --git a/apps-rendering/src/components/Credit/index.tsx b/apps-rendering/src/components/Credit/index.tsx index 94d853ef4fc..c27715c987c 100644 --- a/apps-rendering/src/components/Credit/index.tsx +++ b/apps-rendering/src/components/Credit/index.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { remSpace, textSans14 } from '@guardian/source-foundations'; +import { remSpace, textSans14 } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import { pipe } from 'lib'; diff --git a/apps-rendering/src/components/Dateline/index.tsx b/apps-rendering/src/components/Dateline/index.tsx index 97d425d1a58..5368802144b 100644 --- a/apps-rendering/src/components/Dateline/index.tsx +++ b/apps-rendering/src/components/Dateline/index.tsx @@ -10,7 +10,7 @@ import { neutral, textSans, textSans14, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import type { Option } from '../../../vendor/@guardian/types/index'; import { datetimeFormat } from 'datetime'; diff --git a/apps-rendering/src/components/Deadline/index.tsx b/apps-rendering/src/components/Deadline/index.tsx index a2d5187494d..def8c28d389 100644 --- a/apps-rendering/src/components/Deadline/index.tsx +++ b/apps-rendering/src/components/Deadline/index.tsx @@ -1,4 +1,4 @@ -import { SvgClock } from '@guardian/source-react-components'; +import { SvgClock } from '@guardian/source/react-components'; import { isValidDate } from 'date'; import type { FC } from 'react'; import React from 'react'; diff --git a/apps-rendering/src/components/Deadline/styles.ts b/apps-rendering/src/components/Deadline/styles.ts index d3bd6143003..14ab2eafc1e 100644 --- a/apps-rendering/src/components/Deadline/styles.ts +++ b/apps-rendering/src/components/Deadline/styles.ts @@ -4,7 +4,7 @@ import { neutral, remSpace, textSans14, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { darkModeCss } from 'styles'; export const highlight = css` diff --git a/apps-rendering/src/components/DesignTag/index.tsx b/apps-rendering/src/components/DesignTag/index.tsx index 2a3ba25205c..e18af3a8dc2 100644 --- a/apps-rendering/src/components/DesignTag/index.tsx +++ b/apps-rendering/src/components/DesignTag/index.tsx @@ -2,7 +2,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { from, headline, remSpace } from '@guardian/source-foundations'; +import { from, headline, remSpace } from '@guardian/source/foundations'; import { background, text } from 'palette'; import type { FC } from 'react'; import { articleWidthStyles, darkModeCss } from '../../styles'; diff --git a/apps-rendering/src/components/EmailSignup/index.tsx b/apps-rendering/src/components/EmailSignup/index.tsx index fd48c8cb804..f9dedf5d1a8 100644 --- a/apps-rendering/src/components/EmailSignup/index.tsx +++ b/apps-rendering/src/components/EmailSignup/index.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral, remSpace, textSans14 } from '@guardian/source-foundations'; +import { neutral, remSpace, textSans14 } from '@guardian/source/foundations'; import { withDefault } from '../../../vendor/@guardian/types/index'; import type { EmailSignup } from 'embed'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/EmailSignupForm/index.tsx b/apps-rendering/src/components/EmailSignupForm/index.tsx index ad18936487b..155d50dc116 100644 --- a/apps-rendering/src/components/EmailSignupForm/index.tsx +++ b/apps-rendering/src/components/EmailSignupForm/index.tsx @@ -9,7 +9,7 @@ import { remSpace, textSansBold14, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, InlineError, @@ -20,7 +20,7 @@ import { SvgSpinner, TextInput, userFeedbackThemeDefault, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { background, fill, hover, text } from 'palette'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Epic/index.tsx b/apps-rendering/src/components/Epic/index.tsx index 083da7a5bca..fd39414ce6c 100644 --- a/apps-rendering/src/components/Epic/index.tsx +++ b/apps-rendering/src/components/Epic/index.tsx @@ -11,7 +11,7 @@ import { neutral, remSpace, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { darkModeCss } from 'styles'; // ----- Styles ----- // diff --git a/apps-rendering/src/components/EpicContent/index.tsx b/apps-rendering/src/components/EpicContent/index.tsx index e9da35f88d4..d7935d1dee7 100644 --- a/apps-rendering/src/components/EpicContent/index.tsx +++ b/apps-rendering/src/components/EpicContent/index.tsx @@ -4,7 +4,7 @@ import { Button, buttonThemeReaderRevenue, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { acquisitionsClient } from 'native/nativeApi'; import { useEffect, useRef, useState } from 'react'; diff --git a/apps-rendering/src/components/FigCaption/index.tsx b/apps-rendering/src/components/FigCaption/index.tsx index db333f270d2..485c4b06351 100644 --- a/apps-rendering/src/components/FigCaption/index.tsx +++ b/apps-rendering/src/components/FigCaption/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { neutral, remSpace, textSans14 } from '@guardian/source-foundations'; +import { neutral, remSpace, textSans14 } from '@guardian/source/foundations'; import CaptionIcon from 'components/CaptionIcon'; import type { CaptionIconVariant } from 'components/CaptionIcon'; import type { Styleable } from 'lib'; diff --git a/apps-rendering/src/components/FirstPublished/index.tsx b/apps-rendering/src/components/FirstPublished/index.tsx index e958e4ab946..8fb9a7a0ae6 100644 --- a/apps-rendering/src/components/FirstPublished/index.tsx +++ b/apps-rendering/src/components/FirstPublished/index.tsx @@ -7,8 +7,8 @@ import { space, textSans12, textSansBold12, -} from '@guardian/source-foundations'; -import { SvgPinned } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgPinned } from '@guardian/source/react-components'; import { timestampFormat } from 'datetime'; import { border } from 'palette'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Follow/index.tsx b/apps-rendering/src/components/Follow/index.tsx index 92845f026fd..0782be1d286 100644 --- a/apps-rendering/src/components/Follow/index.tsx +++ b/apps-rendering/src/components/Follow/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleSpecial } from '@guardian/libs'; -import { remSpace, space, textSans15 } from '@guardian/source-foundations'; +import { remSpace, space, textSans15 } from '@guardian/source/foundations'; import { FollowNotificationStatus } from 'components/FollowStatus'; import type { Contributor } from 'contributor'; import { isSingleContributor } from 'contributor'; diff --git a/apps-rendering/src/components/FollowStatus/index.tsx b/apps-rendering/src/components/FollowStatus/index.tsx index 474073fef61..a1d34add3db 100644 --- a/apps-rendering/src/components/FollowStatus/index.tsx +++ b/apps-rendering/src/components/FollowStatus/index.tsx @@ -4,7 +4,7 @@ import { SvgNotificationsOff, SvgNotificationsOn, SvgPlus, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { FC } from 'react'; // ----- Component ----- // diff --git a/apps-rendering/src/components/FootballScores/index.tsx b/apps-rendering/src/components/FootballScores/index.tsx index 811b607d1c4..40c299acabe 100644 --- a/apps-rendering/src/components/FootballScores/index.tsx +++ b/apps-rendering/src/components/FootballScores/index.tsx @@ -8,7 +8,7 @@ import { remSpace, textSans, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { MatchStatusIcon } from 'components/MatchStatusIcon'; import { TeamScore } from 'components/TeamScore'; import { MatchStatusKind, TeamLocation } from 'football'; diff --git a/apps-rendering/src/components/Footer/Footer.defaults.tsx b/apps-rendering/src/components/Footer/Footer.defaults.tsx index 505a838c0f0..65cb9f2b6a9 100644 --- a/apps-rendering/src/components/Footer/Footer.defaults.tsx +++ b/apps-rendering/src/components/Footer/Footer.defaults.tsx @@ -9,7 +9,7 @@ import { neutral, remSpace, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import FooterContent from 'components/FooterContent'; import { background } from 'palette'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Footer/GalleryFooter.tsx b/apps-rendering/src/components/Footer/GalleryFooter.tsx index 952b77fd49d..eee417dc28f 100644 --- a/apps-rendering/src/components/Footer/GalleryFooter.tsx +++ b/apps-rendering/src/components/Footer/GalleryFooter.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, neutral, remSpace } from '@guardian/source-foundations'; +import { from, neutral, remSpace } from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import { background, border, text } from 'palette'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Footer/ImmersiveFooter.tsx b/apps-rendering/src/components/Footer/ImmersiveFooter.tsx index e65d1013061..15aac5f015b 100644 --- a/apps-rendering/src/components/Footer/ImmersiveFooter.tsx +++ b/apps-rendering/src/components/Footer/ImmersiveFooter.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import LeftCentreBorder from 'grid/LeftCentreBorder'; import { background } from 'palette'; diff --git a/apps-rendering/src/components/GenericEmbed/index.tsx b/apps-rendering/src/components/GenericEmbed/index.tsx index 9ede1cc79df..970cd3139ed 100644 --- a/apps-rendering/src/components/GenericEmbed/index.tsx +++ b/apps-rendering/src/components/GenericEmbed/index.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { css } from '@emotion/react'; -import { remSpace, text, textSans14 } from '@guardian/source-foundations'; +import { remSpace, text, textSans14 } from '@guardian/source/foundations'; import { withDefault } from '../../../vendor/@guardian/types/index'; import type { Generic, TikTok } from 'embed'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/HeadingTwo/HeadingTwo.defaults.tsx b/apps-rendering/src/components/HeadingTwo/HeadingTwo.defaults.tsx index 4f5f5c32dc1..f90f99e420a 100644 --- a/apps-rendering/src/components/HeadingTwo/HeadingTwo.defaults.tsx +++ b/apps-rendering/src/components/HeadingTwo/HeadingTwo.defaults.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { headlineBold20, remSpace } from '@guardian/source-foundations'; +import { headlineBold20, remSpace } from '@guardian/source/foundations'; import { withDefault } from '../../../vendor/@guardian/types/index'; import type { HeadingTwo as HeadingTwoType } from 'bodyElement'; import Anchor from 'components/Anchor'; diff --git a/apps-rendering/src/components/HeadingTwo/ImmersiveHeadingTwo.tsx b/apps-rendering/src/components/HeadingTwo/ImmersiveHeadingTwo.tsx index 0475dcfac65..f7e7400be21 100644 --- a/apps-rendering/src/components/HeadingTwo/ImmersiveHeadingTwo.tsx +++ b/apps-rendering/src/components/HeadingTwo/ImmersiveHeadingTwo.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { headlineLight34 } from '@guardian/source-foundations'; +import { headlineLight34 } from '@guardian/source/foundations'; import { text } from 'palette'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/HeadingTwo/LabsHeadingTwo.tsx b/apps-rendering/src/components/HeadingTwo/LabsHeadingTwo.tsx index 4ac7f8e120c..30721f7f1cd 100644 --- a/apps-rendering/src/components/HeadingTwo/LabsHeadingTwo.tsx +++ b/apps-rendering/src/components/HeadingTwo/LabsHeadingTwo.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { css } from '@emotion/react'; -import { textSansBold20 } from '@guardian/source-foundations'; +import { textSansBold20 } from '@guardian/source/foundations'; import type { FC } from 'react'; import type { DefaultProps } from './HeadingTwo.defaults'; import DefaultHeadingTwo, { defaultStyles } from './HeadingTwo.defaults'; diff --git a/apps-rendering/src/components/Headline/BlogHeadline.tsx b/apps-rendering/src/components/Headline/BlogHeadline.tsx index f49780ad834..cf548de7f24 100644 --- a/apps-rendering/src/components/Headline/BlogHeadline.tsx +++ b/apps-rendering/src/components/Headline/BlogHeadline.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { Item } from 'item'; import { DefaultHeadline, defaultStyles } from './Headline.defaults'; diff --git a/apps-rendering/src/components/Headline/CommentHeadline.tsx b/apps-rendering/src/components/Headline/CommentHeadline.tsx index 4e79dd2a0e4..51201150bcb 100644 --- a/apps-rendering/src/components/Headline/CommentHeadline.tsx +++ b/apps-rendering/src/components/Headline/CommentHeadline.tsx @@ -4,7 +4,7 @@ import { headlineLight28, headlineLight34, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { DefaultHeadline, defaultStyles } from './Headline.defaults'; diff --git a/apps-rendering/src/components/Headline/FeatureHeadline.tsx b/apps-rendering/src/components/Headline/FeatureHeadline.tsx index 6fd186fe2f4..5627e528376 100644 --- a/apps-rendering/src/components/Headline/FeatureHeadline.tsx +++ b/apps-rendering/src/components/Headline/FeatureHeadline.tsx @@ -3,7 +3,7 @@ import { from, headlineBold28, headlineBold34, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { DefaultHeadline, defaultStyles } from './Headline.defaults'; diff --git a/apps-rendering/src/components/Headline/GalleryHeadline.tsx b/apps-rendering/src/components/Headline/GalleryHeadline.tsx index 75698b59560..2c5497419bd 100644 --- a/apps-rendering/src/components/Headline/GalleryHeadline.tsx +++ b/apps-rendering/src/components/Headline/GalleryHeadline.tsx @@ -8,7 +8,7 @@ import { headlineBold34, headlineBold50, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import { background, text } from 'palette'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Headline/Headline.defaults.tsx b/apps-rendering/src/components/Headline/Headline.defaults.tsx index 28142abf089..125004e1928 100644 --- a/apps-rendering/src/components/Headline/Headline.defaults.tsx +++ b/apps-rendering/src/components/Headline/Headline.defaults.tsx @@ -9,7 +9,7 @@ import { headlineMedium28, headlineMedium34, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import DesignTag from 'components/DesignTag'; import type { Item } from 'item'; import { getFormat } from 'item'; diff --git a/apps-rendering/src/components/Headline/ImmersiveHeadline.tsx b/apps-rendering/src/components/Headline/ImmersiveHeadline.tsx index a43b58706f7..9606f24dce6 100644 --- a/apps-rendering/src/components/Headline/ImmersiveHeadline.tsx +++ b/apps-rendering/src/components/Headline/ImmersiveHeadline.tsx @@ -8,7 +8,7 @@ import { headlineBold34, headlineBold50, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import { background, text } from 'palette'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Headline/InterviewHeadline.tsx b/apps-rendering/src/components/Headline/InterviewHeadline.tsx index d27b837407f..67e1ec3f85b 100644 --- a/apps-rendering/src/components/Headline/InterviewHeadline.tsx +++ b/apps-rendering/src/components/Headline/InterviewHeadline.tsx @@ -4,7 +4,7 @@ import { headlineBold28, headlineBold34, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import DesignTag from 'components/DesignTag'; import HeadlineByline from 'components/HeadlineByline'; import type { Item } from 'item'; diff --git a/apps-rendering/src/components/Headline/LabsHeadline.tsx b/apps-rendering/src/components/Headline/LabsHeadline.tsx index 44200bf9aca..cde33834a3d 100644 --- a/apps-rendering/src/components/Headline/LabsHeadline.tsx +++ b/apps-rendering/src/components/Headline/LabsHeadline.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, textSans34 } from '@guardian/source-foundations'; +import { from, textSans34 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { DefaultHeadline, defaultStyles } from './Headline.defaults'; diff --git a/apps-rendering/src/components/Headline/MediaHeadline.tsx b/apps-rendering/src/components/Headline/MediaHeadline.tsx index d48a8f95df2..41e909d3bcd 100644 --- a/apps-rendering/src/components/Headline/MediaHeadline.tsx +++ b/apps-rendering/src/components/Headline/MediaHeadline.tsx @@ -3,7 +3,7 @@ import { from, headlineMedium28, headlineMedium34, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { DefaultHeadline, defaultStyles } from './Headline.defaults'; diff --git a/apps-rendering/src/components/Headline/ReviewHeadline.tsx b/apps-rendering/src/components/Headline/ReviewHeadline.tsx index db7d83667ea..7f96871b66a 100644 --- a/apps-rendering/src/components/Headline/ReviewHeadline.tsx +++ b/apps-rendering/src/components/Headline/ReviewHeadline.tsx @@ -3,7 +3,7 @@ import { from, headlineBold28, headlineBold34, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { defaultStyles } from './Headline.defaults'; diff --git a/apps-rendering/src/components/HeadlineByline/index.tsx b/apps-rendering/src/components/HeadlineByline/index.tsx index a5ba5001b2f..281eca5c78e 100644 --- a/apps-rendering/src/components/HeadlineByline/index.tsx +++ b/apps-rendering/src/components/HeadlineByline/index.tsx @@ -7,7 +7,7 @@ import { headline, remSpace, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { withDefault } from '../../../vendor/@guardian/types/index'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/HorizontalRule/index.tsx b/apps-rendering/src/components/HorizontalRule/index.tsx index 583400fcfeb..1207a9123b2 100644 --- a/apps-rendering/src/components/HorizontalRule/index.tsx +++ b/apps-rendering/src/components/HorizontalRule/index.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { css } from '@emotion/react'; -import { neutral, remSpace } from '@guardian/source-foundations'; +import { neutral, remSpace } from '@guardian/source/foundations'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Img/index.tsx b/apps-rendering/src/components/Img/index.tsx index 5e5356ff9b8..2fe5bd87b4a 100644 --- a/apps-rendering/src/components/Img/index.tsx +++ b/apps-rendering/src/components/Img/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css, jsx as styledH } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleElementRole } from '@guardian/libs'; -import { neutral } from '@guardian/source-foundations'; +import { neutral } from '@guardian/source/foundations'; import { withDefault } from '../../../vendor/@guardian/types/index'; import type { Image } from 'image'; import { createElement as h } from 'react'; diff --git a/apps-rendering/src/components/ImgAlt/index.tsx b/apps-rendering/src/components/ImgAlt/index.tsx index 0687fcc55eb..714fa6a3a00 100644 --- a/apps-rendering/src/components/ImgAlt/index.tsx +++ b/apps-rendering/src/components/ImgAlt/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; import type { ArticleFormat } from '@guardian/libs'; -import { neutral } from '@guardian/source-foundations'; +import { neutral } from '@guardian/source/foundations'; import { withDefault } from '../../../vendor/@guardian/types/index'; import type { Option } from '../../../vendor/@guardian/types/index'; import type { Image } from 'image/image'; diff --git a/apps-rendering/src/components/InPageNewsletterSignup/NotSupportedMessage.tsx b/apps-rendering/src/components/InPageNewsletterSignup/NotSupportedMessage.tsx index 48bba576723..c80f2cc1dab 100644 --- a/apps-rendering/src/components/InPageNewsletterSignup/NotSupportedMessage.tsx +++ b/apps-rendering/src/components/InPageNewsletterSignup/NotSupportedMessage.tsx @@ -1,6 +1,6 @@ // ----- Imports ----- // -import { InlineError } from '@guardian/source-react-components'; +import { InlineError } from '@guardian/source/react-components'; import type { FC } from 'react'; // ----- Component ----- // diff --git a/apps-rendering/src/components/InPageNewsletterSignup/index.tsx b/apps-rendering/src/components/InPageNewsletterSignup/index.tsx index 254275f7388..f38cae7af72 100644 --- a/apps-rendering/src/components/InPageNewsletterSignup/index.tsx +++ b/apps-rendering/src/components/InPageNewsletterSignup/index.tsx @@ -4,7 +4,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; import type { Newsletter } from '@guardian/apps-rendering-api-models/newsletter'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import { background, border, text } from 'palette'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/InlineSkipToWrapper/index.tsx b/apps-rendering/src/components/InlineSkipToWrapper/index.tsx index dfc0d24c578..1f53fbad94e 100644 --- a/apps-rendering/src/components/InlineSkipToWrapper/index.tsx +++ b/apps-rendering/src/components/InlineSkipToWrapper/index.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { css } from '@emotion/react'; -import { border, neutral, textSans17 } from '@guardian/source-foundations'; +import { border, neutral, textSans17 } from '@guardian/source/foundations'; import type { FC, ReactNode } from 'react'; // ----- Component ----- // diff --git a/apps-rendering/src/components/Interactive/index.tsx b/apps-rendering/src/components/Interactive/index.tsx index b8112f2ff63..1c8f6b84088 100644 --- a/apps-rendering/src/components/Interactive/index.tsx +++ b/apps-rendering/src/components/Interactive/index.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { css } from '@emotion/react'; -import { neutral, remSpace } from '@guardian/source-foundations'; +import { neutral, remSpace } from '@guardian/source/foundations'; import { withDefault } from '../../../vendor/@guardian/types/index'; import type { Option } from '../../../vendor/@guardian/types/index'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/InteractiveAtom/index.tsx b/apps-rendering/src/components/InteractiveAtom/index.tsx index 73d2c57645d..bab0820ac49 100644 --- a/apps-rendering/src/components/InteractiveAtom/index.tsx +++ b/apps-rendering/src/components/InteractiveAtom/index.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css, jsx as styledH } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import { pipe } from 'lib'; diff --git a/apps-rendering/src/components/KeyEvents/index.tsx b/apps-rendering/src/components/KeyEvents/index.tsx index 3c4288d1bd6..512255caf96 100644 --- a/apps-rendering/src/components/KeyEvents/index.tsx +++ b/apps-rendering/src/components/KeyEvents/index.tsx @@ -15,8 +15,8 @@ import { sport, textSans, textSans15, -} from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import Accordion from 'components/Accordion'; import { background, text } from 'palette'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Kicker/index.tsx b/apps-rendering/src/components/Kicker/index.tsx index bd76758b650..7be914105f5 100644 --- a/apps-rendering/src/components/Kicker/index.tsx +++ b/apps-rendering/src/components/Kicker/index.tsx @@ -2,7 +2,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { maybeRender } from 'lib'; import { text as kickerTextPalette } from 'palette'; diff --git a/apps-rendering/src/components/LabsLogo/index.tsx b/apps-rendering/src/components/LabsLogo/index.tsx index 62e4b1d14fe..a58218a7af3 100644 --- a/apps-rendering/src/components/LabsLogo/index.tsx +++ b/apps-rendering/src/components/LabsLogo/index.tsx @@ -5,7 +5,7 @@ import { remSpace, text, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Logo as LogoImage } from 'capi'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/LastUpdated/index.tsx b/apps-rendering/src/components/LastUpdated/index.tsx index b044fbad300..90851815d54 100644 --- a/apps-rendering/src/components/LastUpdated/index.tsx +++ b/apps-rendering/src/components/LastUpdated/index.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral, textSans12 } from '@guardian/source-foundations'; +import { neutral, textSans12 } from '@guardian/source/foundations'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Layout/AnalysisLayout.tsx b/apps-rendering/src/components/Layout/AnalysisLayout.tsx index f585fdaa828..cd7ba292fe6 100644 --- a/apps-rendering/src/components/Layout/AnalysisLayout.tsx +++ b/apps-rendering/src/components/Layout/AnalysisLayout.tsx @@ -3,8 +3,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { breakpoints, from } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { breakpoints, from } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import ArticleBody from 'components/ArticleBody'; import Byline from 'components/Byline'; import Footer from 'components/Footer'; diff --git a/apps-rendering/src/components/Layout/CommentLayout.tsx b/apps-rendering/src/components/Layout/CommentLayout.tsx index cc94da3c16d..d8b15244ed9 100644 --- a/apps-rendering/src/components/Layout/CommentLayout.tsx +++ b/apps-rendering/src/components/Layout/CommentLayout.tsx @@ -8,8 +8,8 @@ import { from, neutral, remSpace, -} from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import ArticleBody from 'components/ArticleBody'; import Byline from 'components/Byline'; import Cutout from 'components/Cutout'; diff --git a/apps-rendering/src/components/Layout/ImmersiveLayout.tsx b/apps-rendering/src/components/Layout/ImmersiveLayout.tsx index be33f45ae30..054e4fe2326 100644 --- a/apps-rendering/src/components/Layout/ImmersiveLayout.tsx +++ b/apps-rendering/src/components/Layout/ImmersiveLayout.tsx @@ -3,8 +3,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { between, from, palette, remSpace } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { between, from, palette, remSpace } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import Footer from 'components/Footer'; import Headline from 'components/Headline'; import Logo from 'components/Logo'; diff --git a/apps-rendering/src/components/Layout/LabsLayout.tsx b/apps-rendering/src/components/Layout/LabsLayout.tsx index 7697aa8a23b..254f75c52a8 100644 --- a/apps-rendering/src/components/Layout/LabsLayout.tsx +++ b/apps-rendering/src/components/Layout/LabsLayout.tsx @@ -6,8 +6,8 @@ import { breakpoints, from, neutral, -} from '@guardian/source-foundations'; -import { DottedLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { DottedLines } from '@guardian/source-development-kitchen/react-components'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import ArticleBody from 'components/ArticleBody'; import Footer from 'components/Footer'; diff --git a/apps-rendering/src/components/Layout/Layout.stories.tsx b/apps-rendering/src/components/Layout/Layout.stories.tsx index 9ec4862f569..7e7283f5d05 100644 --- a/apps-rendering/src/components/Layout/Layout.stories.tsx +++ b/apps-rendering/src/components/Layout/Layout.stories.tsx @@ -2,7 +2,7 @@ import { Edition } from '@guardian/apps-rendering-api-models/edition'; import { ArticleSpecial } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { StoryFn } from '@storybook/react'; import { formatToString } from 'articleFormat'; import { diff --git a/apps-rendering/src/components/Layout/LetterLayout.tsx b/apps-rendering/src/components/Layout/LetterLayout.tsx index f34c8f561d0..b2035168f2e 100644 --- a/apps-rendering/src/components/Layout/LetterLayout.tsx +++ b/apps-rendering/src/components/Layout/LetterLayout.tsx @@ -3,8 +3,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { breakpoints, from } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { breakpoints, from } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import ArticleBody from 'components/ArticleBody'; import Byline from 'components/Byline'; import Cutout from 'components/Cutout'; diff --git a/apps-rendering/src/components/Layout/LiveLayout.tsx b/apps-rendering/src/components/Layout/LiveLayout.tsx index 25c776ef4c2..6da05c8af46 100644 --- a/apps-rendering/src/components/Layout/LiveLayout.tsx +++ b/apps-rendering/src/components/Layout/LiveLayout.tsx @@ -10,7 +10,7 @@ import { news, pxToRem, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { fromNullable } from '../../../vendor/@guardian/types/index'; import Footer from 'components/Footer'; import GridItem from 'components/GridItem'; diff --git a/apps-rendering/src/components/Layout/NewsletterSignUpLayout.tsx b/apps-rendering/src/components/Layout/NewsletterSignUpLayout.tsx index 487db65a2b2..96b7a2dae24 100644 --- a/apps-rendering/src/components/Layout/NewsletterSignUpLayout.tsx +++ b/apps-rendering/src/components/Layout/NewsletterSignUpLayout.tsx @@ -9,8 +9,8 @@ import { textSans14, textSansBold14, until, -} from '@guardian/source-foundations'; -import { SvgClock, SvgNewsletter } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgClock, SvgNewsletter } from '@guardian/source/react-components'; import { OptionKind } from '../../../vendor/@guardian/types/index'; import ArticleBody from 'components/ArticleBody'; import Footer from 'components/Footer'; diff --git a/apps-rendering/src/components/Layout/StandardLayout.tsx b/apps-rendering/src/components/Layout/StandardLayout.tsx index b55dce5a082..75220068e43 100644 --- a/apps-rendering/src/components/Layout/StandardLayout.tsx +++ b/apps-rendering/src/components/Layout/StandardLayout.tsx @@ -4,11 +4,11 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticlePillar } from '@guardian/libs'; -import { breakpoints, from } from '@guardian/source-foundations'; +import { breakpoints, from } from '@guardian/source/foundations'; import { DottedLines, StraightLines, -} from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source-development-kitchen/react-components'; import Body from 'components/ArticleBody'; import Epic from 'components/Epic'; import FootballScores from 'components/FootballScores'; diff --git a/apps-rendering/src/components/Layout/index.tsx b/apps-rendering/src/components/Layout/index.tsx index 0fe695acc39..a465a6f2eaa 100644 --- a/apps-rendering/src/components/Layout/index.tsx +++ b/apps-rendering/src/components/Layout/index.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, ArticleSpecial } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import CommentLayout from 'components/Layout/CommentLayout'; import GalleryLayout from 'components/Layout/GalleryLayout'; import InteractiveLayout from 'components/Layout/InteractiveLayout'; diff --git a/apps-rendering/src/components/List/index.tsx b/apps-rendering/src/components/List/index.tsx index 0f5505a1811..b3b0d4ad121 100644 --- a/apps-rendering/src/components/List/index.tsx +++ b/apps-rendering/src/components/List/index.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import { background } from 'palette'; import type { FC, ReactNode } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/ListItem/index.tsx b/apps-rendering/src/components/ListItem/index.tsx index 78fb3949328..e107f55eb1b 100644 --- a/apps-rendering/src/components/ListItem/index.tsx +++ b/apps-rendering/src/components/ListItem/index.tsx @@ -2,7 +2,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { FC, ReactNode } from 'react'; // ----- Component ----- // diff --git a/apps-rendering/src/components/LiveBlockContainer/index.tsx b/apps-rendering/src/components/LiveBlockContainer/index.tsx index 096d0aa8812..cd8dde96454 100644 --- a/apps-rendering/src/components/LiveBlockContainer/index.tsx +++ b/apps-rendering/src/components/LiveBlockContainer/index.tsx @@ -7,7 +7,7 @@ import { headlineBold20, neutral, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import FirstPublished from 'components/FirstPublished'; import type { Contributor } from 'contributor'; import type { Image } from 'image'; diff --git a/apps-rendering/src/components/LiveDateline/index.tsx b/apps-rendering/src/components/LiveDateline/index.tsx index a495ae90d2f..afefb721f67 100644 --- a/apps-rendering/src/components/LiveDateline/index.tsx +++ b/apps-rendering/src/components/LiveDateline/index.tsx @@ -3,7 +3,7 @@ import { css, keyframes } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { neutral, pxToRem, textSans } from '@guardian/source-foundations'; +import { neutral, pxToRem, textSans } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { makeRelativeDate } from 'date'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/LiveEventLink/index.tsx b/apps-rendering/src/components/LiveEventLink/index.tsx index 0bd88d04f1f..d0341ccef70 100644 --- a/apps-rendering/src/components/LiveEventLink/index.tsx +++ b/apps-rendering/src/components/LiveEventLink/index.tsx @@ -6,8 +6,8 @@ import { remSpace, textSans14, textSans15, -} from '@guardian/source-foundations'; -import { SvgGuardianLiveLogo } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgGuardianLiveLogo } from '@guardian/source/react-components'; import type { ReactElement } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/LiveblogHeader/index.tsx b/apps-rendering/src/components/LiveblogHeader/index.tsx index 3cab6ea73bc..f79ff3674cd 100644 --- a/apps-rendering/src/components/LiveblogHeader/index.tsx +++ b/apps-rendering/src/components/LiveblogHeader/index.tsx @@ -3,13 +3,13 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import { Column, Columns, Container, Hide, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import Headline from 'components/Headline'; import LiveDateline from 'components/LiveDateline'; import Series from 'components/Series'; diff --git a/apps-rendering/src/components/LiveblogMetadataLines/index.tsx b/apps-rendering/src/components/LiveblogMetadataLines/index.tsx index d66195fe9bf..99008896165 100644 --- a/apps-rendering/src/components/LiveblogMetadataLines/index.tsx +++ b/apps-rendering/src/components/LiveblogMetadataLines/index.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, neutral, until } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { from, neutral, until } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Logo/index.tsx b/apps-rendering/src/components/Logo/index.tsx index a01906750bd..8e5225bf04a 100644 --- a/apps-rendering/src/components/Logo/index.tsx +++ b/apps-rendering/src/components/Logo/index.tsx @@ -2,7 +2,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace, textSans15, until } from '@guardian/source-foundations'; +import { remSpace, textSans15, until } from '@guardian/source/foundations'; import Anchor from 'components/Anchor'; import { getFormat } from 'item'; import type { Item } from 'item'; diff --git a/apps-rendering/src/components/MainMedia/GalleryCaption.tsx b/apps-rendering/src/components/MainMedia/GalleryCaption.tsx index f49681b0360..f913efec394 100644 --- a/apps-rendering/src/components/MainMedia/GalleryCaption.tsx +++ b/apps-rendering/src/components/MainMedia/GalleryCaption.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace, textSans14 } from '@guardian/source-foundations'; +import { from, remSpace, textSans14 } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { OptionKind } from '../../../vendor/@guardian/types/index'; import Caption from 'components/caption'; diff --git a/apps-rendering/src/components/MainMedia/ImmersiveCaption.tsx b/apps-rendering/src/components/MainMedia/ImmersiveCaption.tsx index 44a3a1ab181..3ddd30c06c6 100644 --- a/apps-rendering/src/components/MainMedia/ImmersiveCaption.tsx +++ b/apps-rendering/src/components/MainMedia/ImmersiveCaption.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace, textSans14 } from '@guardian/source-foundations'; +import { from, remSpace, textSans14 } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { OptionKind } from '../../../vendor/@guardian/types/index'; import Caption from 'components/caption'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaImage/BlogMainMediaImage.tsx b/apps-rendering/src/components/MainMedia/MainMediaImage/BlogMainMediaImage.tsx index 0d169f9fe1e..208fdbe78cf 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaImage/BlogMainMediaImage.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaImage/BlogMainMediaImage.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { between, remSpace } from '@guardian/source-foundations'; +import { between, remSpace } from '@guardian/source/foundations'; import { none } from '../../../../vendor/@guardian/types/index'; import type { Image } from 'image'; import type { Sizes } from 'image/sizes'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaImage/CommentMainMediaImage.tsx b/apps-rendering/src/components/MainMedia/MainMediaImage/CommentMainMediaImage.tsx index 66376c4b0ed..08bc8504a1b 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaImage/CommentMainMediaImage.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaImage/CommentMainMediaImage.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; +import { from, remSpace } from '@guardian/source/foundations'; import type { Image } from 'image'; import type { FC } from 'react'; import { wideContentWidth } from 'styles'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaImage/GalleryMainMediaImage.tsx b/apps-rendering/src/components/MainMedia/MainMediaImage/GalleryMainMediaImage.tsx index 121d5f229cf..bd822536677 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaImage/GalleryMainMediaImage.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaImage/GalleryMainMediaImage.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { some } from '../../../../vendor/@guardian/types/index'; import Img from 'components/ImgAlt'; import { grid } from 'grid/grid'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaImage/ImmersiveMainMediaImage.tsx b/apps-rendering/src/components/MainMedia/MainMediaImage/ImmersiveMainMediaImage.tsx index a388f368fb2..d425027a5fb 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaImage/ImmersiveMainMediaImage.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaImage/ImmersiveMainMediaImage.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { some } from '../../../../vendor/@guardian/types/index'; import Img from 'components/ImgAlt'; import { grid } from 'grid/grid'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaImage/InterviewMainMediaImage.tsx b/apps-rendering/src/components/MainMedia/MainMediaImage/InterviewMainMediaImage.tsx index 4486ea4fc2a..dc534183c96 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaImage/InterviewMainMediaImage.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaImage/InterviewMainMediaImage.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; +import { from, remSpace } from '@guardian/source/foundations'; import type { Image } from 'image'; import type { FC } from 'react'; import { wideContentWidth } from 'styles'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaImage/MainMediaImage.defaults.tsx b/apps-rendering/src/components/MainMedia/MainMediaImage/MainMediaImage.defaults.tsx index e795244ae56..c132876a6d1 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaImage/MainMediaImage.defaults.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaImage/MainMediaImage.defaults.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; +import { from, remSpace } from '@guardian/source/foundations'; import type { Option } from '../../../../vendor/@guardian/types/index'; import { some } from '../../../../vendor/@guardian/types/index'; import Img from 'components/ImgAlt'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaImage/NewsletterSignupMainMediaImage.tsx b/apps-rendering/src/components/MainMedia/MainMediaImage/NewsletterSignupMainMediaImage.tsx index 059b08ad41a..49bcef2ea37 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaImage/NewsletterSignupMainMediaImage.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaImage/NewsletterSignupMainMediaImage.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; +import { from, remSpace } from '@guardian/source/foundations'; import { none, some } from '../../../../vendor/@guardian/types/index'; import Img from 'components/ImgAlt'; import type { Image } from 'image'; diff --git a/apps-rendering/src/components/MainMedia/MainMediaVideo/index.tsx b/apps-rendering/src/components/MainMedia/MainMediaVideo/index.tsx index 17c2e0dc46a..a8eb0366a2c 100644 --- a/apps-rendering/src/components/MainMedia/MainMediaVideo/index.tsx +++ b/apps-rendering/src/components/MainMedia/MainMediaVideo/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { from, neutral, remSpace } from '@guardian/source-foundations'; +import { from, neutral, remSpace } from '@guardian/source/foundations'; import type { FC } from 'react'; import { darkModeCss, wideContentWidth } from 'styles'; import type { Video } from 'video'; diff --git a/apps-rendering/src/components/MainMediaCaption/Caption.tsx b/apps-rendering/src/components/MainMediaCaption/Caption.tsx index f15b1796286..3d9f5a58ef5 100644 --- a/apps-rendering/src/components/MainMediaCaption/Caption.tsx +++ b/apps-rendering/src/components/MainMediaCaption/Caption.tsx @@ -6,7 +6,7 @@ import { neutral, textSansBold14, textSansItalic14, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { OptionKind } from '../../../vendor/@guardian/types/index'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/MainMediaCaption/MainMediaCaption.defaults.tsx b/apps-rendering/src/components/MainMediaCaption/MainMediaCaption.defaults.tsx index 21e698af35c..35f5d7f143b 100644 --- a/apps-rendering/src/components/MainMediaCaption/MainMediaCaption.defaults.tsx +++ b/apps-rendering/src/components/MainMediaCaption/MainMediaCaption.defaults.tsx @@ -9,8 +9,8 @@ import { remSpace, textSans14, textSans15, -} from '@guardian/source-foundations'; -import { SvgCamera } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgCamera } from '@guardian/source/react-components'; import type { Option } from '../../../vendor/@guardian/types/index'; import { OptionKind, withDefault } from '../../../vendor/@guardian/types/index'; import type { Styleable } from 'lib'; diff --git a/apps-rendering/src/components/MatchStatusIcon/index.tsx b/apps-rendering/src/components/MatchStatusIcon/index.tsx index f2ff2c2a919..df27c89f8f5 100644 --- a/apps-rendering/src/components/MatchStatusIcon/index.tsx +++ b/apps-rendering/src/components/MatchStatusIcon/index.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { neutral, textSansBold15 } from '@guardian/source-foundations'; +import { neutral, textSansBold15 } from '@guardian/source/foundations'; import { MatchStatusKind } from 'football'; import type { MatchStatus } from 'football'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Metadata/ExtendedMetadata.tsx b/apps-rendering/src/components/Metadata/ExtendedMetadata.tsx index fe9a1b00e5c..0b0f0b2e762 100644 --- a/apps-rendering/src/components/Metadata/ExtendedMetadata.tsx +++ b/apps-rendering/src/components/Metadata/ExtendedMetadata.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { Item } from 'item'; import type { FC } from 'react'; import DefaultMetadata, { defaultStyles } from './Metadata.defaults'; diff --git a/apps-rendering/src/components/Metadata/GalleryMetadata.tsx b/apps-rendering/src/components/Metadata/GalleryMetadata.tsx index 522c2164fe3..f6c69124898 100644 --- a/apps-rendering/src/components/Metadata/GalleryMetadata.tsx +++ b/apps-rendering/src/components/Metadata/GalleryMetadata.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { Edition } from '@guardian/apps-rendering-api-models/edition'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import CommentCount from 'components/CommentCount'; import Dateline from 'components/Dateline'; diff --git a/apps-rendering/src/components/Metadata/ImmersiveMetadata.tsx b/apps-rendering/src/components/Metadata/ImmersiveMetadata.tsx index 8e870fe913d..a589dd50be3 100644 --- a/apps-rendering/src/components/Metadata/ImmersiveMetadata.tsx +++ b/apps-rendering/src/components/Metadata/ImmersiveMetadata.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import type { Edition } from '@guardian/apps-rendering-api-models/edition'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; +import { from, remSpace } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import CommentCount from 'components/CommentCount'; import Dateline from 'components/Dateline'; diff --git a/apps-rendering/src/components/Metadata/LiveBlogMetadata.tsx b/apps-rendering/src/components/Metadata/LiveBlogMetadata.tsx index b4f0df6fdc2..a8cf3f2324a 100644 --- a/apps-rendering/src/components/Metadata/LiveBlogMetadata.tsx +++ b/apps-rendering/src/components/Metadata/LiveBlogMetadata.tsx @@ -8,8 +8,8 @@ import { neutral, remSpace, until, -} from '@guardian/source-foundations'; -import { ToggleSwitchApps } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { ToggleSwitchApps } from '@guardian/source-development-kitchen/react-components'; import Avatar from 'components/Avatar'; import Byline from 'components/Byline'; import CommentCount from 'components/CommentCount'; diff --git a/apps-rendering/src/components/Metadata/Metadata.defaults.tsx b/apps-rendering/src/components/Metadata/Metadata.defaults.tsx index 942d9a6084a..912f6a08ad1 100644 --- a/apps-rendering/src/components/Metadata/Metadata.defaults.tsx +++ b/apps-rendering/src/components/Metadata/Metadata.defaults.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import Avatar from 'components/Avatar'; import Byline from 'components/Byline'; import CommentCount from 'components/CommentCount'; diff --git a/apps-rendering/src/components/Metadata/Metadata.stories.tsx b/apps-rendering/src/components/Metadata/Metadata.stories.tsx index 094563e9aa5..6a4445bda20 100644 --- a/apps-rendering/src/components/Metadata/Metadata.stories.tsx +++ b/apps-rendering/src/components/Metadata/Metadata.stories.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { css } from '@emotion/react'; -import { from, neutral } from '@guardian/source-foundations'; +import { from, neutral } from '@guardian/source/foundations'; import { comment } from 'fixtures/item'; import { deadBlog, live } from 'fixtures/live'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Metadata/ShortMetadata.tsx b/apps-rendering/src/components/Metadata/ShortMetadata.tsx index c118c0f2ce3..f8467bc5d95 100644 --- a/apps-rendering/src/components/Metadata/ShortMetadata.tsx +++ b/apps-rendering/src/components/Metadata/ShortMetadata.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { Item } from 'item'; import type { FC } from 'react'; import DefaultMetadata from './Metadata.defaults'; diff --git a/apps-rendering/src/components/NewsletterSignup/PrivacyWording.tsx b/apps-rendering/src/components/NewsletterSignup/PrivacyWording.tsx index 833745c7a63..c2690c38bae 100644 --- a/apps-rendering/src/components/NewsletterSignup/PrivacyWording.tsx +++ b/apps-rendering/src/components/NewsletterSignup/PrivacyWording.tsx @@ -3,8 +3,8 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { textSans, textSansBold12 } from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +import { textSans, textSansBold12 } from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import { text } from 'palette'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/NewsletterSignup/index.tsx b/apps-rendering/src/components/NewsletterSignup/index.tsx index 7835fa42f1f..b8f8d7280b4 100644 --- a/apps-rendering/src/components/NewsletterSignup/index.tsx +++ b/apps-rendering/src/components/NewsletterSignup/index.tsx @@ -12,8 +12,8 @@ import { sport, textSans, textSansBold14, -} from '@guardian/source-foundations'; -import { SvgNewsletter } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgNewsletter } from '@guardian/source/react-components'; import type { NewsletterSignUp } from 'bodyElement'; import { background, border, text } from 'palette'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/OrderedList/index.tsx b/apps-rendering/src/components/OrderedList/index.tsx index c24a1a7e98f..3d0e2c0cdb3 100644 --- a/apps-rendering/src/components/OrderedList/index.tsx +++ b/apps-rendering/src/components/OrderedList/index.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { FC, ReactNode } from 'react'; // ----- Component ----- // diff --git a/apps-rendering/src/components/Pagination/Pagination.stories.tsx b/apps-rendering/src/components/Pagination/Pagination.stories.tsx index b3a5b052d5a..65653282f83 100644 --- a/apps-rendering/src/components/Pagination/Pagination.stories.tsx +++ b/apps-rendering/src/components/Pagination/Pagination.stories.tsx @@ -1,5 +1,5 @@ import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { StoryFn } from '@storybook/react'; import { formatToString } from 'articleFormat'; import { getAllThemes } from 'fixtures/article'; diff --git a/apps-rendering/src/components/Pagination/index.tsx b/apps-rendering/src/components/Pagination/index.tsx index b6d7e7a2198..eaa0228fc43 100644 --- a/apps-rendering/src/components/Pagination/index.tsx +++ b/apps-rendering/src/components/Pagination/index.tsx @@ -6,7 +6,7 @@ import { space, textSans15, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Hide, LinkButton, @@ -14,7 +14,7 @@ import { SvgChevronLeftSingle, SvgChevronRightDouble, SvgChevronRightSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { border, hover, text } from 'palette'; import type { FC, ReactElement, ReactNode } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Paragraph/index.tsx b/apps-rendering/src/components/Paragraph/index.tsx index 3c8213e94e4..c47630da1fa 100644 --- a/apps-rendering/src/components/Paragraph/index.tsx +++ b/apps-rendering/src/components/Paragraph/index.tsx @@ -9,7 +9,7 @@ import { headline, remSpace, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { text } from 'palette'; import type { FC, ReactNode } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/PinnedPost/PinnedPost.stories.tsx b/apps-rendering/src/components/PinnedPost/PinnedPost.stories.tsx index d116b7a3b51..d357e0ad987 100644 --- a/apps-rendering/src/components/PinnedPost/PinnedPost.stories.tsx +++ b/apps-rendering/src/components/PinnedPost/PinnedPost.stories.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import { Edition } from '@guardian/apps-rendering-api-models/edition'; import type { ArticleFormat, Pillar } from '@guardian/libs'; import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { pinnedBlock } from 'fixtures/item'; import type { FC } from 'react'; import PinnedPost from './'; diff --git a/apps-rendering/src/components/PinnedPost/index.tsx b/apps-rendering/src/components/PinnedPost/index.tsx index 02a155a2153..435a2dffe05 100644 --- a/apps-rendering/src/components/PinnedPost/index.tsx +++ b/apps-rendering/src/components/PinnedPost/index.tsx @@ -13,12 +13,12 @@ import { textSansBold17, transitions, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgMinus, SvgPinned, SvgPlus, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import LiveBlock from 'components/LiveBlock'; import type { LiveBlock as LiveBlockType } from 'liveBlock'; import { background, border } from 'palette'; diff --git a/apps-rendering/src/components/Pullquote/index.tsx b/apps-rendering/src/components/Pullquote/index.tsx index a17c3674d13..8d661afa7e3 100644 --- a/apps-rendering/src/components/Pullquote/index.tsx +++ b/apps-rendering/src/components/Pullquote/index.tsx @@ -1,8 +1,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { headlineLight24, remSpace } from '@guardian/source-foundations'; -import { SvgQuote } from '@guardian/source-react-components'; +import { headlineLight24, remSpace } from '@guardian/source/foundations'; +import { SvgQuote } from '@guardian/source/react-components'; import type { Option } from '../../../vendor/@guardian/types/index'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import { pipe } from 'lib'; diff --git a/apps-rendering/src/components/RadioInput/index.tsx b/apps-rendering/src/components/RadioInput/index.tsx index 49ec10fe7fe..2cddb043e44 100644 --- a/apps-rendering/src/components/RadioInput/index.tsx +++ b/apps-rendering/src/components/RadioInput/index.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import type { FormField } from '@guardian/apps-rendering-api-models/formField'; -import { Radio, RadioGroup } from '@guardian/source-react-components'; +import { Radio, RadioGroup } from '@guardian/source/react-components'; import type { ReactElement } from 'react'; interface RadioInputProps { diff --git a/apps-rendering/src/components/RelatedContent/GalleryRelatedContent.tsx b/apps-rendering/src/components/RelatedContent/GalleryRelatedContent.tsx index 056e6cf739d..e18c3aecb39 100644 --- a/apps-rendering/src/components/RelatedContent/GalleryRelatedContent.tsx +++ b/apps-rendering/src/components/RelatedContent/GalleryRelatedContent.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, neutral, remSpace, until } from '@guardian/source-foundations'; +import { from, neutral, remSpace, until } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { none } from '../../../vendor/@guardian/types/index'; import BylineCard from 'components/BylineCard'; diff --git a/apps-rendering/src/components/RelatedContent/ImmersiveRelatedContent.tsx b/apps-rendering/src/components/RelatedContent/ImmersiveRelatedContent.tsx index dfcdc9f4cc3..7a2e315701e 100644 --- a/apps-rendering/src/components/RelatedContent/ImmersiveRelatedContent.tsx +++ b/apps-rendering/src/components/RelatedContent/ImmersiveRelatedContent.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, neutral, until } from '@guardian/source-foundations'; +import { from, neutral, until } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { grid } from 'grid/grid'; import LeftCentreBorder from 'grid/LeftCentreBorder'; diff --git a/apps-rendering/src/components/RelatedContent/RelatedContent.defaults.tsx b/apps-rendering/src/components/RelatedContent/RelatedContent.defaults.tsx index 20ce966baae..8973c23bde9 100644 --- a/apps-rendering/src/components/RelatedContent/RelatedContent.defaults.tsx +++ b/apps-rendering/src/components/RelatedContent/RelatedContent.defaults.tsx @@ -9,7 +9,7 @@ import { neutral, remSpace, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { map, none, withDefault } from '../../../vendor/@guardian/types/index'; import BylineCard from 'components/BylineCard'; diff --git a/apps-rendering/src/components/RichLink/RichLink.stories.tsx b/apps-rendering/src/components/RichLink/RichLink.stories.tsx index d64a726e1bc..05d911a737c 100644 --- a/apps-rendering/src/components/RichLink/RichLink.stories.tsx +++ b/apps-rendering/src/components/RichLink/RichLink.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; +import { from, remSpace } from '@guardian/source/foundations'; import type { FC } from 'react'; import RichLink, { richLinkWidth } from './'; diff --git a/apps-rendering/src/components/RichLink/index.tsx b/apps-rendering/src/components/RichLink/index.tsx index 51301b20424..7754ba10b6c 100644 --- a/apps-rendering/src/components/RichLink/index.tsx +++ b/apps-rendering/src/components/RichLink/index.tsx @@ -7,8 +7,8 @@ import { headlineBold17, remSpace, textSansBold17, -} from '@guardian/source-foundations'; -import { SvgArrowRightStraight } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgArrowRightStraight } from '@guardian/source/react-components'; import { background, border, fill, text } from 'palette'; import type { ReactElement } from 'react'; import { darkModeCss, darkModeStyles } from 'styles'; diff --git a/apps-rendering/src/components/Series/GallerySeries.tsx b/apps-rendering/src/components/Series/GallerySeries.tsx index aee5b7188d2..85a21e852f3 100644 --- a/apps-rendering/src/components/Series/GallerySeries.tsx +++ b/apps-rendering/src/components/Series/GallerySeries.tsx @@ -9,7 +9,7 @@ import { headlineBold17, headlineBold20, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import { maybeRender } from 'lib'; import type { Optional } from 'optional'; diff --git a/apps-rendering/src/components/Series/ImmersiveSeries.tsx b/apps-rendering/src/components/Series/ImmersiveSeries.tsx index 04ee7458e5e..53fe297a722 100644 --- a/apps-rendering/src/components/Series/ImmersiveSeries.tsx +++ b/apps-rendering/src/components/Series/ImmersiveSeries.tsx @@ -9,7 +9,7 @@ import { headlineBold17, headlineBold20, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import { maybeRender } from 'lib'; import type { Optional } from 'optional'; diff --git a/apps-rendering/src/components/Series/index.tsx b/apps-rendering/src/components/Series/index.tsx index e053512f49b..db2eee92979 100644 --- a/apps-rendering/src/components/Series/index.tsx +++ b/apps-rendering/src/components/Series/index.tsx @@ -11,7 +11,7 @@ import { neutral, remSpace, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/SpecialReportAltAtom/index.tsx b/apps-rendering/src/components/SpecialReportAltAtom/index.tsx index f1e6ea473a7..378d18edda6 100644 --- a/apps-rendering/src/components/SpecialReportAltAtom/index.tsx +++ b/apps-rendering/src/components/SpecialReportAltAtom/index.tsx @@ -3,8 +3,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { FC } from 'react'; -import { article17, body } from '@guardian/source-foundations'; -import { LinkButton } from '@guardian/source-react-components'; +import { article17, body } from '@guardian/source/foundations'; +import { LinkButton } from '@guardian/source/react-components'; import { background, border, hover, text } from 'palette'; import type { ArticleFormat } from '@guardian/libs'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Standfirst/AnalysisStandfirst.tsx b/apps-rendering/src/components/Standfirst/AnalysisStandfirst.tsx index dbac6fcc72f..2f17d498024 100644 --- a/apps-rendering/src/components/Standfirst/AnalysisStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/AnalysisStandfirst.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineMedium17 } from '@guardian/source-foundations'; +import { headlineMedium17 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import DefaultStandfirst, { defaultStyles } from './Standfirst.defaults'; diff --git a/apps-rendering/src/components/Standfirst/DeadBlogStandfirst.tsx b/apps-rendering/src/components/Standfirst/DeadBlogStandfirst.tsx index 398ac3d7542..4e6bf883684 100644 --- a/apps-rendering/src/components/Standfirst/DeadBlogStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/DeadBlogStandfirst.tsx @@ -5,7 +5,7 @@ import { headlineBold17, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { border, text } from 'palette'; diff --git a/apps-rendering/src/components/Standfirst/ExplainerStandfirst.tsx b/apps-rendering/src/components/Standfirst/ExplainerStandfirst.tsx index 96d55ac6a53..f659bab4802 100644 --- a/apps-rendering/src/components/Standfirst/ExplainerStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/ExplainerStandfirst.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineLight17 } from '@guardian/source-foundations'; +import { headlineLight17 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Standfirst/GalleryStandfirst.tsx b/apps-rendering/src/components/Standfirst/GalleryStandfirst.tsx index e4d946af58e..796b6590f33 100644 --- a/apps-rendering/src/components/Standfirst/GalleryStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/GalleryStandfirst.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, headlineBold17, remSpace } from '@guardian/source-foundations'; +import { from, headlineBold17, remSpace } from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import { maybeRender } from 'lib'; import type { Optional } from 'optional'; diff --git a/apps-rendering/src/components/Standfirst/ImmersiveLabsStandfirst.tsx b/apps-rendering/src/components/Standfirst/ImmersiveLabsStandfirst.tsx index e8f79d4051e..3b494b3352e 100644 --- a/apps-rendering/src/components/Standfirst/ImmersiveLabsStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/ImmersiveLabsStandfirst.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { remSpace, textSans20 } from '@guardian/source-foundations'; +import { remSpace, textSans20 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import DefaultStandfirst, { defaultStyles } from './Standfirst.defaults'; diff --git a/apps-rendering/src/components/Standfirst/ImmersiveStandfirst.tsx b/apps-rendering/src/components/Standfirst/ImmersiveStandfirst.tsx index e7e7d56fd07..af3b265df5f 100644 --- a/apps-rendering/src/components/Standfirst/ImmersiveStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/ImmersiveStandfirst.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, headlineLight24, remSpace } from '@guardian/source-foundations'; +import { from, headlineLight24, remSpace } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { OptionKind } from '../../../vendor/@guardian/types/index'; import { grid } from 'grid/grid'; diff --git a/apps-rendering/src/components/Standfirst/InterviewStandfirst.tsx b/apps-rendering/src/components/Standfirst/InterviewStandfirst.tsx index 3aa4bf612d3..c246e1d8e46 100644 --- a/apps-rendering/src/components/Standfirst/InterviewStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/InterviewStandfirst.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Standfirst/LabsStandfirst.tsx b/apps-rendering/src/components/Standfirst/LabsStandfirst.tsx index e714af220df..faaba5069bd 100644 --- a/apps-rendering/src/components/Standfirst/LabsStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/LabsStandfirst.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans17 } from '@guardian/source-foundations'; +import { textSans17 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import DefaultStandfirst, { defaultStyles } from './Standfirst.defaults'; diff --git a/apps-rendering/src/components/Standfirst/LiveBlogStandfirst.tsx b/apps-rendering/src/components/Standfirst/LiveBlogStandfirst.tsx index a35459fd16c..eaa233f2e6e 100644 --- a/apps-rendering/src/components/Standfirst/LiveBlogStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/LiveBlogStandfirst.tsx @@ -3,7 +3,7 @@ import { headlineMedium17, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/Standfirst/MediaStandfirst.tsx b/apps-rendering/src/components/Standfirst/MediaStandfirst.tsx index a4f86ca2624..efa62852e23 100644 --- a/apps-rendering/src/components/Standfirst/MediaStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/MediaStandfirst.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { headlineBold17 } from '@guardian/source-foundations'; +import { headlineBold17 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { text } from 'palette'; diff --git a/apps-rendering/src/components/Standfirst/NewsletterSignupStandfirst.tsx b/apps-rendering/src/components/Standfirst/NewsletterSignupStandfirst.tsx index d873a5ce3b7..cd2d0294d1f 100644 --- a/apps-rendering/src/components/Standfirst/NewsletterSignupStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/NewsletterSignupStandfirst.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineLight20 } from '@guardian/source-foundations'; +import { headlineLight20 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Standfirst/ReviewStandfirst.tsx b/apps-rendering/src/components/Standfirst/ReviewStandfirst.tsx index 6ebee5be5c8..f9a77b38143 100644 --- a/apps-rendering/src/components/Standfirst/ReviewStandfirst.tsx +++ b/apps-rendering/src/components/Standfirst/ReviewStandfirst.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineLight20 } from '@guardian/source-foundations'; +import { headlineLight20 } from '@guardian/source/foundations'; import StarRating from 'components/StarRating'; import type { Item } from 'item'; import { getFormat } from 'item'; diff --git a/apps-rendering/src/components/Standfirst/Standfirst.defaults.tsx b/apps-rendering/src/components/Standfirst/Standfirst.defaults.tsx index 1b6d5772972..95af5cf97dc 100644 --- a/apps-rendering/src/components/Standfirst/Standfirst.defaults.tsx +++ b/apps-rendering/src/components/Standfirst/Standfirst.defaults.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { headlineBold17, remSpace } from '@guardian/source-foundations'; +import { headlineBold17, remSpace } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/StarRating/index.tsx b/apps-rendering/src/components/StarRating/index.tsx index 76c01549d53..9e4858e53de 100644 --- a/apps-rendering/src/components/StarRating/index.tsx +++ b/apps-rendering/src/components/StarRating/index.tsx @@ -7,8 +7,8 @@ import { brandAltLine, from, remSpace, -} from '@guardian/source-foundations'; -import { SvgStar } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgStar } from '@guardian/source/react-components'; import type { Item } from 'item'; import { maybeRender } from 'lib'; import type { FC, ReactNode } from 'react'; diff --git a/apps-rendering/src/components/TableOfContents/index.tsx b/apps-rendering/src/components/TableOfContents/index.tsx index 6af41e79bf7..7edc0eddfaa 100644 --- a/apps-rendering/src/components/TableOfContents/index.tsx +++ b/apps-rendering/src/components/TableOfContents/index.tsx @@ -8,11 +8,11 @@ import { remSpace, textSans14, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgChevronDownSingle, SvgChevronUpSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import Anchor from 'components/Anchor'; import ListItem from 'components/ListItem'; import OrderedList from 'components/OrderedList'; diff --git a/apps-rendering/src/components/Tags/GalleryTags.tsx b/apps-rendering/src/components/Tags/GalleryTags.tsx index 88838fb729b..10fbc8fce5c 100644 --- a/apps-rendering/src/components/Tags/GalleryTags.tsx +++ b/apps-rendering/src/components/Tags/GalleryTags.tsx @@ -3,7 +3,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import type { Item } from 'item'; import { getFormat } from 'item'; diff --git a/apps-rendering/src/components/Tags/ImmersiveTags.tsx b/apps-rendering/src/components/Tags/ImmersiveTags.tsx index 4ca96fede9d..b7b4b08a29a 100644 --- a/apps-rendering/src/components/Tags/ImmersiveTags.tsx +++ b/apps-rendering/src/components/Tags/ImmersiveTags.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { grid } from 'grid/grid'; import type { Item } from 'item'; import { getFormat } from 'item'; diff --git a/apps-rendering/src/components/Tags/Tags.defaults.tsx b/apps-rendering/src/components/Tags/Tags.defaults.tsx index a9746e3695a..ca888781e90 100644 --- a/apps-rendering/src/components/Tags/Tags.defaults.tsx +++ b/apps-rendering/src/components/Tags/Tags.defaults.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import { TagType } from '@guardian/content-api-models/v1/tagType'; import type { ArticleFormat } from '@guardian/libs'; -import { neutral, remSpace, textSans17 } from '@guardian/source-foundations'; +import { neutral, remSpace, textSans17 } from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { background, text } from 'palette'; diff --git a/apps-rendering/src/components/TeamScore/index.tsx b/apps-rendering/src/components/TeamScore/index.tsx index ba4f818acd5..2dc69193ac0 100644 --- a/apps-rendering/src/components/TeamScore/index.tsx +++ b/apps-rendering/src/components/TeamScore/index.tsx @@ -8,7 +8,7 @@ import { neutral, remSpace, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { TeamLocation } from 'football'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/Video/index.tsx b/apps-rendering/src/components/Video/index.tsx index 420fd43d578..a1c10c63352 100644 --- a/apps-rendering/src/components/Video/index.tsx +++ b/apps-rendering/src/components/Video/index.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { neutral, remSpace } from '@guardian/source-foundations'; +import { neutral, remSpace } from '@guardian/source/foundations'; import type { FC, ReactElement } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/WithAgeWarning/index.tsx b/apps-rendering/src/components/WithAgeWarning/index.tsx index e0893f5e11a..bfe0e3c6f5d 100644 --- a/apps-rendering/src/components/WithAgeWarning/index.tsx +++ b/apps-rendering/src/components/WithAgeWarning/index.tsx @@ -3,8 +3,8 @@ import { css } from '@emotion/react'; import type { Tag } from '@guardian/content-api-models/v1/tag'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; import type { ArticleFormat } from '@guardian/libs'; -import { from, remSpace } from '@guardian/source-foundations'; -import { AgeWarning } from '@guardian/source-react-components-development-kitchen'; +import { from, remSpace } from '@guardian/source/foundations'; +import { AgeWarning } from '@guardian/source-development-kitchen/react-components'; import type { Option } from '../../../vendor/@guardian/types/index'; import { grid } from 'grid/grid'; import { isComment, isNews } from 'item'; diff --git a/apps-rendering/src/components/caption/caption.tsx b/apps-rendering/src/components/caption/caption.tsx index d182e606cdb..ee6745f293b 100644 --- a/apps-rendering/src/components/caption/caption.tsx +++ b/apps-rendering/src/components/caption/caption.tsx @@ -10,7 +10,7 @@ import { remSpace, textSans14, textSansItalic14, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { withDefault } from '../../../vendor/@guardian/types/index'; import Anchor from 'components/Anchor'; diff --git a/apps-rendering/src/components/editions/byline/index.tsx b/apps-rendering/src/components/editions/byline/index.tsx index e134684baff..60e6a8b7e63 100644 --- a/apps-rendering/src/components/editions/byline/index.tsx +++ b/apps-rendering/src/components/editions/byline/index.tsx @@ -7,7 +7,7 @@ import type { FontStyle, FontWeight, LineHeight, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { body, border, @@ -15,7 +15,7 @@ import { headline, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/editions/cartoon/index.tsx b/apps-rendering/src/components/editions/cartoon/index.tsx index 49f07e08aee..a22b6c98fce 100644 --- a/apps-rendering/src/components/editions/cartoon/index.tsx +++ b/apps-rendering/src/components/editions/cartoon/index.tsx @@ -2,7 +2,7 @@ import type { FC } from 'react'; import { Cartoon } from '../../../cartoon'; import type { ArticleFormat } from '@guardian/libs'; import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { articlePaddingStyles, desktopArticleMargin, diff --git a/apps-rendering/src/components/editions/footballScores/index.tsx b/apps-rendering/src/components/editions/footballScores/index.tsx index 883f73a3a52..2ef0cb44e50 100644 --- a/apps-rendering/src/components/editions/footballScores/index.tsx +++ b/apps-rendering/src/components/editions/footballScores/index.tsx @@ -8,7 +8,7 @@ import { remSpace, textSans, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { MatchStatusKind, TeamLocation } from 'football'; import type { FC } from 'react'; import { tabletContentWidth, wideContentWidth } from '../styles'; diff --git a/apps-rendering/src/components/editions/galleryImage/index.tsx b/apps-rendering/src/components/editions/galleryImage/index.tsx index 1868d56fb26..05ed1810922 100644 --- a/apps-rendering/src/components/editions/galleryImage/index.tsx +++ b/apps-rendering/src/components/editions/galleryImage/index.tsx @@ -7,7 +7,7 @@ import { remSpace, textSans15, textSansBold15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../../../../vendor/@guardian/types/index'; import { map, diff --git a/apps-rendering/src/components/editions/header/index.tsx b/apps-rendering/src/components/editions/header/index.tsx index 201ac3640eb..942e44932ad 100644 --- a/apps-rendering/src/components/editions/header/index.tsx +++ b/apps-rendering/src/components/editions/header/index.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { border, from, neutral, remSpace } from '@guardian/source-foundations'; +import { border, from, neutral, remSpace } from '@guardian/source/foundations'; import Byline from 'components/editions/byline'; import HeaderMedia from 'components/editions/headerMedia'; import Headline from 'components/editions/headline'; diff --git a/apps-rendering/src/components/editions/headerImageCaption.tsx b/apps-rendering/src/components/editions/headerImageCaption.tsx index da1e1564635..146d043616f 100644 --- a/apps-rendering/src/components/editions/headerImageCaption.tsx +++ b/apps-rendering/src/components/editions/headerImageCaption.tsx @@ -5,8 +5,8 @@ import { neutral, remSpace, textSans15, -} from '@guardian/source-foundations'; -import { SvgCamera } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgCamera } from '@guardian/source/react-components'; import type { Option } from '../../../vendor/@guardian/types/index'; import { map, diff --git a/apps-rendering/src/components/editions/headerMedia/index.tsx b/apps-rendering/src/components/editions/headerMedia/index.tsx index 91b45e9ea17..2428d780489 100644 --- a/apps-rendering/src/components/editions/headerMedia/index.tsx +++ b/apps-rendering/src/components/editions/headerMedia/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { brandAltBackground, from } from '@guardian/source-foundations'; +import { brandAltBackground, from } from '@guardian/source/foundations'; import { none, some } from '../../../../vendor/@guardian/types/index'; import HeaderImageCaption, { captionId, diff --git a/apps-rendering/src/components/editions/headline/index.tsx b/apps-rendering/src/components/editions/headline/index.tsx index cf61c5ee161..cc2a811915e 100644 --- a/apps-rendering/src/components/editions/headline/index.tsx +++ b/apps-rendering/src/components/editions/headline/index.tsx @@ -4,7 +4,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import type { FontWeight, LineHeight } from '@guardian/source-foundations'; +import type { FontWeight, LineHeight } from '@guardian/source/foundations'; import { border, from, @@ -14,9 +14,9 @@ import { headlineMedium42, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; -import { SvgQuote } from '@guardian/source-react-components'; +import { SvgQuote } from '@guardian/source/react-components'; import { OptionKind } from '../../../../vendor/@guardian/types/index'; import type { Item } from 'item'; import { getFormat } from 'item'; diff --git a/apps-rendering/src/components/editions/layout/index.tsx b/apps-rendering/src/components/editions/layout/index.tsx index 6128c9d1308..9063bc9d0ff 100644 --- a/apps-rendering/src/components/editions/layout/index.tsx +++ b/apps-rendering/src/components/editions/layout/index.tsx @@ -10,7 +10,7 @@ import { from, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { hasCartoon, isPicture } from 'item'; import type { FC } from 'react'; diff --git a/apps-rendering/src/components/editions/layout/layout.stories.tsx b/apps-rendering/src/components/editions/layout/layout.stories.tsx index 10f96678682..7449bef5c0c 100644 --- a/apps-rendering/src/components/editions/layout/layout.stories.tsx +++ b/apps-rendering/src/components/editions/layout/layout.stories.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import type { Tag } from '@guardian/content-api-models/v1/tag'; import { ArticleDisplay, ArticleElementRole, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { none, some } from '../../../../vendor/@guardian/types/index'; import type { Contributor } from 'contributor'; import { diff --git a/apps-rendering/src/components/editions/lines.tsx b/apps-rendering/src/components/editions/lines.tsx index a34e2fdbf73..71121ef5c28 100644 --- a/apps-rendering/src/components/editions/lines.tsx +++ b/apps-rendering/src/components/editions/lines.tsx @@ -1,7 +1,7 @@ // ----- Imports ----- // import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import type { FC } from 'react'; import { borderWidthStyles } from './styles'; diff --git a/apps-rendering/src/components/editions/pullquote/index.tsx b/apps-rendering/src/components/editions/pullquote/index.tsx index a214cca0e32..18928efc58f 100644 --- a/apps-rendering/src/components/editions/pullquote/index.tsx +++ b/apps-rendering/src/components/editions/pullquote/index.tsx @@ -1,8 +1,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { from, headline, headlineBold20 } from '@guardian/source-foundations'; -import { SvgQuote } from '@guardian/source-react-components'; +import { from, headline, headlineBold20 } from '@guardian/source/foundations'; +import { SvgQuote } from '@guardian/source/react-components'; import type { Option } from '../../../../vendor/@guardian/types/index'; import { map, withDefault } from '../../../../vendor/@guardian/types/index'; import { pipe } from 'lib'; diff --git a/apps-rendering/src/components/editions/series/index.tsx b/apps-rendering/src/components/editions/series/index.tsx index 1ae80e5daea..7d9f5e17c4c 100644 --- a/apps-rendering/src/components/editions/series/index.tsx +++ b/apps-rendering/src/components/editions/series/index.tsx @@ -8,7 +8,7 @@ import { headlineBold17, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { getFormat } from 'item'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/editions/standfirst/index.tsx b/apps-rendering/src/components/editions/standfirst/index.tsx index 7c6bdc8f8c7..23f4eee61b8 100644 --- a/apps-rendering/src/components/editions/standfirst/index.tsx +++ b/apps-rendering/src/components/editions/standfirst/index.tsx @@ -4,7 +4,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import type { FontWeight, LineHeight } from '@guardian/source-foundations'; +import type { FontWeight, LineHeight } from '@guardian/source/foundations'; import { body, from, @@ -12,7 +12,7 @@ import { neutral, remSpace, text, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Item } from 'item'; import { maybeRender } from 'lib'; import { text as textPalette } from 'palette'; diff --git a/apps-rendering/src/components/editions/standfirst/standfirst.stories.tsx b/apps-rendering/src/components/editions/standfirst/standfirst.stories.tsx index 2a128535f2e..e11356b6ad4 100644 --- a/apps-rendering/src/components/editions/standfirst/standfirst.stories.tsx +++ b/apps-rendering/src/components/editions/standfirst/standfirst.stories.tsx @@ -1,6 +1,6 @@ // ----- Imports ----- // import { ArticleDisplay, ArticlePillar } from '@guardian/libs'; -import { neutral } from '@guardian/source-foundations'; +import { neutral } from '@guardian/source/foundations'; import { parse } from 'client/parser'; import { analysis, article, comment, media } from 'fixtures/item'; import type { Optional } from 'optional'; diff --git a/apps-rendering/src/components/editions/starRating/index.tsx b/apps-rendering/src/components/editions/starRating/index.tsx index d3a48facc08..d466a7e59f8 100644 --- a/apps-rendering/src/components/editions/starRating/index.tsx +++ b/apps-rendering/src/components/editions/starRating/index.tsx @@ -2,8 +2,8 @@ import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { brandAltBackground, brandAltLine } from '@guardian/source-foundations'; -import { SvgStar } from '@guardian/source-react-components'; +import { brandAltBackground, brandAltLine } from '@guardian/source/foundations'; +import { SvgStar } from '@guardian/source/react-components'; import type { Item } from 'item'; import { maybeRender } from 'lib'; import type { FC, ReactNode } from 'react'; diff --git a/apps-rendering/src/components/editions/styles.ts b/apps-rendering/src/components/editions/styles.ts index 38cdb536ba8..b6b7b773a72 100644 --- a/apps-rendering/src/components/editions/styles.ts +++ b/apps-rendering/src/components/editions/styles.ts @@ -12,7 +12,7 @@ import { opinion, remSpace, sport, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Colour } from 'palette'; export const tabletContentWidth = 526; diff --git a/apps-rendering/src/components/editions/teamScore/index.tsx b/apps-rendering/src/components/editions/teamScore/index.tsx index 87544abba5c..853d83dc982 100644 --- a/apps-rendering/src/components/editions/teamScore/index.tsx +++ b/apps-rendering/src/components/editions/teamScore/index.tsx @@ -9,7 +9,7 @@ import { neutral, remSpace, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { fromNullable } from '../../../../vendor/@guardian/types/index'; import { TeamLocation } from 'football'; import { maybeRender } from 'lib'; diff --git a/apps-rendering/src/components/editions/video/index.tsx b/apps-rendering/src/components/editions/video/index.tsx index 18937c2ab49..38dd3877358 100644 --- a/apps-rendering/src/components/editions/video/index.tsx +++ b/apps-rendering/src/components/editions/video/index.tsx @@ -5,8 +5,8 @@ import { neutral, remSpace, textSans15, -} from '@guardian/source-foundations'; -import { SvgOfflineCloud } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgOfflineCloud } from '@guardian/source/react-components'; import type { FC } from 'react'; import { useOnlineStatus } from '../utils/useOnlineStatus'; diff --git a/apps-rendering/src/components/media/articleBody.tsx b/apps-rendering/src/components/media/articleBody.tsx index 78ece0d715f..99b316f991e 100644 --- a/apps-rendering/src/components/media/articleBody.tsx +++ b/apps-rendering/src/components/media/articleBody.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { remSpace } from '@guardian/source-foundations'; +import { remSpace } from '@guardian/source/foundations'; import { background, text } from 'palette'; import type { FC, ReactNode } from 'react'; import { darkModeCss } from 'styles'; diff --git a/apps-rendering/src/components/media/articleSeries.tsx b/apps-rendering/src/components/media/articleSeries.tsx index 86c9b80e575..cb1b720053f 100644 --- a/apps-rendering/src/components/media/articleSeries.tsx +++ b/apps-rendering/src/components/media/articleSeries.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { headline } from '@guardian/source-foundations'; +import { headline } from '@guardian/source/foundations'; import type { Option } from '../../../vendor/@guardian/types/index'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import type { Series } from 'capi'; diff --git a/apps-rendering/src/components/media/byline.tsx b/apps-rendering/src/components/media/byline.tsx index 3bf5819be10..d65912d2ef6 100644 --- a/apps-rendering/src/components/media/byline.tsx +++ b/apps-rendering/src/components/media/byline.tsx @@ -2,7 +2,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { neutral, remSpace, textSans14 } from '@guardian/source-foundations'; +import { neutral, remSpace, textSans14 } from '@guardian/source/foundations'; import { map, withDefault } from '../../../vendor/@guardian/types/index'; import type { Option } from '../../../vendor/@guardian/types/index'; import Dateline from 'components/Dateline'; diff --git a/apps-rendering/src/components/media/tags.tsx b/apps-rendering/src/components/media/tags.tsx index e7b6a10d431..c6cf0d12dfe 100644 --- a/apps-rendering/src/components/media/tags.tsx +++ b/apps-rendering/src/components/media/tags.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { neutral, remSpace, textSans17 } from '@guardian/source-foundations'; +import { neutral, remSpace, textSans17 } from '@guardian/source/foundations'; import type { FC } from 'react'; const tagsStyles = (background: string = neutral[20]): SerializedStyles => css` diff --git a/apps-rendering/src/grid/LeftCentreBorder.tsx b/apps-rendering/src/grid/LeftCentreBorder.tsx index 1a9636f0f5e..bac965ca9c7 100644 --- a/apps-rendering/src/grid/LeftCentreBorder.tsx +++ b/apps-rendering/src/grid/LeftCentreBorder.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import type { SerializedStyles } from '@emotion/react'; -import { from, neutral } from '@guardian/source-foundations'; +import { from, neutral } from '@guardian/source/foundations'; import type { FC } from 'react'; import { darkModeCss } from 'styles'; import { grid } from './grid'; diff --git a/apps-rendering/src/grid/grid.ts b/apps-rendering/src/grid/grid.ts index 8f02cf0977f..a1a9711005e 100644 --- a/apps-rendering/src/grid/grid.ts +++ b/apps-rendering/src/grid/grid.ts @@ -1,6 +1,6 @@ // ----- Imports ----- // -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; // ----- Columns & Lines ----- // diff --git a/apps-rendering/src/image/sizes.test.tsx b/apps-rendering/src/image/sizes.test.tsx index 696f291a0c2..b58efae7e5c 100644 --- a/apps-rendering/src/image/sizes.test.tsx +++ b/apps-rendering/src/image/sizes.test.tsx @@ -5,7 +5,7 @@ // ----- Imports ----- // import { matchers } from '@emotion/jest'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import renderer from 'react-test-renderer'; import type { Sizes } from './sizes'; import { sizesAttribute, styles } from './sizes'; diff --git a/apps-rendering/src/image/sizes.ts b/apps-rendering/src/image/sizes.ts index f6bb5a1d429..f4c02066ee7 100644 --- a/apps-rendering/src/image/sizes.ts +++ b/apps-rendering/src/image/sizes.ts @@ -2,8 +2,8 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import type { Breakpoint } from '@guardian/source-foundations'; -import { breakpoints, from } from '@guardian/source-foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; +import { breakpoints, from } from '@guardian/source/foundations'; // ----- Types ----- // diff --git a/apps-rendering/src/palette/background.ts b/apps-rendering/src/palette/background.ts index bd758ed0c9d..6b2febdb598 100644 --- a/apps-rendering/src/palette/background.ts +++ b/apps-rendering/src/palette/background.ts @@ -18,7 +18,7 @@ import { palette, specialReport, sport, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Colour } from './colour'; // ----- Functions ----- // diff --git a/apps-rendering/src/palette/border.ts b/apps-rendering/src/palette/border.ts index c5cb6737f52..00d9c0446b7 100644 --- a/apps-rendering/src/palette/border.ts +++ b/apps-rendering/src/palette/border.ts @@ -12,7 +12,7 @@ import { palette, specialReport, sport, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Colour } from './colour'; // ----- Functions ----- // diff --git a/apps-rendering/src/palette/fill.ts b/apps-rendering/src/palette/fill.ts index 79793f4c602..76089d2ea40 100644 --- a/apps-rendering/src/palette/fill.ts +++ b/apps-rendering/src/palette/fill.ts @@ -12,7 +12,7 @@ import { palette, specialReport, sport, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Colour } from './colour'; // ----- Functions ----- // diff --git a/apps-rendering/src/palette/hover.ts b/apps-rendering/src/palette/hover.ts index c7138deed9f..021978692ef 100644 --- a/apps-rendering/src/palette/hover.ts +++ b/apps-rendering/src/palette/hover.ts @@ -12,7 +12,7 @@ import { palette, specialReport, sport, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Colour } from './colour'; // ----- Functions ----- // diff --git a/apps-rendering/src/palette/text.ts b/apps-rendering/src/palette/text.ts index f0c910d8cd7..b9d8ff7c43f 100644 --- a/apps-rendering/src/palette/text.ts +++ b/apps-rendering/src/palette/text.ts @@ -18,7 +18,7 @@ import { palette, specialReport, sport, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Colour } from './colour'; // ----- Functions ----- // diff --git a/apps-rendering/src/renderer.ts b/apps-rendering/src/renderer.ts index 0971346466d..e441a7fc29a 100644 --- a/apps-rendering/src/renderer.ts +++ b/apps-rendering/src/renderer.ts @@ -3,8 +3,8 @@ import { css, jsx as styledH } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, ArticleSpecial } from '@guardian/libs'; import type { ArticleFormat } from '@guardian/libs'; -import type { Breakpoint } from '@guardian/source-foundations'; -import { neutral, remSpace, until } from '@guardian/source-foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; +import { neutral, remSpace, until } from '@guardian/source/foundations'; import { andThen, fromNullable, diff --git a/apps-rendering/src/server/editionsPage.tsx b/apps-rendering/src/server/editionsPage.tsx index d0ba00d1acc..4879c688aa5 100644 --- a/apps-rendering/src/server/editionsPage.tsx +++ b/apps-rendering/src/server/editionsPage.tsx @@ -6,7 +6,7 @@ import createEmotionServer from '@emotion/server/create-instance'; import type { EmotionCritical } from '@emotion/server/create-instance'; import type { RenderingRequest } from '@guardian/apps-rendering-api-models/renderingRequest'; import type { ArticleTheme } from '@guardian/libs'; -import { resets } from '@guardian/source-foundations'; +import { resets } from '@guardian/source/foundations'; import type { Option } from '../../vendor/@guardian/types/index'; import { map, diff --git a/apps-rendering/src/server/page.tsx b/apps-rendering/src/server/page.tsx index 76681536128..24bbd5a2db0 100644 --- a/apps-rendering/src/server/page.tsx +++ b/apps-rendering/src/server/page.tsx @@ -7,7 +7,7 @@ import type { EmotionCritical } from '@emotion/server/create-instance'; import type { RenderingRequest } from '@guardian/apps-rendering-api-models/renderingRequest'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; import type { ArticleFormat } from '@guardian/libs'; -import { background, resets } from '@guardian/source-foundations'; +import { background, resets } from '@guardian/source/foundations'; import { map, none, some } from '../../vendor/@guardian/types/index'; import type { Option } from '../../vendor/@guardian/types/index'; import { getThirdPartyEmbeds, requiresInlineStyles } from 'capi'; diff --git a/apps-rendering/src/styles.ts b/apps-rendering/src/styles.ts index 3baf9f134e0..aba9b00cf0f 100644 --- a/apps-rendering/src/styles.ts +++ b/apps-rendering/src/styles.ts @@ -7,7 +7,7 @@ import { from, neutral, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Option } from '../vendor/@guardian/types/index'; import { map, none, some, withDefault } from '../vendor/@guardian/types/index'; import { pipe } from 'lib'; diff --git a/dotcom-rendering/.eslintrc.js b/dotcom-rendering/.eslintrc.js index 1ac387d1982..b304d80baab 100644 --- a/dotcom-rendering/.eslintrc.js +++ b/dotcom-rendering/.eslintrc.js @@ -62,7 +62,6 @@ module.exports = { extends: [ 'eslint:recommended', '@guardian/eslint-config-typescript', - 'plugin:@guardian/source-react-components/recommended', 'plugin:jsx-a11y/recommended', // eslint-config-prettier disables formatting rules that conflict with prettier // needs to go last so it can override other configuration. See https://github.com/prettier/eslint-config-prettier#installation diff --git a/dotcom-rendering/.storybook/decorators/grid.ts b/dotcom-rendering/.storybook/decorators/grid.ts index 2dda73eb4a2..6f62df84b53 100644 --- a/dotcom-rendering/.storybook/decorators/grid.ts +++ b/dotcom-rendering/.storybook/decorators/grid.ts @@ -1,6 +1,6 @@ // ----- Imports ----- // -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; // ----- Columns & Lines ----- // diff --git a/dotcom-rendering/.storybook/decorators/gridDecorators.tsx b/dotcom-rendering/.storybook/decorators/gridDecorators.tsx index 100dd18699d..ea457589605 100644 --- a/dotcom-rendering/.storybook/decorators/gridDecorators.tsx +++ b/dotcom-rendering/.storybook/decorators/gridDecorators.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import type { Decorator } from '@storybook/react'; import { grid } from './grid'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; /** * If "Side-by-side Horizontal" is set in the toolbar, the grid decorator is not diff --git a/dotcom-rendering/.storybook/decorators/splitThemeDecorator.tsx b/dotcom-rendering/.storybook/decorators/splitThemeDecorator.tsx index c4bb1acc0e2..fd37bac484f 100644 --- a/dotcom-rendering/.storybook/decorators/splitThemeDecorator.tsx +++ b/dotcom-rendering/.storybook/decorators/splitThemeDecorator.tsx @@ -12,7 +12,7 @@ import { space, textSans17, textSansBold20, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Decorator } from '@storybook/react'; import { storybookPaletteDeclarations as paletteDeclarations } from '../mocks/paletteDeclarations'; diff --git a/dotcom-rendering/.storybook/decorators/themeDecorator.tsx b/dotcom-rendering/.storybook/decorators/themeDecorator.tsx index 00f49fb7d65..ea46553a385 100644 --- a/dotcom-rendering/.storybook/decorators/themeDecorator.tsx +++ b/dotcom-rendering/.storybook/decorators/themeDecorator.tsx @@ -6,7 +6,7 @@ import { palette as sourcePalette, space, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Decorator, type StrictArgs } from '@storybook/react'; import { ArticleFormat } from '@guardian/libs'; diff --git a/dotcom-rendering/.storybook/preview.ts b/dotcom-rendering/.storybook/preview.ts index ae9fedf76b8..8132baef815 100644 --- a/dotcom-rendering/.storybook/preview.ts +++ b/dotcom-rendering/.storybook/preview.ts @@ -5,7 +5,7 @@ import isChromatic from 'chromatic/isChromatic'; import MockDate from 'mockdate'; import { fontsCss } from '../src/lib/fonts-css'; -import { resets } from '@guardian/source-foundations'; +import { resets } from '@guardian/source/foundations'; import { Lazy } from '../src/components/Lazy'; import { Picture } from '../src/components/Picture'; diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json index f75b0c86a6a..f3f31caf3a6 100644 --- a/dotcom-rendering/package.json +++ b/dotcom-rendering/package.json @@ -45,15 +45,13 @@ "@guardian/core-web-vitals": "6.0.0", "@guardian/eslint-config": "7.0.1", "@guardian/eslint-config-typescript": "9.0.1", - "@guardian/eslint-plugin-source-react-components": "24.0.0", "@guardian/identity-auth": "2.1.0", "@guardian/identity-auth-frontend": "4.0.0", "@guardian/libs": "16.1.0", "@guardian/ophan-tracker-js": "2.1.1", "@guardian/shimport": "1.0.2", - "@guardian/source-foundations": "14.2.2", - "@guardian/source-react-components": "22.1.0", - "@guardian/source-react-components-development-kitchen": "19.0.0", + "@guardian/source": "1.0.1", + "@guardian/source-development-kitchen": "1.0.0", "@guardian/support-dotcom-components": "2.3.1", "@guardian/tsconfig": "0.2.0", "@playwright/test": "1.40.1", diff --git a/dotcom-rendering/src/components/Accordion.stories.tsx b/dotcom-rendering/src/components/Accordion.stories.tsx index 410952896ff..b46882b5b08 100644 --- a/dotcom-rendering/src/components/Accordion.stories.tsx +++ b/dotcom-rendering/src/components/Accordion.stories.tsx @@ -6,7 +6,7 @@ import { breakpoints, from, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { Meta, StoryObj } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { Accordion as AccordionComponent } from './Accordion'; diff --git a/dotcom-rendering/src/components/Accordion.tsx b/dotcom-rendering/src/components/Accordion.tsx index 58b805cb1d3..8d1a2e258ac 100644 --- a/dotcom-rendering/src/components/Accordion.tsx +++ b/dotcom-rendering/src/components/Accordion.tsx @@ -5,11 +5,11 @@ import { from, headlineBold20, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgChevronDownSingle, SvgChevronUpSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { palette } from '../palette'; interface Props { diff --git a/dotcom-rendering/src/components/AdBlockAsk.importable.tsx b/dotcom-rendering/src/components/AdBlockAsk.importable.tsx index eff0674b12f..34b95a68319 100644 --- a/dotcom-rendering/src/components/AdBlockAsk.importable.tsx +++ b/dotcom-rendering/src/components/AdBlockAsk.importable.tsx @@ -6,7 +6,7 @@ import { textSans14, textSans15, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { assertUnreachable } from '../lib/assert-unreachable'; import { useAdblockAsk } from '../lib/useAdBlockAsk'; import ArrowRightIcon from '../static/icons/arrow-right.svg'; diff --git a/dotcom-rendering/src/components/AdPortals.importable.tsx b/dotcom-rendering/src/components/AdPortals.importable.tsx index a078fe2c8fa..58dd721c23e 100644 --- a/dotcom-rendering/src/components/AdPortals.importable.tsx +++ b/dotcom-rendering/src/components/AdPortals.importable.tsx @@ -1,8 +1,8 @@ import { AdSlot as BridgetAdSlot } from '@guardian/bridget/AdSlot'; import { PurchaseScreenReason } from '@guardian/bridget/PurchaseScreenReason'; import type { IRect as BridgetRect } from '@guardian/bridget/Rect'; -import { breakpoints } from '@guardian/source-foundations'; -import type { Breakpoint } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; import libDebounce from 'lodash.debounce'; import { useEffect, useRef, useState } from 'react'; import { createPortal } from 'react-dom'; diff --git a/dotcom-rendering/src/components/AdSlot.apps.stories.tsx b/dotcom-rendering/src/components/AdSlot.apps.stories.tsx index 6dedd507f92..c01ae8a834c 100644 --- a/dotcom-rendering/src/components/AdSlot.apps.stories.tsx +++ b/dotcom-rendering/src/components/AdSlot.apps.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints, space } from '@guardian/source-foundations'; +import { breakpoints, space } from '@guardian/source/foundations'; import type { Decorator } from '@storybook/react'; import { useRef } from 'react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; diff --git a/dotcom-rendering/src/components/AdSlot.apps.tsx b/dotcom-rendering/src/components/AdSlot.apps.tsx index 4822abac180..445d353fac3 100644 --- a/dotcom-rendering/src/components/AdSlot.apps.tsx +++ b/dotcom-rendering/src/components/AdSlot.apps.tsx @@ -4,8 +4,8 @@ import { textSans14, textSans15, until, -} from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { forwardRef } from 'react'; import { palette } from '../palette'; diff --git a/dotcom-rendering/src/components/AdSlot.web.tsx b/dotcom-rendering/src/components/AdSlot.web.tsx index 51b0d93f579..c1b7a96eeb9 100644 --- a/dotcom-rendering/src/components/AdSlot.web.tsx +++ b/dotcom-rendering/src/components/AdSlot.web.tsx @@ -10,8 +10,8 @@ import { space, textSans12, until, -} from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; import { getZIndex } from '../lib/getZIndex'; import { LABS_HEADER_HEIGHT } from '../lib/labs-constants'; import { AdBlockAsk } from './AdBlockAsk.importable'; diff --git a/dotcom-rendering/src/components/AffiliateDisclaimer.tsx b/dotcom-rendering/src/components/AffiliateDisclaimer.tsx index 1ce5d7aa554..8396c7c1af6 100644 --- a/dotcom-rendering/src/components/AffiliateDisclaimer.tsx +++ b/dotcom-rendering/src/components/AffiliateDisclaimer.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { palette, space, textSans } from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; +import { palette, space, textSans } from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; import { palette as themePalette } from '../palette'; const disclaimerLeftColStyles = css` diff --git a/dotcom-rendering/src/components/AgeWarning.tsx b/dotcom-rendering/src/components/AgeWarning.tsx index c92f13e8df4..3690acac070 100644 --- a/dotcom-rendering/src/components/AgeWarning.tsx +++ b/dotcom-rendering/src/components/AgeWarning.tsx @@ -4,7 +4,7 @@ import { textSans12, textSans17, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette } from '../palette'; import ClockIcon from '../static/icons/clock.svg'; diff --git a/dotcom-rendering/src/components/Answers.stories.tsx b/dotcom-rendering/src/components/Answers.stories.tsx index cdf4cce1def..9dbfe07dee7 100644 --- a/dotcom-rendering/src/components/Answers.stories.tsx +++ b/dotcom-rendering/src/components/Answers.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { Pillar } from '@guardian/libs'; -import { Radio, RadioGroup } from '@guardian/source-react-components'; +import { Radio, RadioGroup } from '@guardian/source/react-components'; import type { Meta, StoryObj } from '@storybook/react'; import { CorrectSelectedAnswer, diff --git a/dotcom-rendering/src/components/Answers.tsx b/dotcom-rendering/src/components/Answers.tsx index b410470040a..7dec0d29c5c 100644 --- a/dotcom-rendering/src/components/Answers.tsx +++ b/dotcom-rendering/src/components/Answers.tsx @@ -7,8 +7,8 @@ import { space, textSans14, textSans17, -} from '@guardian/source-foundations'; -import { SvgCheckmark, SvgCross } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgCheckmark, SvgCross } from '@guardian/source/react-components'; // We export Radio wrapper styles to override Source Radio buttons to align // with our custom answers for the quiz diff --git a/dotcom-rendering/src/components/AppsEpic.importable.tsx b/dotcom-rendering/src/components/AppsEpic.importable.tsx index c734ea37bff..3bb81f8383c 100644 --- a/dotcom-rendering/src/components/AppsEpic.importable.tsx +++ b/dotcom-rendering/src/components/AppsEpic.importable.tsx @@ -8,7 +8,7 @@ import { palette, remSpace, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import { getAcquisitionsClient, getUserClient } from '../lib/bridgetApi'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/AppsFooter.importable.tsx b/dotcom-rendering/src/components/AppsFooter.importable.tsx index 6b59430830c..22b69910029 100644 --- a/dotcom-rendering/src/components/AppsFooter.importable.tsx +++ b/dotcom-rendering/src/components/AppsFooter.importable.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { remSpace, textSans15 } from '@guardian/source-foundations'; -import { ButtonLink } from '@guardian/source-react-components'; +import { remSpace, textSans15 } from '@guardian/source/foundations'; +import { ButtonLink } from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import { getNavigationClient, getUserClient } from '../lib/bridgetApi'; import { palette } from '../palette'; diff --git a/dotcom-rendering/src/components/ArticleBody.tsx b/dotcom-rendering/src/components/ArticleBody.tsx index ce8c2fce1fa..b368f9eb18a 100644 --- a/dotcom-rendering/src/components/ArticleBody.tsx +++ b/dotcom-rendering/src/components/ArticleBody.tsx @@ -6,7 +6,7 @@ import { body, headlineBold24, remSpace, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { ArticleRenderer } from '../lib/ArticleRenderer'; import type { EditionId } from '../lib/edition'; import { decideLanguage, decideLanguageDirection } from '../lib/lang'; diff --git a/dotcom-rendering/src/components/ArticleContainer.tsx b/dotcom-rendering/src/components/ArticleContainer.tsx index c34f9cc5012..5162030d2b6 100644 --- a/dotcom-rendering/src/components/ArticleContainer.tsx +++ b/dotcom-rendering/src/components/ArticleContainer.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import { adSizes, constants } from '@guardian/commercial'; import { ArticleDesign } from '@guardian/libs'; -import { from, palette, space, until } from '@guardian/source-foundations'; +import { from, palette, space, until } from '@guardian/source/foundations'; import { carrotAdStyles, labelStyles } from './AdSlot.web'; type Props = { diff --git a/dotcom-rendering/src/components/ArticleHeadline.stories.tsx b/dotcom-rendering/src/components/ArticleHeadline.stories.tsx index cb90f14d64b..14edf8938a0 100644 --- a/dotcom-rendering/src/components/ArticleHeadline.stories.tsx +++ b/dotcom-rendering/src/components/ArticleHeadline.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { getAllThemes } from '../lib/format'; diff --git a/dotcom-rendering/src/components/ArticleHeadline.tsx b/dotcom-rendering/src/components/ArticleHeadline.tsx index c7e200f5f55..d2f7163ff8b 100644 --- a/dotcom-rendering/src/components/ArticleHeadline.tsx +++ b/dotcom-rendering/src/components/ArticleHeadline.tsx @@ -14,7 +14,7 @@ import { textSansBold24, textSansBold34, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling'; import { getAgeWarning } from '../lib/age-warning'; import { decidePalette } from '../lib/decidePalette'; diff --git a/dotcom-rendering/src/components/ArticleLastUpdated.tsx b/dotcom-rendering/src/components/ArticleLastUpdated.tsx index 0329dd9e2bd..2d2c743828f 100644 --- a/dotcom-rendering/src/components/ArticleLastUpdated.tsx +++ b/dotcom-rendering/src/components/ArticleLastUpdated.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, timeAgo } from '@guardian/libs'; -import { textSans15, textSansBold15 } from '@guardian/source-foundations'; +import { textSans15, textSansBold15 } from '@guardian/source/foundations'; import { palette } from '../palette'; import { Island } from './Island'; import { PulsingDot } from './PulsingDot.importable'; diff --git a/dotcom-rendering/src/components/ArticleMeta.apps.stories.tsx b/dotcom-rendering/src/components/ArticleMeta.apps.stories.tsx index a0f991535ae..18cd5af65eb 100644 --- a/dotcom-rendering/src/components/ArticleMeta.apps.stories.tsx +++ b/dotcom-rendering/src/components/ArticleMeta.apps.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { getAllThemes } from '../lib/format'; diff --git a/dotcom-rendering/src/components/ArticleMeta.apps.tsx b/dotcom-rendering/src/components/ArticleMeta.apps.tsx index b345a3055b5..fd414337aad 100644 --- a/dotcom-rendering/src/components/ArticleMeta.apps.tsx +++ b/dotcom-rendering/src/components/ArticleMeta.apps.tsx @@ -1,8 +1,8 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { from, space, until } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { from, space, until } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import type { ReactNode } from 'react'; import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling'; import { getSoleContributor } from '../lib/byline'; diff --git a/dotcom-rendering/src/components/ArticleMeta.stories.tsx b/dotcom-rendering/src/components/ArticleMeta.stories.tsx index dc78c063097..18162e7aa63 100644 --- a/dotcom-rendering/src/components/ArticleMeta.stories.tsx +++ b/dotcom-rendering/src/components/ArticleMeta.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints, from } from '@guardian/source-foundations'; +import { breakpoints, from } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { browserThemeDecorator } from '../../.storybook/decorators/themeDecorator'; diff --git a/dotcom-rendering/src/components/ArticleMeta.tsx b/dotcom-rendering/src/components/ArticleMeta.tsx index 451ffbe7d12..b81012cc1af 100644 --- a/dotcom-rendering/src/components/ArticleMeta.tsx +++ b/dotcom-rendering/src/components/ArticleMeta.tsx @@ -7,8 +7,8 @@ import { palette, space, until, -} from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling'; import { getSoleContributor } from '../lib/byline'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/ArticlePage.amp.tsx b/dotcom-rendering/src/components/ArticlePage.amp.tsx index ed5c8355590..e4bcb792b99 100644 --- a/dotcom-rendering/src/components/ArticlePage.amp.tsx +++ b/dotcom-rendering/src/components/ArticlePage.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { filterForTagsOfType } from '../lib/tag-utils.amp'; import type { NavType } from '../model/extract-nav'; import type { AmpExperiments } from '../server/AMPExperimentCache.amp'; diff --git a/dotcom-rendering/src/components/ArticleTitle.tsx b/dotcom-rendering/src/components/ArticleTitle.tsx index fa81de8bd8d..dba60e66668 100644 --- a/dotcom-rendering/src/components/ArticleTitle.tsx +++ b/dotcom-rendering/src/components/ArticleTitle.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import type { TagType } from '../types/tag'; import { SeriesSectionLink } from './SeriesSectionLink'; diff --git a/dotcom-rendering/src/components/AudioAtom/AudioAtom.tsx b/dotcom-rendering/src/components/AudioAtom/AudioAtom.tsx index c2d3167968c..b60bd93cdb5 100644 --- a/dotcom-rendering/src/components/AudioAtom/AudioAtom.tsx +++ b/dotcom-rendering/src/components/AudioAtom/AudioAtom.tsx @@ -4,7 +4,7 @@ import { headlineBold17, headlineMedium17, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { MouseEvent } from 'react'; import { useEffect, useRef, useState } from 'react'; import { palette } from '../../palette'; diff --git a/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.tsx b/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.tsx index 7eb4368341e..4031626829b 100644 --- a/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.tsx +++ b/dotcom-rendering/src/components/AustralianTerritorySwitcher.importable.tsx @@ -4,14 +4,14 @@ import { space, textSans17, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, ChoiceCard, ChoiceCardGroup, SvgChevronDownSingle, SvgChevronUpSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useState } from 'react'; import type { AustralianTerritory } from '../types/territory'; diff --git a/dotcom-rendering/src/components/BackToTop.tsx b/dotcom-rendering/src/components/BackToTop.tsx index 3d8729c689a..4ac65ce82db 100644 --- a/dotcom-rendering/src/components/BackToTop.tsx +++ b/dotcom-rendering/src/components/BackToTop.tsx @@ -4,7 +4,7 @@ import { brandText, palette, textSansBold15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; const iconHeight = '42px'; diff --git a/dotcom-rendering/src/components/Badge.tsx b/dotcom-rendering/src/components/Badge.tsx index 9a737340353..ab0aaaa00a5 100644 --- a/dotcom-rendering/src/components/Badge.tsx +++ b/dotcom-rendering/src/components/Badge.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { between, from } from '@guardian/source-foundations'; +import { between, from } from '@guardian/source/foundations'; const frontsSectionBadgeSizingStyles = css` height: auto; diff --git a/dotcom-rendering/src/components/BigNumber.stories.tsx b/dotcom-rendering/src/components/BigNumber.stories.tsx index 7d3e5abfe75..8b67b258efb 100755 --- a/dotcom-rendering/src/components/BigNumber.stories.tsx +++ b/dotcom-rendering/src/components/BigNumber.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import type { Meta } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { palette } from '../palette'; diff --git a/dotcom-rendering/src/components/BlockquoteBlockComponent.tsx b/dotcom-rendering/src/components/BlockquoteBlockComponent.tsx index e2d13549726..7f0b427faaf 100644 --- a/dotcom-rendering/src/components/BlockquoteBlockComponent.tsx +++ b/dotcom-rendering/src/components/BlockquoteBlockComponent.tsx @@ -1,5 +1,5 @@ import { css, jsx } from '@emotion/react'; -import { articleItalic17 } from '@guardian/source-foundations'; +import { articleItalic17 } from '@guardian/source/foundations'; import type { ReactNode } from 'react'; import { Fragment } from 'react'; import { getAttrs, isElement, parseHtml } from '../lib/domUtils'; diff --git a/dotcom-rendering/src/components/Blocks.amp.tsx b/dotcom-rendering/src/components/Blocks.amp.tsx index b7a4f8a8ce6..1e1cbab6f14 100644 --- a/dotcom-rendering/src/components/Blocks.amp.tsx +++ b/dotcom-rendering/src/components/Blocks.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, text, textSans12 } from '@guardian/source-foundations'; +import { palette, text, textSans12 } from '@guardian/source/foundations'; import { blockLink } from '../lib/block-link.amp'; import type { EditionId } from '../lib/edition'; import { findBlockAdSlots } from '../lib/find-adslots.amp'; diff --git a/dotcom-rendering/src/components/BodyArticle.amp.tsx b/dotcom-rendering/src/components/BodyArticle.amp.tsx index 43434a76c0d..09c9d6295ef 100644 --- a/dotcom-rendering/src/components/BodyArticle.amp.tsx +++ b/dotcom-rendering/src/components/BodyArticle.amp.tsx @@ -4,7 +4,7 @@ import { ArticleDesign as Design, ArticleSpecial as Special, } from '@guardian/libs'; -import { palette, text, textSans12, until } from '@guardian/source-foundations'; +import { palette, text, textSans12, until } from '@guardian/source/foundations'; import React from 'react'; import { buildAdTargeting } from '../lib/ad-targeting'; import { decideDesign } from '../lib/decideDesign'; diff --git a/dotcom-rendering/src/components/BodyLiveblog.amp.tsx b/dotcom-rendering/src/components/BodyLiveblog.amp.tsx index 01784efa9b7..c4b0a3e799f 100644 --- a/dotcom-rendering/src/components/BodyLiveblog.amp.tsx +++ b/dotcom-rendering/src/components/BodyLiveblog.amp.tsx @@ -3,7 +3,7 @@ import { headlineMedium20, palette, textSans12, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { buildAdTargeting } from '../lib/ad-targeting'; import { decideTheme } from '../lib/decideTheme'; import { getSharingUrls } from '../lib/sharing-urls'; diff --git a/dotcom-rendering/src/components/Border.tsx b/dotcom-rendering/src/components/Border.tsx index 279b749684a..a3f4ace91f7 100644 --- a/dotcom-rendering/src/components/Border.tsx +++ b/dotcom-rendering/src/components/Border.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { palette as themePalette } from '../palette'; export const Border = () => ( diff --git a/dotcom-rendering/src/components/Branding.amp.tsx b/dotcom-rendering/src/components/Branding.amp.tsx index 2dbfda366b3..dfb9985f3a4 100644 --- a/dotcom-rendering/src/components/Branding.amp.tsx +++ b/dotcom-rendering/src/components/Branding.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans12 } from '@guardian/source-foundations'; +import { textSans12 } from '@guardian/source/foundations'; import React from 'react'; import { isEditionId } from '../lib/edition'; import { neutralBorder, pillarPalette_DO_NOT_USE } from '../lib/pillars'; diff --git a/dotcom-rendering/src/components/Branding.importable.tsx b/dotcom-rendering/src/components/Branding.importable.tsx index 3646addebc5..7bd3880ba22 100644 --- a/dotcom-rendering/src/components/Branding.importable.tsx +++ b/dotcom-rendering/src/components/Branding.importable.tsx @@ -5,7 +5,7 @@ import { breakpoints, from, textSans12, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { trackSponsorLogoLinkClick } from '../client/ga/ga'; import { getOphanComponents } from '../lib/labs'; import { palette } from '../palette'; diff --git a/dotcom-rendering/src/components/Byline.tsx b/dotcom-rendering/src/components/Byline.tsx index b2fbd475b32..fdba66791a8 100644 --- a/dotcom-rendering/src/components/Byline.tsx +++ b/dotcom-rendering/src/components/Byline.tsx @@ -9,7 +9,7 @@ import { textSansItalic20, textSansItalic24, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/BylineLink.tsx b/dotcom-rendering/src/components/BylineLink.tsx index 2058d8e11e8..fb90c436bae 100644 --- a/dotcom-rendering/src/components/BylineLink.tsx +++ b/dotcom-rendering/src/components/BylineLink.tsx @@ -1,6 +1,6 @@ import { ArticleDesign, isString } from '@guardian/libs'; -import { Hide } from '@guardian/source-react-components'; -import { DottedLines } from '@guardian/source-react-components-development-kitchen'; +import { Hide } from '@guardian/source/react-components'; +import { DottedLines } from '@guardian/source-development-kitchen/react-components'; import { getBylineComponentsFromTokens, getSoleContributor, diff --git a/dotcom-rendering/src/components/CPScottHeader.tsx b/dotcom-rendering/src/components/CPScottHeader.tsx index 312ed98d6a0..ba5d4788e4f 100644 --- a/dotcom-rendering/src/components/CPScottHeader.tsx +++ b/dotcom-rendering/src/components/CPScottHeader.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { headlineMedium17, palette, until } from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +import { headlineMedium17, palette, until } from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import { generateSources, getFallbackSource } from './Picture'; import { QuoteIcon } from './QuoteIcon'; diff --git a/dotcom-rendering/src/components/Callout/Callout.tsx b/dotcom-rendering/src/components/Callout/Callout.tsx index 9ae13927ad8..ddb10522c46 100644 --- a/dotcom-rendering/src/components/Callout/Callout.tsx +++ b/dotcom-rendering/src/components/Callout/Callout.tsx @@ -3,9 +3,9 @@ import { headlineBold20, headlineMedium20, space, -} from '@guardian/source-foundations'; -import type { TabProps } from '@guardian/source-react-components-development-kitchen'; -import { Tabs } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import type { TabProps } from '@guardian/source-development-kitchen/react-components'; +import { Tabs } from '@guardian/source-development-kitchen/react-components'; import { useState } from 'react'; import { palette } from '../../palette'; import type { diff --git a/dotcom-rendering/src/components/Callout/CalloutComponents.tsx b/dotcom-rendering/src/components/Callout/CalloutComponents.tsx index 27445c64216..2b9a9780ef1 100644 --- a/dotcom-rendering/src/components/Callout/CalloutComponents.tsx +++ b/dotcom-rendering/src/components/Callout/CalloutComponents.tsx @@ -5,12 +5,12 @@ import { space, textSans14, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, SvgShare, SvgTickRound, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useState } from 'react'; import { palette } from '../../palette'; diff --git a/dotcom-rendering/src/components/Callout/Deadline.tsx b/dotcom-rendering/src/components/Callout/Deadline.tsx index 4d237a6376e..a7001aa1c25 100644 --- a/dotcom-rendering/src/components/Callout/Deadline.tsx +++ b/dotcom-rendering/src/components/Callout/Deadline.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space, textSans12 } from '@guardian/source-foundations'; -import { SvgClock } from '@guardian/source-react-components'; +import { space, textSans12 } from '@guardian/source/foundations'; +import { SvgClock } from '@guardian/source/react-components'; import { palette } from '../../palette'; type Props = { diff --git a/dotcom-rendering/src/components/Callout/Form.tsx b/dotcom-rendering/src/components/Callout/Form.tsx index c806f521c2c..7cdb0b7b33f 100644 --- a/dotcom-rendering/src/components/Callout/Form.tsx +++ b/dotcom-rendering/src/components/Callout/Form.tsx @@ -6,9 +6,9 @@ import { space, textSans14, textSansBold17, -} from '@guardian/source-foundations'; -import { Button, SvgTickRound } from '@guardian/source-react-components'; -import { ErrorSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Button, SvgTickRound } from '@guardian/source/react-components'; +import { ErrorSummary } from '@guardian/source-development-kitchen/react-components'; import { useRef, useState } from 'react'; import { palette as schemedPalette } from '../../palette'; import type { CampaignFieldType } from '../../types/content'; diff --git a/dotcom-rendering/src/components/Callout/FormField.tsx b/dotcom-rendering/src/components/Callout/FormField.tsx index d8d3d7f1403..eaa1b517493 100644 --- a/dotcom-rendering/src/components/Callout/FormField.tsx +++ b/dotcom-rendering/src/components/Callout/FormField.tsx @@ -7,8 +7,8 @@ import { Select, TextArea, TextInput, -} from '@guardian/source-react-components'; -import { FileInput } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { FileInput } from '@guardian/source-development-kitchen/react-components'; import { useEffect, useRef } from 'react'; import type { CampaignFieldType, diff --git a/dotcom-rendering/src/components/Callout/MessageUs.tsx b/dotcom-rendering/src/components/Callout/MessageUs.tsx index 1e109fa071b..6de6e3ee8d7 100644 --- a/dotcom-rendering/src/components/Callout/MessageUs.tsx +++ b/dotcom-rendering/src/components/Callout/MessageUs.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; import { isString } from '@guardian/libs'; -import { space, textSans14 } from '@guardian/source-foundations'; +import { space, textSans14 } from '@guardian/source/foundations'; import { LinkButton, SvgSignalBrand, SvgTelegramBrand, SvgWhatsAppBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { ReactElement } from 'react'; import { palette } from '../../palette'; import type { CalloutContactType } from '../../types/content'; diff --git a/dotcom-rendering/src/components/CalloutBlockComponent.importable.tsx b/dotcom-rendering/src/components/CalloutBlockComponent.importable.tsx index 0c34c4e1323..47b4a93026c 100644 --- a/dotcom-rendering/src/components/CalloutBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/CalloutBlockComponent.importable.tsx @@ -1,4 +1,4 @@ -import { ExpandingWrapper } from '@guardian/source-react-components-development-kitchen'; +import { ExpandingWrapper } from '@guardian/source-development-kitchen/react-components'; import { palette } from '../palette'; import type { CalloutBlockElementV2 } from '../types/content'; import { CalloutBlock } from './Callout/Callout'; diff --git a/dotcom-rendering/src/components/CalloutEmbed/Form.tsx b/dotcom-rendering/src/components/CalloutEmbed/Form.tsx index 554808c7bfd..fc5a7ef90ff 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/Form.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/Form.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { text, textSansBold17 } from '@guardian/source-foundations'; -import { Button, Link } from '@guardian/source-react-components'; +import { text, textSansBold17 } from '@guardian/source/foundations'; +import { Button, Link } from '@guardian/source/react-components'; import { useState } from 'react'; import type { CampaignFieldType } from '../../types/content'; import { FileUpload } from './FormFields/FileUpload'; diff --git a/dotcom-rendering/src/components/CalloutEmbed/FormFields/CheckboxSelect.tsx b/dotcom-rendering/src/components/CalloutEmbed/FormFields/CheckboxSelect.tsx index a771de437b6..fc29c379330 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/FormFields/CheckboxSelect.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/FormFields/CheckboxSelect.tsx @@ -1,4 +1,4 @@ -import { Checkbox, CheckboxGroup } from '@guardian/source-react-components'; +import { Checkbox, CheckboxGroup } from '@guardian/source/react-components'; import type { CampaignFieldCheckbox } from '../../../types/content'; type Props = { diff --git a/dotcom-rendering/src/components/CalloutEmbed/FormFields/FieldLabel.tsx b/dotcom-rendering/src/components/CalloutEmbed/FormFields/FieldLabel.tsx index b80d3b84b73..af641fda8ff 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/FormFields/FieldLabel.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/FormFields/FieldLabel.tsx @@ -5,7 +5,7 @@ import { textSansBold17, textSansItalic15, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { CampaignFieldType } from '../../../types/content'; const fieldLabelStyles = css` diff --git a/dotcom-rendering/src/components/CalloutEmbed/FormFields/FileUpload.tsx b/dotcom-rendering/src/components/CalloutEmbed/FormFields/FileUpload.tsx index 0e7acf7f8e5..fca653a5987 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/FormFields/FileUpload.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/FormFields/FileUpload.tsx @@ -1,6 +1,6 @@ // File upload is the only legacy component that is still used on the old callout form import { css } from '@emotion/react'; -import { space, text, textSansBold15 } from '@guardian/source-foundations'; +import { space, text, textSansBold15 } from '@guardian/source/foundations'; import { useState } from 'react'; import { stringifyFileBase64 } from '.././../../lib/stringifyFileBase64'; import type { CampaignFieldFile } from '../../../types/content'; diff --git a/dotcom-rendering/src/components/CalloutEmbed/FormFields/RadioSelect.tsx b/dotcom-rendering/src/components/CalloutEmbed/FormFields/RadioSelect.tsx index 89375bbec8c..da2ddb28675 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/FormFields/RadioSelect.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/FormFields/RadioSelect.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { Radio, RadioGroup } from '@guardian/source-react-components'; +import { Radio, RadioGroup } from '@guardian/source/react-components'; import type { CampaignFieldRadio } from '../../../types/content'; import { FieldLabel } from './FieldLabel'; diff --git a/dotcom-rendering/src/components/CalloutEmbed/FormFields/Select.tsx b/dotcom-rendering/src/components/CalloutEmbed/FormFields/Select.tsx index b25530ec114..3f82b53c6db 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/FormFields/Select.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/FormFields/Select.tsx @@ -1,4 +1,4 @@ -import { Select as SourceSelect } from '@guardian/source-react-components'; +import { Select as SourceSelect } from '@guardian/source/react-components'; import type { CampaignFieldSelect } from '../../../types/content'; type Props = { diff --git a/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextArea.tsx b/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextArea.tsx index df91c2ddb2d..97cc17aff59 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextArea.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextArea.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { TextArea as SourceTextArea } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { TextArea as SourceTextArea } from '@guardian/source/react-components'; import type { CampaignFieldTextArea } from '../../../types/content'; const textAreaStyles = css` diff --git a/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextInput.tsx b/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextInput.tsx index a8d956d5e54..bbaca49e711 100644 --- a/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextInput.tsx +++ b/dotcom-rendering/src/components/CalloutEmbed/FormFields/TextInput.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { TextInput as SourceTextInput } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { TextInput as SourceTextInput } from '@guardian/source/react-components'; import type { CampaignFieldText } from '../../../types/content'; const textInputStyles = css` diff --git a/dotcom-rendering/src/components/CalloutEmbedBlockComponent.importable.tsx b/dotcom-rendering/src/components/CalloutEmbedBlockComponent.importable.tsx index ba330333ca9..e931df32fdd 100644 --- a/dotcom-rendering/src/components/CalloutEmbedBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/CalloutEmbedBlockComponent.importable.tsx @@ -3,8 +3,8 @@ import { palette as srcPalette, textSansBold12, textSansBold17, -} 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 { decidePalette } from '../lib/decidePalette'; import MinusIcon from '../static/icons/minus.svg'; diff --git a/dotcom-rendering/src/components/Caption.amp.tsx b/dotcom-rendering/src/components/Caption.amp.tsx index db5a0175e99..d542f1dc332 100644 --- a/dotcom-rendering/src/components/Caption.amp.tsx +++ b/dotcom-rendering/src/components/Caption.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans12 } from '@guardian/source-foundations'; +import { palette, textSans12 } from '@guardian/source/foundations'; import React from 'react'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import TriangleIcon from '../static/icons/triangle.svg'; diff --git a/dotcom-rendering/src/components/Caption.stories.tsx b/dotcom-rendering/src/components/Caption.stories.tsx index 47f18239ac1..a10fb795d7a 100644 --- a/dotcom-rendering/src/components/Caption.stories.tsx +++ b/dotcom-rendering/src/components/Caption.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { breakpoints, palette } from '@guardian/source-foundations'; +import { breakpoints, palette } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { Caption } from './Caption'; diff --git a/dotcom-rendering/src/components/Caption.tsx b/dotcom-rendering/src/components/Caption.tsx index 9a00d8ffea2..de40cd33594 100644 --- a/dotcom-rendering/src/components/Caption.tsx +++ b/dotcom-rendering/src/components/Caption.tsx @@ -7,7 +7,7 @@ import { textSans, textSans14, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette } from '../palette'; import CameraSvg from '../static/icons/camera.svg'; import VideoSvg from '../static/icons/video-icon.svg'; diff --git a/dotcom-rendering/src/components/Card/Card.stories.tsx b/dotcom-rendering/src/components/Card/Card.stories.tsx index ce2a6a49674..e2fe8a236de 100644 --- a/dotcom-rendering/src/components/Card/Card.stories.tsx +++ b/dotcom-rendering/src/components/Card/Card.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import React from 'react'; import { splitTheme } from '../../../.storybook/decorators/splitThemeDecorator'; import { lightDecorator } from '../../../.storybook/decorators/themeDecorator'; diff --git a/dotcom-rendering/src/components/Card/Card.tsx b/dotcom-rendering/src/components/Card/Card.tsx index 807d6fdf111..78830d58748 100644 --- a/dotcom-rendering/src/components/Card/Card.tsx +++ b/dotcom-rendering/src/components/Card/Card.tsx @@ -4,9 +4,9 @@ import { from, palette as sourcePalette, space, -} from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { decidePalette } from '../../lib/decidePalette'; import { getZIndex } from '../../lib/getZIndex'; import { DISCUSSION_ID_DATA_ATTRIBUTE } from '../../lib/useCommentCount'; diff --git a/dotcom-rendering/src/components/Card/components/AvatarContainer.tsx b/dotcom-rendering/src/components/Card/components/AvatarContainer.tsx index 1052fdb729f..c61f6699a16 100644 --- a/dotcom-rendering/src/components/Card/components/AvatarContainer.tsx +++ b/dotcom-rendering/src/components/Card/components/AvatarContainer.tsx @@ -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'; import type { ImagePositionType, ImageSizeType } from './ImageWrapper'; type Props = { diff --git a/dotcom-rendering/src/components/Card/components/CardAge.tsx b/dotcom-rendering/src/components/Card/components/CardAge.tsx index 340694c09b7..72d55f3e559 100644 --- a/dotcom-rendering/src/components/Card/components/CardAge.tsx +++ b/dotcom-rendering/src/components/Card/components/CardAge.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, timeAgo } from '@guardian/libs'; -import { textSans, until } from '@guardian/source-foundations'; +import { textSans, until } from '@guardian/source/foundations'; import { palette } from '../../../palette'; import ClockIcon from '../../../static/icons/clock.svg'; import type { DCRContainerPalette } from '../../../types/front'; diff --git a/dotcom-rendering/src/components/Card/components/CardBranding.tsx b/dotcom-rendering/src/components/Card/components/CardBranding.tsx index a2b6a9dfd1d..450fadeb84c 100644 --- a/dotcom-rendering/src/components/Card/components/CardBranding.tsx +++ b/dotcom-rendering/src/components/Card/components/CardBranding.tsx @@ -3,7 +3,7 @@ import { space, textSans12, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { trackSponsorLogoLinkClick } from '../../../client/ga/ga'; import { decideLogo } from '../../../lib/decideLogo'; import { getZIndex } from '../../../lib/getZIndex'; diff --git a/dotcom-rendering/src/components/Card/components/CardFooter.tsx b/dotcom-rendering/src/components/Card/components/CardFooter.tsx index 5ba36498d5e..755c55aaa40 100644 --- a/dotcom-rendering/src/components/Card/components/CardFooter.tsx +++ b/dotcom-rendering/src/components/Card/components/CardFooter.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleSpecial } from '@guardian/libs'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { decideContainerOverrides } from '../../../lib/decideContainerOverrides'; import { decidePalette } from '../../../lib/decidePalette'; import type { DCRContainerPalette } from '../../../types/front'; diff --git a/dotcom-rendering/src/components/Card/components/CardLayout.tsx b/dotcom-rendering/src/components/Card/components/CardLayout.tsx index ab538fd04d3..2bc8f624e12 100644 --- a/dotcom-rendering/src/components/Card/components/CardLayout.tsx +++ b/dotcom-rendering/src/components/Card/components/CardLayout.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { until } from '@guardian/source-foundations'; +import { until } from '@guardian/source/foundations'; import type { DCRContainerType } from '../../../types/front'; import type { ImagePositionType } from './ImageWrapper'; diff --git a/dotcom-rendering/src/components/Card/components/CardLink.tsx b/dotcom-rendering/src/components/Card/components/CardLink.tsx index 7b4bfddf773..f81259eda94 100644 --- a/dotcom-rendering/src/components/Card/components/CardLink.tsx +++ b/dotcom-rendering/src/components/Card/components/CardLink.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { focusHalo } from '@guardian/source-foundations'; +import { focusHalo } from '@guardian/source/foundations'; import { getZIndex } from '../../../lib/getZIndex'; const fauxLinkStyles = css` diff --git a/dotcom-rendering/src/components/Card/components/CardWrapper.tsx b/dotcom-rendering/src/components/Card/components/CardWrapper.tsx index 3104f9c004d..6bc0c586481 100644 --- a/dotcom-rendering/src/components/Card/components/CardWrapper.tsx +++ b/dotcom-rendering/src/components/Card/components/CardWrapper.tsx @@ -5,7 +5,7 @@ import { from, palette as sourcePalette, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette } from '../../../palette'; import type { DCRContainerPalette } from '../../../types/front'; import { ContainerOverrides } from '../../ContainerOverrides'; diff --git a/dotcom-rendering/src/components/Card/components/ContentWrapper.tsx b/dotcom-rendering/src/components/Card/components/ContentWrapper.tsx index 4fac7cda29f..10a7bc037e4 100644 --- a/dotcom-rendering/src/components/Card/components/ContentWrapper.tsx +++ b/dotcom-rendering/src/components/Card/components/ContentWrapper.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { between, from } from '@guardian/source-foundations'; +import { between, from } from '@guardian/source/foundations'; import type { ImagePositionType, ImageSizeType } from './ImageWrapper'; const sizingStyles = css` diff --git a/dotcom-rendering/src/components/Card/components/HeadlineWrapper.tsx b/dotcom-rendering/src/components/Card/components/HeadlineWrapper.tsx index 707dbde6ca1..7883d343903 100644 --- a/dotcom-rendering/src/components/Card/components/HeadlineWrapper.tsx +++ b/dotcom-rendering/src/components/Card/components/HeadlineWrapper.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import type { ImagePositionType } from './ImageWrapper'; type Props = { diff --git a/dotcom-rendering/src/components/Card/components/ImageWrapper.tsx b/dotcom-rendering/src/components/Card/components/ImageWrapper.tsx index 749d7b4e91f..99afdf4aeb8 100644 --- a/dotcom-rendering/src/components/Card/components/ImageWrapper.tsx +++ b/dotcom-rendering/src/components/Card/components/ImageWrapper.tsx @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { between, from, until } from '@guardian/source-foundations'; +import { between, from, until } from '@guardian/source/foundations'; import { PlayIcon } from './PlayIcon'; export type ImagePositionType = 'left' | 'top' | 'right' | 'bottom' | 'none'; diff --git a/dotcom-rendering/src/components/Card/components/LI.tsx b/dotcom-rendering/src/components/Card/components/LI.tsx index c0a1d7052a3..27f7467eaad 100644 --- a/dotcom-rendering/src/components/Card/components/LI.tsx +++ b/dotcom-rendering/src/components/Card/components/LI.tsx @@ -4,7 +4,7 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decideContainerOverrides } from '../../../lib/decideContainerOverrides'; import { verticalDivider } from '../../../lib/verticalDivider'; import { verticalDividerWithBottomOffset } from '../../../lib/verticalDividerWithBottomOffset'; diff --git a/dotcom-rendering/src/components/Card/components/PlayIcon.tsx b/dotcom-rendering/src/components/Card/components/PlayIcon.tsx index 281631da7cc..b58c4cdea8f 100644 --- a/dotcom-rendering/src/components/Card/components/PlayIcon.tsx +++ b/dotcom-rendering/src/components/Card/components/PlayIcon.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; -import { from, palette } from '@guardian/source-foundations'; -import type { ThemeIcon } from '@guardian/source-react-components'; -import { SvgMediaControlsPlay } from '@guardian/source-react-components'; +import { from, palette } from '@guardian/source/foundations'; +import type { ThemeIcon } from '@guardian/source/react-components'; +import { SvgMediaControlsPlay } from '@guardian/source/react-components'; import type { ImagePositionType, ImageSizeType } from './ImageWrapper'; type PlayButtonSize = keyof typeof sizes; diff --git a/dotcom-rendering/src/components/Card/components/TrailTextWrapper.tsx b/dotcom-rendering/src/components/Card/components/TrailTextWrapper.tsx index 2b12f4c79b6..e7ff981642b 100644 --- a/dotcom-rendering/src/components/Card/components/TrailTextWrapper.tsx +++ b/dotcom-rendering/src/components/Card/components/TrailTextWrapper.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textEgyptian14, until } from '@guardian/source-foundations'; +import { textEgyptian14, until } from '@guardian/source/foundations'; import { palette } from '../../../palette'; import type { ImagePositionType, ImageSizeType } from './ImageWrapper'; diff --git a/dotcom-rendering/src/components/Card/components/UL.tsx b/dotcom-rendering/src/components/Card/components/UL.tsx index c72bf23f905..5775d32ec8e 100644 --- a/dotcom-rendering/src/components/Card/components/UL.tsx +++ b/dotcom-rendering/src/components/Card/components/UL.tsx @@ -4,7 +4,7 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decideContainerOverrides } from '../../../lib/decideContainerOverrides'; import { verticalDivider } from '../../../lib/verticalDivider'; import type { DCRContainerPalette } from '../../../types/front'; diff --git a/dotcom-rendering/src/components/CardCommentCount.importable.stories.tsx b/dotcom-rendering/src/components/CardCommentCount.importable.stories.tsx index 649ae81f615..d5df3c616b8 100644 --- a/dotcom-rendering/src/components/CardCommentCount.importable.stories.tsx +++ b/dotcom-rendering/src/components/CardCommentCount.importable.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { CardCommentCount } from './CardCommentCount.importable'; import { Island } from './Island'; diff --git a/dotcom-rendering/src/components/CardCommentCount.importable.tsx b/dotcom-rendering/src/components/CardCommentCount.importable.tsx index f9444cacdc0..d82425208da 100644 --- a/dotcom-rendering/src/components/CardCommentCount.importable.tsx +++ b/dotcom-rendering/src/components/CardCommentCount.importable.tsx @@ -3,7 +3,7 @@ import { between, textSans, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { formatCount } from '../lib/formatCount'; import { useCommentCount } from '../lib/useCommentCount'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/CardHeadline.stories.tsx b/dotcom-rendering/src/components/CardHeadline.stories.tsx index ce406d8ff9a..ab6f7bd803a 100644 --- a/dotcom-rendering/src/components/CardHeadline.stories.tsx +++ b/dotcom-rendering/src/components/CardHeadline.stories.tsx @@ -4,7 +4,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { breakpoints, palette } from '@guardian/source-foundations'; +import { breakpoints, palette } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import type { StoryProps } from '../../.storybook/decorators/splitThemeDecorator'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; diff --git a/dotcom-rendering/src/components/CardHeadline.tsx b/dotcom-rendering/src/components/CardHeadline.tsx index 4451aa93230..ccb00ef3bc9 100644 --- a/dotcom-rendering/src/components/CardHeadline.tsx +++ b/dotcom-rendering/src/components/CardHeadline.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleSpecial } from '@guardian/libs'; -import type { FontScaleArgs, FontWeight } from '@guardian/source-foundations'; +import type { FontScaleArgs, FontWeight } from '@guardian/source/foundations'; import { between, fontWeights, @@ -14,8 +14,8 @@ import { textSans17, textSans20, until, -} from '@guardian/source-foundations'; -import { Link, SvgExternal } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link, SvgExternal } from '@guardian/source/react-components'; import React from 'react'; import { decidePalette } from '../lib/decidePalette'; import { getZIndex } from '../lib/getZIndex'; diff --git a/dotcom-rendering/src/components/CardPicture.tsx b/dotcom-rendering/src/components/CardPicture.tsx index fc6a1d9d22e..4d201377200 100644 --- a/dotcom-rendering/src/components/CardPicture.tsx +++ b/dotcom-rendering/src/components/CardPicture.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { breakpoints, space } from '@guardian/source-foundations'; +import { breakpoints, space } from '@guardian/source/foundations'; import type { ImgHTMLAttributes } from 'react'; import React from 'react'; import type { ImageSizeType } from './Card/components/ImageWrapper'; diff --git a/dotcom-rendering/src/components/Carousel.importable.tsx b/dotcom-rendering/src/components/Carousel.importable.tsx index 4e44e2c4b49..ade5122852d 100644 --- a/dotcom-rendering/src/components/Carousel.importable.tsx +++ b/dotcom-rendering/src/components/Carousel.importable.tsx @@ -6,7 +6,7 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import libDebounce from 'lodash.debounce'; import { useEffect, useRef, useState } from 'react'; import { formatAttrString } from '../lib/formatAttrString'; diff --git a/dotcom-rendering/src/components/Carousel.stories.tsx b/dotcom-rendering/src/components/Carousel.stories.tsx index 7c70dddbf78..7797f2ccfb1 100644 --- a/dotcom-rendering/src/components/Carousel.stories.tsx +++ b/dotcom-rendering/src/components/Carousel.stories.tsx @@ -4,7 +4,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import fetchMock from 'fetch-mock'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; diff --git a/dotcom-rendering/src/components/CarouselForNewsletters.importable.tsx b/dotcom-rendering/src/components/CarouselForNewsletters.importable.tsx index 744cd70785e..4b28f1687ad 100644 --- a/dotcom-rendering/src/components/CarouselForNewsletters.importable.tsx +++ b/dotcom-rendering/src/components/CarouselForNewsletters.importable.tsx @@ -6,7 +6,7 @@ import { space, text, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import libDebounce from 'lodash.debounce'; import { useEffect, useRef, useState } from 'react'; import { formatAttrString } from '../lib/formatAttrString'; diff --git a/dotcom-rendering/src/components/CartoonComponent.tsx b/dotcom-rendering/src/components/CartoonComponent.tsx index 35eb7652d85..5ed8a2d059d 100644 --- a/dotcom-rendering/src/components/CartoonComponent.tsx +++ b/dotcom-rendering/src/components/CartoonComponent.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { Hide } from '@guardian/source-react-components'; +import { Hide } from '@guardian/source/react-components'; import type { CartoonBlockElement, Image } from '../types/content'; import { AppsLightboxImage } from './AppsLightboxImage.importable'; import { Caption } from './Caption'; diff --git a/dotcom-rendering/src/components/ChartAtom.importable.tsx b/dotcom-rendering/src/components/ChartAtom.importable.tsx index fe174bf065e..e974ee08609 100644 --- a/dotcom-rendering/src/components/ChartAtom.importable.tsx +++ b/dotcom-rendering/src/components/ChartAtom.importable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, space } from '@guardian/source-foundations'; +import { palette, space } from '@guardian/source/foundations'; interface Props { id: string; diff --git a/dotcom-rendering/src/components/ClickToView.stories.tsx b/dotcom-rendering/src/components/ClickToView.stories.tsx index 63152a22a24..626abb7ec64 100644 --- a/dotcom-rendering/src/components/ClickToView.stories.tsx +++ b/dotcom-rendering/src/components/ClickToView.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { textSans17 } from '@guardian/source-foundations'; +import { textSans17 } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import type { diff --git a/dotcom-rendering/src/components/ClickToView.tsx b/dotcom-rendering/src/components/ClickToView.tsx index 10e76f26d62..831d5253a0e 100644 --- a/dotcom-rendering/src/components/ClickToView.tsx +++ b/dotcom-rendering/src/components/ClickToView.tsx @@ -5,8 +5,8 @@ import { textSans17, textSansBold17, textSansBold20, -} from '@guardian/source-foundations'; -import { Button, SvgCheckmark } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, SvgCheckmark } from '@guardian/source/react-components'; import { useState } from 'react'; import { palette } from '../palette'; import type { RoleType } from '../types/content'; diff --git a/dotcom-rendering/src/components/CodeBlockComponent.tsx b/dotcom-rendering/src/components/CodeBlockComponent.tsx index 5d5441129f1..acda29d6475 100644 --- a/dotcom-rendering/src/components/CodeBlockComponent.tsx +++ b/dotcom-rendering/src/components/CodeBlockComponent.tsx @@ -2,7 +2,7 @@ // stylelint-disable color-no-hex import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { palette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/CommentBlockComponent.amp.tsx b/dotcom-rendering/src/components/CommentBlockComponent.amp.tsx index 561eda9120b..f7912332142 100644 --- a/dotcom-rendering/src/components/CommentBlockComponent.amp.tsx +++ b/dotcom-rendering/src/components/CommentBlockComponent.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans12, textSans17 } from '@guardian/source-foundations'; +import { palette, textSans12, textSans17 } from '@guardian/source/foundations'; import type { CommentBlockElement } from '../types/content'; const wrapper = css` diff --git a/dotcom-rendering/src/components/CommentBlockComponent.tsx b/dotcom-rendering/src/components/CommentBlockComponent.tsx index 2d174ebdeed..ba0a5f5a0d2 100644 --- a/dotcom-rendering/src/components/CommentBlockComponent.tsx +++ b/dotcom-rendering/src/components/CommentBlockComponent.tsx @@ -6,7 +6,7 @@ import { textSans15, textSans17, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { unescapeData } from '../lib/escapeData'; type Props = { diff --git a/dotcom-rendering/src/components/CommentCount.importable.tsx b/dotcom-rendering/src/components/CommentCount.importable.tsx index e281348692b..5d6d83f926a 100644 --- a/dotcom-rendering/src/components/CommentCount.importable.tsx +++ b/dotcom-rendering/src/components/CommentCount.importable.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { isUndefined } from '@guardian/libs'; -import { between, textSans17, until } from '@guardian/source-foundations'; +import { between, textSans17, until } from '@guardian/source/foundations'; import { formatCount } from '../lib/formatCount'; import { useCommentCount } from '../lib/useCommentCount'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/ContainerOverrides.tsx b/dotcom-rendering/src/components/ContainerOverrides.tsx index 7bded6bf5c3..1b11c2c563d 100644 --- a/dotcom-rendering/src/components/ContainerOverrides.tsx +++ b/dotcom-rendering/src/components/ContainerOverrides.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette as sourcePalette } from '@guardian/source-foundations'; +import { palette as sourcePalette } from '@guardian/source/foundations'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { palette } from '../palette'; import type { DCRContainerPalette } from '../types/front'; diff --git a/dotcom-rendering/src/components/ContainerTitle.tsx b/dotcom-rendering/src/components/ContainerTitle.tsx index 311c292e534..447dd9c97f4 100644 --- a/dotcom-rendering/src/components/ContainerTitle.tsx +++ b/dotcom-rendering/src/components/ContainerTitle.tsx @@ -8,7 +8,7 @@ import { palette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import { type EditionId, getEditionFromId } from '../lib/edition'; import type { DCRContainerPalette } from '../types/front'; diff --git a/dotcom-rendering/src/components/Contributor.tsx b/dotcom-rendering/src/components/Contributor.tsx index e34ad84f0e6..d351671c07b 100644 --- a/dotcom-rendering/src/components/Contributor.tsx +++ b/dotcom-rendering/src/components/Contributor.tsx @@ -4,7 +4,7 @@ import { headlineMedium17, textSansItalic17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling'; import { palette as schemedPalette } from '../palette'; import type { TagType } from '../types/tag'; diff --git a/dotcom-rendering/src/components/ContributorAvatar.tsx b/dotcom-rendering/src/components/ContributorAvatar.tsx index 7559b2e8c4f..afd86dd9b60 100644 --- a/dotcom-rendering/src/components/ContributorAvatar.tsx +++ b/dotcom-rendering/src/components/ContributorAvatar.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { breakpoints, from } from '@guardian/source-foundations'; +import { breakpoints, from } from '@guardian/source/foundations'; import { getSourceImageUrl } from '../lib/getSourceImageUrl_temp_fix'; import { generateSources, getFallbackSource, Sources } from './Picture'; diff --git a/dotcom-rendering/src/components/CricketScoreboard.stories.tsx b/dotcom-rendering/src/components/CricketScoreboard.stories.tsx index 84094071fdd..42412f7ecad 100644 --- a/dotcom-rendering/src/components/CricketScoreboard.stories.tsx +++ b/dotcom-rendering/src/components/CricketScoreboard.stories.tsx @@ -1,5 +1,5 @@ import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { Meta, StoryObj } from '@storybook/react'; import { match } from '../../fixtures/manual/cricket-scoreboard'; import { CricketScoreboard } from './CricketScoreboard'; diff --git a/dotcom-rendering/src/components/CricketScoreboard.tsx b/dotcom-rendering/src/components/CricketScoreboard.tsx index 1edd3b671a5..09cdeaf6a01 100644 --- a/dotcom-rendering/src/components/CricketScoreboard.tsx +++ b/dotcom-rendering/src/components/CricketScoreboard.tsx @@ -4,7 +4,7 @@ import { space, textSans14, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decidePalette } from '../lib/decidePalette'; import type { EditionId } from '../lib/edition'; import type { Palette } from '../types/palette'; diff --git a/dotcom-rendering/src/components/DarkModeMessage.tsx b/dotcom-rendering/src/components/DarkModeMessage.tsx index df75fdbef29..434974efe1d 100644 --- a/dotcom-rendering/src/components/DarkModeMessage.tsx +++ b/dotcom-rendering/src/components/DarkModeMessage.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans17 } from '@guardian/source-foundations'; +import { from, palette, space, textSans17 } from '@guardian/source/foundations'; import type { PropsWithChildren } from 'react'; export const DarkModeMessage = ({ children }: PropsWithChildren) => ( diff --git a/dotcom-rendering/src/components/DateTime.stories.tsx b/dotcom-rendering/src/components/DateTime.stories.tsx index 0ece55adf28..bcf282303a3 100644 --- a/dotcom-rendering/src/components/DateTime.stories.tsx +++ b/dotcom-rendering/src/components/DateTime.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, textSans15 } from '@guardian/source-foundations'; +import { space, textSans15 } from '@guardian/source/foundations'; import type { Meta, StoryObj } from '@storybook/react'; import { DateTime } from './DateTime'; diff --git a/dotcom-rendering/src/components/Dateline.tsx b/dotcom-rendering/src/components/Dateline.tsx index 06ac057b8f9..f9644aa75f2 100644 --- a/dotcom-rendering/src/components/Dateline.tsx +++ b/dotcom-rendering/src/components/Dateline.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { textSans12, until } from '@guardian/source-foundations'; +import { textSans12, until } from '@guardian/source/foundations'; import { palette } from '../palette'; import { useConfig } from './ConfigContext'; diff --git a/dotcom-rendering/src/components/DecideContainerByTrails.stories.tsx b/dotcom-rendering/src/components/DecideContainerByTrails.stories.tsx index 2e6fb03b9ba..dbd7db417b1 100644 --- a/dotcom-rendering/src/components/DecideContainerByTrails.stories.tsx +++ b/dotcom-rendering/src/components/DecideContainerByTrails.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { DecideContainerByTrails } from './DecideContainerByTrails'; diff --git a/dotcom-rendering/src/components/DecideFrontsAdSlots.tsx b/dotcom-rendering/src/components/DecideFrontsAdSlots.tsx index e1570050073..eea51956890 100644 --- a/dotcom-rendering/src/components/DecideFrontsAdSlots.tsx +++ b/dotcom-rendering/src/components/DecideFrontsAdSlots.tsx @@ -1,5 +1,5 @@ -import { palette } from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; +import { palette } from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; import type { ReactNode } from 'react'; import { getMerchHighPosition } from '../lib/getFrontsAdPositions'; import { AdSlot } from './AdSlot.web'; diff --git a/dotcom-rendering/src/components/DecideLines.tsx b/dotcom-rendering/src/components/DecideLines.tsx index 2586441851e..49c69833c68 100644 --- a/dotcom-rendering/src/components/DecideLines.tsx +++ b/dotcom-rendering/src/components/DecideLines.tsx @@ -3,7 +3,7 @@ import { ArticleDesign, Pillar } from '@guardian/libs'; import { DottedLines, StraightLines, -} from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source-development-kitchen/react-components'; type Props = { format: ArticleFormat; diff --git a/dotcom-rendering/src/components/DesignTag.tsx b/dotcom-rendering/src/components/DesignTag.tsx index 725015051d3..a9561981ae0 100644 --- a/dotcom-rendering/src/components/DesignTag.tsx +++ b/dotcom-rendering/src/components/DesignTag.tsx @@ -5,8 +5,8 @@ import { headlineBold20, space, until, -} from '@guardian/source-foundations'; -import { LinkButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { LinkButton } from '@guardian/source/react-components'; import { decidePalette } from '../lib/decidePalette'; import type { Palette } from '../types/palette'; diff --git a/dotcom-rendering/src/components/Details.tsx b/dotcom-rendering/src/components/Details.tsx index 20f1021330a..70cdb363a9d 100644 --- a/dotcom-rendering/src/components/Details.tsx +++ b/dotcom-rendering/src/components/Details.tsx @@ -1,10 +1,10 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { textSans14, textSans15 } from '@guardian/source-foundations'; +import { textSans14, textSans15 } from '@guardian/source/foundations'; import { SvgChevronDownSingle, SvgChevronUpSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { getZIndex } from '../lib/getZIndex'; type LabelSize = 'xsmall' | 'small'; diff --git a/dotcom-rendering/src/components/Discussion.tsx b/dotcom-rendering/src/components/Discussion.tsx index 1cf63b6fedf..32b9f8eca29 100644 --- a/dotcom-rendering/src/components/Discussion.tsx +++ b/dotcom-rendering/src/components/Discussion.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import { storage } from '@guardian/libs'; -import { space } from '@guardian/source-foundations'; -import { SvgPlus } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { SvgPlus } from '@guardian/source/react-components'; import { useEffect, useReducer } from 'react'; import { assertUnreachable } from '../lib/assert-unreachable'; import type { diff --git a/dotcom-rendering/src/components/Discussion/AbuseReportForm.tsx b/dotcom-rendering/src/components/Discussion/AbuseReportForm.tsx index 18d9a4d23d3..79e19bee19f 100644 --- a/dotcom-rendering/src/components/Discussion/AbuseReportForm.tsx +++ b/dotcom-rendering/src/components/Discussion/AbuseReportForm.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { log } from '@guardian/libs'; -import { space, textSans12 } from '@guardian/source-foundations'; +import { space, textSans12 } from '@guardian/source/foundations'; import { Button, InlineError, @@ -10,7 +10,7 @@ import { SvgCross, TextArea, TextInput, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useEffect, useRef, useState } from 'react'; import type { reportAbuse } from '../../lib/discussionApi'; import { palette as schemedPalette } from '../../palette'; diff --git a/dotcom-rendering/src/components/Discussion/Badges.tsx b/dotcom-rendering/src/components/Discussion/Badges.tsx index a66d48191f0..10d3bdbca2f 100644 --- a/dotcom-rendering/src/components/Discussion/Badges.tsx +++ b/dotcom-rendering/src/components/Discussion/Badges.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, textSansBold12 } from '@guardian/source-foundations'; +import { space, textSansBold12 } from '@guardian/source/foundations'; import { palette as themePalette } from '../../palette'; const staffBadge = css` diff --git a/dotcom-rendering/src/components/Discussion/Comment.tsx b/dotcom-rendering/src/components/Discussion/Comment.tsx index 38034587e25..1fd2cdb22d2 100644 --- a/dotcom-rendering/src/components/Discussion/Comment.tsx +++ b/dotcom-rendering/src/components/Discussion/Comment.tsx @@ -8,8 +8,8 @@ import { textSansBold12, textSansBold15, until, -} from '@guardian/source-foundations'; -import { Button, Link, SvgIndent } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Link, SvgIndent } from '@guardian/source/react-components'; import { useState } from 'react'; import type { CommentType, diff --git a/dotcom-rendering/src/components/Discussion/CommentContainer.tsx b/dotcom-rendering/src/components/Discussion/CommentContainer.tsx index 930a0d67a29..a53ac1b14f8 100644 --- a/dotcom-rendering/src/components/Discussion/CommentContainer.tsx +++ b/dotcom-rendering/src/components/Discussion/CommentContainer.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { SvgPlus } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { SvgPlus } from '@guardian/source/react-components'; import { useState } from 'react'; import type { CommentType, diff --git a/dotcom-rendering/src/components/Discussion/CommentForm.tsx b/dotcom-rendering/src/components/Discussion/CommentForm.tsx index 06912ce3e6a..1d44828db28 100644 --- a/dotcom-rendering/src/components/Discussion/CommentForm.tsx +++ b/dotcom-rendering/src/components/Discussion/CommentForm.tsx @@ -5,9 +5,9 @@ import { textSans15, textSansBold12, until, -} from '@guardian/source-foundations'; -import { Link, TextArea } from '@guardian/source-react-components'; -import { InfoSummary } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Link, TextArea } from '@guardian/source/react-components'; +import { InfoSummary } from '@guardian/source-development-kitchen/react-components'; import { useEffect, useState } from 'react'; import type { CommentType, diff --git a/dotcom-rendering/src/components/Discussion/CommentReplyPreview.tsx b/dotcom-rendering/src/components/Discussion/CommentReplyPreview.tsx index 5af15f33f8b..6e6f88f272e 100644 --- a/dotcom-rendering/src/components/Discussion/CommentReplyPreview.tsx +++ b/dotcom-rendering/src/components/Discussion/CommentReplyPreview.tsx @@ -3,8 +3,8 @@ import { space, textSans15, textSansBold15, -} from '@guardian/source-foundations'; -import { Button, SvgIndent } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, SvgIndent } from '@guardian/source/react-components'; import { useState } from 'react'; import type { CommentType, ReplyType } from '../../lib/discussion'; import { palette as schemedPalette } from '../../palette'; diff --git a/dotcom-rendering/src/components/Discussion/Comments.tsx b/dotcom-rendering/src/components/Discussion/Comments.tsx index ae705e72c2d..9f61427c980 100644 --- a/dotcom-rendering/src/components/Discussion/Comments.tsx +++ b/dotcom-rendering/src/components/Discussion/Comments.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { isString, storage } from '@guardian/libs'; -import { space, textSans15 } from '@guardian/source-foundations'; +import { space, textSans15 } from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import type { AdditionalHeadersType, diff --git a/dotcom-rendering/src/components/Discussion/Dropdown.tsx b/dotcom-rendering/src/components/Discussion/Dropdown.tsx index 495daa0e330..a09b347315b 100644 --- a/dotcom-rendering/src/components/Discussion/Dropdown.tsx +++ b/dotcom-rendering/src/components/Discussion/Dropdown.tsx @@ -5,7 +5,7 @@ import { textSans15, textSansBold15, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import type { DropdownOptionType } from '../../lib/discussion'; import { palette as schemedPalette } from '../../palette'; diff --git a/dotcom-rendering/src/components/Discussion/Filters.tsx b/dotcom-rendering/src/components/Discussion/Filters.tsx index 85822ee533c..db310f3037c 100644 --- a/dotcom-rendering/src/components/Discussion/Filters.tsx +++ b/dotcom-rendering/src/components/Discussion/Filters.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import type { FilterOptions, OrderByType, diff --git a/dotcom-rendering/src/components/Discussion/FirstCommentWelcome.tsx b/dotcom-rendering/src/components/Discussion/FirstCommentWelcome.tsx index be80b894800..29405f35794 100644 --- a/dotcom-rendering/src/components/Discussion/FirstCommentWelcome.tsx +++ b/dotcom-rendering/src/components/Discussion/FirstCommentWelcome.tsx @@ -3,8 +3,8 @@ import { headlineBold20, space, textSans15, -} from '@guardian/source-foundations'; -import { Link, TextInput } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link, TextInput } from '@guardian/source/react-components'; import { useState } from 'react'; import { palette as schemedPalette } from '../../palette'; import { useConfig } from '../ConfigContext'; diff --git a/dotcom-rendering/src/components/Discussion/LoadingComments.tsx b/dotcom-rendering/src/components/Discussion/LoadingComments.tsx index 12e3809acd1..af2945b0333 100644 --- a/dotcom-rendering/src/components/Discussion/LoadingComments.tsx +++ b/dotcom-rendering/src/components/Discussion/LoadingComments.tsx @@ -1,5 +1,5 @@ import { css, keyframes } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { palette as schemedPalette } from '../../palette'; import { Column } from './Column'; import { Row } from './Row'; diff --git a/dotcom-rendering/src/components/Discussion/LoadingPicks.tsx b/dotcom-rendering/src/components/Discussion/LoadingPicks.tsx index bfa6fd9f408..0c84fceb4e9 100644 --- a/dotcom-rendering/src/components/Discussion/LoadingPicks.tsx +++ b/dotcom-rendering/src/components/Discussion/LoadingPicks.tsx @@ -1,5 +1,5 @@ import { css, keyframes } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { palette as schemedPalette } from '../../palette'; import { Row } from './Row'; diff --git a/dotcom-rendering/src/components/Discussion/Pagination.tsx b/dotcom-rendering/src/components/Discussion/Pagination.tsx index 80bda684207..53c864ec74d 100644 --- a/dotcom-rendering/src/components/Discussion/Pagination.tsx +++ b/dotcom-rendering/src/components/Discussion/Pagination.tsx @@ -4,13 +4,13 @@ import { textSans15, textSansBold15, until, -} from '@guardian/source-foundations'; -import type { ThemeButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import type { ThemeButton } from '@guardian/source/react-components'; import { Button, SvgChevronLeftSingle, SvgChevronRightSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { FilterOptions } from '../../lib/discussion'; import { palette as schemedPalette } from '../../palette'; diff --git a/dotcom-rendering/src/components/Discussion/PillarButton.stories.tsx b/dotcom-rendering/src/components/Discussion/PillarButton.stories.tsx index 69b53a08fe2..863a0739e2f 100644 --- a/dotcom-rendering/src/components/Discussion/PillarButton.stories.tsx +++ b/dotcom-rendering/src/components/Discussion/PillarButton.stories.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { space } from '@guardian/source-foundations'; -import { SvgCheckmark } from '@guardian/source-react-components'; +import { space } from '@guardian/source/foundations'; +import { SvgCheckmark } from '@guardian/source/react-components'; import { splitTheme } from '../../../.storybook/decorators/splitThemeDecorator'; import { PillarButton } from './PillarButton'; import { Row } from './Row'; diff --git a/dotcom-rendering/src/components/Discussion/PillarButton.tsx b/dotcom-rendering/src/components/Discussion/PillarButton.tsx index 268a398a046..975faf6a7af 100644 --- a/dotcom-rendering/src/components/Discussion/PillarButton.tsx +++ b/dotcom-rendering/src/components/Discussion/PillarButton.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { textSansBold15 } from '@guardian/source-foundations'; -import { Button } from '@guardian/source-react-components'; +import { textSansBold15 } from '@guardian/source/foundations'; +import { Button } from '@guardian/source/react-components'; import { palette as themePalette } from '../../palette'; type Props = { diff --git a/dotcom-rendering/src/components/Discussion/Preview.tsx b/dotcom-rendering/src/components/Discussion/Preview.tsx index 13eae9ea12d..3adadd1acd1 100644 --- a/dotcom-rendering/src/components/Discussion/Preview.tsx +++ b/dotcom-rendering/src/components/Discussion/Preview.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, textSans15 } from '@guardian/source-foundations'; +import { space, textSans15 } from '@guardian/source/foundations'; import { palette as schemedPalette } from '../../palette'; type Props = { diff --git a/dotcom-rendering/src/components/Discussion/RecommendationCount.tsx b/dotcom-rendering/src/components/Discussion/RecommendationCount.tsx index d6c4ee36aef..e6d5c9c5972 100644 --- a/dotcom-rendering/src/components/Discussion/RecommendationCount.tsx +++ b/dotcom-rendering/src/components/Discussion/RecommendationCount.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { textSans } from '@guardian/source-foundations'; -import { SvgArrowUpStraight } from '@guardian/source-react-components'; +import { textSans } from '@guardian/source/foundations'; +import { SvgArrowUpStraight } from '@guardian/source/react-components'; import type { MouseEventHandler } from 'react'; import { useState } from 'react'; import type { SignedInUser } from '../../lib/discussion'; diff --git a/dotcom-rendering/src/components/Discussion/Timestamp.tsx b/dotcom-rendering/src/components/Discussion/Timestamp.tsx index b66b8928438..f84efdd2d7e 100644 --- a/dotcom-rendering/src/components/Discussion/Timestamp.tsx +++ b/dotcom-rendering/src/components/Discussion/Timestamp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans } from '@guardian/source-foundations'; +import { textSans } from '@guardian/source/foundations'; import { useState } from 'react'; import { dateFormatter } from '../../lib/discussionDateFormatter'; import { useInterval } from '../../lib/useInterval'; diff --git a/dotcom-rendering/src/components/Discussion/TopPick.tsx b/dotcom-rendering/src/components/Discussion/TopPick.tsx index d13bb7c4e94..a022874fac3 100644 --- a/dotcom-rendering/src/components/Discussion/TopPick.tsx +++ b/dotcom-rendering/src/components/Discussion/TopPick.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, space, textSans15 } from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +import { from, space, textSans15 } from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import type { CommentType, ReplyType, diff --git a/dotcom-rendering/src/components/Discussion/TopPicks.tsx b/dotcom-rendering/src/components/Discussion/TopPicks.tsx index e902ec132b7..3fe0a76d8a5 100644 --- a/dotcom-rendering/src/components/Discussion/TopPicks.tsx +++ b/dotcom-rendering/src/components/Discussion/TopPicks.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, until } from '@guardian/source-foundations'; +import { from, until } from '@guardian/source/foundations'; import type { CommentType, ReplyType, diff --git a/dotcom-rendering/src/components/DiscussionLayout.tsx b/dotcom-rendering/src/components/DiscussionLayout.tsx index ca644d40be4..b52899f6877 100644 --- a/dotcom-rendering/src/components/DiscussionLayout.tsx +++ b/dotcom-rendering/src/components/DiscussionLayout.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDisplay } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import type { RenderingTarget } from '../types/renderingTarget'; import { AdSlot, labelStyles } from './AdSlot.web'; import { useConfig } from './ConfigContext'; diff --git a/dotcom-rendering/src/components/Distribution.tsx b/dotcom-rendering/src/components/Distribution.tsx index 38b30d8be14..12ddf8f1d5e 100644 --- a/dotcom-rendering/src/components/Distribution.tsx +++ b/dotcom-rendering/src/components/Distribution.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineBold34, text } from '@guardian/source-foundations'; +import { headlineBold34, text } from '@guardian/source/foundations'; import { isLight } from '../lib/isLight'; type Props = { diff --git a/dotcom-rendering/src/components/DividerBlockComponent.tsx b/dotcom-rendering/src/components/DividerBlockComponent.tsx index c937eb6c965..2fd879bea89 100644 --- a/dotcom-rendering/src/components/DividerBlockComponent.tsx +++ b/dotcom-rendering/src/components/DividerBlockComponent.tsx @@ -3,7 +3,7 @@ import { from, palette as sourcePalette, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; type Props = { size?: 'full' | 'partial'; diff --git a/dotcom-rendering/src/components/DocumentBlockComponent.importable.tsx b/dotcom-rendering/src/components/DocumentBlockComponent.importable.tsx index 387484c177f..4439e41f5e7 100644 --- a/dotcom-rendering/src/components/DocumentBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/DocumentBlockComponent.importable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { LinkButton } from '@guardian/source-react-components'; +import { LinkButton } from '@guardian/source/react-components'; import type { RoleType } from '../types/content'; import { ClickToView } from './ClickToView'; diff --git a/dotcom-rendering/src/components/Doughnut.stories.tsx b/dotcom-rendering/src/components/Doughnut.stories.tsx index 4fa68dbc023..2fdc9231e1d 100644 --- a/dotcom-rendering/src/components/Doughnut.stories.tsx +++ b/dotcom-rendering/src/components/Doughnut.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { Doughnut } from './Doughnut'; export default { diff --git a/dotcom-rendering/src/components/Doughnut.tsx b/dotcom-rendering/src/components/Doughnut.tsx index 1e2e92c6e65..adaf192517a 100644 --- a/dotcom-rendering/src/components/Doughnut.tsx +++ b/dotcom-rendering/src/components/Doughnut.tsx @@ -4,7 +4,7 @@ import { headlineBold34, text, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { isLight } from '../lib/isLight'; type Props = { diff --git a/dotcom-rendering/src/components/DropCap.tsx b/dotcom-rendering/src/components/DropCap.tsx index f4096b5738a..cd8a53696aa 100644 --- a/dotcom-rendering/src/components/DropCap.tsx +++ b/dotcom-rendering/src/components/DropCap.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, Pillar } from '@guardian/libs'; -import { fonts, space } from '@guardian/source-foundations'; +import { fonts, space } from '@guardian/source/foundations'; import { palette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/Dropcap.stories.tsx b/dotcom-rendering/src/components/Dropcap.stories.tsx index 6cb8662ce6e..e084148ea9e 100644 --- a/dotcom-rendering/src/components/Dropcap.stories.tsx +++ b/dotcom-rendering/src/components/Dropcap.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { article17 } from '@guardian/source-foundations'; +import { article17 } from '@guardian/source/foundations'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { DropCap } from './DropCap'; diff --git a/dotcom-rendering/src/components/Dropdown.stories.tsx b/dotcom-rendering/src/components/Dropdown.stories.tsx index 420f65e296d..5b852c2e517 100644 --- a/dotcom-rendering/src/components/Dropdown.stories.tsx +++ b/dotcom-rendering/src/components/Dropdown.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brandBackground } from '@guardian/source-foundations'; +import { brandBackground } from '@guardian/source/foundations'; import { userEvent, within } from '@storybook/test'; import type { DropdownLinkType } from './Dropdown'; import { Dropdown } from './Dropdown'; diff --git a/dotcom-rendering/src/components/Dropdown.tsx b/dotcom-rendering/src/components/Dropdown.tsx index 0150a0af7e0..e7ffb076999 100644 --- a/dotcom-rendering/src/components/Dropdown.tsx +++ b/dotcom-rendering/src/components/Dropdown.tsx @@ -11,7 +11,7 @@ import { textSans17, until, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect, useMemo, useState } from 'react'; import { submitComponentEvent } from '../client/ophan/ophan'; import { getZIndex } from '../lib/getZIndex'; diff --git a/dotcom-rendering/src/components/DynamicFast.stories.tsx b/dotcom-rendering/src/components/DynamicFast.stories.tsx index 26116abcab6..9efce6df1c6 100644 --- a/dotcom-rendering/src/components/DynamicFast.stories.tsx +++ b/dotcom-rendering/src/components/DynamicFast.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import type { DCRGroupedTrails } from '../types/front'; diff --git a/dotcom-rendering/src/components/DynamicPackage.stories.tsx b/dotcom-rendering/src/components/DynamicPackage.stories.tsx index ce0fd7bb4a2..d9d9ee7aec0 100644 --- a/dotcom-rendering/src/components/DynamicPackage.stories.tsx +++ b/dotcom-rendering/src/components/DynamicPackage.stories.tsx @@ -1,5 +1,5 @@ import { ArticleDesign, ArticleDisplay, ArticleSpecial } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { getSublinks, trails } from '../../fixtures/manual/trails'; import type { DCRFrontCard, DCRGroupedTrails } from '../types/front'; diff --git a/dotcom-rendering/src/components/DynamicSlow.stories.tsx b/dotcom-rendering/src/components/DynamicSlow.stories.tsx index a9f480e888d..a40f6ee9c5e 100644 --- a/dotcom-rendering/src/components/DynamicSlow.stories.tsx +++ b/dotcom-rendering/src/components/DynamicSlow.stories.tsx @@ -1,5 +1,5 @@ import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { lightDecorator } from '../../.storybook/decorators/themeDecorator'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; diff --git a/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx b/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx index e849d8b8f08..c77eb3b69c9 100644 --- a/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx +++ b/dotcom-rendering/src/components/DynamicSlowMPU.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { DynamicSlowMPU } from './DynamicSlowMPU'; diff --git a/dotcom-rendering/src/components/ElementContainer.tsx b/dotcom-rendering/src/components/ElementContainer.tsx index 4940a479302..5c945e61680 100644 --- a/dotcom-rendering/src/components/ElementContainer.tsx +++ b/dotcom-rendering/src/components/ElementContainer.tsx @@ -1,6 +1,6 @@ import { css, jsx } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { from, palette, space } from '@guardian/source-foundations'; +import { from, palette, space } from '@guardian/source/foundations'; import { pageSkinContainer } from '../layouts/lib/pageSkin'; import { center } from '../lib/center'; import { transparentColour } from '../lib/transparentColour'; diff --git a/dotcom-rendering/src/components/EmailSignup.stories.tsx b/dotcom-rendering/src/components/EmailSignup.stories.tsx index b4070984192..5fee27b9fdb 100644 --- a/dotcom-rendering/src/components/EmailSignup.stories.tsx +++ b/dotcom-rendering/src/components/EmailSignup.stories.tsx @@ -1,5 +1,5 @@ import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { EmailSignup } from './EmailSignup'; import { NewsletterPrivacyMessage } from './NewsletterPrivacyMessage'; diff --git a/dotcom-rendering/src/components/EmailSignup.tsx b/dotcom-rendering/src/components/EmailSignup.tsx index 5ee43c92645..8cf5fe6cb5f 100644 --- a/dotcom-rendering/src/components/EmailSignup.tsx +++ b/dotcom-rendering/src/components/EmailSignup.tsx @@ -5,7 +5,7 @@ import { palette as sourcePalette, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { buildDetailText } from '../lib/buildNewsletterSignUpText'; import { palette as themePalette } from '../palette'; import { NewsletterDetail } from './NewsletterDetail'; diff --git a/dotcom-rendering/src/components/EmbedBlockComponent.importable.tsx b/dotcom-rendering/src/components/EmbedBlockComponent.importable.tsx index 84c9d2b603d..01d13df940e 100644 --- a/dotcom-rendering/src/components/EmbedBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/EmbedBlockComponent.importable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, space, text, textSans12 } from '@guardian/source-foundations'; +import { from, space, text, textSans12 } from '@guardian/source/foundations'; import { unescapeData } from '../lib/escapeData'; import type { RoleType } from '../types/content'; import { ClickToView } from './ClickToView'; diff --git a/dotcom-rendering/src/components/Epic.amp.tsx b/dotcom-rendering/src/components/Epic.amp.tsx index 1ebd43d1e3a..b3ea6812b1e 100644 --- a/dotcom-rendering/src/components/Epic.amp.tsx +++ b/dotcom-rendering/src/components/Epic.amp.tsx @@ -12,7 +12,7 @@ import { textSansBold15, textSansBold17, textSansItalic15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { MoustacheSection, MoustacheTemplate, diff --git a/dotcom-rendering/src/components/EpicContent.apps.tsx b/dotcom-rendering/src/components/EpicContent.apps.tsx index 1389b7dfc38..cb240b85d54 100644 --- a/dotcom-rendering/src/components/EpicContent.apps.tsx +++ b/dotcom-rendering/src/components/EpicContent.apps.tsx @@ -4,7 +4,7 @@ import { Button, buttonThemeReaderRevenue, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import { getAcquisitionsClient } from '../lib/bridgetApi'; import { useIsInView } from '../lib/useIsInView'; diff --git a/dotcom-rendering/src/components/Expandable.amp.tsx b/dotcom-rendering/src/components/Expandable.amp.tsx index 8efda461d27..7a409498a65 100644 --- a/dotcom-rendering/src/components/Expandable.amp.tsx +++ b/dotcom-rendering/src/components/Expandable.amp.tsx @@ -4,7 +4,7 @@ import { headlineMedium20, palette, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import React from 'react'; import { neutralBorder, pillarPalette_DO_NOT_USE } from '../lib/pillars'; import InfoIcon from '../static/icons/info.svg'; diff --git a/dotcom-rendering/src/components/ExpandableAtom/Body.tsx b/dotcom-rendering/src/components/ExpandableAtom/Body.tsx index 91990b77b21..4f81a3ad17e 100644 --- a/dotcom-rendering/src/components/ExpandableAtom/Body.tsx +++ b/dotcom-rendering/src/components/ExpandableAtom/Body.tsx @@ -3,8 +3,8 @@ import { article17, palette as sourcePalette, textSans14, -} from '@guardian/source-foundations'; -import { SvgInfo } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgInfo } from '@guardian/source/react-components'; import { palette as themePalette } from '../../palette'; const imageStyling = css` diff --git a/dotcom-rendering/src/components/ExpandableAtom/Container.tsx b/dotcom-rendering/src/components/ExpandableAtom/Container.tsx index 52d7c91a5e0..636bca3e582 100644 --- a/dotcom-rendering/src/components/ExpandableAtom/Container.tsx +++ b/dotcom-rendering/src/components/ExpandableAtom/Container.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette as sourcePalette } from '@guardian/source-foundations'; +import { palette as sourcePalette } from '@guardian/source/foundations'; import { palette as themePalette } from '../../palette'; import { Summary } from './Summary'; diff --git a/dotcom-rendering/src/components/ExpandableAtom/Footer.tsx b/dotcom-rendering/src/components/ExpandableAtom/Footer.tsx index 7b69a13e48c..f84e4cb5071 100644 --- a/dotcom-rendering/src/components/ExpandableAtom/Footer.tsx +++ b/dotcom-rendering/src/components/ExpandableAtom/Footer.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans14 } from '@guardian/source-foundations'; +import { textSans14 } from '@guardian/source/foundations'; import { useState } from 'react'; import { palette as themePalette } from '../../palette'; diff --git a/dotcom-rendering/src/components/ExpandableAtom/Summary.tsx b/dotcom-rendering/src/components/ExpandableAtom/Summary.tsx index 799518d6824..99dd1a3f3b8 100644 --- a/dotcom-rendering/src/components/ExpandableAtom/Summary.tsx +++ b/dotcom-rendering/src/components/ExpandableAtom/Summary.tsx @@ -3,8 +3,8 @@ import { body, headlineMedium17, textSans15, -} from '@guardian/source-foundations'; -import { SvgMinus, SvgPlus } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgMinus, SvgPlus } from '@guardian/source/react-components'; import { useState } from 'react'; import { palette as themePalette } from '../../palette'; diff --git a/dotcom-rendering/src/components/ExplainerAtom.tsx b/dotcom-rendering/src/components/ExplainerAtom.tsx index 24569088be6..3cc59caf6ca 100644 --- a/dotcom-rendering/src/components/ExplainerAtom.tsx +++ b/dotcom-rendering/src/components/ExplainerAtom.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineBold20, space, textSans } from '@guardian/source-foundations'; +import { headlineBold20, space, textSans } from '@guardian/source/foundations'; import { palette } from '../palette'; interface Props { diff --git a/dotcom-rendering/src/components/Figure.stories.tsx b/dotcom-rendering/src/components/Figure.stories.tsx index 64945a39c5c..bb0be274f9a 100644 --- a/dotcom-rendering/src/components/Figure.stories.tsx +++ b/dotcom-rendering/src/components/Figure.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { ArticleContainer } from './ArticleContainer'; import { Figure } from './Figure'; import { Flex } from './Flex'; diff --git a/dotcom-rendering/src/components/Figure.tsx b/dotcom-rendering/src/components/Figure.tsx index 2cd0d99c488..ab8c363c413 100644 --- a/dotcom-rendering/src/components/Figure.tsx +++ b/dotcom-rendering/src/components/Figure.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { from, space, until } from '@guardian/source-foundations'; +import { from, space, until } from '@guardian/source/foundations'; import type { FEElement, RoleType } from '../types/content'; type Props = { diff --git a/dotcom-rendering/src/components/FilterKeyEventsToggle.importable.tsx b/dotcom-rendering/src/components/FilterKeyEventsToggle.importable.tsx index 83eb2c8b4f8..7814fe6db8e 100644 --- a/dotcom-rendering/src/components/FilterKeyEventsToggle.importable.tsx +++ b/dotcom-rendering/src/components/FilterKeyEventsToggle.importable.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, palette, remSpace, until } from '@guardian/source-foundations'; -import { ToggleSwitch } from '@guardian/source-react-components-development-kitchen'; +import { from, palette, remSpace, until } from '@guardian/source/foundations'; +import { ToggleSwitch } from '@guardian/source-development-kitchen/react-components'; import { useState } from 'react'; const cssOverrides = css` diff --git a/dotcom-rendering/src/components/FilterLink.stories.tsx b/dotcom-rendering/src/components/FilterLink.stories.tsx index 3c2b964b65a..608ecfe4bfe 100644 --- a/dotcom-rendering/src/components/FilterLink.stories.tsx +++ b/dotcom-rendering/src/components/FilterLink.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { FilterLink } from './FilterLink'; const Wrapper = ({ children }: { children: React.ReactNode }) => ( diff --git a/dotcom-rendering/src/components/FilterLink.tsx b/dotcom-rendering/src/components/FilterLink.tsx index 52ef923c5c0..a3bb440633b 100644 --- a/dotcom-rendering/src/components/FilterLink.tsx +++ b/dotcom-rendering/src/components/FilterLink.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space, textSans15 } from '@guardian/source-foundations'; -import { LinkButton, SvgCross } from '@guardian/source-react-components'; +import { space, textSans15 } from '@guardian/source/foundations'; +import { LinkButton, SvgCross } from '@guardian/source/react-components'; import { decidePalette } from '../lib/decidePalette'; import type { Palette } from '../types/palette'; diff --git a/dotcom-rendering/src/components/FirstPublished.tsx b/dotcom-rendering/src/components/FirstPublished.tsx index 5e616a6e168..8cc73a87bf4 100644 --- a/dotcom-rendering/src/components/FirstPublished.tsx +++ b/dotcom-rendering/src/components/FirstPublished.tsx @@ -5,8 +5,8 @@ import { space, textSans12, textSansBold12, -} from '@guardian/source-foundations'; -import { SvgPinned } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgPinned } from '@guardian/source/react-components'; import { palette as themePalette } from '../palette'; import { DateTime } from './DateTime'; diff --git a/dotcom-rendering/src/components/FixedLargeSlowXIV.stories.tsx b/dotcom-rendering/src/components/FixedLargeSlowXIV.stories.tsx index 9bcc715e920..230bfa4ba08 100644 --- a/dotcom-rendering/src/components/FixedLargeSlowXIV.stories.tsx +++ b/dotcom-rendering/src/components/FixedLargeSlowXIV.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedLargeSlowXIV } from './FixedLargeSlowXIV'; diff --git a/dotcom-rendering/src/components/FixedMediumFastXI.stories.tsx b/dotcom-rendering/src/components/FixedMediumFastXI.stories.tsx index 2a73def6cd0..8bd3b655061 100644 --- a/dotcom-rendering/src/components/FixedMediumFastXI.stories.tsx +++ b/dotcom-rendering/src/components/FixedMediumFastXI.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedMediumFastXI } from './FixedMediumFastXI'; diff --git a/dotcom-rendering/src/components/FixedMediumFastXII.stories.tsx b/dotcom-rendering/src/components/FixedMediumFastXII.stories.tsx index 112f4b0dc16..21ef8e379d0 100644 --- a/dotcom-rendering/src/components/FixedMediumFastXII.stories.tsx +++ b/dotcom-rendering/src/components/FixedMediumFastXII.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedMediumFastXII } from './FixedMediumFastXII'; diff --git a/dotcom-rendering/src/components/FixedMediumSlowVI.stories.tsx b/dotcom-rendering/src/components/FixedMediumSlowVI.stories.tsx index 33276ae0315..4d381e33478 100644 --- a/dotcom-rendering/src/components/FixedMediumSlowVI.stories.tsx +++ b/dotcom-rendering/src/components/FixedMediumSlowVI.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedMediumSlowVI } from './FixedMediumSlowVI'; diff --git a/dotcom-rendering/src/components/FixedMediumSlowVII.stories.tsx b/dotcom-rendering/src/components/FixedMediumSlowVII.stories.tsx index b796c10d06b..bfdda1bc411 100644 --- a/dotcom-rendering/src/components/FixedMediumSlowVII.stories.tsx +++ b/dotcom-rendering/src/components/FixedMediumSlowVII.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedMediumSlowVII } from './FixedMediumSlowVII'; diff --git a/dotcom-rendering/src/components/FixedMediumSlowXIIMPU.stories.tsx b/dotcom-rendering/src/components/FixedMediumSlowXIIMPU.stories.tsx index 0c8a0f55c0d..9d1e2a0902e 100644 --- a/dotcom-rendering/src/components/FixedMediumSlowXIIMPU.stories.tsx +++ b/dotcom-rendering/src/components/FixedMediumSlowXIIMPU.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedMediumSlowXIIMPU } from './FixedMediumSlowXIIMPU'; diff --git a/dotcom-rendering/src/components/FixedSmallFastVIII.stories.tsx b/dotcom-rendering/src/components/FixedSmallFastVIII.stories.tsx index 0d36b336b51..061238562e5 100644 --- a/dotcom-rendering/src/components/FixedSmallFastVIII.stories.tsx +++ b/dotcom-rendering/src/components/FixedSmallFastVIII.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedSmallFastVIII } from './FixedSmallFastVIII'; diff --git a/dotcom-rendering/src/components/FixedSmallSlowI.stories.tsx b/dotcom-rendering/src/components/FixedSmallSlowI.stories.tsx index 67c68b059d8..b677a6f5ff4 100644 --- a/dotcom-rendering/src/components/FixedSmallSlowI.stories.tsx +++ b/dotcom-rendering/src/components/FixedSmallSlowI.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedSmallSlowI } from './FixedSmallSlowI'; diff --git a/dotcom-rendering/src/components/FixedSmallSlowIII.stories.tsx b/dotcom-rendering/src/components/FixedSmallSlowIII.stories.tsx index bca6a93d30e..cd1311ec0f1 100644 --- a/dotcom-rendering/src/components/FixedSmallSlowIII.stories.tsx +++ b/dotcom-rendering/src/components/FixedSmallSlowIII.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedSmallSlowIII } from './FixedSmallSlowIII'; diff --git a/dotcom-rendering/src/components/FixedSmallSlowIV.stories.tsx b/dotcom-rendering/src/components/FixedSmallSlowIV.stories.tsx index 73230d00af0..8c863641e13 100644 --- a/dotcom-rendering/src/components/FixedSmallSlowIV.stories.tsx +++ b/dotcom-rendering/src/components/FixedSmallSlowIV.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedSmallSlowIV } from './FixedSmallSlowIV'; diff --git a/dotcom-rendering/src/components/FixedSmallSlowVHalf.stories.tsx b/dotcom-rendering/src/components/FixedSmallSlowVHalf.stories.tsx index cfcf00a5081..4a1f1acca68 100644 --- a/dotcom-rendering/src/components/FixedSmallSlowVHalf.stories.tsx +++ b/dotcom-rendering/src/components/FixedSmallSlowVHalf.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedSmallSlowVHalf } from './FixedSmallSlowVHalf'; diff --git a/dotcom-rendering/src/components/FixedSmallSlowVMPU.stories.tsx b/dotcom-rendering/src/components/FixedSmallSlowVMPU.stories.tsx index 2634cf3b2e2..a6132f08099 100644 --- a/dotcom-rendering/src/components/FixedSmallSlowVMPU.stories.tsx +++ b/dotcom-rendering/src/components/FixedSmallSlowVMPU.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedSmallSlowVMPU } from './FixedSmallSlowVMPU'; diff --git a/dotcom-rendering/src/components/FixedSmallSlowVThird.stories.tsx b/dotcom-rendering/src/components/FixedSmallSlowVThird.stories.tsx index 355873375fa..1738458b2d2 100644 --- a/dotcom-rendering/src/components/FixedSmallSlowVThird.stories.tsx +++ b/dotcom-rendering/src/components/FixedSmallSlowVThird.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { FixedSmallSlowVThird } from './FixedSmallSlowVThird'; diff --git a/dotcom-rendering/src/components/FocusStyles.importable.tsx b/dotcom-rendering/src/components/FocusStyles.importable.tsx index 60efe2baba1..f2dd3b43adf 100644 --- a/dotcom-rendering/src/components/FocusStyles.importable.tsx +++ b/dotcom-rendering/src/components/FocusStyles.importable.tsx @@ -1,4 +1,4 @@ -import { FocusStyleManager } from '@guardian/source-foundations'; +import { FocusStyleManager } from '@guardian/source/foundations'; import { useEffect } from 'react'; export const FocusStyles = () => { diff --git a/dotcom-rendering/src/components/FollowButtons.tsx b/dotcom-rendering/src/components/FollowButtons.tsx index 94ba7bfc3d9..f00f7088f81 100644 --- a/dotcom-rendering/src/components/FollowButtons.tsx +++ b/dotcom-rendering/src/components/FollowButtons.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/react'; import type { EmotionJSX } from '@emotion/react/types/jsx-namespace'; -import { space, textSans15 } from '@guardian/source-foundations'; +import { space, textSans15 } from '@guardian/source/foundations'; import { SvgCheckmark, SvgNotificationsOff, SvgNotificationsOn, SvgPlus, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { palette } from '../palette'; type IconProps = { diff --git a/dotcom-rendering/src/components/FollowWrapper.importable.tsx b/dotcom-rendering/src/components/FollowWrapper.importable.tsx index 989effc96ff..2dcf60467be 100644 --- a/dotcom-rendering/src/components/FollowWrapper.importable.tsx +++ b/dotcom-rendering/src/components/FollowWrapper.importable.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import { Topic } from '@guardian/bridget/Topic'; import { log } from '@guardian/libs'; -import { from, space } from '@guardian/source-foundations'; +import { from, space } from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import { getNotificationsClient, getTagClient } from '../lib/bridgetApi'; import { useIsBridgetCompatible } from '../lib/useIsBridgetCompatible'; diff --git a/dotcom-rendering/src/components/Footer.amp.tsx b/dotcom-rendering/src/components/Footer.amp.tsx index e15a302513d..5dda5795023 100644 --- a/dotcom-rendering/src/components/Footer.amp.tsx +++ b/dotcom-rendering/src/components/Footer.amp.tsx @@ -4,7 +4,7 @@ import { palette, textSans12, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { NavType } from '../model/extract-nav'; import { useContentABTestGroup } from './ContentABTest.amp'; import { ReaderRevenueButton } from './ReaderRevenueButton.amp'; diff --git a/dotcom-rendering/src/components/Footer.stories.tsx b/dotcom-rendering/src/components/Footer.stories.tsx index 0f0341e865a..679d790da97 100644 --- a/dotcom-rendering/src/components/Footer.stories.tsx +++ b/dotcom-rendering/src/components/Footer.stories.tsx @@ -5,7 +5,7 @@ import { palette, space, textSans34, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Standard } from '../../fixtures/generated/dcr-articles/Standard'; import { editionList } from '../lib/edition'; import { extractNAV } from '../model/extract-nav'; diff --git a/dotcom-rendering/src/components/Footer.tsx b/dotcom-rendering/src/components/Footer.tsx index fb94a04f119..b5e740654d6 100644 --- a/dotcom-rendering/src/components/Footer.tsx +++ b/dotcom-rendering/src/components/Footer.tsx @@ -11,11 +11,11 @@ import { textSans12, textSans17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { LinkButton, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { EditionId } from '../lib/edition'; import { clearFix } from '../lib/mixins'; import { nestedOphanComponents } from '../lib/ophan-helpers'; diff --git a/dotcom-rendering/src/components/FrontPagination.tsx b/dotcom-rendering/src/components/FrontPagination.tsx index eedfd0dbb8b..8df357c4007 100644 --- a/dotcom-rendering/src/components/FrontPagination.tsx +++ b/dotcom-rendering/src/components/FrontPagination.tsx @@ -4,11 +4,11 @@ import { space, textSans14, textSansBold12, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgChevronLeftSingle, SvgChevronRightSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { Fragment } from 'react'; import { formatCount } from '../lib/formatCount'; diff --git a/dotcom-rendering/src/components/FrontSection.stories.tsx b/dotcom-rendering/src/components/FrontSection.stories.tsx index 43faaa2550b..82c54fdbaef 100644 --- a/dotcom-rendering/src/components/FrontSection.stories.tsx +++ b/dotcom-rendering/src/components/FrontSection.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { LI } from './Card/components/LI'; import { FrontSection } from './FrontSection'; diff --git a/dotcom-rendering/src/components/FrontSection.tsx b/dotcom-rendering/src/components/FrontSection.tsx index 07382f18095..239dfc31575 100644 --- a/dotcom-rendering/src/components/FrontSection.tsx +++ b/dotcom-rendering/src/components/FrontSection.tsx @@ -7,7 +7,7 @@ import { palette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { pageSkinContainer } from '../layouts/lib/pageSkin'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { EditionId } from '../lib/edition'; diff --git a/dotcom-rendering/src/components/FrontSectionTitle.tsx b/dotcom-rendering/src/components/FrontSectionTitle.tsx index 837525db092..b02f37a675a 100644 --- a/dotcom-rendering/src/components/FrontSectionTitle.tsx +++ b/dotcom-rendering/src/components/FrontSectionTitle.tsx @@ -4,8 +4,8 @@ import { palette as sourcePalette, textSans12, until, -} from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; import { assertUnreachable } from '../lib/assert-unreachable'; import { palette } from '../palette'; import type { CollectionBranding } from '../types/branding'; diff --git a/dotcom-rendering/src/components/GetMatchNav.importable.tsx b/dotcom-rendering/src/components/GetMatchNav.importable.tsx index b47e65a7508..8c853d90695 100644 --- a/dotcom-rendering/src/components/GetMatchNav.importable.tsx +++ b/dotcom-rendering/src/components/GetMatchNav.importable.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import type { SWRConfiguration } from 'swr'; import { useApi } from '../lib/useApi'; import type { TagType } from '../types/tag'; diff --git a/dotcom-rendering/src/components/GoalAttempts.tsx b/dotcom-rendering/src/components/GoalAttempts.tsx index c0d05209853..fe04b35e9ca 100644 --- a/dotcom-rendering/src/components/GoalAttempts.tsx +++ b/dotcom-rendering/src/components/GoalAttempts.tsx @@ -3,7 +3,7 @@ import { headlineBold34, palette as sourcePalette, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { isLight } from '../lib/isLight'; import { transparentColour } from '../lib/transparentColour'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/GroupedNewsletterList.tsx b/dotcom-rendering/src/components/GroupedNewsletterList.tsx index b085caf82fe..7c1f1f75ab0 100644 --- a/dotcom-rendering/src/components/GroupedNewsletterList.tsx +++ b/dotcom-rendering/src/components/GroupedNewsletterList.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { GroupedNewsletters } from '../types/newslettersPage'; import { CarouselForNewsletters } from './CarouselForNewsletters.importable'; import { Island } from './Island'; diff --git a/dotcom-rendering/src/components/GuardianLabsLines.tsx b/dotcom-rendering/src/components/GuardianLabsLines.tsx index 6f3e70abc5c..839fa331da8 100644 --- a/dotcom-rendering/src/components/GuardianLabsLines.tsx +++ b/dotcom-rendering/src/components/GuardianLabsLines.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/react'; -import { palette, space } from '@guardian/source-foundations'; +import { palette, space } from '@guardian/source/foundations'; import { DottedLines, StraightLines, -} from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source-development-kitchen/react-components'; const block = css` display: block; diff --git a/dotcom-rendering/src/components/GuardianRoundel.tsx b/dotcom-rendering/src/components/GuardianRoundel.tsx index 875ec1bc22e..05914bbd071 100644 --- a/dotcom-rendering/src/components/GuardianRoundel.tsx +++ b/dotcom-rendering/src/components/GuardianRoundel.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { nestedOphanComponents } from '../lib/ophan-helpers'; const title = 'Back to homepage'; diff --git a/dotcom-rendering/src/components/Header.amp.tsx b/dotcom-rendering/src/components/Header.amp.tsx index b2e9d32141c..b12e5a95e20 100644 --- a/dotcom-rendering/src/components/Header.amp.tsx +++ b/dotcom-rendering/src/components/Header.amp.tsx @@ -6,8 +6,8 @@ import { palette, until, visuallyHidden, -} from '@guardian/source-foundations'; -import { SvgGuardianBestWebsiteLogo } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgGuardianBestWebsiteLogo } from '@guardian/source/react-components'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import type { NavType, PillarLinkType } from '../model/extract-nav'; import { ReaderRevenueButton } from './ReaderRevenueButton.amp'; diff --git a/dotcom-rendering/src/components/Header.tsx b/dotcom-rendering/src/components/Header.tsx index 682a099d2f1..e3c0045f460 100644 --- a/dotcom-rendering/src/components/Header.tsx +++ b/dotcom-rendering/src/components/Header.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 { pageSkinContainer } from '../layouts/lib/pageSkin'; import { center } from '../lib/center'; import type { EditionId } from '../lib/edition'; diff --git a/dotcom-rendering/src/components/HeaderAdSlot.tsx b/dotcom-rendering/src/components/HeaderAdSlot.tsx index cd9d4b08a7a..81fd5da5000 100644 --- a/dotcom-rendering/src/components/HeaderAdSlot.tsx +++ b/dotcom-rendering/src/components/HeaderAdSlot.tsx @@ -1,6 +1,6 @@ import { css, Global } from '@emotion/react'; import { adSizes, constants } from '@guardian/commercial'; -import { palette as sourcePalette, space } from '@guardian/source-foundations'; +import { palette as sourcePalette, space } from '@guardian/source/foundations'; import { AdBlockAsk } from './AdBlockAsk.importable'; import { adContainerStyles, AdSlot } from './AdSlot.web'; import { Hide } from './Hide'; diff --git a/dotcom-rendering/src/components/HeaderTopBar.importable.tsx b/dotcom-rendering/src/components/HeaderTopBar.importable.tsx index 5e53de02a05..5d7a4754eb3 100644 --- a/dotcom-rendering/src/components/HeaderTopBar.importable.tsx +++ b/dotcom-rendering/src/components/HeaderTopBar.importable.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 { pageSkinContainer } from '../layouts/lib/pageSkin'; import { center } from '../lib/center'; import type { EditionId } from '../lib/edition'; diff --git a/dotcom-rendering/src/components/HeaderTopBarEditionDropdown.tsx b/dotcom-rendering/src/components/HeaderTopBarEditionDropdown.tsx index 5fb9a20c3f0..2d2cde6ae27 100644 --- a/dotcom-rendering/src/components/HeaderTopBarEditionDropdown.tsx +++ b/dotcom-rendering/src/components/HeaderTopBarEditionDropdown.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { EditionId } from '../lib/edition'; import { editionList, getEditionFromId } from '../lib/edition'; import { getZIndex } from '../lib/getZIndex'; diff --git a/dotcom-rendering/src/components/HeaderTopBarMyAccount.tsx b/dotcom-rendering/src/components/HeaderTopBarMyAccount.tsx index 99a87cfa6fc..b9df2807b99 100644 --- a/dotcom-rendering/src/components/HeaderTopBarMyAccount.tsx +++ b/dotcom-rendering/src/components/HeaderTopBarMyAccount.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { joinUrl } from '@guardian/libs'; -import { from, palette, textSans17 } from '@guardian/source-foundations'; +import { from, palette, textSans17 } from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import type { UserProfile } from '../lib/discussion'; import { getZIndex } from '../lib/getZIndex'; diff --git a/dotcom-rendering/src/components/HeaderTopBarPrintSubscriptions.tsx b/dotcom-rendering/src/components/HeaderTopBarPrintSubscriptions.tsx index 451c574cd5d..831747a119a 100644 --- a/dotcom-rendering/src/components/HeaderTopBarPrintSubscriptions.tsx +++ b/dotcom-rendering/src/components/HeaderTopBarPrintSubscriptions.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, textSansBold17 } from '@guardian/source-foundations'; +import { from, palette, textSansBold17 } from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import { addTrackingCodesToUrl } from '../lib/acquisitions'; import type { EditionId } from '../lib/edition'; diff --git a/dotcom-rendering/src/components/HeaderTopBarSearch.tsx b/dotcom-rendering/src/components/HeaderTopBarSearch.tsx index 993e2359d41..1a7ddfd70f9 100644 --- a/dotcom-rendering/src/components/HeaderTopBarSearch.tsx +++ b/dotcom-rendering/src/components/HeaderTopBarSearch.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, textSansBold17 } from '@guardian/source-foundations'; +import { from, palette, textSansBold17 } from '@guardian/source/foundations'; import { getZIndex } from '../lib/getZIndex'; import SearchIcon from '../static/icons/search.svg'; diff --git a/dotcom-rendering/src/components/HeaderTopBarSearchCapi.tsx b/dotcom-rendering/src/components/HeaderTopBarSearchCapi.tsx index bc0041716ca..63b5234d2a3 100644 --- a/dotcom-rendering/src/components/HeaderTopBarSearchCapi.tsx +++ b/dotcom-rendering/src/components/HeaderTopBarSearchCapi.tsx @@ -6,7 +6,7 @@ import { textSans15, textSans17, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect, useRef, useState } from 'react'; import { getZIndex } from '../lib/getZIndex'; import { nestedOphanComponents } from '../lib/ophan-helpers'; diff --git a/dotcom-rendering/src/components/HeaderTopBarSearchJobs.tsx b/dotcom-rendering/src/components/HeaderTopBarSearchJobs.tsx index b4e3b461a14..bec014f3571 100644 --- a/dotcom-rendering/src/components/HeaderTopBarSearchJobs.tsx +++ b/dotcom-rendering/src/components/HeaderTopBarSearchJobs.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, textSansBold17 } from '@guardian/source-foundations'; +import { from, palette, textSansBold17 } from '@guardian/source/foundations'; import { nestedOphanComponents } from '../lib/ophan-helpers'; const searchLinkStyles = css` diff --git a/dotcom-rendering/src/components/HeadlineByline.tsx b/dotcom-rendering/src/components/HeadlineByline.tsx index 6eb0dc50695..ac359a30d11 100644 --- a/dotcom-rendering/src/components/HeadlineByline.tsx +++ b/dotcom-rendering/src/components/HeadlineByline.tsx @@ -12,7 +12,7 @@ import { textSansItalic20, textSansItalic34, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { getSoleContributor } from '../lib/byline'; import { palette as schemedPalette } from '../palette'; import type { TagType } from '../types/tag'; diff --git a/dotcom-rendering/src/components/Hide.tsx b/dotcom-rendering/src/components/Hide.tsx index 1cf88b63cdb..f03295c3d2e 100644 --- a/dotcom-rendering/src/components/Hide.tsx +++ b/dotcom-rendering/src/components/Hide.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import type { Breakpoint } from '@guardian/source-foundations'; -import { from, until } from '@guardian/source-foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; +import { from, until } from '@guardian/source/foundations'; interface Props { children: React.ReactNode; diff --git a/dotcom-rendering/src/components/HighlightBlockComponent.tsx b/dotcom-rendering/src/components/HighlightBlockComponent.tsx index de2f157f556..6b4ae8b6b81 100644 --- a/dotcom-rendering/src/components/HighlightBlockComponent.tsx +++ b/dotcom-rendering/src/components/HighlightBlockComponent.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { body, palette } from '@guardian/source-foundations'; +import { body, palette } from '@guardian/source/foundations'; import { unwrapHtml } from '../model/unwrapHtml'; import { RewrappedComponent } from './RewrappedComponent'; diff --git a/dotcom-rendering/src/components/ImageBlockComponent.amp.tsx b/dotcom-rendering/src/components/ImageBlockComponent.amp.tsx index 23bae0a2114..9fa88ce0edf 100644 --- a/dotcom-rendering/src/components/ImageBlockComponent.amp.tsx +++ b/dotcom-rendering/src/components/ImageBlockComponent.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { text, textSans12 } from '@guardian/source-foundations'; +import { text, textSans12 } from '@guardian/source/foundations'; import { bestFitImage, heightEstimate } from '../lib/image-fit.amp'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import TriangleIcon from '../static/icons/triangle.svg'; diff --git a/dotcom-rendering/src/components/ImageComponent.tsx b/dotcom-rendering/src/components/ImageComponent.tsx index ba1d962ab4a..ab99cbc9937 100644 --- a/dotcom-rendering/src/components/ImageComponent.tsx +++ b/dotcom-rendering/src/components/ImageComponent.tsx @@ -8,7 +8,7 @@ import { headlineLight34, palette as srcPalette, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decidePalette } from '../lib/decidePalette'; import { getLargest, getMaster } from '../lib/image'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/InlineSkipToWrapper.tsx b/dotcom-rendering/src/components/InlineSkipToWrapper.tsx index b6a74322b39..e46788471a4 100644 --- a/dotcom-rendering/src/components/InlineSkipToWrapper.tsx +++ b/dotcom-rendering/src/components/InlineSkipToWrapper.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans17 } from '@guardian/source-foundations'; +import { palette, textSans17 } from '@guardian/source/foundations'; import type { ReactNode } from 'react'; type Props = { diff --git a/dotcom-rendering/src/components/InteractiveBlockComponent.importable.tsx b/dotcom-rendering/src/components/InteractiveBlockComponent.importable.tsx index 2973b5ff1d7..728f71c2d02 100644 --- a/dotcom-rendering/src/components/InteractiveBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/InteractiveBlockComponent.importable.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleSpecial } from '@guardian/libs'; -import { article17, space, textSans17 } from '@guardian/source-foundations'; +import { article17, space, textSans17 } from '@guardian/source/foundations'; import libDebounce from 'lodash.debounce'; import { useRef, useState } from 'react'; import { interactiveLegacyFigureClasses } from '../layouts/lib/interactiveLegacyStyling'; diff --git a/dotcom-rendering/src/components/InteractiveContentsBlockComponent.importable.tsx b/dotcom-rendering/src/components/InteractiveContentsBlockComponent.importable.tsx index e1bca9e3525..4c8a79e36fd 100644 --- a/dotcom-rendering/src/components/InteractiveContentsBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/InteractiveContentsBlockComponent.importable.tsx @@ -8,8 +8,8 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; -import { SvgChevronDownSingle } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgChevronDownSingle } from '@guardian/source/react-components'; import { useCallback, useEffect, useState } from 'react'; import { getZIndex } from '../lib/getZIndex'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/InteractiveSupportButton.importable.tsx b/dotcom-rendering/src/components/InteractiveSupportButton.importable.tsx index 8ac85404d91..89452f5c6f1 100644 --- a/dotcom-rendering/src/components/InteractiveSupportButton.importable.tsx +++ b/dotcom-rendering/src/components/InteractiveSupportButton.importable.tsx @@ -1,10 +1,10 @@ import { css, ThemeProvider } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { buttonThemeReaderRevenue, LinkButton, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import { shouldHideSupportMessaging } from '../lib/contributions'; import type { EditionId } from '../lib/edition'; diff --git a/dotcom-rendering/src/components/ItemLinkBlockElement.tsx b/dotcom-rendering/src/components/ItemLinkBlockElement.tsx index ba8c17b9fd3..829106c8824 100644 --- a/dotcom-rendering/src/components/ItemLinkBlockElement.tsx +++ b/dotcom-rendering/src/components/ItemLinkBlockElement.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans17, textSansBold17 } from '@guardian/source-foundations'; +import { textSans17, textSansBold17 } from '@guardian/source/foundations'; type Props = { html: string; diff --git a/dotcom-rendering/src/components/KeyEventCard.stories.tsx b/dotcom-rendering/src/components/KeyEventCard.stories.tsx index 97806ef8c06..dc6a85fbb17 100644 --- a/dotcom-rendering/src/components/KeyEventCard.stories.tsx +++ b/dotcom-rendering/src/components/KeyEventCard.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import type { KeyEventCard as KeyEventCardType } from '../../fixtures/manual/key-events'; import { events } from '../../fixtures/manual/key-events'; diff --git a/dotcom-rendering/src/components/KeyEventCard.tsx b/dotcom-rendering/src/components/KeyEventCard.tsx index e5622e151b3..97c3e1714a8 100644 --- a/dotcom-rendering/src/components/KeyEventCard.tsx +++ b/dotcom-rendering/src/components/KeyEventCard.tsx @@ -4,8 +4,8 @@ import { space, textSans, textSans15, -} from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import { palette } from '../palette'; import { DateTime } from './DateTime'; diff --git a/dotcom-rendering/src/components/KeyEvents.amp.tsx b/dotcom-rendering/src/components/KeyEvents.amp.tsx index f7f07a5f697..23f3dc2d1cd 100644 --- a/dotcom-rendering/src/components/KeyEvents.amp.tsx +++ b/dotcom-rendering/src/components/KeyEvents.amp.tsx @@ -3,7 +3,7 @@ import { headlineMedium20, palette, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { blockLink } from '../lib/block-link.amp'; import DownArrow from '../static/icons/down-arrow.svg'; diff --git a/dotcom-rendering/src/components/KeyEventsCarousel.importable.tsx b/dotcom-rendering/src/components/KeyEventsCarousel.importable.tsx index 7855763a8e0..0229fd0f888 100644 --- a/dotcom-rendering/src/components/KeyEventsCarousel.importable.tsx +++ b/dotcom-rendering/src/components/KeyEventsCarousel.importable.tsx @@ -1,11 +1,11 @@ import { css } from '@emotion/react'; -import { from, headline, space } from '@guardian/source-foundations'; +import { from, headline, space } from '@guardian/source/foundations'; import { Button, Hide, SvgChevronLeftSingle, SvgChevronRightSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useRef } from 'react'; import { palette } from '../palette'; import { KeyEventCard } from './KeyEventCard'; diff --git a/dotcom-rendering/src/components/KeyEventsCarousel.stories.tsx b/dotcom-rendering/src/components/KeyEventsCarousel.stories.tsx index ced775bfe27..1e9abc39181 100644 --- a/dotcom-rendering/src/components/KeyEventsCarousel.stories.tsx +++ b/dotcom-rendering/src/components/KeyEventsCarousel.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { LongKeyEvents, diff --git a/dotcom-rendering/src/components/KeyTakeaways.tsx b/dotcom-rendering/src/components/KeyTakeaways.tsx index b02330295d1..015205ed532 100644 --- a/dotcom-rendering/src/components/KeyTakeaways.tsx +++ b/dotcom-rendering/src/components/KeyTakeaways.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { EditionId } from '../lib/edition'; import type { ArticleElementRenderer } from '../lib/renderElement'; import type { ServerSideTests, Switches } from '../types/config'; diff --git a/dotcom-rendering/src/components/KnowledgeQuizAtom.importable.tsx b/dotcom-rendering/src/components/KnowledgeQuizAtom.importable.tsx index c6236d316b0..57468552bc2 100644 --- a/dotcom-rendering/src/components/KnowledgeQuizAtom.importable.tsx +++ b/dotcom-rendering/src/components/KnowledgeQuizAtom.importable.tsx @@ -8,8 +8,8 @@ import { textSans17, textSansBold17, textSansBold34, -} from '@guardian/source-foundations'; -import { Button, Radio, RadioGroup } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Radio, RadioGroup } from '@guardian/source/react-components'; import { Fragment, useEffect, useState } from 'react'; import type { AnswerType, diff --git a/dotcom-rendering/src/components/LabsHeader.stories.tsx b/dotcom-rendering/src/components/LabsHeader.stories.tsx index 68469e05a01..7bda8b0c501 100644 --- a/dotcom-rendering/src/components/LabsHeader.stories.tsx +++ b/dotcom-rendering/src/components/LabsHeader.stories.tsx @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { LabsHeader } from './LabsHeader'; import { Section } from './Section'; diff --git a/dotcom-rendering/src/components/LabsHeader.tsx b/dotcom-rendering/src/components/LabsHeader.tsx index d693384759b..78f68367b7d 100644 --- a/dotcom-rendering/src/components/LabsHeader.tsx +++ b/dotcom-rendering/src/components/LabsHeader.tsx @@ -5,12 +5,12 @@ import { space, textSans15, textSansBold15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Link, LinkButton, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { EditionId } from '../lib/edition'; import { getLabsUrlSuffix } from '../lib/labs'; import { LABS_HEADER_HEIGHT } from '../lib/labs-constants'; diff --git a/dotcom-rendering/src/components/LabsSection.stories.tsx b/dotcom-rendering/src/components/LabsSection.stories.tsx index 3b98f7deda1..6fb61efaeaf 100644 --- a/dotcom-rendering/src/components/LabsSection.stories.tsx +++ b/dotcom-rendering/src/components/LabsSection.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { LI } from './Card/components/LI'; import { FrontSection } from './FrontSection'; diff --git a/dotcom-rendering/src/components/LabsSection.tsx b/dotcom-rendering/src/components/LabsSection.tsx index f2d744f5fb2..3753072b725 100644 --- a/dotcom-rendering/src/components/LabsSection.tsx +++ b/dotcom-rendering/src/components/LabsSection.tsx @@ -8,12 +8,12 @@ import { textSansBold14, textSansBold20, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Link, LinkButton, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { EditionId } from '../lib/edition'; import { getLabsUrlSuffix } from '../lib/labs'; diff --git a/dotcom-rendering/src/components/LastUpdated.tsx b/dotcom-rendering/src/components/LastUpdated.tsx index 8be296beaed..9a388bcbdd9 100644 --- a/dotcom-rendering/src/components/LastUpdated.tsx +++ b/dotcom-rendering/src/components/LastUpdated.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans12 } from '@guardian/source-foundations'; +import { palette, textSans12 } from '@guardian/source/foundations'; import type { EditionId } from '../lib/edition'; import { DateTime } from './DateTime'; diff --git a/dotcom-rendering/src/components/LatestLinks.importable.stories.tsx b/dotcom-rendering/src/components/LatestLinks.importable.stories.tsx index cb4fbe80623..eea39648803 100644 --- a/dotcom-rendering/src/components/LatestLinks.importable.stories.tsx +++ b/dotcom-rendering/src/components/LatestLinks.importable.stories.tsx @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints, palette } from '@guardian/source-foundations'; +import { breakpoints, palette } from '@guardian/source/foundations'; import fetchMock from 'fetch-mock'; import type { PropsWithChildren } from 'react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; diff --git a/dotcom-rendering/src/components/LatestLinks.importable.tsx b/dotcom-rendering/src/components/LatestLinks.importable.tsx index bd395773167..33ccaca9fe7 100644 --- a/dotcom-rendering/src/components/LatestLinks.importable.tsx +++ b/dotcom-rendering/src/components/LatestLinks.importable.tsx @@ -5,7 +5,7 @@ import { space, textSans14, textSansBold14, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import { revealStyles } from '../lib/revealStyles'; import { useApi } from '../lib/useApi'; diff --git a/dotcom-rendering/src/components/LeftColumn.tsx b/dotcom-rendering/src/components/LeftColumn.tsx index 205ebf4ca35..18de3293919 100644 --- a/dotcom-rendering/src/components/LeftColumn.tsx +++ b/dotcom-rendering/src/components/LeftColumn.tsx @@ -5,7 +5,7 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; const leftWidth = (size: LeftColSize, hasPageSkin: boolean) => { if (hasPageSkin) { diff --git a/dotcom-rendering/src/components/Lightbox.stories.tsx b/dotcom-rendering/src/components/Lightbox.stories.tsx index 7b5ab0af036..acff494ca35 100644 --- a/dotcom-rendering/src/components/Lightbox.stories.tsx +++ b/dotcom-rendering/src/components/Lightbox.stories.tsx @@ -5,7 +5,7 @@ import { Pillar, storage, } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { useEffect } from 'react'; import type { ImageForLightbox } from '../types/content'; import { LightboxLayout } from './LightboxLayout.importable'; diff --git a/dotcom-rendering/src/components/LightboxCaption.tsx b/dotcom-rendering/src/components/LightboxCaption.tsx index fa6dc68996c..b435e367bb0 100644 --- a/dotcom-rendering/src/components/LightboxCaption.tsx +++ b/dotcom-rendering/src/components/LightboxCaption.tsx @@ -3,7 +3,7 @@ import { space, palette as srcPalette, textSans14, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decidePalette } from '../lib/decidePalette'; type Props = { diff --git a/dotcom-rendering/src/components/LightboxImages.tsx b/dotcom-rendering/src/components/LightboxImages.tsx index 4f63a54244c..c02ce0c6cc5 100644 --- a/dotcom-rendering/src/components/LightboxImages.tsx +++ b/dotcom-rendering/src/components/LightboxImages.tsx @@ -8,9 +8,9 @@ import { textSans14, until, visuallyHidden, -} from '@guardian/source-foundations'; -import { Hide, Link } from '@guardian/source-react-components'; -import { StarRating } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Hide, Link } from '@guardian/source/react-components'; +import { StarRating } from '@guardian/source-development-kitchen/react-components'; import { useEffect, useState } from 'react'; import type { ImageForLightbox } from '../types/content'; import { LightboxCaption } from './LightboxCaption'; diff --git a/dotcom-rendering/src/components/LightboxJavascript.tsx b/dotcom-rendering/src/components/LightboxJavascript.tsx index 7af13c5271e..ff92214bf5c 100644 --- a/dotcom-rendering/src/components/LightboxJavascript.tsx +++ b/dotcom-rendering/src/components/LightboxJavascript.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { isUndefined, log, storage } from '@guardian/libs'; -import { from, space } from '@guardian/source-foundations'; +import { from, space } from '@guardian/source/foundations'; import libDebounce from 'lodash.debounce'; import { useEffect, useState } from 'react'; import screenfull from 'screenfull'; diff --git a/dotcom-rendering/src/components/LightboxLayout.importable.tsx b/dotcom-rendering/src/components/LightboxLayout.importable.tsx index 65ed30c8831..9a8b0fec981 100644 --- a/dotcom-rendering/src/components/LightboxLayout.importable.tsx +++ b/dotcom-rendering/src/components/LightboxLayout.importable.tsx @@ -6,13 +6,13 @@ import { textSans14, until, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Hide, SvgArrowLeftStraight, SvgArrowRightStraight, SvgCross, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { getZIndex } from '../lib/getZIndex'; import type { ImageForLightbox } from '../types/content'; import { LightboxJavascript } from './LightboxJavascript'; diff --git a/dotcom-rendering/src/components/LightboxLink.tsx b/dotcom-rendering/src/components/LightboxLink.tsx index feaedc65722..6cf0276086d 100644 --- a/dotcom-rendering/src/components/LightboxLink.tsx +++ b/dotcom-rendering/src/components/LightboxLink.tsx @@ -5,8 +5,8 @@ import { palette, until, visuallyHidden, -} from '@guardian/source-foundations'; -import { SvgArrowExpand } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgArrowExpand } from '@guardian/source/react-components'; import type { RoleType } from '../types/content'; type Props = { diff --git a/dotcom-rendering/src/components/LightboxLoader.tsx b/dotcom-rendering/src/components/LightboxLoader.tsx index 82d255608d2..70129d4f53d 100644 --- a/dotcom-rendering/src/components/LightboxLoader.tsx +++ b/dotcom-rendering/src/components/LightboxLoader.tsx @@ -1,5 +1,5 @@ import { css, keyframes } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; const flash = keyframes` 0% { diff --git a/dotcom-rendering/src/components/Lineup.tsx b/dotcom-rendering/src/components/Lineup.tsx index 3f31432af3d..af3f6c1197f 100644 --- a/dotcom-rendering/src/components/Lineup.tsx +++ b/dotcom-rendering/src/components/Lineup.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans15 } from '@guardian/source-foundations'; +import { textSans15 } from '@guardian/source/foundations'; type Props = { players: PlayerType[]; diff --git a/dotcom-rendering/src/components/LinkHeadline.tsx b/dotcom-rendering/src/components/LinkHeadline.tsx index c5940df42ff..566f8b26379 100644 --- a/dotcom-rendering/src/components/LinkHeadline.tsx +++ b/dotcom-rendering/src/components/LinkHeadline.tsx @@ -4,7 +4,7 @@ import { headlineMedium20, headlineMedium24, headlineMedium28, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette } from '../palette'; import { Byline } from './Byline'; import { Kicker } from './Kicker'; diff --git a/dotcom-rendering/src/components/LiveBlock.stories.tsx b/dotcom-rendering/src/components/LiveBlock.stories.tsx index c2d2cbc5f0d..668ca1f0adc 100644 --- a/dotcom-rendering/src/components/LiveBlock.stories.tsx +++ b/dotcom-rendering/src/components/LiveBlock.stories.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints, from } from '@guardian/source-foundations'; +import { breakpoints, from } from '@guardian/source/foundations'; import { lightDecorator } from '../../.storybook/decorators/themeDecorator'; import { images } from '../../fixtures/generated/images'; import { liveBlock } from '../../fixtures/manual/liveBlock'; diff --git a/dotcom-rendering/src/components/LiveBlockContainer.tsx b/dotcom-rendering/src/components/LiveBlockContainer.tsx index 419c729c279..39f8427a274 100644 --- a/dotcom-rendering/src/components/LiveBlockContainer.tsx +++ b/dotcom-rendering/src/components/LiveBlockContainer.tsx @@ -5,7 +5,7 @@ import { from, headlineBold20, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette } from '../palette'; import { FirstPublished } from './FirstPublished'; diff --git a/dotcom-rendering/src/components/LiveBlogEpic.importable.tsx b/dotcom-rendering/src/components/LiveBlogEpic.importable.tsx index 0a9d48e68f8..cfe6f863a72 100644 --- a/dotcom-rendering/src/components/LiveBlogEpic.importable.tsx +++ b/dotcom-rendering/src/components/LiveBlogEpic.importable.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import type { OphanComponentEvent } from '@guardian/libs'; import { getCookie, log, storage } from '@guardian/libs'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { getEpicViewLog } from '@guardian/support-dotcom-components'; import type { EpicPayload } from '@guardian/support-dotcom-components/dist/dotcom/src/types'; import React, { useEffect, useState } from 'react'; diff --git a/dotcom-rendering/src/components/LiveBlogRenderer.tsx b/dotcom-rendering/src/components/LiveBlogRenderer.tsx index b38c94457d7..dec77432523 100644 --- a/dotcom-rendering/src/components/LiveBlogRenderer.tsx +++ b/dotcom-rendering/src/components/LiveBlogRenderer.tsx @@ -1,4 +1,4 @@ -import { Hide } from '@guardian/source-react-components'; +import { Hide } from '@guardian/source/react-components'; import type { EditionId } from '../lib/edition'; import type { ServerSideTests, Switches } from '../types/config'; import type { TagType } from '../types/tag'; diff --git a/dotcom-rendering/src/components/Logo.stories.tsx b/dotcom-rendering/src/components/Logo.stories.tsx index 01beebc751c..dc50f3ed855 100644 --- a/dotcom-rendering/src/components/Logo.stories.tsx +++ b/dotcom-rendering/src/components/Logo.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, space, textSans34 } from '@guardian/source-foundations'; +import { palette, space, textSans34 } from '@guardian/source/foundations'; import { editionList } from '../lib/edition'; import { Logo } from './Logo'; diff --git a/dotcom-rendering/src/components/Logo.tsx b/dotcom-rendering/src/components/Logo.tsx index 1c903940e77..3c3b20831a3 100644 --- a/dotcom-rendering/src/components/Logo.tsx +++ b/dotcom-rendering/src/components/Logo.tsx @@ -4,8 +4,8 @@ import { palette as sourcePalette, space, visuallyHidden, -} from '@guardian/source-foundations'; -import { SvgGuardianLogo } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgGuardianLogo } from '@guardian/source/react-components'; import type { EditionId } from '../lib/edition'; import { getZIndex } from '../lib/getZIndex'; import { nestedOphanComponents } from '../lib/ophan-helpers'; diff --git a/dotcom-rendering/src/components/MainMedia.amp.tsx b/dotcom-rendering/src/components/MainMedia.amp.tsx index b3683fa7c64..d94f483039a 100644 --- a/dotcom-rendering/src/components/MainMedia.amp.tsx +++ b/dotcom-rendering/src/components/MainMedia.amp.tsx @@ -3,7 +3,7 @@ import { palette, textSans15, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { bestFitImage, heightEstimate } from '../lib/image-fit.amp'; import { scrsetStringFromImagesSources } from '../lib/srcset-utils.amp'; import InfoIcon from '../static/icons/info.svg'; diff --git a/dotcom-rendering/src/components/MainMedia.tsx b/dotcom-rendering/src/components/MainMedia.tsx index 8f6d3632bdb..af5560c8656 100644 --- a/dotcom-rendering/src/components/MainMedia.tsx +++ b/dotcom-rendering/src/components/MainMedia.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { space, until } from '@guardian/source-foundations'; +import { space, until } from '@guardian/source/foundations'; import type { EditionId } from '../lib/edition'; import { getZIndex } from '../lib/getZIndex'; import { RenderArticleElement } from '../lib/renderElement'; diff --git a/dotcom-rendering/src/components/ManyNewsletterSignUp.importable.tsx b/dotcom-rendering/src/components/ManyNewsletterSignUp.importable.tsx index 1a400cb0d72..56f3074e2e2 100644 --- a/dotcom-rendering/src/components/ManyNewsletterSignUp.importable.tsx +++ b/dotcom-rendering/src/components/ManyNewsletterSignUp.importable.tsx @@ -4,8 +4,8 @@ import { headlineObjectStyles, palette, space, -} from '@guardian/source-foundations'; -import { Button, SvgCross } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, SvgCross } from '@guardian/source/react-components'; import type { ChangeEventHandler, ReactEventHandler } from 'react'; import { useCallback, useEffect, useRef, useState } from 'react'; // Note - the package also exports a component as a named export "ReCAPTCHA", diff --git a/dotcom-rendering/src/components/ManyNewslettersForm.tsx b/dotcom-rendering/src/components/ManyNewslettersForm.tsx index ce6bd88ff75..a20983274dc 100644 --- a/dotcom-rendering/src/components/ManyNewslettersForm.tsx +++ b/dotcom-rendering/src/components/ManyNewslettersForm.tsx @@ -4,8 +4,8 @@ import { headlineObjectStyles, palette, space, -} 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 { type ChangeEventHandler, useState } from 'react'; import { InlineSkipToWrapper } from './InlineSkipToWrapper'; import { NewsletterPrivacyMessage } from './NewsletterPrivacyMessage'; diff --git a/dotcom-rendering/src/components/MatchNav.tsx b/dotcom-rendering/src/components/MatchNav.tsx index 81390347b04..94ea2e89171 100644 --- a/dotcom-rendering/src/components/MatchNav.tsx +++ b/dotcom-rendering/src/components/MatchNav.tsx @@ -5,7 +5,7 @@ import { space, textSans15, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Score } from './Score'; type Props = { diff --git a/dotcom-rendering/src/components/MatchStats.tsx b/dotcom-rendering/src/components/MatchStats.tsx index dcecd92099c..e885058404c 100644 --- a/dotcom-rendering/src/components/MatchStats.tsx +++ b/dotcom-rendering/src/components/MatchStats.tsx @@ -8,7 +8,7 @@ import { space, textSans15, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette as themePalette } from '../palette'; import { Distribution } from './Distribution'; import { Doughnut } from './Doughnut'; diff --git a/dotcom-rendering/src/components/MatchTabs.tsx b/dotcom-rendering/src/components/MatchTabs.tsx index 9df1a790482..f598543de1b 100644 --- a/dotcom-rendering/src/components/MatchTabs.tsx +++ b/dotcom-rendering/src/components/MatchTabs.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { headlineMedium17, space } from '@guardian/source-foundations'; +import { headlineMedium17, space } from '@guardian/source/foundations'; import { palette as themePalette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/MediaDuration.tsx b/dotcom-rendering/src/components/MediaDuration.tsx index 28caad9c245..b83d441b6f4 100644 --- a/dotcom-rendering/src/components/MediaDuration.tsx +++ b/dotcom-rendering/src/components/MediaDuration.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { space, textSansBold12 } from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; +import { space, textSansBold12 } from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; import type { ImagePositionType } from './Card/components/ImageWrapper'; const durationStyles = css` diff --git a/dotcom-rendering/src/components/MediaMeta.tsx b/dotcom-rendering/src/components/MediaMeta.tsx index e1adae4d456..7c55d392f63 100644 --- a/dotcom-rendering/src/components/MediaMeta.tsx +++ b/dotcom-rendering/src/components/MediaMeta.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { SvgAudio, SvgCamera } from '@guardian/source-react-components'; +import { SvgAudio, SvgCamera } from '@guardian/source/react-components'; import { palette as themePalette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/MiniCard.tsx b/dotcom-rendering/src/components/MiniCard.tsx index eae400da550..92fbc932b55 100644 --- a/dotcom-rendering/src/components/MiniCard.tsx +++ b/dotcom-rendering/src/components/MiniCard.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { articleBold17, breakpoints } from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +import { articleBold17, breakpoints } from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import { palette } from '../palette'; import type { DCRContainerPalette } from '../types/front'; import type { TrailType } from '../types/trails'; diff --git a/dotcom-rendering/src/components/MostPopularFooterGrid.tsx b/dotcom-rendering/src/components/MostPopularFooterGrid.tsx index af44a02fb13..0ad5ffe67f8 100644 --- a/dotcom-rendering/src/components/MostPopularFooterGrid.tsx +++ b/dotcom-rendering/src/components/MostPopularFooterGrid.tsx @@ -5,8 +5,8 @@ import { palette, textSans14, until, -} from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import type { TrailTabType, TrailType } from '../types/trails'; import { MostViewedFooterItem } from './MostViewedFooterItem'; diff --git a/dotcom-rendering/src/components/MostViewedFooterGrid.tsx b/dotcom-rendering/src/components/MostViewedFooterGrid.tsx index 43f84f1bde3..409292b8bc6 100644 --- a/dotcom-rendering/src/components/MostViewedFooterGrid.tsx +++ b/dotcom-rendering/src/components/MostViewedFooterGrid.tsx @@ -5,7 +5,7 @@ import { palette as sourcePalette, until, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useState } from 'react'; import { palette } from '../palette'; import type { TrailTabType, TrailType } from '../types/trails'; diff --git a/dotcom-rendering/src/components/MostViewedFooterItem.tsx b/dotcom-rendering/src/components/MostViewedFooterItem.tsx index 12ab78c9abf..b8347f43cd0 100644 --- a/dotcom-rendering/src/components/MostViewedFooterItem.tsx +++ b/dotcom-rendering/src/components/MostViewedFooterItem.tsx @@ -2,7 +2,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { headlineMedium17, until } from '@guardian/source-foundations'; +import { headlineMedium17, until } from '@guardian/source/foundations'; import { palette } from '../palette'; import { AgeWarning } from './AgeWarning'; import { BigNumber } from './BigNumber'; diff --git a/dotcom-rendering/src/components/MostViewedFooterLayout.tsx b/dotcom-rendering/src/components/MostViewedFooterLayout.tsx index 63ae7e1a214..4d1fb99c508 100755 --- a/dotcom-rendering/src/components/MostViewedFooterLayout.tsx +++ b/dotcom-rendering/src/components/MostViewedFooterLayout.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import type { Breakpoint } from '@guardian/source-foundations'; -import { between, from, space } from '@guardian/source-foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; +import { between, from, space } from '@guardian/source/foundations'; import { AdSlot } from './AdSlot.web'; const stackBelow = (breakpoint: Breakpoint) => css` diff --git a/dotcom-rendering/src/components/MostViewedRight.tsx b/dotcom-rendering/src/components/MostViewedRight.tsx index a8eec874782..460e19144dc 100755 --- a/dotcom-rendering/src/components/MostViewedRight.tsx +++ b/dotcom-rendering/src/components/MostViewedRight.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { headlineBold17 } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { headlineBold17 } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { decideTrail } from '../lib/decideTrail'; import { useApi } from '../lib/useApi'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/MostViewedRightItem.tsx b/dotcom-rendering/src/components/MostViewedRightItem.tsx index d587f9ad426..2dc5771d273 100644 --- a/dotcom-rendering/src/components/MostViewedRightItem.tsx +++ b/dotcom-rendering/src/components/MostViewedRightItem.tsx @@ -3,7 +3,7 @@ import { ArticleDesign } from '@guardian/libs'; import { headlineMedium17, palette as sourcePalette, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useHover } from '../lib/useHover'; import { palette as themePalette } from '../palette'; import type { TrailType } from '../types/trails'; diff --git a/dotcom-rendering/src/components/MultiImageBlockComponent.tsx b/dotcom-rendering/src/components/MultiImageBlockComponent.tsx index a70d099bcf7..1110ba28235 100644 --- a/dotcom-rendering/src/components/MultiImageBlockComponent.tsx +++ b/dotcom-rendering/src/components/MultiImageBlockComponent.tsx @@ -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'; import type { ImageBlockElement } from '../types/content'; import { Caption } from './Caption'; import { GridItem } from './GridItem'; diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/CollapseColumnButton.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/CollapseColumnButton.tsx index 125978e3665..c513660ca99 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/CollapseColumnButton.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/CollapseColumnButton.tsx @@ -5,7 +5,7 @@ import { headlineMedium24, palette as sourcePalette, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { nestedOphanComponents } from '../../../lib/ophan-helpers'; const hideDesktop = css` diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/Column.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/Column.tsx index e9f3ce2b6fb..22adb19d750 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/Column.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/Column.tsx @@ -7,7 +7,7 @@ import { textSans17, until, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { nestedOphanComponents } from '../../../lib/ophan-helpers'; import type { EditionLinkType, diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/Columns.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/Columns.tsx index be72985fe68..5e399fdd310 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/Columns.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/Columns.tsx @@ -7,14 +7,14 @@ import { space, textSans17, textSans20, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, Label, SvgArrowRightStraight, SvgMagnifyingGlass, TextInput, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { EditionId } from '../../../lib/edition'; import { getEditionFromId, getRemainingEditions } from '../../../lib/edition'; import { nestedOphanComponents } from '../../../lib/ophan-helpers'; diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/ExpandedMenu.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/ExpandedMenu.tsx index ad4044516f2..3967fbcd48c 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/ExpandedMenu.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/ExpandedMenu.tsx @@ -4,7 +4,7 @@ import { from, textSans20, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { EditionId } from '../../../lib/edition'; import { getZIndex } from '../../../lib/getZIndex'; import type { NavType } from '../../../model/extract-nav'; diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/MoreColumn.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/MoreColumn.tsx index 4a8f26b1f0f..be0c1187ece 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/MoreColumn.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/MoreColumn.tsx @@ -5,7 +5,7 @@ import { palette as sourcePalette, textSans, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { nestedOphanComponents } from '../../../lib/ophan-helpers'; import type { LinkType } from '../../../model/extract-nav'; diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/ReaderRevenueLinks.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/ReaderRevenueLinks.tsx index fc4a28e4737..f5b12a26d56 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/ReaderRevenueLinks.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/ReaderRevenueLinks.tsx @@ -5,7 +5,7 @@ import { palette as sourcePalette, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import { addTrackingCodesToUrl } from '../../../lib/acquisitions'; import type { EditionId } from '../../../lib/edition'; diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/ShowMoreMenu.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/ShowMoreMenu.tsx index 076551c37b6..d4988fbc174 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/ShowMoreMenu.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/ShowMoreMenu.tsx @@ -5,8 +5,8 @@ import { headlineMedium24, palette as sourcePalette, visuallyHidden, -} from '@guardian/source-foundations'; -import { SvgChevronDownSingle } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgChevronDownSingle } from '@guardian/source/react-components'; import { nestedOphanComponents } from '../../../lib/ophan-helpers'; import { navInputCheckboxId, showMoreButtonId } from '../config'; diff --git a/dotcom-rendering/src/components/Nav/ExpandedMenu/VeggieBurgerMenu.tsx b/dotcom-rendering/src/components/Nav/ExpandedMenu/VeggieBurgerMenu.tsx index ddc97c6b0d1..b3b54c093b7 100644 --- a/dotcom-rendering/src/components/Nav/ExpandedMenu/VeggieBurgerMenu.tsx +++ b/dotcom-rendering/src/components/Nav/ExpandedMenu/VeggieBurgerMenu.tsx @@ -3,7 +3,7 @@ import { from, palette as sourcePalette, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { getZIndex } from '../../../lib/getZIndex'; import { nestedOphanComponents } from '../../../lib/ophan-helpers'; import { navInputCheckboxId, veggieBurgerId } from '../config'; diff --git a/dotcom-rendering/src/components/Nav/Nav.stories.tsx b/dotcom-rendering/src/components/Nav/Nav.stories.tsx index 38e0f400b75..c27b9e67356 100644 --- a/dotcom-rendering/src/components/Nav/Nav.stories.tsx +++ b/dotcom-rendering/src/components/Nav/Nav.stories.tsx @@ -1,5 +1,5 @@ import { Pillar } from '@guardian/libs'; -import { brandBackground, brandBorder } from '@guardian/source-foundations'; +import { brandBackground, brandBorder } from '@guardian/source/foundations'; import { userEvent, within } from '@storybook/test'; import { Section } from '../Section'; import { Nav } from './Nav'; diff --git a/dotcom-rendering/src/components/Nav/Nav.tsx b/dotcom-rendering/src/components/Nav/Nav.tsx index 0f9aefd7859..51f8f557bd8 100644 --- a/dotcom-rendering/src/components/Nav/Nav.tsx +++ b/dotcom-rendering/src/components/Nav/Nav.tsx @@ -1,6 +1,6 @@ import { css, Global } from '@emotion/react'; import type { Pillar } from '@guardian/libs'; -import { until, visuallyHidden } from '@guardian/source-foundations'; +import { until, visuallyHidden } from '@guardian/source/foundations'; import type { EditionId } from '../../lib/edition'; import { clearFix } from '../../lib/mixins'; import type { NavType } from '../../model/extract-nav'; diff --git a/dotcom-rendering/src/components/NavList.stories.tsx b/dotcom-rendering/src/components/NavList.stories.tsx index 798000eba55..f02b7c440be 100644 --- a/dotcom-rendering/src/components/NavList.stories.tsx +++ b/dotcom-rendering/src/components/NavList.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails-nav'; import { FrontSection } from './FrontSection'; diff --git a/dotcom-rendering/src/components/NavList.tsx b/dotcom-rendering/src/components/NavList.tsx index 141864f1c88..8d5649c2bd8 100644 --- a/dotcom-rendering/src/components/NavList.tsx +++ b/dotcom-rendering/src/components/NavList.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 { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { DCRContainerPalette } from '../types/front'; import type { ContainerOverrides } from '../types/palette'; diff --git a/dotcom-rendering/src/components/NewsletterBadge.tsx b/dotcom-rendering/src/components/NewsletterBadge.tsx index 12ad56ba8c3..32ede9db9bc 100644 --- a/dotcom-rendering/src/components/NewsletterBadge.tsx +++ b/dotcom-rendering/src/components/NewsletterBadge.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineBold28, palette } from '@guardian/source-foundations'; +import { headlineBold28, palette } from '@guardian/source/foundations'; // Note - the font-size is non-standard since the pixels are // relative to the SVG viewbox and need to be this size diff --git a/dotcom-rendering/src/components/NewsletterCard.tsx b/dotcom-rendering/src/components/NewsletterCard.tsx index b129b016182..653fc97c73d 100644 --- a/dotcom-rendering/src/components/NewsletterCard.tsx +++ b/dotcom-rendering/src/components/NewsletterCard.tsx @@ -4,12 +4,12 @@ import { headlineObjectStyles, palette, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, SvgCheckmark, SvgPlus, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useCallback, useEffect, useState } from 'react'; import { submitComponentEvent } from '../client/ophan/ophan'; import { useIsInView } from '../lib/useIsInView'; diff --git a/dotcom-rendering/src/components/NewsletterDetail.tsx b/dotcom-rendering/src/components/NewsletterDetail.tsx index cd81ee8426f..ff829ed15f9 100644 --- a/dotcom-rendering/src/components/NewsletterDetail.tsx +++ b/dotcom-rendering/src/components/NewsletterDetail.tsx @@ -3,8 +3,8 @@ import { brandAltBackground, space, textSans, -} from '@guardian/source-foundations'; -import { SvgNewsletter } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgNewsletter } from '@guardian/source/react-components'; type Props = { text: string; diff --git a/dotcom-rendering/src/components/NewsletterFrequency.tsx b/dotcom-rendering/src/components/NewsletterFrequency.tsx index 5ee841117a1..ca81394462d 100644 --- a/dotcom-rendering/src/components/NewsletterFrequency.tsx +++ b/dotcom-rendering/src/components/NewsletterFrequency.tsx @@ -3,8 +3,8 @@ import { space, textSans14, textSansBold14, -} from '@guardian/source-foundations'; -import { SvgClock } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgClock } from '@guardian/source/react-components'; type Props = { frequency: string; diff --git a/dotcom-rendering/src/components/NewsletterPageHeading.tsx b/dotcom-rendering/src/components/NewsletterPageHeading.tsx index af0f124b0e4..d89a563b94c 100644 --- a/dotcom-rendering/src/components/NewsletterPageHeading.tsx +++ b/dotcom-rendering/src/components/NewsletterPageHeading.tsx @@ -5,8 +5,8 @@ import { headlineMedium34, palette, space, -} from '@guardian/source-foundations'; -import { Link, SvgChevronRightSingle } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link, SvgChevronRightSingle } from '@guardian/source/react-components'; import { Section } from './Section'; export interface NewslettersListProps { diff --git a/dotcom-rendering/src/components/NewsletterPrivacyMessage.tsx b/dotcom-rendering/src/components/NewsletterPrivacyMessage.tsx index 3d9d0f5bc50..c8b75695e08 100644 --- a/dotcom-rendering/src/components/NewsletterPrivacyMessage.tsx +++ b/dotcom-rendering/src/components/NewsletterPrivacyMessage.tsx @@ -3,8 +3,8 @@ import { palette as sourcePalette, textSans, textSans12, -} from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import { palette as themePalette } from '../palette'; interface Props { diff --git a/dotcom-rendering/src/components/NumberedTitleBlockComponent.tsx b/dotcom-rendering/src/components/NumberedTitleBlockComponent.tsx index 803345caab4..3b187c565be 100644 --- a/dotcom-rendering/src/components/NumberedTitleBlockComponent.tsx +++ b/dotcom-rendering/src/components/NumberedTitleBlockComponent.tsx @@ -3,7 +3,7 @@ import { headlineBold34, headlineBold42, headlineLight34, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette as themePalette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/OnwardContainer.amp.tsx b/dotcom-rendering/src/components/OnwardContainer.amp.tsx index 3579d694657..3b6927ae52b 100644 --- a/dotcom-rendering/src/components/OnwardContainer.amp.tsx +++ b/dotcom-rendering/src/components/OnwardContainer.amp.tsx @@ -4,7 +4,7 @@ import { headlineMedium20, palette, textSans12, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import Camera from '../static/icons/camera.svg'; import Clock from '../static/icons/clock.svg'; import Quote from '../static/icons/quote.svg'; diff --git a/dotcom-rendering/src/components/Pagination.amp.tsx b/dotcom-rendering/src/components/Pagination.amp.tsx index 41d90528676..76a5bcfffb3 100644 --- a/dotcom-rendering/src/components/Pagination.amp.tsx +++ b/dotcom-rendering/src/components/Pagination.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans12 } from '@guardian/source-foundations'; +import { palette, textSans12 } from '@guardian/source/foundations'; import ChevronLeftDouble from '../static/icons/chevron-left-double.svg'; import ChevronLeftSingle from '../static/icons/chevron-left-single.svg'; import ChevronRightDouble from '../static/icons/chevron-right-double.svg'; diff --git a/dotcom-rendering/src/components/Pagination.stories.tsx b/dotcom-rendering/src/components/Pagination.stories.tsx index 8f635ec0020..56012986378 100644 --- a/dotcom-rendering/src/components/Pagination.stories.tsx +++ b/dotcom-rendering/src/components/Pagination.stories.tsx @@ -1,5 +1,5 @@ import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { StoryProps } from '../../.storybook/decorators/splitThemeDecorator'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { getAllThemes } from '../lib/format'; diff --git a/dotcom-rendering/src/components/Pagination.tsx b/dotcom-rendering/src/components/Pagination.tsx index 4ff72c8e87d..44ab9a1a82c 100644 --- a/dotcom-rendering/src/components/Pagination.tsx +++ b/dotcom-rendering/src/components/Pagination.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, palette, space, textSans15 } from '@guardian/source-foundations'; +import { from, palette, space, textSans15 } from '@guardian/source/foundations'; import { Hide, LinkButton, @@ -7,7 +7,7 @@ import { SvgChevronLeftSingle, SvgChevronRightDouble, SvgChevronRightSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { palette as themePalette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/PaidForBand.amp.tsx b/dotcom-rendering/src/components/PaidForBand.amp.tsx index 1f6363509ff..b988d76e9e3 100644 --- a/dotcom-rendering/src/components/PaidForBand.amp.tsx +++ b/dotcom-rendering/src/components/PaidForBand.amp.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleSpecial } from '@guardian/libs'; -import { from, palette, textSans15 } from '@guardian/source-foundations'; +import { from, palette, textSans15 } from '@guardian/source/foundations'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import ArrowRightIcon from '../static/icons/arrow-right.svg'; import LabsLogo from '../static/logos/the-guardian-labs.svg'; diff --git a/dotcom-rendering/src/components/Palettes.stories.tsx b/dotcom-rendering/src/components/Palettes.stories.tsx index 48114f38f44..482490c8a2f 100644 --- a/dotcom-rendering/src/components/Palettes.stories.tsx +++ b/dotcom-rendering/src/components/Palettes.stories.tsx @@ -1,4 +1,4 @@ -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl'; import { trails } from '../../fixtures/manual/trails'; import { DynamicFast } from './DynamicFast'; diff --git a/dotcom-rendering/src/components/PersonalityQuizAtom.importable.tsx b/dotcom-rendering/src/components/PersonalityQuizAtom.importable.tsx index a57bf24d5d7..805daf7261c 100644 --- a/dotcom-rendering/src/components/PersonalityQuizAtom.importable.tsx +++ b/dotcom-rendering/src/components/PersonalityQuizAtom.importable.tsx @@ -7,8 +7,8 @@ import { space, textSans17, textSansBold17, -} from '@guardian/source-foundations'; -import { Button, Radio, RadioGroup } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Radio, RadioGroup } from '@guardian/source/react-components'; import type { KeyboardEvent, MouseEvent } from 'react'; import { memo, useEffect, useState } from 'react'; import type { diff --git a/dotcom-rendering/src/components/Picture.tsx b/dotcom-rendering/src/components/Picture.tsx index 54c1f9f5164..1a7755abe65 100644 --- a/dotcom-rendering/src/components/Picture.tsx +++ b/dotcom-rendering/src/components/Picture.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign, ArticleDisplay } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { Fragment, useCallback, useEffect, useState } from 'react'; import { generateImageURL } from '../lib/image'; import type { RoleType } from '../types/content'; diff --git a/dotcom-rendering/src/components/Pillars.tsx b/dotcom-rendering/src/components/Pillars.tsx index e18fd51ba05..4fb54f61409 100644 --- a/dotcom-rendering/src/components/Pillars.tsx +++ b/dotcom-rendering/src/components/Pillars.tsx @@ -7,7 +7,7 @@ import { headlineMedium17, palette as srcPalette, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decidePalette } from '../lib/decidePalette'; import { nestedOphanComponents } from '../lib/ophan-helpers'; import type { PillarLinkType } from '../model/extract-nav'; diff --git a/dotcom-rendering/src/components/PinnedPost.stories.tsx b/dotcom-rendering/src/components/PinnedPost.stories.tsx index 603792d6c34..b22165278ef 100644 --- a/dotcom-rendering/src/components/PinnedPost.stories.tsx +++ b/dotcom-rendering/src/components/PinnedPost.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { breakpoints, from } from '@guardian/source-foundations'; +import { breakpoints, from } from '@guardian/source/foundations'; import { liveBlock } from '../../fixtures/manual/liveBlock'; import { LiveBlock } from './LiveBlock'; import { PinnedPost } from './PinnedPost'; diff --git a/dotcom-rendering/src/components/PinnedPost.tsx b/dotcom-rendering/src/components/PinnedPost.tsx index f7cba24b9a1..10f1af76efc 100644 --- a/dotcom-rendering/src/components/PinnedPost.tsx +++ b/dotcom-rendering/src/components/PinnedPost.tsx @@ -10,12 +10,12 @@ import { textSansBold17, transitions, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgMinus, SvgPinned, SvgPlus, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { decidePalette } from '../lib/decidePalette'; import type { Palette } from '../types/palette'; import { DateTime } from './DateTime'; diff --git a/dotcom-rendering/src/components/Placeholder.tsx b/dotcom-rendering/src/components/Placeholder.tsx index 02252462788..f58f1db0369 100644 --- a/dotcom-rendering/src/components/Placeholder.tsx +++ b/dotcom-rendering/src/components/Placeholder.tsx @@ -1,5 +1,5 @@ import { css, keyframes } from '@emotion/react'; -import { palette, space } from '@guardian/source-foundations'; +import { palette, space } from '@guardian/source/foundations'; const BACKGROUND_COLOUR = palette.neutral[93]; diff --git a/dotcom-rendering/src/components/PrivacySettingsLink.importable.tsx b/dotcom-rendering/src/components/PrivacySettingsLink.importable.tsx index d87e011d453..833c789b1f0 100644 --- a/dotcom-rendering/src/components/PrivacySettingsLink.importable.tsx +++ b/dotcom-rendering/src/components/PrivacySettingsLink.importable.tsx @@ -1,8 +1,8 @@ import { css } from '@emotion/react'; import { cmp, onConsent } from '@guardian/libs'; import type { ConsentFramework } from '@guardian/libs'; -import { palette } from '@guardian/source-foundations'; -import { ButtonLink } from '@guardian/source-react-components'; +import { palette } from '@guardian/source/foundations'; +import { ButtonLink } from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; const footerLink = css` diff --git a/dotcom-rendering/src/components/PullQuoteBlockComponent.stories.tsx b/dotcom-rendering/src/components/PullQuoteBlockComponent.stories.tsx index b93b9231298..68c5065de49 100644 --- a/dotcom-rendering/src/components/PullQuoteBlockComponent.stories.tsx +++ b/dotcom-rendering/src/components/PullQuoteBlockComponent.stories.tsx @@ -1,5 +1,5 @@ import { ArticleDesign, ArticleDisplay, Pillar } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { palette as themePalette } from '../palette'; import { PullQuoteBlockComponent } from './PullQuoteBlockComponent'; diff --git a/dotcom-rendering/src/components/PullQuoteBlockComponent.tsx b/dotcom-rendering/src/components/PullQuoteBlockComponent.tsx index cce7a832000..ee4be3ab31a 100644 --- a/dotcom-rendering/src/components/PullQuoteBlockComponent.tsx +++ b/dotcom-rendering/src/components/PullQuoteBlockComponent.tsx @@ -8,7 +8,7 @@ import { headlineMedium28, textSans, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { unescapeData } from '../lib/escapeData'; import { palette } from '../palette'; import { QuoteIcon } from './QuoteIcon'; diff --git a/dotcom-rendering/src/components/PullquoteBlockComponent.amp.tsx b/dotcom-rendering/src/components/PullquoteBlockComponent.amp.tsx index 4e6ef5a7461..7f3ee91bd67 100644 --- a/dotcom-rendering/src/components/PullquoteBlockComponent.amp.tsx +++ b/dotcom-rendering/src/components/PullquoteBlockComponent.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { article17, palette } from '@guardian/source-foundations'; +import { article17, palette } from '@guardian/source/foundations'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import Quote from '../static/icons/quote.svg'; diff --git a/dotcom-rendering/src/components/ReaderRevenueButton.amp.tsx b/dotcom-rendering/src/components/ReaderRevenueButton.amp.tsx index 4017a8713aa..8e256081461 100644 --- a/dotcom-rendering/src/components/ReaderRevenueButton.amp.tsx +++ b/dotcom-rendering/src/components/ReaderRevenueButton.amp.tsx @@ -4,7 +4,7 @@ import { textSans15, textSans17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { NavType } from '../model/extract-nav'; import ArrowRight from '../static/icons/arrow-right.svg'; diff --git a/dotcom-rendering/src/components/ReaderRevenueLinks.importable.tsx b/dotcom-rendering/src/components/ReaderRevenueLinks.importable.tsx index 7115fd12e86..46e6151714f 100644 --- a/dotcom-rendering/src/components/ReaderRevenueLinks.importable.tsx +++ b/dotcom-rendering/src/components/ReaderRevenueLinks.importable.tsx @@ -13,7 +13,7 @@ import { textSans15, textSans17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { getHeader } from '@guardian/support-dotcom-components'; import type { HeaderPayload, diff --git a/dotcom-rendering/src/components/ReaderRevenueLinks.stories.tsx b/dotcom-rendering/src/components/ReaderRevenueLinks.stories.tsx index 20160703743..27006a89d41 100644 --- a/dotcom-rendering/src/components/ReaderRevenueLinks.stories.tsx +++ b/dotcom-rendering/src/components/ReaderRevenueLinks.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { brandBackground } from '@guardian/source-foundations'; +import { brandBackground } from '@guardian/source/foundations'; import { ReaderRevenueLinks } from './ReaderRevenueLinks.importable'; export default { diff --git a/dotcom-rendering/src/components/RichLink.tsx b/dotcom-rendering/src/components/RichLink.tsx index d30567a08c7..e6f42190461 100644 --- a/dotcom-rendering/src/components/RichLink.tsx +++ b/dotcom-rendering/src/components/RichLink.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleSpecial } from '@guardian/libs'; -import type { FontScaleArgs } from '@guardian/source-foundations'; +import type { FontScaleArgs } from '@guardian/source/foundations'; import { from, headline, @@ -11,7 +11,7 @@ import { textSansBold12, textSansBold15, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { palette as themePalette } from '../palette'; import ArrowInCircle from '../static/icons/arrow-in-circle.svg'; import type { TagType } from '../types/tag'; diff --git a/dotcom-rendering/src/components/RichLinkBlockComponent.amp.tsx b/dotcom-rendering/src/components/RichLinkBlockComponent.amp.tsx index d6dcbc2949f..5f7506f6a57 100644 --- a/dotcom-rendering/src/components/RichLinkBlockComponent.amp.tsx +++ b/dotcom-rendering/src/components/RichLinkBlockComponent.amp.tsx @@ -4,7 +4,7 @@ import { palette, text, textSans12, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import type { RichLinkBlockElement } from '../types/content'; diff --git a/dotcom-rendering/src/components/RightColumn.tsx b/dotcom-rendering/src/components/RightColumn.tsx index 84e11d02eac..764a38d82ff 100644 --- a/dotcom-rendering/src/components/RightColumn.tsx +++ b/dotcom-rendering/src/components/RightColumn.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { from, until } from '@guardian/source-foundations'; -import type { Breakpoint } from '@guardian/source-foundations'; +import { from, until } from '@guardian/source/foundations'; +import type { Breakpoint } from '@guardian/source/foundations'; const hideBelow = (showFrom: Breakpoint) => css` ${until[showFrom]} { diff --git a/dotcom-rendering/src/components/Score.tsx b/dotcom-rendering/src/components/Score.tsx index 3f58e5a29c2..975681183d6 100644 --- a/dotcom-rendering/src/components/Score.tsx +++ b/dotcom-rendering/src/components/Score.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { text } from '@guardian/source-foundations'; +import { text } from '@guardian/source/foundations'; import { Eight } from './numbers/Eight'; import { Five } from './numbers/Five'; import { Four } from './numbers/Four'; diff --git a/dotcom-rendering/src/components/Section.stories.tsx b/dotcom-rendering/src/components/Section.stories.tsx index c8b137cc26b..53810bd3871 100644 --- a/dotcom-rendering/src/components/Section.stories.tsx +++ b/dotcom-rendering/src/components/Section.stories.tsx @@ -4,7 +4,7 @@ import { brandBackground, brandBorder, breakpoints, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Section } from './Section'; export default { diff --git a/dotcom-rendering/src/components/Section.tsx b/dotcom-rendering/src/components/Section.tsx index 3eda1f8df48..ac18001e38c 100644 --- a/dotcom-rendering/src/components/Section.tsx +++ b/dotcom-rendering/src/components/Section.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign } from '@guardian/libs'; -import { background, from, space, until } from '@guardian/source-foundations'; +import { background, from, space, until } from '@guardian/source/foundations'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import type { EditionId } from '../lib/edition'; import { hiddenStyles } from '../lib/hiddenStyles'; diff --git a/dotcom-rendering/src/components/SecureSignup.importable.tsx b/dotcom-rendering/src/components/SecureSignup.importable.tsx index 5e79fc97602..3384edeae2a 100644 --- a/dotcom-rendering/src/components/SecureSignup.importable.tsx +++ b/dotcom-rendering/src/components/SecureSignup.importable.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { isString, type OphanAction } from '@guardian/libs'; -import { space, until } from '@guardian/source-foundations'; +import { space, until } from '@guardian/source/foundations'; import { Button, InlineError, @@ -9,7 +9,7 @@ import { SvgReload, SvgSpinner, TextInput, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { CSSProperties, FormEvent, ReactEventHandler } from 'react'; import { useEffect, useRef, useState } from 'react'; // Note - the package also exports a component as a named export "ReCAPTCHA", diff --git a/dotcom-rendering/src/components/SendAMessage.importable.tsx b/dotcom-rendering/src/components/SendAMessage.importable.tsx index 23646b915c6..40d795d6626 100644 --- a/dotcom-rendering/src/components/SendAMessage.importable.tsx +++ b/dotcom-rendering/src/components/SendAMessage.importable.tsx @@ -9,15 +9,15 @@ import { textSansBold15, textSansBold17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, SvgChevronDownSingle, SvgChevronUpSingle, SvgMessageRound, SvgTickRound, -} 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 { decidePalette } from '../lib/decidePalette'; import type { MessageUsFieldType } from '../types/content'; diff --git a/dotcom-rendering/src/components/SeriesLink.amp.tsx b/dotcom-rendering/src/components/SeriesLink.amp.tsx index 0ed03809c0f..d2653ad61f2 100644 --- a/dotcom-rendering/src/components/SeriesLink.amp.tsx +++ b/dotcom-rendering/src/components/SeriesLink.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineMedium17 } from '@guardian/source-foundations'; +import { headlineMedium17 } from '@guardian/source/foundations'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import type { TagType } from '../types/tag'; diff --git a/dotcom-rendering/src/components/SeriesSectionLink.tsx b/dotcom-rendering/src/components/SeriesSectionLink.tsx index a87cf788e74..79a3bcc872d 100644 --- a/dotcom-rendering/src/components/SeriesSectionLink.tsx +++ b/dotcom-rendering/src/components/SeriesSectionLink.tsx @@ -10,7 +10,7 @@ import { textSans20, textSansBold20, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling'; import { palette as themePalette } from '../palette'; import type { TagType } from '../types/tag'; diff --git a/dotcom-rendering/src/components/ShareButton.importable.tsx b/dotcom-rendering/src/components/ShareButton.importable.tsx index acb7822d881..42a00770204 100644 --- a/dotcom-rendering/src/components/ShareButton.importable.tsx +++ b/dotcom-rendering/src/components/ShareButton.importable.tsx @@ -1,13 +1,13 @@ import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { palette, until } from '@guardian/source-foundations'; -import type { Size } from '@guardian/source-react-components'; +import { palette, until } from '@guardian/source/foundations'; +import type { Size } from '@guardian/source/react-components'; import { Button, LinkButton, SvgCheckmark, SvgShare, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useEffect, useMemo, useState } from 'react'; import { transparentColour } from '../lib/transparentColour'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/ShareIcons.amp.tsx b/dotcom-rendering/src/components/ShareIcons.amp.tsx index 9011d2994e9..89d8b6e97b2 100644 --- a/dotcom-rendering/src/components/ShareIcons.amp.tsx +++ b/dotcom-rendering/src/components/ShareIcons.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { visuallyHidden } from '@guardian/source-foundations'; +import { visuallyHidden } from '@guardian/source/foundations'; import React from 'react'; import { neutralBorder, diff --git a/dotcom-rendering/src/components/SharingIcons.tsx b/dotcom-rendering/src/components/SharingIcons.tsx index 7eadff36a30..0c0e77e46f4 100644 --- a/dotcom-rendering/src/components/SharingIcons.tsx +++ b/dotcom-rendering/src/components/SharingIcons.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; import { LinkButton, SvgEnvelope, @@ -9,8 +9,8 @@ import { SvgPinterest, SvgTwitter, SvgWhatsApp, -} from '@guardian/source-react-components'; -import type { IconProps } from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; +import type { IconProps } from '@guardian/source/react-components'; import type { SharePlatformType } from '../types/content'; const shareIconList = css` diff --git a/dotcom-rendering/src/components/ShowHideButton.tsx b/dotcom-rendering/src/components/ShowHideButton.tsx index 7aa47087010..374c40be369 100644 --- a/dotcom-rendering/src/components/ShowHideButton.tsx +++ b/dotcom-rendering/src/components/ShowHideButton.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { palette, space, textSans14 } from '@guardian/source-foundations'; -import { ButtonLink } from '@guardian/source-react-components'; +import { palette, space, textSans14 } from '@guardian/source/foundations'; +import { ButtonLink } from '@guardian/source/react-components'; type Props = { sectionId: string; diff --git a/dotcom-rendering/src/components/ShowMore.importable.tsx b/dotcom-rendering/src/components/ShowMore.importable.tsx index 558c664e780..581548d5953 100644 --- a/dotcom-rendering/src/components/ShowMore.importable.tsx +++ b/dotcom-rendering/src/components/ShowMore.importable.tsx @@ -6,13 +6,13 @@ import { space, until, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, InlineError, SvgCross, SvgPlus, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import { shouldPadWrappableRows } from '../lib/dynamicSlices'; import type { EditionId } from '../lib/edition'; diff --git a/dotcom-rendering/src/components/ShowMoreButton.amp.tsx b/dotcom-rendering/src/components/ShowMoreButton.amp.tsx index 5e78b445646..f2f74561c1b 100644 --- a/dotcom-rendering/src/components/ShowMoreButton.amp.tsx +++ b/dotcom-rendering/src/components/ShowMoreButton.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans15 } from '@guardian/source-foundations'; +import { palette, textSans15 } from '@guardian/source/foundations'; import PlusIcon from '../static/icons/plus.svg'; const showMore = css` diff --git a/dotcom-rendering/src/components/Sidebar.amp.tsx b/dotcom-rendering/src/components/Sidebar.amp.tsx index 01bcda4b15b..1dd44c76fb1 100644 --- a/dotcom-rendering/src/components/Sidebar.amp.tsx +++ b/dotcom-rendering/src/components/Sidebar.amp.tsx @@ -3,7 +3,7 @@ import { headlineMedium24, palette, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { createAuthenticationEventParams } from '../lib/identity-component-event'; export const Sidebar = () => { diff --git a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateCustomizableText.tsx b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateCustomizableText.tsx index a806a26da42..3c9a28ea0c3 100644 --- a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateCustomizableText.tsx +++ b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateCustomizableText.tsx @@ -1,4 +1,4 @@ -import { Button, Link, LinkButton } from '@guardian/source-react-components'; +import { Button, Link, LinkButton } from '@guardian/source/react-components'; import { useConfig } from '../../ConfigContext'; import { trackLink } from '../componentEventTracking'; import type { SignInGateCustomizableTextProps } from '../types'; diff --git a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateFakeSocial.tsx b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateFakeSocial.tsx index 45d51f86c5f..b872667a805 100644 --- a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateFakeSocial.tsx +++ b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateFakeSocial.tsx @@ -7,8 +7,8 @@ import { space, textSans17, until, -} from '@guardian/source-foundations'; -import { Button, Link, LinkButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Link, LinkButton } from '@guardian/source/react-components'; import { useConfig } from '../../ConfigContext'; import { trackLink } from '../componentEventTracking'; import type { SignInGateProps } from '../types'; diff --git a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMain.tsx b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMain.tsx index 64eaf6c28cc..a6db7511b1c 100644 --- a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMain.tsx +++ b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMain.tsx @@ -1,5 +1,5 @@ import { cmp } from '@guardian/libs'; -import { Button, Link, LinkButton } from '@guardian/source-react-components'; +import { Button, Link, LinkButton } from '@guardian/source/react-components'; import { useConfig } from '../../ConfigContext'; import { trackLink } from '../componentEventTracking'; import type { SignInGateProps } from '../types'; diff --git a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMainCheckoutComplete.tsx b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMainCheckoutComplete.tsx index 85c6d7d9823..990479b32fe 100644 --- a/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMainCheckoutComplete.tsx +++ b/dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateMainCheckoutComplete.tsx @@ -7,8 +7,8 @@ import { headlineBold34, palette, space, -} from '@guardian/source-foundations'; -import { Button, Link, LinkButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Button, Link, LinkButton } from '@guardian/source/react-components'; import { COMPLETE_REGISTRATION_BUTTON, SIGN_IN_BUTTON, diff --git a/dotcom-rendering/src/components/SignInGate/gateDesigns/shared.tsx b/dotcom-rendering/src/components/SignInGate/gateDesigns/shared.tsx index 16129654d99..36f967e18fb 100644 --- a/dotcom-rendering/src/components/SignInGate/gateDesigns/shared.tsx +++ b/dotcom-rendering/src/components/SignInGate/gateDesigns/shared.tsx @@ -9,7 +9,7 @@ import { text, textSans17, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; export const signInGateContainer = css` max-width: 617px; diff --git a/dotcom-rendering/src/components/SignedInAs.tsx b/dotcom-rendering/src/components/SignedInAs.tsx index bccc3266b87..35f712d5ef9 100644 --- a/dotcom-rendering/src/components/SignedInAs.tsx +++ b/dotcom-rendering/src/components/SignedInAs.tsx @@ -9,8 +9,8 @@ import { textSans12, textSans15, until, -} from '@guardian/source-foundations'; -import { LinkButton } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { LinkButton } from '@guardian/source/react-components'; import { getUserClient } from '../lib/bridgetApi'; import type { UserProfile } from '../lib/discussion'; import { createAuthenticationEventParams } from '../lib/identity-component-event'; diff --git a/dotcom-rendering/src/components/SkipTo.tsx b/dotcom-rendering/src/components/SkipTo.tsx index 20a95ae1d15..105dfb7b16e 100644 --- a/dotcom-rendering/src/components/SkipTo.tsx +++ b/dotcom-rendering/src/components/SkipTo.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, textSans17 } from '@guardian/source-foundations'; +import { palette, textSans17 } from '@guardian/source/foundations'; import { nestedOphanComponents } from '../lib/ophan-helpers'; type Identifier = diff --git a/dotcom-rendering/src/components/Slideshow.stories.tsx b/dotcom-rendering/src/components/Slideshow.stories.tsx index 6ed5f872614..f3d4ca787e5 100644 --- a/dotcom-rendering/src/components/Slideshow.stories.tsx +++ b/dotcom-rendering/src/components/Slideshow.stories.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { breakpoints, space } from '@guardian/source-foundations'; +import { breakpoints, space } from '@guardian/source/foundations'; import type { PropsWithChildren } from 'react'; import type { DCRSlideshowImage } from '../types/front'; import { Slideshow } from './Slideshow'; diff --git a/dotcom-rendering/src/components/Slideshow.tsx b/dotcom-rendering/src/components/Slideshow.tsx index 3625f29fe6e..bc5007dd209 100644 --- a/dotcom-rendering/src/components/Slideshow.tsx +++ b/dotcom-rendering/src/components/Slideshow.tsx @@ -6,7 +6,7 @@ import { space, textSansBold12, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { takeFirst } from '../lib/tuple'; import type { DCRSlideshowImage } from '../types/front'; import type { ImageSizeType } from './Card/components/ImageWrapper'; diff --git a/dotcom-rendering/src/components/Standfirst.amp.tsx b/dotcom-rendering/src/components/Standfirst.amp.tsx index 8507573d627..94c37fc966d 100644 --- a/dotcom-rendering/src/components/Standfirst.amp.tsx +++ b/dotcom-rendering/src/components/Standfirst.amp.tsx @@ -5,7 +5,7 @@ import { headlineMedium17, palette, textSans20, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { neutralBorder, pillarPalette_DO_NOT_USE } from '../lib/pillars'; const ListStyle = (iconColour: string) => css` diff --git a/dotcom-rendering/src/components/Standfirst.stories.tsx b/dotcom-rendering/src/components/Standfirst.stories.tsx index 8b74d483bd5..26580fc92b6 100644 --- a/dotcom-rendering/src/components/Standfirst.stories.tsx +++ b/dotcom-rendering/src/components/Standfirst.stories.tsx @@ -4,7 +4,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { palette as sourcePalette } from '@guardian/source-foundations'; +import { palette as sourcePalette } from '@guardian/source/foundations'; import type { StoryObj } from '@storybook/react'; import { splitTheme } from '../../.storybook/decorators/splitThemeDecorator'; import { Section } from './Section'; diff --git a/dotcom-rendering/src/components/Standfirst.tsx b/dotcom-rendering/src/components/Standfirst.tsx index 15c24bd6664..2ef2b244ce1 100644 --- a/dotcom-rendering/src/components/Standfirst.tsx +++ b/dotcom-rendering/src/components/Standfirst.tsx @@ -11,7 +11,7 @@ import { textSans, textSans17, textSans20, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import sanitise from 'sanitize-html'; import { interactiveLegacyClasses } from '../layouts/lib/interactiveLegacyStyling'; import { palette } from '../palette'; diff --git a/dotcom-rendering/src/components/StarRating/StarRating.tsx b/dotcom-rendering/src/components/StarRating/StarRating.tsx index 440f90ccab5..c75fb55eadf 100644 --- a/dotcom-rendering/src/components/StarRating/StarRating.tsx +++ b/dotcom-rendering/src/components/StarRating/StarRating.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { SvgStar, SvgStarOutline } from '@guardian/source-react-components'; +import { SvgStar, SvgStarOutline } from '@guardian/source/react-components'; import type { RatingSizeType } from '../../types/content'; const padding = css` diff --git a/dotcom-rendering/src/components/StickyAd.amp.tsx b/dotcom-rendering/src/components/StickyAd.amp.tsx index c355cbc038d..abbd6c91544 100644 --- a/dotcom-rendering/src/components/StickyAd.amp.tsx +++ b/dotcom-rendering/src/components/StickyAd.amp.tsx @@ -1,4 +1,4 @@ -import { text, textSans14 } from '@guardian/source-foundations'; +import { text, textSans14 } from '@guardian/source/foundations'; import type { BaseAdProps } from './Ad.amp'; import { Ad } from './Ad.amp'; diff --git a/dotcom-rendering/src/components/SubMeta.amp.tsx b/dotcom-rendering/src/components/SubMeta.amp.tsx index ab25e0ffefe..7643117ca58 100644 --- a/dotcom-rendering/src/components/SubMeta.amp.tsx +++ b/dotcom-rendering/src/components/SubMeta.amp.tsx @@ -5,7 +5,7 @@ import { text, textSans12, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { neutralBorder, pillarPalette_DO_NOT_USE } from '../lib/pillars'; import type { BaseLinkType } from '../model/extract-nav'; import CommentIcon from '../static/icons/comment.svg'; diff --git a/dotcom-rendering/src/components/SubMeta.tsx b/dotcom-rendering/src/components/SubMeta.tsx index 518a1503908..2ebe6dc76b5 100644 --- a/dotcom-rendering/src/components/SubMeta.tsx +++ b/dotcom-rendering/src/components/SubMeta.tsx @@ -6,8 +6,8 @@ import { textSans12, textSans14, 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 { BaseLinkType } from '../model/extract-nav'; import { palette } from '../palette'; import { Island } from './Island'; diff --git a/dotcom-rendering/src/components/SubNav.importable.tsx b/dotcom-rendering/src/components/SubNav.importable.tsx index a79742b5d26..08e1628a713 100644 --- a/dotcom-rendering/src/components/SubNav.importable.tsx +++ b/dotcom-rendering/src/components/SubNav.importable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, textSans15, textSans17 } from '@guardian/source-foundations'; +import { from, textSans15, textSans17 } from '@guardian/source/foundations'; import { useEffect, useRef, useState } from 'react'; import { nestedOphanComponents } from '../lib/ophan-helpers'; import type { SubNavType } from '../model/extract-nav'; diff --git a/dotcom-rendering/src/components/Subheading.tsx b/dotcom-rendering/src/components/Subheading.tsx index 90b92283fa6..8e0a6217ec7 100644 --- a/dotcom-rendering/src/components/Subheading.tsx +++ b/dotcom-rendering/src/components/Subheading.tsx @@ -6,8 +6,8 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import type { FontWeight } from '@guardian/source-foundations'; -import { from, headline, space, textSans } from '@guardian/source-foundations'; +import type { FontWeight } from '@guardian/source/foundations'; +import { from, headline, space, textSans } from '@guardian/source/foundations'; import type { ReactNode } from 'react'; import { palette } from '../palette'; diff --git a/dotcom-rendering/src/components/SubheadingBlockComponent.amp.tsx b/dotcom-rendering/src/components/SubheadingBlockComponent.amp.tsx index e3828aaac97..a511cf19140 100644 --- a/dotcom-rendering/src/components/SubheadingBlockComponent.amp.tsx +++ b/dotcom-rendering/src/components/SubheadingBlockComponent.amp.tsx @@ -5,7 +5,7 @@ import { headlineMedium34, palette, textSans20, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; const style = (pillar: ArticleTheme) => css` diff --git a/dotcom-rendering/src/components/SupportTheG.importable.tsx b/dotcom-rendering/src/components/SupportTheG.importable.tsx index 5a0d61891d4..65dab83b04c 100644 --- a/dotcom-rendering/src/components/SupportTheG.importable.tsx +++ b/dotcom-rendering/src/components/SupportTheG.importable.tsx @@ -13,7 +13,7 @@ import { textSans15, textSans17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { getHeader } from '@guardian/support-dotcom-components'; import type { HeaderPayload, diff --git a/dotcom-rendering/src/components/SupportingContent.stories.tsx b/dotcom-rendering/src/components/SupportingContent.stories.tsx index a8bd31f0357..1de64b43d87 100644 --- a/dotcom-rendering/src/components/SupportingContent.stories.tsx +++ b/dotcom-rendering/src/components/SupportingContent.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { Props as CardProps } from './Card/Card'; import { Card } from './Card/Card'; import { SupportingContent } from './SupportingContent'; diff --git a/dotcom-rendering/src/components/SupportingContent.tsx b/dotcom-rendering/src/components/SupportingContent.tsx index 45e8cc0c872..17acbfc54c1 100644 --- a/dotcom-rendering/src/components/SupportingContent.tsx +++ b/dotcom-rendering/src/components/SupportingContent.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from, until } from '@guardian/source-foundations'; +import { from, until } from '@guardian/source/foundations'; import { decidePalette } from '../lib/decidePalette'; import { transparentColour } from '../lib/transparentColour'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/components/SvgGuardianAustraliaLogo.tsx b/dotcom-rendering/src/components/SvgGuardianAustraliaLogo.tsx index d8b1ff70992..fd2e562c07e 100644 --- a/dotcom-rendering/src/components/SvgGuardianAustraliaLogo.tsx +++ b/dotcom-rendering/src/components/SvgGuardianAustraliaLogo.tsx @@ -1,4 +1,4 @@ -import { palette as sourcePalette } from '@guardian/source-foundations'; +import { palette as sourcePalette } from '@guardian/source/foundations'; export const SvgGuardianAustraliaLogo = () => { const white = sourcePalette.neutral[100]; diff --git a/dotcom-rendering/src/components/SvgGuardianBestNewspaperLogo.tsx b/dotcom-rendering/src/components/SvgGuardianBestNewspaperLogo.tsx index d68beb48691..efacf0ad562 100644 --- a/dotcom-rendering/src/components/SvgGuardianBestNewspaperLogo.tsx +++ b/dotcom-rendering/src/components/SvgGuardianBestNewspaperLogo.tsx @@ -1,4 +1,4 @@ -import { palette as sourcePalette } from '@guardian/source-foundations'; +import { palette as sourcePalette } from '@guardian/source/foundations'; export const SvgGuardianBestNewspaperLogo = () => { const white = sourcePalette.neutral[100]; diff --git a/dotcom-rendering/src/components/SvgGuardianNewsProviderLogo.tsx b/dotcom-rendering/src/components/SvgGuardianNewsProviderLogo.tsx index a306f803451..431b6f09212 100644 --- a/dotcom-rendering/src/components/SvgGuardianNewsProviderLogo.tsx +++ b/dotcom-rendering/src/components/SvgGuardianNewsProviderLogo.tsx @@ -1,4 +1,4 @@ -import { palette as sourcePalette } from '@guardian/source-foundations'; +import { palette as sourcePalette } from '@guardian/source/foundations'; export const SvgGuardianNewsProviderLogo = () => { const white = sourcePalette.neutral[100]; diff --git a/dotcom-rendering/src/components/TableBlockComponent.tsx b/dotcom-rendering/src/components/TableBlockComponent.tsx index 965dfd98a92..e9cd9208b34 100644 --- a/dotcom-rendering/src/components/TableBlockComponent.tsx +++ b/dotcom-rendering/src/components/TableBlockComponent.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette, text, textSans12 } from '@guardian/source-foundations'; +import { palette, text, textSans12 } from '@guardian/source/foundations'; import { unescapeData } from '../lib/escapeData'; import type { TableBlockElement } from '../types/content'; diff --git a/dotcom-rendering/src/components/TableOfContents.importable.tsx b/dotcom-rendering/src/components/TableOfContents.importable.tsx index d11bd2d8d78..9cf189c514c 100644 --- a/dotcom-rendering/src/components/TableOfContents.importable.tsx +++ b/dotcom-rendering/src/components/TableOfContents.importable.tsx @@ -2,11 +2,11 @@ /* eslint-disable jsx-a11y/click-events-have-key-events -- TODO https://github.com/guardian/dotcom-rendering/issues/8161 */ import { css } from '@emotion/react'; import { ArticleDisplay } from '@guardian/libs'; -import { headline, space, textSans14 } from '@guardian/source-foundations'; +import { headline, space, textSans14 } from '@guardian/source/foundations'; import { SvgChevronDownSingle, SvgChevronUpSingle, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useState } from 'react'; import { palette } from '../palette'; import type { TableOfContentsItem } from '../types/frontend'; diff --git a/dotcom-rendering/src/components/TagPageHeader.tsx b/dotcom-rendering/src/components/TagPageHeader.tsx index 8d5c2d12bc3..7666c1f90f8 100644 --- a/dotcom-rendering/src/components/TagPageHeader.tsx +++ b/dotcom-rendering/src/components/TagPageHeader.tsx @@ -7,7 +7,7 @@ import { palette, space, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Fragment, type ReactNode } from 'react'; import { decideContainerOverrides } from '../lib/decideContainerOverrides'; import { isElement, parseHtml } from '../lib/domUtils'; diff --git a/dotcom-rendering/src/components/TextBlockComponent.amp.tsx b/dotcom-rendering/src/components/TextBlockComponent.amp.tsx index 67b1e5be2ec..e1fc107c478 100644 --- a/dotcom-rendering/src/components/TextBlockComponent.amp.tsx +++ b/dotcom-rendering/src/components/TextBlockComponent.amp.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleSpecial } from '@guardian/libs'; -import { article17, palette, textSans20 } from '@guardian/source-foundations'; +import { article17, palette, textSans20 } from '@guardian/source/foundations'; import sanitise from 'sanitize-html'; import { neutralBorder, pillarPalette_DO_NOT_USE } from '../lib/pillars'; diff --git a/dotcom-rendering/src/components/TextBlockComponent.tsx b/dotcom-rendering/src/components/TextBlockComponent.tsx index e6774c53d2f..50eda4232da 100644 --- a/dotcom-rendering/src/components/TextBlockComponent.tsx +++ b/dotcom-rendering/src/components/TextBlockComponent.tsx @@ -8,7 +8,7 @@ import { remSpace, textSans17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { ReactNode } from 'react'; import { Fragment } from 'react'; import type { IOptions } from 'sanitize-html'; diff --git a/dotcom-rendering/src/components/Timeline.tsx b/dotcom-rendering/src/components/Timeline.tsx index c5c83875dcb..1debe04fb1c 100644 --- a/dotcom-rendering/src/components/Timeline.tsx +++ b/dotcom-rendering/src/components/Timeline.tsx @@ -6,7 +6,7 @@ import { headline, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { NestedArticleElement } from '../lib/renderElement'; import { palette } from '../palette'; import type { diff --git a/dotcom-rendering/src/components/TimelineAtom.amp.tsx b/dotcom-rendering/src/components/TimelineAtom.amp.tsx index d8d59470f39..c60b5c4cdf9 100644 --- a/dotcom-rendering/src/components/TimelineAtom.amp.tsx +++ b/dotcom-rendering/src/components/TimelineAtom.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { TimelineAtomEvent } from '../types/content'; import { Expandable } from './Expandable.amp'; diff --git a/dotcom-rendering/src/components/TimelineAtom.importable.tsx b/dotcom-rendering/src/components/TimelineAtom.importable.tsx index 31091f9ed3f..933f5491c81 100644 --- a/dotcom-rendering/src/components/TimelineAtom.importable.tsx +++ b/dotcom-rendering/src/components/TimelineAtom.importable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { body, palette, remSpace, space } from '@guardian/source-foundations'; +import { body, palette, remSpace, space } from '@guardian/source/foundations'; import { submitComponentEvent } from '../client/ophan/ophan'; import { palette as schemedPalette } from '../palette'; import type { TimelineAtomEvent, TimelineAtomType } from '../types/content'; diff --git a/dotcom-rendering/src/components/Toast.stories.tsx b/dotcom-rendering/src/components/Toast.stories.tsx index eb93d0f2279..66c43493bc7 100644 --- a/dotcom-rendering/src/components/Toast.stories.tsx +++ b/dotcom-rendering/src/components/Toast.stories.tsx @@ -5,7 +5,7 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { Toast } from './Toast'; const Wrapper = ({ children }: { children: React.ReactNode }) => ( diff --git a/dotcom-rendering/src/components/Toast.tsx b/dotcom-rendering/src/components/Toast.tsx index 793ebbeca96..41172d17ac4 100644 --- a/dotcom-rendering/src/components/Toast.tsx +++ b/dotcom-rendering/src/components/Toast.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; -import { space } from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; -import { EditorialButton } from '@guardian/source-react-components-development-kitchen'; +import { space } from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; +import { EditorialButton } from '@guardian/source-development-kitchen/react-components'; type Props = { count: number; diff --git a/dotcom-rendering/src/components/TopBar.importable.tsx b/dotcom-rendering/src/components/TopBar.importable.tsx index 8b89532ed5f..05abcb01e92 100644 --- a/dotcom-rendering/src/components/TopBar.importable.tsx +++ b/dotcom-rendering/src/components/TopBar.importable.tsx @@ -5,8 +5,8 @@ * This is intended to replace the existing `HeaderTopBar` component after being AB tested. */ import { css } from '@emotion/react'; -import { from, space } from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; +import { from, space } from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import { pageSkinContainer } from '../layouts/lib/pageSkin'; import { addTrackingCodesToUrl } from '../lib/acquisitions'; diff --git a/dotcom-rendering/src/components/TopBarLink.tsx b/dotcom-rendering/src/components/TopBarLink.tsx index 35acc39f556..4651737d88f 100644 --- a/dotcom-rendering/src/components/TopBarLink.tsx +++ b/dotcom-rendering/src/components/TopBarLink.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { space, textSansBold17 } from '@guardian/source-foundations'; +import { space, textSansBold17 } from '@guardian/source/foundations'; import { palette as themePalette } from '../palette'; type Props = { diff --git a/dotcom-rendering/src/components/TopBarMyAccount.tsx b/dotcom-rendering/src/components/TopBarMyAccount.tsx index 17ac09d02fb..79db5e1407f 100644 --- a/dotcom-rendering/src/components/TopBarMyAccount.tsx +++ b/dotcom-rendering/src/components/TopBarMyAccount.tsx @@ -10,7 +10,7 @@ import { space, textSansBold17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import type { UserProfile } from '../lib/discussion'; import { getZIndex } from '../lib/getZIndex'; diff --git a/dotcom-rendering/src/components/TopMetaAnalysis.amp.tsx b/dotcom-rendering/src/components/TopMetaAnalysis.amp.tsx index 6937b3b086b..07dd29db2a0 100644 --- a/dotcom-rendering/src/components/TopMetaAnalysis.amp.tsx +++ b/dotcom-rendering/src/components/TopMetaAnalysis.amp.tsx @@ -4,7 +4,7 @@ import { headlineMedium28, palette, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { string as curly } from 'curlyquotes'; import { getAgeWarning } from '../lib/age-warning'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; diff --git a/dotcom-rendering/src/components/TopMetaExtras.amp.tsx b/dotcom-rendering/src/components/TopMetaExtras.amp.tsx index 906ee6af1de..08dffd5a7d1 100644 --- a/dotcom-rendering/src/components/TopMetaExtras.amp.tsx +++ b/dotcom-rendering/src/components/TopMetaExtras.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { text, textSans12 } from '@guardian/source-foundations'; +import { text, textSans12 } from '@guardian/source/foundations'; import { neutralBorder, pillarMap, diff --git a/dotcom-rendering/src/components/TopMetaLiveblog.amp.tsx b/dotcom-rendering/src/components/TopMetaLiveblog.amp.tsx index 9b2d87bfbd4..c3beadeb3e2 100644 --- a/dotcom-rendering/src/components/TopMetaLiveblog.amp.tsx +++ b/dotcom-rendering/src/components/TopMetaLiveblog.amp.tsx @@ -3,7 +3,7 @@ import { headlineMedium17, headlineMedium28, palette, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { string as curly } from 'curlyquotes'; import { getAgeWarning } from '../lib/age-warning'; import { neutralBorder, pillarPalette_DO_NOT_USE } from '../lib/pillars'; diff --git a/dotcom-rendering/src/components/TopMetaNews.amp.tsx b/dotcom-rendering/src/components/TopMetaNews.amp.tsx index a3b6d85c5ac..a63d78d51e6 100644 --- a/dotcom-rendering/src/components/TopMetaNews.amp.tsx +++ b/dotcom-rendering/src/components/TopMetaNews.amp.tsx @@ -3,7 +3,7 @@ import { headlineMedium17, headlineMedium28, palette, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { string as curly } from 'curlyquotes'; import { getAgeWarning } from '../lib/age-warning'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; diff --git a/dotcom-rendering/src/components/TopMetaOpinion.amp.tsx b/dotcom-rendering/src/components/TopMetaOpinion.amp.tsx index 9215fdae760..0d5c0c82e2d 100644 --- a/dotcom-rendering/src/components/TopMetaOpinion.amp.tsx +++ b/dotcom-rendering/src/components/TopMetaOpinion.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { headlineMedium28, palette } from '@guardian/source-foundations'; +import { headlineMedium28, palette } from '@guardian/source/foundations'; import { getAgeWarning } from '../lib/age-warning'; import { pillarPalette_DO_NOT_USE } from '../lib/pillars'; import { getSharingUrls } from '../lib/sharing-urls'; diff --git a/dotcom-rendering/src/components/TopMetaPaidContent.amp.tsx b/dotcom-rendering/src/components/TopMetaPaidContent.amp.tsx index 0896918bfca..ef9155d1225 100644 --- a/dotcom-rendering/src/components/TopMetaPaidContent.amp.tsx +++ b/dotcom-rendering/src/components/TopMetaPaidContent.amp.tsx @@ -5,7 +5,7 @@ import { text, textSans15, textSans24, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { getAgeWarning } from '../lib/age-warning'; import { getSharingUrls } from '../lib/sharing-urls'; import type { AMPArticleModel } from '../types/article.amp'; diff --git a/dotcom-rendering/src/components/TopicFilterBank.tsx b/dotcom-rendering/src/components/TopicFilterBank.tsx index 3022f86a398..a0a2e8237c6 100644 --- a/dotcom-rendering/src/components/TopicFilterBank.tsx +++ b/dotcom-rendering/src/components/TopicFilterBank.tsx @@ -4,7 +4,7 @@ import { headlineBold17, space, textSans, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decidePalette } from '../lib/decidePalette'; import type { Palette } from '../types/palette'; import { FilterLink } from './FilterLink'; diff --git a/dotcom-rendering/src/components/Treats.tsx b/dotcom-rendering/src/components/Treats.tsx index 1aa5dc5ba45..fbba68769a0 100644 --- a/dotcom-rendering/src/components/Treats.tsx +++ b/dotcom-rendering/src/components/Treats.tsx @@ -6,8 +6,8 @@ import { palette as sourcePalette, space, textSans12, -} from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import { Fragment } from 'react'; import { decidePalette } from '../lib/decidePalette'; import type { TreatType } from '../types/front'; diff --git a/dotcom-rendering/src/components/TrendingTopics.tsx b/dotcom-rendering/src/components/TrendingTopics.tsx index 1d6c61c992a..f311fbb1583 100644 --- a/dotcom-rendering/src/components/TrendingTopics.tsx +++ b/dotcom-rendering/src/components/TrendingTopics.tsx @@ -4,8 +4,8 @@ import { textSans, textSans12, textSans14, -} from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import type { FETagType } from '../types/tag'; type Props = { diff --git a/dotcom-rendering/src/components/TweetBlockComponent.importable.tsx b/dotcom-rendering/src/components/TweetBlockComponent.importable.tsx index 6f79aff7dba..b6290dcd8bd 100644 --- a/dotcom-rendering/src/components/TweetBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/TweetBlockComponent.importable.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import { article15, palette as sourcePalette, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { useEffect } from 'react'; import { unescapeData } from '../lib/escapeData'; import type { TweetBlockElement } from '../types/content'; diff --git a/dotcom-rendering/src/components/TwitterBlockComponent.amp.tsx b/dotcom-rendering/src/components/TwitterBlockComponent.amp.tsx index 6c511825a03..e8409ebe8b7 100644 --- a/dotcom-rendering/src/components/TwitterBlockComponent.amp.tsx +++ b/dotcom-rendering/src/components/TwitterBlockComponent.amp.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { article17, palette } from '@guardian/source-foundations'; +import { article17, palette } from '@guardian/source/foundations'; import { JSDOM } from 'jsdom'; import { neutralBorder, pillarPalette_DO_NOT_USE } from '../lib/pillars'; import type { TweetBlockElement } from '../types/content'; diff --git a/dotcom-rendering/src/components/VineBlockComponent.importable.tsx b/dotcom-rendering/src/components/VineBlockComponent.importable.tsx index 47522a74109..7b6d7c583ff 100644 --- a/dotcom-rendering/src/components/VineBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/VineBlockComponent.importable.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { textSans20 } from '@guardian/source-foundations'; +import { textSans20 } from '@guardian/source/foundations'; import type { RoleType, VineBlockElement } from '../types/content'; import { ClickToView } from './ClickToView'; import { MaintainAspectRatio } from './MaintainAspectRatio'; diff --git a/dotcom-rendering/src/components/Weather.tsx b/dotcom-rendering/src/components/Weather.tsx index af0be3faef0..331b3cf448b 100644 --- a/dotcom-rendering/src/components/Weather.tsx +++ b/dotcom-rendering/src/components/Weather.tsx @@ -22,12 +22,12 @@ import { textSans17, until, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { SvgChevronDownSingle, SvgChevronUpSingle, SvgExternal, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useId } from 'react'; import type { EditionId } from '../lib/edition'; import { WeatherSlot } from './WeatherSlot'; diff --git a/dotcom-rendering/src/components/WeatherSlot.tsx b/dotcom-rendering/src/components/WeatherSlot.tsx index cfbea0841f7..4c0ad780e63 100644 --- a/dotcom-rendering/src/components/WeatherSlot.tsx +++ b/dotcom-rendering/src/components/WeatherSlot.tsx @@ -9,7 +9,7 @@ import { textSans24, until, visuallyHidden, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { lazy, Suspense } from 'react'; import { type EditionId, getEditionFromId } from '../lib/edition'; import type { WeatherData } from './WeatherWrapper.importable'; diff --git a/dotcom-rendering/src/components/WitnessBlockComponent.tsx b/dotcom-rendering/src/components/WitnessBlockComponent.tsx index b5388015d53..a5b75be20b2 100644 --- a/dotcom-rendering/src/components/WitnessBlockComponent.tsx +++ b/dotcom-rendering/src/components/WitnessBlockComponent.tsx @@ -6,7 +6,7 @@ import { headlineMedium17, palette, space, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { EditionId } from '../lib/edition'; import { palette as themePalette } from '../palette'; import type { WitnessAssetType } from '../types/content'; diff --git a/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomOverlay.tsx b/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomOverlay.tsx index ab93e7e04bf..9bd5d524267 100644 --- a/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomOverlay.tsx +++ b/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomOverlay.tsx @@ -8,7 +8,7 @@ import { palette as sourcePalette, space, textSansBold12, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { decidePalette } from '../../lib/decidePalette'; import type { Palette } from '../../types/palette'; import type { diff --git a/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomPicture.tsx b/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomPicture.tsx index 33a16f4a1d1..b98da2d22d5 100644 --- a/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomPicture.tsx +++ b/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomPicture.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import { getSourceImageUrl } from '../../lib/getSourceImageUrl_temp_fix'; import { generateSources, getFallbackSource, Sources } from '../Picture'; diff --git a/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomSticky.tsx b/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomSticky.tsx index 8aed994b49e..e88dd4cff31 100644 --- a/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomSticky.tsx +++ b/dotcom-rendering/src/components/YoutubeAtom/YoutubeAtomSticky.tsx @@ -4,8 +4,8 @@ import { from, palette as sourcePalette, space, -} from '@guardian/source-foundations'; -import { SvgCross } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { SvgCross } from '@guardian/source/react-components'; import detectMobile from 'is-mobile'; import { useEffect, useState } from 'react'; import { submitComponentEvent } from '../../client/ophan/ophan'; diff --git a/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx b/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx index dde42d2c100..70dbfc0d49d 100644 --- a/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx +++ b/dotcom-rendering/src/components/YoutubeBlockComponent.importable.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import type { ConsentState } from '@guardian/libs'; -import { body, palette, space } from '@guardian/source-foundations'; -import { SvgAlertRound } from '@guardian/source-react-components'; +import { body, palette, space } from '@guardian/source/foundations'; +import { SvgAlertRound } from '@guardian/source/react-components'; import { useEffect, useState } from 'react'; import type { Switches } from '../../src/types/config'; import { trackVideoInteraction } from '../client/ga/ga'; diff --git a/dotcom-rendering/src/components/marketing/epics/BylineWithHeadshot.tsx b/dotcom-rendering/src/components/marketing/epics/BylineWithHeadshot.tsx index 1d398d2a2a0..5ac05579b11 100644 --- a/dotcom-rendering/src/components/marketing/epics/BylineWithHeadshot.tsx +++ b/dotcom-rendering/src/components/marketing/epics/BylineWithHeadshot.tsx @@ -8,7 +8,7 @@ import { articleBold17, articleItalic17, palette, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { BylineWithImage } from '@guardian/support-dotcom-components/dist/shared/src/types'; import type { ReactComponent } from '../lib/ReactComponent'; diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpic.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpic.tsx index f0bbdd9d204..5c1a55379e9 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpic.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpic.tsx @@ -8,9 +8,9 @@ import { article17, articleBold17, headlineBold20, -} from '@guardian/source-foundations'; -import { palette, space } from '@guardian/source-foundations'; -import { from } from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; +import { palette, space } from '@guardian/source/foundations'; +import { from } from '@guardian/source/foundations'; import { containsNonArticleCountPlaceholder, getLocalCurrencySymbol, diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicArticleCountAboveWithOptOut.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicArticleCountAboveWithOptOut.tsx index 49a8ac284fe..a22b4bfe69e 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicArticleCountAboveWithOptOut.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicArticleCountAboveWithOptOut.tsx @@ -16,9 +16,9 @@ import { textSansBold14, textSansBold15, until, -} from '@guardian/source-foundations'; -import { palette, space } from '@guardian/source-foundations'; -import { Button, ButtonLink } from '@guardian/source-react-components'; +} from '@guardian/source/foundations'; +import { palette, space } from '@guardian/source/foundations'; +import { Button, ButtonLink } from '@guardian/source/react-components'; import type { ArticleCounts, ArticleCountType, diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicButtons.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicButtons.tsx index 5360d250e9c..d4563ee611f 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicButtons.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicButtons.tsx @@ -6,7 +6,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { OphanComponentEvent } from '@guardian/libs'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { SecondaryCtaType } from '@guardian/support-dotcom-components'; import type { EpicVariant } from '@guardian/support-dotcom-components/dist/shared/src/types/abTests/epic'; import type { diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicChoiceCards.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicChoiceCards.tsx index 7659f3c1013..e00b028a47e 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicChoiceCards.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicChoiceCards.tsx @@ -5,8 +5,8 @@ */ import { css } from '@emotion/react'; import type { OphanComponentEvent } from '@guardian/libs'; -import { until, visuallyHidden } from '@guardian/source-foundations'; -import { ChoiceCard, ChoiceCardGroup } from '@guardian/source-react-components'; +import { until, visuallyHidden } from '@guardian/source/foundations'; +import { ChoiceCard, ChoiceCardGroup } from '@guardian/source/react-components'; import { contributionTabFrequencies } from '@guardian/support-dotcom-components'; import type { ContributionFrequency, diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicNewsletterSignup.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicNewsletterSignup.tsx index 4ce608d5fc2..ba08af2177a 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicNewsletterSignup.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicNewsletterSignup.tsx @@ -5,7 +5,7 @@ */ import { css } from '@emotion/react'; import { isObject, log } from '@guardian/libs'; -import { space } from '@guardian/source-foundations'; +import { space } from '@guardian/source/foundations'; import { useEffect, useRef, useState } from 'react'; const containerStyles = css` diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedIn.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedIn.tsx index ef984ef41ac..927e6897d30 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedIn.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedIn.tsx @@ -12,13 +12,13 @@ import { space, textSans15, textSansBold15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, SvgCheckmark, SvgCross, -} from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { Hide } from '../../Hide'; import type { ReactComponent } from '../lib/ReactComponent'; import { ensureHasPreposition, ReminderStatus } from '../lib/reminders'; diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedOut.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedOut.tsx index f0797d63455..65ee5ddbc3b 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedOut.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicReminderSignedOut.tsx @@ -13,14 +13,14 @@ import { space, textSans15, textSansBold15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, SvgArrowRightStraight, SvgCross, TextInput, -} from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { useContributionsReminderEmailForm } from '../hooks/useContributionsReminderEmailForm'; import type { ReactComponent } from '../lib/ReactComponent'; import { ensureHasPreposition, ReminderStatus } from '../lib/reminders'; diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicSignInCta.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicSignInCta.tsx index 1b7bbdea3c9..a0290793bb2 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicSignInCta.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicSignInCta.tsx @@ -5,8 +5,8 @@ */ import { css } from '@emotion/react'; import type { OphanComponentEvent } from '@guardian/libs'; -import { articleBold17, neutral } from '@guardian/source-foundations'; -import { Link } from '@guardian/source-react-components'; +import { articleBold17, neutral } from '@guardian/source/foundations'; +import { Link } from '@guardian/source/react-components'; import type { ReactComponent } from '../lib/ReactComponent'; import { OPHAN_COMPONENT_SIGN_IN } from './utils/ophan'; diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicTicker.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicTicker.tsx index a9f641e0b9c..a6f55ca6a06 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsEpicTicker.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsEpicTicker.tsx @@ -9,7 +9,7 @@ import { palette, textSans17, textSansBold17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import type { TickerSettings } from '@guardian/support-dotcom-components/dist/shared/src/types'; import { useEffect, useState } from 'react'; import { useIsInView } from '../../../lib/useIsInView'; diff --git a/dotcom-rendering/src/components/marketing/epics/ContributionsLiveblogEpic.tsx b/dotcom-rendering/src/components/marketing/epics/ContributionsLiveblogEpic.tsx index 59768fad893..29c1fc258f4 100644 --- a/dotcom-rendering/src/components/marketing/epics/ContributionsLiveblogEpic.tsx +++ b/dotcom-rendering/src/components/marketing/epics/ContributionsLiveblogEpic.tsx @@ -4,10 +4,10 @@ * https://github.com/guardian/support-dotcom-components/blob/9c3eae7cb0b159db4a1c40679d6b37710b0bb937/packages/modules/src/modules/epics/ContributionsLiveblogEpic.tsx */ import { css } from '@emotion/react'; -import { article17, headlineBold34 } from '@guardian/source-foundations'; -import { from } from '@guardian/source-foundations'; -import { palette } from '@guardian/source-foundations'; -import { space } from '@guardian/source-foundations'; +import { article17, headlineBold34 } from '@guardian/source/foundations'; +import { from } from '@guardian/source/foundations'; +import { palette } from '@guardian/source/foundations'; +import { space } from '@guardian/source/foundations'; import { containsNonArticleCountPlaceholder, replaceNonArticleCountPlaceholders, diff --git a/dotcom-rendering/src/components/marketing/epics/EpicButton.tsx b/dotcom-rendering/src/components/marketing/epics/EpicButton.tsx index 12550aa3423..8db2b1eb868 100644 --- a/dotcom-rendering/src/components/marketing/epics/EpicButton.tsx +++ b/dotcom-rendering/src/components/marketing/epics/EpicButton.tsx @@ -7,12 +7,12 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import { ThemeProvider } from '@emotion/react'; import type { OphanComponentEvent } from '@guardian/libs'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import { Button as DSButton, LinkButton, SvgArrowRightStraight, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import React from 'react'; import type { ReactComponent } from '../lib/ReactComponent'; import { diff --git a/dotcom-rendering/src/components/marketing/header/Header.tsx b/dotcom-rendering/src/components/marketing/header/Header.tsx index 05f76bb4d9d..62446e5d208 100644 --- a/dotcom-rendering/src/components/marketing/header/Header.tsx +++ b/dotcom-rendering/src/components/marketing/header/Header.tsx @@ -13,13 +13,13 @@ import { palette as sourcePalette, textSans17, textSansBold15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Hide, LinkButton, SvgArrowRightStraight, themeButtonReaderRevenueBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { ReactComponent } from '../lib/ReactComponent'; import type { HeaderRenderProps } from './HeaderWrapper'; import { headerWrapper, validatedHeaderWrapper } from './HeaderWrapper'; diff --git a/dotcom-rendering/src/components/marketing/header/SignInPromptHeader.tsx b/dotcom-rendering/src/components/marketing/header/SignInPromptHeader.tsx index 496054333d5..389c06f6997 100644 --- a/dotcom-rendering/src/components/marketing/header/SignInPromptHeader.tsx +++ b/dotcom-rendering/src/components/marketing/header/SignInPromptHeader.tsx @@ -12,12 +12,12 @@ import { space, textSans12, textSans15, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Hide, LinkButton, themeButtonBrand, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { useEffect, useMemo, useState } from 'react'; import type { ReactComponent } from '../lib/ReactComponent'; import type { HeaderRenderProps } from './HeaderWrapper'; diff --git a/dotcom-rendering/src/components/marketing/header/common/HeaderDecorator.tsx b/dotcom-rendering/src/components/marketing/header/common/HeaderDecorator.tsx index ed97bdf87ca..f15ba0812ae 100644 --- a/dotcom-rendering/src/components/marketing/header/common/HeaderDecorator.tsx +++ b/dotcom-rendering/src/components/marketing/header/common/HeaderDecorator.tsx @@ -4,7 +4,7 @@ * https://github.com/guardian/support-dotcom-components/blob/4925ef1e0ced5d221f1122afe79f93bd7448e0e5/packages/modules/src/modules/headers/common/HeaderDecorator.tsx */ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { Decorator } from '@storybook/react'; const background = css` diff --git a/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutOverlay.tsx b/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutOverlay.tsx index 54a4d1ec963..5dd9ed64ec0 100644 --- a/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutOverlay.tsx +++ b/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutOverlay.tsx @@ -15,14 +15,14 @@ import { space, textSans14, textSans17, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Button, buttonThemeBrand, buttonThemeBrandAlt, buttonThemeDefault, SvgCross, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import type { ReactComponent } from '../lib/ReactComponent'; import type { ArticleCountOptOutType } from './ArticleCountOptOutPopup'; diff --git a/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutPopup.tsx b/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutPopup.tsx index 25a9bb5dbb8..9243bb76df5 100644 --- a/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutPopup.tsx +++ b/dotcom-rendering/src/components/marketing/shared/ArticleCountOptOutPopup.tsx @@ -6,7 +6,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { OphanComponentEvent, OphanComponentType } from '@guardian/libs'; -import { from, space } from '@guardian/source-foundations'; +import { from, space } from '@guardian/source/foundations'; import { useEffect, useState } from 'react'; import { useIsInView } from '../../../lib/useIsInView'; import { diff --git a/dotcom-rendering/src/layouts/AllEditorialNewslettersPageLayout.tsx b/dotcom-rendering/src/layouts/AllEditorialNewslettersPageLayout.tsx index cf9c5707bf4..05932deb56c 100644 --- a/dotcom-rendering/src/layouts/AllEditorialNewslettersPageLayout.tsx +++ b/dotcom-rendering/src/layouts/AllEditorialNewslettersPageLayout.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { palette as sourcePalette } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { palette as sourcePalette } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { Footer } from '../components/Footer'; import { GroupedNewslettersList } from '../components/GroupedNewsletterList'; import { Header } from '../components/Header'; diff --git a/dotcom-rendering/src/layouts/CommentLayout.tsx b/dotcom-rendering/src/layouts/CommentLayout.tsx index 4672f2716f9..d194dfcc1ad 100644 --- a/dotcom-rendering/src/layouts/CommentLayout.tsx +++ b/dotcom-rendering/src/layouts/CommentLayout.tsx @@ -5,8 +5,8 @@ import { from, palette as sourcePalette, until, -} from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { AdPortals } from '../components/AdPortals.importable'; import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; import { AppsFooter } from '../components/AppsFooter.importable'; diff --git a/dotcom-rendering/src/layouts/DecideLayout.stories.tsx b/dotcom-rendering/src/layouts/DecideLayout.stories.tsx index 715dbb8a539..de1c5424d09 100644 --- a/dotcom-rendering/src/layouts/DecideLayout.stories.tsx +++ b/dotcom-rendering/src/layouts/DecideLayout.stories.tsx @@ -1,5 +1,5 @@ import { isObject } from '@guardian/libs'; -import { breakpoints } from '@guardian/source-foundations'; +import { breakpoints } from '@guardian/source/foundations'; import type { Decorator, StoryObj } from '@storybook/react'; import { useEffect } from 'react'; import { colourSchemeDecorator } from '../../.storybook/decorators/themeDecorator'; diff --git a/dotcom-rendering/src/layouts/FrontLayout.tsx b/dotcom-rendering/src/layouts/FrontLayout.tsx index df63060ee39..ba65496efa5 100644 --- a/dotcom-rendering/src/layouts/FrontLayout.tsx +++ b/dotcom-rendering/src/layouts/FrontLayout.tsx @@ -6,8 +6,8 @@ import { brandBorder, brandLine, palette as sourcePalette, -} from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { Fragment } from 'react'; import { AdSlot } from '../components/AdSlot.web'; import { Carousel } from '../components/Carousel.importable'; diff --git a/dotcom-rendering/src/layouts/FullPageInteractiveLayout.tsx b/dotcom-rendering/src/layouts/FullPageInteractiveLayout.tsx index 0d95df1d162..395060353fa 100644 --- a/dotcom-rendering/src/layouts/FullPageInteractiveLayout.tsx +++ b/dotcom-rendering/src/layouts/FullPageInteractiveLayout.tsx @@ -5,7 +5,7 @@ import { from, palette as sourcePalette, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { adContainerStyles, MobileStickyContainer, diff --git a/dotcom-rendering/src/layouts/ImmersiveLayout.tsx b/dotcom-rendering/src/layouts/ImmersiveLayout.tsx index 2ff880448f9..7d453101301 100644 --- a/dotcom-rendering/src/layouts/ImmersiveLayout.tsx +++ b/dotcom-rendering/src/layouts/ImmersiveLayout.tsx @@ -6,8 +6,8 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { AdPortals } from '../components/AdPortals.importable'; import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer'; diff --git a/dotcom-rendering/src/layouts/InteractiveLayout.tsx b/dotcom-rendering/src/layouts/InteractiveLayout.tsx index 62e6698e0f4..11f5a45d51e 100644 --- a/dotcom-rendering/src/layouts/InteractiveLayout.tsx +++ b/dotcom-rendering/src/layouts/InteractiveLayout.tsx @@ -5,9 +5,9 @@ import { from, palette as sourcePalette, until, -} from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import React from 'react'; import { AdPortals } from '../components/AdPortals.importable'; import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; diff --git a/dotcom-rendering/src/layouts/LiveLayout.tsx b/dotcom-rendering/src/layouts/LiveLayout.tsx index dbdfd655354..92856acbcfa 100644 --- a/dotcom-rendering/src/layouts/LiveLayout.tsx +++ b/dotcom-rendering/src/layouts/LiveLayout.tsx @@ -6,9 +6,9 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { Accordion } from '../components/Accordion'; import { RightAdsPlaceholder } from '../components/AdPlaceholder.apps'; import { AdPortals } from '../components/AdPortals.importable'; diff --git a/dotcom-rendering/src/layouts/NewsletterSignupLayout.tsx b/dotcom-rendering/src/layouts/NewsletterSignupLayout.tsx index f7411a4eba8..fa0625cc775 100644 --- a/dotcom-rendering/src/layouts/NewsletterSignupLayout.tsx +++ b/dotcom-rendering/src/layouts/NewsletterSignupLayout.tsx @@ -8,7 +8,7 @@ import { space, textSansBold17, until, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { Column, Columns, @@ -17,8 +17,8 @@ import { LinkButton, SvgEye, SvgGuardianLogo, -} from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; import { ArticleHeadline } from '../components/ArticleHeadline'; import { Carousel } from '../components/Carousel.importable'; diff --git a/dotcom-rendering/src/layouts/PictureLayout.tsx b/dotcom-rendering/src/layouts/PictureLayout.tsx index 584e1ede8f1..3af808cd7f0 100644 --- a/dotcom-rendering/src/layouts/PictureLayout.tsx +++ b/dotcom-rendering/src/layouts/PictureLayout.tsx @@ -5,9 +5,9 @@ import { from, palette as sourcePalette, until, -} from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { AdPortals } from '../components/AdPortals.importable'; import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; import { AppsFooter } from '../components/AppsFooter.importable'; diff --git a/dotcom-rendering/src/layouts/ShowcaseLayout.tsx b/dotcom-rendering/src/layouts/ShowcaseLayout.tsx index c92c24cde70..4769b005e06 100644 --- a/dotcom-rendering/src/layouts/ShowcaseLayout.tsx +++ b/dotcom-rendering/src/layouts/ShowcaseLayout.tsx @@ -5,9 +5,9 @@ import { from, palette as sourcePalette, until, -} from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { AdPortals } from '../components/AdPortals.importable'; import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer'; diff --git a/dotcom-rendering/src/layouts/StandardLayout.tsx b/dotcom-rendering/src/layouts/StandardLayout.tsx index 5449aac91b0..f9592d63099 100644 --- a/dotcom-rendering/src/layouts/StandardLayout.tsx +++ b/dotcom-rendering/src/layouts/StandardLayout.tsx @@ -6,9 +6,9 @@ import { palette as sourcePalette, space, until, -} from '@guardian/source-foundations'; -import { Hide } from '@guardian/source-react-components'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source/foundations'; +import { Hide } from '@guardian/source/react-components'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { AdPortals } from '../components/AdPortals.importable'; import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer'; diff --git a/dotcom-rendering/src/layouts/TagPageLayout.tsx b/dotcom-rendering/src/layouts/TagPageLayout.tsx index 1f6819c7ebf..81ea603b523 100644 --- a/dotcom-rendering/src/layouts/TagPageLayout.tsx +++ b/dotcom-rendering/src/layouts/TagPageLayout.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; -import { palette } from '@guardian/source-foundations'; -import { StraightLines } from '@guardian/source-react-components-development-kitchen'; +import { palette } from '@guardian/source/foundations'; +import { StraightLines } from '@guardian/source-development-kitchen/react-components'; import { Fragment } from 'react'; import { DecideContainerByTrails } from '../components/DecideContainerByTrails'; import { diff --git a/dotcom-rendering/src/layouts/lib/interactiveLegacyStyling.ts b/dotcom-rendering/src/layouts/lib/interactiveLegacyStyling.ts index 4c95bb02c4b..33dd2434d34 100644 --- a/dotcom-rendering/src/layouts/lib/interactiveLegacyStyling.ts +++ b/dotcom-rendering/src/layouts/lib/interactiveLegacyStyling.ts @@ -1,6 +1,6 @@ import { css } from '@emotion/react'; import { ArticleDesign } from '@guardian/libs'; -import { from, until } from '@guardian/source-foundations'; +import { from, until } from '@guardian/source/foundations'; import { center } from '../../lib/center'; import type { RoleType } from '../../types/content'; diff --git a/dotcom-rendering/src/layouts/lib/pageSkin.ts b/dotcom-rendering/src/layouts/lib/pageSkin.ts index cf188a06ea8..0970e5e6d46 100644 --- a/dotcom-rendering/src/layouts/lib/pageSkin.ts +++ b/dotcom-rendering/src/layouts/lib/pageSkin.ts @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { breakpoints, from } from '@guardian/source-foundations'; +import { breakpoints, from } from '@guardian/source/foundations'; const pageSkinContainer = css` ${from.desktop} { diff --git a/dotcom-rendering/src/lib/center.ts b/dotcom-rendering/src/lib/center.ts index 15375024948..5b9e48d25a7 100644 --- a/dotcom-rendering/src/lib/center.ts +++ b/dotcom-rendering/src/lib/center.ts @@ -1,5 +1,5 @@ import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; export const center = css` position: relative; diff --git a/dotcom-rendering/src/lib/decideContainerOverrides.ts b/dotcom-rendering/src/lib/decideContainerOverrides.ts index 3270736f62e..1885f63c31f 100644 --- a/dotcom-rendering/src/lib/decideContainerOverrides.ts +++ b/dotcom-rendering/src/lib/decideContainerOverrides.ts @@ -1,4 +1,4 @@ -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; import type { DCRContainerPalette } from '../types/front'; import type { ContainerOverrides } from '../types/palette'; import { transparentColour } from './transparentColour'; diff --git a/dotcom-rendering/src/lib/decidePalette.ts b/dotcom-rendering/src/lib/decidePalette.ts index 98382a75fb1..700d9aea633 100644 --- a/dotcom-rendering/src/lib/decidePalette.ts +++ b/dotcom-rendering/src/lib/decidePalette.ts @@ -1,6 +1,6 @@ import type { ArticleFormat } from '@guardian/libs'; import { ArticleDesign, ArticleSpecial, Pillar } from '@guardian/libs'; -import { brandAltBackground, palette } from '@guardian/source-foundations'; +import { brandAltBackground, palette } from '@guardian/source/foundations'; // Here is the one place where we use `pillarPalette` import { pillarPalette_DO_NOT_USE as pillarPalette } from '../lib/pillars'; import { palette as themePalette } from '../palette'; diff --git a/dotcom-rendering/src/lib/pillars.ts b/dotcom-rendering/src/lib/pillars.ts index 329f3bd1ef3..234f86826ce 100644 --- a/dotcom-rendering/src/lib/pillars.ts +++ b/dotcom-rendering/src/lib/pillars.ts @@ -1,6 +1,6 @@ import type { ArticleTheme } from '@guardian/libs'; import { ArticleSpecial, Pillar } from '@guardian/libs'; -import { palette } from '@guardian/source-foundations'; +import { palette } from '@guardian/source/foundations'; const { culture, diff --git a/dotcom-rendering/src/lib/rootStyles.ts b/dotcom-rendering/src/lib/rootStyles.ts index b0c94442270..b14949fecfe 100644 --- a/dotcom-rendering/src/lib/rootStyles.ts +++ b/dotcom-rendering/src/lib/rootStyles.ts @@ -2,7 +2,7 @@ import { css, type SerializedStyles } from '@emotion/react'; import { focusHalo, palette as sourcePalette, -} from '@guardian/source-foundations'; +} from '@guardian/source/foundations'; import { paletteDeclarations } from '../palette'; /** diff --git a/dotcom-rendering/src/lib/verticalDivider.ts b/dotcom-rendering/src/lib/verticalDivider.ts index 722b0d1ba84..6ed92e87b95 100644 --- a/dotcom-rendering/src/lib/verticalDivider.ts +++ b/dotcom-rendering/src/lib/verticalDivider.ts @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; export const verticalDivider = ( verticalDividerColour: string, diff --git a/dotcom-rendering/src/lib/verticalDividerWithBottomOffset.ts b/dotcom-rendering/src/lib/verticalDividerWithBottomOffset.ts index a4a92e8f3f2..70a09ccfc00 100644 --- a/dotcom-rendering/src/lib/verticalDividerWithBottomOffset.ts +++ b/dotcom-rendering/src/lib/verticalDividerWithBottomOffset.ts @@ -1,6 +1,6 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; -import { from } from '@guardian/source-foundations'; +import { from } from '@guardian/source/foundations'; export function verticalDividerWithBottomOffset( bottomPaddingSize: string, diff --git a/dotcom-rendering/src/palette.ts b/dotcom-rendering/src/palette.ts index 2207c909a55..9684f4f9982 100644 --- a/dotcom-rendering/src/palette.ts +++ b/dotcom-rendering/src/palette.ts @@ -10,17 +10,17 @@ import { ArticleSpecial, Pillar, } from '@guardian/libs'; -import { palette as sourcePalette } from '@guardian/source-foundations'; +import { palette as sourcePalette } from '@guardian/source/foundations'; import { buttonThemeBrand, buttonThemeDefault, -} from '@guardian/source-react-components'; +} from '@guardian/source/react-components'; import { expandingWrapperDarkTheme, expandingWrapperThemeDefault, tabsDarkTheme, tabsThemeDefault, -} from '@guardian/source-react-components-development-kitchen'; +} from '@guardian/source-development-kitchen/react-components'; import { transparentColour } from './lib/transparentColour'; // ----- Palette Functions ----- // diff --git a/dotcom-rendering/src/server/htmlPageTemplate.ts b/dotcom-rendering/src/server/htmlPageTemplate.ts index 9c075687136..5e021a0d3d3 100644 --- a/dotcom-rendering/src/server/htmlPageTemplate.ts +++ b/dotcom-rendering/src/server/htmlPageTemplate.ts @@ -1,4 +1,4 @@ -import { resets, palette as sourcePalette } from '@guardian/source-foundations'; +import { resets, palette as sourcePalette } from '@guardian/source/foundations'; import he from 'he'; import { ASSET_ORIGIN } from '../lib/assets'; import { escapeData } from '../lib/escapeData'; diff --git a/dotcom-rendering/src/server/render.article.amp.tsx b/dotcom-rendering/src/server/render.article.amp.tsx index eedd66bcb7c..05212dae413 100644 --- a/dotcom-rendering/src/server/render.article.amp.tsx +++ b/dotcom-rendering/src/server/render.article.amp.tsx @@ -1,7 +1,7 @@ import createCache from '@emotion/cache'; import { CacheProvider } from '@emotion/react'; import createEmotionServer from '@emotion/server/create-instance'; -import { resets } from '@guardian/source-foundations'; +import { resets } from '@guardian/source/foundations'; import he from 'he'; import React from 'react'; import { renderToStaticMarkup } from 'react-dom/server'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 968cf440e00..cb5a663ff55 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,28 +73,22 @@ importers: version: 4.0.1 '@guardian/eslint-config': specifier: 7.0.1 - version: 7.0.1(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(tslib@2.6.2) + version: 7.0.1(@typescript-eslint/parser@6.18.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0)(tslib@2.6.2) '@guardian/eslint-config-typescript': specifier: 9.0.1 version: 9.0.1(eslint@8.56.0)(tslib@2.6.2)(typescript@5.3.3) - '@guardian/eslint-plugin-source-react-components': - specifier: 24.0.0 - version: 24.0.0(@guardian/libs@16.1.0)(@guardian/source-react-components@22.1.0)(eslint@8.56.0)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) '@guardian/libs': specifier: 16.1.0 version: 16.1.0(tslib@2.6.2)(typescript@5.3.3) '@guardian/renditions': specifier: 0.2.0 version: 0.2.0 - '@guardian/source-foundations': - specifier: 14.2.2 - version: 14.2.2(tslib@2.6.2)(typescript@5.3.3) - '@guardian/source-react-components': - specifier: 22.1.0 - version: 22.1.0(@emotion/react@11.11.1)(@guardian/source-foundations@14.2.2)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) - '@guardian/source-react-components-development-kitchen': - specifier: 19.0.0 - version: 19.0.0(@emotion/react@11.11.1)(@guardian/libs@16.1.0)(@guardian/source-foundations@14.2.2)(@guardian/source-react-components@22.1.0)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) + '@guardian/source': + specifier: 1.0.0 + version: 1.0.0(@emotion/react@11.11.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) + '@guardian/source-development-kitchen': + specifier: 1.0.0 + version: 1.0.0(@emotion/react@11.11.1)(@guardian/libs@16.1.0)(@guardian/source@1.0.0)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) '@smithy/property-provider': specifier: 2.0.16 version: 2.0.16 @@ -350,9 +344,6 @@ importers: '@guardian/eslint-config-typescript': specifier: 9.0.1 version: 9.0.1(eslint@8.56.0)(tslib@2.6.2)(typescript@5.3.3) - '@guardian/eslint-plugin-source-react-components': - specifier: 24.0.0 - version: 24.0.0(@guardian/libs@16.1.0)(@guardian/source-react-components@22.1.0)(eslint@8.56.0)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) '@guardian/identity-auth': specifier: 2.1.0 version: 2.1.0(@guardian/libs@16.1.0)(tslib@2.6.2)(typescript@5.3.3) @@ -368,15 +359,12 @@ importers: '@guardian/shimport': specifier: 1.0.2 version: 1.0.2 - '@guardian/source-foundations': - specifier: 14.2.2 - version: 14.2.2(tslib@2.6.2)(typescript@5.3.3) - '@guardian/source-react-components': - specifier: 22.1.0 - version: 22.1.0(@emotion/react@11.11.1)(@guardian/source-foundations@14.2.2)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) - '@guardian/source-react-components-development-kitchen': - specifier: 19.0.0 - version: 19.0.0(@emotion/react@11.11.1)(@guardian/libs@16.1.0)(@guardian/source-foundations@14.2.2)(@guardian/source-react-components@22.1.0)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) + '@guardian/source': + specifier: 1.0.1 + version: 1.0.1(@emotion/react@11.11.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) + '@guardian/source-development-kitchen': + specifier: 1.0.0 + version: 1.0.0(@emotion/react@11.11.1)(@guardian/libs@16.1.0)(@guardian/source@1.0.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) '@guardian/support-dotcom-components': specifier: 2.3.1 version: 2.3.1(zod@3.22.3) @@ -4197,49 +4185,6 @@ packages: - supports-color dev: false - /@guardian/eslint-config@7.0.1(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(tslib@2.6.2): - resolution: {integrity: sha512-9MX0Xj2vaXWLQvjnk0QJKYXaCABwkaZx6ZAOGiGOb4KiadN5guFOgV2ki+YuDqcd5k/R1F3bUyBh/L3+gk0ouQ==} - peerDependencies: - eslint: ^8.56.0 - tslib: ^2.6.2 - dependencies: - eslint: 8.56.0 - eslint-config-prettier: 9.1.0(eslint@8.56.0) - eslint-plugin-eslint-comments: 3.2.0(eslint@8.56.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint@8.56.0) - tslib: 2.6.2 - transitivePeerDependencies: - - '@typescript-eslint/parser' - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - dev: false - - /@guardian/eslint-plugin-source-react-components@24.0.0(@guardian/libs@16.1.0)(@guardian/source-react-components@22.1.0)(eslint@8.56.0)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3): - resolution: {integrity: sha512-CQpKTWgDsrRhzQcHEI62EQD36W9jQ/TDfMqF6umkNXyCby/WFs80YrgkkJreQmJJFUc5vXCzVdUXpPfB4mMong==} - peerDependencies: - '@guardian/libs': ^16.0.0 - '@guardian/source-react-components': ^22.0.1 - eslint: ^8.56.0 - react: ^18.2.0 - tslib: ^2.6.2 - typescript: ~5.3.3 - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@guardian/libs': 16.1.0(tslib@2.6.2)(typescript@5.3.3) - '@guardian/source-react-components': 22.1.0(@emotion/react@11.11.1)(@guardian/source-foundations@14.2.2)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - eslint: 8.56.0 - react: 18.3.1 - tslib: 2.6.2 - typescript: 5.3.3 - transitivePeerDependencies: - - supports-color - dev: false - /@guardian/identity-auth-frontend@4.0.0(@guardian/identity-auth@2.1.0)(@guardian/libs@16.1.0)(tslib@2.6.2)(typescript@5.3.3): resolution: {integrity: sha512-lSXpRF54eEkxbQXEzJTXYDqzMDHl345Ac/Y7M8/OnKee0vtbR1hCjfm70HbcIXpUyx+TaNV8Ka4bqkR9VwJCPA==} peerDependencies: @@ -4344,8 +4289,67 @@ packages: tslib: 2.6.2 dev: false + /@guardian/source-development-kitchen@1.0.0(@emotion/react@11.11.1)(@guardian/libs@16.1.0)(@guardian/source@1.0.0)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3): + resolution: {integrity: sha512-nZYJuHici8Bja7bKs3GZY5UzNCnbWOq1OCYclC6rhvpkcXdrtP+zyqX6YwJKWMgEKg+aL/l595OubBdGenn7OA==} + peerDependencies: + '@emotion/react': ^11.11.1 + '@guardian/libs': ^16.0.0 + '@guardian/source': ^1.0.0 + '@types/react': ^18.2.11 + react: ^18.2.0 + tslib: ^2.6.2 + typescript: ~5.3.3 + peerDependenciesMeta: + '@emotion/react': + optional: true + '@types/react': + optional: true + react: + optional: true + typescript: + optional: true + dependencies: + '@emotion/react': 11.11.1(@types/react@18.3.1)(react@18.3.1) + '@guardian/libs': 16.1.0(tslib@2.6.2)(typescript@5.3.3) + '@guardian/source': 1.0.0(@emotion/react@11.11.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) + '@types/react': 18.3.1 + react: 18.3.1 + tslib: 2.6.2 + typescript: 5.3.3 + dev: false + + /@guardian/source-development-kitchen@1.0.0(@emotion/react@11.11.1)(@guardian/libs@16.1.0)(@guardian/source@1.0.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3): + resolution: {integrity: sha512-nZYJuHici8Bja7bKs3GZY5UzNCnbWOq1OCYclC6rhvpkcXdrtP+zyqX6YwJKWMgEKg+aL/l595OubBdGenn7OA==} + peerDependencies: + '@emotion/react': ^11.11.1 + '@guardian/libs': ^16.0.0 + '@guardian/source': ^1.0.0 + '@types/react': ^18.2.11 + react: ^18.2.0 + tslib: ^2.6.2 + typescript: ~5.3.3 + peerDependenciesMeta: + '@emotion/react': + optional: true + '@types/react': + optional: true + react: + optional: true + typescript: + optional: true + dependencies: + '@emotion/react': 11.11.1(@types/react@18.3.1)(react@18.3.1) + '@guardian/libs': 16.1.0(tslib@2.6.2)(typescript@5.3.3) + '@guardian/source': 1.0.1(@emotion/react@11.11.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3) + '@types/react': 18.3.1 + react: 18.3.1 + tslib: 2.6.2 + typescript: 5.3.3 + dev: false + /@guardian/source-foundations@14.2.2(tslib@2.6.2)(typescript@5.3.3): resolution: {integrity: sha512-198Akw1RqufsX6Iu/qzqeR4eC9L3ezHURVzMqJeB3ZRZtabdkL2Q562mS1UnSdyACeCLRMqlOXqZDO38gsjP/g==} + deprecated: Use @guardian/source instead peerDependencies: tslib: ^2.6.2 typescript: ~5.3.3 @@ -4360,6 +4364,7 @@ packages: /@guardian/source-react-components-development-kitchen@19.0.0(@emotion/react@11.11.1)(@guardian/libs@16.1.0)(@guardian/source-foundations@14.2.2)(@guardian/source-react-components@22.1.0)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3): resolution: {integrity: sha512-YPqsLlwbuXNcD6dkUuzCCp/ytkwY7HH8ZozuuxlLhdwMFywFuvLRuCAp0q36gEBzcmuEU3eGjSIE823AKK9pfA==} + deprecated: Use @guardian/source-development-kitchen instead peerDependencies: '@emotion/react': ^11.11.1 '@guardian/libs': ^16.0.0 @@ -4383,6 +4388,7 @@ packages: /@guardian/source-react-components@22.1.0(@emotion/react@11.11.1)(@guardian/source-foundations@14.2.2)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3): resolution: {integrity: sha512-2oNhJsd4eaQRuHsOeQLkFZ3y4KAaA7BnG/qQES1SbPSx+e+MA8Z2UZu/9v/SEkGIleffkKKSeftP1TGQr4zJwQ==} + deprecated: Use @guardian/source instead peerDependencies: '@emotion/react': ^11.11.1 '@guardian/source-foundations': ^14.1.4 @@ -4400,6 +4406,50 @@ packages: typescript: 5.3.3 dev: false + /@guardian/source@1.0.0(@emotion/react@11.11.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3): + resolution: {integrity: sha512-UnBWVVyf45lSShKHaN8sqrAnItgrUYBUhQomGPU440QKrhiK6QpaKJfNrSIdTtOyFCPB9x9FljfoYWVj9sgZOg==} + peerDependencies: + '@emotion/react': ^11.11.1 + '@types/react': ^18.2.11 + react: ^18.2.0 + tslib: ^2.6.2 + typescript: ~5.3.3 + peerDependenciesMeta: + '@types/react': + optional: true + typescript: + optional: true + dependencies: + '@emotion/react': 11.11.1(@types/react@18.3.1)(react@18.3.1) + '@types/react': 18.3.1 + mini-svg-data-uri: 1.4.4 + react: 18.3.1 + tslib: 2.6.2 + typescript: 5.3.3 + dev: false + + /@guardian/source@1.0.1(@emotion/react@11.11.1)(@types/react@18.3.1)(react@18.3.1)(tslib@2.6.2)(typescript@5.3.3): + resolution: {integrity: sha512-LzOwkpDuKbOmVv7aOldEJhqaaKdNRP3EpWOAlJVfK08jDTwWtdM5CYTOn/8blJHLTUnEAcxZ6dH+S5zalGhFgg==} + peerDependencies: + '@emotion/react': ^11.11.1 + '@types/react': ^18.2.11 + react: ^18.2.0 + tslib: ^2.6.2 + typescript: ~5.3.3 + peerDependenciesMeta: + '@types/react': + optional: true + typescript: + optional: true + dependencies: + '@emotion/react': 11.11.1(@types/react@18.3.1)(react@18.3.1) + '@types/react': 18.3.1 + mini-svg-data-uri: 1.4.4 + react: 18.3.1 + tslib: 2.6.2 + typescript: 5.3.3 + dev: false + /@guardian/story-packages-model@2.2.0: resolution: {integrity: sha512-tZWBvoBTfR9K7AGlhsiPYAefIjfA5NsU/65OhcZjBEiFN6J+ay37D1dH6uIghYZbd+fB0mQ0I9kT/ac4Lgx0yQ==} dependencies: @@ -8252,35 +8302,6 @@ packages: - supports-color dev: false - /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4(supports-color@8.1.1) - eslint: 8.56.0 - graphemer: 1.4.0 - ignore: 5.3.1 - natural-compare: 1.4.0 - semver: 7.5.4 - ts-api-utils: 1.3.0(typescript@5.3.3) - typescript: 5.3.3 - transitivePeerDependencies: - - supports-color - dev: false - /@typescript-eslint/experimental-utils@5.62.0(eslint@8.56.0)(typescript@5.3.3): resolution: {integrity: sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8335,27 +8356,6 @@ packages: - supports-color dev: false - /@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) - '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4(supports-color@8.1.1) - eslint: 8.56.0 - typescript: 5.3.3 - transitivePeerDependencies: - - supports-color - dev: false - /@typescript-eslint/scope-manager@5.62.0: resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8372,14 +8372,6 @@ packages: '@typescript-eslint/visitor-keys': 6.18.0 dev: false - /@typescript-eslint/scope-manager@6.21.0: - resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==} - engines: {node: ^16.0.0 || >=18.0.0} - dependencies: - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/visitor-keys': 6.21.0 - dev: false - /@typescript-eslint/type-utils@5.62.0(eslint@8.56.0)(typescript@5.3.3): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8420,26 +8412,6 @@ packages: - supports-color dev: false - /@typescript-eslint/type-utils@6.21.0(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) - '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - debug: 4.3.4(supports-color@8.1.1) - eslint: 8.56.0 - ts-api-utils: 1.3.0(typescript@5.3.3) - typescript: 5.3.3 - transitivePeerDependencies: - - supports-color - dev: false - /@typescript-eslint/types@5.62.0: resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8450,11 +8422,6 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: false - /@typescript-eslint/types@6.21.0: - resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==} - engines: {node: ^16.0.0 || >=18.0.0} - dev: false - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.3): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8498,28 +8465,6 @@ packages: - supports-color dev: false - /@typescript-eslint/typescript-estree@6.21.0(typescript@5.3.3): - resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4(supports-color@8.1.1) - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.3 - semver: 7.5.4 - ts-api-utils: 1.3.0(typescript@5.3.3) - typescript: 5.3.3 - transitivePeerDependencies: - - supports-color - dev: false - /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.3.3): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8559,25 +8504,6 @@ packages: - typescript dev: false - /@typescript-eslint/utils@6.21.0(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - '@types/json-schema': 7.0.15 - '@types/semver': 7.5.6 - '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) - eslint: 8.56.0 - semver: 7.5.4 - transitivePeerDependencies: - - supports-color - - typescript - dev: false - /@typescript-eslint/visitor-keys@5.62.0: resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8594,14 +8520,6 @@ packages: eslint-visitor-keys: 3.4.3 dev: false - /@typescript-eslint/visitor-keys@6.21.0: - resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==} - engines: {node: ^16.0.0 || >=18.0.0} - dependencies: - '@typescript-eslint/types': 6.21.0 - eslint-visitor-keys: 3.4.3 - dev: false - /@ungap/structured-clone@1.2.0: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: false @@ -11555,35 +11473,6 @@ packages: - supports-color dev: false - /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0): - resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: '*' - eslint-import-resolver-node: '*' - eslint-import-resolver-typescript: '*' - eslint-import-resolver-webpack: '*' - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - eslint: - optional: true - eslint-import-resolver-node: - optional: true - eslint-import-resolver-typescript: - optional: true - eslint-import-resolver-webpack: - optional: true - dependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - debug: 3.2.7 - eslint: 8.56.0 - eslint-import-resolver-node: 0.3.9 - transitivePeerDependencies: - - supports-color - dev: false - /eslint-plugin-custom-elements@0.0.8(eslint@8.56.0): resolution: {integrity: sha512-726XMAabRLKKm6/yjvYfvY4MKBwX9C4x8yPjj/ap470KhSIBHm+xHbm3P7cKlsFz/4cxq6YrBeSwKmwlacF1jg==} peerDependencies: @@ -11673,41 +11562,6 @@ packages: - supports-color dev: false - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0)(eslint@8.56.0): - resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - dependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) - array-includes: 3.1.7 - array.prototype.findlastindex: 1.2.5 - array.prototype.flat: 1.3.2 - array.prototype.flatmap: 1.3.2 - debug: 3.2.7 - doctrine: 2.1.0 - eslint: 8.56.0 - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0) - hasown: 2.0.2 - is-core-module: 2.13.1 - is-glob: 4.0.3 - minimatch: 3.1.2 - object.fromentries: 2.0.7 - object.groupby: 1.0.3 - object.values: 1.1.7 - semver: 6.3.1 - tsconfig-paths: 3.15.0 - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - dev: false - /eslint-plugin-jsx-a11y@6.7.1(eslint@8.56.0): resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==} engines: {node: '>=4.0'}