fix: support Vite's base config (#489)

JonasKruckenberg · Jan 20, 2023 · 6291c71 · 6291c71
1 parent c0e5fd2
commit 6291c71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.changeset/pink-yaks-jam.md b/.changeset/pink-yaks-jam.md
@@ -0,0 +1,5 @@
+---
+'vite-imagetools': patch
+---
+
+fix: support Vite's `base` config
diff --git a/packages/vite/src/index.ts b/packages/vite/src/index.ts
@@ -37,6 +37,7 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
     : builtinOutputFormats
 
   let viteConfig: ResolvedConfig
+  let basePath: string
 
   const generatedImages = new Map()
 
@@ -45,6 +46,7 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
     enforce: 'pre',
     configResolved(cfg) {
       viteConfig = cfg
+      basePath = viteConfig.base?.replace(/\/$/, '') || ''
     },
     async load(id) {
       if (!filter(id)) return null
@@ -88,7 +90,7 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
 
           metadata.src = `__VITE_ASSET__${fileHandle}__`
         } else {
-          metadata.src = posix.join('/@imagetools', id)
+          metadata.src = posix.join(basePath, '@imagetools', id)
         }
 
         metadata.image = image
@@ -118,8 +120,8 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
 
     configureServer(server) {
       server.middlewares.use((req, res, next) => {
-        if (req.url?.startsWith('/@imagetools/')) {
-          const [, id] = req.url.split('/@imagetools/')
+        if (req.url?.startsWith(`${basePath}/@imagetools/`)) {
+          const [, id] = req.url.split(`${basePath}/@imagetools/`)
 
           const image = generatedImages.get(id)