Merge pull request #54 from markdumay/develop

Develop
Update dependencies
2025-10-07 10:04:22 +00:00 · 2022-11-16 06:24:46 +01:00 · 2022-11-16 06:22:25 +01:00 · 2022-11-16 06:20:08 +01:00 · 2022-11-16 06:14:05 +01:00 · 2022-11-16 06:13:19 +01:00
5 changed files with 48 additions and 97 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
--- a/layouts/partials/utilities/GetImage.html
+++ b/layouts/partials/utilities/GetImage.html
@@ -15,12 +15,14 @@
    {{ $remote = true -}}
 {{ end -}}

+
 {{ with $img -}}
    {{ if in $supportedMediaTypes (string $img.MediaType) -}}
        <!-- Rewrite the path of remote images to avoid storing processed files in the site's root -->
        <!-- Add a file extension based on the media type if needed to avoid Hugo processing errors -->
        {{ if $remote -}}
-            {{ $filename := index (last 1 (split (delimit (split $url "/") "," "") ",")) 0 -}}
+            {{ $path := (urls.Parse $url).Path }}
+            {{ $filename := index (last 1 (split (delimit (split $path "/") "," "") ",")) 0 -}}
            {{ if not (path.Ext $filename) -}}
                {{ $extension := string $img.MediaType.SubType -}}
                {{ $filename = printf "%s.%s" $filename $extension -}}
--- a/layouts/shortcodes/image.html
+++ b/layouts/shortcodes/image.html
@@ -18,67 +18,7 @@
    {{ $title := .Get "title" }}
    {{ $caption := .Get "caption" }}

-    {{ $img := resources.GetMatch $url }}
-    {{ if not $img }}
-        {{ $img = resources.GetRemote $url -}}
-        {{ if $img }}
-            {{ $filename := index (last 1 (split (delimit (split $url "/") "," "") ",")) 0 }}
-            {{ $img = $img.Content | resources.FromString (printf "/img/%s" $filename) }}
-        {{ end }}
-    {{ end}}
-    
-    {{ with $img }}
-        <!-- default ratio 4x3 -->
-        {{ $smDim := "576x432" }}
-        {{ $mdDim := "768x576" }}
-        {{ $lgDim := "992x744" }}
-        {{ $xlDim := "1200x900" }}
-        {{ $xxlDim := "1400x1050" }}
-        
-        {{ if eq $ratio "1x1"}}
-            {{ $smDim = "576x576" }}
-            {{ $mdDim = "768x768" }}
-            {{ $lgDim = "992x992" }}
-            {{ $xlDim = "1200x1200" }}
-            {{ $xxlDim = "1400x1400" }}
-        {{ else if eq $ratio "16x9"}}
-            {{ $smDim = "576x324" }}
-            {{ $mdDim = "768x432" }}
-            {{ $lgDim = "992x558" }}
-            {{ $xlDim = "1200x675" }}
-            {{ $xxlDim = "1400x788" }}
-        {{ else if eq $ratio "21x9"}}
-            {{ $smDim = "576x247" }}
-            {{ $mdDim = "768x329" }}
-            {{ $lgDim = "992x425" }}
-            {{ $xlDim = "1200x514" }}
-            {{ $xxlDim = "1400x600" }}
-        {{ end }}
-        
-        {{ $sm := ($img.Fill (printf "%s webp" $smDim)) }}
-        {{ $md := ($img.Fill (printf "%s webp" $mdDim)) }}
-        {{ $lg := ($img.Fill (printf "%s webp" $lgDim)) }}
-        {{ $xl := ($img.Fill (printf "%s webp" $xlDim)) }}
-        {{ $xxl := ($img.Fill (printf "%s webp" $xxlDim)) }}
-        {{ $fallback := ($img.Fill (printf "%s jpg" $xxlDim)) }}
-        
-
-        <figure class="figure">
-            <img class="figure-img img-fluid {{ $class}}"
-            srcset="
-                {{- with $xxl.RelPermalink -}}{{.}} 1400w{{- end -}}
-                {{- with $xl.RelPermalink -}}, {{.}} 1200w{{- end -}}
-                {{- with $lg.RelPermalink -}}, {{.}} 992w{{- end -}}
-                {{- with $md.RelPermalink -}}, {{.}} 768w{{- end -}}
-                {{- with $sm.RelPermalink -}}, {{.}} 576w{{- end -}}"
-            sizes="100vw"
-            src="{{ $fallback.RelPermalink }}"
-            alt="{{ $title }}">
-            <figcaption class="figure-caption">{{ $caption }}</figcaption>
-        </figure>   
-    {{ else }}
-        {{ warnf "Cannot find image resource: %q" $url }}
-    {{ end }}    
+    {{ partial "image.html" (dict "url" $url "ratio" $ratio "innerClass" $class "title" $title "caption" $caption) -}}    
 {{ else }}
    {{ errorf "Missing value for param 'src': %s" .Position }}
 {{ end }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
  "name": "@markdumay/hugo-theme-hinode",
-  "version": "0.5.4",
+  "version": "0.5.5",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@markdumay/hugo-theme-hinode",
-      "version": "0.5.4",
+      "version": "0.5.5",
      "hasInstallScript": true,
      "license": "MIT",
      "devDependencies": {
-        "@fortawesome/fontawesome-free": "^6.2.0",
+        "@fortawesome/fontawesome-free": "^6.2.1",
        "@fullhuman/postcss-purgecss": "^5.0.0",
        "autoprefixer": "^10.4.13",
        "bootstrap": "^5.2.2",
@@ -26,7 +26,7 @@
        "postcss-cli": "^10.0.0",
        "purgecss-whitelister": "^2.4.0",
        "shx": "^0.3.4",
-        "stylelint": "^14.14.1",
+        "stylelint": "^14.15.0",
        "stylelint-config-standard-scss": "^6.1.0"
      }
    },
