fix(ipx): allow overriding baseURL regardless of router base (#484)

Co-authored-by: Pooya Parsa <pyapar@gmail.com>
nuxt · Jun 21, 2022 · 2720956 · 2720956
1 parent fc7e3d5
commit 2720956
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/runtime/providers/ipx.ts b/src/runtime/providers/ipx.ts
@@ -16,7 +16,7 @@ const operationsGenerator = createOperationsGenerator({
   formatter: (key, val) => encodeParam(key) + '_' + encodeParam(val)
 })
 
-export const getImage: ProviderGetImage = (src, { modifiers = {}, baseURL = '/_ipx' } = {}, { nuxtContext: { base: nuxtBase = '/' } = {} }) => {
+export const getImage: ProviderGetImage = (src, { modifiers = {}, baseURL } = {}, ctx) => {
   if (modifiers.width && modifiers.height) {
     modifiers.resize = `${modifiers.width}x${modifiers.height}`
     delete modifiers.width
@@ -25,8 +25,12 @@ export const getImage: ProviderGetImage = (src, { modifiers = {}, baseURL = '/_i
 
   const params = operationsGenerator(modifiers) || '_'
 
+  if (!baseURL) {
+    baseURL = joinURL(ctx.nuxtContext.base || '/', '/_ipx')
+  }
+
   return {
-    url: joinURL(nuxtBase, baseURL, params, encodePath(src))
+    url: joinURL(baseURL, params, encodePath(src))
   }
 }
 

diff --git a/src/types/image.ts b/src/types/image.ts
@@ -80,6 +80,7 @@ export interface ImageCTX {
     isDev: boolean
     isStatic: boolean
     nuxtState?: any
+    base?: string
   }
   $img?: $Img
 }