@marko/run 0.2.18 → 0.3.1

package/dist/cli/index.mjs

@@ -28,10 +28,13 @@ var __privateSet = (obj, member, value, setter) => {
 import sade from "sade";
 
 // src/cli/commands.ts
-import path3 from "path";
-import fs4 from "fs";
+import path4 from "path";
+import fs5 from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { build as viteBuild, resolveConfig } from "vite";
+import {
+  build as viteBuild,
+  resolveConfig
+} from "vite";
 
 // src/vite/utils/config.ts
 var PluginConfigKey = "__MARKO_RUN_PLUGIN_CONFIG__";
@@ -48,9 +51,6 @@ var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, Plug
 var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterConfigKey);
 var setExternalAdapterOptions = (viteConfig, value) => setConfig(viteConfig, AdapterConfigKey, value);
 
-// src/cli/commands.ts
-import { MemoryStore } from "@marko/vite";
-
 // src/vite/utils/server.ts
 import net from "net";
 import cp from "child_process";
@@ -83,15 +83,14 @@ async function getAvailablePort(port) {
 }
 
 // src/vite/plugin.ts
-import path2 from "path";
-import crypto from "crypto";
-import fs3 from "fs";
+import path3 from "path";
+import fs4 from "fs";
 import { glob } from "glob";
 import { fileURLToPath } from "url";
 import browserslist from "browserslist";
 import { resolveToEsbuildTarget } from "esbuild-plugin-browserslist";
 import { mergeConfig } from "vite";
-import markoVitePlugin, { FileStore } from "@marko/vite";
+import markoVitePlugin from "@marko/vite";
 
 // src/vite/constants.ts
 var markoRunFilePrefix = "__marko-run__";
@@ -172,10 +171,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;
     }
@@ -221,10 +220,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();
@@ -236,7 +235,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);
@@ -278,9 +277,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()
             })),
             "",
             "_",
@@ -310,9 +309,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) {
@@ -332,9 +331,9 @@ function parseFlatRoute(pattern) {
     }
     if (!current) {
       segmentEnd(
-        basePaths.map((path4) => ({
-          ...path4,
-          segments: path4.segments.slice()
+        basePaths.map((path5) => ({
+          ...path5,
+          segments: path5.segments.slice()
         })),
         "",
         "_",
@@ -358,9 +357,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,
@@ -368,22 +367,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);
       }
     }
   }
@@ -439,7 +438,7 @@ async function buildRoutes(sources) {
         dirStack.length = prevDirStackLength;
       };
     },
-    onFile({ name, path: path4 }) {
+    onFile({ name, path: path5 }) {
       const match = name.match(routeableFileRegex);
       if (!match) {
         return;
@@ -447,7 +446,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;
       }
@@ -462,7 +461,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
@@ -514,23 +513,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),
@@ -1193,7 +1192,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);
@@ -1201,7 +1200,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}
 `
           );
         }
@@ -1306,11 +1305,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) {
@@ -1331,15 +1330,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;
@@ -1371,8 +1370,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}"];`);
     }
@@ -1408,22 +1407,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 {
@@ -1434,7 +1433,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
       case RoutableFileTypes.Error:
         writeModuleDeclaration(
           writer,
-          path4,
+          path5,
           "globalThis.MarkoRun.Route",
           `
   export interface Input {
@@ -1443,7 +1442,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
         );
         break;
       case RoutableFileTypes.NotFound:
-        writeModuleDeclaration(writer, path4, "Run.Route");
+        writeModuleDeclaration(writer, path5, "Run.Route");
         break;
     }
   }
@@ -1478,13 +1477,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 };
@@ -1497,8 +1496,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}`;
   });
@@ -1507,11 +1506,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 = {
@@ -1529,12 +1528,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;
@@ -1624,7 +1623,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]
       );
