Merge branch 'main' into rjr-fix-video-main-media-poster-images

Author: jonathonherbert

.github/dependabot.yml

@@ -15,6 +15,12 @@ updates:
       - dependency-name: 'aws-cdk'
       - dependency-name: 'aws-cdk-lib'
       - dependency-name: 'constructs'
+      # The `check-node-versions` script enforces that this package is kept in
+      # sync with our Node major version, so we want dependabot to ignore major
+      # version updates, but still allow smaller updates.
+      - dependency-name: '@types/node'
+        update-types:
+          - 'version-update:semver-major'
 
     open-pull-requests-limit: 10
     groups:

.nvmrc

@@ -1 +1 @@
-22.14.0
+22.18.0

apps-rendering/package.json

@@ -68,7 +68,7 @@
 		"@types/html-webpack-plugin": "3.2.9",
 		"@types/jest": "29.5.14",
 		"@types/jsdom": "16.2.15",
-		"@types/node": "18.18.14",
+		"@types/node": "22.17.0",
 		"@types/react": "18.3.1",
 		"@types/react-dom": "18.3.0",
 		"@types/react-test-renderer": "18.3.0",
@@ -103,7 +103,7 @@
 		"tslib": "2.6.2",
 		"tsx": "4.6.2",
 		"typescript": "5.5.3",
-		"webpack": "5.99.7",
+		"webpack": "5.101.0",
 		"webpack-cli": "6.0.1",
 		"webpack-dev-server": "5.2.1",
 		"webpack-manifest-plugin": "5.0.0",

apps-rendering/riff-raff.yaml

@@ -12,7 +12,7 @@ templates:
             amiEncrypted: true
             amiTags:
                 # Keep the Node version in sync with `.nvmrc`
-                Recipe: apps-rendering-ARM-jammy-node-22.14.0
+                Recipe: apps-rendering-ARM-jammy-node-22.18.0
                 AmigoStage: PROD
 deployments:
     mobile-apps-rendering-cfn:

dotcom-rendering/.storybook/modes.ts

@@ -69,4 +69,8 @@ export const allModes = {
 		globalColourScheme: 'light',
 		viewport: breakpoints.leftCol,
 	},
+	'light wide': {
+		globalColourScheme: 'light',
+		viewport: breakpoints.wide,
+	},
 };

dotcom-rendering/Containerfile

@@ -1,6 +1,6 @@
 # This container is used in our CICD pipelines for running E2E and regression tests.
 # Keep the Node version in sync with `.nvmrc`
-FROM node:22.14.0-alpine
+FROM node:22.18.0-alpine
 
 WORKDIR /opt/app/dotcom-rendering/dotcom-rendering
 

dotcom-rendering/fixtures/config.js

@@ -48,7 +48,6 @@ module.exports = {
 			relatedContent: true,
 			thirdPartyEmbedTracking: true,
 			prebidOzone: true,
-			prebidAdYouLike: true,
 			mostViewedFronts: true,
 			abSignInGateMainControl: true,
 			ampPrebid: true,