Merge branch 'v2' into issue-346-Automatically_create_users_tutorials

client/package.json

@@ -33,16 +33,16 @@
     "@material-ui/core": "^4.10.0",
     "@material-ui/pickers": "^3.2.10",
     "axios": "^0.19.2",
-    "clsx": "^1.1.0",
+    "clsx": "^1.1.1",
     "file-saver": "^2.0.2",
     "formik": "^2.1.4",
     "generate-password": "^1.5.1",
     "github-markdown-css": "^4.0.0",
     "html-react-parser": "^0.10.5",
-    "i18next": "^19.4.4",
+    "i18next": "^19.4.5",
     "i18next-sync-fs-backend": "^1.1.1",
     "i18next-xhr-backend": "^3.2.2",
-    "mdi-material-ui": "^6.14.0",
+    "mdi-material-ui": "^6.16.0",
     "notistack": "^0.9.11",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -57,9 +57,9 @@
     "@craco/craco": "^5.6.4",
     "@types/file-saver": "^2.0.1",
     "@types/react": "^16.9.35",
-    "@types/react-dom": "^16.9.6",
+    "@types/react-dom": "^16.9.8",
     "@types/react-router": "^5.1.7",
-    "@types/react-router-dom": "^5.1.3",
+    "@types/react-router-dom": "^5.1.5",
     "@types/yup": "^0.28.0",
     "babel-loader": "^8.1.0",
     "babel-plugin-named-asset-import": "^0.3.6",

package.json

@@ -24,16 +24,16 @@
     "upgrade-pkg:server": "cd ./server && npm-upgrade"
   },
   "devDependencies": {
-    "@prettier/plugin-pug": "^1.3.0",
-    "@types/lodash": "^4.14.153",
+    "@prettier/plugin-pug": "^1.4.3",
+    "@types/lodash": "^4.14.154",
     "@types/luxon": "^1.22.0",
     "@types/markdown-it": "^10.0.1",
     "@types/node": "^13.13.2",
     "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.27.0",
+    "@typescript-eslint/parser": "^2.34.0",
     "cross-env": "^7.0.2",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-react": "^7.20.0",
     "jest-circus": "^26.0.1",
@@ -45,6 +45,6 @@
     "class-transformer": "^0.2.3",
     "lodash": "^4.17.15",
     "luxon": "^1.23.0",
-    "markdown-it": "^10.0.0"
+    "markdown-it": "^11.0.0"
   }
 }

server/package.json

@@ -25,12 +25,12 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@nestjs/common": "^7.0.9",
-    "@nestjs/core": "^7.0.8",
-    "@nestjs/mongoose": "^6.4.0",
+    "@nestjs/common": "^7.1.2",
+    "@nestjs/core": "^7.1.2",
+    "@nestjs/mongoose": "^7.0.1",
     "@nestjs/passport": "^7.0.0",
-    "@nestjs/platform-express": "^7.0.9",
-    "@nestjs/swagger": "^4.5.3",
+    "@nestjs/platform-express": "^7.1.2",
+    "@nestjs/swagger": "^4.5.9",
     "@typegoose/typegoose": "^7.0.0",
     "bcryptjs": "^2.4.3",
     "class-validator": "^0.12.2",
@@ -42,11 +42,11 @@
     "mongoose": "^5.9.11",
     "mongoose-autopopulate": "^0.12.2",
     "mongoose-field-encryption": "^3.0.4",
-    "nestjs-typegoose": "^7.1.16",
+    "nestjs-typegoose": "^7.1.26",
     "nodemailer": "^6.4.6",
     "passport": "^0.4.1",
     "passport-local": "^1.0.0",
-    "pug": "^2.0.4",
+    "pug": "^3.0.0",
     "puppeteer": "1.19.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
@@ -55,28 +55,28 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@nestjs/cli": "^7.1.2",
-    "@nestjs/schematics": "^7.0.0",
-    "@nestjs/testing": "^7.0.9",
+    "@nestjs/cli": "^7.2.0",
+    "@nestjs/schematics": "^7.0.1",
+    "@nestjs/testing": "^7.1.2",
     "@types/bcryptjs": "^2.4.2",
     "@types/express": "^4.17.4",
     "@types/express-session": "^1.17.0",
     "@types/jest": "^25.2.3",
     "@types/luxon": "^1.22.0",
     "@types/mongoose": "^5.7.21",
-    "@types/node": "^13.13.2",
+    "@types/node": "^14.0.6",
     "@types/nodemailer": "^6.4.0",
     "@types/passport-local": "^1.0.33",
     "@types/pug": "^2.0.4",
     "@types/puppeteer": "1.19.0",
     "@types/supertest": "^2.0.9",
     "env-cmd": "^10.1.0",
     "jest": "^25.5.4",
-    "mongodb-memory-server": "^6.5.2",
+    "mongodb-memory-server": "^6.6.1",
     "prettier": "^2.0.5",
     "supertest": "^4.0.2",
     "ts-jest": "^25.5.1",
-    "ts-loader": "^7.0.2",
+    "ts-loader": "^7.0.5",
     "tsconfig-paths": "^3.9.0"
   },
   "resolutions": {