@caltho/site-kit 0.2.7 → 0.2.8

package/README.md

@@ -57,7 +57,7 @@ the kit only checks it's a URL.
 | --- | --- |
 | **Content** (`@caltho/site-kit/content`) | `defineSite` and the pieces to build blocks from (`text`, `md`, `image`, `link`, `href`, `business`, …); the checks, including that every link lands on a page and every `#part` exists; the JSON Schema. |
 | **prepare** | Loads the content from CalOS (`CALOS_CONTENT_URL`, `CALOS_SITE_TOKEN`; the site's own while nothing's published there) or `content/site.json`, sends CalOS the schema, checks it, writes the schema, and makes every picture the content names as WebP at the widths screens need plus a 1200×630 share crop, named by content so they cache for a year. |
-| **finish** | After the framework's build: a content security policy in every page (each inline script named by hash), `_headers` (security headers, long caching, `noindex` on preview addresses), and `_redirects` from CalOS (`CALOS_REDIRECTS_URL`; a build that can't reach CalOS fails rather than lose them). Where CalOS counts the site's visits (its content answer says where they go), the analytics script in every published page but the preview, with its addresses in the policy, and phone and map links marked so a tap is counted (`phone_tap`, `directions_tap`; a link marked `data-track` already is left as it is). No cookies. |
+| **finish** | After the framework's build: a content security policy in every page (each inline script named by hash), `_headers` (security headers, long caching, `noindex` on preview addresses), and `_redirects` from CalOS (`CALOS_REDIRECTS_URL`; a build that can't reach CalOS fails rather than lose them). Where CalOS counts the site's visits (its content answer says where they go), the analytics script in every published page but the preview, with its addresses in the policy, and phone and map links marked so a tap is counted (`phone_tap`, `directions_tap`; a link marked `data-track` already is left as it is). No cookies. The standard privacy policy then leaves out its claim of no analytics, saying nothing in its place: what to say of the counting is the business's (`extra`). |
 | **check** | Every page in a real browser on a computer and a phone: fails on anything the policy blocks and anything that doesn't load. What axe finds (WCAG 2.0–2.2 A and AA, best practice) is said with where, for the site to weigh (a colour the business chose over the contrast rule is their choice); `--strict` fails on it too, `--allow=rule,rule` leaves named rules out. |
 | **Search** | Titles that fit, canonical addresses, the business as schema.org data (hours, areas, address), FAQ and breadcrumb data, robots.txt, the sitemap. |
 | **Policies** | Privacy, accessibility and terms, written from the business's facts and what the site does. Optional: a site calls `policy()` where it wants them. |

package/dist/content/index.d.ts

@@ -170,7 +170,8 @@ export type SiteBase = {
     footer?: Footer;
     look?: Look;
     redirects: Redirect[]; /** Whether page paths end in a slash (the default). */
-    trailingSlash?: boolean;
+    trailingSlash?: boolean; /** Set by prepare, never in content: CalOS counts this site's visits (its pages carry the script), which its privacy policy says. */
+    countsVisits?: boolean;
 };
 /**
  * The site's menu, as its header draws it: the one edited in CalOS (its links in order, one picked out,

package/dist/policies.js

@@ -1,8 +1,11 @@
 // The policy pages a business's site should have, written from what the business has told us and
 // what the template actually does: no cookies, no analytics, no third-party requests, a contact
 // form that goes to the business's CalOS. So the words stay true as the site changes: add a
-// tracker to the template and this is where it has to be said. Plain language, US-first; a
-// business adds its own paragraphs with `extra`, and should have a lawyer read them once.
+// tracker to the template and this is where it has to be said. Where the business has CalOS count
+// its visits (prepare marks it: site.countsVisits), the claim of no analytics is left out and
+// nothing said in its place: what to say of the counting is the business's, in `extra` (CalOS
+// suggests a paragraph as they turn it on). Plain language, US-first; a business adds its own
+// paragraphs with `extra`, and should have a lawyer read them once.
 /**
  * `collectsFromForm`: the site has a form that takes a visitor's name, email and message, which the
  * privacy policy says (it defaults to the site having a form address).
@@ -13,6 +16,7 @@ export function policy(site, which, o = {}) {
     const reach = [b.email ? `email [${b.email}](mailto:${b.email})` : null, b.phone ? `call ${b.phone}` : null].filter(Boolean).join(" or ");
     const place = b.address ? `${b.address.locality}, ${b.address.region}` : null;
     const hasForm = o.collectsFromForm ?? !!site.form;
+    const counts = !!site.countsVisits;
     if (which === "privacy") {
         return {
             title: "Privacy policy",
@@ -27,7 +31,9 @@ export function policy(site, which, o = {}) {
                 ]
                     .filter(Boolean)
                     .join("\n"),
-                `This site doesn't use cookies, advertising or analytics trackers. Its fonts and pictures come from this site itself, so visiting it doesn't tell anyone else you were here.`,
+                counts
+                    ? `This site doesn't use cookies or advertising trackers. Its fonts and pictures come from this site itself.`
+                    : `This site doesn't use cookies, advertising or analytics trackers. Its fonts and pictures come from this site itself, so visiting it doesn't tell anyone else you were here.`,
                 `## How we use it`,
                 `To answer you, to quote for and do the work you ask about, and to keep the records the law requires. We keep enquiries in our customer records system, which Caltho runs for us. We don't sell or rent your information, and we don't share it for advertising. The companies that help us run this site and our business (hosting, email, records) only use it to do that for us.`,
                 `## How long we keep it`,

package/dist/prepare.js

@@ -92,6 +92,11 @@ export async function prepare(root, env = process.env, log = console.log) {
     if (parsed.problems)
         throw new Error(`The site's content needs fixing (${from}):\n  - ${parsed.problems.join("\n  - ")}`);
     const site = parsed.site;
+    // Its pages will count visits (finish puts the script in): what its privacy policy says follows.
+    if (analytics)
+        site.countsVisits = true;
+    else
+        delete site.countsVisits;
     for (const w of parsed.warnings)
         log(`site-kit: warning: ${w}`);
     const schema = definition.jsonSchema();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caltho/site-kit",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "What every Caltho site is built with: the contract with CalOS (content, and how a site declares what is editable), images, search and security, and the checks",
   "license": "MIT",
   "type": "module",