Skip to content

Commit c0cc6ce

Browse files
emma-imberemma-imber
authored
Merge branch 'main' into ei/product-carousel-styling-updates
2 parents b3e57c1 + 741483f commit c0cc6ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1068
-639
lines changed

‎.github/workflows/ab-testing-ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Build
4545
run: pnpm build
4646

47-
- uses: actions/upload-artifact@v5
47+
- uses: actions/upload-artifact@v6
4848
with:
4949
name: ab-testing-build
5050
path: ab-testing/config/dist
@@ -67,7 +67,7 @@ jobs:
6767
run: pnpm build
6868

6969
- name: Save build
70-
uses: actions/upload-artifact@v5
70+
uses: actions/upload-artifact@v6
7171
with:
7272
name: ui-build
7373
path: ab-testing/frontend/output/ab-tests.html
@@ -97,7 +97,7 @@ jobs:
9797
zip -j lambda.zip ../package.json
9898
9999
- name: Save build
100-
uses: actions/upload-artifact@v5
100+
uses: actions/upload-artifact@v6
101101
with:
102102
name: ab-testing-deploy-lambda-build
103103
path: ab-testing/deploy-lambda/dist/lambda.zip
@@ -126,7 +126,7 @@ jobs:
126126
zip -j lambda.zip ../package.json
127127
128128
- name: Save build
129-
uses: actions/upload-artifact@v5
129+
uses: actions/upload-artifact@v6
130130
with:
131131
name: ab-testing-notification-lambda-build
132132
path: ab-testing/notification-lambda/dist/lambda.zip
@@ -154,25 +154,25 @@ jobs:
154154
uses: ./.github/actions/setup-node-env
155155

156156
- name: Fetch config build
157-
uses: actions/download-artifact@v6.0.0
157+
uses: actions/download-artifact@v7.0.0
158158
with:
159159
name: ab-testing-build
160160
path: ab-testing/config/dist
161161

162162
- name: Fetch UI build
163-
uses: actions/download-artifact@v6.0.0
163+
uses: actions/download-artifact@v7.0.0
164164
with:
165165
name: ui-build
166166
path: ab-testing/frontend/output/ab-tests.html
167167

168168
- name: Fetch Deploy Lambda build
169-
uses: actions/download-artifact@v6.0.0
169+
uses: actions/download-artifact@v7.0.0
170170
with:
171171
name: ab-testing-deploy-lambda-build
172172
path: ab-testing/deploy-lambda/dist/lambda.zip
173173

174174
- name: Fetch Notification Lambda build
175-
uses: actions/download-artifact@v6.0.0
175+
uses: actions/download-artifact@v7.0.0
176176
with:
177177
name: ab-testing-notification-lambda-build
178178
path: ab-testing/notification-lambda/dist/lambda.zip

‎.github/workflows/bundle-analyser.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ jobs:
1919
working-directory: dotcom-rendering
2020

2121
- name: Archive code coverage results for web bundle
22-
uses: actions/upload-artifact@v5
22+
uses: actions/upload-artifact@v6
2323
with:
2424
name: bundle-analyser-report-web-bundles
2525
path: dotcom-rendering/dist/stats/client.web-bundles.html
2626
if-no-files-found: error
2727

2828
- name: Archive code coverage results for web variant bundle
29-
uses: actions/upload-artifact@v5
29+
uses: actions/upload-artifact@v6
3030
with:
3131
name: bundle-analyser-report-web
3232
path: dotcom-rendering/dist/stats/client.web.variant-bundles.html
3333
if-no-files-found: warn # Variant bundle only exists when an active experiment is going on
3434

3535
- name: Archive code coverage results for apps bundle
36-
uses: actions/upload-artifact@v5
36+
uses: actions/upload-artifact@v6
3737
with:
3838
name: bundle-analyser-report-apps
3939
path: dotcom-rendering/dist/stats/client.apps-bundles.html

‎.github/workflows/playwright.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
env:
4242
NODE_ENV: production
4343

44-
- uses: actions/upload-artifact@v5
44+
- uses: actions/upload-artifact@v6
4545
if: always()
4646
with:
4747
name: playwright-report-${{ matrix.group }}

‎dotcom-rendering/docs/logging.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ We use log4js to handle application logs, which can be found in the logs/ direct
44
or in /var/log/dotcom-rendering/ in production. At the moment these logs do not contain uncaught exceptions - these
55
are logged by the frontend article app at present when dotcom-rendering fails to render a page.
66

