Skip to content

feat(react-email): Non-encoded email slugs #1203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import Preview from './preview';
export const dynamicParams = true;

export interface PreviewParams {
slug: string;
slug: string[];
}

export default async function Page({ params }: { params: PreviewParams }) {
// will come in here as a relative path to the email
// ex: authentication/verify-password.tsx but encoded like authentication%20verify-password.tsx
const slug = decodeURIComponent(params.slug);
// will come in here as segments of a relative path to the email
// ex: ['authentication', 'verify-password.tsx']
const slug = params.slug.join('/');
const emailsDirMetadata = await getEmailsDirectoryMetadata(
emailsDirectoryAbsolutePath,
);
Expand Down Expand Up @@ -47,5 +47,5 @@ export default async function Page({ params }: { params: PreviewParams }) {
}

export function generateMetadata({ params }: { params: PreviewParams }) {
return { title: `${decodeURIComponent(params.slug)} — React Email` };
return { title: `${params.slug.join('/')} — React Email` };
}
12 changes: 9 additions & 3 deletions packages/react-email/src/cli/commands/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,15 @@ const getEmailSlugsFromEmailDirectory = (
.replace(emailsDirectoryAbsolutePath, '')
.trim();

const slugs = [] as string[];
const slugs = [] as Array<string>[];
emailDirectory.emailFilenames.forEach((filename) =>
slugs.push(path.join(directoryPathRelativeToEmailsDirectory, filename)),
slugs.push(
path
.join(directoryPathRelativeToEmailsDirectory, filename)
.split(path.sep)
// sometimes it gets empty segments due to trailing slashes
.filter((segment) => segment.length > 0),
),
);
emailDirectory.subDirectories.forEach((directory) => {
slugs.push(
Expand Down Expand Up @@ -136,7 +142,7 @@ const forceSSGForEmailPreviews = async (
).map((slug) => ({ slug }));

await fs.promises.appendFile(
path.resolve(builtPreviewAppPath, './src/app/preview/[slug]/page.tsx'),
path.resolve(builtPreviewAppPath, './src/app/preview/[...slug]/page.tsx'),
`

export async function generateStaticParams() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const SidebarDirectoryChildren = (props: {
return (
<Link
href={{
pathname: `/preview/${encodeURIComponent(emailSlug)}`,
pathname: `/preview/${emailSlug}`,
search: searchParams.toString(),
}}
key={emailSlug}
Expand Down