Skip to content

Commit

Permalink
Merge pull request #1096 from Financial-Times/fix/origami_build_servi…
Browse files Browse the repository at this point in the history
…ce_system_codes

[Update] source_code of Origami Build service URLs
  • Loading branch information
joelcarr authored Nov 5, 2024
2 parents f8e7fe2 + 44bff7a commit 7ebf08c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions packages/dotcom-ui-base-styles/src/lib/fontFaces.ts
Original file line number Diff line number Diff line change
@@ -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'
]
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down

0 comments on commit 7ebf08c

Please sign in to comment.