7-
Logs are shipped from the appplication instance to the central elk stack, you can find them [here](<https://logs.gutools.co.uk/app/kibana#/discover?_g=()&_a=(columns:!(_source),index:a35a6090-59d7-11e8-bbe4-cbb5b151b19c,interval:auto,query:(language:lucene,query:'app:dotcom-rendering'),sort:!('@timestamp',desc))>).
7+
Logs are shipped from the application instance to the central elk stack, you can find them [here](<https://logs.gutools.co.uk/app/kibana#/discover?_g=()&_a=(columns:!(_source),index:a35a6090-59d7-11e8-bbe4-cbb5b151b19c,interval:auto,query:(language:lucene,query:'app:dotcom-rendering'),sort:!('@timestamp',desc))>).
88

99
To log something:
1010

1111
import { logger } from './logging';
1212

13+
logger.debug('Enabled in local and CODE environments only');
1314
logger.info('Logging can be useful');
1415
logger.warn('But also expensive');
1516
logger.error('Help someone put me in a wood burner');

‎dotcom-rendering/fixtures/manual/trails.ts‎

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ export const galleryTrails: [DCRFrontCard, DCRFrontCard] = [
548548
},
549549
];
550550

551-
export const videoTrails: [DCRFrontCard, DCRFrontCard] = [
551+
export const youtubeVideoTrails: [DCRFrontCard, DCRFrontCard] = [
552552
{
553553
...defaultCardProps,
554554
format: { design: 4, display: 0, theme: 2 },
@@ -652,7 +652,7 @@ export const selfHostedVideo54Card = {
652652
...defaultCardProps,
653653
dataLinkName: 'news | group-0 | card-@2',
654654
url: '/uk-news/2025/jan/22/prince-harry-says-sun-publisher-made-historic-admission-as-he-settles-case',
655-
headline: 'Headline for looping video card',
655+
headline: 'Self-hosted 5:4 video card',
656656
trailText: 'Trail text for looping video card',
657657
mainMedia: {
658658
type: 'SelfHostedVideo',
@@ -673,10 +673,44 @@ export const selfHostedVideo54Card = {
673673
src: 'https://media.guim.co.uk/966bf085fb982b1103aaba42a812b09726cc0a3c/1417_104_1378_1104/master/1378.jpg',
674674
altText: 'Wyatt Russell and Florence Pugh in Thunderbolts*.',
675675
},
676+
showVideo: true,
676677
} satisfies DCRFrontCard;
677678

678-
export const selfHostedVerticalVideoCard = {
679+
export const selfHostedVideo45Card = {
679680
...selfHostedVideo54Card,
681+
headline: 'Self-hosted 4:5 video card',
682+
mainMedia: {
683+
...selfHostedVideo54Card.mainMedia,
684+
sources: [
685+
{
686+
mimeType: 'video/mp4',
687+
src: 'https://uploads.guim.co.uk/2025/11/27/4_5_Test--1d34df3e-8c92-4090-8bb6-d79fc7fb9467-1.0.mp4',
688+
},
689+
],
690+
width: 576,
691+
height: 720,
692+
},
693+
} satisfies DCRFrontCard;
694+
695+
export const selfHostedVideo53Card = {
696+
...selfHostedVideo54Card,
697+
headline: 'Self-hosted 5:3 video card',
698+
mainMedia: {
699+
...selfHostedVideo54Card.mainMedia,
700+
sources: [
701+
{
702+
mimeType: 'video/mp4',
703+
src: 'https://uploads.guim.co.uk/2025/11/27/5_3_Test--26763e61-c16b-4c10-8c16-3f11882da154-1.0.mp4',
704+
},
705+
],
706+
width: 1200,
707+
height: 720,
708+
},
709+
} satisfies DCRFrontCard;
710+
711+
export const selfHostedVideo916Card = {
712+
...selfHostedVideo54Card,
713+
headline: 'Self-hosted 9:16 video card',
680714
mainMedia: {
681715
...selfHostedVideo54Card.mainMedia,
682716
sources: [
@@ -690,6 +724,22 @@ export const selfHostedVerticalVideoCard = {
690724
},
691725
} satisfies DCRFrontCard;
692726

727+
export const selfHostedVideo169Card = {
728+
...selfHostedVideo54Card,
729+
headline: 'Self-hosted 16:9 video card',
730+
mainMedia: {
731+
...selfHostedVideo54Card.mainMedia,
732+
sources: [
733+
{
734+
mimeType: 'video/mp4',
735+
src: 'https://uploads.guim.co.uk/2026/01/02/Social_media_footage_shows_person_trying_to_put_out_flames_in_Crans-Montana_bar___video--77ec00d2-7e58-4698-898c-08174f65a94b-1.0.mp4',
736+
},
737+
],
738+
width: 1280,
739+
height: 720,
740+
},
741+
} satisfies DCRFrontCard;
742+
693743
export const slideshowCard: DCRFrontCard = {
694744
...defaultCardProps,
695745
dataLinkName: 'news | group-0 | card-@2',

‎dotcom-rendering/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@types/compression": "1.7.5",
6565
"@types/connect": "3.4.38",
6666
"@types/dompurify": "3.0.2",
67-
"@types/express": "5.0.1",
67+
"@types/express": "5.0.6",
6868
"@types/he": "1.2.0",
6969
"@types/html-minifier-terser": "7.0.2",
7070
"@types/jest": "29.5.14",
@@ -114,7 +114,7 @@
114114
"eslint-plugin-storybook": "10.1.10",
115115
"eslint-plugin-unicorn": "48.0.1",
116116
"eslint-stats": "1.0.1",
117-
"express": "5.1.0",
117+
"express": "5.2.1",
118118
"find": "0.3.0",
119119
"he": "1.2.0",
120120
"html-minifier-terser": "7.2.0",

dotcom-rendering/src/components/EditorialButton/EditorialButton.stories.tsx renamed to dotcom-rendering/src/components/Button/EditorialButton.stories.tsx

File renamed without changes.

dotcom-rendering/src/components/EditorialButton/EditorialButton.tsx renamed to dotcom-rendering/src/components/Button/EditorialButton.tsx

File renamed without changes.

dotcom-rendering/src/components/EditorialButton/EditorialLinkButton.stories.tsx renamed to dotcom-rendering/src/components/Button/EditorialLinkButton.stories.tsx

File renamed without changes.

dotcom-rendering/src/components/EditorialButton/EditorialLinkButton.tsx renamed to dotcom-rendering/src/components/Button/EditorialLinkButton.tsx

File renamed without changes.

0 commit comments

Comments
 (0)