Merge branch 'main' into sync-b011783f

Author: krisfremen

package.json

@@ -93,11 +93,7 @@
     "postcss-flexbugs-fixes": "4.2.1",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.5.1",
-<<<<<<< HEAD
-    "react-server-dom-webpack": "^19.2.5",
-=======
     "react-server-dom-webpack": "^19.3.0",
->>>>>>> b011783fcc7a39da9eefd4274147a1444860a12b
     "reading-time": "^1.2.0",
     "remark": "^12.0.1",
     "remark-external-links": "^7.0.0",

yarn.lock

@@ -7120,17 +7120,10 @@ react-remove-scroll@2.5.5:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-<<<<<<< HEAD
-react-server-dom-webpack@^19.2.5:
-  version "19.2.5"
-  resolved "https://registry.yarnpkg.com/react-server-dom-webpack/-/react-server-dom-webpack-19.2.5.tgz#b16c0bd15e6cb469bab952f367f8ceaaebe11206"
-  integrity sha512-bYhdd2cZJhXHqyJBoloYaJrn8MrL9Egf3ZZVn0OrIODCCORm2goFD7C+xszf6xgfsSJi0rtgB/ichcuHfkJ4yQ==
-=======
 react-server-dom-webpack@^19.3.0:
   version "19.3.0"
   resolved "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.3.0.tgz#f30eaac50578db6f9aa5a38ece7c28d17de05271"
   integrity sha512-ymt9RkvWtW4OpIhWf1wj4u5CxnBaVbDCkz/bw3/QFmOE7+/wg8C30uiJ/QqkEdWn/UqT5c7/rOUW/eWYMwceCg==
->>>>>>> b011783fcc7a39da9eefd4274147a1444860a12b
   dependencies:
     acorn-loose "^8.3.0"
     neo-async "^2.6.1"