@marko/run 0.2.4 → 0.2.6

package/dist/vite/index.cjs

@@ -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,7 +1727,7 @@ 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;
@@ -1949,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") {
@@ -2078,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) {
@@ -2196,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

@@ -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,7 +1687,7 @@ 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;
@@ -1909,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") {
@@ -2038,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) {
@@ -2156,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/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.4",
+  "version": "0.2.6",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -112,7 +112,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@marko/vite": "^2.4.8",
+    "@marko/vite": "^3",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
     "dotenv": "^16.0.3",