Merge branch 'next' into fix/remove-v2-enabled-condition-for-opt-in

apps/dashboard/.vscode/settings.json

@@ -3,5 +3,8 @@
   "tailwindCSS.experimental.classRegex": [
     ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
     ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
-  ]
+  ],
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "always"
+  }
 }

apps/dashboard/src/components/workflow-editor/steps/email/maily.tsx

@@ -3,6 +3,23 @@ import { useWorkflow } from '@/components/workflow-editor/workflow-provider';
 import { parseStepVariablesToLiquidVariables } from '@/utils/parseStepVariablesToLiquidVariables';
 import { cn } from '@/utils/ui';
 import { Editor } from '@maily-to/core';
+import {
+  blockquote,
+  bulletList,
+  button,
+  columns,
+  divider,
+  forLoop,
+  hardBreak,
+  heading1,
+  heading2,
+  heading3,
+  image,
+  orderedList,
+  section,
+  spacer,
+  text,
+} from '@maily-to/core/blocks';
 import type { Editor as TiptapEditor } from '@tiptap/core';
 import { HTMLAttributes, useMemo, useState } from 'react';
 import { useFormContext } from 'react-hook-form';
@@ -29,9 +46,26 @@ export const Maily = (props: MailyProps) => {
                 <Editor
                   config={{
                     hasMenuBar: false,
-                    wrapClassName: 'h-full ',
+                    wrapClassName: 'h-full w-full',
                     bodyClassName: '!bg-transparent h-full !border-none !mt-0 [&>div]:h-full [&_.tiptap]:h-full',
                   }}
+                  blocks={[
+                    text,
+                    heading1,
+                    heading2,
+                    heading3,
+                    bulletList,
+                    orderedList,
+                    image,
+                    section,
+                    columns,
+                    forLoop,
+                    divider,
+                    spacer,
+                    button,
+                    hardBreak,
+                    blockquote,
+                  ]}
                   triggerSuggestionCharacter="{{"
                   variables={variables.map((v) => ({ name: v.label, required: false }))}
                   contentJson={field.value ? JSON.parse(field.value) : undefined}

libs/dal/src/dal.service.ts

@@ -1,11 +1,13 @@
 import mongoose, { Connection, ConnectOptions } from 'mongoose';
+import { AuthMechanism } from './types';
 
 export const baseConfig: ConnectOptions = {
   // AUTO_CREATE_INDEXES is deprecated, use MONGO_AUTO_CREATE_INDEXES
   autoIndex: process.env.AUTO_CREATE_INDEXES === 'true' || process.env.MONGO_AUTO_CREATE_INDEXES === 'true',
   maxIdleTimeMS: process.env.MONGO_MAX_IDLE_TIME_IN_MS ? Number(process.env.MONGO_MAX_IDLE_TIME_IN_MS) : 1000 * 30,
   maxPoolSize: process.env.MONGO_MAX_POOL_SIZE ? Number(process.env.MONGO_MAX_POOL_SIZE) : 50,
   minPoolSize: process.env.MONGO_MIN_POOL_SIZE ? Number(process.env.MONGO_MIN_POOL_SIZE) : 10,
+  authMechanism: (process.env.MONGO_AUTH_MECHANISM as AuthMechanism) || ('DEFAULT' as AuthMechanism),
 };
 
 export class DalService {

libs/dal/src/types/auth.ts

@@ -0,0 +1,8 @@
+export type AuthMechanism =
+  | 'DEFAULT'
+  | 'MONGODB-CR'
+  | 'SCRAM-SHA-1'
+  | 'SCRAM-SHA-256'
+  | 'MONGODB-X509'
+  | 'GSSAPI'
+  | 'PLAIN';

libs/dal/src/types/index.ts

@@ -2,3 +2,4 @@ export * from './enforce';
 export * from './helpers';
 export * from './results';
 export * from './error.enum';
+export * from './auth';

packages/providers/package.json

@@ -60,7 +60,6 @@
     "node-fetch": "^3.2.10",
     "node-mailjet": "^6.0.5",
     "nodemailer": "^6.6.5",
-    "pepipost-sdk-nodejs": "0.4.0",
     "plivo": "^4.60.1",
     "postmark": "^4.0.2",
     "proxy-agent": "^6.3.1",