withastro · rishi-raj-jain · Sep 18, 2023 · Sep 18, 2023 · Sep 20, 2023 · Sep 21, 2023
diff --git a/packages/integrations/node/src/http-server.ts b/packages/integrations/node/src/http-server.ts
@@ -23,21 +23,36 @@ function parsePathname(pathname: string, host: string | undefined, port: number)
 
 export function createServer(
 	{ client, port, host, removeBase }: CreateServerOptions,
-	handler: http.RequestListener
+	handler: http.RequestListener,
+	trailingSlash: string
 ) {
 	const listener: http.RequestListener = (req, res) => {
 		if (req.url) {
 			let pathname: string | undefined = removeBase(req.url);
 			pathname = pathname[0] === '/' ? pathname : '/' + pathname;
-			const encodedURI = parsePathname(pathname, host, port);
+			let encodedURI = parsePathname(pathname, host, port);
 
 			if (!encodedURI) {
 				res.writeHead(400);
 				res.end('Bad request.');
 				return res;
 			}
 
-			const stream = send(req, encodedURI, {
+			let pathForSend = encodedURI;
+
+			if (trailingSlash === 'never') {
+				if (pathname.endsWith('/')) {
+					encodedURI = parsePathname(pathname.substring(0, pathname.length - 1), host, port);
+					if (!encodedURI) {
+						res.writeHead(400);
+						res.end('Bad request.');
+						return res;
+					}
+				}
+				pathForSend = encodedURI + '/';
+			}
+
+			const stream = send(req, pathForSend, {
 				root: fileURLToPath(client),
 				dotfiles: pathname.startsWith('/.well-known/') ? 'allow' : 'deny',
 			});
@@ -64,9 +79,11 @@ export function createServer(
 					location = req.url + '/';
 				}
 
-				res.statusCode = 301;
-				res.setHeader('Location', location);
-				res.end(location);
+				if (!pathForSend.endsWith('/')) {
+					res.statusCode = 301;
+					res.setHeader('Location', location);
+					res.end(location);
+				}
 			});
 			stream.on('file', () => {
 				forwardError = true;

diff --git a/packages/integrations/node/src/index.ts b/packages/integrations/node/src/index.ts
@@ -46,6 +46,7 @@ export default function createIntegration(userOptions: UserOptions): AstroIntegr
 					server: config.build.server?.toString(),
 					host: config.server.host,
 					port: config.server.port,
+					trailingSlash: config.trailingSlash,
 				};
 				setAdapter(getAdapter(_options));
 

diff --git a/packages/integrations/node/src/preview.ts b/packages/integrations/node/src/preview.ts
@@ -60,7 +60,8 @@ const preview: CreatePreviewServer = async function ({
 			host,
 			removeBase,
 		},
-		handler
+		handler,
+		'ignore'
 	);
 	const address = getNetworkAddress('http', host, port);
 

diff --git a/packages/integrations/node/src/standalone.ts b/packages/integrations/node/src/standalone.ts
@@ -53,7 +53,8 @@ export default function startServer(app: NodeApp, options: Options) {
 			host,
 			removeBase: app.removeBase.bind(app),
 		},
-		handler
+		handler,
+		options.trailingSlash
 	);
 
 	const protocol = server.server instanceof https.Server ? 'https' : 'http';

diff --git a/packages/integrations/node/src/types.ts b/packages/integrations/node/src/types.ts
@@ -15,6 +15,7 @@ export interface Options extends UserOptions {
 	port: number;
 	server: string;
 	client: string;
+	trailingSlash: string;
 }
 
 export type RequestHandlerParams = [

diff --git a/packages/integrations/node/test/fixtures/trailing-slash/package.json b/packages/integrations/node/test/fixtures/trailing-slash/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/nodejs-trailing-slash",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*",
+    "@astrojs/node": "workspace:*"
+  }
+}
diff --git a/packages/integrations/node/test/fixtures/trailing-slash/src/pages/one.astro b/packages/integrations/node/test/fixtures/trailing-slash/src/pages/one.astro
@@ -0,0 +1,10 @@
+---
+---
+<html>
+	<head>
+		<title>One</title>
+	</head>
+	<body>
+		<h1>One</h1>
+	</body>
+</html>
diff --git a/packages/integrations/node/test/trailing-slash.test.js b/packages/integrations/node/test/trailing-slash.test.js
@@ -0,0 +1,82 @@
+import nodejs from '../dist/index.js';
+import { loadFixture } from './test-utils.js';
+import { expect } from 'chai';
+/**
+ * @typedef {import('astro/test/test-utils.js').Fixture} Fixture
+ */
+
+async function load() {
+	const mod = await import(
+		`./fixtures/trailing-slash/dist/server/entry.mjs?dropcache=${Date.now()}`
+	);
+	return mod;
+}
+
+describe('Trailing Slash In Production', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+	let server;
+
+	describe('By default does add the trailing slash', async () => {
+		before(async () => {
+			process.env.ASTRO_NODE_AUTOSTART = 'disabled';
+			process.env.PRERENDER = true;
+
+			fixture = await loadFixture({
+				// inconsequential config that differs between tests
+				// to bust cache and prevent modules and their state
+				// from being reused
+				output: 'hybrid',
+				root: './fixtures/trailing-slash/',
+				adapter: nodejs({ mode: 'standalone' }),
+			});
+			await fixture.build();
+			const { startServer } = await load();
+			let res = startServer();
+			server = res.server;
+		});
+
+		after(async () => {
+			await server.stop();
+			await fixture.clean();
+			delete process.env.PRERENDER;
+		});
+
+		it('redirects each route to have trailing slash', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/one`);
+			expect(res.url).to.contain('one/');
+		});
+	});
+
+	describe('Does not add trailing slash when set to never', async () => {
+		before(async () => {
+			process.env.ASTRO_NODE_AUTOSTART = 'disabled';
+			process.env.PRERENDER = true;
+
+			fixture = await loadFixture({
+				// inconsequential config that differs between tests
+				// to bust cache and prevent modules and their state
+				// from being reused
+				output: 'hybrid',
+				trailingSlash: 'never',
+				root: './fixtures/trailing-slash/',
+				adapter: nodejs({ mode: 'standalone' }),
+			});
+			await fixture.build();
+			const { startServer } = await load();
+			let res = startServer();
+			server = res.server;
+		});
+
+		after(async () => {
+			await server.stop();
+			await fixture.clean();
+			delete process.env.PRERENDER;
+		});
+
+		it('redirects each route to have trailing slash', async () => {
+			const res = await fetch(`http://${server.host}:${server.port}/one`);
+			expect(res.url).to.not.contain('one/');
+		});
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml