Skip to content

Commit d0af4a0

Browse files
committed
ignore .yalc directory
1 parent 813693c commit d0af4a0

File tree

9 files changed

+26
-162
lines changed

9 files changed

+26
-162
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ node_modules
77

88
# testing
99
coverage
10-
**/*/package-lock.json
11-
**/*/yalc.lock
10+
package-lock.json
11+
.yalc*
12+
yalc.lock
1213

1314
# next.js
1415
.next/

packages/render/integrations/integrations.spec.ts

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,42 @@ describe('integrations', () => {
3838

3939
describe('vite', () => {
4040
let devServer: child_process.ChildProcess;
41-
beforeAll(() => {
41+
beforeAll(async () => {
4242
const viteLocation = path.resolve(import.meta.dirname, './vite/');
4343
$('npm install', viteLocation);
4444
devServer = child_process.spawn('npm', ['run', 'dev'], {
4545
shell: true,
4646
cwd: viteLocation,
4747
stdio: 'pipe',
4848
});
49-
return new Promise<void>((resolve) => {
50-
devServer.on('spawn', async () => {
51-
await page.goto('http://127.0.0.1:5173');
52-
resolve();
53-
});
54-
});
49+
const waitForServer = async (url: string, timeout: number) => {
50+
const start = Date.now();
51+
while (Date.now() - start < timeout) {
52+
try {
53+
await page.goto(url, { timeout: 1000 });
54+
return;
55+
} catch (e) {
56+
await new Promise((resolve) => setTimeout(resolve, 100));
57+
}
58+
}
59+
throw new Error(`Server at ${url} did not respond within ${timeout}ms`);
60+
};
61+
62+
await waitForServer('http://localhost:5173', 1000);
5563
});
5664

5765
afterAll(() => {
5866
devServer.kill();
5967
});
6068

6169
it('should not error when rendering', async () => {
70+
await expect(() =>
71+
page.waitForSelector('[data-testid="rendered-error"]', {
72+
timeout: 500,
73+
}),
74+
).rejects.toThrow();
6275
await page.waitForSelector('[data-testid="rendered-html"]', {
63-
timeout: 500
76+
timeout: 500,
6477
});
6578
});
6679
});
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
4-
"types": ["@vitest/browser/providers/playwright"]
4+
"types": ["@vitest/browser/providers/playwright", "vitest/globals"]
55
},
66
"include": ["integrations.spec.ts"]
77
}

packages/render/integrations/vite/.yalc/@react-email/render/license.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

packages/render/integrations/vite/.yalc/@react-email/render/package.json

Lines changed: 0 additions & 99 deletions
This file was deleted.

packages/render/integrations/vite/.yalc/@react-email/render/readme.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

packages/render/integrations/vite/.yalc/@react-email/render/yalc.sig

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/render/integrations/vite/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"version": "0.0.0",
55
"type": "module",
66
"scripts": {
7+
"preinstall": "yalc add @react-email/render",
78
"dev": "vite",
89
"build": "tsc -b && vite build",
910
"lint": "eslint .",

packages/render/integrations/vite/src/App.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useState, useEffect } from 'react';
22
import { render } from '@react-email/render';
3-
import './App.css';
43

54
function App() {
65
const [html, setHtml] = useState('');

0 commit comments

Comments
 (0)