Merge pull request #13571 from guardian/crossword-entries-schema

Bump to V3 @guardian/react-crossword: Fix entries schema

Author: DanielCliftonGuardian

dotcom-rendering/package.json

@@ -50,7 +50,7 @@
 		"@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-20250307143039",
+		"@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/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(

dotcom-rendering/src/layouts/CrosswordLayout.tsx

@@ -267,66 +267,89 @@ export const CrosswordLayout = (props: Props) => {
 									/>
 								</GridItem>
 							)}
-							<GridItem area="body" element="article">
-								<ArticleContainer format={format}>
-									<ArticleBody
-										format={format}
-										blocks={article.blocks}
-										host={host}
-										pageId={article.pageId}
-										webTitle={article.webTitle}
-										ajaxUrl={article.config.ajaxUrl}
-										abTests={article.config.abTests}
-										switches={article.config.switches}
-										isSensitive={article.config.isSensitive}
-										isAdFreeUser={article.isAdFreeUser}
-										sectionId={article.config.section}
-										shouldHideReaderRevenue={
-											article.shouldHideReaderRevenue
-										}
-										tags={article.tags}
-										isPaidContent={
-											!!article.config.isPaidContent
-										}
-										contributionsServiceUrl={
-											contributionsServiceUrl
-										}
-										contentType={article.contentType}
-										isPreview={article.config.isPreview}
-										idUrl={article.config.idUrl ?? ''}
-										isDev={!!article.config.isDev}
-										keywordIds={article.config.keywordIds}
-										tableOfContents={
-											article.tableOfContents
-										}
-										lang={article.lang}
-										isRightToLeftLang={
-											article.isRightToLeftLang
-										}
-										editionId={article.editionId}
-									/>
-								</ArticleContainer>
-							</GridItem>
-							<GridItem area="right-column">
-								<RightColumn showFrom="wide">
-									<div
-										css={css`
-											margin-top: ${remSpace[3]};
-										`}
-									>
-										{renderAds ? (
-											<AdSlot
-												position="right"
-												display={format.display}
-												isPaidContent={isPaidContent}
+							{Boolean(article.crossword?.entries.length) && (
+								<>
+									<GridItem area="body" element="article">
+										<ArticleContainer format={format}>
+											<ArticleBody
+												format={format}
+												blocks={article.blocks}
+												host={host}
+												pageId={article.pageId}
+												webTitle={article.webTitle}
+												ajaxUrl={article.config.ajaxUrl}
+												abTests={article.config.abTests}
+												switches={
+													article.config.switches
+												}
+												isSensitive={
+													article.config.isSensitive
+												}
+												isAdFreeUser={
+													article.isAdFreeUser
+												}
+												sectionId={
+													article.config.section
+												}
 												shouldHideReaderRevenue={
 													article.shouldHideReaderRevenue
 												}
+												tags={article.tags}
+												isPaidContent={
+													!!article.config
+														.isPaidContent
+												}
+												contributionsServiceUrl={
+													contributionsServiceUrl
+												}
+												contentType={
+													article.contentType
+												}
+												isPreview={
+													article.config.isPreview
+												}
+												idUrl={
+													article.config.idUrl ?? ''
+												}
+												isDev={!!article.config.isDev}
+												keywordIds={
+													article.config.keywordIds
+												}
+												tableOfContents={
+													article.tableOfContents
+												}
+												lang={article.lang}
+												isRightToLeftLang={
+													article.isRightToLeftLang
+												}
+												editionId={article.editionId}
 											/>
-										) : null}
-									</div>
-								</RightColumn>
-							</GridItem>
+										</ArticleContainer>
+									</GridItem>
+									<GridItem area="right-column">
+										<RightColumn showFrom="wide">
+											<div
+												css={css`
+													margin-top: ${remSpace[3]};
+												`}
+											>
+												{renderAds ? (
+													<AdSlot
+														position="right"
+														display={format.display}
+														isPaidContent={
+															isPaidContent
+														}
+														shouldHideReaderRevenue={
+															article.shouldHideReaderRevenue
+														}
+													/>
+												) : null}
+											</div>
+										</RightColumn>
+									</GridItem>
+								</>
+							)}
 						</CrosswordGrid>
 					</div>
 				</Section>

dotcom-rendering/src/model/article-schema.json

@@ -492,13 +492,7 @@
                 },
                 "entries": {
                     "type": "array",
-                    "items": [
-                        {
-                            "$ref": "#/definitions/CAPIEntry"
-                        }
-                    ],
-                    "minItems": 1,
-                    "additionalItems": {
+                    "items": {
                         "$ref": "#/definitions/CAPIEntry"
                     }
                 },
@@ -4220,13 +4214,7 @@
                         },
                         "entries": {
                             "type": "array",
-                            "items": [
-                                {
-                                    "$ref": "#/definitions/CAPIEntry"
-                                }
-                            ],
-                            "minItems": 1,
-                            "additionalItems": {
+                            "items": {
                                 "$ref": "#/definitions/CAPIEntry"
                             }
                         },

dotcom-rendering/src/model/block-schema.json

@@ -3707,13 +3707,7 @@
                         },
                         "entries": {
                             "type": "array",
-                            "items": [
-                                {
-                                    "$ref": "#/definitions/CAPIEntry"
-                                }
-                            ],
-                            "minItems": 1,
-                            "additionalItems": {
+                            "items": {
                                 "$ref": "#/definitions/CAPIEntry"
                             }
                         },