@marko/vite 2.3.14 → 2.4.1

package/README.md

@@ -138,6 +138,23 @@ Storage mechanism to preserve data between SSR and client builds when building i
   ```
   Reads/writes data to memory. This option can be used when building with Vite programatically.
 
+### options.basePathVar
+
+Set this to variable/identifier which all asset base paths should be prefixed with. All asset paths used by Vite will either be relative (if possible) or prefixed with this identifier. The identifier must be defined as a string before any other server code executes.
+
+First configure `@marko/vite`.
+
+```js
+marko({ basePathVar: "__MY_ASSET_BASE_PATH__" });
+```
+
+Then ensure you set that variable at runtime.
+
+```js
+globalThis.__MY_ASSET_BASE_PATH__ = getAssetUrl(); // Note this must end with a `/`.
+require("./dist/index.mjs"); // load the built vite app.
+```
+
 ## Code of Conduct
 
 This project adheres to the [eBay Code of Conduct](./.github/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.

package/dist/chunk-6IJ5UJ3N.mjs

@@ -0,0 +1,29 @@
+// src/server-entry-template.ts
+import path from "path";
+var server_entry_template_default = async (opts) => {
+  const fileNameStr = JSON.stringify(`./${path.basename(opts.fileName)}`);
+  const base = opts.basePathVar ? ` base=${opts.basePathVar}` : "";
+  return `import template from ${fileNameStr};
+export * from ${fileNameStr};
+${opts.basePathVar ? `
+static if (typeof ${opts.basePathVar} !== "string") throw new Error("${opts.basePathVar} must be defined when using basePathVar.");
+static if (!${opts.basePathVar}.endsWith("/")) throw new Error("${opts.basePathVar} must end with a '/' when using basePathVar.");
+` : ""}${opts.runtimeId ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};
+$ out.global.___viteBaseVar = ${JSON.stringify(
+    "$mbp_" + opts.runtimeId
+  )};
+` : `$ out.global.___viteBaseVar = "$mbp";
+`}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
+<_vite${base} slot="head-prepend"/>
+<_vite${base} slot="head"/>
+<_vite${base} slot="body-prepend"/>
+<\${template} ...input/>
+<init-components/>
+<await-reorderer/>
+<_vite${base} slot="body"/>
+`;
+};
+
+export {
+  server_entry_template_default
+};

package/dist/{chunk-VL2HLMVE.mjs → chunk-BV667Z5U.mjs}

@@ -16,7 +16,7 @@ var voidElements = /* @__PURE__ */ new Set([
   "track",
   "wbr"
 ]);
