Merge branch 'main' into chore/prettier-v3

withastro · Sep 5, 2023 · f03273e · f03273e
2 parents 4fe62d5 + 923a443
commit f03273e
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 13 deletions.
diff --git a/.changeset/twelve-cars-tell.md b/.changeset/twelve-cars-tell.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix markdown page HMR
diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts
@@ -107,7 +107,7 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
 				}
 
 				const code = escapeViteEnvReferences(`
-				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent } from ${JSON.stringify(
+				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
 					astroServerRuntimeModulePath
 				)};
 				import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
@@ -180,10 +180,9 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
 							}, {
 								'default': () => render\`\${unescapeHTML(html)}\`
 							})}\`;`
-							: `render\`\${unescapeHTML(html)}\`;`
+							: `render\`\${maybeRenderHead(result)}\${unescapeHTML(html)}\`;`
 					}
 				});
-				Content[Symbol.for('astro.needsHeadRendering')] = ${layout ? 'false' : 'true'};
 				export default Content;
 				`);
 

diff --git a/packages/astro/test/astro-pages.test.js b/packages/astro/test/astro-pages.test.js
@@ -49,5 +49,10 @@ describe('Pages', () => {
 
 			expect($('#testing').length).to.be.greaterThan(0);
 		});
+
+		it('should have Vite client in dev', async () => {
+			const html = await fixture.fetch('/').then((res) => res.text());
+			expect(html).to.include('/@vite/client', 'Markdown page does not have Vite client for HMR');
+		});
 	});
 });
diff --git a/packages/integrations/cloudflare/test/basics.test.js b/packages/integrations/cloudflare/test/basics.test.js
@@ -8,14 +8,18 @@ describe('Basic app', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/basics/',
 		});
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/basics/', { silent: true, port: 8789 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {

diff --git a/packages/integrations/cloudflare/test/cf.test.js b/packages/integrations/cloudflare/test/cf.test.js
@@ -9,24 +9,28 @@ describe('Cf metadata and caches', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/cf/',
 			output: 'server',
 			adapter: cloudflare(),
 		});
 		await fixture.build();
 
-		cli = await runCLI('./fixtures/cf/', { silent: false, port: 8788 });
-		await cli.ready;
+		cli = await runCLI('./fixtures/cf/', { silent: true, port: 8786 });
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {
 		await cli.stop();
 	});
 
 	it('Load cf and caches API', async () => {
-		let res = await fetch(`http://127.0.0.1:8788/`);
+		let res = await fetch(`http://127.0.0.1:8786/`);
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);

diff --git a/packages/integrations/cloudflare/test/runtime.test.js b/packages/integrations/cloudflare/test/runtime.test.js
@@ -9,7 +9,7 @@ describe('Runtime Locals', () => {
 	/** @type {import('./test-utils.js').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/runtime/',
 			output: 'server',
@@ -18,7 +18,11 @@ describe('Runtime Locals', () => {
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/runtime/', { silent: true, port: 8793 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {

diff --git a/packages/integrations/cloudflare/test/with-solid-js.test.js b/packages/integrations/cloudflare/test/with-solid-js.test.js
@@ -8,14 +8,18 @@ describe('With SolidJS', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/with-solid-js/',
 		});
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/with-solid-js/', { silent: true, port: 8790 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {