Merge branch 'dev' into brian/um-16-clickhouse-support

package.json

@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@fontsource/inter": "4.5.7",
-    "@prisma/client": "3.15.2",
+    "@prisma/client": "4.0.0",
     "bcryptjs": "^2.4.3",
     "chalk": "^4.1.1",
     "chart.js": "^2.9.4",
@@ -80,7 +80,7 @@
     "jose": "2.0.5",
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.33",
-    "next": "12.2.0",
+    "next": "^12.2.0",
     "node-fetch": "^3.2.3",
     "npm-run-all": "^4.1.5",
     "prop-types": "^15.7.2",
@@ -118,7 +118,7 @@
     "postcss-preset-env": "7.4.3",
     "postcss-rtlcss": "^3.6.1",
     "prettier": "^2.6.2",
-    "prisma": "3.15.2",
+    "prisma": "4.0.0",
     "prompts": "2.4.2",
     "rollup": "^2.70.1",
     "rollup-plugin-terser": "^7.0.2",