-function serialize(nodes, parts) {
+function serialize(basePath, nodes, parts) {
   let curString = parts ? parts.pop() : "";
   parts ?? (parts = []);
   for (const node of nodes) {
@@ -26,30 +26,45 @@ function serialize(nodes, parts) {
       case ElementType.Script: {
         const tag = node;
         const { name } = tag;
+        let urlAttr;
         curString += `<${name}`;
         switch (tag.tagName) {
           case "script":
-            parts.push(curString);
+            parts.push(curString, 0 /* AssetAttrs */);
+            urlAttr = "src";
             curString = "";
             break;
           case "style":
-            parts.push(curString);
+            parts.push(curString, 0 /* AssetAttrs */);
             curString = "";
             break;
           case "link":
-            if (tag.attribs.rel === "stylesheet") {
-              parts.push(curString);
+            urlAttr = "href";
+            if (tag.attribs.rel === "stylesheet" || tag.attribs.rel === "modulepreload" || tag.attribs.as === "style" || tag.attribs.as === "script") {
+              parts.push(curString, 0 /* AssetAttrs */);
               curString = "";
             }
             break;
         }
         for (const attr of tag.attributes) {
-          curString += ` ${attr.value === "" ? attr.name : `${attr.name}="${attr.value.replace(/"/g, "&#39;")}"`}`;
+          if (attr.value === "") {
+            curString += ` ${attr.name}`;
+          } else if (attr.name === urlAttr) {
+            curString += ` ${attr.name}="`;
+            parts.push(
+              curString,
+              1 /* PublicPath */,
+              stripBasePath(basePath, attr.value).replace(/"/g, "&#39;").replace(/^\.\//, "") + '"'
+            );
+            curString = "";
+          } else {
+            curString += ` ${attr.name}="${attr.value.replace(/"/g, "&#39;")}"`;
+          }
         }
         curString += ">";
         if (tag.children.length) {
           parts.push(curString);
-          serialize(tag.children, parts);
+          serialize(basePath, tag.children, parts);
           curString = parts.pop();
         }
         if (!voidElements.has(name)) {
@@ -74,6 +89,11 @@ function serialize(nodes, parts) {
   }
   return parts;
 }
+function stripBasePath(basePath, path) {
+  if (path.startsWith(basePath))
+    return path.slice(basePath.length);
+  return path;
+}
 
 export {
   serialize

package/dist/{chunk-DSFBTWOA.mjs → chunk-ZCKVZIQN.mjs}

@@ -1,13 +1,13 @@
 import {
   serialize
-} from "./chunk-VL2HLMVE.mjs";
+} from "./chunk-BV667Z5U.mjs";
 
 // src/manifest-generator.ts
 import { Parser } from "htmlparser2";
 import { ElementType } from "domelementtype";
 import { DomHandler } from "domhandler";
 var MARKER_COMMENT = "MARKO_VITE";
-function generateDocManifest(rawHtml) {
+function generateDocManifest(basePath, rawHtml) {
   return new Promise((resolve, reject) => {
     const parser = new Parser(
       new DomHandler(function(err, dom) {
@@ -34,10 +34,10 @@ function generateDocManifest(rawHtml) {
           body
         );
         resolve({
-          "head-prepend": serializeOrNull(headPrepend),
-          head: serializeOrNull(head),
-          "body-prepend": serializeOrNull(bodyPrepend),
-          body: serializeOrNull(body)
+          "head-prepend": serializeOrNull(basePath, headPrepend),
+          head: serializeOrNull(basePath, head),
+          "body-prepend": serializeOrNull(basePath, bodyPrepend),
+          body: serializeOrNull(basePath, body)
         });
       })
     );
@@ -50,8 +50,8 @@ function generateInputDoc(entry) {
     entry
   )}></script></body></html>`;
 }
-function serializeOrNull(nodes) {
-  const result = serialize(nodes);
+function serializeOrNull(basePath, nodes) {
+  const result = serialize(basePath, nodes);
   if (result.length) {
     return result;
   }

package/dist/components/vite.marko

@@ -9,12 +9,20 @@ static function renderAssets(slot) {
 
     for (let i = lastWrittenEntry; i < writtenEntries; i++) {
       const entry = entries[i];
-      const parts = typeof __MARKO_MANIFEST__ === "object"
-        ? __MARKO_MANIFEST__[entry]?.[slot]
-        : entry[slot];
+      const parts =
+        typeof __MARKO_MANIFEST__ === "object"
+          ? __MARKO_MANIFEST__[entry]?.[slot]
+          : entry[slot];
 
       if (parts) {
-        html += parts.join(this.___viteInjectAttrs);
+        for (const part of parts) {
+          html +=
+            part === 0 /** InjectType.AssetAttrs */
+              ? this.___viteInjectAttrs
+              : part === 1 /** InjectType.PublicPath */
+              ? this.___viteBasePath
+              : part;
+        }
       }
     }
   }
@@ -26,8 +34,13 @@ $ if (!out.global.___viteRenderAssets) {
     ? ` nonce="${out.global.cspNonce.replace(/"/g, "&#39;")}"`
     : "";
   out.global.___viteRenderAssets = renderAssets;
+  out.global.___viteBasePath = input.base || import.meta.env.BASE_URL;
 }
 
 <__flush_here_and_after__>
+  <if(input.base && !out.global.___flushedMBP)>
+    $ out.global.___flushedMBP = true;
+    $!{`<script${out.global.___viteInjectAttrs}>${out.global.___viteBaseVar}=${JSON.stringify(input.base)}</script>`}
+  </if>
   $!{out.global.___viteRenderAssets(input.slot)}
 </__flush_here_and_after__>

package/dist/index.d.ts

@@ -3,11 +3,23 @@ import type * as Compiler from "@marko/compiler";
 import { BuildStore } from "./store";
 export * from "./store";
 export type { BuildStore } from "./store";
+declare module "@marko/babel-utils" {
+    interface Taglib {
+        id: string;
+        dirname: string;
+        path: string;
+        tags: TagDefinition[];
+    }
+    interface TaglibLookup {
+        taglibsById: Record<string, Taglib>;
+    }
+}
 export interface Options {
     linked?: boolean;
     compiler?: string;
     runtimeId?: string;
     translator?: string;
+    basePathVar?: string;
     babelConfig?: Compiler.Config["babelConfig"];
     store?: BuildStore;
 }

package/dist/index.js

@@ -61,7 +61,7 @@ const thisFile = typeof __filename === "string" ? __filename : (0, import_url.fi
 function markoPlugin(opts = {}) {
   var _a;
   let compiler;
-  const { runtimeId, linked = true } = opts;
+  const { runtimeId, basePathVar, linked = true } = opts;
   const baseConfig = {
     cache,
     runtimeId,
@@ -80,7 +80,9 @@ function markoPlugin(opts = {}) {
     }
   };
   const resolveViteVirtualDep = (from, dep) => {
-    const query = `${virtualFileQuery}&id=${normalizePath(dep.virtualPath)}`;
+    const query = `${virtualFileQuery}&id=${encodeURIComponent(
+      normalizePath(dep.virtualPath)
+    )}`;
     const normalizedFrom = normalizePath(from);
     const id = normalizePath(normalizedFrom) + query;
     if (devServer) {
@@ -116,6 +118,8 @@ function markoPlugin(opts = {}) {
   let registeredTag = false;
   let serverManifest;
   let store;
+  let cjsImports;
+  let basePath = "/";
   const entrySources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
@@ -126,6 +130,7 @@ function markoPlugin(opts = {}) {
       // Must be pre to allow us to resolve assets before vite.
       async config(config, env) {
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
+        compiler.configure(baseConfig);
         root = normalizePath(config.root || process.cwd());
         devEntryFile = import_path.default.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
@@ -150,14 +155,24 @@ function markoPlugin(opts = {}) {
         }
         const lookup = compiler.taglib.buildLookup(root);
         const taglibDeps = [];
+        const optimizeTaglibDeps = [];
         for (const name in lookup.taglibsById) {
           const taglib = lookup.taglibsById[name];
           if (!/^marko-(.+-)?core$/.test(taglib.id) && /[\\/]node_modules[\\/]/.test(taglib.dirname)) {
+            let isEsm;
             for (const tagName in taglib.tags) {
               const tag = taglib.tags[tagName];
               const entry = tag.template || tag.renderer;
               if (entry) {
-                taglibDeps.push((0, import_relative_import_path.relativeImportPath)(devEntryFile, entry));
+                const relativePath = (0, import_relative_import_path.relativeImportPath)(devEntryFile, entry);
+                taglibDeps.push(relativePath);
+                if (isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
+                  optimizeTaglibDeps.push(relativePath);
+                } else {
+                  (cjsImports ?? (cjsImports = /* @__PURE__ */ new Map())).set(normalizePath(entry), {
+                    template: tag.template
+                  });
+                }
               }
             }
           }
@@ -168,7 +183,7 @@ function markoPlugin(opts = {}) {
             ...optimizeDeps.include || [],
             ...compiler.getRuntimeEntryFiles("dom", opts.translator),
             ...compiler.getRuntimeEntryFiles("html", opts.translator),
-            ...taglibDeps
+            ...optimizeTaglibDeps
           ])
         );
         const optimizeExtensions = optimizeDeps.extensions ?? (optimizeDeps.extensions = []);
@@ -184,6 +199,29 @@ function markoPlugin(opts = {}) {
             )
           );
         }
+        if (basePathVar) {
+          config.experimental ?? (config.experimental = {});
+          if (config.experimental.renderBuiltUrl) {
+            throw new Error(
+              "Cannot use @marko/vite `basePathVar` with Vite's `renderBuiltUrl` option."
+            );
+          }
+          config.experimental.renderBuiltUrl = (fileName, { hostType, ssr: ssr2 }) => {
+            switch (hostType) {
+              case "html":
+                return fileName;
+              case "js":
+                return {
+                  runtime: `${ssr2 ? basePathVar : `$mbp${runtimeId ? `_${runtimeId}` : ""}`}+${JSON.stringify(fileName)}`
+                };
+              default:
+                return { relative: true };
+            }
+          };
+        }
+      },
+      configResolved(config) {
+        basePath = config.base;
       },
       configureServer(_server) {
         ssrConfig.hot = domConfig.hot = true;
@@ -282,6 +320,22 @@ function markoPlugin(opts = {}) {
         return null;
       },
       async load(id) {
+        if (cjsImports == null ? void 0 : cjsImports.has(id)) {
+          const tag = cjsImports.get(id);
+          if (!tag.esmWrapper) {
+            const { ast } = await compiler.compileFile(tag.template, {
+              output: "source",
+              ast: true,
+              sourceMaps: false,
+              code: false
+            });
+            tag.esmWrapper = await createEsmWrapper(
+              id,
+              getExportIdentifiers(ast)
+            );
+          }
+          return tag.esmWrapper;
+        }
         switch (getMarkoQuery(id)) {
           case serverEntryQuery: {
             const fileName = id.slice(0, -serverEntryQuery.length);
@@ -300,6 +354,7 @@ function markoPlugin(opts = {}) {
             } else {
               entryData = JSON.stringify(
                 await (0, import_manifest_generator.generateDocManifest)(
+                  basePath,
                   await devServer.transformIndexHtml(
                     "/",
                     (0, import_manifest_generator.generateInputDoc)(posixFileNameToURL(fileName, root))
@@ -310,7 +365,8 @@ function markoPlugin(opts = {}) {
             return (0, import_server_entry_template.default)({
               fileName,
               entryData,
-              runtimeId
+              runtimeId,
+              basePathVar
             });
           }
           case browserEntryQuery: {
@@ -336,7 +392,7 @@ function markoPlugin(opts = {}) {
             id = `${id.slice(0, -markoExt.length)}.entry.marko`;
           }
         }
-        if (!isMarkoFile(id)) {
+        if (!isMarkoFile(id) || (cjsImports == null ? void 0 : cjsImports.has(id))) {
           return null;
         }
         if (ssr && entrySources.has(id)) {
@@ -420,6 +476,7 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
             }
             if ((chunk == null ? void 0 : chunk.type) === "asset") {
               browserManifest[entryId] = await (0, import_manifest_generator.generateDocManifest)(
+                basePath,
                 chunk.source.toString()
               );
               delete bundle[chunkId];
@@ -508,5 +565,83 @@ function isEmpty(obj) {
   }
   return true;
 }
+function findPackageJson(file, root = process.cwd()) {
+  let currentDir = import_path.default.dirname(file);
+  while (currentDir !== root && currentDir.length > root.length) {
+    const pkgPath = import_path.default.join(currentDir, "package.json");
+    if (import_fs.default.existsSync(pkgPath)) {
+      return pkgPath;
+    }
+    currentDir = import_path.default.dirname(currentDir);
+  }
+  return null;
+}
+const moduleTypeMap = /* @__PURE__ */ new Map();
+function getModuleType(file) {
+  const pkgPath = findPackageJson(file);
+  if (pkgPath) {
+    let moduleType = moduleTypeMap.get(pkgPath);
+    if (!moduleType) {
+      const pkg = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf8"));
+      moduleType = pkg.type === "module" || pkg.exports ? "esm" : "cjs";
+      moduleTypeMap.set(pkgPath, moduleType);
+    }
+    return moduleType;
+  }
+  return "esm";
+}
+let requireHookInstalled = false;
+async function createEsmWrapper(url, exports) {
+  if (!requireHookInstalled) {
+    await import("@marko/compiler/register.js");
+    requireHookInstalled = true;
+  }
+  let code = `import { createRequire } from 'module';
+const mod = createRequire(import.meta.url)('${url}');
+`;
+  let namedExports;
+  for (const name of exports) {
+    if (name === "default") {
+      code += "export default mod.default;\n";
+    } else if (namedExports) {
+      namedExports += `, ${name}`;
+    } else {
+      namedExports = name;
+    }
+  }
+  if (namedExports) {
+    code += `export const { ${namedExports} } = mod;
+`;
+  }
+  return code;
+}
+function getExportIdentifiers(ast) {
+  const exports = /* @__PURE__ */ new Set();
+  for (const node of ast.program.body) {
+    switch (node.type) {
+      case "ExportDefaultDeclaration":
+      case "MarkoTag":
+        exports.add("default");
+        break;
+      case "ExportNamedDeclaration":
+        if (node.declaration) {
+          for (const declarator of node.declaration.declarations) {
+            exports.add(declarator.id.name);
+          }
+        }
+        for (const specifier of node.specifiers) {
+          if (specifier.type !== "ExportSpecifier") {
+            exports.add(specifier.exported.name);
+          }
+        }
+        break;
+      case "ExportAllDeclaration":
+        throw new Error(
+          'Re-exporting using `export * from "..."` is not supported.'
+        );
+    }
+  }
+  return exports;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/index.mjs

@@ -4,11 +4,11 @@ import {
 import {
   generateDocManifest,
   generateInputDoc
-} from "./chunk-DSFBTWOA.mjs";
-import "./chunk-VL2HLMVE.mjs";
+} from "./chunk-ZCKVZIQN.mjs";
+import "./chunk-BV667Z5U.mjs";
 import {
   server_entry_template_default
-} from "./chunk-EYX7LIK3.mjs";
+} from "./chunk-6IJ5UJ3N.mjs";
 import "./chunk-KIYHBIE6.mjs";
 import {
   MemoryStore
@@ -41,7 +41,7 @@ var thisFile = typeof __filename === "string" ? __filename : fileURLToPath(impor
 function markoPlugin(opts = {}) {
   var _a;
   let compiler;
-  const { runtimeId, linked = true } = opts;
+  const { runtimeId, basePathVar, linked = true } = opts;
   const baseConfig = {
     cache,
     runtimeId,
@@ -60,7 +60,9 @@ function markoPlugin(opts = {}) {
     }
   };
   const resolveViteVirtualDep = (from, dep) => {
-    const query = `${virtualFileQuery}&id=${normalizePath(dep.virtualPath)}`;
+    const query = `${virtualFileQuery}&id=${encodeURIComponent(
+      normalizePath(dep.virtualPath)
+    )}`;
     const normalizedFrom = normalizePath(from);
     const id = normalizePath(normalizedFrom) + query;
     if (devServer) {
@@ -96,6 +98,8 @@ function markoPlugin(opts = {}) {
   let registeredTag = false;
   let serverManifest;
   let store;
+  let cjsImports;
+  let basePath = "/";
   const entrySources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
@@ -106,6 +110,7 @@ function markoPlugin(opts = {}) {
       // Must be pre to allow us to resolve assets before vite.
       async config(config, env) {
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
+        compiler.configure(baseConfig);
         root = normalizePath(config.root || process.cwd());
         devEntryFile = path.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
@@ -130,14 +135,24 @@ function markoPlugin(opts = {}) {
         }
         const lookup = compiler.taglib.buildLookup(root);
         const taglibDeps = [];
+        const optimizeTaglibDeps = [];
         for (const name in lookup.taglibsById) {
           const taglib = lookup.taglibsById[name];
           if (!/^marko-(.+-)?core$/.test(taglib.id) && /[\\/]node_modules[\\/]/.test(taglib.dirname)) {
+            let isEsm;
             for (const tagName in taglib.tags) {
               const tag = taglib.tags[tagName];
               const entry = tag.template || tag.renderer;
               if (entry) {
-                taglibDeps.push(relativeImportPath(devEntryFile, entry));
+                const relativePath = relativeImportPath(devEntryFile, entry);
+                taglibDeps.push(relativePath);
+                if (isBuild || (isEsm ?? (isEsm = getModuleType(taglib.path) === "esm"))) {
+                  optimizeTaglibDeps.push(relativePath);
+                } else {
+                  (cjsImports ?? (cjsImports = /* @__PURE__ */ new Map())).set(normalizePath(entry), {
+                    template: tag.template
+                  });
+                }
               }
             }
           }
@@ -148,7 +163,7 @@ function markoPlugin(opts = {}) {
             ...optimizeDeps.include || [],
             ...compiler.getRuntimeEntryFiles("dom", opts.translator),
             ...compiler.getRuntimeEntryFiles("html", opts.translator),
-            ...taglibDeps
+            ...optimizeTaglibDeps
           ])
         );
         const optimizeExtensions = optimizeDeps.extensions ?? (optimizeDeps.extensions = []);
@@ -164,6 +179,29 @@ function markoPlugin(opts = {}) {
             )
           );
         }
+        if (basePathVar) {
+          config.experimental ?? (config.experimental = {});
+          if (config.experimental.renderBuiltUrl) {
+            throw new Error(
+              "Cannot use @marko/vite `basePathVar` with Vite's `renderBuiltUrl` option."
+            );
+          }
+          config.experimental.renderBuiltUrl = (fileName, { hostType, ssr: ssr2 }) => {
+            switch (hostType) {
+              case "html":
+                return fileName;
+              case "js":
+                return {
+                  runtime: `${ssr2 ? basePathVar : `$mbp${runtimeId ? `_${runtimeId}` : ""}`}+${JSON.stringify(fileName)}`
+                };
+              default:
+                return { relative: true };
+            }
+          };
+        }
+      },
+      configResolved(config) {
+        basePath = config.base;
       },
       configureServer(_server) {
         ssrConfig.hot = domConfig.hot = true;
@@ -262,6 +300,22 @@ function markoPlugin(opts = {}) {
         return null;
       },
       async load(id) {
+        if (cjsImports == null ? void 0 : cjsImports.has(id)) {
+          const tag = cjsImports.get(id);
+          if (!tag.esmWrapper) {
+            const { ast } = await compiler.compileFile(tag.template, {
+              output: "source",
+              ast: true,
+              sourceMaps: false,
+              code: false
+            });
+            tag.esmWrapper = await createEsmWrapper(
+              id,
+              getExportIdentifiers(ast)
+            );
+          }
+          return tag.esmWrapper;
+        }
         switch (getMarkoQuery(id)) {
           case serverEntryQuery: {
             const fileName = id.slice(0, -serverEntryQuery.length);
@@ -280,6 +334,7 @@ function markoPlugin(opts = {}) {
             } else {
               entryData = JSON.stringify(
                 await generateDocManifest(
+                  basePath,
                   await devServer.transformIndexHtml(
                     "/",
                     generateInputDoc(posixFileNameToURL(fileName, root))
@@ -290,7 +345,8 @@ function markoPlugin(opts = {}) {
             return server_entry_template_default({
               fileName,
               entryData,
-              runtimeId
+              runtimeId,
+              basePathVar
             });
           }
           case browserEntryQuery: {
@@ -316,7 +372,7 @@ function markoPlugin(opts = {}) {
             id = `${id.slice(0, -markoExt.length)}.entry.marko`;
           }
         }
-        if (!isMarkoFile(id)) {
+        if (!isMarkoFile(id) || (cjsImports == null ? void 0 : cjsImports.has(id))) {
           return null;
         }
         if (ssr && entrySources.has(id)) {
@@ -400,6 +456,7 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
             }
             if ((chunk == null ? void 0 : chunk.type) === "asset") {
               browserManifest[entryId] = await generateDocManifest(
+                basePath,
                 chunk.source.toString()
               );
               delete bundle[chunkId];
@@ -488,6 +545,84 @@ function isEmpty(obj) {
   }
   return true;
 }
+function findPackageJson(file, root = process.cwd()) {
+  let currentDir = path.dirname(file);
+  while (currentDir !== root && currentDir.length > root.length) {
+    const pkgPath = path.join(currentDir, "package.json");
+    if (fs.existsSync(pkgPath)) {
+      return pkgPath;
+    }
+    currentDir = path.dirname(currentDir);
+  }
+  return null;
+}
+var moduleTypeMap = /* @__PURE__ */ new Map();
+function getModuleType(file) {
+  const pkgPath = findPackageJson(file);
+  if (pkgPath) {
+    let moduleType = moduleTypeMap.get(pkgPath);
+    if (!moduleType) {
+      const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+      moduleType = pkg.type === "module" || pkg.exports ? "esm" : "cjs";
+      moduleTypeMap.set(pkgPath, moduleType);
+    }
+    return moduleType;
+  }
+  return "esm";
+}
+var requireHookInstalled = false;
+async function createEsmWrapper(url, exports) {
+  if (!requireHookInstalled) {
+    await import("@marko/compiler/register.js");
+    requireHookInstalled = true;
+  }
+  let code = `import { createRequire } from 'module';
+const mod = createRequire(import.meta.url)('${url}');
+`;
+  let namedExports;
+  for (const name of exports) {
+    if (name === "default") {
+      code += "export default mod.default;\n";
+    } else if (namedExports) {
+      namedExports += `, ${name}`;
+    } else {
+      namedExports = name;
+    }
+  }
+  if (namedExports) {
+    code += `export const { ${namedExports} } = mod;
+`;
+  }
+  return code;
+}
+function getExportIdentifiers(ast) {
+  const exports = /* @__PURE__ */ new Set();
+  for (const node of ast.program.body) {
+    switch (node.type) {
+      case "ExportDefaultDeclaration":
+      case "MarkoTag":
+        exports.add("default");
+        break;
+      case "ExportNamedDeclaration":
+        if (node.declaration) {
+          for (const declarator of node.declaration.declarations) {
+            exports.add(declarator.id.name);
+          }
+        }
+        for (const specifier of node.specifiers) {
+          if (specifier.type !== "ExportSpecifier") {
+            exports.add(specifier.exported.name);
+          }
+        }
+        break;
+      case "ExportAllDeclaration":
+        throw new Error(
+          'Re-exporting using `export * from "..."` is not supported.'
+        );
+    }
+  }
+  return exports;
+}
 export {
   FileStore,
   MemoryStore,

package/dist/manifest-generator.d.ts

@@ -6,6 +6,6 @@ export interface DocManifest {
     "body-prepend": SerializedOrNull;
     body: SerializedOrNull;
 }
-export declare function generateDocManifest(rawHtml: string): Promise<DocManifest>;
+export declare function generateDocManifest(basePath: string, rawHtml: string): Promise<DocManifest>;
 export declare function generateInputDoc(entry: string): string;
 export {};

package/dist/manifest-generator.js

@@ -37,7 +37,7 @@ var import_domelementtype = require("domelementtype");
 var import_domhandler = require("domhandler");
 var import_serializer = __toESM(require("./serializer"));
 const MARKER_COMMENT = "MARKO_VITE";
-function generateDocManifest(rawHtml) {
+function generateDocManifest(basePath, rawHtml) {
   return new Promise((resolve, reject) => {
     const parser = new import_htmlparser2.Parser(
       new import_domhandler.DomHandler(function(err, dom) {
@@ -64,10 +64,10 @@ function generateDocManifest(rawHtml) {
           body
         );
         resolve({
-          "head-prepend": serializeOrNull(headPrepend),
-          head: serializeOrNull(head),
-          "body-prepend": serializeOrNull(bodyPrepend),
-          body: serializeOrNull(body)
+          "head-prepend": serializeOrNull(basePath, headPrepend),
+          head: serializeOrNull(basePath, head),
+          "body-prepend": serializeOrNull(basePath, bodyPrepend),
+          body: serializeOrNull(basePath, body)
         });
       })
     );
@@ -80,8 +80,8 @@ function generateInputDoc(entry) {
     entry
   )}></script></body></html>`;
 }
-function serializeOrNull(nodes) {
-  const result = (0, import_serializer.default)(nodes);
+function serializeOrNull(basePath, nodes) {
+  const result = (0, import_serializer.default)(basePath, nodes);
   if (result.length) {
     return result;
   }

package/dist/manifest-generator.mjs

@@ -1,8 +1,8 @@
 import {
   generateDocManifest,
   generateInputDoc
-} from "./chunk-DSFBTWOA.mjs";
-import "./chunk-VL2HLMVE.mjs";
+} from "./chunk-ZCKVZIQN.mjs";
+import "./chunk-BV667Z5U.mjs";
 export {
   generateDocManifest,
   generateInputDoc

package/dist/serializer.d.ts

@@ -1,2 +1,7 @@
 import type { Node } from "domhandler";
-export default function serialize(nodes: Node[], parts?: string[]): string[];
+declare enum InjectType {
+    AssetAttrs = 0,
+    PublicPath = 1
+}
+export default function serialize(basePath: string, nodes: Node[], parts?: (string | InjectType)[]): (string | InjectType)[];
+export {};

package/dist/serializer.js

@@ -22,6 +22,11 @@ __export(serializer_exports, {
 });
 module.exports = __toCommonJS(serializer_exports);
 var import_domelementtype = require("domelementtype");
+var InjectType = /* @__PURE__ */ ((InjectType2) => {
+  InjectType2[InjectType2["AssetAttrs"] = 0] = "AssetAttrs";
+  InjectType2[InjectType2["PublicPath"] = 1] = "PublicPath";
+  return InjectType2;
+})(InjectType || {});
 const voidElements = /* @__PURE__ */ new Set([
   "area",
   "base",
@@ -38,7 +43,7 @@ const voidElements = /* @__PURE__ */ new Set([
   "track",
   "wbr"
 ]);
-function serialize(nodes, parts) {
+function serialize(basePath, nodes, parts) {
   let curString = parts ? parts.pop() : "";
   parts ?? (parts = []);
   for (const node of nodes) {
@@ -48,30 +53,45 @@ function serialize(nodes, parts) {
       case import_domelementtype.ElementType.Script: {
         const tag = node;
         const { name } = tag;
+        let urlAttr;
         curString += `<${name}`;
         switch (tag.tagName) {
           case "script":
-            parts.push(curString);
+            parts.push(curString, 0 /* AssetAttrs */);
+            urlAttr = "src";
             curString = "";
             break;
           case "style":
-            parts.push(curString);
+            parts.push(curString, 0 /* AssetAttrs */);
             curString = "";
             break;
           case "link":
-            if (tag.attribs.rel === "stylesheet") {
-              parts.push(curString);
+            urlAttr = "href";
+            if (tag.attribs.rel === "stylesheet" || tag.attribs.rel === "modulepreload" || tag.attribs.as === "style" || tag.attribs.as === "script") {
+              parts.push(curString, 0 /* AssetAttrs */);
               curString = "";
             }
             break;
         }
         for (const attr of tag.attributes) {
-          curString += ` ${attr.value === "" ? attr.name : `${attr.name}="${attr.value.replace(/"/g, "&#39;")}"`}`;
+          if (attr.value === "") {
+            curString += ` ${attr.name}`;
+          } else if (attr.name === urlAttr) {
+            curString += ` ${attr.name}="`;
+            parts.push(
+              curString,
+              1 /* PublicPath */,
+              stripBasePath(basePath, attr.value).replace(/"/g, "&#39;").replace(/^\.\//, "") + '"'
+            );
+            curString = "";
+          } else {
+            curString += ` ${attr.name}="${attr.value.replace(/"/g, "&#39;")}"`;
+          }
         }
         curString += ">";
         if (tag.children.length) {
           parts.push(curString);
-          serialize(tag.children, parts);
+          serialize(basePath, tag.children, parts);
           curString = parts.pop();
         }
         if (!voidElements.has(name)) {
@@ -96,5 +116,10 @@ function serialize(nodes, parts) {
   }
   return parts;
 }
+function stripBasePath(basePath, path) {
+  if (path.startsWith(basePath))
+    return path.slice(basePath.length);
+  return path;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/serializer.mjs

@@ -1,6 +1,6 @@
 import {
   serialize
-} from "./chunk-VL2HLMVE.mjs";
+} from "./chunk-BV667Z5U.mjs";
 export {
   serialize as default
 };

package/dist/server-entry-template.d.ts

@@ -2,5 +2,6 @@ declare const _default: (opts: {
     fileName: string;
     entryData: string;
     runtimeId?: string;
+    basePathVar?: string;
 }) => Promise<string>;
 export default _default;

package/dist/server-entry-template.js

@@ -34,17 +34,25 @@ module.exports = __toCommonJS(server_entry_template_exports);
 var import_path = __toESM(require("path"));
 var server_entry_template_default = async (opts) => {
   const fileNameStr = JSON.stringify(`./${import_path.default.basename(opts.fileName)}`);
+  const base = opts.basePathVar ? ` base=${opts.basePathVar}` : "";
   return `import template from ${fileNameStr};
 export * from ${fileNameStr};
-${opts.runtimeId ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};
-` : ""}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
-<_vite slot="head-prepend"/>
-<_vite slot="head"/>
-<_vite slot="body-prepend"/>
+${opts.basePathVar ? `
+static if (typeof ${opts.basePathVar} !== "string") throw new Error("${opts.basePathVar} must be defined when using basePathVar.");
+static if (!${opts.basePathVar}.endsWith("/")) throw new Error("${opts.basePathVar} must end with a '/' when using basePathVar.");
+` : ""}${opts.runtimeId ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};
+$ out.global.___viteBaseVar = ${JSON.stringify(
+    "$mbp_" + opts.runtimeId
+  )};
+` : `$ out.global.___viteBaseVar = "$mbp";
+`}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
+<_vite${base} slot="head-prepend"/>
+<_vite${base} slot="head"/>
+<_vite${base} slot="body-prepend"/>
 <\${template} ...input/>
 <init-components/>
 <await-reorderer/>
-<_vite slot="body"/>
+<_vite${base} slot="body"/>
 `;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server-entry-template.mjs

@@ -1,6 +1,6 @@
 import {
   server_entry_template_default
-} from "./chunk-EYX7LIK3.mjs";
+} from "./chunk-6IJ5UJ3N.mjs";
 export {
   server_entry_template_default as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.3.14",
+  "version": "2.4.1",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
@@ -34,7 +34,7 @@
     "lint-staged": "^13.1.0",
     "marko": "^5.22.0",
     "mocha": "^10.2.0",
-    "mocha-snap": "^4.3.0",
+    "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
     "playwright": "^1.29.1",
     "prettier": "^2.8.1",

package/dist/chunk-EYX7LIK3.mjs

@@ -1,21 +0,0 @@
-// src/server-entry-template.ts
-import path from "path";
-var server_entry_template_default = async (opts) => {
-  const fileNameStr = JSON.stringify(`./${path.basename(opts.fileName)}`);
-  return `import template from ${fileNameStr};
-export * from ${fileNameStr};
-${opts.runtimeId ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};
-` : ""}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${opts.entryData});
-<_vite slot="head-prepend"/>
-<_vite slot="head"/>
-<_vite slot="body-prepend"/>
-<\${template} ...input/>
-<init-components/>
-<await-reorderer/>
-<_vite slot="body"/>
-`;
-};
-
-export {
-  server_entry_template_default
-};