fix: update Cloudflare adapter's default image service

packages/integrations/cloudflare/src/utils/image-config.ts

@@ -14,6 +14,10 @@ export function setImageConfig(
 	command: HookParameters<'astro:config:setup'>['command'],
 	logger: AstroIntegrationLogger,
 ) {
+	if (command === 'dev' && config.endpoint.entrypoint === undefined) {
+		config.endpoint.entrypoint = '@astrojs/cloudflare/image-endpoint';
+	}
+
 	switch (service) {
 		case 'passthrough':
 			return { ...config, service: passthroughImageService() };
@@ -39,7 +43,7 @@ export function setImageConfig(
 				...config,
 				service: sharpImageService(),
 				endpoint: {
-					entrypoint: command === 'dev' ? undefined : '@astrojs/cloudflare/image-endpoint',
+					entrypoint: '@astrojs/cloudflare/image-endpoint',
 				},
 			};
 

packages/integrations/cloudflare/test/compile-image-service.test.js

@@ -1,63 +1,129 @@
 import * as assert from 'node:assert/strict';
 import { after, before, describe, it } from 'node:test';
+import * as cheerio from 'cheerio';
 import { loadFixture } from './_test-utils.js';
 
 describe('CompileImageService', () => {
 	let fixture;
-	let previewServer;
 
 	before(async () => {
 		fixture = await loadFixture({
 			root: './fixtures/compile-image-service/',
 		});
-		await fixture.build();
-		previewServer = await fixture.preview();
 	});
 
-	after(async () => {
-		await previewServer.stop();
-	});
+	describe('dev', () => {
+		let devServer;
 
-	it('forbids http://', async () => {
-		const res = await fixture.fetch('/_image?href=http://placehold.co/600x400');
-		const html = await res.text();
-		const status = res.status;
-		assert.equal(html, 'Forbidden');
-		assert.equal(status, 403);
-	});
+		before(async () => {
+			devServer = await fixture.startDevServer();
+		});
 
-	it('forbids https://', async () => {
-		const res = await fixture.fetch('/_image?href=https://placehold.co/600x400');
-		const html = await res.text();
-		const status = res.status;
-		assert.equal(html, 'Forbidden');
-		assert.equal(status, 403);
-	});
+		after(async () => {
+			await devServer.stop();
+		});
 
-	it('forbids //', async () => {
-		const res = await fixture.fetch('/_image?href=//placehold.co/600x400');
-		const html = await res.text();
-		const status = res.status;
-		assert.equal(html, 'Blocked');
-		assert.equal(status, 403);
-	});
+		it('forbids http://', async () => {
+			const res = await fixture.fetch('/_image?href=http://placehold.co/600x400');
+			const html = await res.text();
+			const status = res.status;
+			assert.equal(html, 'Forbidden');
+			assert.equal(status, 403);
+		});
 
-	it('allows trusted with redirect', async () => {
-		const res = await fixture.fetch(
-			'/_image?href=https://astro.build/_astro/HeroBackground.B0iWl89K_2hpsgp.webp',
-			{ redirect: 'manual' },
-		);
-		const header = res.headers.get('location');
-		const status = res.status;
-		assert.equal(header, 'https://astro.build/_astro/HeroBackground.B0iWl89K_2hpsgp.webp');
-		assert.equal(status, 302);
+		it('forbids https://', async () => {
+			const res = await fixture.fetch('/_image?href=https://placehold.co/600x400');
+			const html = await res.text();
+			const status = res.status;
+			assert.equal(html, 'Forbidden');
+			assert.equal(status, 403);
+		});
+
+		it('forbids //', async () => {
+			const res = await fixture.fetch('/_image?href=//placehold.co/600x400');
+			const html = await res.text();
+			const status = res.status;
+			assert.equal(html, 'Blocked');
+			assert.equal(status, 403);
+		});
+
+		it('allows trusted with redirect', async () => {
+			const res = await fixture.fetch(
+				'/_image?href=https://astro.build/_astro/HeroBackground.B0iWl89K_2hpsgp.webp',
+				{ redirect: 'manual' },
+			);
+			const header = res.headers.get('location');
+			const status = res.status;
+			assert.equal(header, 'https://astro.build/_astro/HeroBackground.B0iWl89K_2hpsgp.webp');
+			assert.equal(status, 302);
+		});
+
+		// On the dev server, the URL for local images includes an absolute path,
+		// making it difficult to specify statically. Thus, we retrieve it dynamically from the HTML.
+		it('allows local', async () => {
+			const html = await fixture.fetch('/blog/post').then((res) => res.text());
+			const $ = cheerio.load(html);
+			const res = await fixture.fetch($('img').attr('src'));
+			const blob = await res.blob();
+			const status = res.status;
+			assert.equal(blob.type, 'image/jpeg');
+			assert.equal(status, 200);
+		});
 	});
 
-	it('allows local', async () => {
-		const res = await fixture.fetch('/_image?href=/_astro/placeholder.gLBdjEDe.jpg');
-		const blob = await res.blob();
-		const status = res.status;
-		assert.equal(blob.type, 'image/jpeg');
-		assert.equal(status, 200);
+	describe('preview', () => {
+		let previewServer;
+
+		before(async () => {
+			await fixture.build();
+			previewServer = await fixture.preview();
+		});
+
+		after(async () => {
+			await previewServer.stop();
+		});
+
+		it('forbids http://', async () => {
+			const res = await fixture.fetch('/_image?href=http://placehold.co/600x400');
+			const html = await res.text();
+			const status = res.status;
+			assert.equal(html, 'Forbidden');
+			assert.equal(status, 403);
+		});
+
+		it('forbids https://', async () => {
+			const res = await fixture.fetch('/_image?href=https://placehold.co/600x400');
+			const html = await res.text();
+			const status = res.status;
+			assert.equal(html, 'Forbidden');
+			assert.equal(status, 403);
+		});
+
+		it('forbids //', async () => {
+			const res = await fixture.fetch('/_image?href=//placehold.co/600x400');
+			const html = await res.text();
+			const status = res.status;
+			assert.equal(html, 'Blocked');
+			assert.equal(status, 403);
+		});
+
+		it('allows trusted with redirect', async () => {
+			const res = await fixture.fetch(
+				'/_image?href=https://astro.build/_astro/HeroBackground.B0iWl89K_2hpsgp.webp',
+				{ redirect: 'manual' },
+			);
+			const header = res.headers.get('location');
+			const status = res.status;
+			assert.equal(header, 'https://astro.build/_astro/HeroBackground.B0iWl89K_2hpsgp.webp');
+			assert.equal(status, 302);
+		});
+
+		it('allows local', async () => {
+			const res = await fixture.fetch('/_image?href=/_astro/placeholder.gLBdjEDe.jpg');
+			const blob = await res.blob();
+			const status = res.status;
+			assert.equal(blob.type, 'image/jpeg');
+			assert.equal(status, 200);
+		});
 	});
 });