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

Author: KaliedaRik

.github/dependabot.yml

@@ -10,11 +10,6 @@ updates:
     schedule:
       interval: 'daily'
     ignore:
-      # The version of the aws-cdk[-lib] & constructs dependencies should match
-      # exactly the version specified by @guardian/cdk
-      - 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.
@@ -29,6 +24,12 @@ updates:
       babel:
         patterns:
           - '*babel*'
+      cdk:
+        patterns:
+          - '@guardian/cdk'
+          - 'aws-cdk'
+          - 'aws-cdk-lib'
+          - 'constructs'
       eslint:
         patterns:
           - '*eslint*'

dotcom-rendering/package.json

@@ -46,8 +46,7 @@
 		"@guardian/support-dotcom-components": "7.7.0",
 		"@guardian/tsconfig": "0.2.0",
 		"@playwright/test": "1.52.0",
-		"@sentry/browser": "7.75.1",
-		"@sentry/integrations": "7.75.1",
+		"@sentry/browser": "10.3.0",
 		"@storybook/addon-essentials": "8.6.14",
 		"@storybook/addon-interactions": "8.6.14",
 		"@storybook/addon-webpack5-compiler-swc": "3.0.0",

dotcom-rendering/src/client/sentryLoader/sentry.ts

@@ -1,6 +1,5 @@
 import * as Sentry from '@sentry/browser';
 import type { BrowserOptions } from '@sentry/browser';
-import { CaptureConsole } from '@sentry/integrations';
 import { BUILD_VARIANT, dcrJavascriptBundle } from '../../../webpack/bundles';
 import type { ReportError } from '../../types/sentry';
 
@@ -44,7 +43,7 @@ Sentry.init({
 	allowUrls,
 	dsn: dcrSentryDsn,
 	environment: stage || 'DEV',
-	integrations: [new CaptureConsole({ levels: ['error'] })],
+	integrations: [Sentry.captureConsoleIntegration({ levels: ['error'] })],
 	maxBreadcrumbs: 50,
 	// sampleRate: // We use Math.random in init.ts to sample errors
 });

dotcom-rendering/src/components/FollowWrapper.importable.tsx

@@ -26,7 +26,15 @@ export const FollowWrapper = ({ id, displayName }: Props) => {
 	const isMyGuardianEnabled = useIsMyGuardianEnabled();
 	const isBridgetCompatible = useIsBridgetCompatible('2.5.0');
 
-	isBridgetCompatible && isMyGuardianEnabled && setShowFollowTagButton(true);
+	const isNotInBlockList = (tagId: string) => {
+		const blockList = ['profile/anas-al-sharif'];
+		return !blockList.includes(tagId);
+	};
+
+	isBridgetCompatible &&
+		isMyGuardianEnabled &&
+		isNotInBlockList(id) &&
+		setShowFollowTagButton(true);
 
 	useEffect(() => {
 		const topic = new Topic({

dotcom-rendering/src/components/ScrollableHighlights.stories.tsx

@@ -1,3 +1,4 @@
+import { breakpoints } from '@guardian/source/foundations';
 import type { Meta, StoryObj } from '@storybook/react';
 import { defaultCard, trails } from '../../fixtures/manual/highlights-trails';
 import { ScrollableHighlights } from './ScrollableHighlights.importable';
@@ -6,6 +7,16 @@ import { Section } from './Section';
 const meta: Meta<typeof ScrollableHighlights> = {
 	title: 'Components/Masthead/ScrollableHighlights',
 	component: ScrollableHighlights,
+	parameters: {
+		chromatic: {
+			viewports: [
+				breakpoints.mobile,
+				breakpoints.mobileLandscape,
+				breakpoints.tablet,
+				breakpoints.wide,
+			],
+		},
+	},
 	render: ({ ...args }) => (
 		<Section
 			shouldCenter={true}

dotcom-rendering/src/components/marketing/banners/common/BannerWrapper.tsx

@@ -49,6 +49,8 @@ function getComponentIds(bannerId: BannerId) {
 		reminderCta: `${bannerId} : reminder-cta`,
 		reminderSet: `${bannerId} : reminder-set`,
 		reminderClose: `${bannerId} : reminder-close`,
+		collapse: `${bannerId} : collapse`,
+		expand: `${bannerId} : expand`,
 	};
 }
 
@@ -298,6 +300,8 @@ const withBannerData =
 		const onCloseClick = clickHandlerFor(componentIds.close, true);
 		const onNotNowClick = clickHandlerFor(componentIds.notNow, true);
 		const onSignInClick = clickHandlerFor(componentIds.signIn, false);
+		const onCollapseClick = clickHandlerFor(componentIds.collapse, false);
+		const onExpandClick = clickHandlerFor(componentIds.expand, false);
 
 		try {
 			const renderedContent = content && buildRenderedContent(content);
@@ -316,6 +320,8 @@ const withBannerData =
 					onCloseClick,
 					onSignInClick,
 					onNotNowClick,
+					onCollapseClick,
+					onExpandClick,
 					content: {
 						mainContent: renderedContent,
 						mobileContent: renderedMobileContent ?? renderedContent,

dotcom-rendering/src/components/marketing/banners/common/types.tsx

@@ -63,6 +63,8 @@ export interface BannerRenderProps {
 	onNotNowClick: () => void;
 	onCloseClick: () => void;
 	onSignInClick?: () => void;
+	onCollapseClick: () => void;
+	onExpandClick: () => void;
 	reminderTracking: ContributionsReminderTracking;
 	content: BannerTextContent;
 	countryCode?: string;