Handle static file serving in Deno adapter's start command (#3121)

* Handle static file serving in Deno adapter's start command * Adds a changeset * Ignore a .ts imort
withastro · Apr 15, 2022 · e5383cd · e5383cd
1 parent b0ba22c
commit e5383cd
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 8 deletions.
diff --git a/.changeset/brave-planes-punch.md b/.changeset/brave-planes-punch.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/deno': patch
+---
+
+Handles file serving in the main export
diff --git a/packages/integrations/deno/src/index.ts b/packages/integrations/deno/src/index.ts
@@ -10,7 +10,7 @@ export function getAdapter(args?: Options): AstroAdapter {
 		name: '@astrojs/deno',
 		serverEntrypoint: '@astrojs/deno/server.js',
 		args: args ?? {},
-		exports: ['stop', 'handle'],
+		exports: ['stop', 'handle', 'start', 'running'],
 	};
 }
 

diff --git a/packages/integrations/deno/src/server.ts b/packages/integrations/deno/src/server.ts
@@ -3,6 +3,8 @@ import type { SSRManifest } from 'astro';
 import { App } from 'astro/app';
 // @ts-ignore
 import { Server } from 'https://deno.land/[email protected]/http/server.ts';
+// @ts-ignore
+import { fetch } from 'https://deno.land/x/file_fetch/mod.ts';
 
 interface Options {
 	port?: number;
@@ -18,32 +20,43 @@ export function start(manifest: SSRManifest, options: Options) {
 		return;
 	}
 
+	const clientRoot = new URL('../client/', import.meta.url);
 	const app = new App(manifest);
-
 	const handler = async (request: Request) => {
-		const response = await app.render(request);
-		return response;
+		if(app.match(request)) {
+			return await app.render(request);
+		}
+
+		const url = new URL(request.url);
+		const localPath = new URL('.' + url.pathname, clientRoot);
+		return fetch(localPath.toString());
 	};
 
 	_server = new Server({
 		port: options.port ?? 8085,
 		hostname: options.hostname ?? '0.0.0.0',
 		handler,
-		//onError: options.onError,
 	});
 
 	_startPromise = _server.listenAndServe();
 }
 
-export function createExports(manifest: SSRManifest) {
+export function createExports(manifest: SSRManifest, options: Options) {
 	const app = new App(manifest);
 	return {
 		async stop() {
 			if (_server) {
 				_server.close();
+				_server = undefined;
 			}
 			await Promise.resolve(_startPromise);
 		},
+		running() {
+			return _server !== undefined;
+		},
+		async start() {
+			return start(manifest, options);
+		},
 		async handle(request: Request) {
 			return app.render(request);
 		},

diff --git a/packages/integrations/deno/test/basics.test.js b/packages/integrations/deno/test/basics.test.js
@@ -1,14 +1,38 @@
 import { runBuildAndStartApp } from './helpers.js';
-import { assertEquals, assert } from './deps.js';
+import { assertEquals, assert, DOMParser } from './deps.js';
+
+async function startApp(cb) {
+	await runBuildAndStartApp('./fixtures/basics/', cb);
+}
 
 Deno.test({
 	name: 'Basics',
 	async fn() {
-		await runBuildAndStartApp('./fixtures/basics/', async () => {
+		await startApp(async () => {
 			const resp = await fetch('http://127.0.0.1:8085/');
 			assertEquals(resp.status, 200);
 			const html = await resp.text();
 			assert(html);
 		});
 	},
 });
+
+Deno.test({
+	name: 'Loads style assets',
+	async fn() {
+		await startApp(async () => {
+			let resp = await fetch('http://127.0.0.1:8085/');
+			const html = await resp.text();
+
+			const doc = new DOMParser().parseFromString(html, `text/html`);
+			const link = doc.querySelector('link');
+			const href = link.getAttribute('href');
+
+			resp = await fetch(new URL(href, 'http://127.0.0.1:8085/'));
+			assertEquals(resp.status, 200);
+			const ct = resp.headers.get('content-type');
+			assertEquals(ct, 'text/css');
+			await resp.body.cancel()
+		});
+	}
+})
diff --git a/packages/integrations/deno/test/deps.js b/packages/integrations/deno/test/deps.js
@@ -1,2 +1,3 @@
 export * from 'https://deno.land/[email protected]/path/mod.ts';
 export * from 'https://deno.land/[email protected]/testing/asserts.ts';
+export * from 'https://deno.land/x/deno_dom/deno-dom-wasm.ts';
diff --git a/packages/integrations/deno/test/fixtures/basics/src/pages/index.astro b/packages/integrations/deno/test/fixtures/basics/src/pages/index.astro
@@ -4,6 +4,7 @@
 <html>
 <head>
 	<title>Basic App on Deno</title>
+	<style>body { font-family: 'Courier New', Courier, monospace; }</style>
 </head>
 <body>
 	<h1>Basic App on Deno</h1>

diff --git a/packages/integrations/deno/test/helpers.js b/packages/integrations/deno/test/helpers.js
@@ -14,6 +14,9 @@ export async function runBuildAndStartApp(fixturePath, cb) {
 	const url = new URL(fixturePath, dir);
 	const close = await runBuild(fixturePath);
 	const mod = await import(new URL('./dist/server/entry.mjs', url));
+	if(!mod.running()) {
+		mod.start();
+	}
 	await cb();
 	await mod.stop();
 	await close();
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     <html>
     <head>
     	<title>Basic App on Deno</title>
+    	<style>body { font-family: 'Courier New', Courier, monospace; }</style>
     </head>
     <body>
     	<h1>Basic App on Deno</h1>
@@ Expand Down @@