fix(vike): remove vike contentType warning

tsedio · Mar 6, 2024 · b2719c2 · b2719c2
1 parent 94a2419
commit b2719c2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/packages/third-parties/vike/src/services/ViteService.spec.ts b/packages/third-parties/vike/src/services/ViteService.spec.ts
@@ -32,7 +32,13 @@ async function getServiceFixture(httpResponse: any) {
 
   (mod.renderPage as jest.Mock).mockResolvedValue(pageContext);
 
-  return {renderPage: mod.renderPage, service, $ctx, pageContext, stateSnapshot: PlatformTest.injector.settings.get("stateSnapshot")};
+  return {
+    renderPage: mod.renderPage,
+    service,
+    $ctx,
+    pageContext,
+    stateSnapshot: PlatformTest.injector.settings.get("stateSnapshot")
+  };
 }
 
 describe("ViteService", () => {
@@ -49,12 +55,12 @@ describe("ViteService", () => {
       it("should render the page", async () => {
         const {$ctx, service, renderPage} = await getServiceFixture({
           statusCode: 200,
-          contentType: "text/html",
+          headers: [["content-type", "text/html"]],
           body: "html"
         });
 
         jest.spyOn($ctx.response, "status").mockReturnThis();
-        jest.spyOn($ctx.response, "contentType").mockReturnThis();
+        jest.spyOn($ctx.response, "setHeader").mockReturnThis();
 
         const result = await service.render("*", {$ctx});
 
@@ -80,7 +86,7 @@ describe("ViteService", () => {
           urlOriginal: "/"
         });
         expect($ctx.response.status).toHaveBeenCalledWith(200);
-        expect($ctx.response.contentType).toHaveBeenCalledWith("text/html");
+        expect($ctx.response.setHeader).toHaveBeenCalledWith("content-type", "text/html");
       });
       it("should return empty content if the page doesn't contains jsx content", async () => {
         const {$ctx, service, renderPage} = await getServiceFixture(null);
@@ -143,24 +149,34 @@ describe("ViteService", () => {
       beforeEach(() => {
         jest.resetAllMocks();
         return PlatformTest.create({
-          vite: {enableStream: true, root: "./path/to/client", stateSnapshot: jest.fn().mockReturnValue({state: "state"})}
+          vite: {
+            enableStream: true,
+            root: "./path/to/client",
+            stateSnapshot: jest.fn().mockReturnValue({state: "state"})
+          }
         });
       });
       afterEach(() => PlatformTest.reset());
 
       it("should render the page", async () => {
         const {$ctx, service, renderPage} = await getServiceFixture({
           statusCode: 200,
-          contentType: "text/html",
+          headers: [["content-type", "text/html"]],
           body: "html"
         });
 
         jest.spyOn($ctx.response, "status").mockReturnThis();
-        jest.spyOn($ctx.response, "contentType").mockReturnThis();
+        jest.spyOn($ctx.response, "setHeader").mockReturnThis();
 
         const result = await service.render("*", {$ctx});
 
-        expect(result).toEqual({body: "html", contentType: "text/html", statusCode: 200});
+        expect(result).toEqual({
+          body: "html",
+          "headers": [
+            ["content-type", "text/html"]
+          ],
+          statusCode: 200
+        });
         expect(renderPage).toHaveBeenCalledWith({
           view: "*",
           pageProps: {
@@ -182,7 +198,7 @@ describe("ViteService", () => {
           urlOriginal: "/"
         });
         expect($ctx.response.status).toHaveBeenCalledWith(200);
-        expect($ctx.response.contentType).toHaveBeenCalledWith("text/html");
+        expect($ctx.response.setHeader).toHaveBeenCalledWith("content-type", "text/html");
       });
     });
   });

diff --git a/packages/third-parties/vike/src/services/ViteService.ts b/packages/third-parties/vike/src/services/ViteService.ts
@@ -59,8 +59,8 @@ export class ViteService {
 
     if (pageContext.httpResponse) {
       const {httpResponse} = pageContext;
-
-      $ctx.response.contentType(httpResponse.contentType).status(httpResponse.statusCode);
+      httpResponse.headers?.forEach(([name, value]: [string, string]) => $ctx.response.setHeader(name, value));
+      $ctx.response.status(httpResponse.statusCode);
 
       if (this.enableStream) {
         return httpResponse;