Merge pull request #1494 from nunocoracao/dev

🔖 v2.69.0
nunocoracao · May 31, 2024 · 976e6d1 · 976e6d1
2 parents c03744b + d20c8f1
commit 976e6d1
Show file tree

Hide file tree

Showing 38 changed files with 89 additions and 86 deletions.
diff --git a/config.toml b/config.toml
@@ -2,4 +2,4 @@
 [module.hugoVersion]
 extended = true
 min = "0.87.0"
-max = "0.126.1"
+max = "0.126.2"
diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml
@@ -15,6 +15,8 @@ summaryLength = 0
 buildDrafts = false
 buildFuture = false
 
+enableEmoji = true
+
 # googleAnalytics = "G-XXXXXXXXX"
 
 [imaging]

diff --git a/exampleSite/config/_default/hugo.toml b/exampleSite/config/_default/hugo.toml
@@ -17,6 +17,7 @@ hasCJKLanguage = true
 buildDrafts = false
 buildFuture = false
 
+enableEmoji = true
 
 googleAnalytics = "G-PEDMYR1V0K"
 

diff --git a/exampleSite/content/docs/partials/index.md b/exampleSite/content/docs/partials/index.md
@@ -11,7 +11,7 @@ series_order: 9
 
 ## Analytics
 
-Blowfish provides built-in support for Fathom Analytics, Google Analytics annd Umami Analytics. Fathom is a paid alternative to Google Analytics that respects user privacy.
+Blowfish provides built-in support for Fathom Analytics, Google Analytics and Umami Analytics. Fathom is a paid alternative to Google Analytics that respects user privacy.
 
 ### Fathom Analytics
 

diff --git a/exampleSite/layouts/partials/recent-articles-demo.html b/exampleSite/layouts/partials/recent-articles-demo.html
@@ -37,7 +37,7 @@ <h2 class="mt-8 text-2xl font-extrabold mb-10">{{ i18n "shortcode.recent_article
     <a href="{{ $showMoreLinkDest }}">
         <button
             class="bg-transparent hover:text-primary-500 prose dark:prose-invert font-semibold hover:text-white py-2 px-4 border border-primary-500 hover:border-transparent rounded">
-            {{ i18n "recent.show_more" | markdownify | emojify }}
+            {{ i18n "recent.show_more" | markdownify }}
             </button>
     </a>
 </div>

diff --git a/layouts/_default/index.json b/layouts/_default/index.json
@@ -9,11 +9,11 @@
     "date" (.Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long")) 
     "title" (.Title | emojify | safeJS)
     "section" ($section.Title | emojify | safeJS)
-    "summary" (.Summary | emojify | safeJS)
-    "content" (.Plain | emojify | safeJS)
+    "summary" (.Summary | safeJS)
+    "content" (.Plain | safeJS)
     "permalink" .RelPermalink
     "externalUrl" .Params.externalUrl
     "type" .Type
   ) -}}
 {{- end -}}
