Improve error handling

packages/astro/e2e/error-react-spectrum.test.js

@@ -0,0 +1,24 @@
+import { expect } from '@playwright/test';
+import { testFactory, getErrorOverlayMessage } from './test-utils.js';
+
+const test = testFactory({ root: './fixtures/error-react-spectrum/' });
+
+let devServer;
+
+test.beforeEach(async ({ astro }) => {
+	devServer = await astro.startDevServer();
+});
+
+test.afterEach(async ({ astro }) => {
+	await devServer.stop();
+	astro.resetAllFiles();
+});
+
+test.describe('Error: React Spectrum', () => {
+	test('overlay', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/'));
+
+		const message = await getErrorOverlayMessage(page);
+		expect(message).toMatch('@adobe/react-spectrum is not compatible')
+	});
+});

packages/astro/e2e/error-sass.test.js

@@ -0,0 +1,24 @@
+import { expect } from '@playwright/test';
+import { testFactory, getErrorOverlayMessage } from './test-utils.js';
+
+const test = testFactory({ root: './fixtures/error-sass/' });
+
+let devServer;
+
+test.beforeEach(async ({ astro }) => {
+	devServer = await astro.startDevServer();
+});
+
+test.afterEach(async ({ astro }) => {
+	await devServer.stop();
+	astro.resetAllFiles();
+});
+
+test.describe('Error: Sass', () => {
+	test('overlay', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/'));
+
+		const message = await getErrorOverlayMessage(page);
+		expect(message).toMatch('Undefined variable')
+	});
+});

packages/astro/e2e/errors.test.js

@@ -0,0 +1,67 @@
+import { expect } from '@playwright/test';
+import { testFactory, getErrorOverlayMessage } from './test-utils.js';
+
+const test = testFactory({ root: './fixtures/errors/' });
+
+let devServer;
+
+test.beforeEach(async ({ astro }) => {
+	devServer = await astro.startDevServer();
+});
+
+test.afterEach(async ({ astro }) => {
+	await devServer.stop();
+	astro.resetAllFiles();
+});
+
+test.describe('Error display', () => {
+	test('detect syntax errors in template', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/astro-syntax-error'));
+
+		const message = await getErrorOverlayMessage(page);
+		expect(message).toMatch('Unexpected "}"')
+
+		await Promise.all([
+			// Wait for page reload
+			page.waitForNavigation(),
+			// Edit the component file
+			await astro.editFile('./src/pages/astro-syntax-error.astro', () => `<h1>No syntax error</h1>`)
+		]);
+
+		expect(await page.locator('vite-error-overlay').count()).toEqual(0);
+	});
+
+	test('shows useful error when frontmatter import is not found', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/import-not-found'));
+
+		const message = await getErrorOverlayMessage(page);
+		expect(message).toMatch('failed to load module for ssr: ../abc.astro')
+
+		await Promise.all([
+			// Wait for page reload
+			page.waitForNavigation(),
+			// Edit the component file
+			astro.editFile('./src/pages/import-not-found.astro', () => `<h1>No import error</h1>`)
+		]);
+
+		expect(await page.locator('vite-error-overlay').count()).toEqual(0);
+	});
+
+	test('framework errors recover when fixed', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/svelte-syntax-error'));
+
+		const message = await getErrorOverlayMessage(page);
+		expect(message).toMatch('</div> attempted to close an element that was not open')
+
+		await Promise.all([
+			// Wait for page reload
+			page.waitForNavigation(),
+			// Edit the component file
+			astro.editFile('./src/components/SvelteSyntaxError.svelte', () => `<h1>No mismatch</h1>`)
+		]);
+
+		expect(await page.locator('vite-error-overlay').count()).toEqual(0);
+	});
+
+
+});

