Merge remote-tracking branch 'origin/main' into oa/jm/AR-update-typog…

…raphy

.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": {

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

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

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",

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';

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 '.';

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';
 

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';

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';

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';

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';

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';

apps-rendering/src/components/BodyImage/GalleryBodyImage.tsx

@@ -5,7 +5,7 @@ import {
 	from,
 	headlineMedium17,
 	textSans14,
-} from '@guardian/source-foundations';
+} from '@guardian/source/foundations';
 import { CaptionIconVariant } from 'components/CaptionIcon';
 import FigCaption from 'components/FigCaption';
 import Img from 'components/ImgAlt';

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';

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';

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';

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';

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';

apps-rendering/src/components/Byline/GalleryByline.tsx

@@ -1,7 +1,7 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
 import type { ArticleFormat } from '@guardian/libs';
-import { headlineMediumItalic17, remSpace } from '@guardian/source-foundations';
+import { headlineMediumItalic17, remSpace } from '@guardian/source/foundations';
 import type { Option } from '../../../vendor/@guardian/types/index';
 import { grid } from 'grid/grid';
 import { border, text } from 'palette';

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';

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';

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,

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';

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';
 

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';

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';

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';

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 {

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

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],

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';

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,

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 {

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 './';

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';

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';

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';

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';

apps-rendering/src/components/Dateline/index.tsx

@@ -10,7 +10,7 @@ import {
 	neutral,
 	textSans12,
 	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';

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';

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`