Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update DCR Dependencies (workspaces prep) #3443

Merged
merged 16 commits into from
Sep 22, 2021
Merged

Update DCR Dependencies (workspaces prep) #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
32e08f8
Update dependecies for DCR (part 1)
OllysCoding Sep 13, 2021
b124ab3
Fix DCR linting issues after ESLint update
OllysCoding Sep 13, 2021
3150381
Upgrade DCR packages (part 2)
OllysCoding Sep 13, 2021
6d37a47
Update dev dependencies (part 1)
OllysCoding Sep 20, 2021
37cb50a
Fix typechecking errors
OllysCoding Sep 20, 2021
b6e43e6
Update dev dependencies (part 2)
OllysCoding Sep 21, 2021
1be4008
Pull upstream main
OllysCoding Sep 21, 2021
d3e1749
TEMPORARY: Keep node-fetch on 2.6.2 as 2.6.3 (latest) is buggy
OllysCoding Sep 21, 2021
c1572c7
Update dev dependencies (part 3)
OllysCoding Sep 21, 2021
feb22e7
Use @ts-expect-error to resolve typescript errors
OllysCoding Sep 21, 2021
2c79fb1
TEST: Add @types/vfile-messenger as dev dependency
OllysCoding Sep 21, 2021
7f6f94d
Revert "TEST: Add @types/vfile-messenger as dev dependency"
OllysCoding Sep 21, 2021
b8da318
Specify resolution for remark to resolve typescrip check issue for vf…
OllysCoding Sep 21, 2021
5bd15c4
Fix: Upgrade to node-fetch 2.6.4 to use latest (now fixed) version
OllysCoding Sep 21, 2021
5be0c87
Pull in main
OllysCoding Sep 22, 2021
b6b8757
Update src, @emotion/react, specify specific version for commericial-…
OllysCoding Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 18 additions & 17 deletions dotcom-rendering/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions dotcom-rendering/src/amp/components/topMeta/TopMetaLiveblog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ const Headline: React.FC<{
headlineText: string;
standfirst: string;
pillar: Theme;
starRating?: number;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason that star rating has been removed as part of this work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prop was not used anywhere within the topMetaLiveblog component, after updating, ESLint identified it and threw an error as unused prop.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Despite it being passed in by a parent component, it isn't used within the component, making it redundant)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, got it.

}> = ({ headlineText, pillar, standfirst }) => {
return (
<div css={fullWidth}>
Expand All @@ -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) => (
Expand Down
1 change: 1 addition & 0 deletions dotcom-rendering/src/amp/server/render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`);
}
Expand Down
1 change: 1 addition & 0 deletions dotcom-rendering/src/model/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions dotcom-rendering/src/web/components/ArticleHeadline.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export const ShowcaseInterview = () => (
theme: Pillar.Culture,
}}
tags={[]}
isShowcase={true}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering why this is getting removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While the data is passed into the component, the prop isn't actually consumed anywhere within it, meaning it's essentially redundant, causing ESLint to throw an error

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻

byline="Byline text"
/>
</div>
Expand Down Expand Up @@ -148,7 +147,6 @@ export const ShowcaseInterviewNobyline = () => (
theme: Pillar.Culture,
}}
tags={[]}
isShowcase={true}
byline=""
/>
</div>
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/src/web/components/ArticleHeadline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ type Props = {
format: Format;
byline?: string;
tags: TagType[];
isShowcase?: boolean; // Used for Interviews to change headline position
palette: Palette;
};

Expand Down
1 change: 1 addition & 0 deletions dotcom-rendering/src/web/components/elements/InteractiveBlockComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
);
Expand Down
1 change: 1 addition & 0 deletions dotcom-rendering/src/web/lib/braze/buildBrazeMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const maybeWipeUserData = async (
clearHasCurrentBrazeUser();
} catch (error) {
window.guardian.modules.sentry.reportError(
// @ts-expect-error
error,
'braze-maybeWipeUserData',
);
Expand Down
3 changes: 3 additions & 0 deletions dotcom-rendering/src/web/server/render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`);
}
Expand All @@ -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>`);
}
Expand Down Expand Up @@ -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>`);
}
Expand Down