@@ -177,9 +177,9 @@
      }
    },
    "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz",
-      "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz",
+      "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==",
      "dev": true,
      "hasInstallScript": true,
      "engines": {
@@ -1037,9 +1037,9 @@
      "dev": true
    },
    "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
      "dev": true,
      "dependencies": {
        "@types/parse-json": "^4.0.0",
@@ -3900,9 +3900,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "version": "8.4.19",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
      "dev": true,
      "funding": [
        {
@@ -4982,15 +4982,15 @@
      "dev": true
    },
    "node_modules/stylelint": {
-      "version": "14.14.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.14.1.tgz",
-      "integrity": "sha512-Jnftu+lSD8cSpcV/+Z2nfgfgFpTIS1FcujezXPngtoIQ6wtwutL22MsNE0dJuMiM1h1790g2qIjAyUZCMrX4sw==",
+      "version": "14.15.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.15.0.tgz",
+      "integrity": "sha512-JOgDAo5QRsqiOZPZO+B9rKJvBm64S0xasbuRPAbPs6/vQDgDCnZLIiw6XcAS6GQKk9k1sBWR6rmH3Mfj8OknKg==",
      "dev": true,
      "dependencies": {
        "@csstools/selector-specificity": "^2.0.2",
        "balanced-match": "^2.0.0",
        "colord": "^2.9.3",
-        "cosmiconfig": "^7.0.1",
+        "cosmiconfig": "^7.1.0",
        "css-functions-list": "^3.1.0",
        "debug": "^4.3.4",
        "fast-glob": "^3.2.12",
@@ -5010,7 +5010,7 @@
        "micromatch": "^4.0.5",
        "normalize-path": "^3.0.0",
        "picocolors": "^1.0.0",
-        "postcss": "^8.4.18",
+        "postcss": "^8.4.19",
        "postcss-media-query-parser": "^0.2.3",
        "postcss-resolve-nested-selector": "^0.1.1",
        "postcss-safe-parser": "^6.0.0",
@@ -5689,9 +5689,9 @@
      }
    },
    "@fortawesome/fontawesome-free": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz",
-      "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz",
+      "integrity": "sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==",
      "dev": true
    },
    "@fullhuman/postcss-purgecss": {
@@ -6292,9 +6292,9 @@
      "dev": true
    },
    "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
      "dev": true,
      "requires": {
        "@types/parse-json": "^4.0.0",
@@ -8387,9 +8387,9 @@
      }
    },
    "postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "version": "8.4.19",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
      "dev": true,
      "requires": {
        "nanoid": "^3.3.4",
@@ -9156,15 +9156,15 @@
      "dev": true
    },
    "stylelint": {
-      "version": "14.14.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.14.1.tgz",
-      "integrity": "sha512-Jnftu+lSD8cSpcV/+Z2nfgfgFpTIS1FcujezXPngtoIQ6wtwutL22MsNE0dJuMiM1h1790g2qIjAyUZCMrX4sw==",
+      "version": "14.15.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.15.0.tgz",
+      "integrity": "sha512-JOgDAo5QRsqiOZPZO+B9rKJvBm64S0xasbuRPAbPs6/vQDgDCnZLIiw6XcAS6GQKk9k1sBWR6rmH3Mfj8OknKg==",
      "dev": true,
      "requires": {
        "@csstools/selector-specificity": "^2.0.2",
        "balanced-match": "^2.0.0",
        "colord": "^2.9.3",
-        "cosmiconfig": "^7.0.1",
+        "cosmiconfig": "^7.1.0",
        "css-functions-list": "^3.1.0",
        "debug": "^4.3.4",
        "fast-glob": "^3.2.12",
@@ -9184,7 +9184,7 @@
        "micromatch": "^4.0.5",
        "normalize-path": "^3.0.0",
        "picocolors": "^1.0.0",
-        "postcss": "^8.4.18",
+        "postcss": "^8.4.19",
        "postcss-media-query-parser": "^0.2.3",
        "postcss-resolve-nested-selector": "^0.1.1",
        "postcss-safe-parser": "^6.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@markdumay/hugo-theme-hinode",
-  "version": "0.5.4",
+  "version": "0.5.5",
  "description": "Hinode is a clean blog theme for Hugo, an open-source static site generator",
  "main": "index.js",
  "publishConfig": {
@@ -45,7 +45,7 @@
  },
  "homepage": "https://github.com/markdumay/hugo-theme-hinode#readme",
  "devDependencies": {
-    "@fortawesome/fontawesome-free": "^6.2.0",
+    "@fortawesome/fontawesome-free": "^6.2.1",
    "@fullhuman/postcss-purgecss": "^5.0.0",
    "autoprefixer": "^10.4.13",
    "bootstrap": "^5.2.2",
@@ -61,7 +61,7 @@
    "postcss-cli": "^10.0.0",
    "purgecss-whitelister": "^2.4.0",
    "shx": "^0.3.4",
-    "stylelint": "^14.14.1",
+    "stylelint": "^14.15.0",
    "stylelint-config-standard-scss": "^6.1.0"
  },
  "otherDependencies": {
Author	SHA1	Message	Date
Mark Dumay	a2e3f8625a	Merge pull request #54 from markdumay/develop Develop	2022-11-16 06:24:46 +01:00
mark	0b8dabe195	Update dependencies	2022-11-16 06:22:25 +01:00
mark	20accdb6b9	Fix indentation	2022-11-16 06:20:08 +01:00
Mark Dumay	22234b15b5	Merge pull request #53 from markdumay/main Synchronize branch	2022-11-16 06:14:05 +01:00
Mark Dumay	33903c5df8	Merge pull request #52 from markdumay/image-test Image handling	2022-11-16 06:13:19 +01:00
Mark Dumay	35902ed071	Merge pull request #51 from markdumay/main Synchronize branch	2022-11-16 06:10:29 +01:00
Mark Dumay	1add0050b6	Merge pull request #50 from markdumay/dependabot/npm_and_yarn/stylelint-14.15.0 Bump stylelint from 14.14.1 to 14.15.0	2022-11-14 14:58:06 +01:00
dependabot[bot]	959c874630	Bump stylelint from 14.14.1 to 14.15.0 Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.14.1 to 14.15.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/14.14.1...14.15.0) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 13:12:49 +00:00
mark	c15ac68a6f	Bump package version	2022-11-14 09:35:22 +01:00
mark	f7e81d2ab9	Reuse partial	2022-11-14 08:55:53 +01:00
mark	1f539bf724	Strip query parameters from external images	2022-11-14 08:55:15 +01:00
Mark Dumay	2e9a26d84a	Merge pull request #49 from markdumay/main Synchronize branch	2022-11-14 05:43:32 +01:00
Mark Dumay	a36890d61d	Configure dependabot version updates	2022-11-09 09:47:17 +01:00