Replace ExecuteAsTemplate with js.Build for js files.v2.2.0

4 files changed, 24 insertions, 10 deletions

diff --git a/assets/js/search.js b/assets/js/search.js
index 9e464dd..8808ffb 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -5,6 +5,8 @@
  * A JavaScript file for flexsearch.
  */
 
+import * as params from '@params';
+
 (function () {
 
   'use strict';
@@ -44,7 +46,7 @@
     const results = index.search({
       query: query,
       enrich: true,
-      limit: {{ site.Params.searchLimit | default 20 }}
+      limit: params.searchLimit
     });
     const items = {};
     results.forEach(function (result) {
diff --git a/assets/js/tracking.js b/assets/js/tracking.js
index f69028d..757a964 100644
--- a/assets/js/tracking.js
+++ b/assets/js/tracking.js
@@ -5,14 +5,17 @@
  * A JavaScript file for analytic tracking.
  */
 
-var cookiebanner = {{ site.Params.cookieConsent | default false }};
-var cookieconsent = localStorage.getItem('cookieconsent');
-var idSite = '{{ site.Params.piwikSiteID }}';
-var matomoTrackingApiUrl = 'https://{{ site.Params.piwikTrackerUrl }}/matomo.php';
-var googleAnalytics = '{{ site.GoogleAnalytics }}';
+import * as params from '@params';
+
+const cookiebanner = params.cookieConsent;
+const cookieconsent = localStorage.getItem('cookieconsent');
+const idSite = params.piwikSiteID;
+const matomoTrackingApiUrl = 'https://' + params.piwikTrackerUrl + '/matomo.php';
+const googleAnalytics = params.GoogleAnalytics;
 
 if (idSite) {
-  var _paq = window._paq || [];
+  let _paq = window._paq = window._paq || [];
+
   if (cookiebanner) {
     _paq.push(['requireConsent']);
   }
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index f8cf588..11a0e27 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -37,7 +37,8 @@
 {{ if .HasShortcode "search" -}}
 {{ $flexsearch := resources.Get "js/lib/flexsearch.compact.js" | fingerprint -}}
 <script defer src="{{ $flexsearch.RelPermalink }}"></script>
-{{ $search := resources.Get "js/search.js" | resources.ExecuteAsTemplate "js/search.js" . | minify | fingerprint -}}
+{{ $search_opts := dict "minify" true "params" (dict "searchLimit" (site.Params.searchLimit | default 20)) -}}
+{{ $search := resources.Get "js/search.js" | js.Build $search_opts | fingerprint -}}
 <script defer src="{{ $search.RelPermalink }}"></script>
 {{ end -}}
 {{ $script := resources.Get "js/script.js" | minify | fingerprint -}}
diff --git a/layouts/partials/tracking.html b/layouts/partials/tracking.html
index b6a1c49..91c412f 100644
--- a/layouts/partials/tracking.html
+++ b/layouts/partials/tracking.html
@@ -1,5 +1,13 @@
+{{ $opts := dict
+  "minify" true
+  "params" (dict
+    "cookieConsent" site.Params.cookieConsent
+    "piwikTrackerUrl" site.Params.piwikTrackerUrl
+    "piwikSiteID" site.Params.piwikSiteID
+    "plausibleSiteID" site.Params.plausibleSiteID
+    "GoogleAnalytics" site.GoogleAnalytics) -}}
 {{ if and site.Params.piwikTrackerUrl site.Params.piwikSiteID -}}
-{{ $script := resources.Get "js/tracking.js" | resources.ExecuteAsTemplate "js/tracking.js" . | minify | fingerprint -}}
+{{ $script := resources.Get "js/tracking.js" | js.Build $opts | fingerprint -}}
 <script src="{{ $script.RelPermalink }}"></script>
 <script defer src="https://{{ site.Params.piwikTrackerUrl }}/matomo.js"></script>
 {{ end -}}
@@ -9,7 +17,7 @@
 {{ end -}}
 
 {{ if site.GoogleAnalytics -}}
-{{ $script := resources.Get "js/tracking.js" | resources.ExecuteAsTemplate "js/tracking.js" . | minify | fingerprint -}}
+{{ $script := resources.Get "js/tracking.js" | js.Build $opts | fingerprint -}}
 <script src="{{ $script.RelPermalink }}"></script>
 {{ template "_internal/google_analytics.html" . }}
 {{ end -}}