Merge pull request #1188 from gethinode/develop

Fix bootstrap form validation when purging styles
Merge branch 'main' into develop
2025-10-07 10:04:22 +00:00 · 2024-09-12 07:13:56 +02:00 · 2024-09-12 07:07:31 +02:00 · 2024-09-12 07:06:42 +02:00 · 2024-09-12 07:06:10 +02:00 · 2024-09-12 06:57:22 +02:00
12 changed files with 68 additions and 41 deletions
--- a/config/postcss.config.js
+++ b/config/postcss.config.js
@@ -10,7 +10,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
    return [...(els.tags || []), ...(els.classes || []), ...(els.ids || [])]
  },
  dynamicAttributes: ['data-bs-theme'],
-  safelist: [
+  safelist: ['was-validated',
    ...whitelister([
      './assets/scss/components/_clipboard.scss',
      './assets/scss/components/_command.scss',
--- a/exampleSite/config/postcss.config.js
+++ b/exampleSite/config/postcss.config.js
@@ -10,7 +10,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
    return [...(els.tags || []), ...(els.classes || []), ...(els.ids || [])]
  },
  dynamicAttributes: ['data-bs-theme'],
-  safelist: [
+  safelist: ['was-validated',
    ...whitelister([
      './_vendor/github.com/gethinode/hinode/assets/scss/components/_clipboard.scss',
      './_vendor/github.com/gethinode/hinode/assets/scss/components/_command.scss',
--- a/exampleSite/content/en/blog/image.md
+++ b/exampleSite/content/en/blog/image.md
@@ -14,7 +14,7 @@ As an example, the following shortcode displays an image with rounded corners an

 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* image src="https://res.cloudinary.com/demo/image/upload/dog.webp"
+{{</* image src="https://res.cloudinary.com/demo/dog.webp"
    ratio="21x9" caption="Cloudinary image" class="rounded" plain=true */>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->
--- a/layouts/_default/_markup/render-blockquote.html
+++ b/layouts/_default/_markup/render-blockquote.html
@@ -9,10 +9,18 @@
 }}

 {{ if eq .Type "alert" }}
-    <blockquote class="blockquote-alert blockquote-alert-{{ .AlertType }}">
+    {{ $alert := .AlertType }}
+    {{ $icon := (index $icons $alert) }}
+
+    <blockquote class="blockquote-alert blockquote-alert-{{ $alert }}">
        <p class="blockquote-alert-heading">
-            {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fw" (index $icons .AlertType))) }}
-            {{ or (i18n .AlertType) (title .AlertType) }}
+            {{ with $icon }} 
+                {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fw" .)) }}
+                {{ or (i18n $alert) (title $alert) }}
+            {{ else }}
+                {{ title $alert }}
+                {{ warnf "Unsupported alert type: '%s'. See %s" $alert $.Position }}
+            {{ end }}
        </p>
    {{ trim .Text "\n\r" | safeHTML }}
    </blockquote>
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -14,7 +14,7 @@
 {{- end -}}

 {{- /* Initialize module configuration */ -}}
-{{- $modules := partial "utilities/InitModules.html" (dict "page" .) -}}
+{{- $modules := partialCached "utilities/InitModules.html" . -}}
 {{- $.Scratch.Set "modules" $modules -}}

 {{- $fullCover := or (or (and .IsHome .Site.Params.home.fullCover) .Page.Params.fullCover) .Site.Params.main.footerBelowFold }}
@@ -27,7 +27,7 @@
 {{- $.Scratch.Set "sections" $sections -}}

 {{- /* Define main breakpoint */ -}}
-{{- $.Scratch.Set "breakpoint" (partial "utilities/GetBreakpoint.html") }}
+{{- $.Scratch.Set "breakpoint" (partialCached "utilities/GetBreakpoint.html" .) }}

 {{- /* Define base URL */ -}}
 {{ $lang := site.LanguageCode | default site.Language.Lang }}
--- a/layouts/partials/assets/adapters/cloudinary.html
+++ b/layouts/partials/assets/adapters/cloudinary.html
@@ -39,13 +39,22 @@
 {{ $element := "" }}

 <!-- Split path between upload dir and sub dir -->
-{{ $newdir := partial "utilities/URLJoin.html" (dict "base" (index (split $dir "upload") 0) "path" "upload") }}
-{{ $file = partial "utilities/URLJoin.html" (dict "base" (index (split $dir "upload") 1) "path" $file) }}
-{{ $dir = $newdir }}
+{{ $dir = path.Clean (trim .dir "/") }}
+{{ $api := "image/upload" }}
+
+<!-- Define the account, optional API segment, and directory -->
+{{ $elements := split $dir "/" }}
+{{ $account := index $elements 0 }}
+{{ $operation := "" }}
+{{ if and (in (slice "image" "video") (index $elements 1)) (eq (index $elements 2) "upload") }}
+    {{ $api = delimit (slice | append (index $elements 1) | append (index $elements 2)) "/" }}
+    {{ $dir = delimit (after 3 $elements) "/" }}
+{{ else }}
+    {{ $dir = delimit (after 1 $elements) "/" }}
+{{ end }}

 <!-- Generate image URL -->
 {{ if not $error }}
-    {{ $operation := "" }}
    {{ if $format }}
        {{ $operation = printf "%s,h_%d,w_%d" $transform $height $width }}
        {{ $file = printf "%s.%s" (strings.TrimSuffix (path.Ext $file) $file) $format }}
@@ -55,7 +64,7 @@
    {{ with $anchor }}
        {{ $operation = printf "%s,g_%s" $operation . }}
    {{ end }}
-    {{- $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $dir $operation $file)) -}}
+    {{- $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $account $api $operation $dir $file)) -}}
 {{ end }}

 {{ return $element }}
--- a/layouts/partials/assets/card-group.html
+++ b/layouts/partials/assets/card-group.html
@@ -58,7 +58,7 @@
    {{ else }}
        {{ $paginator = $args.page.Paginate $list }}
    {{ end }}
-    {{ $list = first $paginator.PageSize (after (mul (sub $paginator.PageNumber 1) $paginator.PageSize) $list) }}
+    {{ $list = first $paginator.PagerSize (after (mul (sub $paginator.PageNumber 1) $paginator.PagerSize) $list) }}
 {{ end }}

 <!-- Initialize list elements -->
--- a/layouts/partials/assets/section-list.html
+++ b/layouts/partials/assets/section-list.html
@@ -143,7 +143,7 @@

    <div class="container-fluid {{ with $background }} bg-{{ . }}{{ end }} p-0">
        <div class="container-xxl {{ $wrapper }}">
-            {{- partial "assets/section-header.html" (dict  "title" $title "description" $description "content" $content) -}}
+            {{- partial "assets/section-header.html" (dict "title" $title "description" $description "content" $content) -}}
            {{ if eq $layout "card" }}
                {{- $partial = "assets/card-group.html" -}}
                {{- $params = merge $params (dict 
--- a/layouts/partials/utilities/InitModules.html
+++ b/layouts/partials/utilities/InitModules.html
@@ -1,5 +1,3 @@
-{{ $page := .page }}
-
 {{ $core := slice }}
 {{ $optional := slice }}
 {{ $excludeSCSS := slice }}
@@ -7,7 +5,7 @@
 {{ $localize := slice }}
 {{ $modules := dict }}

-{{ range $key, $mod := $page.Site.Params.modules }}
+{{ range $key, $mod := .Site.Params.modules }}
    {{ if eq $key "core" }}
        {{ warnf "DEPRECATED: module parameter `core` has been deprecated in release v0.24.0" }}
        {{ $core = $core | append $mod }}
@@ -57,7 +55,7 @@
    "localize" $localize
 }}

-{{- if and $page.IsPage (not (in $core "bootstrap")) -}}
+{{- if and .IsPage (not (in $core "bootstrap")) -}}
    {{- errorf "Bootstrap is a required module, please add it to 'modules.core' in your site parameters" -}}
 {{- end -}}

--- a/netlify.toml
+++ b/netlify.toml
@@ -4,12 +4,12 @@
    command = "npm run build:example"

 [build.environment]
-    DART_SASS_VERSION = "1.77.5"
-    HUGO_VERSION = "0.131.0"
+    DART_SASS_VERSION = "1.78.0"
+    HUGO_VERSION = "0.134.1"
    HUGO_ENV = "production"
    HUGO_ENABLEGITINFO = "true"
-    NODE_VERSION = "20.16.0"
-    NPM_VERSION = "10.8.1"
+    NODE_VERSION = "20.17.0"
+    NPM_VERSION = "10.8.2"
 # toml-docs-end netlify

 [[headers]]
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,24 +1,24 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.27.0-alpha4",
+  "version": "0.27.0-alpha6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.27.0-alpha4",
+      "version": "0.27.0-alpha6",
      "license": "MIT",
      "dependencies": {
        "@fullhuman/postcss-purgecss": "^6.0.0",
        "autoprefixer": "^10.4.20",
        "cssnano": "^7.0.6",
        "cssnano-preset-advanced": "^7.0.6",
-        "hugo-bin": "0.131.1",
+        "hugo-bin": "0.131.2",
        "purgecss-whitelister": "^2.4.0"
      },
      "devDependencies": {
        "@gethinode/netlify-plugin-dartsass": "^0.3.0",
-        "eslint": "^9.9.1",
+        "eslint": "^9.10.0",
        "markdownlint-cli2": "^0.14.0",
        "neostandard": "^0.11.4",
        "netlify-plugin-hugo-cache-resources": "^0.2.1",
@@ -381,9 +381,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
-      "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz",
+      "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==",
      "dev": true,
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -398,6 +398,18 @@
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz",
+      "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==",
+      "dev": true,
+      "dependencies": {
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
    "node_modules/@fullhuman/postcss-purgecss": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/@fullhuman/postcss-purgecss/-/postcss-purgecss-6.0.0.tgz",
@@ -2427,16 +2439,17 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.9.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
-      "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz",
+      "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==",
      "dev": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.11.0",
        "@eslint/config-array": "^0.18.0",
        "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.9.1",
+        "@eslint/js": "9.10.0",
+        "@eslint/plugin-kit": "^0.1.0",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@humanwhocodes/retry": "^0.3.0",
        "@nodelib/fs.walk": "^1.2.8",
@@ -2459,7 +2472,6 @@
        "is-glob": "^4.0.0",
        "is-path-inside": "^3.0.3",
        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
        "lodash.merge": "^4.6.2",
        "minimatch": "^3.1.2",
        "natural-compare": "^1.4.0",
@@ -3668,9 +3680,9 @@
      }
    },
    "node_modules/hugo-bin": {
-      "version": "0.131.1",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.131.1.tgz",
-      "integrity": "sha512-bfUFKhQ6felvBNng06vwimNuvV+88yYwU6xTuAoTmtdY0g13Z03pf9rrg3AualxpMOu+dV/Yl/n90EvutKPzIQ==",
+      "version": "0.131.2",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.131.2.tgz",
+      "integrity": "sha512-5NrvwHUwu67IQywxXcR9IPc44wT7M0h/gtYxd8b8V1lbUsHywTBCRzKbAFMnbaE/pHey2MEVAzpQt6rY2XTXWA==",
      "funding": [
        {
          "type": "github",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.27.0-alpha4",
+  "version": "0.27.0-alpha6",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -71,12 +71,12 @@
    "autoprefixer": "^10.4.20",
    "cssnano": "^7.0.6",
    "cssnano-preset-advanced": "^7.0.6",
-    "hugo-bin": "0.131.1",
+    "hugo-bin": "0.131.2",
    "purgecss-whitelister": "^2.4.0"
  },
  "devDependencies": {
    "@gethinode/netlify-plugin-dartsass": "^0.3.0",
-    "eslint": "^9.9.1",
+    "eslint": "^9.10.0",
    "markdownlint-cli2": "^0.14.0",
    "neostandard": "^0.11.4",
    "netlify-plugin-hugo-cache-resources": "^0.2.1",
Author	SHA1	Message	Date
Mark Dumay	856a0aed08	Merge pull request #1188 from gethinode/develop Fix bootstrap form validation when purging styles	2024-09-12 07:13:56 +02:00
Mark Dumay	5c6b91f1ce	Merge branch 'main' into develop	2024-09-12 07:07:31 +02:00
Mark Dumay	152b8ca060	Bump package release	2024-09-12 07:06:42 +02:00
Mark Dumay	0f8870fed0	Fix bootstrap form validation when purging styles See #1184	2024-09-12 07:06:10 +02:00
Mark Dumay	742ae6784b	Merge pull request #1187 from gethinode/develop Refine hugo caching	2024-09-12 06:57:22 +02:00
Mark Dumay	ce4c8c0a7c	Merge branch 'main' into develop	2024-09-12 06:42:13 +02:00
Mark Dumay	40de449fed	Refine hugo caching	2024-09-12 06:41:35 +02:00
Mark Dumay	4c27864248	Improve code layout	2024-09-12 06:41:03 +02:00
Mark Dumay	3efb2b7451	Merge pull request #1186 from gethinode/develop Improve handling of Cloudinary image paths	2024-09-12 06:36:51 +02:00
Mark Dumay	721e222849	Merge branch 'main' into develop	2024-09-12 06:30:49 +02:00
Mark Dumay	77b9d62d76	Improve handling of Cloudinary image paths You can reference an image on Cloudinary by using the account name, relative directory, and file name. However, you can reference the image by optionally adding the API path (e.g. "image/upload", "video/upload") directly after the account name. Hinode now parses both types of paths correctly.	2024-09-12 06:29:54 +02:00
github-actions[bot]	efe3c947c2	Merge pull request #1183 from gethinode/dependabot/npm_and_yarn/hugo-bin-0.131.2 Bump hugo-bin from 0.131.1 to 0.131.2	2024-09-10 13:24:12 +00:00
dependabot[bot]	beee2e40e0	Bump hugo-bin from 0.131.1 to 0.131.2 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.131.1 to 0.131.2. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.131.1...v0.131.2) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-10 13:19:12 +00:00
Mark Dumay	895d606175	Merge pull request #1182 from gethinode/develop Bump Netlify build environment	2024-09-10 09:36:02 +02:00
Mark Dumay	9a17df96f3	Merge branch 'main' into develop	2024-09-10 07:17:05 +02:00
Mark Dumay	d2e1a1678a	Bump Netlify build environment	2024-09-10 07:16:39 +02:00
Mark Dumay	d8451e2699	Merge pull request #1181 from gethinode/develop Fix deprecation warning	2024-09-10 07:15:09 +02:00
Mark Dumay	f98ab74905	Merge branch 'main' into develop	2024-09-10 07:09:30 +02:00
Mark Dumay	6e453ea2ab	Fix deprecation warning	2024-09-10 07:09:05 +02:00
Mark Dumay	d6ca890c80	Merge pull request #1180 from gethinode/develop Improve handling of unsupported alert types	2024-09-10 07:07:51 +02:00
Mark Dumay	46aecfe65a	Merge branch 'main' into develop	2024-09-10 06:58:26 +02:00
Mark Dumay	496c07ff7e	Improve handling of unsupported alert types	2024-09-10 06:55:56 +02:00
github-actions[bot]	3a63f4fad7	Merge pull request #1179 from gethinode/dependabot/npm_and_yarn/eslint-9.10.0 Bump eslint from 9.9.1 to 9.10.0	2024-09-09 13:24:05 +00:00
dependabot[bot]	bbf99507d6	Bump eslint from 9.9.1 to 9.10.0 Bumps [eslint](https://github.com/eslint/eslint) from 9.9.1 to 9.10.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.9.1...v9.10.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-09 13:18:22 +00:00