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.

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

Dependencies Update - October 2020 #63

Merged
merged 6 commits into from
Oct 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
labels:
- "dependencies"
80 changes: 40 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,66 +23,66 @@
"wait-on:mock-server": "wait-on http://localhost:9000/healthcheck"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@babel/plugin-transform-runtime": "^7.11.5",
"@babel/preset-env": "^7.11.5",
"@babel/preset-react": "^7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@babel/runtime": "^7.12.0",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-proposal-optional-chaining": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.1",
"@babel/preset-env": "^7.12.1",
"@babel/preset-react": "^7.12.1",
"@babel/preset-typescript": "^7.12.1",
"@babel/runtime": "^7.12.1",
"@emotion/babel-preset-css-prop": "^10.0.27",
"@guardian/types": "^0.4.5",
"@guardian/types": "^0.5.2",
"@types/compression": "^1.7.0",
"@types/cookie-parser": "^1.4.2",
"@types/express": "^4.17.8",
"@types/jest": "^26.0.13",
"@types/jest": "^26.0.15",
"@types/jsonwebtoken": "^8.5.0",
"@types/ms": "^0.7.31",
"@types/node": "^14.10.1",
"@types/node": "^14.14.5",
"@types/node-fetch": "^2.5.7",
"@types/react": "^16.9.49",
"@types/react": "^16.9.53",
"@types/react-dom": "^16.9.8",
"@types/react-router-dom": "^5.1.5",
"@types/react-router-dom": "^5.1.6",
"@types/react-test-renderer": "^16.9.3",
"@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0",
"assets-webpack-plugin": "^5.1.2",
"babel-jest": "^26.3.0",
"@typescript-eslint/eslint-plugin": "^4.6.0",
"@typescript-eslint/parser": "^4.6.0",
"assets-webpack-plugin": "^6.0.3",
"babel-jest": "^26.6.1",
"babel-loader": "^8.1.0",
"copy-node-modules": "^1.1.1",
"core-js": "^3.6.5",
"cypress": "^5.1.0",
"eslint": "^7.9.0",
"eslint-config-prettier": "^6.11.0",
"cypress": "^5.5.0",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.14.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.6",
"file-loader": "^6.1.0",
"eslint-plugin-react": "^7.21.5",
"file-loader": "^6.1.1",
"image-webpack-loader": "^7.0.1",
"jest": "^26.4.2",
"nodemon": "^2.0.4",
"prettier": "^2.1.1",
"jest": "^26.6.1",
"nodemon": "^2.0.6",
"prettier": "^2.1.2",
"react-test-renderer": "^16.13.1",
"snyk": "^1.393.1",
"ts-jest": "^26.3.0",
"typescript": "^4.0.2",
"snyk": "^1.420.1",
"ts-jest": "^26.4.3",
"typescript": "^4.0.5",
"wait-on": "^5.2.0",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack": "^5.3.0",
"webpack-cli": "^4.1.0",
"webpack-node-externals": "^2.5.2"
},
"dependencies": {
"@emotion/core": "^10.0.35",
"@guardian/consent-management-platform": "^4.3.0",
"@guardian/src-brand": "^2.3.0",
"@guardian/src-button": "^2.3.0",
"@guardian/src-checkbox": "^2.3.0",
"@guardian/src-foundations": "^2.3.0",
"@guardian/src-icons": "^2.3.0",
"@guardian/src-link": "^2.3.0",
"@guardian/src-radio": "^2.3.0",
"@guardian/src-text-input": "^2.3.0",
"aws-sdk": "^2.751.0",
"@guardian/src-brand": "^2.5.0",
"@guardian/src-button": "^2.5.0",
"@guardian/src-checkbox": "^2.5.0",
"@guardian/src-foundations": "^2.5.0",
"@guardian/src-icons": "^2.5.0",
"@guardian/src-link": "^2.5.0",
"@guardian/src-radio": "^2.5.0",
"@guardian/src-text-input": "^2.5.0",
"aws-sdk": "^2.779.0",
"compression": "^1.7.4",
"cookie-parser": "^1.4.5",
"emotion-theming": "^10.0.27",
Expand All @@ -92,7 +92,7 @@
"ms": "^2.1.2",
"node-fetch": "^2.6.1",
"ophan-tracker-js": "^1.3.22",
"query-string": "^6.13.2",
"query-string": "^6.13.6",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
Expand Down
9 changes: 8 additions & 1 deletion src/client/pages/ChangePasswordComplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { PageBodyText } from '@/client/components/PageBodyText';
import { PageBody } from '@/client/components/PageBody';
import { linkButton } from '@/client/styles/Shared';
import { SignInLayout } from '@/client/layouts/SignInLayout';
import { SvgArrowRightStraight } from '@guardian/src-icons';

export const ChangePasswordCompletePage = () => {
const { returnUrl } = useQuery();
Expand All @@ -23,7 +24,13 @@ export const ChangePasswordCompletePage = () => {
the button below to jump back to the Guardian.
</PageBodyText>
</PageBody>
<LinkButton css={linkButton} showIcon href={returnUrl}>
<LinkButton
css={linkButton}
iconSide="right"
nudgeIcon={true}
icon={<SvgArrowRightStraight />}
href={returnUrl}
>
Continue to The Guardian
</LinkButton>
</PageBox>
Expand Down
4 changes: 3 additions & 1 deletion src/shared/model/QueryParams.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export interface QueryParams {
import { StringifiableRecord } from 'query-string';

export interface QueryParams extends StringifiableRecord {
returnUrl: string;
clientId?: string;
emailVerified?: boolean;
Expand Down