Clean up

Author: moonglum

lib/cli.js

@@ -1,8 +1,8 @@
 "use strict";
 
-let { readConfig } = require("./config");
 let { abort, repr } = require("./util");
 let { parseArgs } = require("node:util");
+let path = require("node:path");
 
 let HELP = `
 Usage:
@@ -37,7 +37,8 @@ exports.parseCLI = async function parseCLI() {
 			},
 			config: {
 				type: "string",
-				short: "c"
+				short: "c",
+				default: "faucet.config.js"
 			},
 			watch: {
 				type: "boolean",
@@ -69,21 +70,10 @@ exports.parseCLI = async function parseCLI() {
 		abort(HELP, 0);
 	}
 
-	let options = {
-		watch: values.watch,
-		fingerprint: values.fingerprint,
-		sourcemaps: values.sourcemaps,
-		compact: values.compact,
-		serve: values.serve,
-		liveserve: values.liveserve
+	let configPath = path.resolve(process.cwd(), values.config);
+	return {
+		referenceDir: path.dirname(configPath),
+		config: await require(configPath),
+		options: values
 	};
-
-	if(options.watch && options.fingerprint) { // for convenience
-		console.error("you might consider disabling fingerprinting in watch " +
-				"mode to avoid littering your file system with obsolete bundles");
-	}
-
-	let rootDir = process.cwd();
-	let { referenceDir, config } = await readConfig(rootDir, values.config);
-	return { referenceDir, config, options };
 };

lib/config.js

@@ -8,8 +8,6 @@ let { SerializedRunner } = require("./runner");
 
 exports.faucetDispatch = async function faucetDispatch(referenceDir, config,
 		{ watch, fingerprint, sourcemaps, compact, serve, liveserve }) {
-	config = await config;
-
 	let assetManager = new AssetManager(referenceDir, {
 		manifestConfig: config.manifest,
 		fingerprint,
@@ -33,12 +31,14 @@ exports.faucetDispatch = async function faucetDispatch(referenceDir, config,
 	runner.run();
 
 	if(watch) {
-		makeWatcher(config.watchDirs, referenceDir).
-			then(watcher => {
-				watcher.on("edit", filepaths => {
-					runner.rerun(filepaths);
-				});
-			});
+		if(fingerprint) {
+			console.error("you might consider disabling fingerprinting in watch " +
+					"mode to avoid littering your file system with obsolete bundles");
+		}
+		let watcher = await makeWatcher(config.watchDirs, referenceDir);
+		watcher.on("edit", filepaths => {
+			runner.rerun(filepaths);
+		});
 	}
 
 	if(serve && liveserve) {