Skip to content

Commit bc3339b

Browse files
charleycampbellcharleycampbell
authored
Merge branch 'main' into cc/three-tier-baner-v2
2 parents e43c11e + d9d338d commit bc3339b

19 files changed

+1997
-1002
lines changed

‎apps-rendering/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"dependencies": {
3535
"@aws-sdk/client-ssm": "3.621.0",
3636
"@aws-sdk/credential-providers": "3.621.0",
37-
"@babel/core": "7.26.8",
38-
"@babel/preset-env": "7.26.8",
37+
"@babel/core": "7.26.10",
38+
"@babel/preset-env": "7.26.9",
3939
"@creditkarma/thrift-server-core": "1.0.4",
4040
"@emotion/cache": "11.11.0",
4141
"@emotion/jest": "11.11.0",

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ new RenderingCDKStack(cdkApp, 'ArticleRendering-PROD', {
2828
stage: 'PROD',
2929
domainName: 'article-rendering.guardianapis.com',
3030
scaling: {
31-
minimumInstances: 27,
32-
maximumInstances: 270,
31+
minimumInstances: 24,
32+
maximumInstances: 240,
3333
policies: {
3434
step: {
3535
cpu: cpuScalingSteps,
@@ -52,7 +52,7 @@ new RenderingCDKStack(cdkApp, 'ArticleRendering-PROD', {
5252
},
5353
},
5454
},
55-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
55+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
5656
});
5757

5858
/** Facia */
@@ -68,8 +68,8 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
6868
stage: 'PROD',
6969
domainName: 'facia-rendering.guardianapis.com',
7070
scaling: {
71-
minimumInstances: 30,
72-
maximumInstances: 180,
71+
minimumInstances: 21,
72+
maximumInstances: 210,
7373
policies: {
7474
step: {
7575
cpu: cpuScalingSteps,
@@ -92,7 +92,7 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
9292
},
9393
},
9494
},
95-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
95+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
9696
});
9797

9898
/** Tag pages */
@@ -108,8 +108,8 @@ new RenderingCDKStack(cdkApp, 'TagPageRendering-PROD', {
108108
stage: 'PROD',
109109
domainName: 'tag-page-rendering.guardianapis.com',
110110
scaling: {
111-
minimumInstances: 15,
112-
maximumInstances: 150,
111+
minimumInstances: 9,
112+
maximumInstances: 90,
113113
policies: {
114114
step: {
115115
cpu: cpuScalingSteps,
@@ -132,7 +132,7 @@ new RenderingCDKStack(cdkApp, 'TagPageRendering-PROD', {
132132
},
133133
},
134134
},
135-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
135+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
136136
});
137137

138138
/** Interactive */
@@ -172,5 +172,5 @@ new RenderingCDKStack(cdkApp, 'InteractiveRendering-PROD', {
172172
},
173173
},
174174
},
175-
instanceType: InstanceType.of(InstanceClass.C7G, InstanceSize.MEDIUM),
175+
instanceType: InstanceType.of(InstanceClass.C8G, InstanceSize.MEDIUM),
176176
});

