From e0977c8c981a00f7d7826c8c9816b3356d4de3a0 Mon Sep 17 00:00:00 2001
From: dishuostec <dishuostec@gmail.com>
Date: Tue, 27 Oct 2020 19:50:56 +0800
Subject: [PATCH 1/3] reset etag with pathname only

---
 snowpack/src/commands/dev.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
index 914d100cdd..e3dd151a07 100644
--- a/snowpack/src/commands/dev.ts
+++ b/snowpack/src/commands/dev.ts
@@ -1167,7 +1167,11 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
         await result.checkStale();
       }
       if (result.contents) {
-        knownETags.set(reqPath, etag(result.contents, {weak: true}));
+        const tag = etag(result.contents, {weak: true});
+        knownETags.set(reqPath, tag);
+        if (reqPath.indexOf('?') >= 0) {
+          knownETags.set(reqPath.split('?', 2)[0], tag);
+        }
       }
       return;
     } catch (err) {

From e78121defe1a6d382ebd0bb3b5a478fed85993df Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Thu, 29 Oct 2020 07:15:18 -0700
Subject: [PATCH 2/3] Update dev.ts

---
 snowpack/src/commands/dev.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
index e3dd151a07..348413d5e5 100644
--- a/snowpack/src/commands/dev.ts
+++ b/snowpack/src/commands/dev.ts
@@ -1145,15 +1145,15 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
     res: http.ServerResponse,
     {handleError}: {handleError?: boolean} = {},
   ) {
-    const reqPath = req.url!;
+    const fullRequestUrl = req.url!;
     // Check if a configured proxy matches the request.
-    const requestProxy = getRequestProxy(reqPath);
+    const requestProxy = getRequestProxy(fullRequestUrl);
     if (requestProxy) {
       return requestProxy(req, res);
     }
     // Check if we can send back an optimized 304 response
     const quickETagCheck = req.headers['if-none-match'];
-    if (quickETagCheck && quickETagCheck === knownETags.get(reqPath)) {
+    if (quickETagCheck && quickETagCheck === knownETags.get(fullRequestUrl)) {
       logger.debug(`optimized etag! sending 304...`);
       res.writeHead(304, {'Access-Control-Allow-Origin': '*'});
       res.end();
@@ -1161,17 +1161,15 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
     }
     // Otherwise, load the file and respond if successful.
     try {
-      const result = await loadUrl(reqPath, {allowStale: true, encoding: null});
+      const result = await loadUrl(fullRequestUrl, {allowStale: true, encoding: null});
       sendResponseFile(req, res, result);
       if (result.checkStale) {
         await result.checkStale();
       }
       if (result.contents) {
         const tag = etag(result.contents, {weak: true});
+        const reqPath = decodeURI(url.parse(reqUrl).pathname!);
         knownETags.set(reqPath, tag);
-        if (reqPath.indexOf('?') >= 0) {
-          knownETags.set(reqPath.split('?', 2)[0], tag);
-        }
       }
       return;
     } catch (err) {

From b2394b91f02715b0a44a124c6a0b3b96fb684060 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Thu, 29 Oct 2020 07:17:54 -0700
Subject: [PATCH 3/3] Update dev.ts

---
 snowpack/src/commands/dev.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
index 348413d5e5..c062687d58 100644
--- a/snowpack/src/commands/dev.ts
+++ b/snowpack/src/commands/dev.ts
@@ -1145,15 +1145,15 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
     res: http.ServerResponse,
     {handleError}: {handleError?: boolean} = {},
   ) {
-    const fullRequestUrl = req.url!;
+    const reqUrl = req.url!;
     // Check if a configured proxy matches the request.
-    const requestProxy = getRequestProxy(fullRequestUrl);
+    const requestProxy = getRequestProxy(reqUrl);
     if (requestProxy) {
       return requestProxy(req, res);
     }
     // Check if we can send back an optimized 304 response
     const quickETagCheck = req.headers['if-none-match'];
-    if (quickETagCheck && quickETagCheck === knownETags.get(fullRequestUrl)) {
+    if (quickETagCheck && quickETagCheck === knownETags.get(reqUrl)) {
       logger.debug(`optimized etag! sending 304...`);
       res.writeHead(304, {'Access-Control-Allow-Origin': '*'});
       res.end();
@@ -1161,7 +1161,7 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
     }
     // Otherwise, load the file and respond if successful.
     try {
-      const result = await loadUrl(fullRequestUrl, {allowStale: true, encoding: null});
+      const result = await loadUrl(reqUrl, {allowStale: true, encoding: null});
       sendResponseFile(req, res, result);
       if (result.checkStale) {
         await result.checkStale();