@marko/run 0.5.17 → 0.6.1

package/dist/vite/index.js

@@ -12,7 +12,6 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 // src/vite/plugin.ts
 import markoVitePlugin from "@marko/vite";
 import browserslist from "browserslist";
-import { createHash } from "crypto";
 import createDebug from "debug";
 import { resolveToEsbuildTarget } from "esbuild-plugin-browserslist";
 import fs3 from "fs";
@@ -1593,10 +1592,7 @@ var HttpVerbColors = {
 function verbColor(verb) {
   return verb in HttpVerbColors ? HttpVerbColors[verb] : kleur2.gray;
 }
-function logRoutesTable(routes, bundle, options) {
-  function getRouteChunkName(route) {
-    return options.sanitizeFileName(`${route.entryName}.marko`);
-  }
+function logRoutesTable(routes, bundle) {
   const hasMiddleware = routes.list.some((route) => route.middleware.length);
   const hasMeta = routes.list.some((route) => route.meta);
   const headings = ["Method", "Path", "Entry"];
@@ -1634,9 +1630,7 @@ function logRoutesTable(routes, bundle, options) {
         if (route.page && (verb === "get" || verb === "head")) {
           entryType.push(kleur2.yellow("page"));
           if (verb === "get") {
-            size = prettySize(
-              computeRouteSize(getRouteChunkName(route), bundle)
-            );
+            size = prettySize(computeRouteSize(route, bundle));
           }
         }
         const row = [verbCell];
@@ -1656,15 +1650,18 @@ function logRoutesTable(routes, bundle, options) {
     const row = [kleur2.bold(kleur2.white("*")), key, kleur2.yellow("page")];
     hasMiddleware && row.push("");
     hasMeta && row.push("");
-    row.push(prettySize(computeRouteSize(getRouteChunkName(route), bundle)));
+    row.push(prettySize(computeRouteSize(route, bundle)));
     table.push(row);
   }
   console.log(table.toString());
 }
-function computeRouteSize(entryName, bundle) {
-  for (const chunk of Object.values(bundle)) {
-    if (chunk.type === "chunk" && chunk.isEntry && chunk.name === entryName) {
-      return computeChunkSize(chunk, bundle);
+function computeRouteSize(route, bundle) {
+  const facadeModuleId = route.templateFilePath && `${route.templateFilePath}.html`;
+  if (facadeModuleId) {
+    for (const chunk of Object.values(bundle)) {
+      if (chunk.type === "chunk" && chunk.isEntry && chunk.facadeModuleId === facadeModuleId) {
+        return computeChunkSize(chunk, bundle);
+      }
     }
   }
   return [0, 0];
@@ -1767,6 +1764,8 @@ function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let store;
   let root;
+  let shouldEmptyOutDir = false;
+  let outputDir;
   let resolvedRoutesDir;
   let entryFilesDir;
   let entryFilesDirPosix;
@@ -1854,25 +1853,32 @@ function markoRun(opts = {}) {
               );
             }
           }
-          if (page && layouts.length) {
-            const relativePath = path4.relative(
-              resolvedRoutesDir,
-              page.filePath
-            );
-            const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
-            const routeFileRelativePathPosix = normalizePath(
-              path4.relative(routeFileDir, root)
-            );
-            fs3.mkdirSync(routeFileDir, { recursive: true });
-            const pageNameIndex = page.name.indexOf("+page");
-            const pageNamePrefix = pageNameIndex > 0 ? `${page.name.slice(0, pageNameIndex)}.` : "";
-            fs3.writeFileSync(
-              path4.join(routeFileDir, pageNamePrefix + "route.marko"),
-              renderRouteTemplate(
-                route,
-                (to) => path4.posix.join(routeFileRelativePathPosix, to)
-              )
-            );
+          if (page) {
+            if (layouts.length) {
+              const relativePath = path4.relative(
+                resolvedRoutesDir,
+                page.filePath
+              );
+              const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
+              const routeFileRelativePathPosix = normalizePath(
+                path4.relative(routeFileDir, root)
+              );
+              fs3.mkdirSync(routeFileDir, { recursive: true });
+              const pageNameIndex = page.name.indexOf("+page");
+              const pageNamePrefix = pageNameIndex > 0 ? `${page.name.slice(0, pageNameIndex)}.` : "";
+              fs3.writeFileSync(
+                route.templateFilePath = path4.join(
+                  routeFileDir,
+                  pageNamePrefix + "route.marko"
+                ),
+                renderRouteTemplate(
+                  route,
+                  (to) => path4.posix.join(routeFileRelativePathPosix, to)
+                )
+              );
+            } else {
+              route.templateFilePath = page.filePath;
+            }
           }
           virtualFiles.set(
             path4.posix.join(root, `${route.entryName}.js`),
@@ -1881,23 +1887,30 @@ function markoRun(opts = {}) {
         }
         for (const route of Object.values(routes2.special)) {
           const { page, layouts, key } = route;
-          if (page && layouts.length) {
-            const relativePath = path4.relative(
-              resolvedRoutesDir,
-              page.filePath
-            );
-            const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
-            const routeFileRelativePathPosix = normalizePath(
-              path4.relative(routeFileDir, root)
-            );
-            fs3.mkdirSync(routeFileDir, { recursive: true });
-            fs3.writeFileSync(
-              path4.join(routeFileDir, `route.${key}.marko`),
-              renderRouteTemplate(
-                route,
-                (to) => path4.posix.join(routeFileRelativePathPosix, to)
-              )
-            );
+          if (page) {
+            if (layouts.length) {
+              const relativePath = path4.relative(
+                resolvedRoutesDir,
+                page.filePath
+              );
+              const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
+              const routeFileRelativePathPosix = normalizePath(
+                path4.relative(routeFileDir, root)
+              );
+              fs3.mkdirSync(routeFileDir, { recursive: true });
+              fs3.writeFileSync(
+                route.templateFilePath = path4.join(
+                  routeFileDir,
+                  `route.${key}.marko`
+                ),
+                renderRouteTemplate(
+                  route,
+                  (to) => path4.posix.join(routeFileRelativePathPosix, to)
+                )
+              );
+            } else {
+              route.templateFilePath = page.filePath;
+            }
           }
         }
         if (routes2.middleware.length) {
@@ -1950,7 +1963,7 @@ function markoRun(opts = {}) {
       name: `${PLUGIN_NAME_PREFIX}:pre`,
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
@@ -1981,11 +1994,8 @@ function markoRun(opts = {}) {
         markoVitePluginOptions.runtimeId = opts.runtimeId;
         markoVitePluginOptions.basePathVar = opts.basePathVar;
         resolvedRoutesDir = path4.resolve(root, routesDir);
-        entryFilesDir = path4.join(
-          getModulesDir(root),
-          ".marko",
-          createHash("shake256", { outputLength: 4 }).update(root).digest("hex")
-        );
+        outputDir = path4.join(root, ((_d = config2.build) == null ? void 0 : _d.outDir) || "dist");
+        entryFilesDir = path4.join(outputDir, ".marko-run");
         entryFilesDirPosix = normalizePath(entryFilesDir);
         relativeEntryFilesDirPosix = normalizePath(
           path4.relative(root, entryFilesDir)
@@ -1993,9 +2003,9 @@ function markoRun(opts = {}) {
         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;
+        let outDir = ((_e = config2.build) == null ? void 0 : _e.outDir) || "dist";
+        const assetsDir = ((_f = config2.build) == null ? void 0 : _f.assetsDir) || "assets";
+        let rollupOutputOptions = (_h = (_g = config2.build) == null ? void 0 : _g.rollupOptions) == null ? void 0 : _h.output;
         if (isBuild) {
           if (!isSSRBuild) {
             outDir = path4.join(outDir, CLIENT_OUT_DIR);
@@ -2035,9 +2045,10 @@ function markoRun(opts = {}) {
             }));
           }
         }
-        const browserslistTarget = isBuild && !((_h = config2.build) == null ? void 0 : _h.target) ? browserslist(void 0, {
+        const browserslistTarget = isBuild && !((_i = config2.build) == null ? void 0 : _i.target) ? browserslist(void 0, {
           path: root
         }) : void 0;
+        shouldEmptyOutDir = ((_j = config2.build) == null ? void 0 : _j.emptyOutDir) ?? true;
         let pluginConfig = {
           logLevel: isBuild ? "warn" : void 0,
           define: isBuild ? {
@@ -2055,18 +2066,17 @@ function markoRun(opts = {}) {
             target: (browserslistTarget == null ? void 0 : browserslistTarget.length) ? resolveToEsbuildTarget(browserslistTarget, {
               printUnknownTargets: false
             }) : void 0,
-            emptyOutDir: isSSRBuild,
-            // Avoid server & client deleting files from each other.
             copyPublicDir: !isSSRBuild,
             ssrEmitAssets: false,
+            emptyOutDir: false,
             rollupOptions: {
               output: rollupOutputOptions
             },
             modulePreload: { polyfill: false },
-            sourcemap: ((_i = config2.build) == null ? void 0 : _i.sourcemap) ?? (isBuild && !isSSRBuild)
+            sourcemap: ((_k = config2.build) == null ? void 0 : _k.sourcemap) ?? (isBuild && !isSSRBuild)
           },
           optimizeDeps: {
-            entries: !((_j = config2.optimizeDeps) == null ? void 0 : _j.entries) ? [
+            entries: !((_l = config2.optimizeDeps) == null ? void 0 : _l.entries) ? [
               "src/pages/**/*+{page,layout}.marko",
               "!**/__snapshots__/**",
               `!**/__tests__/**`,
@@ -2154,6 +2164,11 @@ function markoRun(opts = {}) {
         }).unwatch(typesDir + "/*");
       },
       async buildStart(_options) {
+        if (isSSRBuild && shouldEmptyOutDir) {
+          if (fs3.existsSync(outputDir)) {
+            fs3.rmSync(outputDir, { recursive: true });
+          }
+        }
         if (isBuild && !isSSRBuild) {
           try {
             routeData = await store.read();
@@ -2254,17 +2269,22 @@ function markoRun(opts = {}) {
           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);
+          logRoutesTable(routes, bundle);
         }
       },
       async closeBundle() {
-        if (isBuild && !isSSRBuild && (adapter == null ? void 0 : adapter.buildEnd) && routes) {
-          await adapter.buildEnd(
-            resolvedConfig,
-            routes.list,
-            routeData.builtEntries,
-            routeData.sourceEntries
-          );
+        if (isBuild && !isSSRBuild) {
+          if (fs3.existsSync(entryFilesDir)) {
+            fs3.rmSync(entryFilesDir, { recursive: true });
+          }
+          if ((adapter == null ? void 0 : adapter.buildEnd) && routes) {
+            await adapter.buildEnd(
+              resolvedConfig,
+              routes.list,
+              routeData.builtEntries,
+              routeData.sourceEntries
+            );
+          }
         }
       }
     }
@@ -2351,15 +2371,6 @@ function getImporters(module, fileName, seen = /* @__PURE__ */ new Set()) {
   }
   return seen;
 }
-function getModulesDir(root, dir = __dirname) {
-  if (dir.startsWith(root)) {
-    const index = dir.indexOf("node_modules");
-    if (index >= 0) {
-      return dir.slice(0, index + 12);
-    }
-  }
-  return path4.join(root, "node_modules");
-}
 var defaultConfigPlugin = {
   name: `${PLUGIN_NAME_PREFIX}:defaults`,
   enforce: "pre",

package/dist/vite/types.d.ts

@@ -51,6 +51,7 @@ export interface Route {
     meta?: RoutableFile;
     handler?: RoutableFile;
     page?: RoutableFile;
+    templateFilePath?: string;
     entryName: string;
 }
 export interface PathInfo {

package/dist/vite/utils/log.d.ts

@@ -1,3 +1,3 @@
-import type { NormalizedOutputOptions, OutputBundle } from "rollup";
+import type { OutputBundle } from "rollup";
 import type { BuiltRoutes } from "../types";
-export declare function logRoutesTable(routes: BuiltRoutes, bundle: OutputBundle, options: NormalizedOutputOptions): void;
+export declare function logRoutesTable(routes: BuiltRoutes, bundle: OutputBundle): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.5.17",
+  "version": "0.6.1",
   "description": "The Marko application framework.",
   "keywords": [
     "marko"
@@ -54,24 +54,23 @@
     "build": "rm -rf ./dist && tsc -b && tsx scripts/build.ts"
   },
   "dependencies": {
-    "@marko/run-explorer": "^0.1.2",
-    "@marko/vite": "^5.0.10",
-    "browserslist": "^4.24.2",
+    "@marko/run-explorer": "^1.0.1",
+    "@marko/vite": "^5.0.14",
+    "browserslist": "^4.24.4",
     "cli-table3": "^0.6.5",
-    "compression": "^1.7.5",
-    "debug": "^4.3.7",
-    "dotenv": "^16.4.5",
+    "compression": "^1.8.0",
+    "debug": "^4.4.0",
+    "dotenv": "^16.4.7",
     "draftlog": "^1.0.13",
-    "esbuild-plugin-browserslist": "^0.15.0",
-    "glob": "^11.0.0",
+    "esbuild-plugin-browserslist": "^0.16.0",
+    "glob": "^11.0.1",
     "human-format": "^1.2.1",
     "kleur": "^4.1.5",
     "parse-node-args": "^1.1.2",
     "sade": "^1.8.1",
     "serve-static": "^1.16.2",
-    "supports-color": "^9.4.0",
-    "undici": "^6.21.0",
-    "vite": "^6.0.0",
+    "supports-color": "^10.0.0",
+    "vite": "^6.2.1",
     "warp10": "^2.1.0"
   },
   "devDependencies": {
@@ -89,7 +88,7 @@
     "body-parser": "^1.20.3",
     "cross-env": "^7.0.3",
     "diff": "^7.0.0",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.1",
     "express": "^4.21.1",
     "jsdom": "^25.0.1",
     "mocha": "^10.8.2",

package/dist/adapter/polyfill.d.ts

@@ -1,11 +0,0 @@
-import { ServerResponse } from "http";
-declare global {
-    interface Headers {
-        getSetCookie: () => string[];
-    }
-}
-export declare const appendHeader: typeof appendHeader_platform;
-declare function appendHeader_platform(response: ServerResponse, name: string, value: string | readonly string[]): void;
-export declare const getSetCookie: typeof getSetCookie_fallback;
-export declare function getSetCookie_fallback(headers: Headers): string | string[] | undefined;
-export {};