fix: arc integration caching issue

marko-js · Nov 30, 2023 · a09d7e3 · a09d7e3
1 parent d326a8e
commit a09d7e3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.changeset/cool-shirts-reflect.md b/.changeset/cool-shirts-reflect.md
@@ -0,0 +1,5 @@
+---
+"@marko/vite": patch
+---
+
+Fix caching issue with virtual Marko files created by arc
diff --git a/src/__tests__/main.test.ts b/src/__tests__/main.test.ts
@@ -51,7 +51,9 @@ before(async () => {
     context.exposeFunction("__track__", (html: string) => {
       const formatted = defaultSerializer(
         defaultNormalizer(JSDOM.fragment(html)),
-      ).replace(/-[a-z0-9]+(\.\w+)/i, "-[hash]$1");
+      )
+        .replace(/-[a-z0-9]+(\.\w+)/i, "-[hash]$1")
+        .replace(/[?&][tv]=[\d.]+/, "");
 
       if (changes.at(-1) !== formatted) {
         changes.push(formatted);

diff --git a/src/index.ts b/src/index.ts
@@ -79,6 +79,7 @@ const virtualFiles = new Map<
   string,
   VirtualFile | DeferredPromise<VirtualFile>
 >();
+const extReg = /\.[^.]+$/;
 const queryReg = /\?marko-[^?]+$/;
 const browserEntryQuery = "?marko-browser-entry";
 const serverEntryQuery = "?marko-server-entry";
@@ -551,8 +552,12 @@ export default function markoPlugin(opts: Options = {}): vite.Plugin[] {
       async transform(source, rawId, ssr) {
         let id = stripVersionAndTimeStamp(rawId);
         const info = isBuild ? this.getModuleInfo(id) : undefined;
-        if (info?.meta.arcSourceId) {
-          id = info.meta.arcSourceId;
+        const arcSourceId = info?.meta.arcSourceId;
+        if (arcSourceId) {
+          const arcFlagSet = info.meta.arcFlagSet;
+          id = arcFlagSet
+            ? arcSourceId.replace(extReg, `[${arcFlagSet.join("+")}]$&`)
+            : arcSourceId;
         }
 
         const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;