Skip to content

Commit

Permalink
Upgrading dependencies (#291)
Browse files Browse the repository at this point in the history
  • Loading branch information
@antoinejaussoin
antoinejaussoin committed Sep 19, 2021
1 parent 4f16da0 commit 113a5f9
Show file tree
Hide file tree
Showing 5 changed files with 1,215 additions and 926 deletions.
72 changes: 36 additions & 36 deletions backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,44 @@
},
"dependencies": {
"@retrospected/common": "*",
"@sendgrid/mail": "^7.4.5",
"@sentry/node": "^6.8.0",
"@sendgrid/mail": "^7.4.6",
"@sentry/node": "^6.11.0",
"@types/bcryptjs": "^2.4.2",
"@types/connect-redis": "0.0.16",
"@types/crypto-js": "^4.0.1",
"@types/connect-redis": "0.0.17",
"@types/crypto-js": "^4.0.2",
"@types/dotenv": "^8.2.0",
"@types/express": "^4.17.12",
"@types/express": "^4.17.13",
"@types/express-mung": "^0.5.2",
"@types/express-rate-limit": "^5.1.2",
"@types/express-serve-static-core": "^4.17.22",
"@types/express-session": "^1.17.3",
"@types/jest": "^26.0.23",
"@types/lodash": "^4.14.170",
"@types/md5": "^2.3.0",
"@types/node": "^16.0.0",
"@types/node-fetch": "^2.5.10",
"@types/passport": "^1.0.6",
"@types/passport-github2": "^1.2.4",
"@types/passport-google-oauth": "^1.0.41",
"@types/passport-local": "^1.0.33",
"@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/md5": "^2.3.1",
"@types/node": "^16.4.14",
"@types/node-fetch": "^2.5.12",
"@types/passport": "^1.0.7",
"@types/passport-github2": "^1.2.5",
"@types/passport-google-oauth": "^1.0.42",
"@types/passport-local": "^1.0.34",
"@types/passport-microsoft": "^0.0.0",
"@types/passport-twitter": "^1.0.36",
"@types/random-words": "^1.1.1",
"@types/redis": "2.8.29",
"@types/passport-twitter": "^1.0.37",
"@types/random-words": "^1.1.2",
"@types/redis": "2.8.31",
"@types/shortid": "^0.0.29",
"@types/socket.io-redis": "1.0.27",
"@types/uuid": "^8.3.1",
"@typescript-eslint/eslint-plugin": "^4.28.1",
"@typescript-eslint/parser": "^4.28.1",
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
"bcryptjs": "^2.4.3",
"body-parser": "^1.19.0",
"chalk": "^4.1.1",
"chalk": "^4.1.2",
"connect-redis": "6.0.0",
"cross-env": "7.0.3",
"crypto-js": "^4.0.0",
"date-fns": "^2.22.1",
"crypto-js": "^4.1.1",
"date-fns": "^2.23.0",
"dotenv": "^10.0.0",
"eslint": "^7.30.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"express": "^4.17.1",
Expand All @@ -65,7 +65,7 @@
"md5": "^2.3.0",
"moment": "^2.29.1",
"node-fetch": "^2.6.1",
"nodemon": "^2.0.9",
"nodemon": "^2.0.12",
"passport": "^0.4.1",
"passport-github2": "^0.1.12",
"passport-google-auth": "^1.0.2",
Expand All @@ -75,24 +75,24 @@
"passport-okta-oauth20": "^1.0.1",
"passport-slack": "^0.0.7",
"passport-twitter": "^1.0.4",
"pg": "^8.6.0",
"pg": "^8.7.1",
"prettier": "^2.3.2",
"random-words": "^1.1.1",
"rate-limiter-flexible": "^2.2.2",
"rate-limiter-flexible": "^2.2.4",
"redis": "^3.1.2",
"rimraf": "^3.0.2",
"shortid": "^2.2.16",
"socket.io": "4.1.2",
"socket.io": "4.1.3",
"socket.io-redis": "6.1.1",
"stripe": "^8.160.0",
"ts-jest": "^27.0.3",
"ts-node": "^9.1.1",
"typeorm": "^0.2.34",
"stripe": "^8.168.0",
"ts-jest": "^27.0.4",
"ts-node": "^10.2.0",
"typeorm": "^0.2.36",
"uuid": "^8.3.2",
"yargs": "^17.0.1"
"yargs": "^17.1.0"
},
"resolutions": {
"@types/connect-redis": "0.0.16",
"@types/connect-redis": "0.0.17",
"@types/express-session": "1.17.3"
},
"nodemonConfig": {
Expand Down
4 changes: 0 additions & 4 deletions backend/src/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ function findDotEnvPath(): string | null {
const custom = path.resolve(current, '.env');
const example = path.resolve(current, '.env.example');
if (fs.existsSync(custom)) {
console.log('Found custom .env: ', custom);
return custom;
}
if (fs.existsSync(example)) {
console.log('Found example .env: ', example);
return example;
}
current = path.resolve(current, '..');
Expand Down Expand Up @@ -103,6 +101,4 @@ const config: BackendConfig = {
WS_MAX_BUFFER_SIZE: defaultsNumber('WS_MAX_BUFFER_SIZE', 10_000),
};

console.log('Config: ', config);

export default config;
55 changes: 28 additions & 27 deletions frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,46 @@
"license": "GNU GPLv3",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.4",
"@material-ui/data-grid": "^4.0.0-alpha.33",
"@material-ui/core": "^4.12.3",
"@material-ui/data-grid": "^4.0.0-alpha.35",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"@material-ui/lab": "^4.0.0-alpha.60",
"@material-ui/styles": "^4.11.4",
"@retrospected/common": "*",
"@sentry/browser": "^6.8.0",
"@sentry/browser": "^6.11.0",
"@stripe/react-stripe-js": "^1.4.1",
"@stripe/stripe-js": "^1.15.1",
"@stripe/stripe-js": "^1.16.0",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0",
"@testing-library/react-hooks": "^7.0.1",
"@types/crypto-js": "^4.0.1",
"@types/jest": "^26.0.23",
"@types/lodash": "^4.14.170",
"@types/md5": "^2.3.0",
"@types/node": "^16.0.0",
"@types/react": "^17.0.13",
"@types/react-beautiful-dnd": "^13.1.0",
"@types/react-color": "^3.0.4",
"@types/react-copy-to-clipboard": "^5.0.0",
"@types/react-dom": "^17.0.8",
"@types/react-helmet": "^6.1.1",
"@types/react-router-dom": "^5.1.7",
"@types/crypto-js": "^4.0.2",
"@types/jest": "^27.0.0",
"@types/lodash": "^4.14.172",
"@types/md5": "^2.3.1",
"@types/node": "^16.4.14",
"@types/react": "^17.0.17",
"@types/react-beautiful-dnd": "^13.1.1",
"@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/shortid": "^0.0.29",
"@types/socket.io-client": "^1.4.36",
"@types/styled-components": "^5.1.11",
"@types/styled-components": "^5.1.12",
"@types/uuid": "^8.3.1",
"bowser": "^2.11.0",
"core-js": "^3.15.2",
"crypto-js": "^4.0.0",
"date-fns": "^2.22.1",
"core-js": "^3.16.1",
"crypto-js": "^4.1.1",
"date-fns": "^2.23.0",
"flag-icon-css": "^3.5.0",
"http-proxy-middleware": "^2.0.1",
"isemail": "^3.2.0",
"lexorank": "^1.0.4",
"lodash": "^4.17.21",
"material-ui-chip-input": "^1.1.0",
"md5": "^2.3.0",
"notistack": "^1.0.9",
"notistack": "^1.0.10",
"prop-types": "^15.7.2",
"query-string": "^7.0.1",
"react": "^17.0.2",
Expand All @@ -55,14 +55,15 @@
"react-ga": "^3.3.0",
"react-giphy-searchbox": "^1.5.4",
"react-helmet": "^6.1.0",
"react-markdown": "^5.0.3",
"react-password-strength-bar": "^0.3.3",
"react-markdown": "^6.0.3",
"react-password-strength-bar": "^0.3.5",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3",
"react-social-login-buttons": "^3.4.0",
"recoil": "^0.3.1",
"react-social-login-buttons": "^3.5.0",
"recoil": "^0.4.0",
"rehype-raw": "^6.0.0",
"shortid": "^2.2.16",
"socket.io-client": "4.1.2",
"socket.io-client": "4.1.3",
"source-map-explorer": "^2.5.2",
"styled-components": "^5.3.0",
"typescript": "^4.3.5",
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/views/home/Encryption.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import grey from '@material-ui/core/colors/grey';
import Markdown from 'react-markdown/with-html';
import Markdown from 'react-markdown';
import rehypeRaw from 'rehype-raw';
import styled from 'styled-components';

const content = `
Expand Down Expand Up @@ -46,7 +47,7 @@ the key will be stored in local storage for the reason explained above.
export default function EncryptionDoc() {
return (
<Container>
<Markdown allowDangerousHtml>{content}</Markdown>
<Markdown rehypePlugins={[rehypeRaw as any]}>{content}</Markdown>
</Container>
);
}
Expand Down
Loading

0 comments on commit 113a5f9

Please sign in to comment.