Skip to content

fix(hygraph): new asset management support #1415

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
danielroe merged 3 commits into from
Aug 27, 2024
Merged

fix(hygraph): new asset management support #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
341aeb6
Cleaner URL splitter for new Hygraph asset management. Updates snapshots
timbenniks Jul 23, 2024
fcb30ff
chore: update
danielroe Aug 27, 2024
cd39cd1
Merge branch 'main' into main
danielroe Aug 27, 2024
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
30 changes: 26 additions & 4 deletions src/runtime/providers/hygraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,36 @@ export function getImageFormat(format?: string) {
return result
}

export function splitUpURL(url: string, baseURL: string) {
// Starting Image URL: https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue

// get Both IDs split off of the baseURL
// -> cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue
const bothIds = url.split(`${baseURL}/`)[1]

// get baseId
// -> cltsj3mii0pvd07vwb5cyh1ig
const baseId = bothIds.split('/')[0]

// get imageId
// -> cltsrex89477t08unlckqx9ue
const imageId = url.split(`/`)[url.split(`/`).length - 1]

return {
baseId,
imageId,
}
}

export function optimizeHygraphImage(baseURL: string, url: string, optimizations: ImageOptimizations) {
baseURL = baseURL.replace(/\/+$/, '')
const imageId = url.split(`${baseURL}/`)[1]

const { baseId, imageId } = splitUpURL(url, baseURL)
const imageFormat = getImageFormat(optimizations.format)
const optimBase = 'resize'
const quality = optimizations.quality ? `quality=value:${optimizations.quality}/compress=metadata:true/` : ''
const quality = optimizations.quality && imageFormat !== 'auto_image' ? `quality=value:${optimizations.quality}/` : ''

const optimList = []
const optimList: [string?] = []
for (const [key, value] of Object.entries(optimizations)) {
if (key !== 'format' && key !== 'quality' && value !== undefined) {
if (key === 'fit' && value === 'contain') {
Expand All @@ -39,7 +61,7 @@ export function optimizeHygraphImage(baseURL: string, url: string, optimizations
}

const optim = `${optimBase}=${optimList.join(',')}`
const result = joinURL(baseURL, optim, quality, imageFormat, imageId)
const result = joinURL(baseURL, baseId, optim, quality, imageFormat, imageId)

return result
}
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/__snapshots__/hygraph.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"requests": [
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/resize=width:300,height:300,fit:clip/output=format:jpeg/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/resize=width:500,fit:max/auto_image/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/resize=width:500,height:500,fit:crop/quality=value:90/compress=metadata:true/auto_image/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue/resize=width:300,height:300,fit:clip/output=format:jpeg/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue/resize=width:500,fit:max/auto_image/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue/resize=width:500,height:500,fit:crop/auto_image/cltsrex89477t08unlckqx9ue",
],
"sources": [
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/resize=width:500,height:500,fit:crop/quality=value:90/compress=metadata:true/auto_image/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/resize=width:500,fit:max/auto_image/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/resize=width:300,height:300,fit:clip/output=format:jpeg/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue/resize=width:500,height:500,fit:crop/auto_image/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue/resize=width:500,fit:max/auto_image/cltsrex89477t08unlckqx9ue",
"https://eu-central-1-shared-euc1-02.graphassets.com/cltsj3mii0pvd07vwb5cyh1ig/cltsrex89477t08unlckqx9ue/resize=width:300,height:300,fit:clip/output=format:jpeg/cltsrex89477t08unlckqx9ue",
],
}
284 changes: 0 additions & 284 deletions test/e2e/__snapshots__/no-ssr.test.ts.snap
View file
Open in desktop

This file was deleted.

Loading