@marko/vite 5.4.2 → 5.4.3

package/dist/index.mjs

@@ -796,6 +796,7 @@ var virtualFiles = /* @__PURE__ */ new Map();
 var extReg = /\.[^.]+$/;
 var queryReg = /\?marko-[^?]+$/;
 var importTagReg2 = /^<([^>]+)>$/;
+var optionalWatchFileReg = /[\\/](?:([^\\/]+)\.)?(?:marko-tag.json|(?:style|component|component-browser)\.\w+)$/;
 var noClientAssetsRuntimeId = "\0no_client_bundles.mjs";
 var browserEntryQuery = "?marko-browser-entry";
 var serverEntryQuery = "?marko-server-entry";
@@ -861,7 +862,6 @@ function markoPlugin(opts = {}) {
   const entryIds = /* @__PURE__ */ new Set();
   const cachedSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
-  const transformOptionalFiles = /* @__PURE__ */ new Map();
   const store = new ReadOncePersistedStore(
     `vite-marko${runtimeId ? `-${runtimeId}` : ""}`
   );
@@ -1170,17 +1170,18 @@ function markoPlugin(opts = {}) {
           if (type === "unlink") {
             entryIds.delete(fileName);
             transformWatchFiles.delete(fileName);
-            transformOptionalFiles.delete(fileName);
           }
           for (const [id, files] of transformWatchFiles) {
             if (anyMatch(files, fileName)) {
               devServer.watcher.emit("change", id);
             }
           }
-          if (type === "add" || type === "unlink") {
-            for (const [id, files] of transformOptionalFiles) {
-              if (anyMatch(files, fileName)) {
-                devServer.watcher.emit("change", id);
+          if (type === "unlink" || type === "add") {
+            const optionalMatch = optionalWatchFileReg.exec(fileName);
+            if (optionalMatch) {
+              const markoFile = fileName.slice(0, optionalMatch.index + 1) + (optionalMatch[1] || "index") + ".marko";
+              if (transformWatchFiles.has(markoFile)) {
+                devServer.watcher.emit("change", markoFile);
               }
             }
           }
@@ -1459,24 +1460,11 @@ function markoPlugin(opts = {}) {
 if (import.meta.hot) import.meta.hot.accept(() => {});`;
         }
         if (devServer) {
-          const templateName = getPosixBasenameWithoutExt(id);
-          const optionalFilePrefix = path6.dirname(id) + path6.sep + (templateName === "index" ? "" : `${templateName}.`);
+          transformWatchFiles.set(id, meta.watchFiles);
+        } else {
           for (const file of meta.watchFiles) {
             this.addWatchFile(file);
           }
-          transformOptionalFiles.set(
-            id,
-            meta.api === "tags" ? [`${optionalFilePrefix}style.*`] : [
-              `${optionalFilePrefix}style.*`,
-              `${optionalFilePrefix}marko-tag.json`,
-              `${optionalFilePrefix}component.*`,
-              `${optionalFilePrefix}component-browser.*`
-            ]
-          );
-          transformWatchFiles.set(
-            id,
-            meta.analyzedTags ? meta.analyzedTags.concat(meta.watchFiles) : meta.watchFiles
-          );
         }
         return {
           code,
@@ -1623,11 +1611,6 @@ function virtualPathToCacheFile(virtualPath, root, cacheDir) {
     normalizePath(path6.relative(root, virtualPath)).replace(/[\\/]+/g, "_")
   );
 }
-function getPosixBasenameWithoutExt(file) {
-  const baseStart = file.lastIndexOf(POSIX_SEP) + 1;
-  const extStart = file.indexOf(".", baseStart + 1);
-  return file.slice(baseStart, extStart);
-}
 function createDeferredPromise() {
   let resolve;
   let reject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",