@marko/vite 5.3.6 → 5.3.8

package/dist/index.mjs

@@ -851,15 +851,19 @@ function markoPlugin(opts = {}) {
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
     const normalizedFrom = normalizePath(from);
-    const query = `${virtualFileQuery}&id=${encodeURIComponent(dep.virtualPath)}`;
+    const query = `${virtualFileQuery}&id=${dep.virtualPath.replace(/^\.\//, "").replace(/[^a-z0-9_.-]+/gi, "_")}`;
     const id = normalizedFrom + query;
+    const virtualFile = {
+      code: dep.code,
+      map: stripSourceRoot(dep.map)
+    };
     if (devServer) {
       const prev = virtualFiles.get(id);
       if (isDeferredPromise(prev)) {
-        prev.resolve(dep);
+        prev.resolve(virtualFile);
       }
     }
-    virtualFiles.set(id, dep);
+    virtualFiles.set(id, virtualFile);
     return `./${path6.posix.basename(normalizedFrom) + query}`;
   };
   let root;
@@ -1257,7 +1261,7 @@ function markoPlugin(opts = {}) {
             )
           } : await this.resolve(importee, importer, resolveOpts);
           if (resolved) {
-            resolved.id = stripVersionAndTimeStamp(resolved.id) + importeeQuery;
+            resolved.id = stripViteQueries(resolved.id) + importeeQuery;
           }
           return resolved;
         }
@@ -1277,7 +1281,7 @@ function markoPlugin(opts = {}) {
         return null;
       },
       async load(rawId) {
-        const id = stripVersionAndTimeStamp(rawId);
+        const id = stripViteQueries(rawId);
         if (id === renderAssetsRuntimeId) {
           return renderAssetsRuntimeCode;
         }
@@ -1310,7 +1314,7 @@ function markoPlugin(opts = {}) {
         return virtualFiles.get(id) || null;
       },
       async transform(source, rawId, ssr) {
-        let id = stripVersionAndTimeStamp(rawId);
+        let id = stripViteQueries(rawId);
         const info = isBuild ? this.getModuleInfo(id) : void 0;
         const arcSourceId = info?.meta.arcSourceId;
         if (arcSourceId) {
@@ -1401,7 +1405,7 @@ function markoPlugin(opts = {}) {
               );
               return {
                 code: code2,
-                map: toSourceMap(map),
+                map: stripSourceRoot(map),
                 meta: { arcSourceCode: source, arcScanIds: meta2.analyzedTags }
               };
             }
@@ -1437,7 +1441,7 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
         }
         return {
           code,
-          map: toSourceMap(compiled.map),
+          map: stripSourceRoot(compiled.map),
           meta: isBuild ? { arcSourceCode: source, arcScanIds: meta.analyzedTags } : void 0
         };
       }
@@ -1600,11 +1604,11 @@ function isEmpty(obj) {
   }
   return true;
 }
-function stripVersionAndTimeStamp(id) {
+function stripViteQueries(id) {
   const queryStart = id.indexOf("?");
   if (queryStart === -1) return id;
   const url = id.slice(0, queryStart);
-  const query = id.slice(queryStart + 1).replace(/(?:^|[&])[vt]=[^&]+/g, "");
+  const query = id.slice(queryStart + 1).replace(/(?:^|[&])(?:cache|[vt])=[^&]+/g, "");
   if (query) return `${url}?${query}`;
   return url;
 }
@@ -1654,11 +1658,11 @@ function getKnownTemplates(cwd) {
   }
   return knownTemplates;
 }
-function toSourceMap(map) {
-  return map ? {
-    names: map.names,
-    mappings: map.mappings
-  } : null;
+function stripSourceRoot(map) {
+  if (map && map.sourceRoot) {
+    map.sourceRoot = void 0;
+  }
+  return map;
 }
 export {
   markoPlugin as default

package/package.json

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