From 195888938e0f96f5699f83bad22b491e17ab62d6 Mon Sep 17 00:00:00 2001
From: koirand <koirand.jp@gmail.com>
Date: Wed, 27 Mar 2019 00:51:33 +0900
Subject: [PATCH] Asset management #18

---
 .gitignore                                   |  1 +
 {static => assets}/js/jquery-3.3.1.min.js    |  0
 {static => assets}/js/jquery.mark.es6.min.js |  0
 {static => assets}/js/lunr.js                |  0
 {static => assets}/js/search.js              |  0
 layouts/_default/list.html                   | 10 ++++++----
 6 files changed, 7 insertions(+), 4 deletions(-)
 rename {static => assets}/js/jquery-3.3.1.min.js (100%)
 rename {static => assets}/js/jquery.mark.es6.min.js (100%)
 rename {static => assets}/js/lunr.js (100%)
 rename {static => assets}/js/search.js (100%)

diff --git a/.gitignore b/.gitignore
index e43b0f9..b695bba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+resources
diff --git a/static/js/jquery-3.3.1.min.js b/assets/js/jquery-3.3.1.min.js
similarity index 100%
rename from static/js/jquery-3.3.1.min.js
rename to assets/js/jquery-3.3.1.min.js
diff --git a/static/js/jquery.mark.es6.min.js b/assets/js/jquery.mark.es6.min.js
similarity index 100%
rename from static/js/jquery.mark.es6.min.js
rename to assets/js/jquery.mark.es6.min.js
diff --git a/static/js/lunr.js b/assets/js/lunr.js
similarity index 100%
rename from static/js/lunr.js
rename to assets/js/lunr.js
diff --git a/static/js/search.js b/assets/js/search.js
similarity index 100%
rename from static/js/search.js
rename to assets/js/search.js
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9c57bbf..ccf01dc 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -20,8 +20,10 @@
     {{ end }}
   </div>
   {{ partial "footer.html" . }}
-  <script src="/js/jquery-3.3.1.min.js"></script>
-  <script src="/js/jquery.mark.es6.min.js"></script>
-  <script src="/js/lunr.js"></script>
-  <script src="/js/search.js"></script>
+  {{ $jquery := resources.Get "js/jquery-3.3.1.min.js" }}
+  {{ $mark := resources.Get "js/jquery.mark.es6.min.js" }}
+  {{ $lunr := resources.Get "js/lunr.js" }}
+  {{ $search := resources.Get "js/search.js" }}
+  {{ $js := slice $jquery $mark $lunr $search | resources.Concat "js/bundle.js" | resources.Minify | resources.Fingerprint }}
+  <script src="{{ $js.Permalink }}"></script>
 {{ end }}