Merge pull request #5881 from FinnStutzenstein/updateDeps

Update Dependencies

client/package-lock.json

@@ -5258,6 +5258,16 @@
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
             "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
         },
+        "cors": {
+            "version": "2.8.5",
+            "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+            "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+            "dev": true,
+            "requires": {
+                "object-assign": "^4",
+                "vary": "^1"
+            }
+        },
         "cosmiconfig": {
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
@@ -9657,16 +9667,6 @@
                     "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
                     "dev": true
                 },
-                "cors": {
-                    "version": "2.8.5",
-                    "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-                    "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-                    "dev": true,
-                    "requires": {
-                        "object-assign": "^4",
-                        "vary": "^1"
-                    }
-                },
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -9779,12 +9779,6 @@
                         "is-wsl": "^1.1.0"
                     }
                 },
-                "proxy-middleware": {
-                    "version": "0.15.0",
-                    "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz",
-                    "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=",
-                    "dev": true
-                },
                 "readable-stream": {
                     "version": "2.3.7",
                     "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -13135,6 +13129,12 @@
                 "ipaddr.js": "1.9.1"
             }
         },
+        "proxy-middleware": {
+            "version": "0.15.0",
+            "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz",
+            "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=",
+            "dev": true
+        },
         "prr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -15523,9 +15523,9 @@
             "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="
         },
         "tinymce": {
-            "version": "5.4.2",
+            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.4.2.tgz",
+            "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.6.0.tgz",
-            "integrity": "sha512-MRquvKxI28AiSn2ikypgJFD7LH4mQZLtgFn+yROF1bTFp92MdlLeGBrI38/O5mej3cvz27g3Pgr+3MShepbJ+w=="
+            "integrity": "sha512-f8LsyT80j8hD4wrL8Sac0DWDG5k10cDyykL/qkJ6kexn1KMt7w1ByrGlUm53XCYDqtavBA5snTU7odioMwSXSQ=="
         },
         "tmp": {
             "version": "0.2.1",
@@ -16439,9 +16439,9 @@
                     }
                 },
                 "fsevents": {
-                    "version": "2.3.1",
+                    "version": "2.3.2",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz",
+                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-                    "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==",
+                    "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
                     "dev": true,
                     "optional": true
                 },

client/package.json

@@ -78,7 +78,7 @@
         "pdfmake": "^0.1.68",
         "po2json": "^1.0.0-beta-2",
         "rxjs": "^6.6.2",
-        "tinymce": "5.4.2",
+        "tinymce": "5.6.0",
         "tslib": "^1.10.0",
         "tsparticles": "^1.18.11",
         "video.js": "^7.8.4",

server/requirements/production.txt

@@ -7,7 +7,7 @@ asgiref>=3.2.9
 
 # Requirements for OpenSlides in production in alphabetical order
 aioredis>=1.1.0,<1.3
-bleach>=1.5.0,<3.2
+bleach>=3.3.0
 daphne>=2.2,<2.5
 Django>=2.1,<2.3
 djangorestframework>=3.9.4,<3.10