Skip to content

Commit

Permalink
Merge pull request #125 from cedadev/twds-0.25.5
Browse files Browse the repository at this point in the history
Upgrade to Hinode v0.25.5
  • Loading branch information
mjpritchard authored Aug 14, 2024
2 parents 67788d0 + 3c6d46f commit a41d278
Show file tree
Hide file tree
Showing 10 changed files with 192 additions and 136 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Update the NODE_VERSION arg in docker-compose.yml to pick a Node version: 18, 16, 14
ARG NODE_VERSION=18
ARG NODE_VERSION=20
FROM mcr.microsoft.com/devcontainers/javascript-node:${NODE_VERSION}

# VARIANT can be either 'hugo' for the standard version or 'hugo_extended' for the extended version.
ARG VARIANT=hugo_extended
# VERSION can be either 'latest' or a specific version number
ARG VERSION=0.126.0
ARG VERSION=0.128.0

# Download Hugo
RUN apt-get update && apt-get install -y ca-certificates openssl git curl && \
Expand Down
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
// Update VERSION to pick a specific hugo version.
// Example versions: latest, 0.73.0, 0,71.1
// Rebuild the container if it already exists to update.
"VERSION": "0.126.0",
"VERSION": "0.128.0",
// Update NODE_VERSION to pick the Node.js version: 12, 14
"NODE_VERSION": "18"
"NODE_VERSION": "20"
}
},
"features": {
"ghcr.io/devcontainers/features/go:1": {
"version": "1.22.3"
"version": "1.22"
}
},

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.126.0'
hugo-version: '0.128.0'
extended: true

- uses: actions/cache@v4
Expand Down
4 changes: 4 additions & 0 deletions assets/scss/common/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,7 @@ $border-radius: 0px !important;
.card-body .article-li {

}

.navbar-brand {
padding-left: 15px;
}
20 changes: 17 additions & 3 deletions config/_default/hugo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,25 @@ home = ["HTML", "RSS", "REDIR"]
permalinkable = false
name = "xml"

[minify] # see https://discourse.gohugo.io/t/minify-config-tutorials/28179/5
disableHTML = false
disableJS = true
disableJSON = false
disableSVG = false
disableXML = false
minifyOutput = true
[minify.tdewolff]
[minify.tdewolff.html]
keepWhitespace = true
[minify.tdewolff.js]
keepVarNames = true
precision = 0
keepWhitespace = true

[module]
[module.hugoVersion]
extended = true
min = "0.110.0"
min = "0.120.0"
max = ""
[[module.mounts]]
source = "archetypes"
Expand All @@ -107,7 +122,6 @@ home = ["HTML", "RSS", "REDIR"]
[[module.mounts]]
source = "netlify.toml"
target = "assets/config/netlify.toml"

[[module.imports]]
path = "github.com/gethinode/hinode"
[[module.imports]]
path = "github.com/gethinode/mod-utils"
12 changes: 1 addition & 11 deletions config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@
[main.build]
transpiler = "libsass"

[modules]
core = ["bootstrap", "fontawesome", "flexsearch"] #"flexsearch",
optional = ["leaflet", "katex", "lottie"]
excludeSCSS = ["bootstrap"]
disableTemplate = ["katex"]
[modules.fontawesome]
inline = true
debug = true
skipMissing = false

[debugging]
showJS = false
showSCSS = false
Expand All @@ -42,7 +32,7 @@
[navigation]
anchor = true
logo = "/img/jasmin-logo.svg" # store -light and -dark variants
logoHeight = 45 # height to control size of logo in layouts/partials/assets/navbar.html
logoHeight = 80 # height to control size of logo in layouts/partials/assets/navbar.html
color = "success"
fixed = true
#offset = "5em"
Expand Down
13 changes: 6 additions & 7 deletions config/_default/server.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ for = '/**'
X-Content-Type-Options = "nosniff"
X-XSS-Protection = "1; mode=block"
Content-Security-Policy = """"""
blah = """\
blah = """\
default-src 'self'; \
script-src 'self' \
https://utteranc.es/client.js https://*.google-analytics.com https://*.googletagmanager.com; \
style-src 'self' https://utteranc.es https://fonts.googleapis.com https://www.youtube.com; \
script-src 'self' https://*.google-analytics.com https://*.googletagmanager.com; \
style-src 'self' https://fonts.googleapis.com https://www.youtube.com; \
object-src 'none'; \
base-uri 'self'; \
connect-src 'self'
https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com; \
font-src 'self' https://fonts.gstatic.com; \
frame-src 'self' https://utteranc.es https://www.youtube-nocookie.com https://www.youtube.com; \
img-src 'self' data: https://i.vimeocdn.com https://i.ytimg.com https://*.google-analytics.com https://*.googletagmanager.com https://tile.openstreetmap.org; \
frame-src 'self' https://www.youtube-nocookie.com https://www.youtube.com; \
img-src 'self' data: https://*.imgix.net https://*.imagekit.io https://*.cloudinary.com https://i.vimeocdn.com https://i.ytimg.com https://*.google-analytics.com https://*.googletagmanager.com https://tile.openstreetmap.org; \
manifest-src 'self'; \
media-src 'self' \
"""
Expand All @@ -39,4 +38,4 @@ for = '/**'
no-store, \
must-revalidate \
"""
Access-Control-Allow-Origin = "*"
Access-Control-Allow-Origin = "*"
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module example.com/my-hinode-site

go 1.22

require github.com/gethinode/hinode v0.24.16 // indirect
require github.com/gethinode/hinode v0.25.5 // indirect
Loading

0 comments on commit a41d278

Please sign in to comment.