‎dotcom-rendering/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
},
2121
"dependencies": {
2222
"@aws-sdk/client-cloudwatch": "3.621.0",
23-
"@babel/core": "7.26.8",
24-
"@babel/helper-compilation-targets": "7.26.5",
25-
"@babel/helper-create-regexp-features-plugin": "7.26.3",
23+
"@babel/core": "7.26.10",
24+
"@babel/helper-compilation-targets": "7.27.0",
25+
"@babel/helper-create-regexp-features-plugin": "7.27.0",
2626
"@babel/plugin-syntax-dynamic-import": "7.8.3",
2727
"@babel/plugin-transform-react-jsx": "7.25.9",
28-
"@babel/plugin-transform-runtime": "7.26.8",
29-
"@babel/preset-env": "7.26.8",
28+
"@babel/plugin-transform-runtime": "7.26.10",
29+
"@babel/preset-env": "7.26.9",
3030
"@babel/preset-react": "7.26.3",
31-
"@babel/preset-typescript": "7.26.0",
32-
"@babel/runtime": "7.26.7",
31+
"@babel/preset-typescript": "7.27.0",
32+
"@babel/runtime": "7.27.0",
3333
"@braze/web-sdk-core": "3.5.1",
3434
"@creditkarma/thrift-server-core": "1.0.4",
3535
"@emotion/babel-plugin": "11.13.5",
@@ -116,7 +116,7 @@
116116
"aws-cdk": "2.179.0",
117117
"aws-cdk-lib": "2.179.0",
118118
"babel-loader": "9.2.1",
119-
"babel-plugin-polyfill-corejs3": "0.11.1",
119+
"babel-plugin-polyfill-corejs3": "0.12.0",
120120
"babel-plugin-transform-runtime": "6.23.0",
121121
"body-parser": "1.20.3",
122122
"browserslist": "4.23.0",

‎dotcom-rendering/src/components/FootballCompetitionSelect.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,38 @@ import { Option, Select } from '@guardian/source/react-components';
22
import type { FootballMatchKind, Region } from '../footballMatches';
33
import { palette } from '../palette';
44

5+
type FootballSelectKind = FootballMatchKind | 'Tables';
6+
57
type Props = {
68
regions: Region[];
7-
kind: FootballMatchKind;
9+
kind: FootballSelectKind;
810
pageId: string;
911
onChange: (competitionTag: string) => void;
1012
};
1113

12-
const allLabel = (kind: FootballMatchKind): string => {
14+
const allLabel = (kind: FootballSelectKind): string => {
1315
switch (kind) {
1416
case 'Fixture':
1517
return 'All fixtures';
1618
case 'Result':
1719
return 'All results';
1820
case 'Live':
1921
return 'All live';
22+
case 'Tables':
23+
return 'All tables';
2024
}
2125
};
2226

23-
const getPagePath = (kind: FootballMatchKind) => {
27+
const getPagePath = (kind: FootballSelectKind) => {
2428
switch (kind) {
2529
case 'Fixture':
2630
return '/football/fixtures';
2731
case 'Live':
2832
return '/football/live';
2933
case 'Result':
3034
return '/football/results';
35+
case 'Tables':
36+
return '/football/tables';
3137
}
3238
};
3339

‎dotcom-rendering/src/components/FootballMatchList.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const Day = (props: { children: ReactNode }) => (
9494
css={css`
9595
${textSansBold14}
9696
grid-column: centre-column-start / centre-column-end;
97-
border-top: 1px solid ${palette('--football-match-list-border')};
97+
border-top: 1px solid ${palette('--football-list-border')};
9898
padding-top: ${space[2]}px;
9999
100100
${from.leftCol} {
@@ -112,14 +112,14 @@ const CompetitionName = (props: { children: ReactNode }) => (
112112
css={css`
113113
${textSansBold14}
114114
grid-column: centre-column-start / centre-column-end;
115-
color: ${palette('--football-match-list-competition-text')};
116-
border-top: 1px solid ${palette('--football-match-list-top-border')};
115+
color: ${palette('--football-competition-text')};
116+
border-top: 1px solid ${palette('--football-top-border')};
117117
padding: ${space[2]}px;
118118
background-color: ${palette('--football-match-list-background')};
119119
margin-top: ${space[9]}px;
120120
121121
${from.leftCol} {
122-
border-top-color: ${palette('--football-match-list-border')};
122+
border-top-color: ${palette('--football-list-border')};
123123
background-color: transparent;
124124
margin-top: 0;
125125
padding: ${space[1]}px 0 0;
@@ -147,7 +147,7 @@ const Matches = (props: { children: ReactNode }) => (
147147

148148
const matchStatusStyles = css`
149149
width: 5rem;
150-
color: ${palette('--football-match-list-sub-text')};
150+
color: ${palette('--football-sub-text')};
151151
152152
${until.mobileMedium} {
153153
flex-basis: 100%;
@@ -196,11 +196,11 @@ export const shouldRenderMatchLink = (matchDateTime: Date, now: Date) =>
196196

197197
const matchListItemStyles = css`
198198
background-color: ${palette('--football-match-list-background')};
199-
border: 1px solid ${palette('--football-match-list-border')};
199+
border: 1px solid ${palette('--football-list-border')};
200200
201201
${from.leftCol} {
202202
&:first-of-type {
203-
border-top-color: ${palette('--football-match-list-top-border')};
203+
border-top-color: ${palette('--football-top-border')};
204204
}
205205
}
206206
`;
@@ -283,7 +283,7 @@ const Match = ({
283283
{isUndefined(match.comment) ? null : (
284284
<small
285285
css={css`
286-
color: ${palette('--football-match-list-sub-text')};
286+
color: ${palette('--football-sub-text')};
287287
flex-basis: 100%;
288288
text-align: center;
289289
padding-top: ${space[2]}px;
@@ -337,7 +337,7 @@ const Battleline = () => (
337337
const Versus = () => (
338338
<span
339339
css={css`
340-
color: ${palette('--football-match-list-sub-text')};
340+
color: ${palette('--football-sub-text')};
341341
width: 3rem;
342342
display: block;
343343
padding: 0 4px;
@@ -359,7 +359,7 @@ const Scores = ({
359359
css={css`
360360
width: 3rem;
361361
display: flex;
362-
color: ${palette('--football-match-list-sub-text')};
362+
color: ${palette('--football-sub-text')};
363363
`}
364364
>
365365
<span

0 commit comments

Comments
 (0)