@marko/run 0.1.9 → 0.1.11

package/dist/adapter/index.cjs

@@ -66,7 +66,7 @@ async function createViteDevServer(config2) {
   const devServer = await (0, import_vite.createServer)({
     ...config2,
     appType: "custom",
-    server: { middlewareMode: true }
+    server: { ...config2 == null ? void 0 : config2.server, middlewareMode: true }
   });
   const originalClose = devServer.close;
   devServer.close = () => {
@@ -124,7 +124,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -161,6 +164,14 @@ async function spawnServerWorker(module2, args = [], port = 0, env) {
     import_cluster.default.settings.execArgv = originalArgs;
   }
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -170,12 +181,29 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }
   return connection;
 }
+async function waitForWorker(worker, port) {
+  return new Promise((resolve, reject) => {
+    function listening(address) {
+      if (address.port === port) {
+        worker.off("listening", listening);
+        resolve();
+      }
+    }
+    worker.on("listening", listening).once("error", reject).once("exit", (code) => {
+      reject(
+        new Error(
+          `Worker exited with code ${code} while waiting for dev server to start on port "${port}".`
+        )
+      );
+    });
+  });
+}
 async function getConnection(port) {
   return new Promise((resolve) => {
     const connection = import_net.default.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => {
@@ -266,7 +294,7 @@ function adapter() {
       });
     },
     async startPreview(entry, options) {
-      const { port, envFile } = options;
+      const { port = 3e3, envFile } = options;
       const { nodeArgs } = (0, import_parse_node_args.default)(options.args);
       const args = [...nodeArgs, entry];
       const server = await spawnServer("node", args, port, envFile);
@@ -275,17 +303,6 @@ function adapter() {
     }
   };
 }
-async function waitForWorker(worker, port) {
-  return new Promise((resolve) => {
-    function listening(address) {
-      if (address.port === port) {
-        worker.off("listening", listening);
-        resolve();
-      }
-    }
-    worker.on("listening", listening);
-  });
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   activeDevServers,

package/dist/adapter/index.js

@@ -32,7 +32,7 @@ async function createViteDevServer(config2) {
   const devServer = await createServer({
     ...config2,
     appType: "custom",
-    server: { middlewareMode: true }
+    server: { ...config2 == null ? void 0 : config2.server, middlewareMode: true }
   });
   const originalClose = devServer.close;
   devServer.close = () => {
@@ -90,7 +90,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -127,6 +130,14 @@ async function spawnServerWorker(module, args = [], port = 0, env) {
     cluster.settings.execArgv = originalArgs;
   }
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -136,12 +147,29 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }
   return connection;
 }
+async function waitForWorker(worker, port) {
+  return new Promise((resolve, reject) => {
+    function listening(address) {
+      if (address.port === port) {
+        worker.off("listening", listening);
+        resolve();
+      }
+    }
+    worker.on("listening", listening).once("error", reject).once("exit", (code) => {
+      reject(
+        new Error(
+          `Worker exited with code ${code} while waiting for dev server to start on port "${port}".`
+        )
+      );
+    });
+  });
+}
 async function getConnection(port) {
   return new Promise((resolve) => {
     const connection = net.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => {
@@ -231,7 +259,7 @@ function adapter() {
       });
     },
     async startPreview(entry, options) {
-      const { port, envFile } = options;
+      const { port = 3e3, envFile } = options;
       const { nodeArgs } = parseNodeArgs(options.args);
       const args = [...nodeArgs, entry];
       const server = await spawnServer("node", args, port, envFile);
@@ -240,17 +268,6 @@ function adapter() {
     }
   };
 }
-async function waitForWorker(worker, port) {
-  return new Promise((resolve) => {
-    function listening(address) {
-      if (address.port === port) {
-        worker.off("listening", listening);
-        resolve();
-      }
-    }
-    worker.on("listening", listening);
-  });
-}
 export {
   activeDevServers,
   createDevServer,

package/dist/cli/index.mjs

@@ -90,12 +90,17 @@ async function resolveAdapter(root, options, log) {
   const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
-    const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
+    const dependecies = {
+      ...pkg.data.dependecies,
+      ...pkg.data.devDependencies
+    };
     for (const name of Object.keys(dependecies)) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(name);
-          log && console.log(`Using adapter ${name} listed in your package.json dependecies`);
+          log && console.log(
+            `Using adapter ${name} listed in your package.json dependecies`
+          );
           return module2.default();
         } catch (err) {
           log && console.warn(`Attempt to use package '${name}' failed`, err);

package/dist/vite/index.cjs

@@ -1379,7 +1379,7 @@ function markoRun(opts = {}) {
       const filepath = import_path2.default.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        import_path2.default.relative(typesDir, resolvedRoutesDir),
+        normalizePath(import_path2.default.relative(typesDir, resolvedRoutesDir)),
         adapter
       );
       if (data !== typesFile || !import_fs2.default.existsSync(filepath)) {
@@ -1452,7 +1452,7 @@ function markoRun(opts = {}) {
       name: "marko-run-vite:pre",
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = (0, import_vite.mergeConfig)(opts, externalPluginOptions);
@@ -1460,7 +1460,11 @@ function markoRun(opts = {}) {
         root = normalizePath(config2.root || process.cwd());
         isBuild = env.command === "build";
         isSSRBuild = isBuild && Boolean((_a = config2.build) == null ? void 0 : _a.ssr);
-        adapter = await resolveAdapter(root, opts, config2.logLevel !== "silent" && !isBuild || isSSRBuild);
+        adapter = await resolveAdapter(
+          root,
+          opts,
+          config2.logLevel !== "silent" && !isBuild || isSSRBuild
+        );
         if (adapter) {
           const externalAdapterConfig = getExternalAdapterOptions(config2);
           if (externalAdapterConfig && adapter.configure) {
@@ -1487,6 +1491,44 @@ function markoRun(opts = {}) {
         typesDir = import_path2.default.join(root, ".marko-run");
         devEntryFile = import_path2.default.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
+        const assetsDir = ((_c = config2.build) == null ? void 0 : _c.assetsDir) || "assets";
+        let rollupOutputOptions = (_e = (_d = config2.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output;
+        if (isBuild && !isSSRBuild) {
+          const defaultRollupOutputOptions = {
+            assetFileNames({ name }) {
+              if (name && name.indexOf("_marko-virtual_id_") < 0) {
+                return `${assetsDir}/${getEntryFileName(name) || "[name]"}-[hash].[ext]`;
+              }
+              return `${assetsDir}/_[hash].[ext]`;
+            },
+            entryFileNames(info) {
+              let name = getEntryFileName(info.facadeModuleId);
+              if (!name) {
+                for (let id of info.moduleIds) {
+                  name = getEntryFileName(id);
+                  if (name) {
+                    break;
+                  }
+                }
+              }
+              return `${assetsDir}/${name || "[name]"}-[hash].js`;
+            },
+            chunkFileNames: `${assetsDir}/_[hash].js`
+          };
+          if (!rollupOutputOptions) {
+            rollupOutputOptions = defaultRollupOutputOptions;
+          } else if (!Array.isArray(rollupOutputOptions)) {
+            rollupOutputOptions = {
+              ...defaultRollupOutputOptions,
+              ...rollupOutputOptions
+            };
+          } else {
+            rollupOutputOptions = rollupOutputOptions.map((options) => ({
+              ...defaultRollupOutputOptions,
+              ...options
+            }));
+          }
+        }
         let pluginConfig = {
           logLevel: isBuild ? "warn" : void 0,
           define: isBuild ? {
@@ -1496,10 +1538,13 @@ function markoRun(opts = {}) {
             noExternal: /@marko\/run/
           },
           build: {
-            emptyOutDir: isSSRBuild
+            emptyOutDir: isSSRBuild,
+            rollupOptions: {
+              output: rollupOutputOptions
+            }
           }
         };
-        const adapterConfig = await ((_c = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _c.call(adapter, config2));
+        const adapterConfig = await ((_f = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _f.call(adapter, config2));
         if (adapterConfig) {
           pluginConfig = (0, import_vite.mergeConfig)(pluginConfig, adapterConfig);
         }
@@ -1619,6 +1664,15 @@ function markoRun(opts = {}) {
     {
       name: "marko-run-vite:post",
       enforce: "post",
+      generateBundle(options, bundle) {
+        if (options.sourcemap && options.sourcemap !== "inline") {
+          for (const key of Object.keys(bundle)) {
+            if (key.endsWith(".map") && !bundle[key.slice(0, -4)]) {
+              delete bundle[key];
+            }
+          }
+        }
+      },
       async writeBundle(options, bundle) {
         var _a;
         if (isSSRBuild) {
@@ -1735,12 +1789,17 @@ async function resolveAdapter(root, options, log) {
   const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
-    const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
+    const dependecies = {
+      ...pkg.data.dependecies,
+      ...pkg.data.devDependencies
+    };
     for (const name of Object.keys(dependecies)) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module3 = await import(name);
-          log && console.log(`Using adapter ${name} listed in your package.json dependecies`);
+          log && console.log(
+            `Using adapter ${name} listed in your package.json dependecies`
+          );
           return module3.default();
         } catch (err) {
           log && console.warn(`Attempt to use package '${name}' failed`, err);
@@ -1753,6 +1812,11 @@ async function resolveAdapter(root, options, log) {
   log && console.log("Using default adapter");
   return module2.default();
 }
+var markoEntryFileRegex = /__marko-run__([^_]+)__(.+)\.marko.([^.]+)$/;
+function getEntryFileName(file) {
+  const match = file && markoEntryFileRegex.exec(file);
+  return match ? `${match[2].replace(/__/g, "-")}` : void 0;
+}
 
 // src/vite/utils/server.ts
 var import_net = __toESM(require("net"), 1);
@@ -1788,7 +1852,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -1798,6 +1865,14 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     close
   };
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -1807,7 +1882,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }

package/dist/vite/index.js

@@ -1341,7 +1341,7 @@ function markoRun(opts = {}) {
       const filepath = path2.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        path2.relative(typesDir, resolvedRoutesDir),
+        normalizePath(path2.relative(typesDir, resolvedRoutesDir)),
         adapter
       );
       if (data !== typesFile || !fs2.existsSync(filepath)) {
@@ -1414,7 +1414,7 @@ function markoRun(opts = {}) {
       name: "marko-run-vite:pre",
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
@@ -1422,7 +1422,11 @@ function markoRun(opts = {}) {
         root = normalizePath(config2.root || process.cwd());
         isBuild = env.command === "build";
         isSSRBuild = isBuild && Boolean((_a = config2.build) == null ? void 0 : _a.ssr);
-        adapter = await resolveAdapter(root, opts, config2.logLevel !== "silent" && !isBuild || isSSRBuild);
+        adapter = await resolveAdapter(
+          root,
+          opts,
+          config2.logLevel !== "silent" && !isBuild || isSSRBuild
+        );
         if (adapter) {
           const externalAdapterConfig = getExternalAdapterOptions(config2);
           if (externalAdapterConfig && adapter.configure) {
@@ -1449,6 +1453,44 @@ function markoRun(opts = {}) {
         typesDir = path2.join(root, ".marko-run");
         devEntryFile = path2.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
+        const assetsDir = ((_c = config2.build) == null ? void 0 : _c.assetsDir) || "assets";
+        let rollupOutputOptions = (_e = (_d = config2.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output;
+        if (isBuild && !isSSRBuild) {
+          const defaultRollupOutputOptions = {
+            assetFileNames({ name }) {
+              if (name && name.indexOf("_marko-virtual_id_") < 0) {
+                return `${assetsDir}/${getEntryFileName(name) || "[name]"}-[hash].[ext]`;
+              }
+              return `${assetsDir}/_[hash].[ext]`;
+            },
+            entryFileNames(info) {
+              let name = getEntryFileName(info.facadeModuleId);
+              if (!name) {
+                for (let id of info.moduleIds) {
+                  name = getEntryFileName(id);
+                  if (name) {
+                    break;
+                  }
+                }
+              }
+              return `${assetsDir}/${name || "[name]"}-[hash].js`;
+            },
+            chunkFileNames: `${assetsDir}/_[hash].js`
+          };
+          if (!rollupOutputOptions) {
+            rollupOutputOptions = defaultRollupOutputOptions;
+          } else if (!Array.isArray(rollupOutputOptions)) {
+            rollupOutputOptions = {
+              ...defaultRollupOutputOptions,
+              ...rollupOutputOptions
+            };
+          } else {
+            rollupOutputOptions = rollupOutputOptions.map((options) => ({
+              ...defaultRollupOutputOptions,
+              ...options
+            }));
+          }
+        }
         let pluginConfig = {
           logLevel: isBuild ? "warn" : void 0,
           define: isBuild ? {
@@ -1458,10 +1500,13 @@ function markoRun(opts = {}) {
             noExternal: /@marko\/run/
           },
           build: {
-            emptyOutDir: isSSRBuild
+            emptyOutDir: isSSRBuild,
+            rollupOptions: {
+              output: rollupOutputOptions
+            }
           }
         };
-        const adapterConfig = await ((_c = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _c.call(adapter, config2));
+        const adapterConfig = await ((_f = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _f.call(adapter, config2));
         if (adapterConfig) {
           pluginConfig = mergeConfig(pluginConfig, adapterConfig);
         }
@@ -1581,6 +1626,15 @@ function markoRun(opts = {}) {
     {
       name: "marko-run-vite:post",
       enforce: "post",
+      generateBundle(options, bundle) {
+        if (options.sourcemap && options.sourcemap !== "inline") {
+          for (const key of Object.keys(bundle)) {
+            if (key.endsWith(".map") && !bundle[key.slice(0, -4)]) {
+              delete bundle[key];
+            }
+          }
+        }
+      },
       async writeBundle(options, bundle) {
         var _a;
         if (isSSRBuild) {
@@ -1697,12 +1751,17 @@ async function resolveAdapter(root, options, log) {
   const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
-    const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
+    const dependecies = {
+      ...pkg.data.dependecies,
+      ...pkg.data.devDependencies
+    };
     for (const name of Object.keys(dependecies)) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(name);
-          log && console.log(`Using adapter ${name} listed in your package.json dependecies`);
+          log && console.log(
+            `Using adapter ${name} listed in your package.json dependecies`
+          );
           return module2.default();
         } catch (err) {
           log && console.warn(`Attempt to use package '${name}' failed`, err);
@@ -1715,6 +1774,11 @@ async function resolveAdapter(root, options, log) {
   log && console.log("Using default adapter");
   return module.default();
 }
+var markoEntryFileRegex = /__marko-run__([^_]+)__(.+)\.marko.([^.]+)$/;
+function getEntryFileName(file) {
+  const match = file && markoEntryFileRegex.exec(file);
+  return match ? `${match[2].replace(/__/g, "-")}` : void 0;
+}
 
 // src/vite/utils/server.ts
 import net from "net";
@@ -1750,7 +1814,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -1760,6 +1827,14 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     close
   };
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -1769,7 +1844,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }

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

@@ -1,5 +1,7 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { type Socket } from "net";
+import { ChildProcess } from "child_process";
 import { type Worker } from "cluster";
 export interface SpawnedServer {
     port: number;
@@ -9,7 +11,9 @@ export declare function parseEnv(envFile: string): Promise<import("dotenv").Dote
 export declare function loadEnv(envFile: string): void;
 export declare function spawnServer(cmd: string, args?: string[], port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number): Promise<SpawnedServer>;
 export declare function spawnServerWorker(module: string, args?: string[], port?: number, env?: string | Record<string, string>): Promise<Worker>;
+export declare function waitForError(proc: ChildProcess, port: number): Promise<void>;
 export declare function waitForServer(port: number, wait?: number): Promise<Socket>;
+export declare function waitForWorker(worker: Worker, port: number): Promise<void>;
 export declare function getConnection(port: number): Promise<Socket | null>;
 export declare function isPortInUse(port: number): Promise<boolean>;
 export declare function getAvailablePort(): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",