From 4b126a3c66c756806fa81713a210524629a72378 Mon Sep 17 00:00:00 2001 From: tdro Date: Mon, 20 Feb 2023 20:50:15 -0500 Subject: themes/default/layouts/partials/bass: Set consistent asset entry point --- themes/default/layouts/_default/home.xslt.rss.xsl | 8 +------- themes/default/layouts/_default/home.xslt.sitemap.xsl | 10 ++-------- themes/default/layouts/partials/base-css.html | 16 ++++++++++++++++ themes/default/layouts/partials/base-head.html | 18 ++++-------------- themes/default/layouts/partials/base-js.html | 8 ++++++++ 5 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 themes/default/layouts/partials/base-css.html create mode 100644 themes/default/layouts/partials/base-js.html diff --git a/themes/default/layouts/_default/home.xslt.rss.xsl b/themes/default/layouts/_default/home.xslt.rss.xsl index e0be815..a19642d 100644 --- a/themes/default/layouts/_default/home.xslt.rss.xsl +++ b/themes/default/layouts/_default/home.xslt.rss.xsl @@ -13,13 +13,7 @@ {{ printf `<xsl:value-of select="/rss/channel/title"/> Web Feed` | safeHTML }} - {{- $default := resources.Get "css/default.css" -}} - {{- if .Site.Params.site.production -}} - {{ $css := slice $default | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }} - - {{- else }} - - {{- end }} + {{- partial "base-css.html" . -}} diff --git a/themes/default/layouts/_default/home.xslt.sitemap.xsl b/themes/default/layouts/_default/home.xslt.sitemap.xsl index 167b773..0edfec5 100644 --- a/themes/default/layouts/_default/home.xslt.sitemap.xsl +++ b/themes/default/layouts/_default/home.xslt.sitemap.xsl @@ -11,13 +11,7 @@ {{ $.Site.Title }} Site Map - {{- $default := resources.Get "css/default.css" -}} - {{- if .Site.Params.site.production -}} - {{ $css := slice $default | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }} - - {{- else }} - - {{- end }} + {{- partial "base-css.html" . -}} @@ -58,7 +52,7 @@ -
+ Uniform Resource Locators (URLs) diff --git a/themes/default/layouts/partials/base-css.html b/themes/default/layouts/partials/base-css.html new file mode 100644 index 0000000..0a104c3 --- /dev/null +++ b/themes/default/layouts/partials/base-css.html @@ -0,0 +1,16 @@ +{{- $default := resources.Get "css/default.css" -}} +{{- $syntax := resources.Get "css/syntax-highlight-default.css" -}} + +{{- $css := + slice $default $syntax | + resources.Concat "css/bundle.css" | + resources.Minify | + fingerprint | +-}} + +{{ if .Site.Params.site.production }} + +{{ else }} + + +{{ end }} diff --git a/themes/default/layouts/partials/base-head.html b/themes/default/layouts/partials/base-head.html index 53d1fbc..3d220ba 100644 --- a/themes/default/layouts/partials/base-head.html +++ b/themes/default/layouts/partials/base-head.html @@ -56,21 +56,11 @@ {{- partial "base-canonical.html" . -}} - -{{- $index := resources.Get "js/index.js" -}} -{{- $default := resources.Get "css/default.css" -}} -{{- $syntax := resources.Get "css/syntax-highlight-default.css" -}} -{{- $js := $index | resources.Minify | fingerprint -}} -{{- $css := slice $default $syntax | resources.Concat "css/bundle.css" | resources.Minify | fingerprint -}} + +{{- partial "base-css.html" . -}} -{{ if .Site.Params.site.production }} - - -{{ else }} - - - -{{ end }} + +{{- partial "base-js.html" . -}} {{- partial "base-manifest.html" . -}} diff --git a/themes/default/layouts/partials/base-js.html b/themes/default/layouts/partials/base-js.html new file mode 100644 index 0000000..a491eee --- /dev/null +++ b/themes/default/layouts/partials/base-js.html @@ -0,0 +1,8 @@ +{{- $index := resources.Get "js/index.js" -}} +{{- $js := $index | resources.Minify | fingerprint -}} + +{{ if .Site.Params.site.production }} + +{{ else }} + +{{ end }} -- cgit v1.2.3