Updated hugo version. Partially solves #144 (#576)

* Updated hugo version. Partially solves #144 * [chore] Removed duplicate section check * [chore] build improvements - decreased image quality - removed smalles image size to reduce total images - cached set of partials
pnp · Sep 26, 2022 · b94f820 · b94f820
1 parent b76ec2e
commit b94f820
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 43 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -12,7 +12,7 @@
 			// Update VERSION to pick a specific hugo version.
 			// Example versions: latest, 0.73.0, 0,71.1
 			// Rebuild the container if it already exists to update.
-			"VERSION": "0.100.2",
+			"VERSION": "latest",
 			// Update NODE_VERSION to pick the Node.js version: 12, 14
 			"NODE_VERSION": "14"
 		}
@@ -22,7 +22,7 @@
 	"settings": {
 		"html.format.templating": true,
 	},
-	
+
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"bungcip.better-toml",

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.100.2' # temporary set to fixed version as 0.101.0 seems to cause problems
+          hugo-version: 'latest'
           extended: true
 
       - name: Build

diff --git a/config/_default/config.toml b/config/_default/config.toml
@@ -18,10 +18,7 @@ enableEmoji = true
 
 # Image Processing Config
 [imaging]
-quality = 100
-
-
-
+quality = 75
 
 ############################# Outputs ##############################
 [outputs]
@@ -59,4 +56,4 @@ suffixes = [""]
 [outputFormats]
 [outputFormats.WebAppManifest]
 mediaType = "application/manifest+json"
-rel = "manifest"
+rel = "manifest"
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
@@ -7,31 +7,28 @@
         {{ $image_ext := path.Ext $image.RelPermalink }}
         {{ $image_width := $image.Width }}
         {{ if  (ne $image_ext ".gif") }}
-            {{ $tinyImage := $image.Resize "500x webp" }}
             {{ $smallImage := $image.Resize "800x webp" }}
             {{ $mediumImage := $image.Resize "1200x webp" }}
             {{ $largeImage := $image.Resize "1500x webp" }}
-            
+
             {{ if .Title }}
             <figure>
                 <picture>
-                    <source media="(min-width:500px)" srcset={{ $smallImage.RelPermalink | safeURL }}>
                     <source media="(min-width:800px)" srcset={{ $mediumImage.RelPermalink | safeURL }}>
                     <source media="(min-width:1200px)" srcset={{ $largeImage.RelPermalink | safeURL }}>
                     <source media="(min-width:1500px)" srcset={{ .Destination | safeURL }}>
-                    <img src="{{ $tinyImage.RelPermalink | safeURL }}" {{ with .Text }} alt="{{ . }}" {{ end }} {{ with .Title }}
+                    <img src="{{ $smallImage.RelPermalink | safeURL }}" {{ with .Text }} alt="{{ . }}" {{ end }} {{ with .Title }}
                         title="{{ . }}" {{ end }} style="width:auto;">
                 </picture>
-            
+
                 {{ with .Title}} <figcaption>{{ . | markdownify }}</figcaption> {{ end }}
             </figure>
             {{ else }}
             <picture>
-                <source media="(min-width:500px)" srcset={{ $smallImage.RelPermalink | safeURL }}>
                 <source media="(min-width:800px)" srcset={{ $mediumImage.RelPermalink | safeURL }}>
                 <source media="(min-width:1200px)" srcset={{ $largeImage.RelPermalink | safeURL }}>
                 <source media="(min-width:1500px)" srcset={{ .Destination | safeURL }}>
-                <img src="{{ $tinyImage.RelPermalink | safeURL }}" {{ with .Text }} alt="{{ . }}" {{ end }} style="width:auto;">
+                <img src="{{ $smallImage.RelPermalink | safeURL }}" {{ with .Text }} alt="{{ . }}" {{ end }} style="width:auto;">
             </picture>
             {{ end }}
         {{ else }}

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -29,7 +29,7 @@
 	<!-- cache partial only in production -->
 	{{ if hugo.IsProduction }}
 	{{ partialCached "script.html" . }}
