@marko/run 0.2.3 → 0.2.5

package/dist/vite/index.cjs

@@ -1494,7 +1494,10 @@ var HttpVerbOrder = {
   put: 2,
   delete: 3
 };
-function logRoutesTable(routes, bundle) {
+function logRoutesTable(routes, bundle, options) {
+  function getRouteChunkName(route) {
+    return options.sanitizeFileName(`${route.entryName}.marko`);
+  }
   const hasMiddleware = routes.list.some((route) => route.middleware.length);
   const hasMeta = routes.list.some((route) => route.meta);
   const headings = ["Method", "Path", "Entry"];
@@ -1529,7 +1532,7 @@ function logRoutesTable(routes, bundle) {
         }
         if (verb === "get" && route.page) {
           entryType.push(import_kleur.default.yellow("page"));
-          size = prettySize(computeRouteSize(route, bundle));
+          size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
         }
         const row = [import_kleur.default.bold(HttpVerbColors[verb](verb.toUpperCase()))];
         if (verbs.length === 1 || firstRow) {
@@ -1548,18 +1551,15 @@ function logRoutesTable(routes, bundle) {
     const row = [import_kleur.default.bold(import_kleur.default.white("*")), key, import_kleur.default.yellow("page")];
     hasMiddleware && row.push("");
     hasMeta && row.push("");
-    row.push(prettySize(computeRouteSize(route, bundle)));
+    row.push(prettySize(computeRouteSize(getRouteChunkName(route), bundle)));
     table.push(row);
   }
   console.log(table.toString());
 }
-function computeRouteSize(route, bundle) {
-  if (route.page) {
-    const entryName = `${route.entryName}.marko`;
-    for (const chunk of Object.values(bundle)) {
-      if (chunk.type === "chunk" && chunk.isEntry && chunk.name === entryName) {
-        return computeChunkSize(chunk, bundle);
-      }
+function computeRouteSize(entryName, bundle) {
+  for (const chunk of Object.values(bundle)) {
+    if (chunk.type === "chunk" && chunk.isEntry && chunk.name === entryName) {
+      return computeChunkSize(chunk, bundle);
     }
   }
   return [0, 0];
@@ -1600,7 +1600,7 @@ function prettySize([bytes, compBytes]) {
   else if (compBytes < 50 * 1e3)
     str += import_kleur.default.yellow(compSize);
   else
-    import_kleur.default.bold(import_kleur.default.red(compSize));
+    str += import_kleur.default.bold(import_kleur.default.red(compSize));
   return str;
 }
 function prettyPath(path3) {
@@ -1624,6 +1624,7 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 // src/vite/plugin.ts
 var import_url2 = require("url");
 var __dirname = import_path2.default.dirname((0, import_url2.fileURLToPath)(__importMetaURL));
+var PLUGIN_NAME_PREFIX = "marko-run-vite";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = import_path2.default.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
@@ -1726,10 +1727,10 @@ function markoRun(opts = {}) {
   });
   return [
     {
-      name: "marko-run-vite:pre",
+      name: `${PLUGIN_NAME_PREFIX}:pre`,
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = (0, import_vite.mergeConfig)(opts, externalPluginOptions);
@@ -1745,7 +1746,8 @@ function markoRun(opts = {}) {
         if (adapter) {
           (_b = adapter.configure) == null ? void 0 : _b.call(adapter, {
             ...getExternalAdapterOptions(config2),
-            root
+            root,
+            isBuild
           });
           const adapterOptions = await ((_c = adapter.pluginOptions) == null ? void 0 : _c.call(adapter, opts));
           if (adapterOptions) {
@@ -1834,9 +1836,11 @@ function markoRun(opts = {}) {
             ]
           } : void 0
         };
-        const adapterConfig = await ((_g = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _g.call(adapter, config2));
-        if (adapterConfig) {
-          pluginConfig = (0, import_vite.mergeConfig)(pluginConfig, adapterConfig);
+        if (adapter == null ? void 0 : adapter.viteConfig) {
+          const adapterConfig = await adapter.viteConfig(config2);
+          if (adapterConfig) {
+            pluginConfig = (0, import_vite.mergeConfig)(pluginConfig, adapterConfig);
+          }
         }
         return setExternalPluginOptions(pluginConfig, opts);
       },
@@ -1946,7 +1950,7 @@ function markoRun(opts = {}) {
     },
     ...(0, import_vite2.default)(markoVitePluginOptions),
     {
-      name: "marko-run-vite:post",
+      name: `${PLUGIN_NAME_PREFIX}:post`,
       enforce: "post",
       generateBundle(options, bundle) {
         if (options.sourcemap && options.sourcemap !== "inline") {
@@ -1982,7 +1986,7 @@ function markoRun(opts = {}) {
           await store.set(routeDataFilename, JSON.stringify(routeData));
           await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes.list));
         } else if (isBuild) {
-          logRoutesTable(routes, bundle);
+          logRoutesTable(routes, bundle, options);
         }
       },
       async closeBundle() {
@@ -2075,9 +2079,8 @@ async function getPackageData(dir) {
   return null;
 }
 async function resolveAdapter(root, options, log) {
-  const { adapter } = options;
-  if (adapter !== void 0) {
-    return adapter;
+  if (options && options.adapter !== void 0) {
+    return options.adapter;
   }
   const pkg = await getPackageData(root);
   if (pkg) {
@@ -2193,11 +2196,14 @@ async function getConnection(port) {
 async function isPortInUse(port) {
   return Boolean(await getConnection(port));
 }
-async function getAvailablePort() {
+async function getAvailablePort(port) {
+  if (port && !await isPortInUse(port)) {
+    return port;
+  }
   return new Promise((resolve) => {
     const server = import_net.default.createServer().listen(0, () => {
-      const { port } = server.address();
-      server.close(() => resolve(port));
+      const { port: port2 } = server.address();
+      server.close(() => resolve(port2));
     });
   });
 }

package/dist/vite/index.js

@@ -1454,7 +1454,10 @@ var HttpVerbOrder = {
   put: 2,
   delete: 3
 };
-function logRoutesTable(routes, bundle) {
+function logRoutesTable(routes, bundle, options) {
+  function getRouteChunkName(route) {
+    return options.sanitizeFileName(`${route.entryName}.marko`);
+  }
   const hasMiddleware = routes.list.some((route) => route.middleware.length);
   const hasMeta = routes.list.some((route) => route.meta);
   const headings = ["Method", "Path", "Entry"];
@@ -1489,7 +1492,7 @@ function logRoutesTable(routes, bundle) {
         }
         if (verb === "get" && route.page) {
           entryType.push(kleur.yellow("page"));
-          size = prettySize(computeRouteSize(route, bundle));
+          size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
         }
         const row = [kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))];
         if (verbs.length === 1 || firstRow) {
@@ -1508,18 +1511,15 @@ function logRoutesTable(routes, bundle) {
     const row = [kleur.bold(kleur.white("*")), key, kleur.yellow("page")];
     hasMiddleware && row.push("");
     hasMeta && row.push("");
-    row.push(prettySize(computeRouteSize(route, bundle)));
+    row.push(prettySize(computeRouteSize(getRouteChunkName(route), bundle)));
     table.push(row);
   }
   console.log(table.toString());
 }
-function computeRouteSize(route, bundle) {
-  if (route.page) {
-    const entryName = `${route.entryName}.marko`;
-    for (const chunk of Object.values(bundle)) {
-      if (chunk.type === "chunk" && chunk.isEntry && chunk.name === entryName) {
-        return computeChunkSize(chunk, bundle);
-      }
+function computeRouteSize(entryName, bundle) {
+  for (const chunk of Object.values(bundle)) {
+    if (chunk.type === "chunk" && chunk.isEntry && chunk.name === entryName) {
+      return computeChunkSize(chunk, bundle);
     }
   }
   return [0, 0];
@@ -1560,7 +1560,7 @@ function prettySize([bytes, compBytes]) {
   else if (compBytes < 50 * 1e3)
     str += kleur.yellow(compSize);
   else
-    kleur.bold(kleur.red(compSize));
+    str += kleur.bold(kleur.red(compSize));
   return str;
 }
 function prettyPath(path3) {
@@ -1584,6 +1584,7 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 // src/vite/plugin.ts
 import { fileURLToPath } from "url";
 var __dirname = path2.dirname(fileURLToPath(import.meta.url));
+var PLUGIN_NAME_PREFIX = "marko-run-vite";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = path2.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
@@ -1686,10 +1687,10 @@ function markoRun(opts = {}) {
   });
   return [
     {
-      name: "marko-run-vite:pre",
+      name: `${PLUGIN_NAME_PREFIX}:pre`,
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
@@ -1705,7 +1706,8 @@ function markoRun(opts = {}) {
         if (adapter) {
           (_b = adapter.configure) == null ? void 0 : _b.call(adapter, {
             ...getExternalAdapterOptions(config2),
-            root
+            root,
+            isBuild
           });
           const adapterOptions = await ((_c = adapter.pluginOptions) == null ? void 0 : _c.call(adapter, opts));
           if (adapterOptions) {
@@ -1794,9 +1796,11 @@ function markoRun(opts = {}) {
             ]
           } : void 0
         };
-        const adapterConfig = await ((_g = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _g.call(adapter, config2));
-        if (adapterConfig) {
-          pluginConfig = mergeConfig(pluginConfig, adapterConfig);
+        if (adapter == null ? void 0 : adapter.viteConfig) {
+          const adapterConfig = await adapter.viteConfig(config2);
+          if (adapterConfig) {
+            pluginConfig = mergeConfig(pluginConfig, adapterConfig);
+          }
         }
         return setExternalPluginOptions(pluginConfig, opts);
       },
@@ -1906,7 +1910,7 @@ function markoRun(opts = {}) {
     },
     ...markoVitePlugin(markoVitePluginOptions),
     {
-      name: "marko-run-vite:post",
+      name: `${PLUGIN_NAME_PREFIX}:post`,
       enforce: "post",
       generateBundle(options, bundle) {
         if (options.sourcemap && options.sourcemap !== "inline") {
@@ -1942,7 +1946,7 @@ function markoRun(opts = {}) {
           await store.set(routeDataFilename, JSON.stringify(routeData));
           await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes.list));
         } else if (isBuild) {
-          logRoutesTable(routes, bundle);
+          logRoutesTable(routes, bundle, options);
         }
       },
       async closeBundle() {
@@ -2035,9 +2039,8 @@ async function getPackageData(dir) {
   return null;
 }
 async function resolveAdapter(root, options, log) {
-  const { adapter } = options;
-  if (adapter !== void 0) {
-    return adapter;
+  if (options && options.adapter !== void 0) {
+    return options.adapter;
   }
   const pkg = await getPackageData(root);
   if (pkg) {
@@ -2153,11 +2156,14 @@ async function getConnection(port) {
 async function isPortInUse(port) {
   return Boolean(await getConnection(port));
 }
-async function getAvailablePort() {
+async function getAvailablePort(port) {
+  if (port && !await isPortInUse(port)) {
+    return port;
+  }
   return new Promise((resolve) => {
     const server = net.createServer().listen(0, () => {
-      const { port } = server.address();
-      server.close(() => resolve(port));
+      const { port: port2 } = server.address();
+      server.close(() => resolve(port2));
     });
   });
 }

package/dist/vite/plugin.d.ts

@@ -1,5 +1,6 @@
-import type { Plugin } from "vite";
+import type { Plugin, ResolvedConfig } from "vite";
 import type { Options, Adapter, PackageData } from "./types";
 export default function markoRun(opts?: Options): Plugin[];
 export declare function getPackageData(dir: string): Promise<PackageData | null>;
-export declare function resolveAdapter(root: string, options: Options, log?: boolean): Promise<Adapter | null>;
+export declare function resolveAdapter(root: string, options?: Options, log?: boolean): Promise<Adapter | null>;
+export declare function isPluginIncluded(config: ResolvedConfig): boolean;

package/dist/vite/types.d.ts

@@ -5,6 +5,8 @@ import type { SpawnedServer } from "./utils/server";
 export type { RoutableFileType, HttpVerb };
 export type StartServer = (port?: number) => Promise<void>;
 export interface AdapterConfig {
+    root: string;
+    isBuild: boolean;
     [name: PropertyKey]: any;
 }
 export interface StartOptions {

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

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

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

@@ -17,4 +17,4 @@ export declare function waitForServer(port: number, wait?: number): Promise<Sock
 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>;
+export declare function getAvailablePort(port?: number): Promise<number>;

package/package.json

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