Use hugo.IsProduction and reduce code repetition

`hugo.IsProduction` defaults to true when building with `hugo` and false
when building with `hugo server`, but the user can explicitly set the
build environment and override this. People might want to do a
production build with `hugo server` or a development build with `hugo`.

5 files changed, 16 insertions, 19 deletions

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 1b38f2e..ace52a2 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -11,13 +11,12 @@
   {{ partial "google-fonts.html" . }}
 
   <!-- CSS-->
-  {{ if .Site.IsServer }}
-  {{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "style.scss" . | toCSS (dict "targetPath" "css/style.css" "enableSourceMap" true) }}
-  <link rel="stylesheet" href="{{ ($style).RelPermalink }}">
-  {{ else }}
-  {{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "style.scss" . | toCSS (dict "targetPath" "css/style.css" "enableSourceMap" false) }}
-  <link rel="stylesheet" href="{{ ($style | minify | fingerprint).RelPermalink }}">
+  {{ $css_options := dict "targetPath" "css/style.css" "enableSourceMap" (not hugo.IsProduction) }}
+  {{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "style.scss" . | toCSS $css_options }}
+  {{ if hugo.IsProduction }}
+    {{ $style = $style | minify | fingerprint }}
   {{ end }}
+  <link rel="stylesheet" href="{{ $style.RelPermalink }}">
 
   {{ block "header_css" . }}{{ end }}
 
@@ -51,11 +50,10 @@
   {{ block "footer_js" . }}
   {{ end }}
 
-  {{ if .Site.IsServer }}
-  <script type="text/javascript" src="{{ $scripts.RelPermalink }}"></script>
-  {{ else }}
-  <script type="text/javascript" src="{{ ($scripts | minify | fingerprint).RelPermalink }}"></script>
+  {{ if hugo.IsProduction }}
+    {{ $scripts = $scripts | minify | fingerprint }}
   {{ end }}
+  <script type="text/javascript" src="{{ $scripts.RelPermalink }}"></script>
 
   {{ partial "google-tag-manager.html" . }}
   {{ partial "google-analytics.html" . }}
diff --git a/layouts/partials/google-analytics.html b/layouts/partials/google-analytics.html
index cf29915..8a58a62 100644
--- a/layouts/partials/google-analytics.html
+++ b/layouts/partials/google-analytics.html
@@ -1,4 +1,4 @@
-{{- if not .Site.IsServer -}}
+{{- if and (not .Site.IsServer) hugo.IsProduction -}}
 {{ with getenv "HUGO_GOOGLE_ANALYTICS_ID" | default .Site.Params.google_analytics_id }}
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{- . -}}"></script>
diff --git a/layouts/partials/google-tag-manager-noscript.html b/layouts/partials/google-tag-manager-noscript.html
index cf75eb9..c29c381 100644
--- a/layouts/partials/google-tag-manager-noscript.html
+++ b/layouts/partials/google-tag-manager-noscript.html
@@ -1,4 +1,4 @@
-{{- if not .Site.IsServer -}}
+{{- if and (not .Site.IsServer) hugo.IsProduction -}}
 {{ with getenv "HUGO_GTM_ID" | default .Site.Params.google_tag_manager_id }}
 <!-- Google Tag Manager (noscript) --> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ . }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) -->
 {{ end }}
diff --git a/layouts/partials/google-tag-manager.html b/layouts/partials/google-tag-manager.html
index a72c490..48cfa6f 100644
--- a/layouts/partials/google-tag-manager.html
+++ b/layouts/partials/google-tag-manager.html
@@ -1,4 +1,4 @@
-{{- if not .Site.IsServer -}}
+{{- if and (not .Site.IsServer) hugo.IsProduction -}}
 {{ with getenv "HUGO_GTM_ID" | default .Site.Params.google_tag_manager_id }}
 <!-- Google Tag Manager --> <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{ . }}');</script> <!-- End Google Tag Manager -->
 {{ end }}
diff --git a/layouts/services/single.html b/layouts/services/single.html
index 0a70f31..3b62ec1 100644
--- a/layouts/services/single.html
+++ b/layouts/services/single.html
@@ -17,9 +17,8 @@
 {{ $library := resources.Get "js/libs/library.js" }}
 {{ $services := resources.Get "js/pages/services.js" }}
 {{ $servicesJS := slice $library $services | resources.Concat "js/services.js" }}
-{{ if .Site.IsServer }}
-  <script type="text/javascript" src="{{ $servicesJS.RelPermalink }}"></script>
-  {{ else }}
-  <script type="text/javascript" src="{{ ($servicesJS | minify | fingerprint).RelPermalink }}"></script>
-  {{ end }}
-{{ end }}
\ No newline at end of file
+{{ if hugo.IsProduction }}
+  {{ $servicesJS = $servicesJS | minify | fingerprint }}
+{{ end }}
+<script type="text/javascript" src="{{ $servicesJS.RelPermalink }}"></script>
+{{ end }}