htmx-router 2.1.1 → 2.1.3

package/dist/internal/request/server.js

@@ -65,7 +65,7 @@ export class HtmxRouterServer {
         return;
     }
     async transform(ctx, res) {
-        if (this.#binding.transform.length < 0)
+        if (this.#binding.transform.length < 1)
             return res;
         ctx.timer.checkpoint("transform");
         for (const process of this.#binding.transform) {

package/dist/response.js

@@ -97,6 +97,7 @@ export function refresh(init) {
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/ETag | ETag - MDN Web Docs }
  */
 export function AssertETagStale(request, headers, etag, options) {
+    headers.delete("Cache-Control"); // clear any defaults
     if (options) {
         // default to private, because it's the slightly less worse of the two potential foot guns
         if (options.public)
@@ -107,7 +108,7 @@ export function AssertETagStale(request, headers, etag, options) {
             headers.append("Cache-Control", `max-age=${options.revalidate}`);
     }
     headers.append("Cache-Control", "must-revalidate");
-    headers.set("ETag", `"${etag}"`);
+    headers.set("ETag", `"${encodeURIComponent(etag.trim())}"`);
     const client = request.headers.get("if-none-match");
     if (client !== etag)
         return;

package/dist/router.js

@@ -189,7 +189,6 @@ class RouteLeaf {
             return null;
         if (jsx instanceof Response)
             return jsx;
-        ctx.timer.checkpoint("render");
         const res = ctx.render(jsx);
         return html(res, { headers: ctx.headers });
     }
@@ -200,10 +199,8 @@ class RouteLeaf {
         let caught;
         if (jsx instanceof Response)
             caught = jsx;
-        else {
-            ctx.timer.checkpoint("render");
+        else
             caught = ctx.render(jsx);
-        }
         if (caught instanceof Response) {
             caught.headers.set("X-Caught", "true");
             return caught;

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "htmx-router",
-	"version": "2.1.1",
+	"version": "2.1.3",
 	"description": "A lightweight SSR framework with server+client islands",
 	"keywords": [ "htmx", "router", "client islands", "ssr", "vite" ],
 	"type": "module",
 	"scripts": {
 		"build": "tsc"
 	},
-	"main": "./index.js",
+	"main": "./dist/index.js",
 	"exports": {
 		".":              "./dist/index.js",
 		"./cookies":      "./dist/cookies.js",
@@ -30,7 +30,7 @@
 		"./internal/mount":  "./dist/internal/mount.js"
 	},
 	"bin": {
-		"htmx-router": "cli/index.js"
+		"htmx-router": "dist/cli/index.js"
 	},
 	"repository": {
 		"type": "git",