update /uses

content/uses/index.md

@@ -94,6 +94,7 @@ layout: etc
     - [Facebook Container](https://addons.mozilla.org/en-US/firefox/addon/facebook-container/)
     - [Firefox Multi-Account Containers](https://addons.mozilla.org/en-US/firefox/addon/multi-account-containers/)
     - [Hide Private Mode](https://addons.mozilla.org/en-US/firefox/addon/hide-private-mode/)
+    - [HTTP Header Spy](https://addons.mozilla.org/en-US/firefox/addon/http-header-spy/)
     - [HTTPS Everywhere](https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/)
     - [Mailvelope](https://addons.mozilla.org/en-US/firefox/addon/mailvelope/)
     - [React Developer Tools](https://addons.mozilla.org/en-US/firefox/addon/react-devtools/)
@@ -102,6 +103,7 @@ layout: etc
     - [Search by Image on Google](https://addons.mozilla.org/en-US/firefox/addon/search-by-image-on-google/)
     - [uBlock Origin](https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/)
     - [View Image](https://addons.mozilla.org/en-US/firefox/addon/view-image/)
+    - [Wappalyzer](https://addons.mozilla.org/en-US/firefox/addon/wappalyzer/)
 - [**Google Chrome** (Dev Channel)](https://www.google.com/chrome/browser/?extra=devchannel) — for testing **only!**
   - [Lighthouse](https://chrome.google.com/webstore/detail/lighthouse/blipmdconlkpinefehnmjammfjpmpbjk?h1=en)
   - [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en)
@@ -153,13 +155,14 @@ I have far too many apps to count, but here the essentials that have earned a sp
 I've been making recent efforts to [de-Google](https://www.reddit.com/r/degoogle/) my life, with mixed results...
 
 - ~~Gmail~~ → [**Fastmail**](https://www.fastmail.com/) [(referral link)](https://ref.fm/u20274504)
-- ~~Chrome~~ → [**Firefox Developer Edition**](#browsing) 🦊
 - ~~Google Drive~~ → [~~Dropbox~~](https://www.dropbox.com/) → [**iCloud Drive**](https://www.icloud.com/iclouddrive)
   - [Read why.](/notes/dropping-dropbox/)
 - ~~Google Docs~~ → [**Microsoft Office**](https://products.office.com/en-us/mac/microsoft-office-for-mac) (hey, it works 🤷)
 - ~~Google Photos~~ → [**iCloud Photos**](https://www.icloud.com/photos/)
 - ~~Google DNS~~ → [**Cloudflare 1.1.1.1**](https://1.1.1.1/)
-- ~~Google Analytics~~ → [**Matomo**](https://github.com/matomo-org/matomo), [**Fathom**](https://usefathom.com/), [**Netlify Analytics**](https://www.netlify.com/products/analytics/) [(my review)](/notes/netlify-analytics-review/)
+- ~~Google Analytics~~ → both of these are awesome, privacy-aware "visitor counters" rather than trackers:
+  - [**Netlify Analytics**](https://www.netlify.com/products/analytics/) [(my review)](/notes/netlify-analytics-review/)
+  - [**Simple Analytics**](https://simpleanalytics.com/) [(referral link)](https://referral.simpleanalytics.com/jake-jarvis)
 - [**Netlify**](https://www.netlify.com/) for static sites.
 - [**Linode**](https://www.linode.com/) for virtual servers.
 - [**Backblaze**](https://www.backblaze.com/) [(referral link)](https://secure.backblaze.com/r/00x84e)

layouts/_default/baseof.html

@@ -11,7 +11,9 @@
 </div>
 {{ partialCached "page/footer" . }}
 {{ partial "scripts/shortcodes" . }}
+{{ if eq hugo.Environment "production" }}
   {{ partialCached "scripts/simple_analytics" . }}
+{{ end }}
   </body>
 </html>
 

layouts/_default/single.amp.html

@@ -257,8 +257,9 @@
       <div class="right"><a class="back-to-top" href="#top">↑ Back to top.</a></div>
     </footer>
 
-    <!-- Simple Analytics -->
+    {{ if eq hugo.Environment "production" }}
     <amp-pixel src="https://s.jarv.is/image.gif" layout="nodisplay"></amp-pixel>
+    {{ end }}
   </body>
 </html>
 

layouts/partials/head/preload.html

@@ -1,4 +1,4 @@
-<link rel="preconnect" href="https://s.jarv.is" crossorigin>
+{{ if eq hugo.Environment "production" }}<link rel="preconnect" href="https://s.jarv.is">{{ end }}
 <link rel="preload" href="{{ "fonts/inter-regular-subset.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
 <link rel="preload" href="{{ "fonts/inter-medium-subset.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
 <link rel="preload" href="{{ "fonts/inter-bold-subset.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>

layouts/partials/scripts/simple_analytics.html

@@ -1,4 +1,2 @@
-{{ if eq hugo.Environment "production" }}
 <script data-skip-dnt="true" async defer src="https://s.jarv.is/app.js"></script>
 <noscript><img src="https://s.jarv.is/image.gif" alt=""></noscript>
-{{ end }}

package.json

@@ -36,7 +36,7 @@
     "cross-env": "^7.0.0",
     "get-folder-size": "^2.0.1",
     "html-minifier": "^4.0.0",
-    "hugo-extended": "0.63.2",
+    "hugo-extended": "git+https://github.com/jakejarvis/hugo-extended.git#master",
     "imagemin-cli": "^5.1.0",
     "imagemin-gifsicle": "^7.0.0",
     "imagemin-jpegoptim": "^6.0.0",

yarn.lock

@@ -207,9 +207,9 @@
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*":
-  version "13.5.3"
+  version "13.7.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.3.tgz#37f1f539b7535b9fb4ef77d59db1847a837b7f17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
-  integrity sha512-ZPnWX9PW992w6DUsz3JIXHaSb5v7qmKCVzC3km6SxcDGxk7zmLfYaCJTbktIa5NeywJkkZDhGldKqDIvC5DRrA==
+  integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -747,7 +747,7 @@ chalk@^1.0.0:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1692,13 +1692,6 @@ figures@^1.3.5:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -2317,14 +2310,12 @@ https-proxy-agent@^4.0.0:
     agent-base "5"
     debug "4"
 
-hugo-extended@0.63.2:
+"hugo-extended@git+https://github.com/jakejarvis/hugo-extended.git#master":
   version "0.63.2"
-  resolved "https://registry.yarnpkg.com/hugo-extended/-/hugo-extended-0.63.2.tgz#5b0c7f622038445fb439037b59ba59208255cfdb"
+  resolved "git+https://github.com/jakejarvis/hugo-extended.git#32b8bb651270c3875f75160ef8fa375b2951aac9"
-  integrity sha512-xR4A0lPMa12ygApCkXryMUd5ZTfDMyfRmhGbVkB5o8F23BkTeFxrL5X3FTW/tAs12kj+dNedN7EG+uvK5lUZiw==
   dependencies:
     bin-wrapper "^4.1.0"
     rimraf "^3.0.1"
-    signale "^1.4.0"
 
 ieee754@^1.1.4:
   version "1.1.13"
@@ -4110,14 +4101,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-conf@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058"
-  integrity sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=
-  dependencies:
-    find-up "^2.0.0"
-    load-json-file "^4.0.0"
-
 plur@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/plur/-/plur-3.1.1.tgz#60267967866a8d811504fe58f2faaba237546a5b"
@@ -4832,15 +4815,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-signale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/signale/-/signale-1.4.0.tgz#c4be58302fb0262ac00fc3d886a7c113759042f1"
-  integrity sha512-iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==
-  dependencies:
-    chalk "^2.3.2"
-    figures "^2.0.0"
-    pkg-conf "^2.1.0"
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"