packages/astro/test/fixtures/error-react-spectrum/package.json → packages/astro/e2e/fixtures/error-react-spectrum/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@test/error-react-spectrum",
+  "name": "@e2e/error-react-spectrum",
   "version": "0.0.0",
   "private": true,
   "dependencies": {

packages/astro/test/fixtures/sass/package.json → packages/astro/e2e/fixtures/error-sass/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@test/sass",
+  "name": "@e2e/error-sass",
   "version": "0.0.0",
   "private": true,
   "dependencies": {

packages/astro/test/fixtures/errors/package.json → packages/astro/e2e/fixtures/errors/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@test/errors",
+  "name": "@e2e/errors",
   "version": "0.0.0",
   "private": true,
   "dependencies": {

packages/astro/e2e/fixtures/preact-component/src/pages/mdx.mdx

@@ -1,4 +1,4 @@
-
+export { default } from '../components/Layout.astro';
 import Counter from '../components/Counter.jsx';
 import PreactComponent from '../components/JSXComponent.jsx';
 

packages/astro/e2e/fixtures/react-component/src/pages/mdx.mdx

@@ -1,3 +1,4 @@
+export { default } from '../components/Layout.astro';
 import Counter from '../components/Counter.jsx';
 import ReactComponent from '../components/JSXComponent.jsx';
 

packages/astro/e2e/fixtures/solid-component/src/pages/mdx.mdx

@@ -1,3 +1,4 @@
+export { default } from '../components/Layout.astro';
 import Counter from '../components/Counter.jsx';
 import SolidComponent from '../components/SolidComponent.jsx';
 

packages/astro/e2e/fixtures/svelte-component/src/pages/mdx.mdx

@@ -1,3 +1,4 @@
+export { default } from '../components/Layout.astro';
 import Counter from '../components/Counter.svelte';
 import SvelteComponent from '../components/SvelteComponent.svelte';
 

packages/astro/e2e/fixtures/vue-component/src/pages/mdx.mdx

@@ -1,3 +1,4 @@
+export { default } from '../components/Layout.astro';
 import Counter from '../components/Counter.vue';
 import VueComponent from '../components/VueComponent.vue';
 

packages/astro/e2e/preact-compat-component.test.js

@@ -2,18 +2,23 @@ import { prepareTestFactory } from './shared-component-tests.js';
 
 const { test, createTests } = prepareTestFactory({ root: './fixtures/preact-compat-component/' });
 
+const config = {
+		counterComponentFilePath: './src/components/Counter.jsx',
+		componentFilePath: './src/components/JSXComponent.jsx',
+}
+
 test.describe('preact/compat components in Astro files', () => {
 	createTests({
+		...config,
 		pageUrl: '/',
 		pageSourceFilePath: './src/pages/index.astro',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });
 
 test.describe('preact/compat components in Markdown files', () => {
 	createTests({
+		...config,
 		pageUrl: '/markdown/',
 		pageSourceFilePath: './src/pages/markdown.md',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });

packages/astro/e2e/preact-component.test.js

@@ -2,26 +2,31 @@ import { prepareTestFactory } from './shared-component-tests.js';
 
 const { test, createTests } = prepareTestFactory({ root: './fixtures/preact-component/' });
 
+const config = {
+		counterComponentFilePath: './src/components/Counter.jsx',
+		componentFilePath: './src/components/JSXComponent.jsx',
+}
+
 test.describe('Preact components in Astro files', () => {
 	createTests({
+		...config,
 		pageUrl: '/',
 		pageSourceFilePath: './src/pages/index.astro',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });
 
 test.describe('Preact components in Markdown files', () => {
 	createTests({
+		...config,
 		pageUrl: '/markdown/',
 		pageSourceFilePath: './src/pages/markdown.md',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });
 
 test.describe('Preact components in MDX files', () => {
 	createTests({
+		...config,
 		pageUrl: '/mdx/',
 		pageSourceFilePath: './src/pages/mdx.mdx',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });

packages/astro/e2e/react-component.test.js

@@ -2,26 +2,31 @@ import { prepareTestFactory } from './shared-component-tests.js';
 
 const { test, createTests } = prepareTestFactory({ root: './fixtures/react-component/' });
 
+const config = {
+		counterComponentFilePath: './src/components/Counter.jsx',
+		componentFilePath: './src/components/JSXComponent.jsx',
+}
+
 test.describe('React components in Astro files', () => {
 	createTests({
+		...config,
 		pageUrl: '/',
 		pageSourceFilePath: './src/pages/index.astro',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });
 
 test.describe('React components in Markdown files', () => {
 	createTests({
+		...config,
 		pageUrl: '/markdown/',
 		pageSourceFilePath: './src/pages/markdown.md',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });
 
 test.describe('React components in MDX files', () => {
 	createTests({
+		...config,
 		pageUrl: '/mdx/',
 		pageSourceFilePath: './src/pages/mdx.mdx',
-		componentFilePath: './src/components/JSXComponent.jsx',
 	});
 });

packages/astro/e2e/shared-component-tests.js

@@ -1,5 +1,5 @@
 import { expect } from '@playwright/test';
-import { testFactory } from './test-utils.js';
+import { testFactory, getErrorOverlayMessage } from './test-utils.js';
 
 export function prepareTestFactory(opts) {
 	const test = testFactory(opts);

packages/astro/e2e/solid-component.test.js

@@ -2,26 +2,31 @@ import { prepareTestFactory } from './shared-component-tests.js';
 
 const { test, createTests } = prepareTestFactory({ root: './fixtures/solid-component/' });
 
+const config = {
+	componentFilePath: './src/components/SolidComponent.jsx',
+	counterComponentFilePath: './src/components/Counter.jsx',
+}
+
 test.describe('Solid components in Astro files', () => {
 	createTests({
+		...config,
 		pageUrl: '/',
 		pageSourceFilePath: './src/pages/index.astro',
-		componentFilePath: './src/components/SolidComponent.jsx',
 	});
 });
 
 test.describe('Solid components in Markdown files', () => {
 	createTests({
+		...config,
 		pageUrl: '/markdown/',
 		pageSourceFilePath: './src/pages/markdown.md',
-		componentFilePath: './src/components/SolidComponent.jsx',
 	});
 });
 
 test.describe('Solid components in MDX files', () => {
 	createTests({
+		...config,
 		pageUrl: '/mdx/',
 		pageSourceFilePath: './src/pages/mdx.mdx',
-		componentFilePath: './src/components/SolidComponent.jsx',
 	});
 });

packages/astro/e2e/svelte-component.test.js

@@ -2,29 +2,32 @@ import { prepareTestFactory } from './shared-component-tests.js';
 
 const { test, createTests } = prepareTestFactory({ root: './fixtures/svelte-component/' });
 
+const config = {
+	componentFilePath: './src/components/SvelteComponent.svelte',
+	counterComponentFilePath: './src/components/Counter.svelte',
+	counterCssFilePath: './src/components/Counter.svelte',
+}
+
 test.describe('Svelte components in Astro files', () => {
 	createTests({
+		...config,
 		pageUrl: '/',
 		pageSourceFilePath: './src/pages/index.astro',
-		componentFilePath: './src/components/SvelteComponent.svelte',
-		counterCssFilePath: './src/components/Counter.svelte',
 	});
 });
 
 test.describe('Svelte components in Markdown files', () => {
 	createTests({
+		...config,
 		pageUrl: '/markdown/',
 		pageSourceFilePath: './src/pages/markdown.md',
-		componentFilePath: './src/components/SvelteComponent.svelte',
-		counterCssFilePath: './src/components/Counter.svelte',
 	});
 });
 
 test.describe('Svelte components in MDX files', () => {
 	createTests({
+		...config,
 		pageUrl: '/mdx/',
 		pageSourceFilePath: './src/pages/mdx.mdx',
-		componentFilePath: './src/components/SvelteComponent.svelte',
-		counterCssFilePath: './src/components/Counter.svelte',
 	});
 });

packages/astro/e2e/test-utils.js

@@ -1,4 +1,4 @@
-import { test as testBase } from '@playwright/test';
+import { test as testBase, expect } from '@playwright/test';
 import { loadFixture as baseLoadFixture } from '../test/test-utils.js';
 
 export function loadFixture(inlineConfig) {
@@ -29,3 +29,11 @@ export function testFactory(inlineConfig) {
 
 	return test;
 }
+
+export async function getErrorOverlayMessage(page) {
+	const overlay = await page.waitForSelector('vite-error-overlay', { strict: true, timeout: 10 * 1000 })
+
+	expect(overlay).toBeTruthy()
+
+	return await overlay.$$eval('.message-body', (m) => m[0].textContent)
+}

packages/astro/e2e/vue-component.test.js

@@ -2,29 +2,32 @@ import { prepareTestFactory } from './shared-component-tests.js';
 
 const { test, createTests } = prepareTestFactory({ root: './fixtures/vue-component/' });
 
+const config = {
+	componentFilePath: './src/components/VueComponent.vue',
+	counterCssFilePath: './src/components/Counter.vue',
+	counterComponentFilePath: './src/components/Counter.vue',
+}
+
 test.describe('Vue components in Astro files', () => {
 	createTests({
+		...config,
 		pageUrl: '/',
 		pageSourceFilePath: './src/pages/index.astro',
-		componentFilePath: './src/components/VueComponent.vue',
-		counterCssFilePath: './src/components/Counter.vue',
 	});
 });
 
 test.describe('Vue components in Markdown files', () => {
 	createTests({
+		...config,
 		pageUrl: '/markdown/',
 		pageSourceFilePath: './src/pages/markdown.md',
-		componentFilePath: './src/components/VueComponent.vue',
-		counterCssFilePath: './src/components/Counter.vue',
 	});
 });
 
 test.describe('Vue components in MDX files', () => {
 	createTests({
+		...config,
 		pageUrl: '/mdx/',
 		pageSourceFilePath: './src/pages/mdx.mdx',
-		componentFilePath: './src/components/VueComponent.vue',
-		counterCssFilePath: './src/components/Counter.vue',
 	});
 });