@@ -1643,7 +1642,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(" -> "));
@@ -1707,18 +1706,66 @@ function prettySize([bytes, compBytes]) {
     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/plugin.ts
 import createDebug from "debug";
+
+// src/vite/utils/read-once-persisted-store.ts
+import os from "os";
+import path2 from "path";
+import { promises as fs3 } from "fs";
+var noop = () => {
+};
+var tmpFile = path2.join(os.tmpdir(), "marko-run-storage.json");
+var values = /* @__PURE__ */ new Map();
+var loadedFromDisk;
+var ReadOncePersistedStore = class {
+  constructor(uid) {
+    this.uid = uid;
+  }
+  write(value) {
+    values.set(this.uid, value);
+  }
+  async read() {
+    const { uid } = this;
+    if (values.has(uid)) {
+      const value = values.get(uid);
+      values.delete(uid);
+      return value;
+    }
+    if (loadedFromDisk === true) {
+      throw new Error(`Value for ${uid} could not be loaded.`);
+    }
+    await (loadedFromDisk || (loadedFromDisk = fs3.readFile(tmpFile, "utf-8").then(syncDataFromDisk).catch(finishLoadFromDisk)));
+    return this.read();
+  }
+};
+function syncDataFromDisk(data) {
+  finishLoadFromDisk();
+  fs3.unlink(tmpFile).catch(noop);
+  for (const [k, v] of JSON.parse(data)) {
+    values.set(k, v);
+  }
+}
+function finishLoadFromDisk() {
+  loadedFromDisk = true;
+}
+process.once("beforeExit", (code) => {
+  if (code === 0 && values.size) {
+    fs3.writeFile(tmpFile, JSON.stringify([...values])).catch(noop);
+  }
+});
+
+// src/vite/plugin.ts
 var debug = createDebug("@marko/run");
-var __dirname = path2.dirname(fileURLToPath(import.meta.url));
+var __dirname = path3.dirname(fileURLToPath(import.meta.url));
 var PLUGIN_NAME_PREFIX = "marko-run-vite";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
-var normalizePath = path2.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
+var normalizePath = path3.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let compiler;
@@ -1735,7 +1782,6 @@ function markoRun(opts = {}) {
   let devServer;
   let routes;
   let routeData;
-  let routeDataFilename = "routes.json";
   let extractVerbs;
   let resolvedConfig;
   let typesFile;
@@ -1751,15 +1797,15 @@ function markoRun(opts = {}) {
       root,
       "{.tsconfig*,tsconfig*.json}"
     )))) {
-      const filepath = path2.join(typesDir, "routes.d.ts");
+      const filepath = path3.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes2,
-        normalizePath(path2.relative(typesDir, resolvedRoutesDir)),
+        normalizePath(path3.relative(typesDir, resolvedRoutesDir)),
         adapter
       );
-      if (data !== typesFile || !fs3.existsSync(filepath)) {
+      if (data !== typesFile || !fs4.existsSync(filepath)) {
         await ensureDir(typesDir);
-        await fs3.promises.writeFile(filepath, typesFile = data);
+        await fs4.promises.writeFile(filepath, typesFile = data);
       }
     }
   }
@@ -1794,24 +1840,24 @@ function markoRun(opts = {}) {
         }
         if (route.page) {
           virtualFiles.set(
-            path2.posix.join(root, `${route.entryName}.marko`),
+            path3.posix.join(root, `${route.entryName}.marko`),
             render ? renderRouteTemplate(route) : ""
           );
         }
         virtualFiles.set(
-          path2.posix.join(root, `${route.entryName}.js`),
+          path3.posix.join(root, `${route.entryName}.js`),
           render ? renderRouteEntry(route) : ""
         );
       }
       for (const route of Object.values(routes.special)) {
         virtualFiles.set(
-          path2.posix.join(root, `${route.entryName}.marko`),
+          path3.posix.join(root, `${route.entryName}.marko`),
           render ? renderRouteTemplate(route) : ""
         );
       }
       if (routes.middleware.length) {
         virtualFiles.set(
-          path2.posix.join(root, `${markoRunFilePrefix}middleware.js`),
+          path3.posix.join(root, `${markoRunFilePrefix}middleware.js`),
           render ? renderMiddleware(routes.middleware) : ""
         );
       }
