From 7a4116288457664f52c558b2deee34d7a703b579 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 20 Jun 2023 23:11:07 +0100 Subject: [PATCH 1/3] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98d764bde..ffe6a71dd 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/image", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.2", "description": "Nuxt Image Module", "repository": "nuxt/image", "license": "MIT", From c9d8ebdfd119c3daa91b91191ca90eb9343b7b42 Mon Sep 17 00:00:00 2001 From: Alexandr Wokalek Date: Thu, 29 Jun 2023 05:18:50 +0300 Subject: [PATCH 2/3] feat: Provide height with sizes attribute --- src/runtime/image.ts | 4 +++- src/runtime/utils/index.ts | 11 ++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/runtime/image.ts b/src/runtime/image.ts index 70fdbede3..0cad2e730 100644 --- a/src/runtime/image.ts +++ b/src/runtime/image.ts @@ -143,7 +143,9 @@ function getSizes (ctx: ImageCTX, input: string, opts: ImageSizesOptions): Image if (Object.keys(sizes).length > 1) { // 'sizes path' for (const key in sizes) { - const variant = getSizesVariant(key, String(sizes[key]), height, hwRatio, ctx) + const _height = sizes[key][1] ? parseSize(sizes[key][1]) : height + + const variant = getSizesVariant(key, sizes[key][0], _height, hwRatio, ctx) if (variant === undefined) { continue } diff --git a/src/runtime/utils/index.ts b/src/runtime/utils/index.ts index f1612a0fd..ad3100e4f 100644 --- a/src/runtime/utils/index.ts +++ b/src/runtime/utils/index.ts @@ -103,17 +103,14 @@ export function parseDensities (input: string | undefined = ''): number[] { return densities.filter((value, index) => densities.indexOf(value) === index) } -export function parseSizes (input: Record | string): Record { - const sizes: Record = {} +export function parseSizes (input: Record | string): Record { + const sizes: Record = {} // string => object if (typeof input === 'string') { for (const entry of input.split(/[\s,]+/).filter(e => e)) { const s = entry.split(':') - if (s.length !== 2) { - sizes[s[0].trim()] = s[0].trim() - } else { - sizes[s[0].trim()] = s[1].trim() - } + + sizes[s[0].trim()] = (s.length !== 2 ? s[0].trim() : s[1].trim()).split('_') } } else { Object.assign(sizes, input) From d38a25f1e57e1625b403172f9185fb335ea100c9 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 20 Jul 2023 14:47:26 +0100 Subject: [PATCH 3/3] chore: remove version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ffe6a71dd..98d764bde 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/image", - "version": "1.0.0-rc.2", + "version": "1.0.0-rc.1", "description": "Nuxt Image Module", "repository": "nuxt/image", "license": "MIT",