From 6a5d6ee3dbc1cb8ce17c0b04e4e6d5fe7d8f3908 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 07:02:41 -0700
Subject: [PATCH] chore(deps): bump oy-vey from 0.10.0 to 0.11.2 (#3902)

* chore(deps): bump oy-vey from 0.10.0 to 0.11.2

Bumps [oy-vey](https://github.com/oysterbooks/oy) from 0.10.0 to 0.11.2.
- [Release notes](https://github.com/oysterbooks/oy/releases)
- [Changelog](https://github.com/revivek/oy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oysterbooks/oy/compare/0.10.0...0.11.2)

---
updated-dependencies:
- dependency-name: oy-vey
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* tsc

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tom Moor <tom.moor@gmail.com>
---
 package.json                                       | 2 +-
 server/emails/mailer.tsx                           | 5 ++---
 server/emails/templates/components/EmailLayout.tsx | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 9ff217e08..e5ef32ab1 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
     "node-fetch": "2.6.7",
     "nodemailer": "^6.6.1",
     "outline-icons": "^1.43.1",
-    "oy-vey": "^0.10.0",
+    "oy-vey": "^0.11.2",
     "passport": "^0.6.0",
     "passport-google-oauth2": "^0.2.0",
     "passport-oauth2": "^1.6.1",
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
index bd58d278b..25e3fde07 100644
--- a/server/emails/mailer.tsx
+++ b/server/emails/mailer.tsx
@@ -1,6 +1,5 @@
 import nodemailer, { Transporter } from "nodemailer";
 import Oy from "oy-vey";
-import * as React from "react";
 import env from "@server/env";
 import Logger from "@server/logging/Logger";
 import { APM } from "@server/logging/tracing";
@@ -15,7 +14,7 @@ type SendMailOptions = {
   subject: string;
   previewText?: string;
   text: string;
-  component: React.ReactNode;
+  component: JSX.Element;
   headCSS?: string;
 };
 
@@ -66,7 +65,7 @@ export class Mailer {
     const html = Oy.renderTemplate(data.component, {
       title: data.subject,
       headCSS: [baseStyles, data.headCSS].join(" "),
-      previewText: data.previewText,
+      previewText: data.previewText ?? "",
     });
 
     try {
diff --git a/server/emails/templates/components/EmailLayout.tsx b/server/emails/templates/components/EmailLayout.tsx
index 2f9934cad..ff3c68ba6 100644
--- a/server/emails/templates/components/EmailLayout.tsx
+++ b/server/emails/templates/components/EmailLayout.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import theme from "@shared/styles/theme";
 
 const EmailLayout: React.FC = ({ children }) => (
-  <Table width="550" padding="40">
+  <Table width="550">
     <TBody>
       <TR>
         <TD align="left">{children}</TD>
diff --git a/yarn.lock b/yarn.lock
index b2bfad19e..c0939336b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11200,10 +11200,10 @@ outline-icons@^1.43.1:
   resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.43.1.tgz#3193c4c659c66b34788db043bb2f843b9c437a48"
   integrity sha512-REj+JsCFi2Jv5uG0/OrBsMVSBFAIsSROxynWbuO9r2eNT8wdqjni02Mk1gq1qFfTbwOvHJ+7ycadu6zlISAK2g==
 
-oy-vey@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.10.0.tgz#16160f837f0ea3d0340adfc2377ba93d1ed9ce76"
-  integrity sha512-mdfU2VUl3Ra1ofXiO6Nqd98PBRFWlPM5rTYvSqsDxQEeV5PCfWroWOoVyg8vOpGhJjcDFKIS62PfbPUJUQmSwQ==
+oy-vey@^0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.11.2.tgz#3bbc36a4064993a2ff52f985b066d44dcb4500d9"
+  integrity sha512-06prDST4MicbAWie4eXcouJbGhAu0r7j3Yta1KFtgs7v2t7goHmY06/GWFjT6lpIsGKJC+7vZtwdecRSYnFtPQ==
   dependencies:
     clean-css "^4.0.12"
     object-assign "^4.1.1"