Skip to content

Commit b8ee5b6

Browse files
gabrielmferngabrielmfern
committed
Merge branch 'canary' into chore/lint-workflow
2 parents 7929d20 + 69bbc1a commit b8ee5b6

File tree

230 files changed

+99317
-3027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+99317
-3027
lines changed

‎apps/demo/emails/magic-links/aws-verify-email.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
Section,
1212
Text,
1313
} from '@react-email/components';
14-
import * as React from 'react';
1514

1615
interface AWSVerifyEmailProps {
1716
verificationCode?: string;
@@ -22,7 +21,7 @@ const baseUrl = process.env.VERCEL_URL
2221
: '';
2322

2423
export default function AWSVerifyEmail({
25-
verificationCode = '596853',
24+
verificationCode,
2625
}: AWSVerifyEmailProps) {
2726
return (
2827
<Html>
@@ -84,6 +83,10 @@ export default function AWSVerifyEmail({
8483
);
8584
}
8685

86+
AWSVerifyEmail.PreviewProps = {
87+
verificationCode: '596853',
88+
} satisfies AWSVerifyEmailProps;
89+
8790
const main = {
8891
backgroundColor: '#fff',
8992
color: '#212121',

‎apps/demo/emails/magic-links/linear-login-code.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
Section,
1313
Text,
1414
} from '@react-email/components';
15-
import * as React from 'react';
1615

1716
interface LinearLoginCodeEmailProps {
1817
validationCode?: string;

‎apps/demo/emails/magic-links/notion-magic-link.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
Preview,
1010
Text,
1111
} from '@react-email/components';
12-
import * as React from 'react';
1312

1413
interface NotionMagicLinkEmailProps {
1514
loginCode?: string;

‎apps/demo/emails/magic-links/plaid-verify-identity.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
Section,
1010
Text,
1111
} from '@react-email/components';
12-
import * as React from 'react';
1312

1413
interface PlaidVerifyIdentityEmailProps {
1514
validationCode?: string;

‎apps/demo/emails/magic-links/raycast-magic-link.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
Section,
1212
Text,
1313
} from '@react-email/components';
14-
import * as React from 'react';
1514

1615
interface RaycastMagicLinkEmailProps {
1716
magicLink?: string;

‎apps/demo/emails/magic-links/slack-confirm.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
Section,
1313
Text,
1414
} from '@react-email/components';
15-
import * as React from 'react';
1615

1716
interface SlackConfirmEmailProps {
1817
validationCode?: string;

‎apps/demo/emails/newsletters/codepen-challengers.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
Section,
1414
Text,
1515
} from '@react-email/components';
16-
import * as React from 'react';
1716

1817
const baseUrl = process.env.VERCEL_URL
1918
? `https://${process.env.VERCEL_URL}`

‎apps/demo/emails/newsletters/google-play-policy-update.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
Section,
1313
Text,
1414
} from '@react-email/components';
15-
import * as React from 'react';
1615

1716
const baseUrl = process.env.VERCEL_URL
1817
? `https://${process.env.VERCEL_URL}`

‎apps/demo/emails/newsletters/stack-overflow-tips.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
Section,
1414
Text,
1515
} from '@react-email/components';
16-
import * as React from 'react';
1716

1817
interface StackOverflowTipsEmailProps {
1918
tips?: { id: number; description: string }[];

‎apps/demo/emails/notifications/github-access-token.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
Section,
1111
Text,
1212
} from '@react-email/components';
13-
import * as React from 'react';
1413

1514
interface GithubAccessTokenEmailProps {
1615
username?: string;

‎apps/demo/emails/notifications/papermark-year-in-review.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default function PapermarkYearInReviewEmail({
6363
you&apos;ve used Papermark to share your important documents.
6464
</Text>
6565
<Link
66-
href="#"
66+
href="https://www.papermark.com"
6767
className="inline-flex items-center rounded-full bg-gray-900 px-12 py-4 text-center text-sm font-bold text-white no-underline"
6868
>
6969
Share your stats
@@ -197,13 +197,13 @@ export default function PapermarkYearInReviewEmail({
197197
Happy Holidays from the Papermark team :)
198198
</Text>
199199
<Link
200-
href="#"
200+
href="https://www.papermark.com"
201201
className="mt-4 inline-flex items-center rounded-full bg-gray-900 px-12 py-4 text-center text-sm font-bold text-white no-underline"
202202
>
203203
Share your stats
204204
</Link>
205205
<Link
206-
href="https://app.papermark.io/documents"
206+
href="https://www.papermark.com"
207207
className="mt-4 block items-center text-center text-sm font-bold text-gray-900 no-underline"
208208
>
209209
Go to your dashboard

‎apps/demo/emails/notifications/vercel-invite-user.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
Tailwind,
1616
Text,
1717
} from '@react-email/components';
18-
import * as React from 'react';
1918

2019
interface VercelInviteUserEmailProps {
2120
username?: string;
@@ -58,7 +57,7 @@ export const VercelInviteUserEmail = ({
5857
src={`${baseUrl}/static/vercel-logo.png`}
5958
width="40"
6059
height="37"
61-
alt="Vercel"
60+
alt="Vercel Logo"
6261
className="my-0 mx-auto"
6362
/>
6463
</Section>
@@ -87,14 +86,15 @@ export const VercelInviteUserEmail = ({
8786
src={userImage}
8887
width="64"
8988
height="64"
89+
alt={`${username}'s profile picture`}
9090
/>
9191
</Column>
9292
<Column align="center">
9393
<Img
9494
src={`${baseUrl}/static/vercel-arrow.png`}
9595
width="12"
9696
height="9"
97-
alt="invited you to"
97+
alt="Arrow indicating invitation"
9898
/>
9999
</Column>
100100
<Column align="left">
@@ -103,6 +103,7 @@ export const VercelInviteUserEmail = ({
103103
src={teamImage}
104104
width="64"
105105
height="64"
106+
alt={`${teamName} team logo`}
106107
/>
107108
</Column>
108109
</Row>
@@ -146,7 +147,7 @@ VercelInviteUserEmail.PreviewProps = {
146147
invitedByEmail: '[email protected]',
147148
teamName: 'Enigma',
148149
teamImage: `${baseUrl}/static/vercel-team.png`,
149-
inviteLink: 'https://vercel.com/teams/invite/foo',
150+
inviteLink: 'https://vercel.com',
150151
inviteFromIp: '204.13.186.218',
151152
inviteFromLocation: 'São Paulo, Brazil',
152153
} as VercelInviteUserEmailProps;

‎apps/demo/emails/notifications/yelp-recent-login.tsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
Section,
1313
Text,
1414
} from '@react-email/components';
15-
import * as React from 'react';
1615

1716
interface YelpRecentLoginEmailProps {
1817
userFirstName?: string;
@@ -45,7 +44,7 @@ export const YelpRecentLoginEmail = ({
4544
<Preview>Yelp recent login</Preview>
4645
<Container>
4746
<Section style={logo}>
48-
<Img src={`${baseUrl}/static/yelp-logo.png`} />
47+
<Img src={`${baseUrl}/static/yelp-logo.png`} alt="Yelp logo" />
4948
</Section>
5049

5150
<Section style={content}>
@@ -54,6 +53,7 @@ export const YelpRecentLoginEmail = ({
5453
style={image}
5554
width={620}
5655
src={`${baseUrl}/static/yelp-header.png`}
56+
alt="Yelp header illustration"
5757
/>
5858
</Row>
5959

@@ -123,6 +123,7 @@ export const YelpRecentLoginEmail = ({
123123
style={image}
124124
width={620}
125125
src={`${baseUrl}/static/yelp-footer.png`}
126+
alt="Yelp footer decoration"
126127
/>
127128
</Section>
128129

@@ -167,7 +168,7 @@ const logo = {
167168
};
168169

169170
const buttonContainer = {
170-
display: 'flex',
171+
textAlign: 'center' as const,
171172
};
172173

173174
const button = {
@@ -177,8 +178,9 @@ const button = {
177178
fontWeight: 'bold',
178179
border: '1px solid rgb(0,0,0, 0.1)',
179180
cursor: 'pointer',
180-
margin: '0 auto',
181+
display: 'inline-block',
181182
padding: '12px 30px',
183+
textDecoration: 'none',
182184
};
183185

184186
const content = {

‎apps/demo/emails/receipts/apple-receipt.tsx

+16-38
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
Section,
1313
Text,
1414
} from '@react-email/components';
15-
import * as React from 'react';
1615

1716
const baseUrl = process.env.VERCEL_URL
1817
? `https://${process.env.VERCEL_URL}`
@@ -45,7 +44,7 @@ export const AppleReceiptEmail = () => (
4544
<Text style={cupomText}>
4645
Save 3% on all your Apple purchases with Apple Card.
4746
<sup style={supStyle}>1</sup>{' '}
48-
<Link href="https://www.apple.com/apple-card">
47+
<Link href="https://www.apple.com/apple-card/">
4948
Apply and use in minutes
5049
</Link>
5150
<sup style={supStyle}>2</sup>
@@ -127,19 +126,11 @@ export const AppleReceiptEmail = () => (
127126
<Text style={productTitle}>HBO Max: Stream TV &amp; Movies</Text>
128127
<Text style={productDescription}>HBO Max Ad-Free (Monthly)</Text>
129128
<Text style={productDescription}>Renews Aug 20, 2023</Text>
130-
<Link
131-
href="https://userpub.itunes.apple.com/WebObjects/MZUserPublishing.woa/wa/addUserReview?cc=us&amp;id=1497977514&amp;o=i&amp;type=Subscription%20Renewal"
132-
style={productLink}
133-
data-saferedirecturl="https://www.google.com/url?q=https://userpub.itunes.apple.com/WebObjects/MZUserPublishing.woa/wa/addUserReview?cc%3Dus%26id%3D1497977514%26o%3Di%26type%3DSubscription%2520Renewal&amp;source=gmail&amp;ust=1673963081204000&amp;usg=AOvVaw2DFCLKMo1snS-Swk5H26Z1"
134-
>
129+
<Link href="https://www.apple.com/" style={productLink}>
135130
Write a Review
136131
</Link>
137132
<span style={divisor}>|</span>
138-
<Link
139-
href="https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/reportAProblem?a=1497977514&amp;cc=us&amp;d=683263808&amp;o=i&amp;p=29065684906671&amp;pli=29092219632071&amp;s=1"
140-
style={productLink}
141-
data-saferedirecturl="https://www.google.com/url?q=https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/reportAProblem?a%3D1497977514%26cc%3Dus%26d%3D683263808%26o%3Di%26p%3D29065684906671%26pli%3D29092219632071%26s%3D1&amp;source=gmail&amp;ust=1673963081204000&amp;usg=AOvVaw3y47L06B2LTrL6qsmaW2Hq"
142-
>
133+
<Link href="https://www.apple.com/" style={productLink}>
143134
Report a Problem
144135
</Link>
145136
</Column>
@@ -184,10 +175,7 @@ export const AppleReceiptEmail = () => (
184175
<Section>
185176
<Row>
186177
<Column align="center" style={walletWrapper}>
187-
<Link
188-
href="https://wallet.apple.com/apple-card/setup/feature/ccs?referrer=cid%3Dapy-120-100003"
189-
style={walletLink}
190-
>
178+
<Link href="https://www.apple.com/" style={walletLink}>
191179
<Img
192180
src={`${baseUrl}/static/apple-wallet.png`}
193181
width="28"
@@ -228,24 +216,21 @@ export const AppleReceiptEmail = () => (
228216
</Text>
229217
<Text style={footerTextCenter}>
230218
Privacy: We use a
231-
<Link href="http://support.apple.com/kb/HT207233" style={footerLink}>
219+
<Link href="https://www.apple.com/" style={footerLink}>
232220
{' '}
233221
Subscriber ID{' '}
234222
</Link>
235223
to provide reports to developers.
236224
</Text>
237225
<Text style={footerTextCenter}>
238226
Get help with subscriptions and purchases.
239-
<Link
240-
href="https://support.apple.com/billing?cid=email_receipt"
241-
style={footerLink}
242-
>
227+
<Link href="https://www.apple.com/" style={footerLink}>
243228
Visit Apple Support.
244229
</Link>
245230
</Text>
246231
<Text style={footerTextCenter}>
247232
Learn how to{' '}
248-
<Link href="https://support.apple.com/kb/HT204030?cid=email_receipt_itunes_article_HT204030">
233+
<Link href="https://www.apple.com/">
249234
manage your password preferences
250235
</Link>{' '}
251236
for iTunes, Apple Books, and App Store purchases.
@@ -257,9 +242,7 @@ export const AppleReceiptEmail = () => (
257242
subscription renewals. If you have opted out, you can still view your
258243
receipts in your account under Purchase History. To manage receipts or
259244
to opt in again, go to{' '}
260-
<Link href="https://finance-app.itunes.apple.com/account/subscriptions?unsupportedRedirectUrl=https://apps.apple.com/US/invoice">
261-
Account Settings.
262-
</Link>
245+
<Link href="https://www.apple.com/">Account Settings.</Link>
263246
</Text>
264247
<Section>
265248
<Row>
@@ -274,14 +257,8 @@ export const AppleReceiptEmail = () => (
274257
</Row>
275258
</Section>
276259
<Text style={footerLinksWrapper}>
277-
<Link href="https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/accountSummary?mt=8">
278-
Account Settings
279-
</Link>{' '}
280-
•{' '}
281-
<Link href="https://www.apple.com/legal/itunes/us/sales.html">
282-
Terms of Sale
283-
</Link>{' '}
284-
•{' '}
260+
<Link href="https://www.apple.com/">Account Settings</Link> •{' '}
261+
<Link href="https://www.apple.com/">Terms of Sale</Link> •{' '}
285262
<Link href="https://www.apple.com/legal/privacy/">
286263
Privacy Policy{' '}
287264
</Link>
@@ -345,15 +322,15 @@ const informationTable = {
345322
};
346323

347324
const informationTableRow = {
348-
height: '46px',
325+
minHeight: '46px',
349326
};
350327

351328
const informationTableColumn = {
352329
paddingLeft: '20px',
353330
borderStyle: 'solid',
354331
borderColor: 'white',
355332
borderWidth: '0px 1px 1px 0px',
356-
height: '44px',
333+
minHeight: '44px',
357334
};
358335

359336
const informationTableLabel = {
@@ -372,7 +349,7 @@ const informationTableValue = {
372349
const productTitleTable = {
373350
...informationTable,
374351
margin: '30px 0 15px 0',
375-
height: '24px',
352+
minHeight: '24px',
376353
};
377354

378355
const productsTitle = {
@@ -386,7 +363,7 @@ const productsTitle = {
386363
const productIcon = {
387364
margin: '0 0 0 20px',
388365
borderRadius: '14px',
389-
border: '1px solid rgba(128,128,128,0.2)',
366+
border: '1px solid rgb(242,242,242)',
390367
};
391368

392369
const productTitle = { fontSize: '12px', fontWeight: '600', ...resetText };
@@ -443,7 +420,8 @@ const productPriceWrapper = {
443420
const productPriceLine = { margin: '30px 0 0 0' };
444421

445422
const productPriceVerticalLine = {
446-
height: '48px',
423+
minHeight: '48px',
424+
paddingTop: '48px',
447425
borderLeft: '1px solid',
448426
borderColor: 'rgb(238,238,238)',
449427
};

0 commit comments

Comments
 (0)