Merge branch 'dev' into main

Author: gustavotoyota

apps/app-server/Dockerfile

@@ -18,5 +18,5 @@ RUN pnpm add -g pm2
 WORKDIR /app
 COPY --from=builder /build/apps/app-server/dist/ ./
 RUN pnpm init
-RUN pnpm install knex ws pg
+RUN pnpm install knex ws pg @getbrevo/brevo
 CMD pm2 start /app/index.js -i max && pm2 logs

apps/app-server/package.json

@@ -5,12 +5,14 @@
   "dependencies": {
     "@deeplib/data": "workspace:*",
     "@deeplib/db": "workspace:*",
+    "@deeplib/mail": "workspace:*",
     "@deeplib/misc": "workspace:*",
     "@fastify/cookie": "^9.1.0",
     "@fastify/cors": "^8.4.1",
     "@fastify/helmet": "^11.1.1",
     "@fastify/rate-limit": "^8.0.3",
     "@fastify/websocket": "^8.2.0",
+    "@getbrevo/brevo": "^1.0.1",
     "@sendgrid/mail": "^7.7.0",
     "@stdlib/base64": "workspace:*",
     "@stdlib/crypto": "workspace:*",
@@ -38,7 +40,6 @@
     "objection": "3.0.1",
     "otplib": "^12.0.1",
     "redlock": "5.0.0-beta.2",
-    "sib-api-v3-typescript": "^2.2.2",
     "stripe": "^14.3.0",
     "superjson": "npm:@deepnotes/superjson@^1.12.4",
     "unilogr": "^0.0.27",

apps/app-server/src/env.d.ts

@@ -45,15 +45,10 @@ declare namespace NodeJS {
     MAILJET_API_KEY: string;
     MAILJET_API_SECRET: string;
 
-    SENDINBLUE_API_KEY: string;
+    BREVO_API_KEY: string;
 
     SENDGRID_API_KEY: string;
 
-    ZOHO_HOST: string;
-    ZOHO_PORT: string;
-    ZOHO_USER: string;
-    ZOHO_PASSWORD: string;
-
     STRIPE_SECRET_KEY: string;
     STRIPE_WEBHOOK_SECRET: string;
     STRIPE_MONTHLY_PRICE_ID: string;

apps/app-server/src/mail/sendinblue.ts

@@ -1,11 +1,11 @@
 import { encryptUserEmail, hashUserEmail } from '@deeplib/data';
 import { UserModel } from '@deeplib/db';
+import { sendMail } from '@deeplib/mail';
 import { padZeroes } from '@stdlib/misc';
 import { checkRedlockSignalAborted } from '@stdlib/redlock';
 import { TRPCError } from '@trpc/server';
 import { randomInt } from 'crypto';
 import { once } from 'lodash';
-import { sendMail } from 'src/mail';
 import type { InferProcedureOpts } from 'src/trpc/helpers';
 import { authProcedure } from 'src/trpc/helpers';
 import { z } from 'zod';

apps/app-server/src/mail/zoho.ts

@@ -1,9 +1,9 @@
 import { hashUserEmail } from '@deeplib/data';
 import { UserModel } from '@deeplib/db';
+import { sendMail } from '@deeplib/mail';
 import { w3cEmailRegex } from '@stdlib/misc';
 import { TRPCError } from '@trpc/server';
 import { once } from 'lodash';
-import { sendMail } from 'src/mail';
 import type { InferProcedureOpts } from 'src/trpc/helpers';
 import { publicProcedure } from 'src/trpc/helpers';
 import { derivePasswordValues } from 'src/utils/crypto';

apps/app-server/src/trpc/api/users/account/email-change/request.ts

@@ -30,6 +30,7 @@
   "references": [
     { "path": "../../packages/@deeplib/data/tsconfig.json" },
     { "path": "../../packages/@deeplib/db/tsconfig.json" },
+    { "path": "../../packages/@deeplib/mail/tsconfig.json" },
     { "path": "../../packages/@deeplib/misc/tsconfig.json" },
     { "path": "../../packages/@stdlib/base64/tsconfig.json" },
     { "path": "../../packages/@stdlib/crypto/tsconfig.json" },

apps/app-server/src/trpc/api/users/account/register.ts

@@ -9,5 +9,5 @@ export default defineConfig({
   sourcemap: false,
   splitting: false,
   dts: false,
-  noExternal: [/^(?!knex|ws).+$/],
+  noExternal: [/^(?!knex|ws|@getbrevo\/brevo).+$/],
 });

apps/app-server/tsconfig.json

@@ -2,7 +2,7 @@
   "name": "@deepnotes/client",
   "description": "DeepNotes",
   "homepage": "https://deepnotes.app",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "author": "Gustavo Toyota <gustavottoyota@gmail.com>",
   "dependencies": {
     "@_ueberdosis/prosemirror-tables": "~1.1.3",
@@ -69,6 +69,7 @@
     "lodash": "^4.17.21",
     "lowlight": "^2.9.0",
     "marked": "^9.1.5",
+    "marked-gfm-heading-id": "^3.1.1",
     "msgpackr": "^1.9.9",
     "nanoid": "^3.3.7",
     "node-fetch": "^2.7.0",
@@ -97,7 +98,7 @@
   },
   "devDependencies": {
     "@intlify/vite-plugin-vue-i18n": "^3.4.0",
-    "@quasar/app-vite": "npm:@deepnotes/quasar-app-vite@^2.0.0-alpha.41",
+    "@quasar/app-vite": "npm:@deepnotes/quasar-app-vite@^2.0.0-alpha.42",
     "@types/argon2-browser": "^1.18.3",
     "@types/color": "^3.0.5",
     "@types/cookie": "^0.5.3",
@@ -106,7 +107,6 @@
     "@types/katex": "^0.16.5",
     "@types/libsodium-wrappers-sumo": "^0.7.7",
     "@types/lodash": "^4.14.200",
-    "@types/marked": "^6.0.0",
     "@types/node-fetch": "^2.6.3",
     "@types/qrcode": "^1.5.4",
     "@types/showdown": "^2.0.3",