feat: render page content once — serve bodies from cached .Content (render-once D8)

data/structures/button.yml

@@ -2,6 +2,8 @@ comment: >-
   Display a button with a hyperlink.
 icon: touch_app
 arguments:
+  page:
+    optional: true
   title:
     preview: true
   class:

data/structures/card-icon.yml

@@ -2,6 +2,8 @@ comment: >-
   Renders a card icon including optional rounding.
 group: partial
 arguments:
+  page:
+    optional: true
   icon:
   padding:
   icon-rounded:

exampleSite/config/_default/hugo.toml

@@ -13,9 +13,14 @@ enableInlineShortcodes = true
 # prevent build failures when using Hugo's Instagram shortcode due to deprecated Instagram API.
 # See https://github.com/gohugoio/hugo/issues/7228#issuecomment-714490456
 # the transitional 'warn-missing-page-argument' entry suppresses the fallback warning raised by
-# mod-blocks <= v2.1.4, which calls the section-title / image partials without a page argument;
-# remove it once the exampleSite picks up the mod-blocks release that threads the page explicitly.
+# mod-blocks <= v2.2.0, which still calls the section-title / image partials without a page
+# argument in several components (hero, faq, testimonials, preview, and others); remove it once
+# the exampleSite picks up a mod-blocks release that threads the page into every call.
 ignoreErrors = ["error-remote-getjson", "warn-preview-restricted", "warn-missing-page-argument"]
+# the site's content uses HTML comments (markdownlint directives); with Goldmark's unsafe
+# rendering disabled these trigger 'warning-goldmark-raw-html' and render as harmless
+# '<!-- raw HTML omitted -->' placeholders, which the minifier strips from production output.
+ignoreLogs = ['warning-goldmark-raw-html']
 timeout = "180s"
 
 languageCode = "en-us"

exampleSite/config/_default/params.toml

@@ -79,7 +79,6 @@
 [debugging]
     showJS = false
     showSCSS = false
-    purgeHTMLComments = true # prevents a Goldmark warning when processing HTML comments (as used by markdownlint)
     includeSVGOrigin = true
 
 [docs]

exampleSite/go.mod

@@ -3,11 +3,9 @@ module github.com/gethinode/hinode-example
 go 1.19
 
 require (
-	github.com/FortAwesome/Font-Awesome v0.0.0-20260625220317-70fb2dd154b6 // indirect
 	github.com/cloudcannon/bookshop/hugo/v3 v3.18.5 // indirect
 	github.com/gethinode/mod-bootstrap-icons/v2 v2.0.1 // indirect
 	github.com/gethinode/mod-cookieyes/v2 v2.2.6 // indirect
 	github.com/gethinode/mod-docs v1.15.2 // indirect
-	github.com/gethinode/mod-fontawesome/v6 v6.0.2 // indirect
 	github.com/twbs/icons v1.13.1 // indirect
 )

exampleSite/go.sum

@@ -1,5 +1,3 @@
-github.com/FortAwesome/Font-Awesome v0.0.0-20260625220317-70fb2dd154b6 h1:slcJCZg0UQMHqw5JCoVmE8/IJfoNUprTmP2T3lDG9VY=
-github.com/FortAwesome/Font-Awesome v0.0.0-20260625220317-70fb2dd154b6/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/cloudcannon/bookshop/hugo/v3 v3.18.5 h1:AKWzUQpWcBSbJgHQ/5cfPQtGX40bn8vbHBGk4rlHEGE=
 github.com/cloudcannon/bookshop/hugo/v3 v3.18.5/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
 github.com/gethinode/mod-bootstrap-icons/v2 v2.0.1 h1:shq4Gb48U3h9xYUpq+FSHWz/eu1azJ5bMkja6wPmCpM=
@@ -8,7 +6,5 @@ github.com/gethinode/mod-cookieyes/v2 v2.2.6 h1:/DQm8OYpms0On8wuosQER47TplVu/3z7
 github.com/gethinode/mod-cookieyes/v2 v2.2.6/go.mod h1:tULb7D7CoTycGUyL7ryqHJKaX11XuL2SN+XwP7/DI0Y=
 github.com/gethinode/mod-docs v1.15.2 h1:ZuOO/M5KyuUNGEoId+rManHG/L3WBboXG9L/ikSPNrY=
 github.com/gethinode/mod-docs v1.15.2/go.mod h1:ru1w0fHqFocjDIMV0dm40OwhBw5k4UncCS8iO/1S5kI=
