From 0cbd21753b8598a3507f9e3ae3b1379e81588e91 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Thu, 2 Mar 2023 08:19:28 +0100
Subject: [PATCH] Move third party js to a assets/vendor dir.

---
 .eslintignore                                   |  1 -
 .stylelintignore                                |  2 +-
 assets/sass/_zen.scss                           |  1 -
 assets/{js/lib => vendor}/alpine.min.js         |  0
 assets/{js/lib => vendor}/flexsearch.compact.js |  0
 assets/{js/lib => vendor}/jquery.min.js         |  0
 assets/{js/lib => vendor}/jquery.slim.min.js    |  0
 assets/{js/lib => vendor}/js.cookie.min.js      |  0
 assets/{js/lib => vendor}/list.min.js           |  0
 assets/{js/lib => vendor}/lozad.min.js          |  0
 assets/{js/lib => vendor}/umbrella.min.js       |  0
 layouts/partials/scripts.html                   | 12 ++++++------
 12 files changed, 7 insertions(+), 9 deletions(-)
 rename assets/{js/lib => vendor}/alpine.min.js (100%)
 rename assets/{js/lib => vendor}/flexsearch.compact.js (100%)
 rename assets/{js/lib => vendor}/jquery.min.js (100%)
 rename assets/{js/lib => vendor}/jquery.slim.min.js (100%)
 rename assets/{js/lib => vendor}/js.cookie.min.js (100%)
 rename assets/{js/lib => vendor}/list.min.js (100%)
 rename assets/{js/lib => vendor}/lozad.min.js (100%)
 rename assets/{js/lib => vendor}/umbrella.min.js (100%)

diff --git a/.eslintignore b/.eslintignore
index b1f8c81..f0b3557 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,2 @@
 *.compact.js
 *.min.js
-umbrella.js
diff --git a/.stylelintignore b/.stylelintignore
index e350727..48b8bf9 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1 +1 @@
-typey/
+vendor/
diff --git a/assets/sass/_zen.scss b/assets/sass/_zen.scss
index 94f0c37..32090e8 100644
--- a/assets/sass/_zen.scss
+++ b/assets/sass/_zen.scss
@@ -118,7 +118,6 @@ article {
   text-align: right;
 }
 
-
 // Figure and image.
 
 figure,
diff --git a/assets/js/lib/alpine.min.js b/assets/vendor/alpine.min.js
similarity index 100%
rename from assets/js/lib/alpine.min.js
rename to assets/vendor/alpine.min.js
diff --git a/assets/js/lib/flexsearch.compact.js b/assets/vendor/flexsearch.compact.js
similarity index 100%
rename from assets/js/lib/flexsearch.compact.js
rename to assets/vendor/flexsearch.compact.js
diff --git a/assets/js/lib/jquery.min.js b/assets/vendor/jquery.min.js
similarity index 100%
rename from assets/js/lib/jquery.min.js
rename to assets/vendor/jquery.min.js
diff --git a/assets/js/lib/jquery.slim.min.js b/assets/vendor/jquery.slim.min.js
similarity index 100%
rename from assets/js/lib/jquery.slim.min.js
rename to assets/vendor/jquery.slim.min.js
diff --git a/assets/js/lib/js.cookie.min.js b/assets/vendor/js.cookie.min.js
similarity index 100%
rename from assets/js/lib/js.cookie.min.js
rename to assets/vendor/js.cookie.min.js
diff --git a/assets/js/lib/list.min.js b/assets/vendor/list.min.js
similarity index 100%
rename from assets/js/lib/list.min.js
rename to assets/vendor/list.min.js
diff --git a/assets/js/lib/lozad.min.js b/assets/vendor/lozad.min.js
similarity index 100%
rename from assets/js/lib/lozad.min.js
rename to assets/vendor/lozad.min.js
diff --git a/assets/js/lib/umbrella.min.js b/assets/vendor/umbrella.min.js
similarity index 100%
rename from assets/js/lib/umbrella.min.js
rename to assets/vendor/umbrella.min.js
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 5197d02..1fce1e6 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -2,17 +2,17 @@
 <script src="{{ $early.RelPermalink }}"></script>
 
 {{ if $.Param "alpine" -}}
-{{ $alpine := resources.Get "js/lib/alpine.min.js" | fingerprint -}}
+{{ $alpine := resources.Get "vendor/alpine.min.js" | fingerprint -}}
 <script defer src="{{ $alpine.RelPermalink }}"></script>
 {{ end -}}
 
 {{ if $.Param "jquery" -}}
-{{ $jquery := resources.Get "js/lib/jquery.slim.min.js" | fingerprint -}}
+{{ $jquery := resources.Get "vendor/jquery.slim.min.js" | fingerprint -}}
 <script defer src="{{ $jquery.RelPermalink }}"></script>
 {{ end -}}
 
 {{ if $.Param "umbrella" -}}
-{{ $umbrella := resources.Get "js/lib/umbrella.min.js" | fingerprint -}}
+{{ $umbrella := resources.Get "vendor/umbrella.min.js" | fingerprint -}}
 <script defer src="{{ $umbrella.RelPermalink }}"></script>
 {{ end -}}
 
@@ -27,14 +27,14 @@
 {{ end -}}
 
 {{ if $.Param "lazyload" -}}
-{{ $lozadmin := resources.Get "js/lib/lozad.min.js" | fingerprint -}}
+{{ $lozadmin := resources.Get "vendor/lozad.min.js" | fingerprint -}}
 <script defer src="{{ $lozadmin.RelPermalink }}"></script>
 {{ $lozad := resources.Get "js/lozadinit.js" | fingerprint -}}
 <script defer src="{{ $lozad.RelPermalink }}"></script>
 {{ end -}}
 
 {{ if $.Param "listsort" -}}
-{{ $listmin := resources.Get "js/lib/list.min.js" | fingerprint -}}
+{{ $listmin := resources.Get "vendor/list.min.js" | fingerprint -}}
 <script defer src="{{ $listmin.RelPermalink }}"></script>
 {{ $listsort := resources.Get "js/listsort.js" | fingerprint -}}
 <script defer src="{{ $listsort.RelPermalink }}"></script>
@@ -46,7 +46,7 @@
 {{ end -}}
 
 {{ if .HasShortcode "search" -}}
-{{ $flexsearch := resources.Get "js/lib/flexsearch.compact.js" | fingerprint -}}
+{{ $flexsearch := resources.Get "vendor/flexsearch.compact.js" | fingerprint -}}
 <script defer src="{{ $flexsearch.RelPermalink }}"></script>
 {{ $search_opts := dict "minify" true "params" (dict "searchLimit" (site.Params.searchLimit | default 20)) -}}
 {{ $search := resources.Get "js/search.js" | js.Build $search_opts | fingerprint -}}