-{{- $index | jsonify -}}
+{{- $index | jsonify -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -49,7 +49,7 @@ <h1 class="mt-5 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .
     </div>
     {{ end }}
     <div class="min-w-0 min-h-0 max-w-prose">
-      {{ .Content | emojify }}
+      {{ .Content }}
     </div>
 
 

diff --git a/layouts/_default/simple.html b/layouts/_default/simple.html
@@ -9,7 +9,7 @@ <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">
       </h1>
     </header>
     <section class="max-w-full mt-6 prose dark:prose-invert">
-      {{ .Content | emojify }}
+      {{ .Content }}
     </section>
     <footer class="pt-8">
       {{ partial "sharing-links.html" . }}

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -80,7 +80,7 @@ <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">
         {{ partial "series/series.html" . }}
 
         <div class="article-content max-w-prose mb-20">
-          {{ .Content | emojify }}
+          {{ .Content }}
         </div>
 
         {{ if (.Params.showAuthorBottom | default ( .Site.Params.article.showAuthorBottom | default false)) }}
@@ -147,4 +147,4 @@ <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">
     {{ end }}
   </footer>
 </article>
-{{ end }}
+{{ end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
@@ -25,7 +25,7 @@ <h1 class="mt-5 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .
   {{ if .Content }}
     <section class="flex flex-col max-w-full mt-0 prose dark:prose-invert lg:flex-row">
       <div class="min-w-0 min-h-0 max-w-prose">
-        {{ .Content | emojify }}
+        {{ .Content }}
       </div>
     </section>
   {{ end }}

diff --git a/layouts/_default/term.html b/layouts/_default/term.html
@@ -24,7 +24,7 @@ <h1 class="mt-5 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .
   <section class="flex flex-col max-w-full mt-0 mb-5 prose dark:prose-invert lg:flex-row">
     {{ if .Content }}
     <div class="min-w-0 min-h-0 max-w-prose">
-      {{ .Content | emojify }}
+      {{ .Content }}
     </div>
     {{ end }}
     <script>
@@ -128,4 +128,4 @@ <h2 class="mt-12 mb-3 text-2xl font-bold text-neutral-700 first:mt-8 dark:text-n
 
   {{ partial "pagination.html" . }}
 
-  {{ end }}
+  {{ end }}
diff --git a/layouts/partials/article-link/card-related.html b/layouts/partials/article-link/card-related.html
@@ -65,12 +65,12 @@
 
         {{ if .Params.showSummary | default (.Site.Params.list.showSummary | default false) }}
         <div class="py-1 prose dark:prose-invert">
-          {{ .Summary | emojify }}
+          {{ .Summary }}
         </div>
         {{ end }}
       </div>
       <div class="px-6 pt-4 pb-2">
 
       </div>
     </div>
-  </a>
+  </a>
diff --git a/layouts/partials/article-link/card.html b/layouts/partials/article-link/card.html
@@ -66,12 +66,12 @@
 
         {{ if .Params.showSummary | default (.Site.Params.list.showSummary | default false) }}
         <div class="py-1 prose dark:prose-invert">
-          {{ .Summary | emojify }}
+          {{ .Summary }}
         </div>
         {{ end }}
       </div>
       <div class="px-6 pt-4 pb-2">
 
       </div>
     </div>
-  </a>
+  </a>
diff --git a/layouts/partials/article-link/simple.html b/layouts/partials/article-link/simple.html
@@ -94,8 +94,8 @@
       </div>
       {{ if .Params.showSummary | default (.Site.Params.list.showSummary | default false) }}
       <div class="py-1 max-w-fit prose dark:prose-invert">
-        {{ .Summary | emojify }}
+        {{ .Summary }}
       </div>
       {{ end }}
     </div>
-  </a>
+  </a>
diff --git a/layouts/partials/author-extra.html b/layouts/partials/author-extra.html
@@ -21,13 +21,13 @@
     {{ $link := .link}}
     {{ with .data.name | markdownify | emojify }}
     <div class="text-[0.6rem] uppercase leading-3 text-neutral-500 dark:text-neutral-400">
-      {{ i18n "author.byline_title" | markdownify | emojify }}
+      {{ i18n "author.byline_title" | markdownify }}
     </div>
     <a {{ if $link }} href="{{ $link }}" {{ end }} class="font-semibold leading-6 text-neutral-800 dark:text-neutral-300">
       {{ . }}
     </a>
     {{ end }}
-    {{ with .data.bio | markdownify | emojify }}
+    {{ with .data.bio | markdownify }}
     <div class="text-sm text-neutral-700 dark:text-neutral-400">{{ . }}</div>
     {{ end }}
     <div class="text-2xl sm:text-lg">
@@ -41,4 +41,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>
diff --git a/layouts/partials/author.html b/layouts/partials/author.html
@@ -23,15 +23,15 @@
     {{ end }}
   {{ end }}
   <div class="place-self-center">
-    {{ with .Site.Author.name | markdownify | emojify }}
+    {{ with .Site.Author.name | markdownify }}
     <div class="text-[0.6rem] uppercase leading-3 text-neutral-500 dark:text-neutral-400">
-      {{ i18n "author.byline_title" | markdownify | emojify }}
+      {{ i18n "author.byline_title" | markdownify }}
     </div>
     <div class="font-semibold leading-6 text-neutral-800 dark:text-neutral-300">
       {{ . }}
     </div>
     {{ end }}
-    {{ with .Site.Author.bio | markdownify | emojify }}
+    {{ with .Site.Author.bio | markdownify }}
     <div class="text-sm text-neutral-700 dark:text-neutral-400">{{ . }}</div>
     {{ end }}
     <div class="text-2xl sm:text-lg">{{ partialCached "author-links.html" . }}</div>

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -13,7 +13,7 @@
                 {{ partial "icon.html" .Pre }}
             </span>
             {{ end }}
-            {{ .Name | markdownify | emojify }}
+            {{ .Name | markdownify }}
           </a>
         </li>
         {{ end }}
@@ -27,11 +27,11 @@
     {{ if .Site.Params.footer.showCopyright | default true }}
     <p class="text-sm text-neutral-500 dark:text-neutral-400">
       {{- with replace .Site.Params.copyright "{ year }" now.Year  }}
-      {{ . | emojify | markdownify }}
+      {{ . | emojify }}
       {{- else }}
       &copy;
       {{ now.Format "2006" }}
-      {{ .Site.Author.name | markdownify | emojify }}
+      {{ .Site.Author.name | markdownify }}
       {{- end }}
     </p>
     {{ end }}
@@ -65,4 +65,4 @@
   {{ if templates.Exists "partials/extend-footer.html" }}
   {{ partialCached "extend-footer.html" . }}
   {{ end }}
-</footer>
+</footer>
diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html
@@ -5,7 +5,7 @@
     {{ if $logo }}
     <div>
         <a href="{{ "" | relLangURL }}" class="flex">
-            <span class="sr-only">{{ .Site.Title | markdownify | emojify }}</span>
+            <span class="sr-only">{{ .Site.Title | markdownify }}</span>
 
             <img src="{{ $logo.RelPermalink }}" width="{{ div $logo.Width 2 }}" height="{{ div $logo.Height 2 }}"
                 class="logo max-h-[5rem] max-w-[5rem] object-scale-down object-left nozoom" alt="{{ .Site.Title }}" />
@@ -20,7 +20,7 @@
             {{ if not .Site.Params.disableTextInHeader | default true }}
             <a href="{{ "" | relLangURL }}" class="text-base font-medium text-gray-500 hover:text-gray-900">{{
                 .Site.Title | markdownify
-                | emojify }}</a>
+                }}</a>
             {{ end }}
 
         </nav>
@@ -129,7 +129,7 @@
                             </span>
                             {{ end }}
                             <p class="text-sm font-sm text-gray-500 hover:text-gray-900" title="{{ .Title }}">
-                                {{ .Name | markdownify | emojify }}
+                                {{ .Name | markdownify }}
                             </p>
                         </a>
                     </li>
@@ -157,7 +157,7 @@
             </span>
             {{ end }}
             <p class="text-xs font-light text-gray-500 hover:text-gray-900" title="{{ .Title }}">
-                {{ .Name | markdownify | emojify }}
+                {{ .Name | markdownify }}
             </p>
         </a>
         {{ end }}

diff --git a/layouts/partials/header/header-mobile-option-nested.html b/layouts/partials/header/header-mobile-option-nested.html
@@ -6,7 +6,7 @@
         </span>
         {{ end }}
         <p class="text-bg font-bg" title="{{ .Title }}">
-            {{ .Name | markdownify | emojify }}
+            {{ .Name | markdownify }}
         </p>
         <span>
             {{ partial "icon.html" "chevron-down" }}
@@ -23,9 +23,9 @@
         </span>
         {{ end }}
         <p class="text-sm font-small" title="{{ .Title }}">
-            {{ .Name | markdownify | emojify }}
+            {{ .Name | markdownify }}
         </p>
     </a>
 </li>
 {{ end }}
-<li class="mb-2"></li>
+<li class="mb-2"></li>
diff --git a/layouts/partials/header/header-mobile-option-simple.html b/layouts/partials/header/header-mobile-option-simple.html
@@ -7,7 +7,7 @@
         </div>
         {{ end }}
         <p class="text-bg font-bg" title="{{ .Title }}">
-            {{ .Name | markdownify | emojify }}
+            {{ .Name | markdownify }}
         </p>
     </a>
-</li>
+</li>
diff --git a/layouts/partials/header/header-option-nested.html b/layouts/partials/header/header-option-nested.html
@@ -7,7 +7,7 @@
     {{ end }}
     <a {{ if .URL }} href="{{ .URL }}" {{ if or (strings.HasPrefix .URL "http:" ) (strings.HasPrefix .URL "https:" ) }}
       target="_blank" {{ end }} {{ end }} class="text-base font-medium text-gray-500 hover:text-primary-600 dark:hover:text-primary-400" title="{{ .Title }}">
-      {{ .Name | markdownify | emojify }}
+      {{ .Name | markdownify }}
     </a>
     <span>
       {{ partial "icon.html" "chevron-down" }}
@@ -25,7 +25,7 @@
           </span>
           {{ end }}
           <p class="text-sm font-sm" title="{{ .Title }}">
-            {{ .Name | markdownify | emojify }}
+            {{ .Name | markdownify }}
           </p>
         </a>
         {{ end }}

diff --git a/layouts/partials/header/header-option-simple.html b/layouts/partials/header/header-option-simple.html
@@ -6,6 +6,6 @@
     </span>
     {{ end }}
     <p class="text-base font-medium" title="{{ .Title }}">
-        {{ .Name | markdownify | emojify }}
+        {{ .Name | markdownify }}
     </p>
-</a>
+</a>
diff --git a/layouts/partials/home/background.html b/layouts/partials/home/background.html
@@ -51,7 +51,7 @@ <h1 class="mb-2 text-4xl font-extrabold text-neutral-800 dark:text-neutral-200">
                     </h1>
                     {{ with .Site.Author.headline }}
                     <h2 class="mt-0 mb-0 text-xl text-neutral-800 dark:text-neutral-300">
-                        {{ . | markdownify | emojify }}
+                        {{ . | markdownify }}
                     </h2>
                     {{ end }}
                     <div class="mt-3 mb-10 text-2xl">
@@ -67,7 +67,7 @@ <h2 class="mt-0 mb-0 text-xl text-neutral-800 dark:text-neutral-300">
                         </div>
                         {{ end }}
                     </div>
-                    <section class="prose dark:prose-invert">{{ .Content | emojify }}</section>
+                    <section class="prose dark:prose-invert">{{ .Content }}</section>
                 </div>
             </div>
         </div>

diff --git a/layouts/partials/home/card.html b/layouts/partials/home/card.html
@@ -9,7 +9,7 @@
                         <h1>{{ . | emojify }}</h1>
                       </header>
                     {{ end }}
-                    <section>{{ .Content | emojify }}</section>
+                    <section>{{ .Content }}</section>
                   </article>
             </div>
             <div class="mt-6 sm:mt-16 lg:mt-0 mx-auto max-w-xl px-4 sm:px-6 lg:mx-0 lg:max-w-none lg:py-16 lg:px-0">
@@ -40,4 +40,4 @@ <h1>{{ . | emojify }}</h1>
 </div>
 <section>
     {{ partial "recent-articles/main.html" . }}
-</section>
+</section>
diff --git a/layouts/partials/home/hero.html b/layouts/partials/home/hero.html
@@ -48,7 +48,7 @@ <h1 class="mb-2 text-4xl font-extrabold text-neutral-200">
                     </h1>
                     {{ with .Site.Author.headline }}
                     <h2 class="mt-0 mb-0 text-xl text-neutral-300">
-                        {{ . | markdownify | emojify }}
+                        {{ . | markdownify }}
                     </h2>
                     {{ end }}
                     <div class="mt-3 mb-10 text-2xl">
@@ -64,7 +64,7 @@ <h2 class="mt-0 mb-0 text-xl text-neutral-300">
                         </div>
                         {{ end }}
                     </div>
-                    <section class="prose prose-invert">{{ .Content | emojify }}</section>
+                    <section class="prose prose-invert">{{ .Content }}</section>
                 </div>
             </div>
         </div>

diff --git a/layouts/partials/home/page.html b/layouts/partials/home/page.html
@@ -4,7 +4,7 @@
       <h1>{{ . | emojify }}</h1>
     </header>
   {{ end }}
-  <section>{{ .Content | emojify }}</section>
+  <section>{{ .Content }}</section>
 </article>
 <section>
   {{ partial "recent-articles/main.html" . }}