Skip to content

Commit 1bc1146

Browse files
author
Rik Roots
committed
Merge branch 'main' into rjr-fix-datawrapper-iframe-scrollbar-issue
2 parents e7f4b03 + eb63c91 commit 1bc1146

File tree

98 files changed

+3054
-1237
lines changed

Some content is hidden

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

98 files changed

+3054
-1237
lines changed

‎dotcom-rendering/.storybook/modes.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ export const allModes = {
5757
globalColourScheme: 'vertical',
5858
viewport: breakpoints.leftCol,
5959
},
60+
'vertical wide': {
61+
globalColourScheme: 'vertical',
62+
viewport: breakpoints.wide,
63+
},
6064
'light desktop': {
6165
globalColourScheme: 'light',
6266
viewport: breakpoints.desktop,

‎dotcom-rendering/cdk/bin/cdk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
6868
stage: 'PROD',
6969
domainName: 'facia-rendering.guardianapis.com',
7070
scaling: {
71-
minimumInstances: 18,
71+
minimumInstances: 30,
7272
maximumInstances: 180,
7373
policies: {
7474
step: {

‎dotcom-rendering/fixtures/generated/football-live.ts

Lines changed: 73 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -16,78 +16,8 @@ import type { FEFootballDataPage } from '../../src/feFootballDataPage';
1616
export const footballData: FEFootballDataPage = {
1717
matchesList: [
1818
{
19-
date: '2025-02-14',
19+
date: '2025-03-03',
2020
competitionMatches: [
21-
{
22-
competitionSummary: {
23-
id: '100',
24-
url: '/football/premierleague',
25-
fullName: 'Premier League',
26-
nation: 'English',
27-
},
28-
matches: [
29-
{
30-
id: '4478426',
31-
date: '2025-02-14T20:00:00Z[Europe/London]',
32-
stage: {
33-
stageNumber: '1',
34-
},
35-
round: {
36-
roundNumber: '1',
37-
name: 'League',
38-
},
39-
leg: '1',
40-
homeTeam: {
41-
id: '6795',
42-
name: 'Brighton',
43-
},
44-
awayTeam: {
45-
id: '4',
46-
name: 'Chelsea',
47-
},
48-
venue: {
49-
id: '1536',
50-
name: 'The American Express Community Stadium',
51-
},
52-
type: 'Fixture',
53-
},
54-
],
55-
},
56-
{
57-
competitionSummary: {
58-
id: '625',
59-
url: '/football/bundesligafootball',
60-
fullName: 'Bundesliga',
61-
nation: 'European',
62-
},
63-
matches: [
64-
{
65-
id: '4484272',
66-
date: '2025-02-14T19:30:00Z[Europe/London]',
67-
stage: {
68-
stageNumber: '1',
69-
},
70-
round: {
71-
roundNumber: '1',
72-
name: 'League',
73-
},
74-
leg: '1',
75-
homeTeam: {
76-
id: '32656',
77-
name: 'Augsburg',
78-
},
79-
awayTeam: {
80-
id: '61019',
81-
name: 'RB Leipzig',
82-
},
83-
venue: {
84-
id: '1371',
85-
name: 'WWK Arena',
86-
},
87-
type: 'Fixture',
88-
},
89-
],
90-
},
9121
{
9222
competitionSummary: {
9323
id: '635',
@@ -97,8 +27,8 @@ export const footballData: FEFootballDataPage = {
9727
},
9828
matches: [
9929
{
100-
id: '4486775',
101-
date: '2025-02-14T19:45:00Z[Europe/London]',
30+
id: '4489318',
31+
date: '2025-03-03T19:45:00Z[Europe/London]',
10232
stage: {
10333
stageNumber: '1',
10434
},
@@ -108,16 +38,16 @@ export const footballData: FEFootballDataPage = {
10838
},
10939
leg: '1',
11040
homeTeam: {
111-
id: '26371',
112-
name: 'Bologna',
41+
id: '26359',
42+
name: 'Juventus',
11343
},
11444
awayTeam: {
115-
id: '27038',
116-
name: 'Torino',
45+
id: '27648',
46+
name: 'Verona',
11747
},
11848
venue: {
119-
id: '419',
120-
name: "Renato Dall'Ara",
49+
id: '1704',
50+
name: 'Juventus Stadium',
12151
},
12252
type: 'Fixture',
12353
},
@@ -132,43 +62,8 @@ export const footballData: FEFootballDataPage = {
13262
},
13363
matches: [
13464
{
135-
id: '4486653',
136-
date: '2025-02-14T20:00:00Z[Europe/London]',
137-
stage: {
138-
stageNumber: '1',
139-
},
140-
round: {
141-
roundNumber: '1',
142-
name: 'League',
143-
},
144-
leg: '1',
145-
homeTeam: {
146-
id: '27832',
147-
name: 'Girona',
148-
},
149-
awayTeam: {
150-
id: '37459',
151-
name: 'Getafe',
152-
},
153-
venue: {
154-
id: '236',
155-
name: 'Montilivi',
156-
},
157-
type: 'Fixture',
158-
},
159-
],
160-
},
161-
{
162-
competitionSummary: {
163-
id: '620',
164-
url: '/football/ligue1football',
165-
fullName: 'Ligue 1',
166-
nation: 'European',
167-
},
168-
matches: [
169-
{
170-
id: '4487176',
171-
date: '2025-02-14T19:45:00Z[Europe/London]',
65+
id: '4488456',
66+
date: '2025-03-03T20:00:00Z[Europe/London]',
17267
stage: {
17368
stageNumber: '1',
17469
},
@@ -178,59 +73,87 @@ export const footballData: FEFootballDataPage = {
17873
},
17974
leg: '1',
18075
homeTeam: {
181-
id: '27099',
182-
name: 'Brest',
76+
id: '38295',
77+
name: 'Villarreal',
18378
},
18479
awayTeam: {
185-
id: '26348',
186-
name: 'Auxerre',
80+
id: '26306',
81+
name: 'Espanyol',
18782
},
18883
venue: {
189-
id: '143',
190-
name: 'Stade Francis-Le Ble',
84+
id: '466',
85+
name: 'Estadio de la Ceramica',
19186
},
19287
type: 'Fixture',
19388
},
19489
],
19590
},
19691
{
19792
competitionSummary: {
198-
id: '101',
199-
url: '/football/championship',
200-
fullName: 'Championship',
93+
id: '300',
94+
url: '/football/fa-cup',
95+
fullName: 'FA Cup',
20196
nation: 'English',
20297
},
20398
matches: [
20499
{
205-
id: '4475296',
206-
date: '2025-02-14T20:00:00Z[Europe/London]',
100+
id: '4488116',
101+
date: '2025-03-03T19:30:00Z[Europe/London]',
102+
competition: {
103+
id: '300',
104+
name: 'The Emirates FA Cup 24/25',
105+
},
207106
stage: {
208107
stageNumber: '1',
209108
},
210109
round: {
211-
roundNumber: '1',
212-
name: 'League',
110+
roundNumber: '5',
111+
name: 'Fifth Round',
213112
},
214113
leg: '1',
114+
liveMatch: false,
115+
result: false,
116+
previewAvailable: false,
117+
reportAvailable: false,
118+
lineupsAvailable: false,
119+
matchStatus: '-',
215120
homeTeam: {
216-
id: '16',
217-
name: 'QPR',
121+
id: '15',
122+
name: 'Nottm Forest',
218123
},
219124
awayTeam: {
220-
id: '7',
221-
name: 'Derby',
125+
id: '27',
126+
name: 'Ipswich',
222127
},
223128
venue: {
224-
id: '48',
225-
name: 'Loftus Road',
129+
id: '2020',
130+
name: 'The City Ground',
226131
},
227-
type: 'Fixture',
132+
type: 'MatchDay',
228133
},
229134
],
230135
},
231136
],
232137
},
233138
],
139+
filters: {
140+
English: [
141+
{
142+
name: 'FA Cup',
143+
url: '/football/fa-cup/live',
144+
},
145+
],
146+
European: [
147+
{
148+
name: 'Serie A',
149+
url: '/football/serieafootball/live',
150+
},
151+
{
152+
name: 'La Liga',
153+
url: '/football/laligafootball/live',
154+
},
155+
],
156+
},
234157
nav: {
235158
currentUrl: '/football/live',
236159
pillars: [
@@ -358,6 +281,10 @@ export const footballData: FEFootballDataPage = {
358281
title: 'Ukraine',
359282
url: '/world/ukraine',
360283
},
284+
{
285+
title: 'Oscars',
286+
url: '/film/oscars',
287+
},
361288
{
362289
title: 'Football',
363290
url: '/football',
@@ -480,10 +407,6 @@ export const footballData: FEFootballDataPage = {
480407
title: 'UK politics',
481408
url: '/politics',
482409
},
483-
{
484-
title: 'Society',
485-
url: '/society',
486-
},
487410
{
488411
title: 'Science',
489412
url: '/science',
@@ -1055,7 +978,7 @@ export const footballData: FEFootballDataPage = {
1055978
config: {
1056979
switches: {
1057980
lightbox: true,
1058-
abPrebidKeywords: true,
981+
externalVideoEmbeds: true,
1059982
personaliseSignInGateAfterCheckout: true,
1060983
abSignInGateMainVariant: true,
1061984
prebidAppnexusUkRow: true,
@@ -1089,8 +1012,8 @@ export const footballData: FEFootballDataPage = {
10891012
imrWorldwide: true,
10901013
acast: true,
10911014
twitterUwt: true,
1092-
abAuxiaSignInGate: false,
1093-
abDeferPermutiveLoad: false,
1015+
abAuxiaSignInGate: true,
1016+
abDeferPermutiveLoad: true,
10941017
prebidAppnexusInvcode: true,
10951018
ampPrebidPubmatic: false,
10961019
a9HeaderBidding: true,
@@ -1102,9 +1025,8 @@ export const footballData: FEFootballDataPage = {
11021025
discussionAllPageSize: true,
11031026
prebidUserSync: true,
11041027
audioOnwardJourneySwitch: true,
1028+
abMovePermutiveSegmentation: false,
11051029
brazeTaylorReport: false,
1106-
externalVideoEmbeds: true,
1107-
abTheTradeDesk: true,
11081030
callouts: true,
11091031
sentinelLogger: true,
11101032
geoMostPopular: true,
@@ -1119,7 +1041,6 @@ export const footballData: FEFootballDataPage = {
11191041
optOutAdvertising: true,
11201042
abSignInGateMainControl: true,
11211043
googleSearch: true,
1122-
abOptOutFrequencyCap: true,
11231044
brazeSwitch: true,
11241045
prebidKargo: true,
11251046
consentManagement: true,
@@ -1137,7 +1058,6 @@ export const footballData: FEFootballDataPage = {
11371058
youtubeIma: true,
11381059
webFonts: true,
11391060
liveBlogTopSponsorship: true,
1140-
abAdBlockAsk: false,
11411061
ophan: true,
11421062
crosswordSvgThumbnails: true,
11431063
prebidTriplelift: true,
@@ -1150,6 +1070,7 @@ export const footballData: FEFootballDataPage = {
11501070
prebidHeaderBidding: true,
11511071
idCookieRefresh: true,
11521072
discussionPageSize: true,
1073+
abFiveFourImages: false,
11531074
smartAppBanner: false,
11541075
historyTags: true,
11551076
brazeContentCards: true,
@@ -1159,8 +1080,11 @@ export const footballData: FEFootballDataPage = {
11591080
shouldLoadGoogletag: true,
11601081
inizio: true,
11611082
europeBetaFront: true,
1083+
dcrFootballLive: false,
1084+
},
1085+
abTests: {
1086+
dcrCrosswordsControl: 'control',
11621087
},
1163-
abTests: {},
11641088
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
11651089
stage: 'PROD',
11661090
frontendAssetsFullURL: 'https://assets.guim.co.uk/',
@@ -1180,7 +1104,7 @@ export const footballData: FEFootballDataPage = {
11801104
forecastsapiurl: '/weatherapi/forecast',
11811105
supportUrl: 'https://support.theguardian.com',
11821106
commercialBundleUrl:
1183-
'https://assets.guim.co.uk/commercial/47e59a6f2531251d895a/graun.standalone.commercial.js',
1107+
'https://assets.guim.co.uk/commercial/1ceb3579215c79c2231f/graun.standalone.commercial.js',
11841108
idOAuthUrl: 'https://oauth.theguardian.com',
11851109
webTitle: 'Live matches',
11861110
isFront: false,

0 commit comments

Comments
 (0)