@@ -1843,7 +1889,7 @@ function markoRun(opts = {}) {
       }
       console.error(err);
       virtualFiles.set(
-        path2.posix.join(root, `${markoRunFilePrefix}error.marko`),
+        path3.posix.join(root, `${markoRunFilePrefix}error.marko`),
         renderEntryTemplate(`${markoRunFilePrefix}error`, ["<dev-error-page>"])
       );
       virtualFiles.set(
@@ -1887,25 +1933,25 @@ function markoRun(opts = {}) {
         compiler.taglib.register("@marko/run", {
           "<dev-error-page>": {
             template: normalizePath(
-              path2.resolve(__dirname, "../components/dev-error-page.marko")
+              path3.resolve(__dirname, "../components/dev-error-page.marko")
             )
           },
           "<*>": {
-            transform: path2.resolve(
+            transform: path3.resolve(
               __dirname,
               "../components/src-attributes-transformer.cjs"
             )
           }
         });
         routesDir = opts.routesDir || "src/routes";
-        markoVitePluginOptions.store = store = opts.store || new FileStore(
-          `marko-serve-vite-${crypto.createHash("SHA1").update(root).digest("hex")}`
+        store = new ReadOncePersistedStore(
+          `vite-marko-run${opts.runtimeId ? `-${opts.runtimeId}` : ""}`
         );
         markoVitePluginOptions.runtimeId = opts.runtimeId;
         markoVitePluginOptions.basePathVar = opts.basePathVar;
-        resolvedRoutesDir = path2.resolve(root, routesDir);
-        typesDir = path2.join(root, ".marko-run");
-        devEntryFile = path2.join(root, "index.html");
+        resolvedRoutesDir = path3.resolve(root, routesDir);
+        typesDir = path3.join(root, ".marko-run");
+        devEntryFile = path3.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
         const assetsDir = ((_d = config2.build) == null ? void 0 : _d.assetsDir) || "assets";
         let rollupOutputOptions = (_f = (_e = config2.build) == null ? void 0 : _e.rollupOptions) == null ? void 0 : _f.output;
@@ -1964,7 +2010,8 @@ function markoRun(opts = {}) {
             // Avoid server & client deleting files from each other.
             rollupOptions: {
               output: rollupOutputOptions
-            }
+            },
+            modulePreload: { polyfill: false }
           },
           optimizeDeps: {
             entries: !((_h = config2.optimizeDeps) == null ? void 0 : _h.entries) ? [
@@ -2014,7 +2061,7 @@ function markoRun(opts = {}) {
       configureServer(_server) {
         devServer = _server;
         devServer.watcher.on("all", async (type, filename) => {
-          const routableFileType = matchRoutableFile(path2.parse(filename).base);
+          const routableFileType = matchRoutableFile(path3.parse(filename).base);
           if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
             if (type === "add") {
               isStale = true;
@@ -2037,9 +2084,7 @@ function markoRun(opts = {}) {
       async buildStart(_options) {
         if (isBuild && !isSSRBuild) {
           try {
-            routeData = JSON.parse(
-              await store.get(routeDataFilename)
-            );
+            routeData = await store.read();
           } catch {
             this.error(
               `You must run the "ssr" build before the "browser" build.`
@@ -2061,9 +2106,9 @@ function markoRun(opts = {}) {
         let virtualFilePath;
         if (importee.startsWith(virtualFilePrefix)) {
           virtualFilePath = importee.slice(virtualFilePrefix.length + 1);
-          importee = path2.resolve(root, virtualFilePath);
+          importee = path3.resolve(root, virtualFilePath);
         } else if (!isBuild && importer && (importer === devEntryFile || normalizePath(importer) === devEntryFilePosix) && importee.startsWith(`/${markoRunFilePrefix}`)) {
-          importee = path2.resolve(root, "." + importee);
+          importee = path3.resolve(root, "." + importee);
         }
         importee = normalizePath(importee);
         if (isStale) {
@@ -2072,7 +2117,7 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           resolved = importee;
         } else if (virtualFilePath) {
-          const filePath = path2.resolve(__dirname, "..", virtualFilePath);
+          const filePath = path3.resolve(__dirname, "..", virtualFilePath);
           const resolution = await this.resolve(filePath, importer, {
             skipSelf: true
           });
@@ -2111,7 +2156,7 @@ function markoRun(opts = {}) {
           const builtEntries = Object.values(bundle).reduce(
             (acc, item) => {
               if (item.type === "chunk" && item.isEntry) {
-                acc.push(path2.join(options.dir, item.fileName));
+                acc.push(path3.join(options.dir, item.fileName));
               }
               return acc;
             },
@@ -2127,7 +2172,7 @@ function markoRun(opts = {}) {
           for (const [key, code] of virtualFiles) {
             routeData.files.push({ key, code });
           }
-          await store.set(routeDataFilename, JSON.stringify(routeData));
+          store.write(routeData);
           await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes.list));
         } else if (process.env.MR_EXPLORER !== "true") {
           logRoutesTable(routes, bundle, options);
@@ -2202,17 +2247,17 @@ async function globFileExists(root, pattern) {
   return (await glob(pattern, { root })).length > 0;
 }
 async function ensureDir(dir) {
-  if (!fs3.existsSync(dir)) {
-    await fs3.promises.mkdir(dir, { recursive: true });
+  if (!fs4.existsSync(dir)) {
+    await fs4.promises.mkdir(dir, { recursive: true });
   }
 }
 async function getPackageData(dir) {
   do {
-    const pkgPath = path2.join(dir, "package.json");
-    if (fs3.existsSync(pkgPath)) {
-      return JSON.parse(await fs3.promises.readFile(pkgPath, "utf-8"));
+    const pkgPath = path3.join(dir, "package.json");
+    if (fs4.existsSync(pkgPath)) {
+      return JSON.parse(await fs4.promises.readFile(pkgPath, "utf-8"));
     }
-  } while (dir !== (dir = path2.dirname(dir)));
+  } while (dir !== (dir = path3.dirname(dir)));
   return null;
 }
 async function resolveAdapter(root, options, log) {
@@ -2244,10 +2289,10 @@ async function resolveAdapter(root, options, log) {
   log && debug("Using default adapter");
   return module.default();
 }
-var markoEntryFileRegex = /__marko-run__([^.]+)\.(.+)\.marko\.([^.]+)$/;
+var markoEntryFileRegex = /__marko-run__([^.]+)(?:\.(.+))?\.marko\.([^.]+)$/;
 function getEntryFileName(file) {
   const match = file && markoEntryFileRegex.exec(file);
-  return match ? match[2] : void 0;
+  return match ? match[2] || "index" : void 0;
 }
 function isPluginIncluded(config2) {
   return config2.plugins.some((plugin) => {
@@ -2256,7 +2301,7 @@ function isPluginIncluded(config2) {
 }
 
 // src/cli/commands.ts
-var __dirname2 = path3.dirname(fileURLToPath2(import.meta.url));
+var __dirname2 = path4.dirname(fileURLToPath2(import.meta.url));
 var defaultPort = Number(process.env.PORT || 3e3);
 var defaultConfigFileBases = ["serve.config", "vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];
@@ -2267,7 +2312,9 @@ async function preview(entry, distEntry, cwd, configFile, port, outDir, envFile,
     "build"
   );
   const [availablePort, adapter] = await Promise.all([
-    getAvailablePort(port ?? resolvedConfig.preview.port ?? resolvedConfig.server.port ?? defaultPort),
+    getAvailablePort(
+      port ?? resolvedConfig.preview.port ?? resolvedConfig.server.port ?? defaultPort
+    ),
     resolveAdapter2(resolvedConfig)
   ]);
   if (!adapter) {
@@ -2278,10 +2325,10 @@ async function preview(entry, distEntry, cwd, configFile, port, outDir, envFile,
   if (!entry) {
     entry = await ((_a = adapter.getEntryFile) == null ? void 0 : _a.call(adapter));
   }
-  const dir = path3.resolve(cwd, resolvedConfig.build.outDir);
-  const entryFile = distEntry ? path3.join(dir, distEntry) : await findFileWithExt(dir, "index", [".mjs", ".js"]);
+  const dir = path4.resolve(cwd, resolvedConfig.build.outDir);
+  const entryFile = distEntry ? path4.join(dir, distEntry) : await findFileWithExt(dir, "index", [".mjs", ".js"]);
   if (envFile) {
-    envFile = path3.resolve(cwd, envFile);
+    envFile = path4.resolve(cwd, envFile);
   }
   const options = {
     cwd,
@@ -2300,10 +2347,12 @@ async function dev(entry, cwd, configFile, port, envFile, args = []) {
     "serve"
   );
   if (envFile) {
-    envFile = path3.resolve(cwd, envFile);
+    envFile = path4.resolve(cwd, envFile);
   }
   const [availablePort, adapter] = await Promise.all([
-    getAvailablePort(port ?? resolvedConfig.server.port ?? resolvedConfig.preview.port ?? defaultPort),
+    getAvailablePort(
+      port ?? resolvedConfig.server.port ?? resolvedConfig.preview.port ?? defaultPort
+    ),
     resolveAdapter2(resolvedConfig)
   ]);
   if (!adapter) {
@@ -2312,9 +2361,7 @@ async function dev(entry, cwd, configFile, port, envFile, args = []) {
       // Would the user know what a target is if presented with this error?
     );
   } else if (!adapter.startDev) {
-    throw new Error(
-      `Adapter '${adapter.name}' does not support 'dev' command`
-    );
+    throw new Error(`Adapter '${adapter.name}' does not support 'dev' command`);
   }
   if (!entry) {
     entry = await ((_a = adapter.getEntryFile) == null ? void 0 : _a.call(adapter));
@@ -2322,7 +2369,7 @@ async function dev(entry, cwd, configFile, port, envFile, args = []) {
   const config2 = {
     root: cwd,
     configFile,
-    plugins: isPluginIncluded(resolvedConfig) ? void 0 : [markoRun()]
+    plugins: isPluginIncluded(resolvedConfig) ? void 0 : markoRun()
   };
   const options = {
     cwd,
@@ -2352,28 +2399,26 @@ async function build(entry, cwd, configFile, outDir, envFile) {
     }
   }
   if (envFile) {
-    envFile = path3.resolve(cwd, envFile);
+    envFile = path4.resolve(cwd, envFile);
   }
-  let buildConfig = {
-    root,
-    configFile,
-    build: {
-      ssr: false,
-      outDir
+  const buildConfig = setExternalAdapterOptions(
+    {
+      root,
+      configFile,
+      plugins: isPluginIncluded(resolvedConfig) ? void 0 : markoRun(),
+      build: {
+        ssr: false,
+        outDir
+      }
+    },
+    {
+      root,
+      isBuild: true,
+      envFile
     }
-  };
-  buildConfig = setExternalPluginOptions(buildConfig, {
-    store: new MemoryStore()
-  });
-  buildConfig = setExternalAdapterOptions(buildConfig, {
-    root,
-    isBuild: true,
-    envFile
-  });
-  const hasPlugin = isPluginIncluded(resolvedConfig);
+  );
   await viteBuild({
     ...buildConfig,
-    plugins: hasPlugin ? void 0 : [markoRun()],
     build: {
       target: "esnext",
       ...buildConfig.build,
@@ -2388,7 +2433,6 @@ async function build(entry, cwd, configFile, outDir, envFile) {
   });
   await viteBuild({
     ...buildConfig,
-    plugins: hasPlugin ? void 0 : [markoRun()],
     build: {
       ...buildConfig.build,
       sourcemap: true
@@ -2397,8 +2441,8 @@ async function build(entry, cwd, configFile, outDir, envFile) {
 }
 function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
   for (const ext of extensions) {
-    const filePath = path3.join(dir, base + ext);
-    if (fs4.existsSync(filePath)) {
+    const filePath = path4.join(dir, base + ext);
+    if (fs5.existsSync(filePath)) {
       return filePath;
     }
   }
@@ -2406,8 +2450,8 @@ function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
 }
 async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
   if (configFile) {
-    const configFilePath = path3.join(dir, configFile);
-    if (!fs4.existsSync(configFilePath)) {
+    const configFilePath = path4.join(dir, configFile);
+    if (!fs5.existsSync(configFilePath)) {
       throw new Error(`No config file found at '${configFilePath}'`);
     }
     return configFile;
@@ -2418,7 +2462,7 @@ async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
       return configFile;
     }
   }
-  return path3.join(__dirname2, "default.config.mjs");
+  return path4.join(__dirname2, "default.config.mjs");
 }
 async function resolveAdapter2(config2) {
   const options = getExternalPluginOptions(config2);
@@ -2460,7 +2504,8 @@ prog.command("dev [entry]", "", { default: true }).describe("Start development s
   "Port the dev server should listen on (defaults: 'preview.port' in config, or `$PORT` env variable, or 3000)"
 ).example("dev --config vite.config.js").action(async (entry, opts) => {
   const cwd = process.cwd();
-  const args = process.argv.slice(entry ? 4 : 3);
+  const offset = (process.argv[2] === "dev" ? 3 : 2) + (entry ? 1 : 0);
+  const args = process.argv.slice(offset);
   const config2 = await getViteConfig(cwd, opts.config);
   await dev(entry, cwd, config2, opts.port, opts.env, args);
 });