From 153a266297258a4367bb6ea0449c89b1e78ea6d7 Mon Sep 17 00:00:00 2001 From: Samuel Gratzl Date: Thu, 1 Jul 2021 14:04:21 +0200 Subject: [PATCH] build: update dependencies --- package-lock.json | 41 +++++++++++-------- package.json | 10 ++--- themes/delphi/layouts/_default/baseof.html | 6 +-- themes/delphi/layouts/_default/coe.html | 1 + themes/delphi/layouts/_default/team.html | 1 + .../delphi/layouts/_internal/pagination.html | 14 +++---- themes/delphi/layouts/blog/single.html | 7 ++-- .../layouts/partials/about/collaborators.html | 2 +- .../delphi/layouts/partials/blog/license.html | 3 +- .../delphi/layouts/partials/font-awesome.html | 2 +- themes/delphi/layouts/partials/head/meta.html | 1 + .../layouts/partials/head/socialmedia.html | 30 ++++++++++---- .../layouts/partials/landing/carousel.html | 2 +- .../layouts/partials/landing/latest-news.html | 1 + themes/delphi/layouts/partials/nav.html | 10 +++-- themes/delphi/layouts/partials/scripts.html | 3 +- .../layouts/shortcodes/bibliography.html | 5 ++- themes/delphi/layouts/shortcodes/systems.html | 2 +- themes/delphi/layouts/shortcodes/team.html | 8 +++- 19 files changed, 92 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index 91ce30279..3bc9ff9c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.72.3", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.3.tgz", - "integrity": "sha512-xMbaX5Wb4eDvHOOERdyRnuhyjzXOr+zv+9CHIcgRV0pK0vKcolCqP7OGhbpGgFHU20fzSfHf/uKOahEK62rBhQ==", + "version": "0.72.4", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.4.tgz", + "integrity": "sha512-PKsS3JAf7U88XCkVGU+hlUU/MIwsOmk/vH2f7hHGBJ4I8OF/Qvi4aPLdxiAtSaiu6rbd0It0h69ekYua5kXHcA==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", @@ -974,9 +974,9 @@ "dev": true }, "husky": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz", - "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz", + "integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==", "dev": true }, "ieee754": { @@ -1935,16 +1935,19 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", "dev": true }, "prettier-plugin-go-template": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.10.tgz", - "integrity": "sha512-TaHPqiMK/zfk+YhvKRf/1WZDgQ6ffnlxJZX5rwphqfxBOVEezZQtYistTB348MKrKnnwKpyXZWpMRo0/KCVB+A==", - "dev": true + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.11.tgz", + "integrity": "sha512-qtgoEjvbgmcDp9TOqYNgrPrA41s6S1UMyzMqjcxdxQahTX0webWfbamyA/x3XeBFEEJmgXrRAirzJrIVzImsMg==", + "dev": true, + "requires": { + "ulid": "^2.3.0" + } }, "process-nextick-args": { "version": "2.0.1", @@ -2471,9 +2474,15 @@ "dev": true }, "uikit": { - "version": "3.6.22", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.6.22.tgz", - "integrity": "sha512-c8jz0lzvGPrPbOG4K5HvOCgUe7i9A6blZmMq2M/EYqoY7FT9dBayGFZYbBeio2s9WCpADIcCAj2QX/5L3EByOQ==" + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.7.0.tgz", + "integrity": "sha512-N0xluQ380EHey26toMmNA4H2YLtvVRHMaYksG31qDxW2VaAAf9i0Q0aT82zeMdrK2Tx9sqnHz6GaOMTIYYM0ZQ==" + }, + "ulid": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz", + "integrity": "sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==", + "dev": true }, "unbzip2-stream": { "version": "1.4.3", diff --git a/package.json b/package.json index 97b768be5..6bffae074 100644 --- a/package.json +++ b/package.json @@ -6,16 +6,16 @@ "@fortawesome/fontawesome-free": "^5.15.3", "highlight.js": "^11.0.1", "katex": "^0.13.11", - "uikit": "^3.6.22", + "uikit": "^3.7.0", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz" }, "devDependencies": { - "hugo-bin": "^0.72.3", - "husky": "^6.0.0", + "hugo-bin": "^0.72.4", + "husky": "^7.0.0", "lint-staged": "^11.0.0", - "prettier": "~2.2.1", - "prettier-plugin-go-template": "^0.0.10", + "prettier": "^2.3.2", + "prettier-plugin-go-template": "^0.0.11", "rimraf": "^3.0.2", "shx": "^0.3.3" }, diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index f2389b0a8..1d5a9a1eb 100644 --- a/themes/delphi/layouts/_default/baseof.html +++ b/themes/delphi/layouts/_default/baseof.html @@ -4,14 +4,14 @@ {{ partial "head/meta.html" . }} {{ partial "head/styles.html" . }} - {{ block "styles" . }} {{ end }} + {{ block "styles" . }}{{ end }} {{ partial "nav.html" . }} {{ block "breadcrumb" . }}{{ partial "menu/breadcrumb.html" . }}{{ end }} - {{ block "main" . }} {{ end }} + {{ block "main" . }}{{ end }} {{ partial "footer.html" . }} {{ partial "scripts.html" . }} - {{ block "scripts" . }} {{ end }} + {{ block "scripts" . }}{{ end }} diff --git a/themes/delphi/layouts/_default/coe.html b/themes/delphi/layouts/_default/coe.html index c7d958b60..af81b7c36 100644 --- a/themes/delphi/layouts/_default/coe.html +++ b/themes/delphi/layouts/_default/coe.html @@ -22,6 +22,7 @@

We work closely with

{{ partial "coe/research-papers.html" . }} +

Supporters

diff --git a/themes/delphi/layouts/_default/team.html b/themes/delphi/layouts/_default/team.html index 1a83b675b..b04900f87 100644 --- a/themes/delphi/layouts/_default/team.html +++ b/themes/delphi/layouts/_default/team.html @@ -20,6 +20,7 @@

{{ .Content }} +
Abbreviations diff --git a/themes/delphi/layouts/_internal/pagination.html b/themes/delphi/layouts/_internal/pagination.html index 3d5dfb0a3..aefff961a 100644 --- a/themes/delphi/layouts/_internal/pagination.html +++ b/themes/delphi/layouts/_internal/pagination.html @@ -1,10 +1,10 @@ {{ $pag := $.Paginator }} {{ if gt $pag.TotalPages 1 -}}
    -
  • +
  • {{ if $pag.HasPrev }} - {{ else }} + {{ else }} {{ end }}
    • @@ -18,24 +18,24 @@ {{- if $showNumber -}} {{- $ellipsed = false -}} {{- $shouldEllipse = false -}} - {{- else -}} + {{- else -}} {{- $shouldEllipse = not $ellipsed -}} {{- $ellipsed = true -}} {{- end -}} {{- if $showNumber }} -
  • +
  • {{ .PageNumber }}
    • - {{- else if $shouldEllipse }} + {{- else if $shouldEllipse }}
    • {{- end -}} {{- end }} -
  • +
  • {{ if $pag.HasNext }} - {{ else }} + {{ else }} {{ end }}
    • diff --git a/themes/delphi/layouts/blog/single.html b/themes/delphi/layouts/blog/single.html index e9d96cf99..9512219d8 100644 --- a/themes/delphi/layouts/blog/single.html +++ b/themes/delphi/layouts/blog/single.html @@ -3,8 +3,7 @@ {{ end }} {{ define "scripts" }} - {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} - + {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} {{ end }} {{ define "main" }} {{ $currentPage := . }} @@ -33,7 +32,7 @@

    {{ .Title }}

    {{ if gt (len .Params.authors) 1 }} {{ partial "font-awesome.html" "solid/users" }} - {{ else }} + {{ else }} {{ partial "font-awesome.html" "solid/user" }} {{ end }} @@ -78,7 +77,7 @@
    Outline
    {{ with (partial "get-person.html" (dict "Site" $currentPage.Site "key" .)) }} {{ if isset . "link" }} {{ .name | safeHTML }} - {{ else }} + {{ else }} {{ .name | safeHTML }} {{ end }} {{ .description }} diff --git a/themes/delphi/layouts/partials/about/collaborators.html b/themes/delphi/layouts/partials/about/collaborators.html index 8e30e6151..6a4b0c5f2 100644 --- a/themes/delphi/layouts/partials/about/collaborators.html +++ b/themes/delphi/layouts/partials/about/collaborators.html @@ -6,7 +6,7 @@

    Collaborators

      {{ range .Params.collaborators }}
    • - {{ if eq .group "sponsor" }}With support from {{ end }} + {{ if eq .group "sponsor" }}With support from{{ end }} {{ .name }}
      • diff --git a/themes/delphi/layouts/partials/blog/license.html b/themes/delphi/layouts/partials/blog/license.html index c94c31847..29ad6d1e6 100644 --- a/themes/delphi/layouts/partials/blog/license.html +++ b/themes/delphi/layouts/partials/blog/license.html @@ -1,7 +1,8 @@
      © {{ now.Format "2006" }} Delphi group authors. Text and figures released under - CC BY 4.0 {{ partial "font-awesome.html" "brands/creative-commons" }} + CC BY 4.0 + {{ partial "font-awesome.html" "brands/creative-commons" }} {{ partial "font-awesome.html" "brands/creative-commons-by" }} ; code under the MIT license.
      diff --git a/themes/delphi/layouts/partials/font-awesome.html b/themes/delphi/layouts/partials/font-awesome.html index e79719aa5..ecf915735 100644 --- a/themes/delphi/layouts/partials/font-awesome.html +++ b/themes/delphi/layouts/partials/font-awesome.html @@ -4,7 +4,7 @@ {{- $localPath := path.Join "./themes/delphi/assets/" $fileName -}} {{- if fileExists $localPath -}} {{ readFile $localPath | safeHTML }} - {{- else -}} + {{- else -}} {{ readFile $faPath | safeHTML }} {{- end -}} diff --git a/themes/delphi/layouts/partials/head/meta.html b/themes/delphi/layouts/partials/head/meta.html index 98f3408d4..98f752da0 100644 --- a/themes/delphi/layouts/partials/head/meta.html +++ b/themes/delphi/layouts/partials/head/meta.html @@ -5,6 +5,7 @@ {{ partial "head/socialmedia.html" . }} + diff --git a/themes/delphi/layouts/partials/head/socialmedia.html b/themes/delphi/layouts/partials/head/socialmedia.html index 5c898d391..697b5a4b5 100644 --- a/themes/delphi/layouts/partials/head/socialmedia.html +++ b/themes/delphi/layouts/partials/head/socialmedia.html @@ -4,15 +4,27 @@ @@ -26,6 +38,7 @@ {{- end -}} {{- end -}} + @@ -46,7 +59,7 @@ - {{- else -}} +{{- else -}} {{- end -}} @@ -54,12 +67,13 @@ {{- if .IsPage }} {{- if not .PublishDate.IsZero }} - {{ else if not .Date.IsZero }} + {{ else if not .Date.IsZero }} + {{ end }} {{- if not .Lastmod.IsZero }} - {{ end }} - {{- else }} + + {{ end }} +{{- else }} {{- if not .Date.IsZero }} {{- end }} diff --git a/themes/delphi/layouts/partials/landing/carousel.html b/themes/delphi/layouts/partials/landing/carousel.html index 7240454e4..9f645f19f 100644 --- a/themes/delphi/layouts/partials/landing/carousel.html +++ b/themes/delphi/layouts/partials/landing/carousel.html @@ -19,7 +19,7 @@

      {{ .pre }}

      {{ .title }}

      {{ if isset . "ref" }} {{ partial "arrow-link.html" (dict "link" (relref $currentPage .ref) "alt" .alt) }} - {{ else }} + {{ else }} {{ partial "arrow-link.html" (dict "link" .link "alt" .alt) }} {{ end }}

diff --git a/themes/delphi/layouts/partials/landing/latest-news.html b/themes/delphi/layouts/partials/landing/latest-news.html index 200553297..a62edba56 100644 --- a/themes/delphi/layouts/partials/landing/latest-news.html +++ b/themes/delphi/layouts/partials/landing/latest-news.html @@ -15,6 +15,7 @@

Latest News

{{ $top := 10 }} +