@marko/run 0.7.2 → 0.7.3

package/dist/adapter/load-dev-worker.mjs

@@ -1,6 +1,7 @@
-import { getDevGlobal } from "@marko/run/adapter";
+import { getDevGlobal, resolveAdapter } from "@marko/run/adapter";
+import plugin, { defaultConfigPlugin } from "@marko/run/vite";
 import net from "net";
-import { createServer } from "vite";
+import { createServer, resolveConfig } from "vite";
 
 process
   .on("message", (message) => {
@@ -14,6 +15,29 @@ process
   .send("ready");
 
 async function start(entry, config) {
+  if (config.plugins?.length) {
+    const resolvedConfig = await resolveConfig(
+      {
+        root: config.root,
+        configFile: config.configFile,
+        logLevel: "silent",
+        plugins: [defaultConfigPlugin],
+      },
+      "serve",
+    );
+    const adapter = await resolveAdapter(resolvedConfig);
+    const plugins =
+      (adapter.plugins &&
+        (await adapter.plugins({ root: config.root, command: "dev" }))) ||
+      [];
+
+    if (plugins.some((plugin) => plugin.name === "marko-run-vite:pre")) {
+      plugins.push(...plugin());
+    }
+
+    config.plugins = plugins;
+  }
+
   globalThis.__marko_run_vite_config__ = config;
 
   let changed = false;

package/dist/cli/index.mjs

@@ -14,13 +14,16 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 import sade from "sade";
 
 // src/cli/commands.ts
+import fs6 from "fs";
+import path9 from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
+import { build as viteBuild, resolveConfig } from "vite";
+
+// src/adapter/index.ts
 import fs5 from "fs";
-import path7 from "path";
+import inspector from "inspector";
+import path8 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import {
-  build as viteBuild,
-  resolveConfig
-} from "vite";
 
 // src/vite/plugin.ts
 import markoVitePlugin from "@marko/vite";
@@ -671,14 +674,14 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         if (useSwitch) {
           writer.writeBlockStart(`switch (${value}) {`);
         }
-        for (const { key, path: path8, route: route2 } of terminal) {
+        for (const { key, path: path10, route: route2 } of terminal) {
           const decodedKey = decodeURIComponent(key);
           if (useSwitch) {
             writer.write(`case '${decodedKey}': `, true);
           } else {
             writer.write(`if (${value} === '${decodedKey}') `, true);
           }
-          writer.write(`return ${renderMatch(verb, route2, path8)};
+          writer.write(`return ${renderMatch(verb, route2, path10)};
 `);
         }
         if (useSwitch) {
@@ -780,11 +783,11 @@ function renderParams(params, pathIndex) {
   }
   return result ? result + " }" : "{}";
 }
-function renderMatch(verb, route, path8, pathIndex) {
+function renderMatch(verb, route, path10, pathIndex) {
   const handler = `${verb}${route.index}`;
-  const params = path8.params ? renderParams(path8.params, pathIndex) : "{}";
+  const params = path10.params ? renderParams(path10.params, pathIndex) : "{}";
   const meta = route.meta ? `meta${route.index}` : "{}";
-  return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${path8.path}' }`;
+  return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${path10.path}' }`;
 }
 function renderMiddleware(middleware, rootDir) {
   const writer = createStringWriter();
@@ -806,18 +809,18 @@ function renderMiddleware(middleware, rootDir) {
   imports.join();
   return writer.end();
 }
-function stripTsExtension(path8) {
-  const index = path8.lastIndexOf(".");
+function stripTsExtension(path10) {
+  const index = path10.lastIndexOf(".");
   if (index !== -1) {
-    const ext = path8.slice(index + 1);
+    const ext = path10.slice(index + 1);
     if (ext.toLowerCase() === "ts") {
-      return path8.slice(0, index);
+      return path10.slice(0, index);
     }
   }
-  return path8;
+  return path10;
 }
-function decodePath(path8) {
-  return path8;
+function decodePath(path10) {
+  return path10;
 }
 async function renderRouteTypeInfo(routes, outDir, adapter) {
   var _a, _b, _c, _d;
@@ -975,11 +978,11 @@ function createRouteTrie(routes) {
   const root = {
     key: ""
   };
-  function insert(path8, route) {
+  function insert(path10, route) {
     let node = root;
-    for (const segment of path8.segments) {
+    for (const segment of path10.segments) {
       if (segment === "$$") {
-        node.catchAll ?? (node.catchAll = { route, path: path8 });
+        node.catchAll ?? (node.catchAll = { route, path: path10 });
         return;
       } else if (segment === "$") {
         node = node.dynamic ?? (node.dynamic = {
@@ -997,7 +1000,7 @@ function createRouteTrie(routes) {
         node = next;
       }
     }
-    node.path ?? (node.path = path8);
+    node.path ?? (node.path = path10);
     node.route ?? (node.route = route);
   }
   for (const route of routes) {
@@ -1047,9 +1050,9 @@ function parseFlatRoute(pattern) {
       } else if (charCode === 44 /* Alternate */) {
         if (!current) {
           segmentEnd(
-            basePaths.map((path8) => ({
-              ...path8,
-              segments: path8.segments.slice()
+            basePaths.map((path10) => ({
+              ...path10,
+              segments: path10.segments.slice()
             })),
             escaped,
             "_",
@@ -1086,9 +1089,9 @@ function parseFlatRoute(pattern) {
         } else if (charCode === 36 /* Dynamic */) {
           type = pattern.charCodeAt(i + 1) === 36 ? "$$" : "$";
         }
-        current ?? (current = basePaths.map((path8) => ({
-          ...path8,
-          segments: path8.segments.slice()
+        current ?? (current = basePaths.map((path10) => ({
+          ...path10,
+          segments: path10.segments.slice()
         })));
         i = len;
         for (const char of delimiters) {
@@ -1113,9 +1116,9 @@ function parseFlatRoute(pattern) {
     }
     if (!current) {
       segmentEnd(
-        basePaths.map((path8) => ({
-          ...path8,
-          segments: path8.segments.slice()
+        basePaths.map((path10) => ({
+          ...path10,
+          segments: path10.segments.slice()
         })),
         escaped,
         void 0,
@@ -1144,9 +1147,9 @@ function parseFlatRoute(pattern) {
         segment.param = normalizeParam(raw.slice(type.length));
       }
     }
-    for (const path8 of paths) {
+    for (const path10 of paths) {
       if (segment) {
-        if (path8.isCatchall) {
+        if (path10.isCatchall) {
           throw new Error(
             `Invalid route pattern: nested segments are not allowed after a catch-all parameter. Found '.' following '${pattern.slice(
               0,
@@ -1154,22 +1157,22 @@ function parseFlatRoute(pattern) {
             )}' in '${pattern}'.`
           );
         }
-        path8.segments.push(segment);
-        path8.id += path8.id === "/" ? segment.name : `/${segment.name}`;
+        path10.segments.push(segment);
+        path10.id += path10.id === "/" ? segment.name : `/${segment.name}`;
         if (type === "$$") {
-          path8.isCatchall = true;
+          path10.isCatchall = true;
         }
       }
       if (map) {
-        if (map.has(path8.id)) {
-          const existing = map.get(path8.id);
+        if (map.has(path10.id)) {
+          const existing = map.get(path10.id);
           const existingExpansion = existing.segments.map((s) => s.raw).join(".");
-          const currentExpansion = path8.segments.map((s) => s.raw).join(".");
+          const currentExpansion = path10.segments.map((s) => s.raw).join(".");
           throw new Error(
-            `Invalid route pattern: route '${path8.id}' is ambiguous. Expansion '${currentExpansion}' collides with '${existingExpansion}' in '${pattern}'.`
+            `Invalid route pattern: route '${path10.id}' is ambiguous. Expansion '${currentExpansion}' collides with '${existingExpansion}' in '${pattern}'.`
           );
         }
-        map.set(path8.id, path8);
+        map.set(path10.id, path10);
       }
     }
   }
@@ -1244,11 +1247,11 @@ var _VDir = class _VDir {
     });
     return value;
   }
-  addDir(path8, segment) {
+  addDir(path10, segment) {
     const map = segment.type === "_" ? __privateGet(this, _pathlessDirs) ?? __privateSet(this, _pathlessDirs, /* @__PURE__ */ new Map()) : __privateGet(this, _dirs) ?? __privateSet(this, _dirs, /* @__PURE__ */ new Map());
     const key = segment.type === "$" ? segment.raw : segment.name;
     if (!map.has(key)) {
-      const dir = new _VDir(this, segment, path8);
+      const dir = new _VDir(this, segment, path10);
       map.set(key, dir);
       return dir;
     }
@@ -1294,10 +1297,10 @@ var _VDir = class _VDir {
     const dirs = [];
     const unique = /* @__PURE__ */ new Map();
     for (const root of roots) {
-      for (const path8 of paths) {
+      for (const path10 of paths) {
         let dir = root;
-        for (const segment of path8.segments) {
-          dir = dir.addDir(path8, segment);
+        for (const segment of path10.segments) {
+          dir = dir.addDir(path10, segment);
         }
         const existing = unique.get(dir.path);
         if (existing) {
@@ -1310,7 +1313,7 @@ var _VDir = class _VDir {
             }
           }
           throw new Error(
-            `Ambiguous directory structure: ${sourcePath}${path8.source} defines ${dir.path} multiple times.`
+            `Ambiguous directory structure: ${sourcePath}${path10.source} defines ${dir.path} multiple times.`
           );
         } else {
           unique.set(dir.path, dir);
@@ -1765,8 +1768,8 @@ function prettySize([bytes, compBytes]) {
   else str += kleur2.bold(kleur2.red(compSize));
   return str;
 }
-function prettyPath(path8) {
-  return path8.replace(
+function prettyPath(path10) {
+  return path10.replace(
     /\/(\$\$?)(`?)([^/`]+)\2/g,
     (_, type, tick, key) => "/" + type + tick + kleur2.bold(kleur2.dim(key)) + tick
   );
@@ -2467,8 +2470,60 @@ async function getAvailablePort(port) {
   });
 }
 
+// src/adapter/dev-server.ts
+import path7 from "path";
+import {
+  buildErrorMessage as buildErrorMessage2,
+  createServer
+} from "vite";
+
+// src/adapter/logger.ts
+import DraftLog from "draftlog";
+import format2 from "human-format";
+import inpspector from "inspector";
+import kleur3 from "kleur";
+if (!inpspector.url()) {
+  DraftLog.into(console);
+  DraftLog.defaults.canReWrite = false;
+}
+var IdChars = [
+  "",
+  kleur3.cyan("\xB9"),
+  kleur3.magenta("\xB2"),
+  kleur3.green("\xB3"),
+  kleur3.red("\u2074"),
+  kleur3.cyan("\u2075"),
+  kleur3.magenta("\u2076"),
+  kleur3.green("\u2077"),
+  kleur3.red("\u2078"),
+  kleur3.cyan("\u2079"),
+  kleur3.red("\u207A")
+];
+
+// src/adapter/middleware.ts
+import { Readable } from "node:stream";
+var bodyConsumedErrorStream = new ReadableStream({
+  pull(controller) {
+    controller.error(
+      new Error(
+        "The request body stream has been destroyed or consumed by something before Marko Run."
+      )
+    );
+  }
+});
+
+// src/adapter/index.ts
+import parseNodeArgs from "parse-node-args";
+var __dirname2 = path8.dirname(fileURLToPath2(import.meta.url));
+var defaultEntry = path8.join(__dirname2, "default-entry");
+var loadDevWorker = path8.join(__dirname2, "load-dev-worker.mjs");
+async function resolveAdapter2(config2) {
+  const options = getExternalPluginOptions(config2);
+  return resolveAdapter(config2.root, options);
+}
+
 // src/cli/commands.ts
-var __dirname2 = path7.dirname(fileURLToPath2(import.meta.url));
+var __dirname3 = path9.dirname(fileURLToPath3(import.meta.url));
 var defaultConfigFileBases = ["vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];
 async function preview(entry, distEntry, cwd, configFile, port, outDir, envFile, args = []) {
@@ -2497,10 +2552,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 = path7.resolve(cwd, resolvedConfig.build.outDir);
-  const entryFile = distEntry ? path7.join(dir, distEntry) : findFileWithExt(dir, "index", [".mjs", ".js"]);
+  const dir = path9.resolve(cwd, resolvedConfig.build.outDir);
+  const entryFile = distEntry ? path9.join(dir, distEntry) : findFileWithExt(dir, "index", [".mjs", ".js"]);
   if (envFile) {
-    envFile = path7.resolve(cwd, envFile);
+    envFile = path9.resolve(cwd, envFile);
   }
   const options = {
     cwd,
@@ -2528,7 +2583,7 @@ async function dev(entry, cwd, configFile, port, envFile, args = []) {
     "serve"
   );
   if (envFile) {
-    envFile = path7.resolve(cwd, envFile);
+    envFile = path9.resolve(cwd, envFile);
   }
   const [availablePort, adapter] = await Promise.all([
     getAvailablePort(
@@ -2586,7 +2641,7 @@ async function build(entry, cwd, configFile, outDir, envFile) {
     }
   }
   if (envFile) {
-    envFile = path7.resolve(cwd, envFile);
+    envFile = path9.resolve(cwd, envFile);
   }
   let plugins = adapter.plugins && await adapter.plugins({ root, command: "build" });
   if (!isPluginIncluded(resolvedConfig)) {
@@ -2628,8 +2683,8 @@ async function build(entry, cwd, configFile, outDir, envFile) {
 }
 function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
   for (const ext of extensions) {
-    const filePath = path7.join(dir, base + ext);
-    if (fs5.existsSync(filePath)) {
+    const filePath = path9.join(dir, base + ext);
+    if (fs6.existsSync(filePath)) {
       return filePath;
     }
   }
@@ -2637,8 +2692,8 @@ function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
 }
 async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
   if (configFile) {
-    const configFilePath = path7.join(dir, configFile);
-    if (!fs5.existsSync(configFilePath)) {
+    const configFilePath = path9.join(dir, configFile);
+    if (!fs6.existsSync(configFilePath)) {
       throw new Error(`No config file found at '${configFilePath}'`);
     }
     return configFile;
@@ -2649,11 +2704,7 @@ async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
       return configFile;
     }
   }
-  return path7.join(__dirname2, "default.config.mjs");
-}
-async function resolveAdapter2(config2) {
-  const options = getExternalPluginOptions(config2);
-  return resolveAdapter(config2.root, options);
+  return path9.join(__dirname3, "default.config.mjs");
 }
 
 // src/cli/index.ts

package/dist/vite/index.cjs

@@ -40,6 +40,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var vite_exports = {};
 __export(vite_exports, {
   default: () => markoRun,
+  defaultConfigPlugin: () => defaultConfigPlugin,
   getAvailablePort: () => getAvailablePort,
   getPackageData: () => getPackageData,
   isPortInUse: () => isPortInUse,
@@ -2594,6 +2595,7 @@ function sleep(ms) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  defaultConfigPlugin,
   getAvailablePort,
   getPackageData,
   isPortInUse,

package/dist/vite/index.d.ts

@@ -1,4 +1,4 @@
-export { default, getPackageData } from "./plugin";
+export { default, defaultConfigPlugin, getPackageData } from "./plugin";
 export type { Adapter, AdapterConfig, BuiltRoutes, ExplorerData, HttpVerb, Options, PackageData, PathInfo, RoutableFile, RoutableFileType, Route, RouteGenerationData, } from "./types";
 export type { SpawnedServer } from "./utils/server";
 export { getAvailablePort, isPortInUse, loadEnv, parseEnv, spawnServer, spawnServerWorker, } from "./utils/server";

package/dist/vite/index.js

@@ -2552,6 +2552,7 @@ function sleep(ms) {
 }
 export {
   markoRun as default,
+  defaultConfigPlugin,
   getAvailablePort,
   getPackageData,
   isPortInUse,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "The Marko application framework.",
   "keywords": [
     "marko"