@primate/htmx 0.15.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/htmx",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Primate HTMX module",
   "homepage": "https://primatejs.com/modules/htmx",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -15,11 +15,11 @@
     "directory": "packages/htmx"
   },
   "dependencies": {
-    "htmx.org": "^1.9.2",
-    "runtime-compat": "^0.20.2"
+    "htmx.org": "^1.9.4",
+    "runtime-compat": "^0.24.1"
   },
   "peerDependencies": {
-    "primate": "0.20"
+    "primate": "0.21"
   },
   "type": "module",
   "exports": "./src/exports.js"

package/src/module.js

@@ -1,3 +1,5 @@
+import {Response, Status, MediaType} from "runtime-compat/http";
+
 const loadComponent = async (file) => {
   try {
     return await file.read();
@@ -11,32 +13,38 @@ const getBody = async (app, partial, file) => {
   return partial ? body : app.render({body});
 };
 
-const handler = path => (name, {status = 200, partial = false} = {}) =>
+const handler = (name, {status = Status.OK, partial = false} = {}) =>
   async app => {
+    const {build: {paths: {components}}} = app;
+    const code = "import {htmx} from \"app\";";
+    await app.publish({code, type: "module", inline: true});
+
     const headers = app.headers();
-    const styleSrc = "style-src 'self' 'unsafe-inline';";
-    const csp = `${headers["Content-Security-Policy"]}${styleSrc}`;
-    const options = {
+    const csp = headers["Content-Security-Policy"].replace(
+      "style-src 'self'", "style-src 'self' 'unsafe-inline'"
+    );
+    const body = await getBody(app, partial, components.join(name).file);
+
+    return new Response(body, {
       status,
       headers: {
         ...headers,
-        "Content-Type": "text/html",
+        "Content-Type": MediaType.TEXT_HTML,
         "Content-Security-Policy": csp,
       },
-    };
-    return [await getBody(app, partial, path.join(name).file), options];
+    });
   };
 
-export default directory => ({
+export default _ => ({
   name: "@primate/htmx",
   register(app, next) {
-    app.register("htmx", handler(directory ?? app.paths.components));
+    app.register("htmx", handler);
     return next(app);
   },
   async publish(app, next) {
     const name = "htmx.org";
     await app.import(name);
-    app.bootstrap({type: "script", code: `import * as htmx from "${name}";`});
+    app.bootstrap({type: "script", code: `export * as htmx from "${name}";`});
     return next(app);
   },
 });