@marko/run 0.5.17 → 0.6.0

package/dist/cli/index.mjs

@@ -25,7 +25,6 @@ import {
 // 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";
@@ -1781,6 +1780,8 @@ function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let store;
   let root;
+  let shouldEmptyOutDir = false;
+  let outputDir;
   let resolvedRoutesDir;
   let entryFilesDir;
   let entryFilesDirPosix;
@@ -1964,7 +1965,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);
@@ -1995,11 +1996,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)
@@ -2007,9 +2005,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);
@@ -2049,9 +2047,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 ? {
@@ -2069,18 +2068,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__/**`,
@@ -2168,6 +2166,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();
@@ -2272,13 +2275,18 @@ function markoRun(opts = {}) {
         }
       },
       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
+            );
+          }
         }
       }
     }
@@ -2370,15 +2378,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/runtime/internal.cjs

@@ -89,7 +89,7 @@ function createContext(route, request, platform, url = new URL(request.url)) {
 }
 async function call(handler, next, context) {
   let response;
-  if (process.env.NODE_ENV !== "production") {
+  if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
     let nextCallCount = 0;
     let didThrow = false;
     try {

package/dist/runtime/internal.js

@@ -47,7 +47,7 @@ function createContext(route, request, platform, url = new URL(request.url)) {
 }
 async function call(handler, next, context) {
   let response;
-  if (process.env.NODE_ENV !== "production") {
+  if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
     let nextCallCount = 0;
     let didThrow = false;
     try {

package/dist/vite/index.cjs

@@ -57,7 +57,6 @@ var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
 // src/vite/plugin.ts
 var import_vite = __toESM(require("@marko/vite"), 1);
 var import_browserslist = __toESM(require("browserslist"), 1);
-var import_crypto = require("crypto");
 var import_debug = __toESM(require("debug"), 1);
 var import_esbuild_plugin_browserslist = require("esbuild-plugin-browserslist");
 var import_fs3 = __toESM(require("fs"), 1);
@@ -1812,6 +1811,8 @@ function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let store;
   let root;
+  let shouldEmptyOutDir = false;
+  let outputDir;
   let resolvedRoutesDir;
   let entryFilesDir;
   let entryFilesDirPosix;
@@ -1995,7 +1996,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 = (0, import_vite2.mergeConfig)(opts, externalPluginOptions);
@@ -2026,11 +2027,8 @@ function markoRun(opts = {}) {
         markoVitePluginOptions.runtimeId = opts.runtimeId;
         markoVitePluginOptions.basePathVar = opts.basePathVar;
         resolvedRoutesDir = import_path4.default.resolve(root, routesDir);
-        entryFilesDir = import_path4.default.join(
-          getModulesDir(root),
-          ".marko",
-          (0, import_crypto.createHash)("shake256", { outputLength: 4 }).update(root).digest("hex")
-        );
+        outputDir = import_path4.default.join(root, ((_d = config2.build) == null ? void 0 : _d.outDir) || "dist");
+        entryFilesDir = import_path4.default.join(outputDir, ".marko-run");
         entryFilesDirPosix = normalizePath(entryFilesDir);
         relativeEntryFilesDirPosix = normalizePath(
           import_path4.default.relative(root, entryFilesDir)
@@ -2038,9 +2036,9 @@ function markoRun(opts = {}) {
         typesDir = import_path4.default.join(root, ".marko-run");
         devEntryFile = import_path4.default.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 = import_path4.default.join(outDir, CLIENT_OUT_DIR);
@@ -2080,9 +2078,10 @@ function markoRun(opts = {}) {
             }));
           }
         }
-        const browserslistTarget = isBuild && !((_h = config2.build) == null ? void 0 : _h.target) ? (0, import_browserslist.default)(void 0, {
+        const browserslistTarget = isBuild && !((_i = config2.build) == null ? void 0 : _i.target) ? (0, import_browserslist.default)(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 ? {
@@ -2100,18 +2099,17 @@ function markoRun(opts = {}) {
             target: (browserslistTarget == null ? void 0 : browserslistTarget.length) ? (0, import_esbuild_plugin_browserslist.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__/**`,
@@ -2199,6 +2197,11 @@ function markoRun(opts = {}) {
         }).unwatch(typesDir + "/*");
       },
       async buildStart(_options) {
+        if (isSSRBuild && shouldEmptyOutDir) {
+          if (import_fs3.default.existsSync(outputDir)) {
+            import_fs3.default.rmSync(outputDir, { recursive: true });
+          }
+        }
         if (isBuild && !isSSRBuild) {
           try {
             routeData = await store.read();
@@ -2303,13 +2306,18 @@ function markoRun(opts = {}) {
         }
       },
       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 (import_fs3.default.existsSync(entryFilesDir)) {
+            import_fs3.default.rmSync(entryFilesDir, { recursive: true });
+          }
+          if ((adapter == null ? void 0 : adapter.buildEnd) && routes) {
+            await adapter.buildEnd(
+              resolvedConfig,
+              routes.list,
+              routeData.builtEntries,
+              routeData.sourceEntries
+            );
+          }
         }
       }
     }
@@ -2396,15 +2404,6 @@ function getImporters(module2, 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 import_path4.default.join(root, "node_modules");
-}
 var defaultConfigPlugin = {
   name: `${PLUGIN_NAME_PREFIX}:defaults`,
   enforce: "pre",

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";
@@ -1767,6 +1766,8 @@ function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let store;
   let root;
+  let shouldEmptyOutDir = false;
+  let outputDir;
   let resolvedRoutesDir;
   let entryFilesDir;
   let entryFilesDirPosix;
@@ -1950,7 +1951,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 +1982,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 +1991,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 +2033,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 +2054,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 +2152,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();
@@ -2258,13 +2261,18 @@ function markoRun(opts = {}) {
         }
       },
       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 +2359,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.5.17",
+  "version": "0.6.0",
   "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.0",
+    "@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 {};