From 7826f531f0f8899f536f0f71c1f61fd7f25c7f38 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Mon, 7 Dec 2020 14:56:26 -0800
Subject: [PATCH] revert fix for hmr regression, breaks svelte and vue

---
 snowpack/src/commands/dev.ts      | 18 ++++++------------
 snowpack/src/hmr-server-engine.ts |  2 --
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
index 9b48355ae5..9a9cfeb775 100644
--- a/snowpack/src/commands/dev.ts
+++ b/snowpack/src/commands/dev.ts
@@ -38,7 +38,6 @@ import * as colors from 'kleur/colors';
 import mime from 'mime-types';
 import os from 'os';
 import path from 'path';
-import querystring from 'querystring';
 import {performance} from 'perf_hooks';
 import onProcessExit from 'signal-exit';
 import stream from 'stream';
@@ -443,7 +442,7 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
     const isHMR = _isHMR ?? ((config.devOptions.hmr ?? true) && !isSSR);
     const allowStale = _allowStale ?? false;
     const encoding = _encoding ?? null;
-    const reqQuery = querystring.parse(reqUrl.split('?')[1]) as {mtime?: string};
+    const reqUrlHmrParam = reqUrl.includes('?mtime=') && reqUrl.split('?')[1];
     let reqPath = decodeURI(url.parse(reqUrl).pathname!);
     const originalReqPath = reqPath;
     let isProxyModule = false;
@@ -805,21 +804,16 @@ export async function startDevServer(commandOptions: CommandOptions): Promise<Sn
       }
 
       let code = wrappedResponse;
-      if (responseFileExt === '.js' && reqQuery.mtime) {
+      if (responseFileExt === '.js' && reqUrlHmrParam)
         code = await transformEsmImports(code as string, (imp) => {
           const importUrl = path.posix.resolve(path.posix.dirname(reqPath), imp);
           const node = hmrEngine.getEntry(importUrl);
-          if (!node || !node.needsReplacement) {
-            return imp;
+          if (node && node.needsReplacement) {
+            hmrEngine.markEntryForReplacement(node, false);
+            return `${imp}?${reqUrlHmrParam}`;
           }
-          hmrEngine.markEntryForReplacement(node, false);
-          if (node.isHmrAccepted) {
-            return imp;
-          }
-          node.mtime = reqQuery.mtime;
-          return `${imp}?mtime=${reqQuery.mtime}`;
+          return imp;
         });
-      }
 
       if (responseFileExt === '.js') {
         const isHmrEnabled = code.includes('import.meta.hot');
diff --git a/snowpack/src/hmr-server-engine.ts b/snowpack/src/hmr-server-engine.ts
index fdf57079c4..a22352fb9a 100644
--- a/snowpack/src/hmr-server-engine.ts
+++ b/snowpack/src/hmr-server-engine.ts
@@ -4,7 +4,6 @@ import type http from 'http';
 import type http2 from 'http2';
 
 interface Dependency {
-  mtime: string | undefined;
   dependents: Set<string>;
   dependencies: Set<string>;
   isHmrEnabled: boolean;
@@ -98,7 +97,6 @@ export class EsmHmrEngine {
 
   createEntry(sourceUrl: string) {
     const newEntry: Dependency = {
-      mtime: undefined,
       dependencies: new Set(),
       dependents: new Set(),
       needsReplacement: false,