Merge branch 'master' into ffmpeg-6

# Conflicts:
#	yarn.lock

Author: mifi

package.json

@@ -62,7 +62,7 @@
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "evergreen-ui": "^6.13.1",
-    "fast-xml-parser": "^4.2.4",
+    "fast-xml-parser": "^4.2.5",
     "framer-motion": "^9.0.3",
     "i18next-parser": "^7.6.0",
     "icon-gen": "^3.0.0",
@@ -113,7 +113,7 @@
     "json5": "^2.2.2",
     "lodash": "^4.17.19",
     "mime-types": "^2.1.14",
-    "semver": "^7.1.3",
+    "semver": "^7.5.2",
     "string-to-stream": "^1.1.1",
     "strtok3": "^6.0.0",
     "winston": "^3.8.1",

yarn.lock

@@ -4430,14 +4430,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-xml-parser@npm:^4.2.4":
-  version: 4.2.4
-  resolution: "fast-xml-parser@npm:4.2.4"
+"fast-xml-parser@npm:^4.2.5":
+  version: 4.2.5
+  resolution: "fast-xml-parser@npm:4.2.5"
   dependencies:
     strnum: ^1.0.5
   bin:
     fxparser: src/cli/cli.js
-  checksum: d3b4d0c0152c09f98def792769fca6bb3fa1d597f9745d9564451c239089bd86bdf573c9263b4944860028cb7edb81752d64399c1aff8b87c9225ecef96905f7
+  checksum: d32b22005504eeb207249bf40dc82d0994b5bb9ca9dcc731d335a1f425e47fe085b3cace3cf9d32172dd1a5544193c49e8615ca95b4bf95a4a4920a226b06d80
   languageName: node
   linkType: hard
 
@@ -6442,7 +6442,7 @@ __metadata:
     eslint-plugin-react-hooks: ^4.3.0
     evergreen-ui: ^6.13.1
     execa: ^7.1.1
-    fast-xml-parser: ^4.2.4
+    fast-xml-parser: ^4.2.5
     file-type: 16
     file-url: ^3.0.0
     framer-motion: ^9.0.3
@@ -6472,7 +6472,7 @@ __metadata:
     react-syntax-highlighter: ^15.4.3
     react-use: ^17.4.0
     scroll-into-view-if-needed: ^2.2.28
-    semver: ^7.1.3
+    semver: ^7.5.2
     sharp: ^0.30.5
     smpte-timecode: ^1.2.3
     sortablejs: ^1.13.0
@@ -8535,7 +8535,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7":
+"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7":
   version: 7.3.7
   resolution: "semver@npm:7.3.7"
   dependencies:
@@ -8546,6 +8546,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.5.2":
+  version: 7.5.3
+  resolution: "semver@npm:7.5.3"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 9d58db16525e9f749ad0a696a1f27deabaa51f66e91d2fa2b0db3de3e9644e8677de3b7d7a03f4c15bc81521e0c3916d7369e0572dbde250d9bedf5194e2a8a7
+  languageName: node
+  linkType: hard
+
 "semver@npm:~7.0.0":
   version: 7.0.0
   resolution: "semver@npm:7.0.0"