Merge branch 'main' into ja-article-rendering-migration

Author: jorgeazevedo

dotcom-rendering/cdk/bin/cdk.ts

@@ -68,7 +68,7 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
 	stage: 'PROD',
 	domainName: 'facia-rendering.guardianapis.com',
 	scaling: {
-		minimumInstances: 18,
+		minimumInstances: 30,
 		maximumInstances: 180,
 		policies: {
 			step: {

dotcom-rendering/fixtures/manual/footballData.ts

@@ -21,7 +21,7 @@ export const regions: Regions = [
 
 export const initialDays: FootballMatches = [
 	{
-		date: new Date('2022-01-01T00:00:00Z'),
+		dateISOString: new Date('2022-01-01T00:00:00Z').toISOString(),
 		competitions: [
 			{
 				id: '635',
@@ -31,7 +31,9 @@ export const initialDays: FootballMatches = [
 				matches: [
 					{
 						kind: 'Live',
-						dateTime: new Date('2022-01-01T11:11:00Z'),
+						dateTimeISOString: new Date(
+							'2022-01-01T11:11:00Z',
+						).toISOString(),
 						paId: '4482093',
 						homeTeam: {
 							name: 'Torino',
@@ -45,7 +47,9 @@ export const initialDays: FootballMatches = [
 					},
 					{
 						kind: 'Fixture',
-						dateTime: new Date('2022-01-01T19:45:00Z'),
+						dateTimeISOString: new Date(
+							'2022-01-01T19:45:00Z',
+						).toISOString(),
 						paId: '4482890',
 						homeTeam: 'Auxerre',
 						awayTeam: 'St Etienne',
@@ -60,7 +64,9 @@ export const initialDays: FootballMatches = [
 				matches: [
 					{
 						kind: 'Result',
-						dateTime: new Date('2022-01-01T20:00:00Z'),
+						dateTimeISOString: new Date(
+							'2022-01-01T20:00:00Z',
+						).toISOString(),
 						paId: '4482835',
 						homeTeam: {
 							name: 'Las Palmas',
@@ -82,7 +88,9 @@ export const initialDays: FootballMatches = [
 				matches: [
 					{
 						kind: 'Result',
-						dateTime: new Date('2022-01-01T20:00:00Z'),
+						dateTimeISOString: new Date(
+							'2022-01-01T20:00:00Z',
+						).toISOString(),
 						paId: '4482836',
 						homeTeam: {
 							name: 'Brighton & Hove Albion Women',
@@ -103,7 +111,7 @@ export const initialDays: FootballMatches = [
 
 export const moreDays: FootballMatches = [
 	{
-		date: new Date('2022-01-05T00:00:00Z'),
+		dateISOString: new Date('2022-01-05T00:00:00Z').toISOString(),
 		competitions: [
 			{
 				id: '635',
@@ -113,7 +121,9 @@ export const moreDays: FootballMatches = [
 				matches: [
 					{
 						kind: 'Fixture',
-						dateTime: new Date('2022-01-05T19:45:00Z'),
+						dateTimeISOString: new Date(
+							'2022-01-05T19:45:00Z',
+						).toISOString(),
 						paId: '4482890',
 						homeTeam: 'Juventus',
 						awayTeam: 'Roma',

dotcom-rendering/package.json

@@ -41,16 +41,16 @@
 		"@guardian/bridget": "8.1.0",
 		"@guardian/browserslist-config": "6.1.0",
 		"@guardian/cdk": "50.13.0",
-		"@guardian/commercial": "25.0.0",
+		"@guardian/commercial": "25.1.0",
 		"@guardian/core-web-vitals": "7.0.0",
 		"@guardian/eslint-config": "7.0.1",
 		"@guardian/eslint-config-typescript": "9.0.1",
 		"@guardian/identity-auth": "6.0.1",
 		"@guardian/identity-auth-frontend": "8.1.0",
-		"@guardian/libs": "21.4.0",
+		"@guardian/libs": "22.0.0",
 		"@guardian/ophan-tracker-js": "2.2.5",
 		"@guardian/react-crossword": "2.0.2",
-		"@guardian/react-crossword-next": "npm:@guardian/react-crossword@0.0.0-canary-20250226111729",
+		"@guardian/react-crossword-next": "npm:@guardian/react-crossword@3.0.0",
 		"@guardian/shimport": "1.0.2",
 		"@guardian/source": "8.0.0",
 		"@guardian/source-development-kitchen": "12.0.0",

dotcom-rendering/playwright/tests/braze.e2e.spec.ts

@@ -33,7 +33,7 @@ const expectLocalStorageItem = (
 };
 
 test.describe('Braze messaging', () => {
-	test('records in local storage that the Braze SDK was loaded', async ({
+	test.skip('records in local storage that the Braze SDK was loaded', async ({
 		context,
 		page,
 	}) => {
@@ -73,7 +73,7 @@ test.describe('Braze messaging', () => {
 		await expectLocalStorageItem(page, 'gu.brazeUserSet', 'true');
 	});
 
-	test('clears Braze data when a user logs out', async ({
+	test.skip('clears Braze data when a user logs out', async ({
 		context,
 		page,
 	}) => {

dotcom-rendering/playwright/tests/ophan.e2e.spec.ts

@@ -19,7 +19,13 @@ const articleUrl =
 const frontUrl = 'https://www.theguardian.com/uk';
 
 test.describe('Ophan requests', () => {
-	test('should make an IMPRESSION request on an article when consent is rejected', async ({
+	/**
+	 * Why is this test skipped?
+	 *
+	 * Since the launch of Guardian Ad Lite, rejecting all cookies takes the user to the "Consent or Pay" page,
+	 * instead of removing the cookie banner. This new behaviour is causing the below test to fail.
+	 */
+	test.skip('should make an IMPRESSION request on an article when consent is rejected', async ({
 		page,
 		context,
 	}) => {

dotcom-rendering/scripts/deploy/riff-raff.yaml

@@ -78,6 +78,8 @@ deployments:
       cloudFormationStackByTags: false
       cloudFormationStackName: tag-page-rendering
       amiParameter: AMITagpagerendering
+      templateParameters:
+        tagpagerenderingPrivateSubnets: /devx/bigger/private/subnets
   # tag-page-rendering autoscaling
   tag-page-rendering:
     type: autoscaling

dotcom-rendering/scripts/env/check-deps.js

@@ -12,9 +12,7 @@ if (pkg.devDependencies) {
  * We don't check packages that are not semver-compatible
  * @type {RegExp[]}
  */
-const exceptions = /** @type {const} */ ([
-	/npm:@guardian\/react-crossword@0.0.0-canary/,
-]);
+const exceptions = /** @type {const} */ ([/npm:@guardian\/react-crossword@/]);
 
 const mismatches = Object.entries(pkg.dependencies)
 	.filter(