fix(api): set charset along with Content-Type response headers

wessberg · Oct 22, 2020 · 80e9433 · 80e9433
1 parent 6545898
commit 80e9433
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/build/build.ts b/src/build/build.ts
@@ -31,6 +31,7 @@ export async function build({paths, features, featuresRequested, userAgent, cont
 	const banner = `\
 /**
  * ${featuresRequestedText}
+ *
  * ${polyfillsAppliedText}
  * @preserve
  */

diff --git a/src/controller/polyfill/polyfill-controller.ts b/src/controller/polyfill/polyfill-controller.ts
@@ -48,7 +48,7 @@ export class PolyfillController extends Controller implements IPolyfillControlle
 
 			// Return an OK
 			return {
-				contentType: "application/javascript",
+				contentType: "application/javascript; charset=utf-8",
 				statusCode: request.http2 ? constants.HTTP_STATUS_OK : OK,
 				body: buffer,
 				cacheControl: "public,max-age=31536000,immutable",
@@ -61,7 +61,7 @@ export class PolyfillController extends Controller implements IPolyfillControlle
 			const statusCode = request.http2 ? constants.HTTP_STATUS_INTERNAL_SERVER_ERROR : INTERNAL_SERVER_ERROR;
 
 			return {
-				contentType: "text/html",
+				contentType: "text/html; charset=utf-8",
 				statusCode,
 				body: generateErrorHtml(ex, statusCode)
 			};

diff --git a/test/server/server.test.ts b/test/server/server.test.ts
@@ -65,15 +65,12 @@ test("Is able to generate a bundle of every available polyfill", async t => {
 	const features = Object.entries(constant.polyfill)
 		.filter(([, value]) => !("polyfills" in value))
 		.map(([key, value]) => {
-			switch (key) {
-				case "zone":
-					return `${key}|${Object.keys(((value as unknown) as PolyfillDictNormalizedEntry).meta!).join("|")}|force`;
-				case "intl.core":
-				case "intl.list-format":
-				case "intl.relative-time-format":
-					return `${key}|locale=en~da|force`;
-				default:
-					return `${key}|force`;
+			if (key === "zone") {
+				return `${key}|${Object.keys(((value as unknown) as PolyfillDictNormalizedEntry).meta!).join("|")}|force`;
+			} else if (key.startsWith("intl.")) {
+				return `${key}|locale=en~da|force`;
+			} else {
+				return `${key}|force`;
 			}
 		});