@marko/run 0.5.11 → 0.5.13

package/dist/vite/index.js

@@ -10,7 +10,7 @@ var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
 // src/vite/plugin.ts
-import path3 from "path";
+import path4 from "path";
 import fs3 from "fs";
 import { glob } from "glob";
 import { fileURLToPath } from "url";
@@ -98,10 +98,10 @@ var _VDir = class _VDir {
     });
     return value;
   }
-  addDir(path4, segment) {
+  addDir(path5, segment) {
     const map = segment.type === "_" ? __privateGet(this, _pathlessDirs) ?? __privateSet(this, _pathlessDirs, /* @__PURE__ */ new Map()) : __privateGet(this, _dirs) ?? __privateSet(this, _dirs, /* @__PURE__ */ new Map());
     if (!map.has(segment.name)) {
-      const dir = new _VDir(this, segment, path4);
+      const dir = new _VDir(this, segment, path5);
       map.set(segment.name, dir);
       return dir;
     }
@@ -147,10 +147,10 @@ var _VDir = class _VDir {
     const dirs = [];
     const unique = /* @__PURE__ */ new Set();
     for (const root of roots) {
-      for (const path4 of paths) {
+      for (const path5 of paths) {
         let dir = root;
-        for (const segment of path4.segments) {
-          dir = dir.addDir(path4, segment);
+        for (const segment of path5.segments) {
+          dir = dir.addDir(path5, segment);
         }
         if (unique.has(dir.path)) {
           const sources = /* @__PURE__ */ new Set();
@@ -162,7 +162,7 @@ var _VDir = class _VDir {
             }
           }
           throw new Error(
-            `Ambiguous directory structure: '${sourcePath}${path4.source}' defines '${dir.path}' multiple times.`
+            `Ambiguous directory structure: '${sourcePath}${path5.source}' defines '${dir.path}' multiple times.`
           );
         } else {
           unique.add(dir.path);
@@ -203,9 +203,9 @@ function parseFlatRoute(pattern) {
       } else if (charCode === 44) {
         if (!current) {
           segmentEnd(
-            basePaths.map((path4) => ({
-              ...path4,
-              segments: path4.segments.slice()
+            basePaths.map((path5) => ({
+              ...path5,
+              segments: path5.segments.slice()
             })),
             "",
             "_",
@@ -235,9 +235,9 @@ function parseFlatRoute(pattern) {
         } else if (charCode === 36) {
           type = pattern.charCodeAt(i + 1) === 36 ? "$$" : "$";
         }
-        current ?? (current = basePaths.map((path4) => ({
-          ...path4,
-          segments: path4.segments.slice()
+        current ?? (current = basePaths.map((path5) => ({
+          ...path5,
+          segments: path5.segments.slice()
         })));
         i = len;
         for (const char of delimiters) {
@@ -257,9 +257,9 @@ function parseFlatRoute(pattern) {
     }
     if (!current) {
       segmentEnd(
-        basePaths.map((path4) => ({
-          ...path4,
-          segments: path4.segments.slice()
+        basePaths.map((path5) => ({
+          ...path5,
+          segments: path5.segments.slice()
         })),
         "",
         "_",
@@ -283,9 +283,9 @@ function parseFlatRoute(pattern) {
         segment.param = raw.slice(type.length);
       }
     }
-    for (const path4 of paths) {
+    for (const path5 of paths) {
       if (segment) {
-        if (path4.isCatchall) {
+        if (path5.isCatchall) {
           throw new Error(
             `Invalid route pattern: nested segments are not allowed after a catch-all parameter. Found '.' following '${pattern.slice(
               0,
@@ -293,22 +293,22 @@ function parseFlatRoute(pattern) {
             )}' in '${pattern}'.`
           );
         }
-        path4.segments.push(segment);
-        path4.id += path4.id === "/" ? segment.name : `/${segment.name}`;
+        path5.segments.push(segment);
+        path5.id += path5.id === "/" ? segment.name : `/${segment.name}`;
         if (type === "$$") {
-          path4.isCatchall = true;
+          path5.isCatchall = true;
         }
       }
       if (map) {
-        if (map.has(path4.id)) {
-          const existing = map.get(path4.id);
+        if (map.has(path5.id)) {
+          const existing = map.get(path5.id);
           const existingExpansion = existing.segments.map((s) => s.raw).join(".");
-          const currentExpansion = path4.segments.map((s) => s.raw).join(".");
+          const currentExpansion = path5.segments.map((s) => s.raw).join(".");
           throw new Error(
-            `Invalid route pattern: route '${path4.id}' is ambiguous. Expansion '${currentExpansion}' collides with '${existingExpansion}' in '${pattern}'.`
+            `Invalid route pattern: route '${path5.id}' is ambiguous. Expansion '${currentExpansion}' collides with '${existingExpansion}' in '${pattern}'.`
           );
         }
-        map.set(path4.id, path4);
+        map.set(path5.id, path5);
       }
     }
   }
@@ -364,7 +364,7 @@ async function buildRoutes(sources) {
         dirStack.length = prevDirStackLength;
       };
     },
-    onFile({ name, path: path4 }) {
+    onFile({ name, path: path5 }) {
       const match = name.match(routeableFileRegex);
       if (!match) {
         return;
@@ -372,7 +372,7 @@ async function buildRoutes(sources) {
       const type = (match[1] || match[3]).toLowerCase();
       if (dirStack.length && isSpecialType(type)) {
         console.warn(
-          `Special pages '${RoutableFileTypes.NotFound}' and '${RoutableFileTypes.Error}' are only considered in the root directory - ignoring ${path4}`
+          `Special pages '${RoutableFileTypes.NotFound}' and '${RoutableFileTypes.Error}' are only considered in the root directory - ignoring ${path5}`
         );
         return;
       }
@@ -387,7 +387,7 @@ async function buildRoutes(sources) {
         id: String(nextFileId++),
         name,
         type,
-        filePath: path4,
+        filePath: path5,
         relativePath,
         importPath: `${importPrefix}/${relativePath}`,
         verbs: type === RoutableFileTypes.Page ? ["get"] : void 0
@@ -439,23 +439,23 @@ async function buildRoutes(sources) {
         }
       }
       if (page || handler) {
-        const path4 = dir.pathInfo;
-        if (uniqueRoutes.has(path4.id)) {
-          const existing = uniqueRoutes.get(path4.id);
+        const path5 = dir.pathInfo;
+        if (uniqueRoutes.has(path5.id)) {
+          const existing = uniqueRoutes.get(path5.id);
           const route = routes[existing.index];
           const existingFiles = [route.handler, route.page].filter(Boolean).map((f) => f.filePath);
           const currentFiles = [handler, page].filter(Boolean).map((f) => f.filePath);
-          throw new Error(`Duplicate routes for path '${path4.path}' were defined. A route established by:
+          throw new Error(`Duplicate routes for path '${path5.path}' were defined. A route established by:
       ${existingFiles.join(" and ")} via '${existing.dir.path}'
         collides with
       ${currentFiles.join(" and ")} via '${dir.path}'
       `);
         }
-        uniqueRoutes.set(path4.id, { dir, index: routes.length });
+        uniqueRoutes.set(path5.id, { dir, index: routes.length });
         routes.push({
           index: nextRouteIndex++,
           key: dir.fullPath,
-          paths: [path4],
+          paths: [path5],
           middleware: [...currentMiddleware],
           layouts: page ? [...currentLayouts] : [],
           meta: dir.files.get(RoutableFileTypes.Meta),
@@ -705,6 +705,7 @@ function hasVerb(route, verb) {
 }
 
 // src/vite/codegen/index.ts
+import path2 from "path";
 function renderRouteTemplate(route, getRelativePath) {
   if (!route.page) {
     throw new Error(`Route ${route.key} has no page to render`);
@@ -799,7 +800,7 @@ function renderRouteEntry(route, entriesDir) {
     );
   }
   if (page) {
-    const importPath = route.layouts.length ? `./${entriesDir}/${entryName}.marko` : `./${page.importPath}`;
+    const importPath = route.layouts.length ? `./${path2.posix.join(entriesDir, page.relativePath, "..", "route.marko")}` : `./${page.importPath}`;
     imports.writeLines(`import page from '${importPath}${serverEntryQuery}';`);
   }
   if (meta) {
@@ -906,7 +907,7 @@ function renderRouter(routes, entriesDir, options = {
     );
   }
   for (const route of Object.values(routes.special)) {
-    const importPath = route.layouts.length ? `./${entriesDir}/${route.entryName}.marko` : `./${route.page.importPath}`;
+    const importPath = route.layouts.length ? `./${path2.posix.join(entriesDir, route.page.relativePath, "..", `route.${route.key}.marko`)}` : `./${route.page.importPath}`;
     imports.writeLines(
       `import page${route.key} from '${importPath}${serverEntryQuery}';`
     );
@@ -1077,7 +1078,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         if (useSwitch) {
           writer.writeBlockStart(`switch (${value}) {`);
         }
-        for (const { key, path: path4, route: route2 } of terminal) {
+        for (const { key, path: path5, route: route2 } of terminal) {
           const decodedKey = decodeURIComponent(key);
           if (useSwitch) {
             writer.write(`case '${decodedKey}': `, true);
@@ -1085,7 +1086,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
             writer.write(`if (${value} === '${decodedKey}') `, true);
           }
           writer.write(
-            `return ${renderMatch(verb, route2, path4)}; // ${path4.path}
+            `return ${renderMatch(verb, route2, path5)}; // ${path5.path}
 `
           );
         }
@@ -1188,11 +1189,11 @@ function renderParams(params, pathIndex) {
   }
   return result ? result + " }" : "{}";
 }
-function renderMatch(verb, route, path4, pathIndex) {
+function renderMatch(verb, route, path5, pathIndex) {
   const handler = `${verb}${route.index}`;
-  const params = path4.params ? renderParams(path4.params, pathIndex) : "{}";
+  const params = path5.params ? renderParams(path5.params, pathIndex) : "{}";
   const meta = route.meta ? `meta${route.index}` : "{}";
-  const pathPattern = pathToURLPatternString(path4.path);
+  const pathPattern = pathToURLPatternString(path5.path);
   return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${pathPattern}' }`;
 }
 function renderMiddleware(middleware) {
@@ -1213,15 +1214,15 @@ function renderMiddleware(middleware) {
   imports.join();
   return writer.end();
 }
-function stripTsExtension(path4) {
-  const index = path4.lastIndexOf(".");
+function stripTsExtension(path5) {
+  const index = path5.lastIndexOf(".");
   if (index !== -1) {
-    const ext = path4.slice(index + 1);
+    const ext = path5.slice(index + 1);
     if (ext.toLowerCase() === "ts") {
-      return path4.slice(0, index);
+      return path5.slice(0, index);
     }
   }
-  return path4;
+  return path5;
 }
 async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   var _a, _b;
@@ -1253,8 +1254,8 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   const routeTypes = /* @__PURE__ */ new Map();
   for (const route of routes.list) {
     let routeType = "";
-    for (const path4 of route.paths) {
-      const pathType = `"${pathToURLPatternString(path4.path)}"`;
+    for (const path5 of route.paths) {
+      const pathType = `"${pathToURLPatternString(path5.path)}"`;
       routeType += routeType ? " | " + pathType : pathType;
       routesWriter.writeLines(`${pathType}: Routes["${route.key}"];`);
     }
@@ -1290,22 +1291,22 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   const pageWriter = writer.branch("page");
   const layoutWriter = writer.branch("layout");
   for (const [file, types] of routeTypes) {
-    const path4 = `${pathPrefix}/${file.relativePath}`;
+    const path5 = `${pathPrefix}/${file.relativePath}`;
     const routeType = `Run.Routes[${types.join(" | ")}]`;
     switch (file.type) {
       case RoutableFileTypes.Handler:
-        writeModuleDeclaration(handlerWriter, path4, routeType);
+        writeModuleDeclaration(handlerWriter, path5, routeType);
         break;
       case RoutableFileTypes.Middleware:
-        writeModuleDeclaration(middlewareWriter, path4, routeType);
+        writeModuleDeclaration(middlewareWriter, path5, routeType);
         break;
       case RoutableFileTypes.Page:
-        writeModuleDeclaration(pageWriter, path4, routeType);
+        writeModuleDeclaration(pageWriter, path5, routeType);
         break;
       case RoutableFileTypes.Layout:
         writeModuleDeclaration(
           layoutWriter,
-          path4,
+          path5,
           routeType,
           `
   export interface Input {
@@ -1316,7 +1317,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
       case RoutableFileTypes.Error:
         writeModuleDeclaration(
           writer,
-          path4,
+          path5,
           "globalThis.MarkoRun.Route",
           `
   export interface Input {
@@ -1325,7 +1326,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
         );
         break;
       case RoutableFileTypes.NotFound:
-        writeModuleDeclaration(writer, path4, "Run.Route");
+        writeModuleDeclaration(writer, path5, "Run.Route");
         break;
     }
   }
@@ -1349,7 +1350,7 @@ type Routes = {`);
       if (meta) {
         const metaPath = stripTsExtension(`${pathPrefix}/${meta.relativePath}`);
         let metaType = `typeof import("${metaPath}")`;
-        if (/\.(ts|js|mjs)$/.test(meta.relativePath)) {
+        if (/\.(ts|js|mjs)$/.test(meta.name)) {
           metaType += `["default"]`;
         }
         routeType += ` meta: ${metaType};`;
@@ -1360,13 +1361,13 @@ type Routes = {`);
   writer.writeBlockEnd("}");
   return writer.end();
 }
-function writeModuleDeclaration(writer, path4, routeType, moduleTypes) {
-  writer.writeLines("").write(`declare module "${stripTsExtension(path4)}" {`);
+function writeModuleDeclaration(writer, path5, routeType, moduleTypes) {
+  writer.writeLines("").write(`declare module "${stripTsExtension(path5)}" {`);
   if (moduleTypes) {
     writer.write(moduleTypes);
   }
   if (routeType) {
-    const isMarko = path4.endsWith(".marko");
+    const isMarko = path5.endsWith(".marko");
     writer.write(`
   namespace MarkoRun {
     export { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform };
@@ -1380,8 +1381,8 @@ function writeModuleDeclaration(writer, path4, routeType, moduleTypes) {
   writer.writeLines(`
 }`);
 }
-function pathToURLPatternString(path4) {
-  return path4.replace(/\/\$(\$?)([^\/]*)/g, (_, catchAll, name) => {
+function pathToURLPatternString(path5) {
+  return path5.replace(/\/\$(\$?)([^\/]*)/g, (_, catchAll, name) => {
     name = decodeURIComponent(name);
     return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
   });
@@ -1390,11 +1391,11 @@ function createRouteTrie(routes) {
   const root = {
     key: ""
   };
-  function insert(path4, route) {
+  function insert(path5, route) {
     let node = root;
-    for (const segment of path4.segments) {
+    for (const segment of path5.segments) {
       if (segment === "$$") {
-        node.catchAll ?? (node.catchAll = { route, path: path4 });
+        node.catchAll ?? (node.catchAll = { route, path: path5 });
         return;
       } else if (segment === "$") {
         node = node.dynamic ?? (node.dynamic = {
@@ -1412,12 +1413,12 @@ function createRouteTrie(routes) {
         node = next;
       }
     }
-    node.path ?? (node.path = path4);
+    node.path ?? (node.path = path5);
     node.route ?? (node.route = route);
   }
   for (const route of routes) {
-    for (const path4 of route.paths) {
-      insert(path4, route);
+    for (const path5 of route.paths) {
+      insert(path5, route);
     }
   }
   return root;
@@ -1523,7 +1524,7 @@ function logRoutesTable(routes, bundle, options) {
     style: { compact: true }
   });
   for (const route of routes.list) {
-    for (const path4 of route.paths) {
+    for (const path5 of route.paths) {
       const verbs = getVerbs(route).sort(
         (a, b) => HttpVerbOrder[a] - HttpVerbOrder[b]
       );
@@ -1542,7 +1543,7 @@ function logRoutesTable(routes, bundle, options) {
           kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))
         ];
         if (verbs.length === 1 || firstRow) {
-          row.push({ rowSpan: verbs.length, content: prettyPath(path4.path) });
+          row.push({ rowSpan: verbs.length, content: prettyPath(path5.path) });
           firstRow = false;
         }
         row.push(entryType.join(" -> "));
@@ -1603,8 +1604,8 @@ function prettySize([bytes, compBytes]) {
   else str += kleur.bold(kleur.red(compSize));
   return str;
 }
-function prettyPath(path4) {
-  return path4.replace(/\/\$\$(.*)$/, (_, p) => "/" + kleur.bold(kleur.dim(`*${p}`))).replace(/\/\$([^/]+)/g, (_, p) => "/" + kleur.bold(kleur.dim(`:${p}`)));
+function prettyPath(path5) {
+  return path5.replace(/\/\$\$(.*)$/, (_, p) => "/" + kleur.bold(kleur.dim(`*${p}`))).replace(/\/\$([^/]+)/g, (_, p) => "/" + kleur.bold(kleur.dim(`:${p}`)));
 }
 
 // src/vite/utils/config.ts
@@ -1626,11 +1627,11 @@ import createDebug from "debug";
 
 // src/vite/utils/read-once-persisted-store.ts
 import os from "os";
-import path2 from "path";
+import path3 from "path";
 import { promises as fs2 } from "fs";
 var noop = () => {
 };
-var tmpFile = path2.join(os.tmpdir(), "marko-run-storage.json");
+var tmpFile = path3.join(os.tmpdir(), "marko-run-storage.json");
 var values = /* @__PURE__ */ new Map();
 var loadedFromDisk;
 var ReadOncePersistedStore = class {
@@ -1698,7 +1699,7 @@ function prepareError(err) {
 // src/vite/plugin.ts
 import { createHash } from "crypto";
 var debug = createDebug("@marko/run");
-var __dirname = path3.dirname(fileURLToPath(import.meta.url));
+var __dirname = path4.dirname(fileURLToPath(import.meta.url));
 var PLUGIN_NAME_PREFIX = "marko-run-vite";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
@@ -1706,7 +1707,7 @@ var CLIENT_OUT_DIR = "public";
 var MIDDLEWARE_FILENAME = `${markoRunFilePrefix}middleware.js`;
 var ROUTER_FILENAME = `${markoRunFilePrefix}router.js`;
 var defaultPort = Number(process.env.PORT || 3e3);
-var normalizePath = path3.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
+var normalizePath = path4.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let store;
@@ -1734,18 +1735,15 @@ function markoRun(opts = {}) {
     routesBuild: 0,
     routesRender: 0
   };
-  function getEntryFileRelativePath(to) {
-    return normalizePath(path3.relative(entryFilesDir, to));
-  }
   async function writeTypesFile(routes2) {
     if (routes2 && (tsConfigExists ?? (tsConfigExists = await globFileExists(
       root,
       "{.tsconfig*,tsconfig*.json}"
     )))) {
-      const filepath = path3.join(typesDir, "routes.d.ts");
+      const filepath = path4.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes2,
-        normalizePath(path3.relative(typesDir, resolvedRoutesDir)),
+        normalizePath(path4.relative(typesDir, resolvedRoutesDir)),
         adapter
       );
       if (data !== typesFile || !fs3.existsSync(filepath)) {
@@ -1767,12 +1765,12 @@ function markoRun(opts = {}) {
           throw new Error("No routes generated");
         }
         for (const route of routes.list) {
-          virtualFiles.set(path3.posix.join(root, `${route.entryName}.js`), "");
+          virtualFiles.set(path4.posix.join(root, `${route.entryName}.js`), "");
         }
         if (routes.middleware.length) {
-          virtualFiles.set(path3.posix.join(root, MIDDLEWARE_FILENAME), "");
+          virtualFiles.set(path4.posix.join(root, MIDDLEWARE_FILENAME), "");
         }
-        virtualFiles.set(path3.posix.join(root, ROUTER_FILENAME), "");
+        virtualFiles.set(path4.posix.join(root, ROUTER_FILENAME), "");
         resolve(routes);
       } catch (err) {
         reject(err);
@@ -1785,7 +1783,6 @@ function markoRun(opts = {}) {
       var _a;
       try {
         const routes2 = await buildVirtualFiles();
-        let entryFilesDirExists = false;
         if (fs3.existsSync(entryFilesDir)) {
           fs3.rmSync(entryFilesDir, { recursive: true });
         }
@@ -1804,32 +1801,34 @@ function markoRun(opts = {}) {
             }
             if (!route.handler.verbs.length) {
               context.warn(
-                `Did not find any http verb exports in handler '${path3.relative(root, route.handler.filePath)}' - expected ${httpVerbs.map((v) => v.toUpperCase()).join(", ")}`
+                `Did not find any http verb exports in handler '${path4.relative(root, route.handler.filePath)}' - expected ${httpVerbs.map((v) => v.toUpperCase()).join(", ")}`
               );
             }
           }
           if (route.page && route.layouts.length) {
-            entryFilesDirExists || (entryFilesDirExists = !!fs3.mkdirSync(entryFilesDir, {
-              recursive: true
-            }));
+            const relativePath = path4.relative(resolvedRoutesDir, route.page.filePath);
+            const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
+            const routeFileRelativePathPosix = normalizePath(path4.relative(routeFileDir, root));
+            fs3.mkdirSync(routeFileDir, { recursive: true });
             fs3.writeFileSync(
-              path3.join(entryFilesDir, `${route.entryName}.marko`),
-              renderRouteTemplate(route, getEntryFileRelativePath)
+              path4.join(routeFileDir, "route.marko"),
+              renderRouteTemplate(route, (to) => path4.posix.join(routeFileRelativePathPosix, to))
             );
           }
           virtualFiles.set(
-            path3.posix.join(root, `${route.entryName}.js`),
+            path4.posix.join(root, `${route.entryName}.js`),
             renderRouteEntry(route, relativeEntryFilesDirPosix)
           );
         }
         for (const route of Object.values(routes2.special)) {
-          if (route.layouts.length) {
-            entryFilesDirExists || (entryFilesDirExists = !!fs3.mkdirSync(entryFilesDir, {
-              recursive: true
-            }));
+          if (route.page && route.layouts.length) {
+            const relativePath = path4.relative(resolvedRoutesDir, route.page.filePath);
+            const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
+            const routeFileRelativePathPosix = normalizePath(path4.relative(routeFileDir, root));
+            fs3.mkdirSync(routeFileDir, { recursive: true });
             fs3.writeFileSync(
-              path3.join(entryFilesDir, `${route.entryName}.marko`),
-              renderRouteTemplate(route, getEntryFileRelativePath)
+              path4.join(routeFileDir, `route.${route.key}.marko`),
+              renderRouteTemplate(route, (to) => path4.posix.join(routeFileRelativePathPosix, to))
             );
           }
         }
@@ -1837,17 +1836,17 @@ function markoRun(opts = {}) {
           for (const middleware of routes2.middleware) {
             if (!(await getExportsFromFile(context, middleware.filePath)).includes("default")) {
               context.warn(
-                `Did not find a default export in middleware '${path3.relative(root, middleware.filePath)}'`
+                `Did not find a default export in middleware '${path4.relative(root, middleware.filePath)}'`
               );
             }
           }
           virtualFiles.set(
-            path3.posix.join(root, MIDDLEWARE_FILENAME),
+            path4.posix.join(root, MIDDLEWARE_FILENAME),
             renderMiddleware(routes2.middleware)
           );
         }
         virtualFiles.set(
-          path3.posix.join(root, ROUTER_FILENAME),
+          path4.posix.join(root, ROUTER_FILENAME),
           renderRouter(routes2, relativeEntryFilesDirPosix, {
             trailingSlashes: opts.trailingSlashes || "RedirectWithout"
           })
@@ -1871,7 +1870,7 @@ function markoRun(opts = {}) {
           throw err;
         }
         virtualFiles.set(
-          path3.posix.join(root, ROUTER_FILENAME),
+          path4.posix.join(root, ROUTER_FILENAME),
           `throw ${JSON.stringify(prepareError(err))}`
         );
       }
@@ -1914,23 +1913,23 @@ function markoRun(opts = {}) {
         );
         markoVitePluginOptions.runtimeId = opts.runtimeId;
         markoVitePluginOptions.basePathVar = opts.basePathVar;
-        resolvedRoutesDir = path3.resolve(root, routesDir);
-        entryFilesDir = path3.join(
+        resolvedRoutesDir = path4.resolve(root, routesDir);
+        entryFilesDir = path4.join(
           getModulesDir(root),
           ".marko",
           createHash("shake256", { outputLength: 4 }).update(root).digest("hex")
         );
         entryFilesDirPosix = normalizePath(entryFilesDir);
-        relativeEntryFilesDirPosix = normalizePath(path3.relative(root, entryFilesDir));
-        typesDir = path3.join(root, ".marko-run");
-        devEntryFile = path3.join(root, "index.html");
+        relativeEntryFilesDirPosix = normalizePath(path4.relative(root, entryFilesDir));
+        typesDir = path4.join(root, ".marko-run");
+        devEntryFile = path4.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
         let outDir = ((_d = config2.build) == null ? void 0 : _d.outDir) || "dist";
         const assetsDir = ((_e = config2.build) == null ? void 0 : _e.assetsDir) || "assets";
         let rollupOutputOptions = (_g = (_f = config2.build) == null ? void 0 : _f.rollupOptions) == null ? void 0 : _g.output;
         if (isBuild) {
           if (!isSSRBuild) {
-            outDir = path3.join(outDir, CLIENT_OUT_DIR);
+            outDir = path4.join(outDir, CLIENT_OUT_DIR);
           }
           const defaultRollupOutputOptions = {
             assetFileNames({ name }) {
@@ -2062,7 +2061,7 @@ function markoRun(opts = {}) {
         devServer.watcher.on("all", async (type, filename) => {
           seenErrors.clear();
           const routableFileType = matchRoutableFile(
-            path3.parse(filename).base
+            path4.parse(filename).base
           );
           if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
             if (type === "add" || type === "unlink" || type === "change" && (routableFileType === RoutableFileTypes.Handler || routableFileType === RoutableFileTypes.Middleware)) {
@@ -2107,19 +2106,19 @@ function markoRun(opts = {}) {
       },
       async resolveId(importee, importer) {
         if (importee === "@marko/run/router") {
-          return path3.resolve(root, ROUTER_FILENAME);
+          return path4.resolve(root, ROUTER_FILENAME);
         } else if (importee.endsWith(".marko") && importee.includes(relativeEntryFilesDirPosix)) {
           if (!importee.startsWith(root)) {
-            importee = path3.resolve(root, "." + importee);
+            importee = path4.resolve(root, "." + importee);
           }
           return normalizePath(importee);
         }
         let virtualFilePath;
         if (importee.startsWith(virtualFilePrefix)) {
           virtualFilePath = importee.slice(virtualFilePrefix.length + 1);
-          importee = path3.resolve(root, virtualFilePath);
+          importee = path4.resolve(root, virtualFilePath);
         } else if (!isBuild && importer && (importer === devEntryFile || normalizePath(importer) === devEntryFilePosix) && importee.startsWith(`/${markoRunFilePrefix}`)) {
-          importee = path3.resolve(root, "." + importee);
+          importee = path4.resolve(root, "." + importee);
         }
         importee = normalizePath(importee);
         if (!buildVirtualFilesResult) {
@@ -2128,7 +2127,7 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           return importee;
         } else if (virtualFilePath) {
-          const filePath = path3.resolve(__dirname, "..", virtualFilePath);
+          const filePath = path4.resolve(__dirname, "..", virtualFilePath);
           return await this.resolve(filePath, importer, {
             skipSelf: true
           });
@@ -2167,7 +2166,7 @@ function markoRun(opts = {}) {
           const builtEntries = Object.values(bundle).reduce(
             (acc, item) => {
               if (item.type === "chunk" && item.isEntry) {
-                acc.push(path3.join(options.dir, item.fileName));
+                acc.push(path4.join(options.dir, item.fileName));
               }
               return acc;
             },
@@ -2227,11 +2226,11 @@ async function ensureDir(dir) {
 }
 async function getPackageData(dir) {
   do {
-    const pkgPath = path3.join(dir, "package.json");
+    const pkgPath = path4.join(dir, "package.json");
     if (fs3.existsSync(pkgPath)) {
       return JSON.parse(await fs3.promises.readFile(pkgPath, "utf-8"));
     }
-  } while (dir !== (dir = path3.dirname(dir)));
+  } while (dir !== (dir = path4.dirname(dir)));
   return null;
 }
 async function resolveAdapter(root, options, log) {
@@ -2284,7 +2283,7 @@ function getModulesDir(root, dir = __dirname) {
       return dir.slice(0, index + 12);
     }
   }
-  return path3.join(root, "node_modules");
+  return path4.join(root, "node_modules");
 }
 var defaultConfigPlugin = {
   name: `${PLUGIN_NAME_PREFIX}:defaults`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",