change load file result from file name to contentType

FredKSchott · Nov 6, 2020 · 803e67c · 803e67c · vercel · Nov 6, 2020
1 parent d20c655
commit 803e67c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 29 deletions.
diff --git a/plugins/web-test-runner-plugin/plugin.js b/plugins/web-test-runner-plugin/plugin.js
@@ -38,7 +38,7 @@ To Resolve:
       }
       const reqPath = request.path;
       const result = await server.loadUrl(reqPath, {isSSR: false, encoding: 'utf8'});
-      return result.contents;
+      return {body: result.contents, type: result.contentType};
     },
     transformImport({source}) {
       if (!isTestFilePath(source) || source.startsWith('/__web-dev-server')) {

diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
@@ -181,11 +181,10 @@ function shouldProxy(pathPrefix: string, reqUrl: string) {
 function sendResponseFile(
   req: http.IncomingMessage,
   res: http.ServerResponse,
-  {contents, originalFileLoc, responseFileName}: LoadResult,
+  {contents, originalFileLoc, contentType}: LoadResult,
 ) {
   const body = Buffer.from(contents);
   const ETag = etag(body, {weak: true});
-  const contentType = mime.contentType(responseFileName);
   const headers: Record<string, string> = {
     'Accept-Ranges': 'bytes',
     'Access-Control-Allow-Origin': '*',
@@ -515,21 +514,21 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
       return {
         contents: encodeResponse(HMR_CLIENT_CODE, encoding),
         originalFileLoc: null,
-        responseFileName: 'hmr-client.js',
+        contentType: 'application/javascript',
       };
     }
     if (reqPath === getMetaUrlPath('/hmr-error-overlay.js', config)) {
       return {
         contents: encodeResponse(HMR_OVERLAY_CODE, encoding),
         originalFileLoc: null,
-        responseFileName: 'hmr-error-overlay.js',
+        contentType: 'application/javascript',
       };
     }
     if (reqPath === getMetaUrlPath('/env.js', config)) {
       return {
         contents: encodeResponse(generateEnvModule({mode: 'development', isSSR}), encoding),
         originalFileLoc: null,
-        responseFileName: 'env.js',
+        contentType: 'application/javascript',
       };
     }
 
@@ -936,11 +935,7 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
       return {
         contents: encodeResponse(responseContent, encoding),
         originalFileLoc: fileLoc,
-        responseFileName: replaceExt(
-          path.basename(fileLoc),
-          path.extname(fileLoc),
-          responseFileExt,
-        ),
+        contentType: mime.lookup(responseFileExt),
       };
     }
 
@@ -953,11 +948,7 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
         return {
           contents: encodeResponse(fileContents, encoding),
           originalFileLoc: fileLoc,
-          responseFileName: replaceExt(
-            path.basename(fileLoc),
-            path.extname(fileLoc),
-            responseFileExt,
-          ),
+          contentType: mime.lookup(responseFileExt),
         };
       }
       // Otherwise, finalize the response (where resolution happens) before sending.
@@ -983,11 +974,7 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
       return {
         contents: encodeResponse(responseContent, encoding),
         originalFileLoc: fileLoc,
-        responseFileName: replaceExt(
-          path.basename(fileLoc),
-          path.extname(fileLoc),
-          responseFileExt,
-        ),
+        contentType: mime.lookup(responseFileExt),
       };
     }
 
@@ -1035,11 +1022,7 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
         return {
           contents: encodeResponse(wrappedResponse, encoding),
           originalFileLoc: fileLoc,
-          responseFileName: replaceExt(
-            path.basename(fileLoc),
-            path.extname(fileLoc),
-            responseFileExt,
-          ),
+          contentType: mime.lookup(responseFileExt),
           // ...but verify.
           checkStale: async () => {
             let checkFinalBuildResult: SnowpackBuildMap | null = null;
@@ -1114,7 +1097,7 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
     return {
       contents: encodeResponse(responseContent, encoding),
       originalFileLoc: fileLoc,
-      responseFileName: replaceExt(path.basename(fileLoc), path.extname(fileLoc), responseFileExt),
+      contentType: mime.lookup(responseFileExt),
     };
   }
 

diff --git a/snowpack/src/types/snowpack.ts b/snowpack/src/types/snowpack.ts
@@ -14,7 +14,7 @@ export type DeepPartial<T> = {
 export interface LoadResult<T = Buffer | string> {
   contents: T;
   originalFileLoc: string | null;
-  responseFileName: string;
+  contentType: string | false;
   checkStale?: () => Promise<void>;
 }
 
@@ -57,7 +57,7 @@ export interface SnowpackDevServer {
   sendResponseFile: (
     req: http.IncomingMessage,
     res: http.ServerResponse,
-    {contents, originalFileLoc, responseFileName}: LoadResult,
+    {contents, originalFileLoc, contentType}: LoadResult,
   ) => void;
   sendResponseError: (req: http.IncomingMessage, res: http.ServerResponse, status: number) => void;
   onFileChange: (callback: OnFileChangeCallback) => void;