treefmt: fix config, add prettier-plugin-go-template

2024-10-17 17:41:01 +02:00 · 2024-10-17 17:41:01 +02:00 · 9e8f680c52
commit 9e8f680c52
parent 6ccec6f792
10 changed files with 137 additions and 85 deletions
--- a/layouts/_default/home.html
+++ b/layouts/_default/home.html
@ -1,14 +1,19 @@
-{{ define "main" }} {{ .Content }} {{ $pages := .Paginate (where
-.Site.RegularPages "Type" "ne" "page") }} {{ range $pages.Pages }}
-<a href="{{ .RelPermalink }}" style="display: block">
-  <div class="list">
-    {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} {{
-    $dateHuman := .Date | time.Format "2006-01-02" }}
-    <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
+{{ define "main" }}
+  {{ .Content }}
+  {{ $pages := .Paginate (where
+    .Site.RegularPages "Type" "ne" "page")
+  }}
+  {{ range $pages.Pages }}
+    <a href="{{ .RelPermalink }}" style="display: block">
+      <div class="list">
+        {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
+        {{ $dateHuman := .Date | time.Format "2006-01-02" }}
+        <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>

-    <h2>{{ .Title }}</h2>
+        <h2>{{ .Title }}</h2>

-    <p class="lead">{{ .Description }}</p>
-  </div>
-</a>
-{{ end }} {{ end }}
+        <p class="lead">{{ .Description }}</p>
+      </div>
+    </a>
+  {{ end }}
+{{ end }}
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -1,13 +1,16 @@
-{{ define "main" }} {{ .Content }} {{ range .Pages }}
-<a href="{{ .RelPermalink }}" style="display: block">
-  <div class="list">
-    {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} {{
-    $dateHuman := .Date | time.Format "2006-01-02" }}
-    <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
+{{ define "main" }}
+  {{ .Content }}
+  {{ range .Pages }}
+    <a href="{{ .RelPermalink }}" style="display: block">
+      <div class="list">
+        {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
+        {{ $dateHuman := .Date | time.Format "2006-01-02" }}
+        <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>

-    <h2>{{ .Title }}</h2>
+        <h2>{{ .Title }}</h2>

-    <p class="lead">{{ .Description }}</p>
-  </div>
-</a>
-{{ end }} {{ end }}
+        <p class="lead">{{ .Description }}</p>
+      </div>
+    </a>
+  {{ end }}
+{{ end }}
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -1,14 +1,15 @@
 {{ define "main" }}
-<article>
-  {{ $dateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }} {{
-  $dateHuman := .Lastmod | time.Format "2006-01-02" }}
-  <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
-  <br />
+  <article>
+    {{ $dateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }}
+    {{ $dateHuman := .Lastmod | time.Format "2006-01-02" }}
+    <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
+    <br />

-  <h1>{{ .Title }}</h1>
+    <h1>{{ .Title }}</h1>

-  <p class="lead">{{ .Description }}</p>
+    <p class="lead">{{ .Description }}</p>

-  {{ .Content }}
-</article>
-{{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} {{ end }}
+    {{ .Content }}
+  </article>
+  {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
+{{ end }}
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@ -5,10 +5,18 @@
 <meta name="author" content="Jan Kremer" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <title>
-  {{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s – %s" .Title
-  site.Title }}{{ end }}
+  {{ if .IsHome }}
+    {{ site.Title }}
+  {{ else }}
+    {{ printf "%s – %s" .Title
+      site.Title
+    }}
+  {{ end }}
 </title>
-{{ partialCached "head/css.html" . }} {{ partialCached "head/js.html" . }} {{
-partial "head/analytics.html" . }} {{ with .OutputFormats.Get "rss" -}} {{
-printf `<link rel="%q" type="%q" href="%q" title="%q" />` .Rel .MediaType.Type
-.Permalink site.Title | safeHTML }} {{ end }}
+{{ partialCached "head/css.html" . }} {{ partialCached "head/js.html" . }}
+{{ partial "head/analytics.html" . }}
+{{ with .OutputFormats.Get "rss" -}}
+  {{ printf `<link rel="%q" type="%q" href="%q" title="%q" />` .Rel .MediaType.Type
+    .Permalink site.Title | safeHTML
+  }}
+{{ end }}
--- a/layouts/partials/head/analytics.html
+++ b/layouts/partials/head/analytics.html
@ -1,7 +1,7 @@
 {{ if hugo.IsProduction }}
-<script
-  data-goatcounter="https://jankremer.goatcounter.com/count"
-  async
-  src="//gc.zgo.at/count.js"
-></script>
+  <script
+    data-goatcounter="https://jankremer.goatcounter.com/count"
+    async
+    src="//gc.zgo.at/count.js"
+  ></script>
 {{ end }}
--- a/layouts/partials/head/css.html
+++ b/layouts/partials/head/css.html
@ -1,11 +1,16 @@
-{{- with resources.Get "css/main.css" }} {{- if eq hugo.Environment
-"development" }}
-<link rel="stylesheet" href="{{ .RelPermalink }}" />
-{{- else }} {{- with . | minify | fingerprint }}
-<link
-  rel="stylesheet"
-  href="{{ .RelPermalink }}"
-  integrity="{{ .Data.Integrity }}"
-  crossorigin="anonymous"
-/>
-{{- end }} {{- end }} {{- end }}
+{{- with resources.Get "css/main.css" }}
+  {{- if eq hugo.Environment
+    "development"
+  }}
+    <link rel="stylesheet" href="{{ .RelPermalink }}" />
+  {{- else }}
+    {{- with . | minify | fingerprint }}
+      <link
+        rel="stylesheet"
+        href="{{ .RelPermalink }}"
+        integrity="{{ .Data.Integrity }}"
+        crossorigin="anonymous"
+      />
+    {{- end }}
+  {{- end }}
+{{- end }}
--- a/layouts/partials/head/js.html
+++ b/layouts/partials/head/js.html
@ -1,11 +1,18 @@
-{{- with resources.Get "js/main.js" }} {{- if eq hugo.Environment "development"
-}} {{- with . | js.Build }}
-<script src="{{ .RelPermalink }}"></script>
-{{- end }} {{- else }} {{- $opts := dict "minify" true }} {{- with . | js.Build
-$opts | fingerprint }}
-<script
-  src="{{ .RelPermalink }}"
-  integrity="{{- .Data.Integrity }}"
-  crossorigin="anonymous"
-></script>
-{{- end }} {{- end }} {{- end }}
+{{- with resources.Get "js/main.js" }}
+  {{- if eq hugo.Environment "development" }}
+    {{- with . | js.Build }}
+      <script src="{{ .RelPermalink }}"></script>
+    {{- end }}
+  {{- else }}
+    {{- $opts := dict "minify" true }}
+    {{- with . | js.Build
+      $opts | fingerprint
+    }}
+      <script
+        src="{{ .RelPermalink }}"
+        integrity="{{- .Data.Integrity }}"
+        crossorigin="anonymous"
+      ></script>
+    {{- end }}
+  {{- end }}
+{{- end }}
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@ -1,12 +1,12 @@
 {{- /*
-Renders a menu for the given menu ID.
+  Renders a menu for the given menu ID.

-@context {page} page The current page.
-@context {string} menuID The menu ID.
+  @context {page} page The current page.
+  @context {string} menuID The menu ID.

-@example: {{ partial "menu.html" (dict "menuID" "main" "page" .) }}
+  @example: {{ partial "menu.html" (dict "menuID" "main" "page" .)
+}}
 */}}
-
 {{- $page := .page }}
 {{- $menuID := .menuID }}

@ -24,7 +24,7 @@ Renders a menu for the given menu ID.
    {{- $attrs := dict "href" .URL }}
    {{- if $page.IsMenuCurrent .Menu . }}
      {{- $attrs = merge $attrs (dict "class" "active" "aria-current" "page") }}
-    {{- else if $page.HasMenuCurrent .Menu .}}
+    {{- else if $page.HasMenuCurrent .Menu . }}
      {{- $attrs = merge $attrs (dict "class" "ancestor" "aria-current" "true") }}
    {{- end }}
    {{- $name := .Name }}
@ -40,7 +40,8 @@ Renders a menu for the given menu ID.
            {{- printf " %s=%q" $k $v | safeHTMLAttr }}
          {{- end }}
        {{- end -}}
-      >{{ $name }}</a>
+        >{{ $name }}</a
+      >
      {{- with .Children }}
        <ul>
          {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
--- a/layouts/partials/terms.html
+++ b/layouts/partials/terms.html
@ -1,13 +1,17 @@
 {{- /* For a given taxonomy, renders a list of terms assigned to the page.
-@context {page} page The current page. @context {string} taxonomy The taxonony.
-@example: {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} */}} {{-
-$page := .page }} {{- $taxonomy := .taxonomy }} {{- with $page.GetTerms
-$taxonomy }} {{- $label := (index . 0).Parent.LinkTitle }}
-<div class="tags">
-  <ul>
-    {{- range . }}
-    <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
-    {{- end }}
-  </ul>
-</div>
+  @context {page} page The current page. @context {string} taxonomy The taxonony.
+  @example: {{ partial "terms.html" (dict "taxonomy" "tags" "page" .)
+}}
+*/}} {{- $page := .page }} {{- $taxonomy := .taxonomy }}
+{{- with $page.GetTerms
+  $taxonomy
+}}
+  {{- $label := (index . 0).Parent.LinkTitle }}
+  <div class="tags">
+    <ul>
+      {{- range . }}
+        <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+      {{- end }}
+    </ul>
+  </div>
 {{- end }}
--- a/treefmt.nix
+++ b/treefmt.nix
@ -1,9 +1,27 @@
+{ pkgs, ... }:
 {
  projectRootFile = "flake.nix";
  programs = {
    nixfmt.enable = true;
    gofmt.enable = true;
    taplo.enable = true;
-    prettier.enable = true;
+    prettier = {
+      enable = true;
+      settings = {
+        plugins = [
+          "${pkgs.prettier-plugin-go-template}/lib/node_modules/prettier-plugin-go-template/lib/index.js"
+        ];
+        overrides = [
+          {
+            files = [ "*.html" ];
+            options.parser = "go-template";
+          }
+        ];
+      };
+    };
  };
+  settings.global.excludes = [
+    "public/**"
+    "static/**"
+  ];
 }