From 92707a1a46256411724e55fb9855e0c1550ccc01 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Mon, 11 Jan 2021 23:05:13 +0000 Subject: [PATCH] fix: multilingual search broke Fix recent refactor that migrated to Hugo's best practice of js.Build. js.Build was performing excessive caching, only running the pipeline once even though the pipeline parameters changed for each multilingual site. --- wowchemy/layouts/partials/site_js.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wowchemy/layouts/partials/site_js.html b/wowchemy/layouts/partials/site_js.html index 964f1f6a..3e10d0ea 100644 --- a/wowchemy/layouts/partials/site_js.html +++ b/wowchemy/layouts/partials/site_js.html @@ -137,24 +137,24 @@ {{ $js_bundle_head := $js_license | resources.FromString "js/bundle-head.js" }} {{ $js_linebreak := "\n" | resources.FromString "js/linebreak.js" }}{{/* Fix no line break after Bootstrap JS causing error. */}} {{ $js_params := dict "hugoEnvironment" hugo.Environment "codeHighlighting" ($scr.Get "highlight_enabled" | default false) "searchEnabled" (ne site.Params.search.engine 0) }} - {{ $js_academic := resources.Get "js/wowchemy.js" | js.Build (dict "params" $js_params) }} + {{ $js_academic := resources.Get "js/wowchemy.js" | js.Build (dict "targetPath" (printf "%s/js/wow-core.js" .Lang ) "params" $js_params) }} {{ $js_bootstrap := resources.Get "js/_vendor/bootstrap.bundle.js" }} {{ $js_bundle := slice $js_bootstrap $js_linebreak $js_academic }} {{ if eq site.Params.search.engine 1 }} - {{ $js_academic_search := resources.Get "js/wowchemy-search.js" | js.Build (dict "params" $js_search_params) }} + {{ $js_academic_search := resources.Get "js/wowchemy-search.js" | js.Build (dict "targetPath" (printf "%s/js/wow-search-built.js" .Lang) "params" $js_search_params) }} {{ $js_bundle = $js_bundle | append $js_academic_search }} {{ else if eq site.Params.search.engine 2 }} - {{ $js_algolia_search := resources.Get "js/algolia-search.js" | js.Build (dict "params" $js_search_params) }} + {{ $js_algolia_search := resources.Get "js/algolia-search.js" | js.Build (dict "targetPath" (printf "%s/js/algolia-search-built.js" .Lang) "params" $js_search_params) }} {{ $js_bundle = $js_bundle | append $js_algolia_search }} {{ end }} {{ range site.Params.plugins_js }} {{ $js_bundle = $js_bundle | append (resources.Get (printf "js/%s.js" .)) }} {{ end }} - {{ $js_bundle := $js_bundle | resources.Concat "js/wowchemy-bundle-pre.js" }} + {{ $js_bundle := $js_bundle | resources.Concat (printf "%s/js/wowchemy-bundle.js" .Lang) }} {{- if eq hugo.Environment "production" -}} {{ $js_bundle = $js_bundle | minify }} {{- end -}} - {{ $js_bundle := slice $js_bundle_head $js_bundle | resources.Concat "js/wowchemy.min.js" }} + {{ $js_bundle := slice $js_bundle_head $js_bundle | resources.Concat (printf "%s/js/wowchemy.min.js" .Lang) }} {{- if eq hugo.Environment "production" -}} {{- $js_bundle = $js_bundle | fingerprint "md5" -}} {{- end -}}