Preserve querystring when stripping file extension

src/index.js

@@ -551,14 +551,17 @@ module.exports = async (request, response, config = {}, methods = {}) => {
 	const handlers = getHandlers(methods);
 
 	let relativePath = null;
+	let search = null;
 	let acceptsJSON = null;
 
 	if (request.headers.accept) {
 		acceptsJSON = request.headers.accept.includes('application/json');
 	}
 
 	try {
-		relativePath = decodeURIComponent(url.parse(request.url).pathname);
+		const parsed = url.parse(request.url);
+		relativePath = decodeURIComponent(parsed.pathname);
+		search = parsed.search || '';
 	} catch (err) {
 		return sendError('/', response, acceptsJSON, current, handlers, config, {
 			statusCode: 400,
@@ -584,7 +587,7 @@ module.exports = async (request, response, config = {}, methods = {}) => {
 
 	if (redirect) {
 		response.writeHead(redirect.statusCode, {
-			Location: encodeURI(redirect.target)
+			Location: encodeURI(`${redirect.target}${search}`)
 		});
 
 		response.end();

test/integration.js

@@ -755,6 +755,23 @@ test('set `cleanUrls` config property to `true` and try with file', async t => {
 	t.is(location, `${url}${target}`);
 });
 
+test('set `cleanUrls` config property to `true` and try with query', async t => {
+	const target = '/directory/clean-file';
+	const search = '?foo=bar/';
+
+	const url = await getUrl({
+		cleanUrls: true
+	});
+
+	const response = await fetch(`${url}${target}.html${search}`, {
+		redirect: 'manual',
+		follow: 0
+	});
+
+	const location = response.headers.get('location');
+	t.is(location, `${url}${target}${search}`);
+});
+
 test('set `cleanUrls` config property to `true` and not index file found', async t => {
 	const contents = await getDirectoryContents();
 	const url = await getUrl({cleanUrls: true});