@t8/serve 0.1.30 → 0.1.31

package/dist/index.js

@@ -6,8 +6,12 @@ import { extname } from "node:path";
 // src/bundle.ts
 import { rm } from "node:fs/promises";
 import { join } from "node:path";
-import { build } from "esbuild";
-async function bundle({ path = "", bundle: options } = {}) {
+import { build, context } from "esbuild";
+async function bundle({
+  path = "",
+  bundle: options,
+  watch
+} = {}) {
   if (!options) return;
   let normalizedOptions;
   if (typeof options === "boolean") normalizedOptions = {};
@@ -20,13 +24,21 @@ async function bundle({ path = "", bundle: options } = {}) {
   let inputFile = join(path, normalizedOptions.input ?? "index.ts");
   let outputFile = join(path, dir, normalizedOptions.output ?? "index.js");
   await rm(join(path, dir), { recursive: true, force: true });
-  await build({
+  let buildOptions = {
     entryPoints: [inputFile],
     outfile: outputFile,
     bundle: true,
     platform: "browser",
     logLevel: "warning"
-  });
+  };
+  if (watch) {
+    let ctx = await context(buildOptions);
+    await ctx.watch();
+    return async () => {
+      await ctx.dispose();
+    };
+  }
+  await build(buildOptions);
 }
 
 // src/getFilePath.ts
@@ -91,7 +103,7 @@ var mimeTypes = {
 
 // src/serve.ts
 async function serve(config = {}) {
-  await bundle(config);
+  let stop = await bundle(config);
   return new Promise((resolve) => {
     let server = createServer(async (req, res) => {
       await config.onRequest?.(req, res);
@@ -107,6 +119,11 @@ async function serve(config = {}) {
       res.writeHead(200, { "content-type": mimeType });
       createReadStream(filePath).pipe(res);
     });
+    if (stop) {
+      server.on("close", async () => {
+        await stop();
+      });
+    }
     let { host, port } = getTarget(config);
     server.listen(port, host, () => {
       if (config.log) console.log(`Server running at http://${host}:${port}`);

package/dist/run.cjs

@@ -10,7 +10,11 @@ var import_node_path3 = require("node:path");
 var import_promises = require("node:fs/promises");
 var import_node_path = require("node:path");
 var import_esbuild = require("esbuild");
-async function bundle({ path = "", bundle: options } = {}) {
+async function bundle({
+  path = "",
+  bundle: options,
+  watch
+} = {}) {
   if (!options) return;
   let normalizedOptions;
   if (typeof options === "boolean") normalizedOptions = {};
@@ -23,13 +27,21 @@ async function bundle({ path = "", bundle: options } = {}) {
   let inputFile = (0, import_node_path.join)(path, normalizedOptions.input ?? "index.ts");
   let outputFile = (0, import_node_path.join)(path, dir, normalizedOptions.output ?? "index.js");
   await (0, import_promises.rm)((0, import_node_path.join)(path, dir), { recursive: true, force: true });
-  await (0, import_esbuild.build)({
+  let buildOptions = {
     entryPoints: [inputFile],
     outfile: outputFile,
     bundle: true,
     platform: "browser",
     logLevel: "warning"
-  });
+  };
+  if (watch) {
+    let ctx = await (0, import_esbuild.context)(buildOptions);
+    await ctx.watch();
+    return async () => {
+      await ctx.dispose();
+    };
+  }
+  await (0, import_esbuild.build)(buildOptions);
 }
 
 // src/getFilePath.ts
@@ -94,7 +106,7 @@ var mimeTypes = {
 
 // src/serve.ts
 async function serve(config = {}) {
-  await bundle(config);
+  let stop = await bundle(config);
   return new Promise((resolve) => {
     let server = (0, import_node_http.createServer)(async (req, res) => {
       await config.onRequest?.(req, res);
@@ -110,6 +122,11 @@ async function serve(config = {}) {
       res.writeHead(200, { "content-type": mimeType });
       (0, import_node_fs.createReadStream)(filePath).pipe(res);
     });
+    if (stop) {
+      server.on("close", async () => {
+        await stop();
+      });
+    }
     let { host, port } = getTarget(config);
     server.listen(port, host, () => {
       if (config.log) console.log(`Server running at http://${host}:${port}`);
@@ -122,10 +139,15 @@ async function serve(config = {}) {
 async function run() {
   let [url, ...args] = process.argv.slice(2);
   let spa = false;
+  let watch = false;
   if (args[0] === "*") {
     spa = true;
     args.shift();
   }
+  if (args.at(-1) === "--watch") {
+    watch = true;
+    args.pop();
+  }
   let bundleFlagIndex = args.indexOf("-b");
   let path = args[0];
   let dirs;
@@ -145,7 +167,8 @@ async function run() {
     dirs,
     spa,
     bundle: bundle2,
-    log: true
+    log: true,
+    watch
   });
 }
 run();

package/dist/run.mjs

@@ -8,8 +8,12 @@ import { extname } from "node:path";
 // src/bundle.ts
 import { rm } from "node:fs/promises";
 import { join } from "node:path";
-import { build } from "esbuild";
-async function bundle({ path = "", bundle: options } = {}) {
+import { build, context } from "esbuild";
+async function bundle({
+  path = "",
+  bundle: options,
+  watch
+} = {}) {
   if (!options) return;
   let normalizedOptions;
   if (typeof options === "boolean") normalizedOptions = {};
@@ -22,13 +26,21 @@ async function bundle({ path = "", bundle: options } = {}) {
   let inputFile = join(path, normalizedOptions.input ?? "index.ts");
   let outputFile = join(path, dir, normalizedOptions.output ?? "index.js");
   await rm(join(path, dir), { recursive: true, force: true });
-  await build({
+  let buildOptions = {
     entryPoints: [inputFile],
     outfile: outputFile,
     bundle: true,
     platform: "browser",
     logLevel: "warning"
-  });
+  };
+  if (watch) {
+    let ctx = await context(buildOptions);
+    await ctx.watch();
+    return async () => {
+      await ctx.dispose();
+    };
+  }
+  await build(buildOptions);
 }
 
 // src/getFilePath.ts
@@ -93,7 +105,7 @@ var mimeTypes = {
 
 // src/serve.ts
 async function serve(config = {}) {
-  await bundle(config);
+  let stop = await bundle(config);
   return new Promise((resolve) => {
     let server = createServer(async (req, res) => {
       await config.onRequest?.(req, res);
@@ -109,6 +121,11 @@ async function serve(config = {}) {
       res.writeHead(200, { "content-type": mimeType });
       createReadStream(filePath).pipe(res);
     });
+    if (stop) {
+      server.on("close", async () => {
+        await stop();
+      });
+    }
     let { host, port } = getTarget(config);
     server.listen(port, host, () => {
       if (config.log) console.log(`Server running at http://${host}:${port}`);
@@ -121,10 +138,15 @@ async function serve(config = {}) {
 async function run() {
   let [url, ...args] = process.argv.slice(2);
   let spa = false;
+  let watch = false;
   if (args[0] === "*") {
     spa = true;
     args.shift();
   }
+  if (args.at(-1) === "--watch") {
+    watch = true;
+    args.pop();
+  }
   let bundleFlagIndex = args.indexOf("-b");
   let path = args[0];
   let dirs;
@@ -144,7 +166,8 @@ async function run() {
     dirs,
     spa,
     bundle: bundle2,
-    log: true
+    log: true,
+    watch
   });
 }
 run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t8/serve",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "Simple static file server + bundler, primarily for demo apps and tests, manual or automated",
   "keywords": [
     "node",

package/src/Config.ts

@@ -28,6 +28,8 @@ export type Config = {
    * unmatched URLs are served as "/".
    */
   spa?: boolean;
+  /** Whether to rebuild whenever the bundled files change. */
+  watch?: boolean;
   /** Whether to log to the console. */
   log?: boolean;
   /**

package/src/bundle.ts

@@ -1,10 +1,14 @@
 import { rm } from "node:fs/promises";
 import { join } from "node:path";
-import { build } from "esbuild";
+import { type BuildOptions, build, context } from "esbuild";
 import type { BundleConfig } from "./BundleConfig";
 import type { Config } from "./Config";
 
-export async function bundle({ path = "", bundle: options }: Config = {}) {
+export async function bundle({
+  path = "",
+  bundle: options,
+  watch,
+}: Config = {}) {
   if (!options) return;
 
   let normalizedOptions: BundleConfig;
@@ -22,11 +26,23 @@ export async function bundle({ path = "", bundle: options }: Config = {}) {
 
   await rm(join(path, dir), { recursive: true, force: true });
 
-  await build({
+  let buildOptions: BuildOptions = {
     entryPoints: [inputFile],
     outfile: outputFile,
     bundle: true,
     platform: "browser",
     logLevel: "warning",
-  });
+  };
+
+  if (watch) {
+    let ctx = await context(buildOptions);
+
+    await ctx.watch();
+
+    return async () => {
+      await ctx.dispose();
+    };
+  }
+
+  await build(buildOptions);
 }

package/src/run.ts

@@ -5,12 +5,18 @@ import { serve } from "./serve";
 async function run() {
   let [url, ...args] = process.argv.slice(2);
   let spa = false;
+  let watch = false;
 
   if (args[0] === "*") {
     spa = true;
     args.shift();
   }
 
+  if (args.at(-1) === "--watch") {
+    watch = true;
+    args.pop();
+  }
+
   let bundleFlagIndex = args.indexOf("-b");
   let path = args[0];
 
@@ -34,6 +40,7 @@ async function run() {
     spa,
     bundle,
     log: true,
+    watch,
   });
 }
 

package/src/serve.ts

@@ -9,10 +9,10 @@ import { mimeTypes } from "./mimeTypes";
 
 export type Server = ReturnType<typeof createServer>;
 
-export async function serve(config: Config = {}): Promise<Server> {
-  await bundle(config);
+export async function serve(config: Config = {}) {
+  let stop = await bundle(config);
 
-  return new Promise((resolve) => {
+  return new Promise<Server>((resolve) => {
     let server = createServer(async (req, res) => {
       await config.onRequest?.(req, res);
 
@@ -33,6 +33,12 @@ export async function serve(config: Config = {}): Promise<Server> {
       createReadStream(filePath).pipe(res);
     });
 
+    if (stop) {
+      server.on("close", async () => {
+        await stop();
+      });
+    }
+
     let { host, port } = getTarget(config);
 
     server.listen(port, host, () => {