@marko/vite 2.4.5 → 2.4.7

package/dist/index.js

@@ -52,6 +52,7 @@ const queryReg = /\?marko-.+$/;
 const browserEntryQuery = "?marko-browser-entry";
 const serverEntryQuery = "?marko-server-entry";
 const virtualFileQuery = "?marko-virtual";
+const browserQuery = "?marko-browser";
 const manifestFileName = "manifest.json";
 const markoExt = ".marko";
 const htmlExt = ".html";
@@ -94,7 +95,8 @@ function markoPlugin(opts = {}) {
   let store;
   let CJSTemplates;
   let basePath = "/";
-  const entrySources = /* @__PURE__ */ new Map();
+  const entryIds = /* @__PURE__ */ new Set();
+  const cachedSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
   return [
@@ -238,8 +240,9 @@ function markoPlugin(opts = {}) {
         ssrConfig.hot = domConfig.hot = true;
         devServer = _server;
         devServer.watcher.on("all", (type, filename) => {
+          cachedSources.delete(filename);
           if (type === "unlink") {
-            entrySources.delete(filename);
+            entryIds.delete(filename);
             transformWatchFiles.delete(filename);
             transformOptionalFiles.delete(filename);
           }
@@ -274,10 +277,9 @@ function markoPlugin(opts = {}) {
             );
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
             for (const entry in serverManifest.entrySources) {
-              entrySources.set(
-                normalizePath(import_path.default.resolve(root, entry)),
-                serverManifest.entrySources[entry]
-              );
+              const id = normalizePath(import_path.default.resolve(root, entry));
+              entryIds.add(id);
+              cachedSources.set(id, serverManifest.entrySources[entry]);
             }
           } catch (err) {
             this.error(
@@ -302,6 +304,8 @@ function markoPlugin(opts = {}) {
           importeeQuery = serverEntryQuery;
         } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a = this.getModuleInfo(importer)) == null ? void 0 : _a.isEntry)) {
           importeeQuery = browserEntryQuery;
+        } else if (linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
+          importeeQuery = browserQuery;
         }
         if (importeeQuery) {
           const resolved = importee[0] === "." ? {
@@ -331,11 +335,29 @@ function markoPlugin(opts = {}) {
         return null;
       },
       async load(id) {
-        switch (getMarkoQuery(id)) {
+        const query = getMarkoQuery(id);
+        switch (query) {
           case serverEntryQuery: {
-            const fileName = id.slice(0, -serverEntryQuery.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;
-            entrySources.set(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);
@@ -352,63 +374,44 @@ 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: {
-            return entrySources.get(id.slice(0, -browserEntryQuery.length));
-          }
-        }
-        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;
         }
-        if (CJSTemplates == null ? void 0 : CJSTemplates.has(id)) {
-          return createEsmWrapper(
-            id,
-            getExportIdentifiers(
-              (await compiler.compile(source, id, {
-                cache,
-                ast: true,
-                code: false,
-                output: "source",
-                sourceMaps: false
-              })).ast
-            )
-          );
-        }
-        if (isSSR && linked && entrySources.has(id)) {
-          entrySources.set(id, source);
-          if (serverManifest) {
-            serverManifest.entrySources[import_path.default.posix.relative(root, id)] = source;
+        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(
+              id,
+              getExportIdentifiers(
+                (await compiler.compile(source, id, {
+                  cache,
+                  ast: true,
+                  code: false,
+                  output: "source",
+                  sourceMaps: false
+                })).ast
+              )
+            );
           }
         }
         const compiled = await compiler.compile(
@@ -525,7 +528,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

@@ -32,6 +32,7 @@ var queryReg = /\?marko-.+$/;
 var browserEntryQuery = "?marko-browser-entry";
 var serverEntryQuery = "?marko-server-entry";
 var virtualFileQuery = "?marko-virtual";
+var browserQuery = "?marko-browser";
 var manifestFileName = "manifest.json";
 var markoExt = ".marko";
 var htmlExt = ".html";
@@ -74,7 +75,8 @@ function markoPlugin(opts = {}) {
   let store;
   let CJSTemplates;
   let basePath = "/";
-  const entrySources = /* @__PURE__ */ new Map();
+  const entryIds = /* @__PURE__ */ new Set();
+  const cachedSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
   return [
@@ -218,8 +220,9 @@ function markoPlugin(opts = {}) {
         ssrConfig.hot = domConfig.hot = true;
         devServer = _server;
         devServer.watcher.on("all", (type, filename) => {
+          cachedSources.delete(filename);
           if (type === "unlink") {
-            entrySources.delete(filename);
+            entryIds.delete(filename);
             transformWatchFiles.delete(filename);
             transformOptionalFiles.delete(filename);
           }
@@ -254,10 +257,9 @@ function markoPlugin(opts = {}) {
             );
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
             for (const entry in serverManifest.entrySources) {
-              entrySources.set(
-                normalizePath(path.resolve(root, entry)),
-                serverManifest.entrySources[entry]
-              );
+              const id = normalizePath(path.resolve(root, entry));
+              entryIds.add(id);
+              cachedSources.set(id, serverManifest.entrySources[entry]);
             }
           } catch (err) {
             this.error(
@@ -282,6 +284,8 @@ function markoPlugin(opts = {}) {
           importeeQuery = serverEntryQuery;
         } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a = this.getModuleInfo(importer)) == null ? void 0 : _a.isEntry)) {
           importeeQuery = browserEntryQuery;
+        } else if (linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
+          importeeQuery = browserQuery;
         }
         if (importeeQuery) {
           const resolved = importee[0] === "." ? {
@@ -311,11 +315,29 @@ function markoPlugin(opts = {}) {
         return null;
       },
       async load(id) {
-        switch (getMarkoQuery(id)) {
+        const query = getMarkoQuery(id);
+        switch (query) {
           case serverEntryQuery: {
-            const fileName = id.slice(0, -serverEntryQuery.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;
-            entrySources.set(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);
@@ -332,63 +354,44 @@ 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: {
-            return entrySources.get(id.slice(0, -browserEntryQuery.length));
-          }
-        }
-        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;
         }
-        if (CJSTemplates == null ? void 0 : CJSTemplates.has(id)) {
-          return createEsmWrapper(
-            id,
-            getExportIdentifiers(
-              (await compiler.compile(source, id, {
-                cache,
-                ast: true,
-                code: false,
-                output: "source",
-                sourceMaps: false
-              })).ast
-            )
-          );
-        }
-        if (isSSR && linked && entrySources.has(id)) {
-          entrySources.set(id, source);
-          if (serverManifest) {
-            serverManifest.entrySources[path.posix.relative(root, id)] = source;
+        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(
+              id,
+              getExportIdentifiers(
+                (await compiler.compile(source, id, {
+                  cache,
+                  ast: true,
+                  code: false,
+                  output: "source",
+                  sourceMaps: false
+                })).ast
+              )
+            );
           }
         }
         const compiled = await compiler.compile(
@@ -505,7 +508,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.5",
+  "version": "2.4.7",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {