Merge branch 'main' into add-posthog-analytics

# Conflicts:
#	yarn.lock

package.json

@@ -26,20 +26,20 @@
   },
   "dependencies": {
     "@fisch0920/use-dark-mode": "^2.4.0",
-    "@keyv/redis": "^2.2.3",
+    "@keyvhq/core": "^1.6.9",
+    "@keyvhq/redis": "^1.6.10",
     "classnames": "^2.3.1",
     "date-fns": "^2.28.0",
     "expiry-map": "^2.0.0",
     "fathom-client": "^3.4.1",
     "got": "^12.0.3",
     "isomorphic-unfetch": "^3.1.0",
-    "keyv": "^4.1.1",
     "lqip-modern": "^1.2.0",
     "next": "^12.1.1",
     "node-fetch": "^2.6.1",
-    "notion-client": "^6.5.0",
-    "notion-types": "^6.5.0",
-    "notion-utils": "^6.5.0",
+    "notion-client": "^6.7.0-alpha.1",
+    "notion-types": "^6.7.0-alpha.0",
+    "notion-utils": "^6.7.0-alpha.1",
     "p-map": "^5.3.0",
     "p-memoize": "^6.0.1",
     "posthog-js": "^1.20.2",
@@ -47,7 +47,7 @@
     "react-body-classname": "^1.3.1",
     "react-dom": "^17.0.2",
     "react-icons": "^4.3.1",
-    "react-notion-x": "^6.6.1",
+    "react-notion-x": "^6.7.0-alpha.1",
     "react-static-tweets": "^0.7.1",
     "react-use": "^17.3.2",
     "static-tweets": "^0.7.1"
@@ -67,5 +67,10 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.4.1",
     "typescript": "^4.4.4"
+  },
+  "overrides": {
+    "cacheable-request": {
+      "keyv": "npm:@keyvhq/core@~1.6.6"
+    }
   }
 }