chore: clean up smoke tests

shellscape · Jul 4, 2024 · 1cdac08 · 1cdac08
1 parent 76053d2
commit 1cdac08
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 31 deletions.
diff --git a/apps/preview/app/src/templates.ts b/apps/preview/app/src/templates.ts
@@ -33,7 +33,7 @@ export const gather = async () => {
     const absHtmlPath = `${path
       .replace(relativePath, absBuildPath)
       .replace(/\.(jsx|tsx)$/, '')}.html`;
-    const templateName = templateNameMap[absHtmlPath];
+    const templateName = templateNameMap[absHtmlPath] || basePath.split('/').at(-1);
     return {
       ...acc,
       [path]: {

diff --git a/test/smoke/fixtures/components/test-body.tsx b/test/smoke/fixtures/components/test-body.tsx
@@ -1,7 +1,7 @@
 import { Body, Text } from 'jsx-email';
 
 // eslint-disable-next-line arrow-body-style
-export const TestBody = () => {
+export const Template = () => {
   return (
     <Body>
       <Text>paths import</Text>

diff --git a/test/smoke/fixtures/templates/code.tsx b/test/smoke/fixtures/templates/code.tsx
@@ -1,6 +1,6 @@
 import { Body, Code, Container, Head, Html, Tailwind } from 'jsx-email';
 
-export const CodeEmail = () => (
+export const Template = () => (
   <Html>
     <Head />
     <Tailwind>
@@ -22,6 +22,3 @@ export const CodeEmail = () => (
     </Tailwind>
   </Html>
 );
-
-// eslint-disable-next-line
-export default CodeEmail;
diff --git a/test/smoke/fixtures/templates/context.tsx b/test/smoke/fixtures/templates/context.tsx
@@ -1,6 +1,6 @@
 import { createContext, useContext, Body, Html } from 'jsx-email';
 
-export const TemplateName = 'local-assets';
+export const templateName = 'context';
 
 const context = createContext(123);
 

diff --git a/test/smoke/fixtures/templates/default-export-props-fn.tsx b/test/smoke/fixtures/templates/default-export-props-fn.tsx
@@ -1,6 +1,6 @@
 import { Body, Html } from 'jsx-email';
 
-export const TemplateName = 'default-export-props-fn';
+export const templateName = 'default-export-props-fn';
 
 export const Template = ({ test }: { test: string }) => (
   <Html>

diff --git a/test/smoke/fixtures/templates/default-export.tsx b/test/smoke/fixtures/templates/default-export.tsx
diff --git a/test/smoke/fixtures/templates/empty.tsx b/test/smoke/fixtures/templates/empty.tsx
diff --git a/test/smoke/fixtures/templates/issue-174.tsx b/test/smoke/fixtures/templates/issue-174.tsx
@@ -10,7 +10,7 @@ export const preset = definePreset(() => {
   };
 });
 
-export const TemplateName = 'Issue174';
+export const templateName = 'Issue174';
 
 export const Template = () => (
   <Tailwind config={{ presets: [preset] }}>

diff --git a/test/smoke/fixtures/templates/local-assets.tsx b/test/smoke/fixtures/templates/local-assets.tsx
@@ -1,9 +1,15 @@
 import { Body, Html, Img, Link } from 'jsx-email';
 
-export const TemplateName = 'local-assets';
+export const templateName = 'local-assets';
 
+// Note: This worked while we were rendering within vite. As of v2, we're pre-rendering
+// with esbuild. esbuild creates cjs bundles, which doesn't work with import.meta.
+// Additionally, import.meta.resolve doesn't work with the esbuild pre-render because
+// the filesystem location is in a temp directory, so the resolve is always incorrect.
+// This is a step back but we can try and figure out a good solution later.
 // @ts-ignore
-const baseUrl = import.meta.resolve('../static/');
+// const baseUrl = import.meta.resolve('../static/');
+const baseUrl = '../static';
 
 export const Template = () => {
   const catUrl = `${baseUrl}cat.jpeg`;

diff --git a/test/smoke/fixtures/templates/paths.tsx b/test/smoke/fixtures/templates/paths.tsx
@@ -1,8 +1,8 @@
 import { Html } from 'jsx-email';
 
-import { TestBody } from '@components/test-body';
+import { Template as TestBody } from '@components/test-body';
 
-export const TemplateName = 'local-assets';
+export const templateName = 'paths';
 
 // eslint-disable-next-line arrow-body-style
 export const Template = () => {

diff --git a/test/smoke/fixtures/templates/props/preview-props-fn.tsx b/test/smoke/fixtures/templates/props/preview-props-fn.tsx
@@ -8,6 +8,6 @@ export const Template = ({ test }: { test: string }) => (
   </Html>
 );
 
-Template.PreviewProps = () => {
+export const previewProps = () => {
   return { test: 'batman' };
 };
diff --git a/test/smoke/fixtures/templates/props/preview-props-named.tsx b/test/smoke/fixtures/templates/props/preview-props-named.tsx
@@ -1,6 +1,6 @@
 import { Body, Html } from 'jsx-email';
 
-export const TemplateName = 'preview-props';
+export const TemplateName = 'preview-props-named';
 
 export const Template = ({ test }: { test: string }) => (
   <Html>

diff --git a/test/smoke/fixtures/templates/props/preview-props.tsx b/test/smoke/fixtures/templates/props/preview-props.tsx
@@ -8,4 +8,4 @@ export const Template = ({ test }: { test: string }) => (
   </Html>
 );
 
-Template.PreviewProps = { test: 'batman' };
+export const previewProps = { test: 'batman' };