Merge pull request #3443 from guardian/olly/prepare-workspaces-update…

…-dcr-deps Update DCR Dependencies (workspaces prep)
guardian · Sep 22, 2021 · 141ab07 · 141ab07
2 parents 2632c27 + b6b8757
commit 141ab07
Show file tree

Hide file tree

Showing 10 changed files with 3,968 additions and 6,218 deletions.
diff --git a/dotcom-rendering/package.json b/dotcom-rendering/package.json
@@ -41,22 +41,22 @@
     "@guardian/ab-core": "^2.0.0",
     "@guardian/ab-react": "^2.0.1",
     "@guardian/atoms-rendering": "^19.0.0",
-    "@guardian/braze-components": "^3.6.0",
     "@guardian/automat-contributions": "^0.4.1",
-    "@guardian/commercial-core": "^0.19.2",
+    "@guardian/braze-components": "^3.6.0",
+    "@guardian/commercial-core": "0.19.2",
     "@guardian/consent-management-platform": "~6.11.5",
     "@guardian/discussion-rendering": "^7.0.0",
     "@guardian/libs": "^2.0.0",
     "@guardian/shimport": "^1.0.2",
-    "@guardian/src-button": "^3.8.0",
-    "@guardian/src-checkbox": "^3.8.0",
-    "@guardian/src-ed-lines": "^3.8.0",
-    "@guardian/src-foundations": "^3.8.0",
-    "@guardian/src-icons": "^3.8.0",
-    "@guardian/src-link": "^3.8.0",
-    "@guardian/src-radio": "^3.8.0",
-    "@guardian/src-text-area": "^3.8.0",
-    "@guardian/src-text-input": "^3.8.0",
+    "@guardian/src-button": "^3.9.0",
+    "@guardian/src-checkbox": "^3.9.0",
+    "@guardian/src-ed-lines": "^3.9.0",
+    "@guardian/src-foundations": "^3.9.0",
+    "@guardian/src-icons": "^3.9.0",
+    "@guardian/src-link": "^3.9.0",
+    "@guardian/src-radio": "^3.9.0",
+    "@guardian/src-text-area": "^3.9.0",
+    "@guardian/src-text-input": "^3.9.0",
     "@guardian/types": "^7.0.0",
     "@hkdobrev/run-if-changed": "^0.3.1",
     "@loadable/component": "^5.14.1",
@@ -97,7 +97,7 @@
     "he": "^1.2.0",
     "html-minifier": "^4.0.0",
     "inquirer": "^5.2.0",
-    "jsdom": "^16.4.0",
+    "jsdom": "^16.7.0",
     "lodash.debounce": "^4.0.6",
     "lodash.escape": "^4.0.1",
     "lodash.get": "^4.4.2",
@@ -111,7 +111,7 @@
     "pretty-bytes": "^5.6.0",
     "reset-css": "^5.0.1",
     "sanitize-html": "^2.3.2",
-    "swr": "^0.5.5",
+    "swr": "^0.5.7",
     "web-vitals": "^2.1.0",
     "youtube-player": "^5.5.2"
   },
@@ -138,7 +138,7 @@
     "@storybook/builder-webpack5": "^6.3.6",
     "@storybook/manager-webpack5": "^6.3.6",
     "@storybook/react": "^6.3.6",
-    "@testing-library/dom": "^7.27.1",
+    "@testing-library/dom": "^7.31.2",
     "@testing-library/react": "^11.2.6",
     "@testing-library/user-event": "^12.8.1",
     "@types/amphtml-validator": "^1.0.1",
@@ -150,7 +150,7 @@
     "@types/google.analytics": "^0.0.41",
     "@types/he": "^1.1.1",
     "@types/html-minifier": "^4.0.0",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.24",
     "@types/jsdom": "^16.2.10",
     "@types/loadable__component": "^5.13.3",
     "@types/loadable__server": "^5.12.3",
@@ -201,7 +201,7 @@
     "load-json-file": "^6.2.0",
     "lodash.clonedeep": "^4.5.0",
     "mockdate": "^3.0.2",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.4",
     "nodemon": "^2.0.7",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
