Update imports to use local copy of article format types

guardian · Oct 3, 2024 · c8858f9 · c8858f9
1 parent 1994d2f
commit c8858f9
Show file tree

Hide file tree

Showing 195 changed files with 1,017 additions and 936 deletions.
diff --git a/apps-rendering/src/adSlot.stories.tsx b/apps-rendering/src/adSlot.stories.tsx
@@ -1,14 +1,18 @@
 // ----- Imports ----- //
 
-import type { ArticleFormat } from '@guardian/libs';
-import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';
+import {
+	ArticleDesign,
+	ArticleDisplay,
+	type ArticleFormat,
+	Pillar,
+} from 'articleFormat';
 import AdSlot from 'adSlot';
 import type { ReactElement } from 'react';
 
 // ----- Stories ----- //
 
 const mockFormat: ArticleFormat = {
-	theme: ArticlePillar.News,
+	theme: Pillar.News,
 	design: ArticleDesign.Standard,
 	display: ArticleDisplay.Standard,
 };

diff --git a/apps-rendering/src/adSlot.tsx b/apps-rendering/src/adSlot.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css, ThemeProvider } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from 'articleFormat';
 import {
 	from,
 	headlineMedium17,

diff --git a/apps-rendering/src/ads.ts b/apps-rendering/src/ads.ts
@@ -1,4 +1,4 @@
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from 'articleFormat';
 import AdSlot from 'adSlot';
 import Paragraph from 'components/Paragraph';
 import type { ReactNode } from 'react';

diff --git a/apps-rendering/src/articleFormat.test.ts b/apps-rendering/src/articleFormat.test.ts
@@ -1,6 +1,6 @@
 // ----- Imports ----- //
 
-import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';
+import { ArticleDesign, ArticleDisplay, Pillar } from 'articleFormat';
 import { formatToString } from 'articleFormat';
 
 // ----- Tests ----- //
@@ -10,7 +10,7 @@ describe('formatToString', () => {
 		const format = formatToString({
 			design: ArticleDesign.Standard,
 			display: ArticleDisplay.Immersive,
-			theme: ArticlePillar.Culture,
+			theme: Pillar.Culture,
 		});
 
 		expect(format).toBe(

diff --git a/apps-rendering/src/bodyElement.ts b/apps-rendering/src/bodyElement.ts
@@ -7,7 +7,7 @@ import type { Newsletter } from '@guardian/apps-rendering-api-models/newsletter'
 import type { Atoms } from '@guardian/content-api-models/v1/atoms';
 import type { BlockElement } from '@guardian/content-api-models/v1/blockElement';
 import { ElementType } from '@guardian/content-api-models/v1/elementType';
-import type { ArticleTheme } from '@guardian/libs';
+import type { ArticleTheme } from 'articleFormat';
 import type { Option } from '../vendor/@guardian/types/index';
 import { fromNullable } from '../vendor/@guardian/types/index';
 import type { TimelineEvent } from 'atoms';

diff --git a/apps-rendering/src/campaign.test.ts b/apps-rendering/src/campaign.test.ts
@@ -3,7 +3,7 @@
 import { Campaign } from '@guardian/apps-rendering-api-models/campaign';
 import { CampaignFields } from '@guardian/apps-rendering-api-models/campaignFields';
 import { ParticipationFields } from '@guardian/apps-rendering-api-models/participationFields';
-import { ArticleSpecial } from '@guardian/libs';
+import { ArticleSpecial } from 'articleFormat';
 import { Int64 } from 'thrift';
 import { getCallout, getReport } from 'campaign';
 

diff --git a/apps-rendering/src/campaign.ts b/apps-rendering/src/campaign.ts
@@ -2,7 +2,7 @@
 
 import type { Campaign } from '@guardian/apps-rendering-api-models/campaign';
 import type { ParticipationFields } from '@guardian/apps-rendering-api-models/participationFields';
-import { ArticleSpecial } from '@guardian/libs';
+import { ArticleSpecial } from 'articleFormat';
 import { Optional } from 'optional';
 
 export type CalloutFields = {

diff --git a/apps-rendering/src/client/callouts.ts b/apps-rendering/src/client/callouts.ts
@@ -3,8 +3,12 @@
 import type { Contact } from '@guardian/apps-rendering-api-models/contact';
 import type { FormField } from '@guardian/apps-rendering-api-models/formField';
 import type { FormOption } from '@guardian/apps-rendering-api-models/formOption';
-import { ArticleSpecial, Pillar } from '@guardian/libs';
-import type { ArticleFormat, ArticleTheme } from '@guardian/libs';
+import {
+	type ArticleFormat,
+	ArticleSpecial,
+	type ArticleTheme,
+	Pillar,
+} from 'articleFormat';
 import { withDefault } from '../../vendor/@guardian/types/index';
 import { ElementKind } from 'bodyElementKind';
 import { pipe, resultFromNullable } from 'lib';

diff --git a/apps-rendering/src/components/Anchor/Anchor.stories.tsx b/apps-rendering/src/components/Anchor/Anchor.stories.tsx
@@ -1,6 +1,6 @@
 // ----- Imports ----- //
 
-import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';
+import { ArticleDesign, ArticleDisplay, Pillar } from '../../articleFormat';
 import { getAllThemes, getThemeNameAsString } from 'fixtures/article';
 import Anchor from './';
 
@@ -16,7 +16,7 @@ const Default = () => (
 		format={{
 			design: ArticleDesign.Standard,
 			display: ArticleDisplay.Standard,
-			theme: ArticlePillar.News,
+			theme: Pillar.News,
 		}}
 		href={link}
 	>

diff --git a/apps-rendering/src/components/Anchor/index.tsx b/apps-rendering/src/components/Anchor/index.tsx
@@ -2,8 +2,11 @@
 
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
-import { ArticleDesign, ArticleSpecial } from '@guardian/libs';
+import {
+	ArticleDesign,
+	type ArticleFormat,
+	ArticleSpecial,
+} from '../../articleFormat';
 import { labs, neutral } from '@guardian/source/foundations';
 import { text } from 'palette';
 import type { ReactNode } from 'react';

diff --git a/apps-rendering/src/components/ArticleBody/index.tsx b/apps-rendering/src/components/ArticleBody/index.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { palette, remSpace } from '@guardian/source/foundations';
 import type { BodyElement } from 'bodyElement';
 import { background } from 'palette';

diff --git a/apps-rendering/src/components/Avatar/index.tsx b/apps-rendering/src/components/Avatar/index.tsx
@@ -2,7 +2,7 @@
 
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { remSpace } from '@guardian/source/foundations';
 import { map, withDefault } from '../../../vendor/@guardian/types/index';
 import Img from 'components/Img';

diff --git a/apps-rendering/src/components/Blockquote/Blockquote.stories.tsx b/apps-rendering/src/components/Blockquote/Blockquote.stories.tsx
@@ -1,11 +1,11 @@
-import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';
+import { ArticleDesign, ArticleDisplay, Pillar } from '../../articleFormat';
 import Paragraph from 'components/Paragraph';
 import Blockquote from './';
 
 const standard = {
 	design: ArticleDesign.Standard,
 	display: ArticleDisplay.Standard,
-	theme: ArticlePillar.News,
+	theme: Pillar.News,
 };
 
 const Default = () => (

diff --git a/apps-rendering/src/components/Blockquote/index.tsx b/apps-rendering/src/components/Blockquote/index.tsx
@@ -2,7 +2,7 @@
 
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { remSpace } from '@guardian/source/foundations';
 import { fill } from 'palette';
 import type { ReactNode } from 'react';

diff --git a/apps-rendering/src/components/BodyImage/BodyImage.defaults.tsx b/apps-rendering/src/components/BodyImage/BodyImage.defaults.tsx
@@ -2,7 +2,7 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
 import { ArticleElementRole } from '@guardian/libs';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { from, remSpace } from '@guardian/source/foundations';
 import type { Breakpoint } from '@guardian/source/foundations';
 import type { Option } from '../../../vendor/@guardian/types/index';

diff --git a/apps-rendering/src/components/BodyImage/BodyImage.stories.tsx b/apps-rendering/src/components/BodyImage/BodyImage.stories.tsx
@@ -1,11 +1,7 @@
 // ----- Imports ----- //
 
-import {
-	ArticleDesign,
-	ArticleDisplay,
-	ArticleElementRole,
-	ArticlePillar,
-} from '@guardian/libs';
+import { ArticleElementRole } from '@guardian/libs';
+import { ArticleDesign, ArticleDisplay, Pillar } from '../../articleFormat';
 import { none } from '../../../vendor/@guardian/types/index';
 import { image } from 'fixtures/image';
 import { Optional } from 'optional';
@@ -16,7 +12,7 @@ import BodyImage from '.';
 const format = {
 	design: ArticleDesign.Standard,
 	display: ArticleDisplay.Standard,
-	theme: ArticlePillar.News,
+	theme: Pillar.News,
 };
 const caption = Optional.some(
 	'Age of the train … a tourist train in Switzerland. Photograph: Kisa_Markiza/Getty Images',

diff --git a/apps-rendering/src/components/BodyImage/GalleryBodyImage.tsx b/apps-rendering/src/components/BodyImage/GalleryBodyImage.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import {
 	from,
 	headlineMedium17,

diff --git a/apps-rendering/src/components/BodyImage/index.tsx b/apps-rendering/src/components/BodyImage/index.tsx
@@ -1,5 +1,5 @@
 // ----- Imports ----- //
-import { ArticleDesign } from '@guardian/libs';
+import { ArticleDesign } from '../../articleFormat';
 import type { Breakpoint } from '@guardian/source/foundations';
 import type { Option } from '../../../vendor/@guardian/types/index';
 import { none } from '../../../vendor/@guardian/types/index';

diff --git a/apps-rendering/src/components/Bullet/Bullet.stories.tsx b/apps-rendering/src/components/Bullet/Bullet.stories.tsx
@@ -1,6 +1,6 @@
 // ----- Imports ----- //
 
-import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';
+import { ArticleDesign, ArticleDisplay, Pillar } from '../../articleFormat';
 import Bullet from './';
 
 // ----- Stories ----- //
@@ -10,7 +10,7 @@ const Default = () => (
 		format={{
 			design: ArticleDesign.Standard,
 			display: ArticleDisplay.Standard,
-			theme: ArticlePillar.News,
+			theme: Pillar.News,
 		}}
 		text="• Lorem ipsum"
 	/>

diff --git a/apps-rendering/src/components/Bullet/index.tsx b/apps-rendering/src/components/Bullet/index.tsx
@@ -2,7 +2,7 @@
 
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { background } from 'palette';
 import { darkModeCss } from 'styles';
 

diff --git a/apps-rendering/src/components/Byline/AnalysisByline.tsx b/apps-rendering/src/components/Byline/AnalysisByline.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import {
 	headlineLightItalic28,
 	headlineLightItalic34,

diff --git a/apps-rendering/src/components/Byline/Byline.defaults.tsx b/apps-rendering/src/components/Byline/Byline.defaults.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import {
 	headlineBold17,
 	headlineMediumItalic17,

diff --git a/apps-rendering/src/components/Byline/Byline.stories.tsx b/apps-rendering/src/components/Byline/Byline.stories.tsx
@@ -3,9 +3,9 @@
 import {
 	ArticleDesign,
 	ArticleDisplay,
-	ArticlePillar,
 	ArticleSpecial,
-} from '@guardian/libs';
+	Pillar,
+} from '../../articleFormat';
 import { parse } from 'client/parser';
 import { getAllThemes, getThemeNameAsString } from 'fixtures/article';
 import Byline from './';
@@ -27,7 +27,7 @@ const mockBylineHtml = parseByline(
 
 const Default = () => (
 	<Byline
-		theme={ArticlePillar.News}
+		theme={Pillar.News}
 		design={ArticleDesign.Standard}
 		display={ArticleDisplay.Standard}
 		bylineHtml={mockBylineHtml}
@@ -36,7 +36,7 @@ const Default = () => (
 
 const Analysis = () => (
 	<Byline
-		theme={ArticlePillar.News}
+		theme={Pillar.News}
 		design={ArticleDesign.Analysis}
 		display={ArticleDisplay.Standard}
 		bylineHtml={mockBylineHtml}
@@ -45,7 +45,7 @@ const Analysis = () => (
 
 const Comment = () => (
 	<Byline
-		theme={ArticlePillar.Opinion}
+		theme={Pillar.Opinion}
 		design={ArticleDesign.Comment}
 		display={ArticleDisplay.Standard}
 		bylineHtml={mockBylineHtml}

diff --git a/apps-rendering/src/components/Byline/CommentByline.tsx b/apps-rendering/src/components/Byline/CommentByline.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { between, headlineLightItalic34 } from '@guardian/source/foundations';
 import type { Option } from '../../../vendor/@guardian/types/index';
 import { text } from 'palette';

diff --git a/apps-rendering/src/components/Byline/DeadBlogByline.tsx b/apps-rendering/src/components/Byline/DeadBlogByline.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import {
 	headlineBold17,
 	headlineMediumItalic17,

diff --git a/apps-rendering/src/components/Byline/GalleryByline.tsx b/apps-rendering/src/components/Byline/GalleryByline.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { headlineMediumItalic17, remSpace } from '@guardian/source/foundations';
 import type { Option } from '../../../vendor/@guardian/types/index';
 import { grid } from 'grid/grid';

diff --git a/apps-rendering/src/components/Byline/LabsByline.tsx b/apps-rendering/src/components/Byline/LabsByline.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import { labs, textSansItalic17 } from '@guardian/source/foundations';
 import type { Option } from '../../../vendor/@guardian/types/index';
 import { darkModeCss } from 'styles';

diff --git a/apps-rendering/src/components/Byline/LiveBlogByline.tsx b/apps-rendering/src/components/Byline/LiveBlogByline.tsx
@@ -1,6 +1,6 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import {
 	from,
 	headlineBold17,

diff --git a/apps-rendering/src/components/Byline/index.tsx b/apps-rendering/src/components/Byline/index.tsx
@@ -1,6 +1,9 @@
 // ----- Imports ----- //
-import { ArticleDesign, ArticleSpecial } from '@guardian/libs';
-import type { ArticleFormat } from '@guardian/libs';
+import {
+	ArticleDesign,
+	type ArticleFormat,
+	ArticleSpecial,
+} from '../../articleFormat';
 import type { Option } from '../../../vendor/@guardian/types/index';
 import AnalysisByline from './AnalysisByline';
 import {

diff --git a/apps-rendering/src/components/BylineCard/index.tsx b/apps-rendering/src/components/BylineCard/index.tsx
@@ -1,7 +1,7 @@
 import type { SerializedStyles } from '@emotion/react';
 import { css } from '@emotion/react';
 import type { RelatedItem } from '@guardian/apps-rendering-api-models/relatedItem';
-import type { ArticleFormat } from '@guardian/libs';
+import type { ArticleFormat } from '../../articleFormat';
 import {
 	from,
 	headlineMedium17,

diff --git a/apps-rendering/src/components/Callout/Callout.stories.tsx b/apps-rendering/src/components/Callout/Callout.stories.tsx
@@ -1,12 +1,16 @@
-import { ArticleDesign, ArticleDisplay, ArticlePillar } from '@guardian/libs';
-import type { ArticleFormat } from '@guardian/libs';
+import {
+	ArticleDesign,
+	ArticleDisplay,
+	type ArticleFormat,
+	Pillar,
+} from '../../articleFormat';
 import fetchMock from 'fetch-mock';
 import { campaignDescription, mockCampaign } from 'fixtures/campaign';
 import type { ReactElement } from 'react';
 import Callout from '.';
 
 const mockFormat: ArticleFormat = {
-	theme: ArticlePillar.News,
+	theme: Pillar.News,
 	design: ArticleDesign.Standard,
 	display: ArticleDisplay.Standard,
 };

diff --git a/apps-rendering/src/components/Callout/calloutBlock.tsx b/apps-rendering/src/components/Callout/calloutBlock.tsx
@@ -1,6 +1,6 @@
 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 type { ArticleFormat } from '../../articleFormat';
 import { Tabs } from '@guardian/source-development-kitchen/react-components';
 import { useState } from 'react';
 import type { ReactElement } from 'react';

diff --git a/apps-rendering/src/components/Callout/index.tsx b/apps-rendering/src/components/Callout/index.tsx
@@ -1,7 +1,7 @@
 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 type { ArticleFormat } from '../../articleFormat';
 import { remSpace } from '@guardian/source/foundations';
 import { ExpandingWrapper } from '@guardian/source-development-kitchen/react-components';
 import { isElement } from 'lib';