@marko/run 0.2.7 → 0.2.8

package/dist/cli/index.mjs

@@ -1115,10 +1115,18 @@ export async function fetch(request, platform) {
     const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
-    const body = import.meta.env.DEV
-      ? error.stack || error.message || "Internal Server Error"
-      : null;
-    return new Response(body, {
+    if (import.meta.env.DEV) {
+      let body;
+      if (error.cause) {
+        body = error.cause.stack || error.cause.message || error.cause;
+      } else {
+        body = error.stack || error.message || "Internal Server Error";
+      }
+      return new Response(body, {
+        status: 500
+      });
+    }
+    return new Response(null, {
       status: 500
     });
   }
@@ -1611,7 +1619,9 @@ function logRoutesTable(routes, bundle, options) {
           entryType.push(kleur.yellow("page"));
           size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
         }
-        const row = [kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))];
+        const row = [
+          kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))
+        ];
         if (verbs.length === 1 || firstRow) {
           row.push({ rowSpan: verbs.length, content: prettyPath(path4.path) });
           firstRow = false;
@@ -1649,10 +1659,7 @@ function byteSize(source) {
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
-    return [
-      byteSize(chunk.source),
-      gzipSize(chunk.source)
-    ];
+    return [byteSize(chunk.source), gzipSize(chunk.source)];
   }
   const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
@@ -1739,12 +1746,10 @@ function markoRun(opts = {}) {
     const routerOptions = {
       trailingSlashes: opts.trailingSlashes || "RedirectWithout"
     };
-    if (!render) {
-      virtualFiles.clear();
-      isRendered = false;
-    }
     try {
       if (isStale) {
+        virtualFiles.clear();
+        isRendered = false;
         const buildStartTime = performance.now();
         routes = await buildRoutes(
           createFSWalker(resolvedRoutesDir),
@@ -2035,13 +2040,10 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           resolved = importee;
         } else if (virtualFilePath) {
-          const resolution = await this.resolve(
-            path2.resolve(__dirname, "..", virtualFilePath),
-            importer,
-            {
-              skipSelf: true
-            }
-          );
+          const filePath = path2.resolve(__dirname, "..", virtualFilePath);
+          const resolution = await this.resolve(filePath, importer, {
+            skipSelf: true
+          });
           return resolution;
         }
         return resolved || null;
@@ -2051,7 +2053,7 @@ function markoRun(opts = {}) {
           id = id.slice(0, -serverEntryQuery.length);
         }
         if (virtualFiles.has(id)) {
-          if (!isRendered) {
+          if (isStale || !isRendered) {
             await buildVirtualFiles(true);
           }
           return virtualFiles.get(id);
@@ -2233,7 +2235,7 @@ var __dirname2 = path3.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"];
-async function preview(entry, cwd, configFile, port, outDir, envFile, args = []) {
+async function preview(sourceEntry, entry, cwd, configFile, port, outDir, envFile, args = []) {
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent", build: { outDir } },
     "serve"
@@ -2257,7 +2259,8 @@ async function preview(entry, cwd, configFile, port, outDir, envFile, args = [])
     dir,
     args,
     port: availablePort,
-    envFile
+    envFile,
+    sourceEntry
   };
   return await adapter.startPreview(entryFile, options);
 }
@@ -2409,6 +2412,7 @@ prog.command("preview [entry]").describe("Start a production-like server for alr
   const config2 = await getViteConfig(cwd, opts.config);
   await build(entry, cwd, config2, opts.output, opts.env);
   await preview(
+    entry,
     opts.file,
     cwd,
     config2,

package/dist/runtime/index.d.ts

@@ -1,7 +1,9 @@
+import { InlineConfig } from "vite";
 import { NotHandled, NotMatched } from "./namespace";
 import type { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, HandlerTypeFn, RuntimeModule, AnyRoute, AnyContext, AnyHandler } from "./types";
 declare global {
     var __marko_run__: RuntimeModule;
+    var __marko_run_vite_config__: InlineConfig | undefined;
     namespace MarkoRun {
         export const route: HandlerTypeFn;
         export { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, NotHandled, NotMatched, AnyRoute as Route, AnyContext as Context, AnyHandler as Handler, };

package/dist/vite/index.cjs

@@ -1100,10 +1100,18 @@ export async function fetch(request, platform) {
     const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
-    const body = import.meta.env.DEV
-      ? error.stack || error.message || "Internal Server Error"
-      : null;
-    return new Response(body, {
+    if (import.meta.env.DEV) {
+      let body;
+      if (error.cause) {
+        body = error.cause.stack || error.cause.message || error.cause;
+      } else {
+        body = error.stack || error.message || "Internal Server Error";
+      }
+      return new Response(body, {
+        status: 500
+      });
+    }
+    return new Response(null, {
       status: 500
     });
   }
@@ -1596,7 +1604,9 @@ function logRoutesTable(routes, bundle, options) {
           entryType.push(import_kleur.default.yellow("page"));
           size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
         }
-        const row = [import_kleur.default.bold(HttpVerbColors[verb](verb.toUpperCase()))];
+        const row = [
+          import_kleur.default.bold(HttpVerbColors[verb](verb.toUpperCase()))
+        ];
         if (verbs.length === 1 || firstRow) {
           row.push({ rowSpan: verbs.length, content: prettyPath(path3.path) });
           firstRow = false;
@@ -1634,10 +1644,7 @@ function byteSize(source) {
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
-    return [
-      byteSize(chunk.source),
-      gzipSize(chunk.source)
-    ];
+    return [byteSize(chunk.source), gzipSize(chunk.source)];
   }
   const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
@@ -1738,12 +1745,10 @@ function markoRun(opts = {}) {
     const routerOptions = {
       trailingSlashes: opts.trailingSlashes || "RedirectWithout"
     };
-    if (!render) {
-      virtualFiles.clear();
-      isRendered = false;
-    }
     try {
       if (isStale) {
+        virtualFiles.clear();
+        isRendered = false;
         const buildStartTime = performance.now();
         routes = await buildRoutes(
           createFSWalker(resolvedRoutesDir),
@@ -2034,13 +2039,10 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           resolved = importee;
         } else if (virtualFilePath) {
-          const resolution = await this.resolve(
-            import_path2.default.resolve(__dirname, "..", virtualFilePath),
-            importer,
-            {
-              skipSelf: true
-            }
-          );
+          const filePath = import_path2.default.resolve(__dirname, "..", virtualFilePath);
+          const resolution = await this.resolve(filePath, importer, {
+            skipSelf: true
+          });
           return resolution;
         }
         return resolved || null;
@@ -2050,7 +2052,7 @@ function markoRun(opts = {}) {
           id = id.slice(0, -serverEntryQuery.length);
         }
         if (virtualFiles.has(id)) {
-          if (!isRendered) {
+          if (isStale || !isRendered) {
             await buildVirtualFiles(true);
           }
           return virtualFiles.get(id);

package/dist/vite/index.js

@@ -1056,10 +1056,18 @@ export async function fetch(request, platform) {
     const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
-    const body = import.meta.env.DEV
-      ? error.stack || error.message || "Internal Server Error"
-      : null;
-    return new Response(body, {
+    if (import.meta.env.DEV) {
+      let body;
+      if (error.cause) {
+        body = error.cause.stack || error.cause.message || error.cause;
+      } else {
+        body = error.stack || error.message || "Internal Server Error";
+      }
+      return new Response(body, {
+        status: 500
+      });
+    }
+    return new Response(null, {
       status: 500
     });
   }
@@ -1552,7 +1560,9 @@ function logRoutesTable(routes, bundle, options) {
           entryType.push(kleur.yellow("page"));
           size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
         }
-        const row = [kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))];
+        const row = [
+          kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))
+        ];
         if (verbs.length === 1 || firstRow) {
           row.push({ rowSpan: verbs.length, content: prettyPath(path3.path) });
           firstRow = false;
@@ -1590,10 +1600,7 @@ function byteSize(source) {
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
-    return [
-      byteSize(chunk.source),
-      gzipSize(chunk.source)
-    ];
+    return [byteSize(chunk.source), gzipSize(chunk.source)];
   }
   const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
@@ -1694,12 +1701,10 @@ function markoRun(opts = {}) {
     const routerOptions = {
       trailingSlashes: opts.trailingSlashes || "RedirectWithout"
     };
-    if (!render) {
-      virtualFiles.clear();
-      isRendered = false;
-    }
     try {
       if (isStale) {
+        virtualFiles.clear();
+        isRendered = false;
         const buildStartTime = performance.now();
         routes = await buildRoutes(
           createFSWalker(resolvedRoutesDir),
@@ -1990,13 +1995,10 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           resolved = importee;
         } else if (virtualFilePath) {
-          const resolution = await this.resolve(
-            path2.resolve(__dirname, "..", virtualFilePath),
-            importer,
-            {
-              skipSelf: true
-            }
-          );
+          const filePath = path2.resolve(__dirname, "..", virtualFilePath);
+          const resolution = await this.resolve(filePath, importer, {
+            skipSelf: true
+          });
           return resolution;
         }
         return resolved || null;
@@ -2006,7 +2008,7 @@ function markoRun(opts = {}) {
           id = id.slice(0, -serverEntryQuery.length);
         }
         if (virtualFiles.has(id)) {
-          if (!isRendered) {
+          if (isStale || !isRendered) {
             await buildVirtualFiles(true);
           }
           return virtualFiles.get(id);

package/dist/vite/types.d.ts

@@ -19,6 +19,7 @@ export interface StartDevOptions extends StartOptions {
 }
 export interface StartPreviewOptions extends StartOptions {
     dir: string;
+    sourceEntry?: string;
 }
 export interface Adapter {
     readonly name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -92,42 +92,45 @@
     "@marko/fixture-snapshots": "^2.1.7",
     "@marko/testing-library": "^6.1.2",
     "@types/glob": "^8.0.1",
-    "@types/human-format": "^1.0.0",
-    "@types/jsdom": "^21.1.0",
+    "@types/human-format": "^1.0.2",
+    "@types/jsdom": "^21.1.4",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^20.3.1",
+    "@types/node": "^20.8.7",
     "acorn": "^8.8.0",
+    "body-parser": "^1.20.2",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.19.0",
+    "esbuild": "^0.19.5",
+    "express": "^4.18.2",
     "jsdom": "^21.1.1",
-    "marko": "^5.23.0",
+    "marko": "^5.31.12",
     "mocha": "^10.2.0",
     "mocha-snap": "^4.3.0",
-    "playwright": "^1.29.1",
+    "playwright": "^1.39.0",
     "prettier": "^2.7.1",
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
     "tsm": "^2.3.0",
-    "tsx": "^3.9.0",
+    "tsx": "^3.14.0",
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@marko/vite": "^3",
+    "@marko/vite": "^3.1.4",
     "browserslist": "^4.22.1",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
     "dotenv": "^16.0.3",
     "esbuild-plugin-browserslist": "^0.9.1",
     "glob": "^8.1.0",
-    "human-format": "^1.0.0",
+    "human-format": "^1.0.2",
     "kleur": "^4.1.5",
     "parse-node-args": "^1.1.2",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
     "strip-ansi": "^7.0.1",
-    "undici": "^5.20.0",
-    "vite": "^4.4.0",
+    "supports-color": "^9.4.0",
+    "undici": "^5.26.3",
+    "vite": "^4.5.0",
     "warp10": "^2.1.0"
   }
 }