From 351dcb985e8ad1361f0b9e93ab2093a02cb3ecec Mon Sep 17 00:00:00 2001
From: George <31376482+george-gca@users.noreply.github.com>
Date: Wed, 9 Apr 2025 11:36:16 -0300
Subject: [PATCH] Fixed liquid variables in some js files (#3117)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #3095

---------

Signed-off-by: George Araújo <george.gcac@gmail.com>
---
 .github/workflows/deploy.yml                          | 2 ++
 .prettierignore                                       | 2 +-
 _includes/distill_scripts.liquid                      | 8 ++++----
 _includes/scripts.liquid                              | 8 ++++----
 _layouts/bib.liquid                                   | 2 +-
 {assets/js => _scripts}/cronitor-analytics-setup.js   | 3 +++
 {assets/js => _scripts}/google-analytics-setup.js     | 3 +++
 {assets/js => _scripts}/open-panel-analytics-setup.js | 3 +++
 {assets/js => _scripts}/photoswipe-setup.js           | 3 +++
 9 files changed, 24 insertions(+), 10 deletions(-)
 rename {assets/js => _scripts}/cronitor-analytics-setup.js (77%)
 rename {assets/js => _scripts}/google-analytics-setup.js (75%)
 rename {assets/js => _scripts}/open-panel-analytics-setup.js (80%)
 rename {assets/js => _scripts}/photoswipe-setup.js (86%)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7046747..5fb7e8a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,6 +8,7 @@ on:
     paths:
       - "assets/**"
       - "_sass/**"
+      - "_scripts/**"
       - "**.bib"
       - "**.html"
       - "**.js"
@@ -36,6 +37,7 @@ on:
     paths:
       - "assets/**"
       - "_sass/**"
+      - "_scripts/**"
       - "**.bib"
       - "**.html"
       - "**.js"
diff --git a/.prettierignore b/.prettierignore
index 2929bf4..b276dd9 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,4 +9,4 @@ lighthouse_results/**
 _posts/2015-10-20-math.md
 _sass/font-awesome/*.scss
 _sass/tabler-icons/*.scss
-_scripts/search.liquid.js
+_scripts/*
diff --git a/_includes/distill_scripts.liquid b/_includes/distill_scripts.liquid
index 8d6a63c..12d365d 100644
--- a/_includes/distill_scripts.liquid
+++ b/_includes/distill_scripts.liquid
@@ -195,13 +195,13 @@
   <!-- Analytics -->
   <!-- Global site tag (gtag.js) - Google Analytics -->
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
-  <script defer src="{{ '/assets/js/google-analytics-setup.js' | relative_url | bust_file_cache }}"></script>
+  <script defer src="{{ '/assets/js/google-analytics-setup.js' | relative_url }}"></script>
 {% endif %}
 
 {% if site.enable_cronitor_analytics %}
   <!-- Cronitor RUM -->
   <script async src="https://rum.cronitor.io/script.js"></script>
-  <script defer src="{{ '/assets/js/cronitor-analytics-setup.js' | relative_url | bust_file_cache }}"></script>
+  <script defer src="{{ '/assets/js/cronitor-analytics-setup.js' | relative_url }}"></script>
 {% endif %}
 {% if site.enable_pirsch_analytics %}
   <script
@@ -212,7 +212,7 @@
   ></script>
 {% endif %}
 {% if site.enable_openpanel_analytics %}
-  <script defer src="{{ '/assets/js/open-panel-analytics-setup.js' | relative_url | bust_file_cache }}"></script>
+  <script defer src="{{ '/assets/js/open-panel-analytics-setup.js' | relative_url }}"></script>
   <script async defer src="https://openpanel.dev/op1.js"></script>
 {% endif %}
 
@@ -240,7 +240,7 @@
     ></script>
   {% endif %}
   {% if page.images.photoswipe %}
-    <script defer src="{{ '/assets/js/photoswipe-setup.js' | relative_url | bust_file_cache }}" type="module"></script>
+    <script defer src="{{ '/assets/js/photoswipe-setup.js' | relative_url }}" type="module"></script>
   {% endif %}
   {% if page.images.slider %}
     <script
diff --git a/_includes/scripts.liquid b/_includes/scripts.liquid
index a97abaa..0f07388 100644
--- a/_includes/scripts.liquid
+++ b/_includes/scripts.liquid
@@ -236,13 +236,13 @@
 
     gtag('config', '{{ site.google_analytics }}');
   </script>
-  <script defer src="{{ '/assets/js/google-analytics-setup.js' | relative_url | bust_file_cache }}"></script>
+  <script defer src="{{ '/assets/js/google-analytics-setup.js' | relative_url }}"></script>
 {% endif %}
 
 {% if site.enable_cronitor_analytics %}
   <!-- Cronitor RUM -->
   <script async src="https://rum.cronitor.io/script.js"></script>
-  <script defer src="{{ '/assets/js/cronitor-analytics-setup.js' | relative_url | bust_file_cache }}"></script>
+  <script defer src="{{ '/assets/js/cronitor-analytics-setup.js' | relative_url }}"></script>
 {% endif %}
 {% if site.enable_pirsch_analytics %}
   <script
@@ -253,7 +253,7 @@
   ></script>
 {% endif %}
 {% if site.enable_openpanel_analytics %}
-  <script defer src="{{ '/assets/js/open-panel-analytics-setup.js' | relative_url | bust_file_cache }}"></script>
+  <script defer src="{{ '/assets/js/open-panel-analytics-setup.js' | relative_url }}"></script>
   <script async defer src="https://openpanel.dev/op1.js"></script>
 {% endif %}
 
@@ -281,7 +281,7 @@
     ></script>
   {% endif %}
   {% if page.images.photoswipe %}
-    <script defer src="{{ '/assets/js/photoswipe-setup.js' | relative_url | bust_file_cache }}" type="module"></script>
+    <script defer src="{{ '/assets/js/photoswipe-setup.js' | relative_url }}" type="module"></script>
   {% endif %}
   {% if page.images.slider %}
     <script
diff --git a/_layouts/bib.liquid b/_layouts/bib.liquid
index 1e2d0e0..ea9ce56 100644
--- a/_layouts/bib.liquid
+++ b/_layouts/bib.liquid
@@ -80,7 +80,7 @@
 
         {%- if forloop.length > 1 -%}
           {% if forloop.first == false -%}
-            {%- if forloop.length > 2 %}, {% elsif forloop.length == 2 %} {% endif %}
+            {%- if forloop.length > 2 %}, {% elsif forloop.length == 2 %}  {% endif %}
           {%- endif %}
           {%- if forloop.last and author_array_limit == author_array_size %}and {% endif -%}
         {% endif %}
diff --git a/assets/js/cronitor-analytics-setup.js b/_scripts/cronitor-analytics-setup.js
similarity index 77%
rename from assets/js/cronitor-analytics-setup.js
rename to _scripts/cronitor-analytics-setup.js
index 537bc5b..8e0ac3e 100644
--- a/assets/js/cronitor-analytics-setup.js
+++ b/_scripts/cronitor-analytics-setup.js
@@ -1,3 +1,6 @@
+---
+permalink: /assets/js/cronitor-analytics-setup.js
+---
 window.cronitor =
   window.cronitor ||
   function () {
diff --git a/assets/js/google-analytics-setup.js b/_scripts/google-analytics-setup.js
similarity index 75%
rename from assets/js/google-analytics-setup.js
rename to _scripts/google-analytics-setup.js
index c66e201..b341ab9 100644
--- a/assets/js/google-analytics-setup.js
+++ b/_scripts/google-analytics-setup.js
@@ -1,3 +1,6 @@
+---
+permalink: /assets/js/google-analytics-setup.js
+---
 window.dataLayer = window.dataLayer || [];
 function gtag() {
   window.dataLayer.push(arguments);
diff --git a/assets/js/open-panel-analytics-setup.js b/_scripts/open-panel-analytics-setup.js
similarity index 80%
rename from assets/js/open-panel-analytics-setup.js
rename to _scripts/open-panel-analytics-setup.js
index fbd4833..c36ebb5 100644
--- a/assets/js/open-panel-analytics-setup.js
+++ b/_scripts/open-panel-analytics-setup.js
@@ -1,3 +1,6 @@
+---
+permalink: /assets/js/open-panel-analytics-setup.js
+---
 window.op =
   window.op ||
   function (...args) {
diff --git a/assets/js/photoswipe-setup.js b/_scripts/photoswipe-setup.js
similarity index 86%
rename from assets/js/photoswipe-setup.js
rename to _scripts/photoswipe-setup.js
index dc6a74a..e115512 100644
--- a/assets/js/photoswipe-setup.js
+++ b/_scripts/photoswipe-setup.js
@@ -1,3 +1,6 @@
+---
+permalink: /assets/js/photoswipe-setup.js
+---
 import PhotoSwipeLightbox from "{{ site.third_party_libraries.photoswipe-lightbox.url.js }}";
 import PhotoSwipe from "{{ site.third_party_libraries.photoswipe.url.js }}";
 const photoswipe = new PhotoSwipeLightbox({