@primate/htmx 0.5.1 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/htmx",
-  "version": "0.5.1",
+  "version": "0.7.0",
   "description": "Primate HTMX module",
   "homepage": "https://primatejs.com/modules/htmx",
   "bugs": "https://github.com/primatejs/htmx/issues",
@@ -13,6 +13,9 @@
   "devDependencies": {
     "maximin": "^0.1.2"
   },
+  "peerDependencies": {
+    "primate": "0.14.0"
+  },
   "type": "module",
   "exports": "./exports.js",
   "engines": {

package/src/module.js

@@ -1,20 +1,6 @@
 import {Path} from "runtime-compat/fs";
-import crypto from "runtime-compat/crypto";
 
-const fileName = "htmx.min.js";
-const scriptPath = ["node_modules", "htmx.org", "dist", fileName];
-
-const hash = async (string, algorithm = "sha-384") => {
-  const buffer = new ArrayBuffer(string.length);
-  const view = new Uint8Array(buffer);
-  for (let i = 0; i < string.length; i++) {
-    view[i] = string.charCodeAt(i);
-  }
-  const bytes = await crypto.subtle.digest(algorithm, buffer);
-  return btoa(String.fromCharCode(...new Uint8Array(bytes)));
-};
-
-const getContent = async (env, name) => {
+const loadComponent = async (env, name) => {
   try {
     return await env.paths.components.join(`${name}.html`).file.read();
   } catch (error) {
@@ -22,16 +8,19 @@ const getContent = async (env, name) => {
   }
 };
 
-const handler = (content, {status = 200, partial = false, adhoc = false} = {}) =>
+const getContent = (env, {adhoc, content}) => {
+  return adhoc ? content : loadComponent(env, content);
+};
+
+const getBody = async (env, {adhoc, partial, content}) => {
+  const body = await getContent(env, {adhoc, content});
+  return partial ? body : env.render({body});
+};
+
+const htmx = (content, {status = 200, partial = false, adhoc = false} = {}) =>
   async (env, headers) => {
-    const src = `/${fileName}`;
-    const htmx = env.paths.public.join(fileName);
-    const integrity = `sha384-${await hash(await htmx.file.read())}`;
-    const head = `<script src="${src}" integrity="${integrity}"></script>`;
-    const body = adhoc ? content : await getContent(env, content);
-    const scriptSrc = `script-src 'self' '${integrity}';`;
     const styleSrc = "style-src 'unsafe-inline';";
-    const csp = `${headers["Content-Security-Policy"]}${scriptSrc}${styleSrc}`;
+    const csp = `${headers["Content-Security-Policy"]}${styleSrc}`;
     const options = {
       status,
       headers: {
@@ -41,21 +30,19 @@ const handler = (content, {status = 200, partial = false, adhoc = false} = {}) =
       },
     };
 
-    return [partial ? body : await env.render({head, body}), options];
+    return [await getBody(env, {adhoc, partial, content}), options];
   };
 
-export default () => () => {
-  return {
-    register: async (env, next) => {
-      env.register("htmx", handler);
-      return next(env);
-    },
-    bundle: async (env, next) => {
-      const htmx = env.paths.public.join(fileName);
-      if (!await htmx.exists) {
-        await Path.resolve().join(...scriptPath).file.copy(`${htmx}`);
-      }
-      return next(env);
-    },
-  };
-};
+export default () => ({
+  register(env, next) {
+    env.register("htmx", htmx);
+    return next(env);
+  },
+  async publish(env, next) {
+    const src = "htmx.min.js";
+    const path = ["node_modules", "htmx.org", "dist", src];
+    const code = await Path.resolve().join(...path).file.read();
+    await env.publish({src, code});
+    return next(env);
+  },
+});