Skip to content

refactor: import variant tier constants from shared module in loader #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zheaoli merged 1 commit into from
May 30, 2026
Merged

refactor: import variant tier constants from shared module in loader #492

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions lib/image/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
* Client-side responsive variant URL builder for the gallery's custom
* next/image loader.
*
* IMPORTANT: this MUST stay in sync with `server/lib/image-variants.ts`
* (`VARIANT_TIER_WIDTHS` + `buildVariantKey`). That module is `server-only`
* (it imports sharp), so the naming convention is mirrored here as the single
* client-side source of truth. Any change to the tier ladder or the
* `{baseKey}_{width}.{format}` key shape must be made in both files.
* The tier ladder and `{baseKey}_{width}.{format}` key shape come from the
* shared, client-safe `~/lib/image/variant-tiers` module (the single source of
* truth, also re-exported by the server-only `server/lib/image-variants.ts`),
* so there are no longer duplicated constants to keep in sync.
*/

export const VARIANT_TIER_WIDTHS = [320, 480, 640, 800, 1080, 1280, 1920, 2560] as const
import { VARIANT_TIER_WIDTHS, buildVariantKey, type VariantFormat } from '~/lib/image/variant-tiers'

export type VariantFormat = 'avif' | 'webp'
export type { VariantFormat }

/**
* Round a requested render width up to the nearest generated tier, clamped to
Expand All @@ -27,11 +26,6 @@ export function ceilToTier(width: number): number {
return VARIANT_TIER_WIDTHS[VARIANT_TIER_WIDTHS.length - 1]
}

/** Variant object key `{baseKey}_{width}.{format}` — mirrors `buildVariantKey`. */
export function buildVariantKey(baseKey: string, width: number, format: VariantFormat): string {
return `${baseKey}_${width}.${format}`
}

function joinUrl(base: string, key: string): string {
return `${base.replace(/\/+$/, '')}/${key}`
}
Expand Down
Loading