Ryan/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2025-11-15 13:01:13 +10:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies

Browse Source
This commit is contained in:
Philipinho
2024-09-02 12:43:33 +01:00
parent 7e6a71fa2d
commit 6c6b47599a
5 changed files with 1797 additions and 3124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/server/src/common/helpers/prosemirror/html/generateJSON.ts
View File

@ -10,10 +10,7 @@ export function generateJSON(
const schema = getSchema(extensions);
const window = new Window();
const dom = new HappyDomParser(window).parseFromString(
html,
'text/html',
).body;
const dom = new HappyDomParser().parseFromString(html, 'text/html').body;
// @ts-ignore
return DOMParser.fromSchema(schema).parse(dom, options).toJSON();

8
apps/server/src/integrations/mail/mail.service.ts
View File

@ -19,8 +19,8 @@ export class MailService {
async sendEmail(message: MailMessage): Promise<void> {
if (message.template) {
// in case this method is used directly. we do not send the tsx template from queue
message.html = render(message.template, { pretty: true });
message.text = render(message.template, { plainText: true });
message.html = await render(message.template, { pretty: true });
message.text = await render(message.template, { plainText: true });
}
const sender = `${this.environmentService.getMailFromName()} <${this.environmentService.getMailFromAddress()}> `;
@ -30,8 +30,8 @@ export class MailService {
async sendToQueue(message: MailMessage): Promise<void> {
if (message.template) {
// transform the React object because it gets lost when sent via the queue
message.html = render(message.template, { pretty: true });
message.text = render(message.template, {
message.html = await render(message.template, { pretty: true });
message.text = await render(message.template, {
plainText: true,
});
delete message.template;