@b9g/shovel 0.1.8 → 0.1.10

package/bin/shovel.js

@@ -25,6 +25,7 @@ program.command("develop <file>")
 			});
 
 			await proc.exited;
+			return;
 		}
 
 		const {develop} = await import("../src/develop.js");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@b9g/shovel",
-	"version": "0.1.8",
+	"version": "0.1.10",
 	"description": "Dig for treasure",
 	"license": "MIT",
 	"type": "module",
@@ -11,21 +11,21 @@
 		"test": "node --experimental-fetch node_modules/.bin/uvu"
 	},
 	"dependencies": {
-		"commander": "^10.0.0",
-		"esbuild": "^0.17.11",
-		"is-core-module": "^2.11.0",
-		"magic-string": "^0.30.0",
-		"resolve.exports": "^2.0.1",
+		"commander": "^13.1.0",
+		"esbuild": "^0.25.0",
+		"is-core-module": "^2.16.1",
+		"magic-string": "^0.30.17",
+		"resolve.exports": "^2.0.3",
 		"source-map": "^0.7.4"
 	},
 	"devDependencies": {
-		"@b9g/crank": "^0.5.3",
-		"@emotion/css": "^11.10.6",
-		"@flydotio/dockerfile": "^0.5.0",
+		"@b9g/crank": "^0.6.0",
+		"@emotion/css": "^11.13.5",
+		"@flydotio/dockerfile": "^0.7.8",
 		"@types/bun": "^1.2.2",
-		"fkill": "^8.1.0",
-		"sinon": "^15.0.2",
-		"typescript": "^5.3.3",
+		"fkill": "^9.0.0",
+		"sinon": "^19.0.2",
+		"typescript": "^5.7.3",
 		"uvu": "^0.5.6"
 	},
 	"publishConfig": {

package/src/develop.js

@@ -7,20 +7,25 @@ export async function develop(entry, options) {
 		throw new Error("Invalid port", options.port);
 	}
 
+	const module = await import(entry);
 	const server = Bun.serve({
 		port,
 		async fetch(req) {
 			console.log(`${req.method}: ${req.url}`);
-			const module = await import(entry);
 			if (typeof module?.default?.fetch === "function") {
 				try {
-					return await module?.default?.fetch(req);
+					const res = await module?.default?.fetch(req);
+					return res;
 				} catch (err)	{
 					return new Response(err.stack, {
 						status: 500,
 					});
 				}
 			}
+
+			return new Response("fetch not defined on default export", {
+				status: 500,
+			});
 		},
 	});
 

package/src/static.js

@@ -1,84 +1,21 @@
 import * as Path from "path";
 import * as FS from "fs/promises";
 import {pathToFileURL} from "url";
-import * as VM from "vm";
-import {formatMessages} from "esbuild";
 
-// TODO: The static workflow is run once so we don’t need to observe files.
-import {BuildObserver} from "./_esbuild.js";
-import {createLink} from "./_vm.js";
-
-// TODO: This code is duplicated in ./develop.js so it should be moved to a
-// module-specific file.
-
-//interface ModuleCacheValue {
-//	module: VM.SourceTextModule;
-//	dependents: Set<string>;
-//	hot: Hot;
-//}
-export async function static_(file, options) {
-	file = Path.resolve(process.cwd(), file);
-	process.on("SIGINT", async () => {
-		await observer.dispose();
-		process.exit(0);
-	});
-
-	process.on("SIGTERM", async () => {
-		await observer.dispose();
-		process.exit(0);
-	});
-
-	const observer = new BuildObserver(async (record) => {
-		if (record.result.errors.length > 0) {
-			const formatted = await formatMessages(record.result.errors, {
-				kind: "error",
-			});
-			console.error(formatted.join("\n"));
-			process.exit(1);
-		} else if (record.result.warnings.length > 0) {
-			const formatted = await formatMessages(record.result.warnings, {
-				kind: "warning",
-			});
-			console.warn(formatted.join("\n"));
-		}
-	});
-
-	const link = createLink(observer);
-	const result = await observer.build(file);
-	const code = result.outputFiles.find((file) => file.path.endsWith(".js"))?.text || "";
-	const url = pathToFileURL(file).href;
-	const module = new VM.SourceTextModule(code, {
-		identifier: url,
-		initializeImportMeta(meta) {
-			meta.url = url;
-		},
-		async importModuleDynamically(specifier, referencingModule) {
-			// TODO: link is not defined so I dunno how this works.
-			const linked = await link(specifier, referencingModule);
-			await linked.link(link);
-			await linked.evaluate();
-			return linked;
-		},
-	});
-
-	await module.link(link);
-	await module.evaluate();
-	const namespace = module.namespace;
+export async function static_(entry, options) {
+	entry = Path.resolve(process.cwd(), entry);
+	const module = await import(entry);
 	const dist = Path.resolve(process.cwd(), options.outDir);
-	const paths = await namespace.default?.staticPaths?.(dist);
+	const paths = module.default?.staticPaths?.(dist);
 	if (paths) {
 		for await (const path of paths) {
 			const req = new Request(pathToFileURL(path).href);
-			const res = await namespace.default?.fetch?.(req);
+			const res = await module.default?.fetch?.(req);
 			const body = await res.text();
-			// TODO: we need an alternative to /index.html style builds.
-			const file = Path.resolve(dist, path.replace(/^\//, ""), "index.html");
-			console.info(`Writing: ${file}`);
-			// ensure directory exists
-			await FS.mkdir(Path.dirname(file), {recursive: true});
-			await FS.writeFile(file, body);
+			const htmlPath = Path.resolve(dist, path.replace(/^\//, ""), "index.html");
+			console.info(`Writing: ${htmlPath}`);
+			await FS.mkdir(Path.dirname(htmlPath), {recursive: true});
+			await FS.writeFile(htmlPath, body);
 		}
 	}
-
-	process.exit(0);
 }