@marko/vite 2.3.11 → 2.3.12

package/dist/index.js

@@ -82,10 +82,8 @@ function markoPlugin(opts = {}) {
     const id = normalizePath(from) + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
-      if (prev && prev.code !== dep.code) {
-        devServer.moduleGraph.invalidateModule(
-          devServer.moduleGraph.getModuleById(id)
-        );
+      if (isDeferredPromise(prev)) {
+        prev.resolve(dep);
       }
     }
     virtualFiles.set(id, dep);
@@ -188,6 +186,8 @@ function markoPlugin(opts = {}) {
         devServer.watcher.on("all", (type, filename) => {
           if (type === "unlink") {
             entrySources.delete(filename);
+            transformWatchFiles.delete(filename);
+            transformOptionalFiles.delete(filename);
           }
           for (const [id, files] of transformWatchFiles) {
             if ((0, import_anymatch.default)(files, filename)) {
@@ -195,19 +195,23 @@ function markoPlugin(opts = {}) {
             }
           }
           if (type === "add" || type === "unlink") {
-            let clearedCache = false;
             for (const [id, files] of transformOptionalFiles) {
               if ((0, import_anymatch.default)(files, filename)) {
-                if (!clearedCache) {
-                  baseConfig.cache.clear();
-                  clearedCache = true;
-                }
                 devServer.watcher.emit("change", id);
               }
             }
           }
         });
       },
+      handleHotUpdate(ctx) {
+        compiler.taglib.clearCaches();
+        baseConfig.cache.clear();
+        for (const mod of ctx.modules) {
+          if (mod.id && virtualFiles.has(mod.id)) {
+            virtualFiles.set(mod.id, createDeferredPromise());
+          }
+        }
+      },
       async buildStart(inputOptions) {
         if (isBuild && linked && !isSSRBuild) {
           try {
@@ -343,7 +347,7 @@ function markoPlugin(opts = {}) {
         let { code } = compiled;
         if (query !== browserEntryQuery && devServer) {
           code += `
-if (import.meta.hot) import.meta.hot.accept();`;
+if (import.meta.hot) import.meta.hot.accept(() => {});`;
         }
         if (devServer) {
           const templateName = getBasenameWithoutExt(id);
@@ -477,6 +481,20 @@ function getBasenameWithoutExt(file) {
   const extStart = file.indexOf(".", baseStart + 1);
   return file.slice(baseStart, extStart);
 }
+function createDeferredPromise() {
+  let resolve;
+  let reject;
+  const promise = new Promise((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  promise.resolve = resolve;
+  promise.reject = reject;
+  return promise;
+}
+function isDeferredPromise(obj) {
+  return typeof (obj == null ? void 0 : obj.then) === "function";
+}
 function isEmpty(obj) {
   for (const _ in obj) {
     return false;

package/dist/index.mjs

@@ -62,10 +62,8 @@ function markoPlugin(opts = {}) {
     const id = normalizePath(from) + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
-      if (prev && prev.code !== dep.code) {
-        devServer.moduleGraph.invalidateModule(
-          devServer.moduleGraph.getModuleById(id)
-        );
+      if (isDeferredPromise(prev)) {
+        prev.resolve(dep);
       }
     }
     virtualFiles.set(id, dep);
@@ -168,6 +166,8 @@ function markoPlugin(opts = {}) {
         devServer.watcher.on("all", (type, filename) => {
           if (type === "unlink") {
             entrySources.delete(filename);
+            transformWatchFiles.delete(filename);
+            transformOptionalFiles.delete(filename);
           }
           for (const [id, files] of transformWatchFiles) {
             if (anyMatch(files, filename)) {
@@ -175,19 +175,23 @@ function markoPlugin(opts = {}) {
             }
           }
           if (type === "add" || type === "unlink") {
-            let clearedCache = false;
             for (const [id, files] of transformOptionalFiles) {
               if (anyMatch(files, filename)) {
-                if (!clearedCache) {
-                  baseConfig.cache.clear();
-                  clearedCache = true;
-                }
                 devServer.watcher.emit("change", id);
               }
             }
           }
         });
       },
+      handleHotUpdate(ctx) {
+        compiler.taglib.clearCaches();
+        baseConfig.cache.clear();
+        for (const mod of ctx.modules) {
+          if (mod.id && virtualFiles.has(mod.id)) {
+            virtualFiles.set(mod.id, createDeferredPromise());
+          }
+        }
+      },
       async buildStart(inputOptions) {
         if (isBuild && linked && !isSSRBuild) {
           try {
@@ -323,7 +327,7 @@ function markoPlugin(opts = {}) {
         let { code } = compiled;
         if (query !== browserEntryQuery && devServer) {
           code += `
-if (import.meta.hot) import.meta.hot.accept();`;
+if (import.meta.hot) import.meta.hot.accept(() => {});`;
         }
         if (devServer) {
           const templateName = getBasenameWithoutExt(id);
@@ -457,6 +461,20 @@ function getBasenameWithoutExt(file) {
   const extStart = file.indexOf(".", baseStart + 1);
   return file.slice(baseStart, extStart);
 }
+function createDeferredPromise() {
+  let resolve;
+  let reject;
+  const promise = new Promise((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  promise.resolve = resolve;
+  promise.reject = reject;
+  return promise;
+}
+function isDeferredPromise(obj) {
+  return typeof (obj == null ? void 0 : obj.then) === "function";
+}
 function isEmpty(obj) {
   for (const _ in obj) {
     return false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.3.11",
+  "version": "2.3.12",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {