Merge pull request #1096 from Financial-Times/fix/origami_build_service_system_codes

joelcarr · web-flow · commit 7ebf08c7a1db · 2024-11-05T16:03:18.000Z
[Update] source_code of Origami Build service URLs
diff --git a/packages/dotcom-ui-base-styles/src/lib/fontFaces.ts b/packages/dotcom-ui-base-styles/src/lib/fontFaces.ts
@@ -1,8 +1,8 @@
 // NOTE: please also update dotcom-ui-base-styles/styles.scss $o-fonts-path when updating the URLs defined below. They
 // need to stay in-sync to ensure our CSS output matches the resource hints we set.
 export const fontFaceURLs = [
-  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=origami&version=1.12',
-  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Semibold&system_code=origami&version=1.12',
-  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Regular&system_code=origami&version=1.12',
-  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=origami&version=1.12'
+  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=page-kit&version=1.12',
+  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Semibold&system_code=page-kit&version=1.12',
+  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Regular&system_code=page-kit&version=1.12',
+  'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=page-kit&version=1.12'
 ]
diff --git a/packages/dotcom-ui-shell/src/__test__/components/ResourceHints.test.tsx b/packages/dotcom-ui-shell/src/__test__/components/ResourceHints.test.tsx
@@ -8,7 +8,7 @@ describe('dotcom-ui-shell/src/components/ResourceHints', () => {
       'www.example.com/assets/style.css',
       'www.example.com/images/graphic.svg#icon',
       '/assets/public/style.as83hd99.css',
-      '/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=origami&version=1.12'
+      '/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=page-kit&version=1.12'
     ]
 
     const tree = renderer.create(<Subject resourceHints={fixture} />).toJSON()
diff --git a/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/ResourceHints.test.tsx.snap b/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/ResourceHints.test.tsx.snap
@@ -40,7 +40,7 @@ Array [
   <link
     as="font"
     crossOrigin="anonymous"
-    href="/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=origami&version=1.12"
+    href="/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=page-kit&version=1.12"
     rel="preload"
     type="font/woff2"
   />,
diff --git a/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/Shell.test.tsx.snap b/packages/dotcom-ui-shell/src/__test__/components/__snapshots__/Shell.test.tsx.snap
@@ -102,28 +102,28 @@ exports[`dotcom-ui-shell/src/components/Shell renders the GTM script when the en
     <link
       as="font"
       crossOrigin="anonymous"
-      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=origami&version=1.12"
+      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=page-kit&version=1.12"
       rel="preload"
       type="font/woff2"
     />
     <link
       as="font"
       crossOrigin="anonymous"
-      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Semibold&system_code=origami&version=1.12"
+      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Semibold&system_code=page-kit&version=1.12"
       rel="preload"
       type="font/woff2"
     />
     <link
       as="font"
       crossOrigin="anonymous"
-      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Regular&system_code=origami&version=1.12"
+      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Regular&system_code=page-kit&version=1.12"
       rel="preload"
       type="font/woff2"
     />
     <link
       as="font"
       crossOrigin="anonymous"
-      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=origami&version=1.12"
+      href="https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=page-kit&version=1.12"
       rel="preload"
       type="font/woff2"
     />
diff --git a/packages/dotcom-ui-shell/src/__test__/lib/getResourceType.spec.ts b/packages/dotcom-ui-shell/src/__test__/lib/getResourceType.spec.ts
@@ -7,7 +7,7 @@ describe('dotcom-ui-shell/src/lib/getResourceType', () => {
     expect(subject('image.png')).toEqual('image')
     expect(
       subject(
-        'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=origami&version=1.12'
+        'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=page-kit&version=1.12'
       )
     ).toEqual('font')
   })

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ describe('dotcom-ui-shell/src/components/ResourceHints', () => {`
`8`	`8`	`'www.example.com/assets/style.css',`
`9`	`9`	`'www.example.com/images/graphic.svg#icon',`
`10`	`10`	`'/assets/public/style.as83hd99.css',`
`11`		`- '/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=origami&version=1.12'`
	`11`	`+ '/__origami/service/build/v3/font?font_format=woff2&font_name=FinancierDisplayWeb-Bold&system_code=page-kit&version=1.12'`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`const tree = renderer.create(<Subject resourceHints={fixture} />).toJSON()`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ describe('dotcom-ui-shell/src/lib/getResourceType', () => {`
`7`	`7`	`expect(subject('image.png')).toEqual('image')`
`8`	`8`	`expect(`
`9`	`9`	`subject(`
`10`		`- 'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=origami&version=1.12'`
	`10`	`+ 'https://www.ft.com/__origami/service/build/v3/font?font_format=woff2&font_name=MetricWeb-Regular&system_code=page-kit&version=1.12'`
`11`	`11`	`)`
`12`	`12`	`).toEqual('font')`
`13`	`13`	`})`