-	{{ partial "footer.html" . }}
+	{{ partialCached "footer.html" . }}
 	{{ else }}
 	{{ partial "script.html" . }}
 	{{ partial "footer.html" . }}

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -1,12 +1,26 @@
 {{ define "main" }}
 
 <!-- checking blog -->
-{{ if or (eq .Section "post") (eq .Section "microsoft-viva-and-spfx-community-call") (eq .Section
-"cli-for-microsoft-365") (eq .Section "cli-for-microsoft-365") (eq .Section "m365-dev-podcast") (eq .Section
-"microsoft-365-developer-community-call")
-(eq .Section "categories") (eq .Section "tags") (eq .Section "adaptive-card-community-call") (eq .Section
-"power-platform-community-call") (eq .Section "microsoft-365-platform-community-update") (eq .Section
-"microsoft-365-pnp-weekly") (eq .Section "m365-pnp-weekly") (eq .Section "adaptive-cards-community-call") (eq .Section "microsoft-365-pnp-community") (eq .Section "office-add-ins-community-call") (eq .Section "microsoft-graph-community-call") (eq .Section "microsoft-identity-platform-community-call") (eq .Section "microsoft-teams-community-call") }}
+{{ if or
+  (eq .Section "adaptive-cards-community-call")
+  (eq .Section "categories") (eq .Section "tags")
+  (eq .Section "cli-for-microsoft-365")
+  (eq .Section "m365-dev-podcast")
+  (eq .Section "m365-pnp-weekly")
+  (eq .Section "microsoft-365-developer-community-call")
+  (eq .Section "microsoft-365-platform-community-call")
+  (eq .Section "microsoft-365-platform-community-update")
+  (eq .Section "microsoft-365-pnp-community")
+  (eq .Section "microsoft-365-pnp-weekly")
+  (eq .Section "microsoft-graph-community-call")
+  (eq .Section "microsoft-identity-platform-community-call")
+  (eq .Section "microsoft-teams-community-call")
+  (eq .Section "microsoft-viva-and-spfx-community-call")
+  (eq .Section "office-add-ins-community-call")
+  (eq .Section "pnp-powershell")
+  (eq .Section "post")
+  (eq .Section "power-platform-community-call")
+}}
 
 <section class="section">
   <div class="py-4"></div>

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -1,12 +1,30 @@
 {{ define "main" }}
 
 <!-- checking blog -->
-{{ if or (eq .Section "post") (eq .Section "microsoft-viva-and-spfx-community-call") (eq .Section "cli-for-microsoft-365") (eq .Section "cli-for-microsoft-365") (eq .Section "m365-dev-podcast") (eq .Section "microsoft-365-developer-community-call")
-(eq .Section "categories") (eq .Section "tags") (eq .Section "adaptive-card-community-call") (eq .Section "power-platform-community-call") (eq .Section "microsoft-teams-community-call") (eq .Section "microsoft-365-platform-community-update") (eq .Section "microsoft-365-pnp-weekly") (eq .Section "m365-pnp-weekly") (eq .Section "adaptive-cards-community-call") (eq .Section "microsoft-365-pnp-community") (eq .Section "office-add-ins-community-call") (eq .Section "microsoft-graph-community-call") (eq .Section "microsoft-identity-platform-community-call") (eq .Section "microsoft-365-platform-community-call") (eq .Section "pnp-powershell")}}
+{{ if or
+    (eq .Section "adaptive-cards-community-call")
+    (eq .Section "categories") (eq .Section "tags")
+    (eq .Section "cli-for-microsoft-365")
+    (eq .Section "m365-dev-podcast")
+    (eq .Section "m365-pnp-weekly")
+    (eq .Section "microsoft-365-developer-community-call")
+    (eq .Section "microsoft-365-platform-community-call")
+    (eq .Section "microsoft-365-platform-community-update")
+    (eq .Section "microsoft-365-pnp-community")
+    (eq .Section "microsoft-365-pnp-weekly")
+    (eq .Section "microsoft-graph-community-call")
+    (eq .Section "microsoft-identity-platform-community-call")
+    (eq .Section "microsoft-teams-community-call")
+    (eq .Section "microsoft-viva-and-spfx-community-call")
+    (eq .Section "office-add-ins-community-call")
+    (eq .Section "pnp-powershell")
+    (eq .Section "post")
+    (eq .Section "power-platform-community-call")
+}}
 
 {{ $sidebar:= site.Params.sidebar }}
 {{ $hasbar:= or (eq $sidebar `left`) (eq $sidebar `right`)}}
