fix: merge merge presets with inline modifiers

nuxt · Nov 17, 2020 · 164af06 · 164af06
1 parent 0856343
commit 164af06
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/runtime/image.ts b/src/runtime/image.ts
@@ -1,3 +1,4 @@
+import defu from 'defu'
 import type { CreateImageOptions, ImageModifiers, ImagePreset, ImageSize } from 'types'
 import { getMeta } from './meta'
 import { cleanDoubleSlashes, isRemoteUrl } from './utils'
@@ -77,7 +78,7 @@ export function createImage (context, { providers, defaultProvider, presets, int
 
     const image = provider.provider.getImage(
       src,
-      preset ? preset.modifiers : modifiers,
+      defu(modifiers, preset.modifiers),
       { ...provider.defaults, ...options }
     )
 

diff --git a/src/runtime/nuxt-img.ts b/src/runtime/nuxt-img.ts
@@ -14,15 +14,15 @@ export default {
     },
     format: {
       type: String,
-      default: undefined
+      default: null
     },
     quality: {
       type: [Number, String],
-      default: 75
+      default: null
     },
     fit: {
       type: String,
-      default: 'cover'
+      default: null
     },
     operations: {
       type: Object,

diff --git a/src/runtime/nuxt-picture.ts b/src/runtime/nuxt-picture.ts
@@ -32,19 +32,19 @@ export default {
     },
     format: {
       type: String,
-      default: undefined
+      default: null
     },
     fallbackFormat: {
       type: String,
-      default: undefined
+      default: null
     },
     quality: {
       type: [Number, String],
-      default: 75
+      default: null
     },
     fit: {
       type: String,
-      default: 'cover'
+      default: null
     },
     operations: {
       type: Object,