Skip to content

Commit

Permalink
Upgrade dependencies & easier version bumping (#303)
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinejaussoin authored Sep 29, 2021
1 parent 9453f69 commit e879990
Show file tree
Hide file tree
Showing 7 changed files with 1,812 additions and 1,527 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Alpha Build'

on:
push:
branches: [v471/bugfix]
branches: [v472/deps]

jobs:
build:
Expand Down
42 changes: 21 additions & 21 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
},
"dependencies": {
"@retrospected/common": "*",
"@sendgrid/mail": "^7.4.6",
"@sentry/node": "^6.11.0",
"@sendgrid/mail": "^7.4.7",
"@sentry/node": "^6.13.2",
"@types/bcryptjs": "^2.4.2",
"@types/connect-redis": "0.0.17",
"@types/crypto-js": "^4.0.2",
Expand All @@ -26,10 +26,10 @@
"@types/express-rate-limit": "^5.1.3",
"@types/express-serve-static-core": "^4.17.24",
"@types/express-session": "^1.17.4",
"@types/jest": "^27.0.0",
"@types/lodash": "^4.14.172",
"@types/jest": "^27.0.2",
"@types/lodash": "^4.14.175",
"@types/md5": "^2.3.1",
"@types/node": "^16.4.14",
"@types/node": "^16.10.2",
"@types/node-fetch": "^2.5.12",
"@types/passport": "^1.0.7",
"@types/passport-github2": "^1.2.5",
Expand All @@ -38,37 +38,37 @@
"@types/passport-microsoft": "^0.0.0",
"@types/passport-twitter": "^1.0.37",
"@types/random-words": "^1.1.2",
"@types/redis": "2.8.31",
"@types/redis": "2.8.32",
"@types/shortid": "^0.0.29",
"@types/socket.io-redis": "1.0.27",
"@types/uuid": "^8.3.1",
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
"@typescript-eslint/eslint-plugin": "^4.32.0",
"@typescript-eslint/parser": "^4.32.0",
"bcryptjs": "^2.4.3",
"body-parser": "^1.19.0",
"chalk": "^4.1.2",
"connect-redis": "6.0.0",
"cross-env": "7.0.3",
"crypto-js": "^4.1.1",
"csurf": "^1.11.0",
"date-fns": "^2.23.0",
"date-fns": "^2.24.0",
"dotenv": "^10.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-prettier": "^4.0.0",
"express": "^4.17.1",
"express-mung": "^0.5.1",
"express-rate-limit": "^5.3.0",
"express-session": "^1.17.2",
"freemail": "^1.7.0",
"jest": "27.0.6",
"jest": "27.2.4",
"lexorank": "^1.0.4",
"lodash": "^4.17.21",
"md5": "^2.3.0",
"moment": "^2.29.1",
"node-fetch": "^2.6.1",
"nodemon": "^2.0.12",
"passport": "^0.4.1",
"nodemon": "^2.0.13",
"passport": "^0.5.0",
"passport-github2": "^0.1.12",
"passport-google-auth": "^1.0.2",
"passport-google-oauth": "^2.0.0",
Expand All @@ -78,20 +78,20 @@
"passport-slack": "^0.0.7",
"passport-twitter": "^1.0.4",
"pg": "^8.7.1",
"prettier": "^2.3.2",
"prettier": "^2.4.1",
"random-words": "^1.1.1",
"rate-limiter-flexible": "^2.2.4",
"rate-limiter-flexible": "^2.3.0",
"redis": "^3.1.2",
"rimraf": "^3.0.2",
"shortid": "^2.2.16",
"socket.io": "4.1.3",
"socket.io": "4.2.0",
"socket.io-redis": "6.1.1",
"stripe": "^8.168.0",
"ts-jest": "^27.0.4",
"ts-node": "^9.1.1",
"typeorm": "^0.2.36",
"stripe": "^8.178.0",
"ts-jest": "^27.0.5",
"ts-node": "^10.2.1",
"typeorm": "^0.2.37",
"uuid": "^8.3.2",
"yargs": "^17.1.0"
"yargs": "^17.2.1"
},
"resolutions": {
"@types/connect-redis": "0.0.17",
Expand Down
2 changes: 1 addition & 1 deletion backend/src/db/entities/UserIdentity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from 'typeorm';
import { AccountType, UserIdentity } from '@retrospected/common';
import UserEntity from './User';
import { UserIds } from 'src/utils';
import { UserIds } from '../../utils';

export const ALL_FIELDS: Array<keyof UserIdentityEntity> = [
'id',
Expand Down
6 changes: 4 additions & 2 deletions backend/src/email/emailSender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export async function sendResetPassword(
try {
await sendGrid.send(msg);
} catch (e) {
console.error('Send grid error: ', e, e.response.body);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
console.error('Send grid error: ', e, (e as any).response.body);
}
}

Expand Down Expand Up @@ -91,6 +92,7 @@ export async function sendSelfHostWelcome(
try {
await sendGrid.send(msg);
} catch (e) {
console.error('Send grid error: ', e, e.response.body);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
console.error('Send grid error: ', e, (e as any).response.body);
}
}
46 changes: 23 additions & 23 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@
"@material-ui/lab": "^4.0.0-alpha.60",
"@material-ui/styles": "^4.11.4",
"@retrospected/common": "*",
"@sentry/browser": "^6.11.0",
"@stripe/react-stripe-js": "^1.4.1",
"@stripe/stripe-js": "^1.16.0",
"@sentry/browser": "^6.13.2",
"@stripe/react-stripe-js": "^1.5.0",
"@stripe/stripe-js": "^1.18.0",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0",
"@testing-library/react-hooks": "^7.0.1",
"@testing-library/react": "^12.1.1",
"@testing-library/react-hooks": "^7.0.2",
"@types/crypto-js": "^4.0.2",
"@types/jest": "^27.0.0",
"@types/lodash": "^4.14.172",
"@types/jest": "^27.0.2",
"@types/lodash": "^4.14.175",
"@types/md5": "^2.3.1",
"@types/node": "^16.4.14",
"@types/react": "^17.0.17",
"@types/react-beautiful-dnd": "^13.1.1",
"@types/node": "^16.10.2",
"@types/react": "^17.0.24",
"@types/react-beautiful-dnd": "^13.1.2",
"@types/react-color": "^3.0.5",
"@types/react-copy-to-clipboard": "^5.0.1",
"@types/react-dom": "^17.0.9",
"@types/react-helmet": "^6.1.2",
"@types/react-router-dom": "^5.1.8",
"@types/react-router-dom": "^5.3.0",
"@types/shortid": "^0.0.29",
"@types/socket.io-client": "^1.4.36",
"@types/styled-components": "^5.1.12",
"@types/styled-components": "^5.1.14",
"@types/uuid": "^8.3.1",
"bowser": "^2.11.0",
"core-js": "^3.16.1",
"core-js": "^3.18.1",
"crypto-js": "^4.1.1",
"date-fns": "^2.23.0",
"date-fns": "^2.24.0",
"flag-icon-css": "^3.5.0",
"http-proxy-middleware": "^2.0.1",
"isemail": "^3.2.0",
Expand All @@ -50,23 +50,23 @@
"react-autosize-textarea": "^7.1.0",
"react-beautiful-dnd": "^13.1.0",
"react-color": "^2.19.3",
"react-copy-to-clipboard": "^5.0.3",
"react-copy-to-clipboard": "^5.0.4",
"react-dom": "^17.0.2",
"react-ga": "^3.3.0",
"react-giphy-searchbox": "^1.5.4",
"react-helmet": "^6.1.0",
"react-markdown": "^6.0.3",
"react-markdown": "^7.0.1",
"react-password-strength-bar": "^0.3.5",
"react-router-dom": "^5.2.0",
"react-router-dom": "^5.3.0",
"react-scripts": "^4.0.3",
"react-social-login-buttons": "^3.5.0",
"recoil": "^0.4.0",
"rehype-raw": "^6.0.0",
"react-social-login-buttons": "^3.5.1",
"recoil": "^0.4.1",
"rehype-raw": "^6.1.0",
"shortid": "^2.2.16",
"socket.io-client": "4.1.3",
"socket.io-client": "4.2.0",
"source-map-explorer": "^2.5.2",
"styled-components": "^5.3.0",
"typescript": "^4.3.5",
"styled-components": "^5.3.1",
"typescript": "^4.4.3",
"uuid": "^8.3.2",
"whatwg-fetch": "^3.6.2"
},
Expand Down
8 changes: 8 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"ts-node": {
"compilerOptions": {
"experimentalDecorators": true,
"emitDecoratorMetadata": true
}
}
}
Loading

0 comments on commit e879990

Please sign in to comment.