-github.com/gethinode/mod-fontawesome/v6 v6.0.2 h1:MxaHU7MZIh4pgxtoR6C/F0qiB5eSiySmRpTw9DGIOVs=
-github.com/gethinode/mod-fontawesome/v6 v6.0.2/go.mod h1:Zy+hjVhFDU52nkTIn9btbZ1PWy2n203zKHiPG9RVSL0=
 github.com/twbs/icons v1.13.1 h1:6bmNXvoeIbvjFWjfbjXg5JGbelLD1haIsMaEIzE9UZI=
 github.com/twbs/icons v1.13.1/go.mod h1:GnRlymgVWp5iVJCMa0Me5b6tFyGpVc2bSxPMRGIJmyA=

exampleSite/hinode.work.sum

@@ -17,3 +17,4 @@ github.com/gethinode/mod-fontawesome/v3 v3.1.3/go.mod h1:+E6jSVNv7h6oXw4Wm1XRq8H
 github.com/gethinode/mod-utils/v4 v4.12.0 h1:5sSfYIxZCeQbXLoZdS//rl6thwLwtXuvM0ujaWKyPmc=
 github.com/gethinode/mod-utils/v4 v4.12.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/gethinode/mod-utils/v6 v6.5.0/go.mod h1:E5tO9w3VKaidJpu1nI8zAKmh0bddFHOIIQnudAaXQTs=
+github.com/gethinode/mod-utils/v6 v6.5.1/go.mod h1:E5tO9w3VKaidJpu1nI8zAKmh0bddFHOIIQnudAaXQTs=

exampleSite/hugo_stats.json

@@ -902,7 +902,6 @@
       "bi-chevron-left",
       "bi-chevron-right",
       "bi-display",
-      "bi-download",
       "bi-exclamation",
       "bi-exclamation-triangle",
       "bi-facebook",
@@ -1080,7 +1079,6 @@
       "examples",
       "external-link",
       "fa-address-card",
-      "fa-paper-plane",
       "fab-bootstrap",
       "fab-facebook",
       "fab-github",

go.mod

