Merge branch 'main' into fix-image-width-for-gallery-inline-images

Author: marjisound

.github/workflows/ar-chromatic.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Chromatic - Apps Rendering
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
-        uses: chromaui/action@v11.27.0
+        uses: chromaui/action@v13.3.0
 
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN__APPS_RENDERING }}

.github/workflows/dcr-chromatic.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Chromatic - DCR
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
-        uses: chromaui/action@v11.27.0
+        uses: chromaui/action@v13.3.0
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN__DOTCOM_RENDERING }}
           token: ${{ secrets.GITHUB_TOKEN }}

dotcom-rendering/package.json

@@ -32,13 +32,13 @@
 		"@guardian/bridget": "8.7.0",
 		"@guardian/browserslist-config": "6.1.0",
 		"@guardian/cdk": "61.4.0",
-		"@guardian/commercial-core": "27.1.0",
+		"@guardian/commercial-core": "28.0.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": "25.3.0",
+		"@guardian/libs": "26.0.0",
 		"@guardian/ophan-tracker-js": "2.3.2",
 		"@guardian/react-crossword": "6.3.0",
 		"@guardian/shimport": "1.0.2",

dotcom-rendering/src/components/Caption.tsx

@@ -210,7 +210,19 @@ const captionLink = css`
 	}
 `;
 
+const galleryCaptionHeadingReset = css`
+	h2 {
+		display: inline;
+		font-weight: bold;
+	}
+	h2::after {
+		content: '';
+		display: block;
+	}
+`;
+
 const galleryStyles = css`
+	${galleryCaptionHeadingReset}
 	${grid.column.centre};
 	${textSans14};
 

dotcom-rendering/src/components/SignInGate/gateDesigns/SignInGateAuxiaV2.tsx

@@ -407,6 +407,7 @@ const headerSection = css`
 		flex-direction: column-reverse;
 		gap: ${space[6]}px;
 		padding-right: ${space[4]}px;
+		max-height: 528px;
 		max-width: 100%;
 	}
 `;

dotcom-rendering/src/server/htmlPageTemplate.ts

@@ -79,13 +79,18 @@ export const htmlPageTemplate = (props: WebProps | AppProps): string => {
 	} = props;
 
 	const doNotIndex = (): boolean => {
-		const isDevelopment = process.env.GU_STAGE !== 'PROD';
+		if (process.env.GU_STAGE !== 'PROD') return true;
+		if (!canonicalUrl) return false;
 
-		const hasNoIndexPattern = Boolean(
-			canonicalUrl?.includes('tracking/commissioningdesk'),
-		);
+		const isAllowListed = [
+			'tracking/commissioningdesk/the-filter',
+			'tracking/commissioningdesk/filter-us',
+		].some((allowed) => canonicalUrl.includes(allowed));
 
-		return isDevelopment || hasNoIndexPattern;
+		return (
+			canonicalUrl.includes('tracking/commissioningdesk') &&
+			!isAllowListed
+		);
 	};
 
 	/**

package.json

@@ -24,7 +24,7 @@
 	},
 	"dependencies": {
 		"@guardian/prettier": "5.0.0",
-		"chromatic": "11.27.0",
+		"chromatic": "13.3.0",
 		"husky": "9.1.7",
 		"lint-staged": "15.2.0",
 		"prettier": "3.0.3",