fix(vite-plugin): honor server origin and merge client types with Vite's

Author: dangreen

packages/vite-plugin/client.d.ts

@@ -1,6 +1,8 @@
 /* oxlint-disable trigen/import-order */
 /**
  * Ambient module declarations for image imports handled by @srcset/vite-plugin.
+ * Only the named exports are declared: the default url export
+ * comes from the `vite/client` asset types.
  *
  * Usage: add to tsconfig `types` or reference directly:
  * /// <reference types="@srcset/vite-plugin/client" />
@@ -9,71 +11,53 @@
 declare module '*.jpg' {
   import type { SrcSetEntry } from '@srcset/runtime'
 
-  const url: string
-
   export const src: SrcSetEntry
   export const srcSet: SrcSetEntry[]
   export const srcMap: Record<string, string>
   export const placeholder: string | undefined
-  export default url
 }
 
 declare module '*.jpeg' {
   import type { SrcSetEntry } from '@srcset/runtime'
 
-  const url: string
-
   export const src: SrcSetEntry
   export const srcSet: SrcSetEntry[]
   export const srcMap: Record<string, string>
   export const placeholder: string | undefined
-  export default url
 }
 
 declare module '*.png' {
   import type { SrcSetEntry } from '@srcset/runtime'
 
-  const url: string
-
   export const src: SrcSetEntry
   export const srcSet: SrcSetEntry[]
   export const srcMap: Record<string, string>
   export const placeholder: string | undefined
-  export default url
 }
 
 declare module '*.webp' {
   import type { SrcSetEntry } from '@srcset/runtime'
 
-  const url: string
-
   export const src: SrcSetEntry
   export const srcSet: SrcSetEntry[]
   export const srcMap: Record<string, string>
   export const placeholder: string | undefined
-  export default url
 }
 
 declare module '*.avif' {
   import type { SrcSetEntry } from '@srcset/runtime'
 
-  const url: string
-
   export const src: SrcSetEntry
   export const srcSet: SrcSetEntry[]
   export const srcMap: Record<string, string>
   export const placeholder: string | undefined
-  export default url
 }
 
 declare module '*.gif' {
   import type { SrcSetEntry } from '@srcset/runtime'
 
-  const url: string
-
   export const src: SrcSetEntry
   export const srcSet: SrcSetEntry[]
   export const srcMap: Record<string, string>
   export const placeholder: string | undefined
-  export default url
 }

packages/vite-plugin/src/plugin.ts

@@ -49,6 +49,7 @@ export function srcset(options: SrcSetVitePluginOptions = {}): Plugin {
   const matchesLoadFilter = createFilter(loadFilter.id.include, loadFilter.id.exclude)
   const devCache: DevCache = new Map()
   let base = '/'
+  let origin = ''
   let isBuild = false
   const generateModule = async (context: EmitContext, id: string) => {
     const { path } = splitId(id)
@@ -77,7 +78,7 @@ export function srcset(options: SrcSetVitePluginOptions = {}): Plugin {
 
       return {
         outputPath: devPath,
-        publicPath: base + devPath
+        publicPath: origin + base + devPath
       }
     }
 
@@ -95,6 +96,8 @@ export function srcset(options: SrcSetVitePluginOptions = {}): Plugin {
     enforce: 'pre',
     configResolved(config) {
       base = config.base
+      // Vite includes the origin in the dev asset urls for backend integrations.
+      origin = config.server.origin ?? ''
       isBuild = config.command === 'build'
     },
     configureServer(server) {