From f05ae2f875ef9547ab249ff9c882ce6a481d669c Mon Sep 17 00:00:00 2001
From: LawssssCat <1191693505@qq.com>
Date: Thu, 2 Jun 2022 18:26:05 +0800
Subject: [PATCH]  fix: assets 404 when baseurl isn't empty and assets is
 'self_host'

---
 _includes/head.html          | 12 ++++++------
 _includes/js-selector.html   |  8 ++++----
 _includes/mermaid.html       |  2 +-
 _includes/search-loader.html |  2 +-
 _includes/toc.html           |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/_includes/head.html b/_includes/head.html
index bd267e0c5f7..aaa23a091af 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -68,7 +68,7 @@
       <link rel="dns-prefetch" href="{{ cdn.url }}" {{ cdn.args }}>
     {% endfor %}
 
-    <link rel="stylesheet" href="{{ site.data.assets[origin].webfonts }}">
+    <link rel="stylesheet" href="{{ site.data.assets[origin].webfonts | relative_url }}">
 
   {% endif %}
 
@@ -90,25 +90,25 @@
   {% endif %}
 
   <!-- Bootstrap -->
-  <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap.css }}">
+  <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap.css | relative_url}}">
 
   <!-- Font Awesome -->
-  <link rel="stylesheet" href="{{ site.data.assets[origin].fontawesome.css }}">
+  <link rel="stylesheet" href="{{ site.data.assets[origin].fontawesome.css | relative_url }}">
 
   <link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
 
   {% if site.toc and page.toc %}
-    <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap-toc.css }}">
+    <link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap-toc.css | relative_url }}">
   {% endif %}
 
   {% if page.layout == 'page' or page.layout == 'post' %}
     <!-- Manific Popup -->
-    <link rel="stylesheet" href="{{ site.data.assets[origin].magnific-popup.css }}">
+    <link rel="stylesheet" href="{{ site.data.assets[origin].magnific-popup.css | relative_url }}">
   {% endif %}
 
   <!-- JavaScript -->
 
-  <script src="{{ site.data.assets[origin].jquery.js }}"></script>
+  <script src="{{ site.data.assets[origin].jquery.js | relative_url }}"></script>
 
   {% unless site.theme_mode %}
     {% include mode-toggle.html %}
diff --git a/_includes/js-selector.html b/_includes/js-selector.html
index c0402bfadbb..89b93a450de 100644
--- a/_includes/js-selector.html
+++ b/_includes/js-selector.html
@@ -7,7 +7,7 @@
 {% if page.layout == 'post' %}
   {% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %}
     <!-- pv-report needs countup.js -->
-    <script async src="{{ site.data.assets[origin].countup.js }}"></script>
+    <script async src="{{ site.data.assets[origin].countup.js | relative_url }}"></script>
     <script defer src="{{ '/assets/js/dist/pvreport.min.js' | relative_url }}"></script>
   {% endif %}
 {% endif %}
@@ -79,14 +79,14 @@
     }
   };
   </script>
-  <script src="{{ site.data.assets[origin].polyfill.js }}"></script>
-  <script id="MathJax-script" async src="{{ site.data.assets[origin].mathjax.js }}">
+  <script src="{{ site.data.assets[origin].polyfill.js | relative_url }}"></script>
+  <script id="MathJax-script" async src="{{ site.data.assets[origin].mathjax.js | relative_url }}">
   </script>
 {% endif %}
 
 <!-- commons -->
 
-<script src="{{ site.data.assets[origin].bootstrap.js }}"></script>
+<script src="{{ site.data.assets[origin].bootstrap.js | relative_url }}"></script>
 
 {% if jekyll.environment == 'production' %}
   <!-- PWA -->
diff --git a/_includes/mermaid.html b/_includes/mermaid.html
index 51eea696e6b..e89a12edcb3 100644
--- a/_includes/mermaid.html
+++ b/_includes/mermaid.html
@@ -2,7 +2,7 @@
   mermaid-js loader
 -->
 
-<script src="{{ site.data.assets[origin].mermaid.js }}"></script>
+<script src="{{ site.data.assets[origin].mermaid.js | relative_url }}"></script>
 
 <script>
   $(function() {
diff --git a/_includes/search-loader.html b/_includes/search-loader.html
index 1f767607b05..c56038448aa 100644
--- a/_includes/search-loader.html
+++ b/_includes/search-loader.html
@@ -16,7 +16,7 @@
 
 {% capture not_found %}<p class="mt-5">{{ site.data.locales[lang].search.no_results }}</p>{% endcapture %}
 
-<script src="{{ site.data.assets[origin].search.js }}"></script>
+<script src="{{ site.data.assets[origin].search.js | relative_url }}"></script>
 
 <script>
 SimpleJekyllSearch({
diff --git a/_includes/toc.html b/_includes/toc.html
index 7741c6f577c..adf122f18ea 100644
--- a/_includes/toc.html
+++ b/_includes/toc.html
@@ -7,7 +7,7 @@
 
 {% if enable_toc %}
 <!-- BS-toc.js will be loaded at medium priority -->
-<script src="{{ site.data.assets[origin].bootstrap-toc.js }}"></script>
+<script src="{{ site.data.assets[origin].bootstrap-toc.js | relative_url }}"></script>
 
 <div id="toc-wrapper" class="pl-0 pr-4 mb-5">
   <div class="panel-heading pl-3 pt-2 mb-2">{{- site.data.locales[lang].panel.toc -}}</div>