@@ -3,18 +3,18 @@ module github.com/gethinode/hinode/v3
 go 1.19
 
 require (
-	github.com/FortAwesome/Font-Awesome v0.0.0-20260625220317-70fb2dd154b6 // indirect
+	github.com/FortAwesome/Font-Awesome v0.0.0-20260715180930-14c65a3747d0 // indirect
 	github.com/airbnb/lottie-web v5.13.0+incompatible // indirect
-	github.com/gethinode/mod-blocks/v2 v2.2.0 // indirect
+	github.com/gethinode/mod-blocks/v2 v2.2.2 // indirect
 	github.com/gethinode/mod-bootstrap v1.3.7 // indirect
 	github.com/gethinode/mod-csp v1.0.12 // indirect
 	github.com/gethinode/mod-flexsearch/v5 v5.0.2 // indirect
-	github.com/gethinode/mod-fontawesome/v6 v6.0.2 // indirect
+	github.com/gethinode/mod-fontawesome/v6 v6.1.1 // indirect
 	github.com/gethinode/mod-google-analytics/v2 v2.0.4 // indirect
 	github.com/gethinode/mod-katex v1.1.6 // indirect
 	github.com/gethinode/mod-leaflet/v3 v3.1.1 // indirect
 	github.com/gethinode/mod-lottie/v3 v3.0.2 // indirect
-	github.com/gethinode/mod-mermaid/v5 v5.0.1 // indirect
+	github.com/gethinode/mod-mermaid/v5 v5.0.2 // indirect
 	github.com/gethinode/mod-simple-datatables/v4 v4.1.0 // indirect
 	github.com/gethinode/mod-utils/v6 v6.6.0 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20260529083235-f7ed963096a0 // indirect

go.sum

@@ -1,9 +1,13 @@
 github.com/FortAwesome/Font-Awesome v0.0.0-20260625220317-70fb2dd154b6 h1:slcJCZg0UQMHqw5JCoVmE8/IJfoNUprTmP2T3lDG9VY=
 github.com/FortAwesome/Font-Awesome v0.0.0-20260625220317-70fb2dd154b6/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/FortAwesome/Font-Awesome v0.0.0-20260715180930-14c65a3747d0 h1:4+bB2ojsMTsQroHtQr1FWy2gxFzpBn5hISldeRfxF+o=
+github.com/FortAwesome/Font-Awesome v0.0.0-20260715180930-14c65a3747d0/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/airbnb/lottie-web v5.13.0+incompatible h1:plBV5Uq/F1kK0EC61Hr0cBGReI9OgUfd/pp0baoDX8o=
 github.com/airbnb/lottie-web v5.13.0+incompatible/go.mod h1:nTss557UK9FGnp8QYlCMO29tjUHwbdAHG/DprbGfHGE=
 github.com/gethinode/mod-blocks/v2 v2.2.0 h1:sIRH7R7MYvqVECByJEuopVgzUCOa+iOEYOFCIouo5A0=
 github.com/gethinode/mod-blocks/v2 v2.2.0/go.mod h1:z+0Rg+I0naJf7VOy9dDuo8FX1dB5bPuMmbWT1QmBFhg=
+github.com/gethinode/mod-blocks/v2 v2.2.2 h1:8CZkdenBGUQ2O6zMdlD+UHG5cjCOVxIG0UfBagSFWog=
+github.com/gethinode/mod-blocks/v2 v2.2.2/go.mod h1:Kt8QjKpgozmxGj0dX20f0i8ZdBVaO1jw+tbZwJUl7yE=
 github.com/gethinode/mod-bootstrap v1.3.7 h1:rbjOg//q7dbsM+TkDQLsyk9LKv93D1RUjtcSkvV55UU=
 github.com/gethinode/mod-bootstrap v1.3.7/go.mod h1:CxrYCFzKtBMz3YWG5i/d5jHKCgvUo60NFcCmz2mxCjQ=
 github.com/gethinode/mod-csp v1.0.12 h1:6CaIH3IBn92lcwMFdYPmmWsPKq+VZ6n9Po8FI26jLJc=
@@ -12,6 +16,8 @@ github.com/gethinode/mod-flexsearch/v5 v5.0.2 h1:VAHzYLJECrVBvzn5xvM+FoHSP2VwDDP
 github.com/gethinode/mod-flexsearch/v5 v5.0.2/go.mod h1:0kRR1xaAhSYVyVICV5+x5bF8OSpfre1DwLdrK3a5uAA=
 github.com/gethinode/mod-fontawesome/v6 v6.0.2 h1:MxaHU7MZIh4pgxtoR6C/F0qiB5eSiySmRpTw9DGIOVs=
 github.com/gethinode/mod-fontawesome/v6 v6.0.2/go.mod h1:Zy+hjVhFDU52nkTIn9btbZ1PWy2n203zKHiPG9RVSL0=
+github.com/gethinode/mod-fontawesome/v6 v6.1.1 h1:k5Jy7nA+YfLZ9YqXH8hyaiw9wjAeOxNEUcnu6fynnJo=
+github.com/gethinode/mod-fontawesome/v6 v6.1.1/go.mod h1:875OBk5te+KBJmr0PdSkFcduYnsKCuHWfcaqChh9NGo=
 github.com/gethinode/mod-google-analytics/v2 v2.0.4 h1:ONEUjhfVR6p+Y/XyU3BUGXZy4+HAkJvGo+mr24ugklY=
 github.com/gethinode/mod-google-analytics/v2 v2.0.4/go.mod h1:y4ZlacA8FSXjmvn9P8cZshOrBB5Wc+3p0DKSehkk+8E=
 github.com/gethinode/mod-katex v1.1.6 h1:mow61stEySb5mH5tUp1l69l2FrLWl+jh46JVT5lMOSA=
@@ -22,6 +28,8 @@ github.com/gethinode/mod-lottie/v3 v3.0.2 h1:PJ9BB5s+oli2D5i9apcWu8AowtfyNVb7VAc
 github.com/gethinode/mod-lottie/v3 v3.0.2/go.mod h1:QnNRtZPSwl6x7acJbR4jHNhNNRxbwVv0XsnD1hFcsro=
 github.com/gethinode/mod-mermaid/v5 v5.0.1 h1:heGJ9i3rDXAh+qU8N0jSEPhVGOsQwxLpNmB+h1FhTg8=
 github.com/gethinode/mod-mermaid/v5 v5.0.1/go.mod h1:3M0XrI6Ginj5EIbXy1xOymv3KsfPuBhD07FEPz1SikI=
+github.com/gethinode/mod-mermaid/v5 v5.0.2 h1:OmpgjPcSlm7lXpcRDKkZbzklG/3a9QurrqsdkGMDdGQ=
+github.com/gethinode/mod-mermaid/v5 v5.0.2/go.mod h1:rrCnPe+gLH83GpMm5uA/SeapZcNBj65jcJVLyXtsXPU=
 github.com/gethinode/mod-simple-datatables/v4 v4.1.0 h1:AtEtLH9RoAEIpElg0k6UkVlHmiBc4Df3NCCUfBtmktU=
 github.com/gethinode/mod-simple-datatables/v4 v4.1.0/go.mod h1:jRHoX20bUiaVg7UtKzMjfHQjd5M6WZ8hAeVqA3TKwTA=
 github.com/gethinode/mod-utils/v6 v6.6.0 h1:b+xpvPUqDKcQr1LUU4YKqtr7zIpzZ7zxCrlpLtlyr5Y=

layouts/404.html

@@ -5,7 +5,7 @@
         <div class="container-xxl my-auto h-100">
             <div class="col-12 col-sm-8 col-md-6 text-center mx-auto">
                 <span class="text-secondary fw-bold">
-                    {{ partial "assets/icon.html" (dict "icon" $notFoundPage "class" "fa-10x") }}
+                    {{ partial "assets/icon.html" (dict "page" . "icon" $notFoundPage "class" "fa-10x") }}
                     <p class="display-1 mt-3 fw-bold">404</p>
                     <p class="fs-3">{{ T "pageNotFoundTitle" }}</p>
                 </span>

layouts/_markup/render-blockquote.html

@@ -17,7 +17,7 @@
     <blockquote class="blockquote-alert blockquote-alert-{{ $alert }}">
         <p class="blockquote-alert-heading">
             {{ with $icon }} 
-                {{ partial "assets/icon.html" (dict "icon" . "class" "fa-fw") }}
+                {{ partial "assets/icon.html" (dict "page" $.Page "icon" . "class" "fa-fw") }}
                 {{ or (i18n $alert) (title $alert) }}
             {{ else }}
                 {{ title $alert }}

layouts/_markup/render-heading.html

@@ -29,7 +29,7 @@
 <h{{ .Level }} id="{{ $anchor | safeURL }}" class="{{ $classAttr }}">
     {{- $text | safeHTML -}}
     <a href="#{{ $anchor | safeURL }}" aria-labelledby="{{ $anchor | safeURL }}">
-        {{- partial "assets/icon.html" (dict "icon" $headingAnchor "class" "anchor") }}
+        {{- partial "assets/icon.html" (dict "page" .Page "icon" $headingAnchor "class" "anchor") }}
     </a>
 </h{{ .Level }}>
 {{ else }}

layouts/_partials/assets/breadcrumb.html

@@ -54,7 +54,7 @@
                 {{ $item := index $items (sub $length 1) }}
                 <li class="breadcrumb-item">
                     <a href="{{ $item.address }}">
-                        {{ partial "assets/icon.html" (dict "icon" $breadcrumbBack) }}&nbsp;{{ partial "inline/short-title" $item.title }}
+                        {{ partial "assets/icon.html" (dict "page" $args.page "icon" $breadcrumbBack) }}&nbsp;{{ partial "inline/short-title" $item.title }}
                     </a>
                 </li>
             {{- end -}}

layouts/_partials/assets/button.html

@@ -68,7 +68,7 @@
     {{- end -}}
 
     {{- if and $title $cue -}}
-        {{ $suffix := partial "assets/icon.html" (dict "icon" $externalLink "class" "fa-2xs") }}
+        {{ $suffix := partial "assets/icon.html" (dict "page" $args.page "icon" $externalLink "class" "fa-2xs") }}
         {{- $title = printf "%s %s" $title $suffix | safeHTML -}}
     {{- end -}}
 {{- end -}}
@@ -105,7 +105,7 @@
             <span class="my-auto">{{ $title | safeHTML }}</span>
             {{- with $args.icon }}
                 <span class="align-self-center{{ if $title }}{{ if eq $args.order "first" }} order-first pe-1{{ else }} ps-1{{ end }}{{ end }}">
-                    {{ partial "assets/icon.html" (dict "icon" $args.icon "class" ($args.iconClass | default "") "spacing" false) }}
+                    {{ partial "assets/icon.html" (dict "page" $args.page "icon" $args.icon "class" ($args.iconClass | default "") "spacing" false) }}
                 </span>
             {{ end }}
         </span>

layouts/_partials/assets/card-group.html

@@ -203,7 +203,8 @@
                 {{- $href = printf "%s/" $href -}}
             {{- end -}}
             <div class="mt-{{ $padding.y }} w-100 align-self-start">
-                {{ partial "assets/button.html" (dict 
+                {{ partial "assets/button.html" (dict
+                    "page"      $args.page
                     "href"      $href
                     "title"     $args.hrefTitle
                     "color"     "primary"

layouts/_partials/assets/card-icon.html

@@ -26,10 +26,10 @@
     {{ $args.class }}"
     >
         {{ if $args.iconRounded }}
-            {{- partial "assets/icon.html" (dict "icon" "fas circle" "class" "fa-stack-2x" "spacing" false) -}}
-            {{- partial "assets/icon.html" (dict "icon" $args.icon "class" "fa-stack-1x fa-inverse" "spacing" false) -}}
+            {{- partial "assets/icon.html" (dict "page" $args.page "icon" "fas circle" "class" "fa-stack-2x" "spacing" false) -}}
+            {{- partial "assets/icon.html" (dict "page" $args.page "icon" $args.icon "class" "fa-stack-1x fa-inverse" "spacing" false) -}}
         {{ else }}
-            {{- partial "assets/icon.html" (dict "icon" $args.icon "class" (trim (printf "%s fa-fw" (or $args.iconStyle "")) " ") "spacing" false) -}}
+            {{- partial "assets/icon.html" (dict "page" $args.page "icon" $args.icon "class" (trim (printf "%s fa-fw" (or $args.iconStyle "")) " ") "spacing" false) -}}
         {{ end }}
     </div>
 {{ end }}

layouts/_partials/assets/card.html

@@ -8,10 +8,12 @@
 
 {{- define "_partials/inline/card-icons.html" -}}
     {{ $links := .links }}
-
+    {{ $page := .page }}
+
     <span class="text-body-secondary">
         {{- range $index, $item := $links -}}
-            {{ partial "assets/button.html" (dict 
+            {{ partial "assets/button.html" (dict
+                "page"       $page
                 "href"       $item.url
                 "icon"       ($item.icon | default "")
                 "icon-class" "fa-fw"
@@ -26,6 +28,7 @@
 {{/* Inline partial to render the card's body */}}
 {{- define "_partials/inline/card-body.html" -}}
     {{- $page := .page -}}
+    {{- $owner := .owner -}}
     {{- $title := .title -}}
     {{- $href := .href -}}
     {{- $color := .color -}}
@@ -40,8 +43,8 @@
             {{ if or $title $links }}
                 <p class="card-title {{ $fs }}">
                     {{- with $title }}{{ . | $page.RenderString }}{{ end }}
-                    {{ with $links }}{{ partial "inline/card-icons.html" (dict "links" .) }}{{ end -}}
-                    {{- with $linkIcon -}}<span class="card-link-icon">{{- partial "assets/icon.html" (dict "icon" . "spacing" false) -}}</span>{{- end -}}
+                    {{ with $links }}{{ partial "inline/card-icons.html" (dict "links" . "page" $owner) }}{{ end -}}
+                    {{- with $linkIcon -}}<span class="card-link-icon">{{- partial "assets/icon.html" (dict "page" $owner "icon" . "spacing" false) -}}</span>{{- end -}}
                 </p>
             {{ end -}}
             {{ with $description }}
@@ -55,7 +58,7 @@
             {{ if or $title $links }}
                 <p class="card-title {{ $fs }}">
                     {{- with $title }}{{ . | $page.RenderString }}{{ end }}
-                    {{ with $links }}{{ partial "inline/card-icons.html" (dict "links" .) }}{{ end -}}
+                    {{ with $links }}{{ partial "inline/card-icons.html" (dict "links" . "page" $owner) }}{{ end -}}
                 </p>
             {{ end -}}
             {{ with $description }}<div class="card-text">{{ . | safeHTML }}</div>{{ end -}}
@@ -245,6 +248,7 @@
                 <div class="card-body {{ $padding }} h-100 hstack">
                     {{ if $icon }}
                         {{- partial "assets/card-icon.html" (dict
+                            "page"         $args.page
                             "icon"         $icon
                             "padding"      0
                             "icon-rounded" $args.iconRounded
@@ -263,6 +267,7 @@
                         {{ end }}
                         {{- partial "inline/card-body.html" (dict
                             "page"        $renderPage
+                            "owner"       $args.page
                             "title"       (cond $minimal "" $title)
                             "href"        $href
                             "color"       $args.color
@@ -285,7 +290,8 @@
                             {{ $buttonType := (or $args.linkType $args.buttonType) }}
                             {{ if eq $buttonType "link" }}{{ $buttonClass = "card-button card-button-link mb-n4" }}{{ end }}
                             <div class="d-flex align-items-end">
-                                {{ partial "assets/button.html" (dict 
+                                {{ partial "assets/button.html" (dict
+                                    "page"        $args.page
                                     "title"       $label
                                     "icon"        $cardReadMore
                                     "href"        $href
@@ -313,6 +319,7 @@
             )) -}}
         {{- else if $icon -}}
             {{- partial "assets/card-icon.html" (dict
+                "page"         $args.page
                 "icon"         $icon
                 "padding"      0
                 "icon-rounded" $args.iconRounded
@@ -326,6 +333,7 @@
             {{ if $page }}{{- partial "inline/card-caption.html" (dict "page" $page "keywords" $args.headerStyle "color" $args.color) -}}{{ end }}
             {{- partial "inline/card-body.html" (dict
                 "page"        $renderPage
+                "owner"       $args.page
                 "title"       (cond $minimal "" $title)
                 "href"        $href
                 "color"       $args.color
@@ -346,7 +354,8 @@
                     {{ $buttonType := (or $args.linkType $args.buttonType) }}
                     {{ if eq $buttonType "link" }}{{ $buttonClass = "card-button card-button-link" }}{{ end }}
                     {{ if ne $args.align "start" }}{{ $buttonClass = printf "%s m%s-auto" $buttonClass (cond (eq $args.align "center") "x" "s") }}{{ end }}
-                    {{ partial "assets/button.html" (dict 
+                    {{ partial "assets/button.html" (dict
+                        "page"        $args.page
                         "title"       $label
                         "href"        $href
                         "outline"     true

layouts/_partials/assets/download.html

@@ -59,7 +59,8 @@
         {{ end }}
     {{ end }}
     {{ $attr := dict "download" (path.Base $download) }}
-    {{ partial "assets/button.html" (dict 
+    {{ partial "assets/button.html" (dict
+        "page"        $args.page
         "href"        $download
         "title"       $title
         "color"       $args.color

layouts/_partials/assets/featured-illustration.html

@@ -40,7 +40,7 @@
             ) -}}
         {{- end -}}
     {{- else }}
-        {{ partial "assets/icon.html" (dict "icon" $icon "class" $class "wrapper" $wrapper "spacing" false) -}}
+        {{ partial "assets/icon.html" (dict "page" $args.page "icon" $icon "class" $class "wrapper" $wrapper "spacing" false) -}}
     {{- end -}}
 {{- else if $image -}}
     {{- if not (hasSuffix $image "svg") }}{{ $class = strings.TrimSpace (printf "%s rounded" (or $class "")) }}{{ end -}}