Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.

1 files changed, 9 insertions, 9 deletions

diff --git a/package.json b/package.json
index 0bb51bbf6..09f1ec435 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "@github/webauthn-json": "^0.5.7",
     "@rails/ujs": "^6.1.7",
     "abortcontroller-polyfill": "^1.7.5",
-    "array-includes": "^3.1.5",
+    "array-includes": "^3.1.6",
     "atrament": "0.2.4",
     "arrow-key-navigation": "^1.2.0",
     "autoprefixer": "^9.8.8",
@@ -45,7 +45,7 @@
     "babel-plugin-preval": "^5.1.0",
     "babel-plugin-react-intl": "^6.2.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "blurhash": "^2.0.3",
+    "blurhash": "^2.0.4",
     "classnames": "^2.3.2",
     "cocoon-js-vanilla": "^1.3.0",
     "color-blend": "^3.0.1",
@@ -75,7 +75,7 @@
     "intl-relativeformat": "^6.4.3",
     "is-nan": "^1.3.2",
     "js-yaml": "^4.1.0",
-    "jsdom": "^20.0.1",
+    "jsdom": "^20.0.2",
     "lodash": "^4.17.21",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.5",
@@ -84,13 +84,13 @@
     "npmlog": "^7.0.1",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
-    "object.values": "^1.1.5",
+    "object.values": "^1.1.6",
     "path-complete-extname": "^1.0.0",
     "pg": "^8.5.0",
-    "postcss": "^8.4.18",
+    "postcss": "^8.4.19",
     "postcss-loader": "^3.0.0",
     "postcss-object-fit-images": "^1.1.2",
-    "promise.prototype.finally": "^3.1.3",
+    "promise.prototype.finally": "^3.1.4",
     "prop-types": "^15.8.1",
     "punycode": "^2.1.0",
     "react": "^16.14.0",
@@ -115,10 +115,10 @@
     "redis": "^4.0.6 <4.1.0",
     "redux": "^4.2.0",
     "redux-immutable": "^4.0.0",
-    "redux-thunk": "^2.4.1",
+    "redux-thunk": "^2.4.2",
     "regenerator-runtime": "^0.13.10",
     "requestidlecallback": "^0.3.0",
-    "reselect": "^4.1.6",
+    "reselect": "^4.1.7",
     "rimraf": "^3.0.2",
     "sass": "^1.55.0",
     "sass-loader": "^10.2.0",
@@ -165,7 +165,7 @@
     "stylelint": "^14.14.0",
     "stylelint-config-standard-scss": "^5.0.0",
     "webpack-dev-server": "^3.11.3",
-    "yargs": "^17.6.0"
+    "yargs": "^17.6.2"
   },
   "resolutions": {
     "kind-of": "^6.0.3"