@marko/vite 2.4.6 → 2.4.8

package/dist/index.js

@@ -338,9 +338,26 @@ function markoPlugin(opts = {}) {
         const query = getMarkoQuery(id);
         switch (query) {
           case serverEntryQuery: {
-            const fileName = id.slice(0, -query.length);
+            entryIds.add(id.slice(0, -query.length));
+            return null;
+          }
+          case browserEntryQuery:
+          case browserQuery: {
+            return cachedSources.get(id.slice(0, -query.length)) || null;
+          }
+        }
+        return virtualFiles.get(id) || null;
+      },
+      async transform(source, id, ssr) {
+        const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
+        const query = getMarkoQuery(id);
+        if (query && !query.startsWith(virtualFileQuery)) {
+          id = id.slice(0, -query.length);
+          if (query === serverEntryQuery) {
+            const fileName = id;
             let entryData;
-            entryIds.add(fileName);
+            id = `${id.slice(0, -markoExt.length)}.entry.marko`;
+            cachedSources.set(fileName, source);
             if (isBuild) {
               const relativeFileName = import_path.default.posix.relative(root, fileName);
               const entryId = toEntryId(relativeFileName);
@@ -350,6 +367,7 @@ function markoPlugin(opts = {}) {
                 chunksNeedingAssets: []
               });
               serverManifest.entries[entryId] = relativeFileName;
+              serverManifest.entrySources[relativeFileName] = source;
               entryData = JSON.stringify(entryId);
             } else {
               entryData = JSON.stringify(
@@ -357,42 +375,20 @@ function markoPlugin(opts = {}) {
                   basePath,
                   await devServer.transformIndexHtml(
                     "/",
-                    (0, import_manifest_generator.generateInputDoc)(posixFileNameToURL(fileName, root))
+                    (0, import_manifest_generator.generateInputDoc)(
+                      posixFileNameToURL(fileName, root) + browserEntryQuery
+                    )
                   )
                 )
               );
             }
-            return (0, import_server_entry_template.default)({
+            source = await (0, import_server_entry_template.default)({
               fileName,
               entryData,
               runtimeId,
               basePathVar: isBuild ? basePathVar : void 0
             });
           }
-          case browserEntryQuery:
-          case browserQuery: {
-            return cachedSources.get(id.slice(0, -query.length)) || null;
-          }
-        }
-        return virtualFiles.get(id) || null;
-      },
-      async transformIndexHtml(html) {
-        if (isBuild) {
-          return html;
-        }
-        return html.replace(
-          /(src\s*=\s*(['"])(?:(?!\2).)*\.marko)(?:\?((?:(?!\2).)*))?\2/gim,
-          (_, prefix, quote, query) => prefix + browserEntryQuery + (query ? "&" + query : "") + quote
-        );
-      },
-      async transform(source, id, ssr) {
-        const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
-        const query = getMarkoQuery(id);
-        if (query && !query.startsWith(virtualFileQuery)) {
-          id = id.slice(0, -query.length);
-          if (query === serverEntryQuery) {
-            id = `${id.slice(0, -markoExt.length)}.entry.marko`;
-          }
         }
         if (!isMarkoFile(id)) {
           return null;
@@ -400,9 +396,6 @@ function markoPlugin(opts = {}) {
         if (isSSR) {
           if (linked) {
             cachedSources.set(id, source);
-            if (serverManifest && entryIds.has(id)) {
-              serverManifest.entrySources[import_path.default.posix.relative(root, id)] = source;
-            }
           }
           if (CJSTemplates == null ? void 0 : CJSTemplates.has(id)) {
             return createEsmWrapper(
@@ -533,7 +526,7 @@ function toHTMLEntries(root, serverEntries) {
     const markoFile = import_path.default.posix.join(root, serverEntries[id]);
     const htmlFile = markoFile + htmlExt;
     virtualFiles.set(htmlFile, {
-      code: (0, import_manifest_generator.generateInputDoc)(markoFile)
+      code: (0, import_manifest_generator.generateInputDoc)(markoFile + browserEntryQuery)
     });
     result.push(htmlFile);
   }

package/dist/index.mjs

@@ -318,9 +318,26 @@ function markoPlugin(opts = {}) {
         const query = getMarkoQuery(id);
         switch (query) {
           case serverEntryQuery: {
-            const fileName = id.slice(0, -query.length);
+            entryIds.add(id.slice(0, -query.length));
+            return null;
+          }
+          case browserEntryQuery:
+          case browserQuery: {
+            return cachedSources.get(id.slice(0, -query.length)) || null;
+          }
+        }
+        return virtualFiles.get(id) || null;
+      },
+      async transform(source, id, ssr) {
+        const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
+        const query = getMarkoQuery(id);
+        if (query && !query.startsWith(virtualFileQuery)) {
+          id = id.slice(0, -query.length);
+          if (query === serverEntryQuery) {
+            const fileName = id;
             let entryData;
-            entryIds.add(fileName);
+            id = `${id.slice(0, -markoExt.length)}.entry.marko`;
+            cachedSources.set(fileName, source);
             if (isBuild) {
               const relativeFileName = path.posix.relative(root, fileName);
               const entryId = toEntryId(relativeFileName);
@@ -330,6 +347,7 @@ function markoPlugin(opts = {}) {
                 chunksNeedingAssets: []
               });
               serverManifest.entries[entryId] = relativeFileName;
+              serverManifest.entrySources[relativeFileName] = source;
               entryData = JSON.stringify(entryId);
             } else {
               entryData = JSON.stringify(
@@ -337,42 +355,20 @@ function markoPlugin(opts = {}) {
                   basePath,
                   await devServer.transformIndexHtml(
                     "/",
-                    generateInputDoc(posixFileNameToURL(fileName, root))
+                    generateInputDoc(
+                      posixFileNameToURL(fileName, root) + browserEntryQuery
+                    )
                   )
                 )
               );
             }
-            return server_entry_template_default({
+            source = await server_entry_template_default({
               fileName,
               entryData,
               runtimeId,
               basePathVar: isBuild ? basePathVar : void 0
             });
           }
-          case browserEntryQuery:
-          case browserQuery: {
-            return cachedSources.get(id.slice(0, -query.length)) || null;
-          }
-        }
-        return virtualFiles.get(id) || null;
-      },
-      async transformIndexHtml(html) {
-        if (isBuild) {
-          return html;
-        }
-        return html.replace(
-          /(src\s*=\s*(['"])(?:(?!\2).)*\.marko)(?:\?((?:(?!\2).)*))?\2/gim,
-          (_, prefix, quote, query) => prefix + browserEntryQuery + (query ? "&" + query : "") + quote
-        );
-      },
-      async transform(source, id, ssr) {
-        const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
-        const query = getMarkoQuery(id);
-        if (query && !query.startsWith(virtualFileQuery)) {
-          id = id.slice(0, -query.length);
-          if (query === serverEntryQuery) {
-            id = `${id.slice(0, -markoExt.length)}.entry.marko`;
-          }
         }
         if (!isMarkoFile(id)) {
           return null;
@@ -380,9 +376,6 @@ function markoPlugin(opts = {}) {
         if (isSSR) {
           if (linked) {
             cachedSources.set(id, source);
-            if (serverManifest && entryIds.has(id)) {
-              serverManifest.entrySources[path.posix.relative(root, id)] = source;
-            }
           }
           if (CJSTemplates == null ? void 0 : CJSTemplates.has(id)) {
             return createEsmWrapper(
@@ -513,7 +506,7 @@ function toHTMLEntries(root, serverEntries) {
     const markoFile = path.posix.join(root, serverEntries[id]);
     const htmlFile = markoFile + htmlExt;
     virtualFiles.set(htmlFile, {
-      code: generateInputDoc(markoFile)
+      code: generateInputDoc(markoFile + browserEntryQuery)
     });
     result.push(htmlFile);
   }

package/package.json

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