Merge branch 'develop'

.github/workflows/main.yml

@@ -0,0 +1,18 @@
+name: Merge master changes to develop
+on:
+  push:
+    branches:
+      - 'master'
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge master -> develop
+        uses: devmasx/merge-branch@v1.3.1
+        with:
+          type: now
+          from_branch: master
+          target_branch: develop
+          github_token: ${{ github.token }}

package-lock.json

@@ -7862,9 +7862,9 @@
       }
     },
     "mongoose": {
-      "version": "5.11.8",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.8.tgz",
-      "integrity": "sha512-RRfrYLg7pyuyx7xu5hwadjIZZJB9W2jqIMkL1CkTmk/uOCX3MX2tl4BVIi2rJUtgMNwn6dy3wBD3soB8I9Nlog==",
+      "version": "5.11.9",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.9.tgz",
+      "integrity": "sha512-lmG6R64jtGGxqtn88BkkY+v470LUfGgyTKUyjswQ5c01GNgQvxA0kQd8h+tm0hZb639hKNRxL9ZBQlLleUpuIQ==",
       "requires": {
         "@types/mongodb": "^3.5.27",
         "bson": "^1.1.4",
@@ -8668,9 +8668,9 @@
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "postcss": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.1.tgz",
-      "integrity": "sha512-RhsqOOAQzTgh1UB/IZdca7F9WDb7SUCR2Vnv1x7DbvuuggQIpoDwjK+q0rzoPffhYvWNKX5JSwS4so4K3UC6vA==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.2.tgz",
+      "integrity": "sha512-HM1NDNWLgglJPQQMNwvLxgH2KcrKZklKLi/xXYIOaqQB57p/pDWEJNS83PVICYsn1Dg/9C26TiejNr422/ePaQ==",
       "dev": true,
       "requires": {
         "colorette": "^1.2.1",
@@ -9953,9 +9953,9 @@
       }
     },
     "react-calendar": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-3.2.1.tgz",
-      "integrity": "sha512-nuS2o4FLGdVSNLniP3JatbYDSgp4hVRG2lWFmhx79qwm+XawmziF3aOjixCW6pxdBU36CagvGaGukKTfPfOOwg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-3.3.0.tgz",
+      "integrity": "sha512-Mdzchiidfch0Bfqg+7oQ938PRrHJKK9aMCDdfDmJ5+0qhmvonvaMn1mDHq9ppCpjdrqYXmnUW+7C6PhrhJ14ZQ==",
       "requires": {
         "@wojtekmaj/date-utils": "^1.0.2",
         "get-user-locale": "^1.2.0",

package.json

@@ -13,12 +13,12 @@
     "date-fns": "^2.16.1",
     "date-fns-tz": "^1.0.12",
     "ics": "^2.26.2",
-    "mongoose": "^5.11.8",
+    "mongoose": "^5.11.9",
     "next": "^10.0.4",
     "next-iron-session": "^4.1.10",
     "p-retry": "^4.2.0",
     "react": "^17.0.1",
-    "react-calendar": "^3.2.1",
+    "react-calendar": "^3.3.0",
     "react-dom": "^17.0.1",
     "ts-jest": "^26.4.4",
     "uuid": "^8.3.2"
@@ -31,7 +31,7 @@
     "@types/react-calendar": "^3.1.2",
     "@types/uuid": "^8.3.0",
     "jest": "^26.6.3",
-    "postcss": "^8.2.1",
+    "postcss": "^8.2.2",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-preset-env": "^6.7.0",
     "swr": "^0.3.11",