Merge f2af0198fa into 82b5481914

🔀 Merge pull request #748 from jpanther/dependabot/npm_and_yarn/prettier-3.1.1
📌 Bump prettier from 3.1.0 to 3.1.1
2023-12-12 01:27:24 -08:00 · 2023-12-12 10:15:54 +11:00 · 2023-12-10 22:09:36 +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
@ -17,7 +17,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="mb-6 -mt-3 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
@ -18,7 +18,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
@ -12,7 +12,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
@ -15,7 +15,7 @@
        "fuse.js": "^7.0.0",
        "katex": "^0.16.9",
        "mermaid": "^10.6.1",
-        "prettier": "^3.1.0",
+        "prettier": "^3.1.1",
        "prettier-plugin-go-template": "^0.0.15",
        "prettier-plugin-tailwindcss": "^0.5.9",
        "quicklink": "^2.3.0",
@ -2333,9 +2333,9 @@
      "dev": true
    },
    "node_modules/prettier": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+      "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
      "dev": true,
      "bin": {
        "prettier": "bin/prettier.cjs"
@ -4845,9 +4845,9 @@
      "dev": true
    },
    "prettier": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+      "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
      "dev": true
    },
    "prettier-plugin-go-template": {
--- a/package.json
+++ b/package.json
@ -34,7 +34,7 @@
    "fuse.js": "^7.0.0",
    "katex": "^0.16.9",
    "mermaid": "^10.6.1",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
    "prettier-plugin-go-template": "^0.0.15",
    "prettier-plugin-tailwindcss": "^0.5.9",
    "quicklink": "^2.3.0",
Author	SHA1	Message	Date
stereobooster	89032d7ff3	Merge `f2af0198fa` into `82b5481914`	2023-12-12 01:27:24 -08:00
James Panther	82b5481914	🔀 Merge pull request #748 from jpanther/dependabot/npm_and_yarn/prettier-3.1.1 📌 Bump prettier from 3.1.0 to 3.1.1	2023-12-12 10:15:54 +11:00
dependabot[bot]	d19572206a	📌 Bump prettier from 3.1.0 to 3.1.1 Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.1.0...3.1.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-10 22:09:36 +00:00
stereobooster	f2af0198fa	fix bug in picture with params	2023-11-29 14:51:44 +01:00