@@ -240,7 +240,8 @@
     "webpack-sources": "^2.2.0"
   },
   "resolutions": {
-    "@types/serve-static": "^1.13.9"
+    "@types/serve-static": "^1.13.9",
+    "remark": "11.0.2"
   },
   "jest": {
     "preset": "ts-jest/presets/js-with-ts",

diff --git a/dotcom-rendering/src/amp/components/topMeta/TopMetaLiveblog.tsx b/dotcom-rendering/src/amp/components/topMeta/TopMetaLiveblog.tsx
@@ -86,7 +86,6 @@ const Headline: React.FC<{
 	headlineText: string;
 	standfirst: string;
 	pillar: Theme;
-	starRating?: number;
 }> = ({ headlineText, pillar, standfirst }) => {
 	return (
 		<div css={fullWidth}>
@@ -110,7 +109,6 @@ export const TopMetaLiveblog: React.FC<{
 			headlineText={articleData.headline}
 			standfirst={articleData.standfirst}
 			pillar={pillar}
-			starRating={articleData.starRating}
 		/>
 
 		{articleData.mainMediaElements.map((element, i) => (

diff --git a/dotcom-rendering/src/amp/server/render.tsx b/dotcom-rendering/src/amp/server/render.tsx
@@ -73,6 +73,7 @@ export const render = ({ body }: express.Request, res: express.Response) => {
 		if (e instanceof TypeError) {
 			res.status(400).send(`<pre>${e.message}</pre>`);
 		} else {
+			// @ts-expect-error
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			res.status(500).send(`<pre>${e.message}</pre>`);
 		}

diff --git a/dotcom-rendering/src/model/validate.ts b/dotcom-rendering/src/model/validate.ts
@@ -19,6 +19,7 @@ export const validateAsCAPIType = (data: { [key: string]: any }): CAPIType => {
 	const isValid = validate(data);
 
 	if (!isValid) {
+		// @ts-expect-error
 		const url = data.webURL || 'unknown url';
 
 		throw new TypeError(

diff --git a/dotcom-rendering/src/web/components/ArticleHeadline.stories.tsx b/dotcom-rendering/src/web/components/ArticleHeadline.stories.tsx
@@ -97,7 +97,6 @@ export const ShowcaseInterview = () => (
 							theme: Pillar.Culture,
 						}}
 						tags={[]}
-						isShowcase={true}
 						byline="Byline text"
 					/>
 				</div>
@@ -148,7 +147,6 @@ export const ShowcaseInterviewNobyline = () => (
 							theme: Pillar.Culture,
 						}}
 						tags={[]}
-						isShowcase={true}
 						byline=""
 					/>
 				</div>

diff --git a/dotcom-rendering/src/web/components/ArticleHeadline.tsx b/dotcom-rendering/src/web/components/ArticleHeadline.tsx
@@ -15,7 +15,6 @@ type Props = {
 	format: Format;
 	byline?: string;
 	tags: TagType[];
-	isShowcase?: boolean; // Used for Interviews to change headline position
 	palette: Palette;
 };
 

diff --git a/dotcom-rendering/src/web/components/elements/InteractiveBlockComponent.tsx b/dotcom-rendering/src/web/components/elements/InteractiveBlockComponent.tsx
@@ -137,6 +137,7 @@ const setupWindowListeners = (iframe: HTMLIFrameElement) => {
 				message = JSON.parse(event.data);
 			} catch (e) {
 				window?.guardian?.modules?.sentry?.reportError(
+					// @ts-expect-error
 					e,
 					'Json parse Failed on in interactiveBlockComponent',
 				);

diff --git a/dotcom-rendering/src/web/lib/braze/buildBrazeMessages.ts b/dotcom-rendering/src/web/lib/braze/buildBrazeMessages.ts
@@ -33,6 +33,7 @@ const maybeWipeUserData = async (
 			clearHasCurrentBrazeUser();
 		} catch (error) {
 			window.guardian.modules.sentry.reportError(
+				// @ts-expect-error
 				error,
 				'braze-maybeWipeUserData',
 			);

diff --git a/dotcom-rendering/src/web/server/render.ts b/dotcom-rendering/src/web/server/render.ts
@@ -25,6 +25,7 @@ export const renderArticle = (
 
 		res.status(200).send(resp);
 	} catch (e) {
+		// @ts-expect-error
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		res.status(500).send(`<pre>${e.stack}</pre>`);
 	}
@@ -49,6 +50,7 @@ export const renderArticleJson = (
 
 		res.status(200).send(resp);
 	} catch (e) {
+		// @ts-expect-error
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		res.status(500).send(`<pre>${e.stack}</pre>`);
 	}
@@ -81,6 +83,7 @@ export const renderInteractive = (
 
 		res.status(200).send(resp);
 	} catch (e) {
+		// @ts-expect-error
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		res.status(500).send(`<pre>${e.stack}</pre>`);
 	}