fix: don't allow undefined values to override defaults (#274)

closes #273
nuxt · May 17, 2021 · d2e65f9 · d2e65f9
1 parent 7e06ea6
commit d2e65f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/runtime/image.ts b/src/runtime/image.ts
@@ -23,10 +23,7 @@ export function createImage (globalOptions: CreateImageOptions, nuxtContext: any
   const $img = function $img (input, modifiers = {}, options = {}) {
     return getImage(input, {
       ...options,
-      modifiers: {
-        ...options.modifiers,
-        ...modifiers
-      }
+      modifiers: defu(modifiers, options.modifiers || {})
     }).url
   } as $Img
 

diff --git a/src/runtime/providers/cloudinary.ts b/src/runtime/providers/cloudinary.ts
@@ -1,5 +1,6 @@
 import type { ProviderGetImage } from 'src'
 import { joinURL, encodePath } from 'ufo'
+import defu from 'defu'
 import { createOperationsGenerator } from '~image'
 
 const convertHextoRGBFormat = (value: string) => value.startsWith('#') ? value.replace('#', 'rgb_') : value
@@ -80,7 +81,7 @@ const defaultModifiers = {
 }
 
 export const getImage: ProviderGetImage = (src, { modifiers = {}, baseURL = '/' } = {}) => {
-  const mergeModifiers = { ...defaultModifiers, ...modifiers }
+  const mergeModifiers = defu(modifiers, defaultModifiers)
   const operations = operationsGenerator(mergeModifiers as any)
 
   const remoteFolderMapping = baseURL.match(/\/image\/upload\/(.*)/)