alanorth/hugo-theme-bootstrap4-blog
1
0
Fork 0
mirror of https://github.com/alanorth/hugo-theme-bootstrap4-blog.git synced 2024-11-24 21:20:17 +01:00
Code Releases Activity

Use Hugo's built-in subresource integrity support

Browse Source 
We can use Hugo's built-in SRI support instead of using our custom
SRI generator script (as cool as it was at the time). This is more
clean and gives us the added benefit of adding fingerprints to the
CSS and JS filenames, which acts as a cache buster.

See: https://gohugo.io/hugo-pipes/introduction/
See: https://github.com/alanorth/hugo-theme-bootstrap4-blog/issues/120
This commit is contained in:
Alan Orth 2020-01-23 19:34:21 +02:00
parent 6e36b66fab
commit 44e8c677a6
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
static/css/cookieconsent.min.css → assets/css/cookieconsent.min.css vendored
View File

0
static/css/style.css → assets/css/style.css
View File

0
static/css/style.rtl.css → assets/css/style.rtl.css
View File

0
static/js/cookieconsent.min.js → assets/js/cookieconsent.min.js vendored
View File

6
layouts/_default/baseof.html
View File

@ -14,10 +14,12 @@
{{ if or (eq .Lang "ar") (eq .Lang "fa") }} {{ if or (eq .Lang "ar") (eq .Lang "fa") }}
{{ "<!-- ar -->" | safeHTML }} {{ "<!-- ar -->" | safeHTML }}
<link href="{{ "css/style.rtl.css" | absURL }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.styleltr}}" crossorigin="anonymous"{{ end }}> {{ $styleRtl := resources.Get "css/style.rtl.css" | resources.Fingerprint }}
<link href="{{ $styleRtl.Permalink }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ $styleRtl.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
{{ else }} {{ else }}
{{ "<!-- combined, minified CSS -->" | safeHTML }} {{ "<!-- combined, minified CSS -->" | safeHTML }}
<link href="{{ "css/style.css" | absURL }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.style}}" crossorigin="anonymous"{{ end }}> {{ $style := resources.Get "css/style.css" | resources.Fingerprint }}
<link href="{{ $style.Permalink }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ $style.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
{{ end }} {{ end }}
{{ "<!-- RSS 2.0 feed -->" | safeHTML }} {{ "<!-- RSS 2.0 feed -->" | safeHTML }}

6
layouts/partials/cookie-consent.html
View File

@ -1,5 +1,7 @@
<link href="{{ "css/cookieconsent.min.css" | absURL }}" rel="stylesheet" type="text/css"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.cookieconsentcss }}" crossorigin="anonymous"{{ end }}> {{ $cookieConsentStyle := resources.Get "css/cookieconsent.min.css" | resources.Fingerprint }}
<script src="{{ "js/cookieconsent.min.js" |absURL }}"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.cookieconsentjs }}" crossorigin="anonymous"{{ end }} async></script> <link href="{{ $cookieConsentStyle.Permalink }}" rel="stylesheet" type="text/css"{{ if not .Site.Params.disable_sri }} integrity="{{ $cookieConsentStyle.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
{{ $cookieConsentScript := resources.Get "js/cookieconsent.min.js" | resources.Fingerprint }}
<script src="{{ $cookieConsentScript.Permalink }}"{{ if not .Site.Params.disable_sri }} integrity="{{ $cookieConsentScript.Data.Integrity }}" crossorigin="anonymous"{{ end }} async></script>
<script> <script>
window.addEventListener("load", function(){ window.addEventListener("load", function(){

8
package.json
View File

@ -7,13 +7,13 @@
"url": "https://github.com/alanorth/hugo-theme-bootstrap4-blog.git" "url": "https://github.com/alanorth/hugo-theme-bootstrap4-blog.git"
}, },
"scripts": { "scripts": {
"build:css": "node-sass --output-style expanded --precision 6 source/scss/style.scss static/css/style.css.tmp && cleancss --level 1 static/css/style.css.tmp -o static/css/style.css", "build:css": "node-sass --output-style expanded --precision 6 source/scss/style.scss assets/css/style.css.tmp && cleancss --level 1 assets/css/style.css.tmp -o assets/css/style.css",
"build:ltrcss": "rtlcss -s static/css/style.css.tmp static/css/style.rtl.css.tmp && cleancss --level 1 static/css/style.rtl.css.tmp -o static/css/style.rtl.css", "build:ltrcss": "rtlcss -s assets/css/style.css.tmp assets/css/style.rtl.css.tmp && cleancss --level 1 assets/css/style.rtl.css.tmp -o assets/css/style.rtl.css",
"build:fonts": "cp node_modules/font-awesome/fonts/* static/fonts", "build:fonts": "cp node_modules/font-awesome/fonts/* static/fonts",
"build:cookieconsent": "cp node_modules/cookieconsent/build/cookieconsent.min.css static/css && cp node_modules/cookieconsent/build/cookieconsent.min.js static/js", "build:cookieconsent": "cp node_modules/cookieconsent/build/cookieconsent.min.css assets/css && cp node_modules/cookieconsent/build/cookieconsent.min.js assets/js",
"build:generatesri": "node build/sri.js > data/sri.toml", "build:generatesri": "node build/sri.js > data/sri.toml",
"build": "npm run build:css && npm run build:ltrcss && npm run build:fonts && npm run build:cookieconsent && npm run build:generatesri && npm run clean", "build": "npm run build:css && npm run build:ltrcss && npm run build:fonts && npm run build:cookieconsent && npm run build:generatesri && npm run clean",
"clean": "rm static/css/style.css.tmp static/css/style.rtl.css.tmp" "clean": "rm assets/css/style.css.tmp assets/css/style.rtl.css.tmp"
}, },
"keywords": "hugo", "keywords": "hugo",
"author": "Alan Orth", "author": "Alan Orth",