Merge f2af0198fa into c8f648d5c2

🔀 Merge pull request #763 from jpanther/dependabot/npm_and_yarn/prettier-plugin-tailwindcss-0.5.10
📌 Bump prettier-plugin-tailwindcss from 0.5.9 to 0.5.10
2023-12-31 19:33:07 +01:00 · 2023-12-29 11:05:10 +11:00 · 2023-12-28 22:35:07 +00:00 · 2023-11-29 14:51:44 +01:00
7 changed files with 21 additions and 14 deletions
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@ -20,7 +20,9 @@

 <figure>
  {{- with $img -}}
-    {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "x2" $x2) }}
+    {{ $lazy := $.Page.Site.Params.enableImageLazyLoading | default true }}
+    {{ $webp := $.Page.Site.Params.enableImageWebp | default true }}
+    {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "x2" $x2 "lazy" $lazy "webp" $webp) }}
  {{- else -}}
    <img src="{{ .Destination | safeURL }}" alt="{{ $altText }}" class="{{ $class }}" />
  {{- end -}}
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -18,7 +18,8 @@
        <div class="prose">
          {{ $altText := $.Params.featureAlt | default $.Params.coverAlt | default "" }}
          {{ $class := "mb-6 -mt-4 rounded-md" }}
-          {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "lazy" false) }}
+          {{ $webp := $.Page.Site.Params.enableImageWebp | default true }}
+          {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "lazy" false "webp" $webp) }}
          {{ with $.Params.coverCaption }}
            <figcaption class="-mt-3 mb-6 text-center">{{ . | markdownify }}</figcaption>
          {{ end }}
--- a/layouts/partials/picture.html
+++ b/layouts/partials/picture.html
@ -1,8 +1,8 @@
 {{ $img := .img }}
 {{ $alt := .alt }}
 {{ $class := .class }}
-{{ $lazy := .lazy | default $.Page.Site.Params.enableImageLazyLoading | default true }}
-{{ $webp := .webp | default $.Page.Site.Params.enableImageWebp | default true }}
+{{ $lazy := .lazy }}
+{{ $webp := .webp }}
 {{ $lqip := .lqip | default false }}
 {{ $x2 := .x2 | default false }}

--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@ -19,7 +19,9 @@
    {{ with $href }}<a href="{{ . }}">{{ end }}

    {{- with $img -}}
-      {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class) }}
+      {{ $lazy := $.Page.Site.Params.enableImageLazyLoading | default true }}
+      {{ $webp := $.Page.Site.Params.enableImageWebp | default true }}
+      {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "lazy" $lazy "webp" $webp) }}
    {{- else -}}
      <img src="{{ $url.String }}" alt="{{ $altText }}" class="{{ $class }}"/>
    {{- end -}}
--- a/layouts/shortcodes/screenshot.html
+++ b/layouts/shortcodes/screenshot.html
@ -13,7 +13,9 @@
      {{ $altText = (.Get "caption") | markdownify | plainify }}
    {{ end }}

-    {{ partial "picture.html" (dict "img" $image "alt" $altText "x2" true) }}
+    {{ $lazy := $.Page.Site.Params.enableImageLazyLoading | default true }}
+    {{ $webp := $.Page.Site.Params.enableImageWebp | default true }}
+    {{ partial "picture.html" (dict "img" $image "alt" $altText "x2" true "lazy" $lazy "webp" $webp) }}

    {{- if .Get "href" }}</a>{{ end -}}
    {{- if .Get "caption" -}}
--- a/package-lock.json
+++ b/package-lock.json
@ -17,7 +17,7 @@
        "mermaid": "^10.6.1",
        "prettier": "^3.1.1",
        "prettier-plugin-go-template": "^0.0.15",
-        "prettier-plugin-tailwindcss": "^0.5.9",
+        "prettier-plugin-tailwindcss": "^0.5.10",
        "quicklink": "^2.3.0",
        "rimraf": "^5.0.5",
        "tailwindcss": "^3.4.0",
@ -2363,9 +2363,9 @@
      }
    },
    "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.9.tgz",
-      "integrity": "sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==",
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.10.tgz",
+      "integrity": "sha512-9UGSejqFxGG6brYjFfTYlJ8zs4L/lvZg1AngFfaC5Fs1otSskASv5IWKmjPu5MlABQUtTKtMArKyYr/hWpXSUg==",
      "dev": true,
      "engines": {
        "node": ">=14.21.3"
@ -4860,9 +4860,9 @@
      }
    },
    "prettier-plugin-tailwindcss": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.9.tgz",
-      "integrity": "sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==",
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.10.tgz",
+      "integrity": "sha512-9UGSejqFxGG6brYjFfTYlJ8zs4L/lvZg1AngFfaC5Fs1otSskASv5IWKmjPu5MlABQUtTKtMArKyYr/hWpXSUg==",
      "dev": true,
      "requires": {}
    },
--- a/package.json
+++ b/package.json
@ -36,7 +36,7 @@
    "mermaid": "^10.6.1",
    "prettier": "^3.1.1",
    "prettier-plugin-go-template": "^0.0.15",
-    "prettier-plugin-tailwindcss": "^0.5.9",
+    "prettier-plugin-tailwindcss": "^0.5.10",
    "quicklink": "^2.3.0",
    "rimraf": "^5.0.5",
    "tailwindcss": "^3.4.0",
Author	SHA1	Message	Date
stereobooster	145b81f704	Merge `f2af0198fa` into `c8f648d5c2`	2023-12-31 19:33:07 +01:00
James Panther	c8f648d5c2	🔀 Merge pull request #763 from jpanther/dependabot/npm_and_yarn/prettier-plugin-tailwindcss-0.5.10 📌 Bump prettier-plugin-tailwindcss from 0.5.9 to 0.5.10	2023-12-29 11:05:10 +11:00
dependabot[bot]	28ba29ed4a	📌 Bump prettier-plugin-tailwindcss from 0.5.9 to 0.5.10 Bumps [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) from 0.5.9 to 0.5.10. - [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.9...v0.5.10) --- updated-dependencies: - dependency-name: prettier-plugin-tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-28 22:35:07 +00:00
stereobooster	f2af0198fa	fix bug in picture with params	2023-11-29 14:51:44 +01:00