Cap markdown images at their real width instead of forcing 1280
Trigger container build / trigger (push) Successful in 2s
Trigger container build / trigger (push) Successful in 2s
This commit is contained in:
@@ -1,11 +1,16 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
// Overrides Nuxt Content's default ProseImg (which renders every markdown
|
// Overrides Nuxt Content's default ProseImg (which renders every markdown
|
||||||
// image as a plain <img>, or through NuxtImg only if it happens to detect
|
// image as a plain <img>, or through NuxtImg only if it happens to detect
|
||||||
// one registered): every raster image gets capped at 1280px wide (IPX
|
// one registered): every raster image is re-encoded to WebP, which alone
|
||||||
// never upscales past its native size by default) and re-encoded to WebP,
|
// cuts most screenshots down substantially, and capped at 1280px wide.
|
||||||
// which alone cuts most screenshots down substantially. SVGs are already
|
// NuxtImg's `width` prop doubles as the rendered <img>'s HTML width
|
||||||
// tiny vector files and would gain nothing from either step, so they're
|
// attribute, not just the resize target, so passing 1280 unconditionally
|
||||||
// left untouched.
|
// would stretch a smaller source (a 1024px screenshot, say) up to fill
|
||||||
|
// that width in the browser, blurry on every display. `imageWidths`
|
||||||
|
// (nuxt.config.ts's scanImageWidths) holds each image's real width, read
|
||||||
|
// once at build time, so undersized images are only re-encoded, not
|
||||||
|
// stretched. SVGs are already tiny vector files and would gain nothing
|
||||||
|
// from either step, so they're left untouched.
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
src?: string
|
src?: string
|
||||||
alt?: string
|
alt?: string
|
||||||
@@ -13,7 +18,13 @@ const props = defineProps<{
|
|||||||
height?: string | number
|
height?: string | number
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
const config = useRuntimeConfig()
|
||||||
const isSvg = computed(() => props.src?.toLowerCase().endsWith('.svg'))
|
const isSvg = computed(() => props.src?.toLowerCase().endsWith('.svg'))
|
||||||
|
const cappedWidth = computed(() => {
|
||||||
|
if (props.width) return props.width
|
||||||
|
const naturalWidth = props.src ? config.public.imageWidths[props.src] : undefined
|
||||||
|
return naturalWidth ? Math.min(naturalWidth, 1280) : 1280
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -28,7 +39,7 @@ const isSvg = computed(() => props.src?.toLowerCase().endsWith('.svg'))
|
|||||||
v-else
|
v-else
|
||||||
:src="src"
|
:src="src"
|
||||||
:alt="alt"
|
:alt="alt"
|
||||||
:width="width ?? 1280"
|
:width="cappedWidth"
|
||||||
:height="height"
|
:height="height"
|
||||||
format="webp"
|
format="webp"
|
||||||
quality="100"
|
quality="100"
|
||||||
|
|||||||
+37
-1
@@ -1,8 +1,9 @@
|
|||||||
import { fileURLToPath } from 'node:url'
|
import { fileURLToPath } from 'node:url'
|
||||||
import { execFileSync } from 'node:child_process'
|
import { execFileSync } from 'node:child_process'
|
||||||
import { readdirSync, readFileSync } from 'node:fs'
|
import { readdirSync, readFileSync } from 'node:fs'
|
||||||
import { join } from 'node:path'
|
import { extname, join } from 'node:path'
|
||||||
import { createResolver } from '@nuxt/kit'
|
import { createResolver } from '@nuxt/kit'
|
||||||
|
import { imageSize } from 'image-size'
|
||||||
|
|
||||||
const { resolve } = createResolver(import.meta.url)
|
const { resolve } = createResolver(import.meta.url)
|
||||||
|
|
||||||
@@ -66,6 +67,34 @@ function scanContentIcons(): { collections: string[], icons: string[] } {
|
|||||||
}
|
}
|
||||||
const contentIcons = scanContentIcons()
|
const contentIcons = scanContentIcons()
|
||||||
|
|
||||||
|
// ProseImg (app/components/content/ProseImg.vue) caps every markdown image
|
||||||
|
// at 1280px wide, but NuxtImg's `width` prop always becomes the rendered
|
||||||
|
// <img>'s HTML width attribute too, not just the resize target. Passing
|
||||||
|
// 1280 unconditionally would force a smaller source (a 1024px screenshot,
|
||||||
|
// say) to stretch up to fill that width in the browser, blurry on every
|
||||||
|
// display. Reading each image's real width here once at build time lets
|
||||||
|
// ProseImg pass through `min(natural, 1280)` instead, so undersized images
|
||||||
|
// are only re-encoded, never stretched.
|
||||||
|
function scanImageWidths(): Record<string, number> {
|
||||||
|
const widths: Record<string, number> = {}
|
||||||
|
const raster = new Set(['.png', '.jpg', '.jpeg', '.webp'])
|
||||||
|
function walk(dir: string) {
|
||||||
|
for (const entry of readdirSync(dir, { withFileTypes: true })) {
|
||||||
|
const full = join(dir, entry.name)
|
||||||
|
if (entry.isDirectory()) {
|
||||||
|
walk(full)
|
||||||
|
}
|
||||||
|
else if (raster.has(extname(entry.name).toLowerCase())) {
|
||||||
|
const { width } = imageSize(readFileSync(full))
|
||||||
|
const publicPath = full.slice(full.indexOf('/public/') + '/public'.length)
|
||||||
|
widths[publicPath] = width
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
walk(resolve('./public/img'))
|
||||||
|
return widths
|
||||||
|
}
|
||||||
|
|
||||||
// None of the top-level content sections has a landing page of its own,
|
// None of the top-level content sections has a landing page of its own,
|
||||||
// just a first numbered article inside the folder, so the bare section URL
|
// just a first numbered article inside the folder, so the bare section URL
|
||||||
// (/en/serveex/) has nothing to serve on the static build. Deriving the
|
// (/en/serveex/) has nothing to serve on the static build. Deriving the
|
||||||
@@ -157,6 +186,13 @@ export default defineNuxtConfig({
|
|||||||
// Every single /_ipx/* request 404s (IPX_FILE_NOT_FOUND) otherwise.
|
// Every single /_ipx/* request 404s (IPX_FILE_NOT_FOUND) otherwise.
|
||||||
dir: fileURLToPath(new URL('./public', import.meta.url)),
|
dir: fileURLToPath(new URL('./public', import.meta.url)),
|
||||||
},
|
},
|
||||||
|
runtimeConfig: {
|
||||||
|
public: {
|
||||||
|
// Read by ProseImg to cap each image's width at its own real size
|
||||||
|
// instead of always requesting (and rendering) 1280px.
|
||||||
|
imageWidths: scanImageWidths(),
|
||||||
|
},
|
||||||
|
},
|
||||||
icon: {
|
icon: {
|
||||||
// This site builds to a fully static export (nginx serving prerendered
|
// This site builds to a fully static export (nginx serving prerendered
|
||||||
// files, no Nitro server at runtime), so the `/api/_nuxt_icon` route
|
// files, no Nitro server at runtime), so the `/api/_nuxt_icon` route
|
||||||
|
|||||||
Generated
+13
@@ -16,6 +16,7 @@
|
|||||||
"@nuxtjs/i18n": "^10.6.0",
|
"@nuxtjs/i18n": "^10.6.0",
|
||||||
"better-sqlite3": "^12.11.1",
|
"better-sqlite3": "^12.11.1",
|
||||||
"docus": "^5.13.0",
|
"docus": "^5.13.0",
|
||||||
|
"image-size": "^2.0.2",
|
||||||
"nuxt": "^4.4.8"
|
"nuxt": "^4.4.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -11449,6 +11450,18 @@
|
|||||||
"integrity": "sha512-3MOLanc3sb3LNGWQl1RlQlNWURE5g32aUphrDyFeCsxBTk08iE3VNe4CwsUZ0Qs1X+EfX0+r29Sxdpza4B+yRA==",
|
"integrity": "sha512-3MOLanc3sb3LNGWQl1RlQlNWURE5g32aUphrDyFeCsxBTk08iE3VNe4CwsUZ0Qs1X+EfX0+r29Sxdpza4B+yRA==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/image-size": {
|
||||||
|
"version": "2.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz",
|
||||||
|
"integrity": "sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==",
|
||||||
|
"license": "MIT",
|
||||||
|
"bin": {
|
||||||
|
"image-size": "bin/image-size.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=16.x"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/import-meta-resolve": {
|
"node_modules/import-meta-resolve": {
|
||||||
"version": "4.2.0",
|
"version": "4.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
"@nuxtjs/i18n": "^10.6.0",
|
"@nuxtjs/i18n": "^10.6.0",
|
||||||
"better-sqlite3": "^12.11.1",
|
"better-sqlite3": "^12.11.1",
|
||||||
"docus": "^5.13.0",
|
"docus": "^5.13.0",
|
||||||
|
"image-size": "^2.0.2",
|
||||||
"nuxt": "^4.4.8"
|
"nuxt": "^4.4.8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user