-{{ $layout:= site.Params.post_layout}}
+
 {{ $widget:= site.Params.widgets.sidebar }}
 
 
@@ -19,7 +37,7 @@
             <!-- left sidebar -->
             {{ if eq $sidebar "left" }}
             <aside class="col-lg-4 order-2 order-lg-1">
-                {{- partial "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
+                {{- partialCached "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
             </aside>
             {{ end }}
             <!-- /left sidebar -->
@@ -39,9 +57,7 @@
                                 {{ $image:= resources.Get $imgPath }}
                                 {{ $imageMD:= $image.Fill "700x330 webp" }}
                                 {{ $imageLG:= $image.Fill "510x240 webp" }}
-                                {{ $imageSM:= $image.Fill "380x180 webp" }}
                                 <picture>
-                                    <source srcset="{{ $imageSM.Permalink }}" media="(max-width: 575px)">
                                     <source srcset="{{ $imageMD.Permalink }}" media="(max-width: 767px)">
                                     <source srcset="{{ $imageLG.Permalink }}" media="(max-width: 991px)">
                                     <source srcset="{{$imageMD.Permalink}}">
@@ -53,9 +69,7 @@
                                 {{ $image:= . }}
                                 {{ $imageMD:= $image.Fill "700x330 webp" }}
                                 {{ $imageLG:= $image.Fill "510x240 webp" }}
-                                {{ $imageSM:= $image.Fill "380x180 webp" }}
                                 <picture>
-                                    <source srcset="{{ $imageSM.Permalink }}" media="(max-width: 575px)">
                                     <source srcset="{{ $imageMD.Permalink }}" media="(max-width: 767px)">
                                     <source srcset="{{ $imageLG.Permalink }}" media="(max-width: 991px)">
                                     <source srcset="{{$imageMD.Permalink}}">
@@ -133,7 +147,7 @@ <h1 class="h2">{{ .Title }}</h1>
             <!-- right sidebar -->
             {{ if eq $sidebar "right" }}
             <aside class="col-lg-4">
-                {{- partial "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
+                {{- partialCached "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
             </aside>
             {{ end }}
             <!-- /right sidebar -->

diff --git a/layouts/homepage/single.html b/layouts/homepage/single.html
@@ -344,7 +344,7 @@ <h3 class="h4 mb-3"><a class="post-title" href="{{ .Permalink }}">{{ .Title }}</
       <!-- left sidebar -->
       {{ if eq $sidebar "left" }}
       <aside class="col-lg-4 sidebar-home order-2 order-lg-1">
-        {{- partial "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
+        {{- partialCached "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
       </aside>
       {{ end }}
       <!-- /left sidebar -->
@@ -367,7 +367,7 @@ <h2 class="h5 section-title">{{ i18n "recent_post" }}</h2>
               {{ if .Params.images }}
               <div class="post-slider slider-sm">
                 <a href="{{ .Permalink }}">
-                {{ range .Params.images }} 
+                {{ range .Params.images }}
                 {{ $imgPath:= . }}
                 {{ if fileExists (add `assets/` $imgPath) }}
                   {{ $img:= resources.Get $imgPath }}
@@ -609,7 +609,7 @@ <h3 class="mb-3"><a class="post-title" href="{{ .Permalink }}">{{ .Title }}</a><
       <!-- right sidebar -->
       {{ if eq $sidebar "right" }}
       <aside class="col-lg-4 sidebar-home">
-        {{- partial "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
+        {{- partialCached "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
       </aside>
       {{ end }}
       <!-- /right sidebar -->

diff --git a/layouts/partials/default.html b/layouts/partials/default.html
@@ -9,7 +9,7 @@
     <!-- left sidebar -->
     {{ if eq $sidebar "left" }}
     <aside class="col-lg-4 order-2 order-lg-1 {{.Scratch.Get `sidebar-margin`}}">
-      {{- partial "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
+      {{- partialCached "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
     </aside>
     {{ end }}
     <!-- /left sidebar -->
@@ -388,7 +388,7 @@ <h3 class="mb-3"><a class="post-title" href="{{ .Permalink }}">{{ .Title }}</a><
     <!-- right sidebar -->
     {{ if eq $sidebar "right" }}
     <aside class="col-lg-4 {{.Scratch.Get `sidebar-margin`}}">
-      {{- partial "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
+      {{- partialCached "widgets/widget-wrapper" ( dict "Widgets" $widget "Scope" . ) -}}
     </aside>
     {{ end }}
     <!-- /right sidebar -->

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -59,7 +59,7 @@ <h2 class="h3 mb-5">{{ i18n "instagram_post" | upper }}</h2>
       </div>
       <div class="col-md-2 text-center mb-4">
         <a href="{{ site.BaseURL | relLangURL }}">
-          {{ partial "logo.html" . }}
+          {{ partialCached "logo.html" . }}
         </a>
       </div>
       <div class="col-md-5 text-md-right text-center mb-4">

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -2,9 +2,7 @@
 <title>{{.Title | default site.Title}}</title>
 
 <!-- base url -->
-{{ if or (eq site.BaseURL "/") (eq site.BaseURL "http://localhost:1313/") (eq site.BaseURL "http://examplesite.org/")
-(eq site.BaseURL "https://examplesite.org/") (eq site.BaseURL "http://examplesite.com/") (eq site.BaseURL
-"https://examplesite.com/")}}{{else}}
+{{ if or (eq site.BaseURL "/") (eq site.BaseURL "http://localhost:1313/") }}{{else}}
 <base href="{{ .Permalink }}">
 {{ end }}
 
@@ -26,7 +24,6 @@
 
 <!-- favicon -->
 {{ $favicon:= site.Params.favicon }}
-{{ if $favicon }}
 {{ if fileExists (add `assets/` $favicon) }}
 {{ $favicon:= resources.Get $favicon }}
 {{ $favicon_16:= $favicon.Resize "16x png"}}
@@ -38,7 +35,6 @@
 <link rel="icon" type="image/png" sizes="32x32" href="{{$favicon_32.RelPermalink}}">
 <link rel="apple-touch-icon" sizes="180x180" href="{{$favicon_180.RelPermalink}}">
 {{ end }}
-{{ end }}
 <link rel="manifest" href="{{`manifest.webmanifest` | relURL }}">
 <meta name="msapplication-TileColor" content="{{site.Params.variables.color_primary | default `#da532c`}}">
 <meta name="theme-color" content="{{site.Params.variables.body_color | default `#ffffff` }}">

diff --git a/themes/reader-hugo/layouts/partials/header.html b/themes/reader-hugo/layouts/partials/header.html
@@ -79,7 +79,7 @@
             placeholder="{{ i18n `search_placeholder`}}">
         </form>
         {{ end }}
-        {{ partial "pnp-main-page-link.html" . }}
+        {{ partialCached "pnp-main-page-link.html" . }}
         {{ partial "gh-link.html" . }}
       </div>
     </nav>