Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2020-11-19 22:09:34 +0300
committerGitHub <noreply@github.com>2020-11-19 22:09:34 +0300
commit6637154beba30f0a3adcd5572656a93de3a1cd8c (patch)
tree69b59c8c8b1c6a1052045ec23c49b6cb51af68d0 /site/layouts
parent50d892167036f440f9224327b0a48cf72a2e44b6 (diff)
Revert "Use Hugo mounts for our docs vendor files." (#32210)
* Revert "Adapt to the recent main changes" This reverts commit 50d892167036f440f9224327b0a48cf72a2e44b6. * Revert "Add Hugo Pipes logic for local and vendored scripts." This reverts commit 3fcfd606f2c264f1d3434e99c140a05edec461c3. * Revert "Use Hugo mounts for our docs vendor JS files." This reverts commit 6b071116f3b09b59a423ad999efbd67f8645bfa5.
Diffstat (limited to 'site/layouts')
-rw-r--r--site/layouts/partials/func/get-js-assets.html74
-rw-r--r--site/layouts/partials/scripts.html18
2 files changed, 14 insertions, 78 deletions
diff --git a/site/layouts/partials/func/get-js-assets.html b/site/layouts/partials/func/get-js-assets.html
deleted file mode 100644
index 351e9ad1dc..0000000000
--- a/site/layouts/partials/func/get-js-assets.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{{/*
- get-js-assets
- Returns a list of processed Hugo Assets to be used in templates
-
- @author @regisphilibert
-
- @context Page (.)
-
- @access public
-
- @example - Go Template
- {{- range partialCached "func/get-js-assets" . $variant -}}
- <script src="{{ .RelPermalink }}"></script>
- {{- end -}}
-*/}}
-
-{{/* We'll return a slice so templates can safely use `range` */}}
-{{ $jsAssets := slice }}
-
-{{/* Storing the reused mount warning message */}}
-{{ $missing_file_warning := "%s not found. Check your mounts settings and/or run `npm i`." }}
-{{ $doc_version := site.Params.docs_version }}
-{{/* Doc Search */}}
-{{ if eq .Page.Layout "docs" -}}
- {{ with resources.GetMatch "js/vendor/docsearch.min.js" }}
- {{/* As this is a WIP, we don't customize the asset URL,
- but we will after Hugo .74 and resources.Put (https://github.com/gohugoio/hugo/issues/7406):
- {{ with resources.GetMatch "js/vendor/docsearch.min.js" }}
- {{ $docsearch := . | resources.Put (printf /docs/%s/assets/js/vendor/docsearch.min.js" $doc_version) }}
- {{ $jsAssets = $jsAssets | append $docsearch }}
- */}}
- {{ $jsAssets = $jsAssets | append . }}
- {{ else }}
- {{ errorf $missing_file_warning "docsearch.min.js" }}
- {{ end }}
-{{- end }}
-
-{{/* --- Bundle */}}
-{{ $bundle := slice }}
-
-{{/* ----- Mounted from vendors */}}
-{{- $vendor_assets := slice -}}
-{{/* As we need to list the desired mounted files to:
- 1. Check for missing mounts and throw an error
- 2. Control order if need be
- 3. Exclude docsearch (though there would be other ways) */}}
-{{ $vendor_filenames := slice "clipboard.min.js" "anchor.min.js" }}
-{{ range $filename := $vendor_filenames }}
- {{ with resources.GetMatch (print "js/vendor/" .) }}
- {{ $vendor_assets = $vendor_assets | append . }}
- {{ else }}
- {{ errorf $missing_file_warning $filename }}
- {{ end }}
-{{ end }}
-{{ with $vendor_assets }}
- {{ $bundle = $bundle | append . }}
-{{ end }}
-
-{{/* ----- Local assets */}}
-{{ with resources.Match "js/*.js" }}
- {{ $bundle = $bundle | append . }}
-{{ end }}
-
-{{/* Above code should have populated $bundle slice */}}
-{{ with $bundle }}
- {{ $targetBundlePath := printf "/docs/%s/assets/js/docs.js" $doc_version }}
- {{ $bundle_asset := $bundle | resources.Concat $targetBundlePath }}
- {{ if eq hugo.Environment "production" }}
- {{ $bundle_asset = $bundle_asset | resources.Minify }}
- {{ end }}
- {{ $jsAssets = $jsAssets | append $bundle_asset }}
-{{ end }}
-
-{{ return $jsAssets }}
diff --git a/site/layouts/partials/scripts.html b/site/layouts/partials/scripts.html
index f19a9b5825..d7c6946417 100644
--- a/site/layouts/partials/scripts.html
+++ b/site/layouts/partials/scripts.html
@@ -4,7 +4,17 @@
<script src="/docs/{{ .Site.Params.docs_version }}/dist/js/bootstrap.bundle.js"></script>
{{- end }}
-{{- $variant := cond (eq .Page.Layout "docs") "docs" "default" -}}
-{{- range partialCached "func/get-js-assets" . $variant -}}
- <script src="{{ .RelPermalink }}"></script>
-{{- end -}}
+{{ if eq .Page.Layout "docs" -}}
+<script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
+{{- end }}
+
+{{- $vendor := resources.Match "js/vendor/*.js" -}}
+{{- $js := resources.Match "js/*.js" -}}
+{{- $targetDocsJSPath := printf "/docs/%s/assets/js/docs.js" .Site.Params.docs_version -}}
+{{- $docsJs := append $js $vendor | resources.Concat $targetDocsJSPath -}}
+
+{{- if eq hugo.Environment "production" -}}
+ {{- $docsJs = $docsJs | resources.Minify -}}
+{{- end }}
+
+<script src="{{ $docsJs.Permalink | relURL }}"></script>