Skip to content

Commit 763cc3b

Browse files
fix: make urlFormat the fallback
1 parent 989988a commit 763cc3b

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/index.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function imagetools(userOptions: Partial<PluginOptions> = {}): Plugin {
3838

3939
const directives = [...pluginOptions.customDirectives, ...Object.values(builtinDiretcives)]
4040

41-
const outputFormats = [...pluginOptions.customOutputFormats, ...Object.values(builtinOutputFormats)]
41+
const outputFormats = [...pluginOptions.customOutputFormats, builtinOutputFormats.metadataFormat, builtinOutputFormats.srcsetFormat]
4242

4343
return {
4444
name: 'imagetools',
@@ -116,7 +116,8 @@ export function imagetools(userOptions: Partial<PluginOptions> = {}): Plugin {
116116
// go through all output formats to find the one to use
117117
const output = outputFormats
118118
.map(f => f(src, outputMetadatas))
119-
.find(res => !!res)
119+
.find(res => !!res) || builtinOutputFormats.urlFormat(src, outputMetadatas)
120+
120121

121122
// output as JSON or esm depending on the vite config
122123
return viteConfig.json?.stringify

src/output.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { dataToEsm } from "@rollup/pluginutils"
12
import { OutputFormat } from "./types"
23

34
export const metadataFormat: OutputFormat = (src: URL, outputMetadatas: Record<string, any>[]) => {
@@ -9,7 +10,15 @@ export const metadataFormat: OutputFormat = (src: URL, outputMetadatas: Record<s
910
export const srcsetFormat: OutputFormat = (src: URL, outputMetadatas: Record<string, any>[]) => {
1011
if (!src.searchParams.has('srcset')) return null
1112

12-
return outputMetadatas.length === 1 ? outputMetadatas[0] : outputMetadatas
13+
const sources = outputMetadatas.reduce((prev,meta) => {
14+
if(prev) {
15+
return `${prev}, ${meta.src} ${meta.width}w`
16+
} else {
17+
return `${meta.src} ${meta.width}w`
18+
}
19+
}, '')
20+
21+
return sources
1322
}
1423

1524
export const urlFormat: OutputFormat = (src: URL, outputMetadatas: Record<string, any>[]) => {

0 commit comments

Comments
 (0)