Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Update dependencies and refactor email handling

Bill Yang3d17b39be715
diff --git a/server/package-lock.json b/server/package-lock.json
index 92f9f2d2e..8fcdfbd36 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -17,6 +17,8 @@
"@fastify/static": "8.1.1",
"@maxmind/geoip2-node": "6.1.0",
"@mongodb-js/zstd": "^2.0.1",
+ "@react-email/components": "0.5.5",
+ "@react-email/tailwind": "1.2.2",
"@rybbit/shared": "file:../shared",
"better-auth": "1.3.1",
"bullmq": "^5.56.5",
@@ -32,6 +34,8 @@
"pg": "8.16.0",
"postgres": "3.4.5",
"psl": "^1.15.0",
+ "react": "19.2.0",
+ "react-dom": "19.2.0",
"resend": "^4.5.1",
"rrweb": "^2.0.0-alpha.11",
"sqlstring": "2.3.3",
@@ -48,6 +52,8 @@
"@types/node": "^20.14.8",
"@types/pg": "^8.15.1",
"@types/psl": "^1.1.3",
+ "@types/react": "^19.2.0",
+ "@types/react-dom": "^19.2.0",
"@types/sqlstring": "2.3.2",
"drizzle-kit": "0.31.1",
"esbuild": "^0.25.5",
@@ -2782,6 +2788,238 @@
"tslib": "^2.8.1"
}
},
+ "node_modules/@react-email/body": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/@react-email/body/-/body-0.1.0.tgz",
+ "integrity": "sha512-o1bcSAmDYNNHECbkeyceCVPGmVsYvT+O3sSO/Ct7apKUu3JphTi31hu+0Nwqr/pgV5QFqdoT5vdS3SW5DJFHgQ==",
+ "license": "MIT",
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/button": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@react-email/button/-/button-0.2.0.tgz",
+ "integrity": "sha512-8i+v6cMxr2emz4ihCrRiYJPp2/sdYsNNsBzXStlcA+/B9Umpm5Jj3WJKYpgTPM+aeyiqlG/MMI1AucnBm4f1oQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/code-block": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/@react-email/code-block/-/code-block-0.1.0.tgz",
+ "integrity": "sha512-jSpHFsgqnQXxDIssE4gvmdtFncaFQz5D6e22BnVjcCPk/udK+0A9jRwGFEG8JD2si9ZXBmU4WsuqQEczuZn4ww==",
+ "license": "MIT",
+ "dependencies": {
+ "prismjs": "^1.30.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/code-inline": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/@react-email/code-inline/-/code-inline-0.0.5.tgz",
+ "integrity": "sha512-MmAsOzdJpzsnY2cZoPHFPk6uDO/Ncpb4Kh1hAt9UZc1xOW3fIzpe1Pi9y9p6wwUmpaeeDalJxAxH6/fnTquinA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/column": {
+ "version": "0.0.13",
+ "resolved": "https://registry.npmjs.org/@react-email/column/-/column-0.0.13.tgz",
+ "integrity": "sha512-Lqq17l7ShzJG/d3b1w/+lVO+gp2FM05ZUo/nW0rjxB8xBICXOVv6PqjDnn3FXKssvhO5qAV20lHM6S+spRhEwQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/components": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/@react-email/components/-/components-0.5.5.tgz",
+ "integrity": "sha512-+utnip1DiXTq5TQKvL8qztWy0EC3L+qdRIeJkBZXJA4WGIukbaqimWCTBGIMW19Pj+1iKvDYk2JQHEQDLiq7uQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@react-email/body": "0.1.0",
+ "@react-email/button": "0.2.0",
+ "@react-email/code-block": "0.1.0",
+ "@react-email/code-inline": "0.0.5",
+ "@react-email/column": "0.0.13",
+ "@react-email/container": "0.0.15",
+ "@react-email/font": "0.0.9",
+ "@react-email/head": "0.0.12",
+ "@react-email/heading": "0.0.15",
+ "@react-email/hr": "0.0.11",
+ "@react-email/html": "0.0.11",
+ "@react-email/img": "0.0.11",
+ "@react-email/link": "0.0.12",
+ "@react-email/markdown": "0.0.15",
+ "@react-email/preview": "0.0.13",
+ "@react-email/render": "1.3.1",
+ "@react-email/row": "0.0.12",
+ "@react-email/section": "0.0.16",
+ "@react-email/tailwind": "1.2.2",
+ "@react-email/text": "0.1.5"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/components/node_modules/@react-email/render": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@react-email/render/-/render-1.3.1.tgz",
+ "integrity": "sha512-BOc/kanieEVyiuldFFvceriiBGBBVhe4JWWXCXE2ehLIqz+gSWD4rgCoXAGbJRnnVyyp4joPqK62bSfa88yonA==",
+ "license": "MIT",
+ "dependencies": {
+ "html-to-text": "^9.0.5",
+ "prettier": "^3.5.3",
+ "react-promise-suspense": "^0.3.4"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/container": {
+ "version": "0.0.15",
+ "resolved": "https://registry.npmjs.org/@react-email/container/-/container-0.0.15.tgz",
+ "integrity": "sha512-Qo2IQo0ru2kZq47REmHW3iXjAQaKu4tpeq/M8m1zHIVwKduL2vYOBQWbC2oDnMtWPmkBjej6XxgtZByxM6cCFg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/font": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npmjs.org/@react-email/font/-/font-0.0.9.tgz",
+ "integrity": "sha512-4zjq23oT9APXkerqeslPH3OZWuh5X4crHK6nx82mVHV2SrLba8+8dPEnWbaACWTNjOCbcLIzaC9unk7Wq2MIXw==",
+ "license": "MIT",
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/head": {
+ "version": "0.0.12",
+ "resolved": "https://registry.npmjs.org/@react-email/head/-/head-0.0.12.tgz",
+ "integrity": "sha512-X2Ii6dDFMF+D4niNwMAHbTkeCjlYYnMsd7edXOsi0JByxt9wNyZ9EnhFiBoQdqkE+SMDcu8TlNNttMrf5sJeMA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/heading": {
+ "version": "0.0.15",
+ "resolved": "https://registry.npmjs.org/@react-email/heading/-/heading-0.0.15.tgz",
+ "integrity": "sha512-xF2GqsvBrp/HbRHWEfOgSfRFX+Q8I5KBEIG5+Lv3Vb2R/NYr0s8A5JhHHGf2pWBMJdbP4B2WHgj/VUrhy8dkIg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/hr": {
+ "version": "0.0.11",
+ "resolved": "https://registry.npmjs.org/@react-email/hr/-/hr-0.0.11.tgz",
+ "integrity": "sha512-S1gZHVhwOsd1Iad5IFhpfICwNPMGPJidG/Uysy1AwmspyoAP5a4Iw3OWEpINFdgh9MHladbxcLKO2AJO+cA9Lw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/html": {
+ "version": "0.0.11",
+ "resolved": "https://registry.npmjs.org/@react-email/html/-/html-0.0.11.tgz",
+ "integrity": "sha512-qJhbOQy5VW5qzU74AimjAR9FRFQfrMa7dn4gkEXKMB/S9xZN8e1yC1uA9C15jkXI/PzmJ0muDIWmFwatm5/+VA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/img": {
+ "version": "0.0.11",
+ "resolved": "https://registry.npmjs.org/@react-email/img/-/img-0.0.11.tgz",
+ "integrity": "sha512-aGc8Y6U5C3igoMaqAJKsCpkbm1XjguQ09Acd+YcTKwjnC2+0w3yGUJkjWB2vTx4tN8dCqQCXO8FmdJpMfOA9EQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/link": {
+ "version": "0.0.12",
+ "resolved": "https://registry.npmjs.org/@react-email/link/-/link-0.0.12.tgz",
+ "integrity": "sha512-vF+xxQk2fGS1CN7UPQDbzvcBGfffr+GjTPNiWM38fhBfsLv6A/YUfaqxWlmL7zLzVmo0K2cvvV9wxlSyNba1aQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/markdown": {
+ "version": "0.0.15",
+ "resolved": "https://registry.npmjs.org/@react-email/markdown/-/markdown-0.0.15.tgz",
+ "integrity": "sha512-UQA9pVm5sbflgtg3EX3FquUP4aMBzmLReLbGJ6DZQZnAskBF36aI56cRykDq1o+1jT+CKIK1CducPYziaXliag==",
+ "license": "MIT",
+ "dependencies": {
+ "md-to-react-email": "^5.0.5"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/preview": {
+ "version": "0.0.13",
+ "resolved": "https://registry.npmjs.org/@react-email/preview/-/preview-0.0.13.tgz",
+ "integrity": "sha512-F7j9FJ0JN/A4d7yr+aw28p4uX7VLWs7hTHtLo7WRyw4G+Lit6Zucq4UWKRxJC8lpsUdzVmG7aBJnKOT+urqs/w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
"node_modules/@react-email/render": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/@react-email/render/-/render-1.0.6.tgz",
@@ -2814,6 +3052,54 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
+ "node_modules/@react-email/row": {
+ "version": "0.0.12",
+ "resolved": "https://registry.npmjs.org/@react-email/row/-/row-0.0.12.tgz",
+ "integrity": "sha512-HkCdnEjvK3o+n0y0tZKXYhIXUNPDx+2vq1dJTmqappVHXS5tXS6W5JOPZr5j+eoZ8gY3PShI2LWj5rWF7ZEtIQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/section": {
+ "version": "0.0.16",
+ "resolved": "https://registry.npmjs.org/@react-email/section/-/section-0.0.16.tgz",
+ "integrity": "sha512-FjqF9xQ8FoeUZYKSdt8sMIKvoT9XF8BrzhT3xiFKdEMwYNbsDflcjfErJe3jb7Wj/es/lKTbV5QR1dnLzGpL3w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/tailwind": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@react-email/tailwind/-/tailwind-1.2.2.tgz",
+ "integrity": "sha512-heO9Khaqxm6Ulm6p7HQ9h01oiiLRrZuuEQuYds/O7Iyp3c58sMVHZGIxiRXO/kSs857NZQycpjewEVKF3jhNTw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
+ "node_modules/@react-email/text": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/@react-email/text/-/text-0.1.5.tgz",
+ "integrity": "sha512-o5PNHFSE085VMXayxH+SJ1LSOtGsTv+RpNKnTiJDrJUwoBu77G3PlKOsZZQHCNyD28WsQpl9v2WcJLbQudqwPg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0 || ^19.0.0-rc"
+ }
+ },
"node_modules/@rollup/rollup-android-arm-eabi": {
"version": "4.42.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.42.0.tgz",
@@ -3930,6 +4216,26 @@
"integrity": "sha512-Iu174JHfLd7i/XkXY6VDrqSlPvTDQOtQI7wNAXKKOAADJ9TduRLkNdMgjGiMxSttUIZnomv81JAbAbC0DhggxA==",
"dev": true
},
+ "node_modules/@types/react": {
+ "version": "19.2.0",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.0.tgz",
+ "integrity": "sha512-1LOH8xovvsKsCBq1wnT4ntDUdCJKmnEakhsuoUSy6ExlHCkGP2hqnatagYTgFk6oeL0VU31u7SNjunPN+GchtA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "csstype": "^3.0.2"
+ }
+ },
+ "node_modules/@types/react-dom": {
+ "version": "19.2.0",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.0.tgz",
+ "integrity": "sha512-brtBs0MnE9SMx7px208g39lRmC5uHZs96caOJfTjFcYSLHNamvaSMfJNagChVNkup2SdtOxKX1FDBkRSJe1ZAg==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "@types/react": "^19.2.0"
+ }
+ },
"node_modules/@types/sqlstring": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/@types/sqlstring/-/sqlstring-2.3.2.tgz",
@@ -4590,6 +4896,13 @@
"node": ">=18"
}
},
+ "node_modules/csstype": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/data-urls": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
@@ -6307,6 +6620,18 @@
"@jridgewell/sourcemap-codec": "^1.5.0"
}
},
+ "node_modules/marked": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/marked/-/marked-7.0.4.tgz",
+ "integrity": "sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ==",
+ "license": "MIT",
+ "bin": {
+ "marked": "bin/marked.js"
+ },
+ "engines": {
+ "node": ">= 16"
+ }
+ },
"node_modules/math-intrinsics": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -6330,6 +6655,18 @@
"npm": ">=6"
}
},
+ "node_modules/md-to-react-email": {
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/md-to-react-email/-/md-to-react-email-5.0.5.tgz",
+ "integrity": "sha512-OvAXqwq57uOk+WZqFFNCMZz8yDp8BD3WazW1wAKHUrPbbdr89K9DWS6JXY09vd9xNdPNeurI8DU/X4flcfaD8A==",
+ "license": "MIT",
+ "dependencies": {
+ "marked": "7.0.4"
+ },
+ "peerDependencies": {
+ "react": "^18.0 || ^19.0"
+ }
+ },
"node_modules/merge2": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -7145,7 +7482,6 @@
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
- "dev": true,
"license": "MIT",
"bin": {
"prettier": "bin/prettier.cjs"
@@ -7157,6 +7493,15 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
+ "node_modules/prismjs": {
+ "version": "1.30.0",
+ "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
+ "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/process": {
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -7301,24 +7646,24 @@
}
},
"node_modules/react": {
- "version": "19.1.0",
- "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
- "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
- "peer": true,
+ "version": "19.2.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
+ "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
+ "license": "MIT",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/react-dom": {
- "version": "19.1.0",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz",
- "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
- "peer": true,
+ "version": "19.2.0",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
+ "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
+ "license": "MIT",
"dependencies": {
- "scheduler": "^0.26.0"
+ "scheduler": "^0.27.0"
},
"peerDependencies": {
- "react": "^19.1.0"
+ "react": "^19.2.0"
}
},
"node_modules/react-promise-suspense": {
@@ -7614,10 +7959,10 @@
}
},
"node_modules/scheduler": {
- "version": "0.26.0",
- "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
- "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
- "peer": true
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+ "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+ "license": "MIT"
},
"node_modules/scmp": {
"version": "2.1.0",
diff --git a/server/package.json b/server/package.json
index 2710adf47..4383f9253 100644
--- a/server/package.json
+++ b/server/package.json
@@ -32,6 +32,8 @@
"@fastify/static": "8.1.1",
"@maxmind/geoip2-node": "6.1.0",
"@mongodb-js/zstd": "^2.0.1",
+ "@react-email/components": "0.5.5",
+ "@react-email/tailwind": "1.2.2",
"@rybbit/shared": "file:../shared",
"better-auth": "1.3.1",
"bullmq": "^5.56.5",
@@ -47,6 +49,8 @@
"pg": "8.16.0",
"postgres": "3.4.5",
"psl": "^1.15.0",
+ "react": "19.2.0",
+ "react-dom": "19.2.0",
"resend": "^4.5.1",
"rrweb": "^2.0.0-alpha.11",
"sqlstring": "2.3.3",
@@ -63,6 +67,8 @@
"@types/node": "^20.14.8",
"@types/pg": "^8.15.1",
"@types/psl": "^1.1.3",
+ "@types/react": "^19.2.0",
+ "@types/react-dom": "^19.2.0",
"@types/sqlstring": "2.3.2",
"drizzle-kit": "0.31.1",
"esbuild": "^0.25.5",
diff --git a/server/src/lib/auth.ts b/server/src/lib/auth.ts
index 163111de5..f16585eab 100644
--- a/server/src/lib/auth.ts
+++ b/server/src/lib/auth.ts
@@ -9,7 +9,7 @@ import { db } from "../db/postgres/postgres.js";
import * as schema from "../db/postgres/schema.js";
import { user } from "../db/postgres/schema.js";
import { DISABLE_SIGNUP } from "./const.js";
-import { sendEmail, sendInvitationEmail } from "./resend.js";
+import { sendEmail, sendInvitationEmail } from "./email/email.js";
dotenv.config();
diff --git a/server/src/lib/email/email.ts b/server/src/lib/email/email.ts
new file mode 100644
index 000000000..3b809cb72
--- /dev/null
+++ b/server/src/lib/email/email.ts
@@ -0,0 +1,69 @@
+import { Resend } from "resend";
+import { render } from "@react-email/components";
+import { IS_CLOUD } from "../const.js";
+import { InvitationEmail } from "./templates/InvitationEmail.js";
+import { LimitExceededEmail } from "./templates/LimitExceededEmail.js";
+
+let resend: Resend | undefined;
+
+if (IS_CLOUD) {
+ resend = new Resend(process.env.RESEND_API_KEY);
+}
+
+export const sendEmail = async (email: string, subject: string, html: string) => {
+ if (!resend) {
+ return;
+ // not sure how to handle self hosted instances without resend
+ // throw new Error("Resend is not initialized");
+ }
+ try {
+ const response = await resend.emails.send({
+ from: "Rybbit <[email protected]>",
+ to: email,
+ subject,
+ html,
+ });
+ return response;
+ } catch (error) {
+ console.error(error);
+ throw error;
+ }
+};
+
+export const sendInvitationEmail = async (
+ email: string,
+ invitedBy: string,
+ organizationName: string,
+ inviteLink: string
+) => {
+ const html = await render(
+ InvitationEmail({
+ email,
+ invitedBy,
+ organizationName,
+ inviteLink,
+ })
+ );
+
+ await sendEmail(email, "You're Invited to Join an Organization on Rybbit", html);
+};
+
+export const sendLimitExceededEmail = async (
+ email: string,
+ organizationName: string,
+ eventCount: number,
+ eventLimit: number
+) => {
+ const upgradeLink = "https://app.rybbit.io/settings/organization/subscription";
+
+ const html = await render(
+ LimitExceededEmail({
+ organizationName,
+ eventCount,
+ eventLimit,
+ upgradeLink,
+ })
+ );
+
+ await sendEmail(email, `Action Required: ${organizationName} has exceeded its monthly event limit`, html);
+};
diff --git a/server/src/lib/email/templates/InvitationEmail.tsx b/server/src/lib/email/templates/InvitationEmail.tsx
new file mode 100644
index 000000000..39d4ae3e8
--- /dev/null
+++ b/server/src/lib/email/templates/InvitationEmail.tsx
@@ -0,0 +1,86 @@
+import {
+ Body,
+ Button,
+ Container,
+ Head,
+ Heading,
+ Html,
+ Preview,
+ Section,
+ Text,
+ Tailwind,
+ pixelBasedPreset,
+} from "@react-email/components";
+import * as React from "react";
+
+interface InvitationEmailProps {
+ email: string;
+ invitedBy: string;
+ organizationName: string;
+ inviteLink: string;
+}
+
+export const InvitationEmail = ({ email, invitedBy, organizationName, inviteLink }: InvitationEmailProps) => {
+ const currentYear = new Date().getFullYear();
+
+ return (
+ <Html>
+ <Head />
+ <Preview>You're Invited to Join {organizationName} on Rybbit</Preview>
+ <Tailwind
+ config={{
+ presets: [pixelBasedPreset],
+ theme: {
+ extend: {
+ colors: {
+ brand: "#10b981",
+ darkBg: "#0c0c0c",
+ lightText: "#e5e5e5",
+ mutedText: "#a3a3a3",
+ borderColor: "#27272a",
+ },
+ },
+ },
+ }}
+ >
+ <Body className="bg-darkBg font-sans">
+ <Container className="mx-auto py-10 px-6 max-w-[600px]">
+ <Section className="text-center">
+ <div className="inline-block bg-brand/20 text-brand px-3 py-1.5 rounded-full text-sm font-medium mb-4">
+ New Invitation
+ </div>
+ <Heading className="text-white text-3xl font-semibold mb-6">You've Been Invited!</Heading>
+ </Section>
+
+ <Section className="mb-8">
+ <Text className="text-lightText text-base leading-relaxed mb-4">
+ {invitedBy} has invited you to join <span className="font-bold text-brand">{organizationName}</span> on
+ Rybbit Analytics.
+ </Text>
+ <Text className="text-lightText text-base leading-relaxed">
+ Rybbit is an open-source analytics platform that helps you understand your website traffic while
+ respecting user privacy.
+ </Text>
+ </Section>
+
+ <Section className="text-center mb-10">
+ <Button
+ href={inviteLink}
+ className="bg-brand text-white px-8 py-3 rounded-md font-bold text-base no-underline inline-block"
+ >
+ Accept Invitation
+ </Button>
+ </Section>
+
+ <Section className="text-center border-t border-borderColor pt-5">
+ <Text className="text-mutedText text-xs mb-2">
+ This invitation was sent to <span className="text-brand">{email}</span>.
+ </Text>
+ <Text className="text-mutedText text-xs">© {currentYear} Rybbit Analytics</Text>
+ </Section>
+ </Container>
+ </Body>
+ </Tailwind>
+ </Html>
+ );
+};
diff --git a/server/src/lib/email/templates/LimitExceededEmail.tsx b/server/src/lib/email/templates/LimitExceededEmail.tsx
new file mode 100644
index 000000000..d5279e5ac
--- /dev/null
+++ b/server/src/lib/email/templates/LimitExceededEmail.tsx
@@ -0,0 +1,101 @@
+import {
+ Body,
+ Button,
+ Container,
+ Head,
+ Heading,
+ Html,
+ Preview,
+ Section,
+ Text,
+ Tailwind,
+ pixelBasedPreset,
+} from "@react-email/components";
+import * as React from "react";
+
+interface LimitExceededEmailProps {
+ organizationName: string;
+ eventCount: number;
+ eventLimit: number;
+ upgradeLink: string;
+}
+
+export const LimitExceededEmail = ({
+ organizationName,
+ eventCount,
+ eventLimit,
+ upgradeLink,
+}: LimitExceededEmailProps) => {
+ const currentYear = new Date().getFullYear();
+
+ return (
+ <Html>
+ <Head />
+ <Preview>Your organization has exceeded its monthly event limit</Preview>
+ <Tailwind
+ config={{
+ presets: [pixelBasedPreset],
+ theme: {
+ extend: {
+ colors: {
+ brand: "#10b981",
+ darkBg: "#0c0c0c",
+ lightText: "#e5e5e5",
+ mutedText: "#a3a3a3",
+ borderColor: "#27272a",
+ warningBg: "#dc2626",
+ },
+ },
+ },
+ }}
+ >
+ <Body className="bg-darkBg font-sans">
+ <Container className="mx-auto py-10 px-6 max-w-[600px]">
+ <Section className="text-center">
+ <div className="inline-block bg-warningBg/20 text-warningBg px-3 py-1.5 rounded-full text-sm font-medium mb-4">
+ Event Limit Exceeded
+ </div>
+ <Heading className="text-white text-3xl font-semibold mb-6">
+ Monthly Event Limit Reached
+ </Heading>
+ </Section>
+
+ <Section className="mb-8">
+ <Text className="text-lightText text-base leading-relaxed mb-4">
+ Your organization <span className="font-bold text-brand">{organizationName}</span> has
+ exceeded its monthly event limit.
+ </Text>
+ <Text className="text-lightText text-base leading-relaxed mb-4">
+ <strong>Current usage:</strong> {eventCount.toLocaleString()} events
+ <br />
+ <strong>Monthly limit:</strong> {eventLimit.toLocaleString()} events
+ </Text>
+ <Text className="text-lightText text-base leading-relaxed">
+ Your analytics tracking has been paused. To continue tracking events and accessing
+ your analytics data, please upgrade your plan.
+ </Text>
+ </Section>
+
+ <Section className="text-center mb-10">
+ <Button
+ href={upgradeLink}
+ className="bg-brand text-white px-8 py-3 rounded-md font-bold text-base no-underline inline-block"
+ >
+ Upgrade Your Plan
+ </Button>
+ </Section>
+
+ <Section className="text-center border-t border-borderColor pt-5">
+ <Text className="text-mutedText text-xs mb-2">
+ Need help? Contact our support team at [email protected]
+ </Text>
+ <Text className="text-mutedText text-xs">
+ © {currentYear} Rybbit Analytics
+ </Text>
+ </Section>
+ </Container>
+ </Body>
+ </Tailwind>
+ </Html>
+ );
+};
\ No newline at end of file
diff --git a/server/src/lib/resend.ts b/server/src/lib/resend.ts
deleted file mode 100644
index 1c0839639..000000000
--- a/server/src/lib/resend.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { Resend } from "resend";
-import { IS_CLOUD } from "./const.js";
-
-let resend: Resend | undefined;
-
-if (IS_CLOUD) {
- resend = new Resend(process.env.RESEND_API_KEY);
-}
-
-export const sendEmail = async (email: string, subject: string, html: string) => {
- if (!resend) {
- return;
- // not sure how to handle self hosted instances without resend
- // throw new Error("Resend is not initialized");
- }
- try {
- const response = await resend.emails.send({
- from: "Rybbit <[email protected]>",
- to: email,
- subject,
- html,
- });
- return response;
- } catch (error) {
- console.error(error);
- throw error;
- }
-};
-
-export const sendInvitationEmail = async (
- email: string,
- invitedBy: string,
- organizationName: string,
- inviteLink: string
-) => {
- const html = `
- <!DOCTYPE html>
- <html>
- <head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Invitation to Join Rybbit</title>
- <style>
- body {
- font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
- line-height: 1.6;
- color: #1a1a1a;
- background-color: #0c0c0c;
- margin: 0;
- padding: 0;
- }
- .email-container {
- max-width: 600px;
- margin: 0 auto;
- padding: 40px 24px;
- background-color: #0c0c0c;
- }
- .header {
- text-align: center;
- padding-bottom: 32px;
- }
- .logo {
- margin: 0 auto;
- display: block;
- }
- .content {
- padding: 0;
- }
- .invite-badge {
- display: inline-block;
- background-color: rgba(16, 185, 129, 0.2);
- color: #10b981;
- padding: 6px 12px;
- border-radius: 50px;
- font-size: 14px;
- font-weight: 500;
- margin-bottom: 16px;
- text-align: center;
- }
- .invite-text {
- font-size: 16px;
- margin-bottom: 32px;
- color: #e5e5e5;
- }
- .highlight {
- font-weight: bold;
- color: #10b981;
- }
- .button-container {
- text-align: center;
- margin: 32px 0;
- }
- .button {
- display: inline-block;
- background-color: #10b981;
- color: white;
- padding: 12px 32px;
- text-decoration: none;
- font-weight: bold;
- border-radius: 6px;
- font-size: 16px;
- transition: background-color 0.3s;
- }
- .button:hover {
- background-color: #059669;
- }
- .footer {
- text-align: center;
- margin-top: 40px;
- padding-top: 20px;
- border-top: 1px solid #27272a;
- font-size: 12px;
- color: #a3a3a3;
- }
- .footer a {
- color: #10b981;
- text-decoration: none;
- }
- .footer a:hover {
- text-decoration: underline;
- }
- h2 {
- color: #ffffff;
- font-size: 28px;
- text-align: center;
- margin-bottom: 24px;
- font-weight: 600;
- }
- p {
- margin: 12px 0;
- }
- </style>
- </head>
- <body>
- <div class="email-container">
- <div class="content">
- <div style="text-align: center;">
- <div class="invite-badge">New Invitation</div>
- <h2>You've Been Invited!</h2>
- </div>
- <div class="invite-text">
- <p>${invitedBy} has invited you to join <span class="highlight">${organizationName}</span> on Rybbit Analytics.</p>
- <p>Rybbit is an open-source analytics platform that helps you understand your website traffic while respecting user privacy.</p>
- </div>
- <div class="button-container">
- <a href="${inviteLink}" class="button">Accept Invitation</a>
- </div>
- </div>
- <div class="footer">
- <p>This invitation was sent to <span class="highlight">${email}</span>.</p>
- <p>&copy; ${new Date().getFullYear()} Rybbit Analytics</p>
- </div>
- </div>
- </body>
- </html>
- `;
- await sendEmail(email, "You're Invited to Join an Organization on Rybbit", html);
-};
diff --git a/server/src/services/uptime/notificationService.ts b/server/src/services/uptime/notificationService.ts
index f02bbe174..eac4e5a46 100644
--- a/server/src/services/uptime/notificationService.ts
+++ b/server/src/services/uptime/notificationService.ts
@@ -3,7 +3,7 @@ import { and, eq, InferSelectModel } from "drizzle-orm";
import { db } from "../../db/postgres/postgres.js";
import { notificationChannels } from "../../db/postgres/schema.js";
import { createServiceLogger } from "../../lib/logger/logger.js";
-import { sendEmail } from "../../lib/resend.js";
+import { sendEmail } from "../../lib/email/email.js";
import { sendSMS } from "../../lib/twilio.js";
// Type inferred from Drizzle schema
diff --git a/server/src/services/usageService.ts b/server/src/services/usageService.ts
index 4dc8defdf..c9cc7c71a 100644
--- a/server/src/services/usageService.ts
+++ b/server/src/services/usageService.ts
@@ -1,12 +1,13 @@
-import { eq } from "drizzle-orm";
+import { and, eq } from "drizzle-orm";
import { DateTime } from "luxon";
import * as cron from "node-cron";
import Stripe from "stripe";
import { processResults } from "../api/analytics/utils.js";
import { clickhouse } from "../db/clickhouse/clickhouse.js";
import { db } from "../db/postgres/postgres.js";
-import { organization, sites } from "../db/postgres/schema.js";
+import { member, organization, sites, user } from "../db/postgres/schema.js";
import { DEFAULT_EVENT_LIMIT, getStripePrices, IS_CLOUD, StripePlan } from "../lib/const.js";
+import { sendLimitExceededEmail } from "../lib/email/email.js";
import { createServiceLogger } from "../lib/logger/logger.js";
import { stripe } from "../lib/stripe.js";
@@ -61,6 +62,29 @@ class UsageService {
return DateTime.now().startOf("month").toISODate() as string;
}
+ /**
+ * Gets the email of the organization owner
+ */
+ private async getOrganizationOwnerEmail(organizationId: string): Promise<string | null> {
+ try {
+ const owners = await db
+ .select({
+ email: user.email,
+ })
+ .from(member)
+ .innerJoin(user, eq(member.userId, user.id))
+ .where(and(
+ eq(member.organizationId, organizationId),
+ eq(member.role, "owner")
+ ));
+
+ return owners.length > 0 ? owners[0].email : null;
+ } catch (error) {
+ this.logger.error(error as Error, `Error getting owner email for organization ${organizationId}`);
+ return null;
+ }
+ }
+
/**
* Gets all site IDs for an organization
*/
@@ -236,6 +260,7 @@ class UsageService {
name: organization.name,
stripeCustomerId: organization.stripeCustomerId,
createdAt: organization.createdAt,
+ overMonthlyLimit: organization.overMonthlyLimit,
})
.from(organization);
@@ -257,6 +282,7 @@ class UsageService {
// Check if over limit and update global set
const isOverLimit = eventCount > eventLimit;
+ const wasOverLimit = orgData.overMonthlyLimit ?? false;
// Update organization's monthlyEventCount and overMonthlyLimit fields
await db
@@ -267,6 +293,35 @@ class UsageService {
})
.where(eq(organization.id, orgData.id));
+ // Send email notification if transitioning from under limit to over limit
+ if (isOverLimit && !wasOverLimit) {
+ const ownerEmail = await this.getOrganizationOwnerEmail(orgData.id);
+
+ // Send email to the owner if found
+ if (ownerEmail) {
+ try {
+ await sendLimitExceededEmail(
+ ownerEmail,
+ orgData.name,
+ eventCount,
+ eventLimit
+ );
+ this.logger.info(
+ `Sent limit exceeded email to owner ${ownerEmail} for organization ${orgData.name}`
+ );
+ } catch (error) {
+ this.logger.error(
+ error as Error,
+ `Failed to send limit exceeded email to owner ${ownerEmail} for organization ${orgData.name}`
+ );
+ }
+ } else {
+ this.logger.warn(
+ `No owner found for organization ${orgData.name}, skipping limit exceeded email`
+ );
+ }
+ }
+
// If over the limit, add all this organization's sites to the global set
if (isOverLimit) {
for (const siteId of siteIds) {
diff --git a/server/tsconfig.json b/server/tsconfig.json
index 0cf7261e0..af3623c29 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -6,6 +6,7 @@
"lib": [
"ES2020"
],
+ "jsx": "react",
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,