build: Resolve {h} in --out

Author: lauriro

lib/build.js

@@ -79,15 +79,14 @@ function build(opts) {
 		if (opts.banner) {
 			output = banner[ext].replace(/\{0\}/g, opts.banner) + output
 		}
-		var outFile = out.replace(/.*\//, "")
-		, bytes = write(outDir, outFile + "?{h}", output)
-		console.log("# Build %s %s", outFile, bytes)
+		var outFile = write(outDir, out.replace(/.*\//, ""), output)
+		console.log("# Build %s %s", path.basename(outFile), output.length)
 
 		if (opts.worker) {
 			updateWorker(opts.worker, opts, {})
 		}
 		child.execSync("git add -u")
-		if (opts._bytes) console.log("# Total %s bytes", opts._bytes + bytes)
+		if (opts._bytes) console.log("# Total %s bytes", opts._bytes + output.length)
 	}
 }
 
@@ -136,7 +135,7 @@ function write(dir, name, content, el) {
 		}
 	}
 	cli.writeFile(outFile, content)
-	return content.length
+	return outFile
 }
 
 function html(opts, next) {
@@ -200,9 +199,9 @@ function html(opts, next) {
 
 	opts._bytes = 0
 	pendingWrites.forEach(function(w) {
-		var bytes = write(w.dir, w.name, w.content, w.el)
-		console.log("# Write %s %s", w.name.split("?")[0], bytes)
-		opts._bytes += bytes
+		var outFile = write(w.dir, w.name, w.content, w.el)
+		console.log("# Write %s %s", path.basename(outFile), w.content.length)
+		opts._bytes += w.content.length
 	})
 
 	$$("[inline],[min]").forEach(function(el) {

test/build.js

@@ -78,8 +78,11 @@ describe("build", function() {
 	test("ui build with --min", function(assert, mock) {
 		mock.swap(console, "error", mock.fn())
 		mock.swap(console, "log", mock.fn())
-		build({ _: files, min: temp + "min.ui" })
-		assert.matchSnapshot(temp + "min.ui", 0, "test/data/snap/ui-build/min.ui")
+		build({ _: files, min: temp + "min-{h}.ui" })
+		var out = cli.ls(temp + "*.ui", { dir: false })
+		assert.equal(out.length, 1)
+		assert.ok(out[0].indexOf("{h}") < 0, "hash should be resolved")
+		assert.matchSnapshot(out[0], 0, "test/data/snap/ui-build/min.ui")
 		cli.rmrf(temp)
 		assert.end()
 	})