fix: script loading + script order

gethyas · Mar 17, 2021 · 89784d9 · 89784d9
1 parent 8b794c8
commit 89784d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/layouts/partials/footer/script-footer.html b/layouts/partials/footer/script-footer.html
@@ -55,14 +55,14 @@
   {{ if .Site.Params.options.bootStrapJs -}}
     <script src="{{ $bs.Permalink }}" defer></script>
   {{ end -}}
-  <script src="{{ $js.Permalink }}" defer></script>
   {{ if .Site.Params.options.highLight -}}
     <script src="{{ $highlight.Permalink }}" defer></script>
   {{ end -}}
   {{ if .Site.Params.options.kaTex -}}
     <script src="{{ $katex.Permalink }}" defer></script>
     <script src="{{ $katexAutoRender.Permalink }}" onload="renderMathInElement(document.body);" defer></script>
   {{ end -}}
+  <script src="{{ $js.Permalink }}" defer></script>
   {{ if .Site.Params.options.flexSearch -}}
     <script src="{{ $index.Permalink }}" defer></script>
   {{ end -}}
@@ -76,14 +76,14 @@
   {{ if .Site.Params.options.bootStrapJs -}}
     <script src="{{ $bs.Permalink }}" integrity="{{ $bs.Data.Integrity }}" crossorigin="anonymous" defer></script>
   {{ end -}}
-  <script src="{{ $js.Permalink }}" integrity="{{ $js.Data.Integrity }}" crossorigin="anonymous" defer></script>
   {{ if .Site.Params.options.highLight -}}
     <script src="{{ $highlight.Permalink }}" integrity="{{ $highlight.Data.Integrity }}" crossorigin="anonymous" defer></script>
   {{ end -}}
   {{ if .Site.Params.options.kaTex -}}
     <script src="{{ $katex.Permalink }}" integrity="{{ $katex.Data.Integrity }}" crossorigin="anonymous" defer></script>
-    <script src="{{ $katexAutoRender.Permalink }}" integrity="{{ $katexAutoRender.Data.Integrity }}" crossorigin="anonymous" onload="renderMathInElement(document.body);" defer></script>
+    <script src="{{ $katexAutoRender.Permalink }}" integrity="{{ $katexAutoRender.Data.Integrity }}" crossorigin="anonymous" defer></script>
   {{ end -}}
+  <script src="{{ $js.Permalink }}" integrity="{{ $js.Data.Integrity }}" crossorigin="anonymous" defer></script>
   {{ if .Site.Params.options.flexSearch -}}
     <script src="{{ $index.Permalink }}" integrity="{{ $index.Data.Integrity }}" crossorigin="anonymous" defer></script>
   {{ end -}}

diff --git a/netlify.toml b/netlify.toml
@@ -8,10 +8,10 @@
   NPM_VERSION = "7.3.0"
 
 [context.production]
-  command = "hugo -b $URL --gc && npm run build:functions"
+  command = "hugo -b $URL --gc --minify && npm run build:functions"
 
 [context.deploy-preview]
-  command = "hugo -b $DEPLOY_PRIME_URL --gc"
+  command = "hugo -b $DEPLOY_PRIME_URL --gc --minify"
 
 [context.branch-deploy]
-  command = "hugo -b $DEPLOY_PRIME_URL --gc"
+  command = "hugo -b $DEPLOY_PRIME_URL --gc --minify"