Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
158 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,5 @@ | ||
| export function createIPXMiddleware (options) { | ||
| const { IPX, IPXMiddleware } = require('ipx') | ||
|
|
||
| const ipx = new IPX({ | ||
| inputs: [ | ||
| { | ||
| name: 'remote', | ||
| adapter: 'remote', | ||
| accept: [/.*/] | ||
| }, | ||
| { | ||
| name: 'static', | ||
| adapter: 'fs', | ||
| dir: options.dir | ||
| } | ||
| ], | ||
| cache: { | ||
| dir: options.cacheDir, | ||
| cleanCron: options.clearCache | ||
| }, | ||
| sharp: options.sharp | ||
| }) | ||
|
|
||
| return IPXMiddleware(ipx) | ||
| export function createIPXMiddleware (ipxOptions) { | ||
| const { createIPX, createIPXMiddleware } = require('ipx') | ||
| const ipx = createIPX(ipxOptions) | ||
| return createIPXMiddleware(ipx) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,39 @@ | ||
| import { ProviderGetImage } from 'src' | ||
| import { hasProtocol, joinURL } from 'ufo' | ||
| import { joinURL, encodeQueryItem, encodePath, hasProtocol } from 'ufo' | ||
| import { createOperationsGenerator } from '~image' | ||
|
|
||
| const operationsGenerator = createOperationsGenerator({ | ||
| keyMap: { | ||
| fit: 'f', | ||
| format: 'f', | ||
| fit: 'fit', | ||
| width: 'w', | ||
| height: 'h', | ||
| resize: 's', | ||
| quality: 'q', | ||
| background: 'b' | ||
| background: 'bg' | ||
| }, | ||
| valueMap: { | ||
| background (value = '') { | ||
| if (value.startsWith('#')) { | ||
| return value.replace('#', 'hex_') | ||
| } | ||
| return value | ||
| } | ||
| }, | ||
| joinWith: ',', | ||
| formatter: (key, value) => `${key}_${value}` | ||
| joinWith: '&', | ||
| formatter: (key, val) => encodeQueryItem(key, val) | ||
| }) | ||
|
|
||
| export const getImage: ProviderGetImage = (src, { modifiers = {}, baseURL = '/' } = {}) => { | ||
| const format = modifiers.format || '_' | ||
| delete modifiers.format | ||
|
|
||
| export const getImage: ProviderGetImage = (src, { modifiers = {}, baseURL = '/_ipx', domains = [] } = {}) => { | ||
| if (modifiers.width && modifiers.height) { | ||
| modifiers.resize = `${modifiers.width}_${modifiers.height}` | ||
| delete modifiers.width | ||
| delete modifiers.height | ||
| } | ||
|
|
||
| const operationsString = operationsGenerator(modifiers) || '_' | ||
| const params = operationsGenerator(modifiers) | ||
|
|
||
| const type = hasProtocol(src) ? 'remote' : 'static' | ||
| if (hasProtocol(src)) { | ||
| if (!domains.find(d => src.startsWith(d))) { | ||
| return { | ||
| url: src | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return { | ||
| url: joinURL(baseURL, type, format, operationsString, src) | ||
| url: joinURL(baseURL, encodePath(src) + (params ? '?' + params : '')) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,30 @@ | ||
| import type { IPXOptions } from 'ipx' | ||
| import type { ImageOptions } from './image' | ||
|
|
||
| export interface InputProvider { | ||
| export interface InputProvider<T=any> { | ||
| name?: string | ||
| provider?: string | ||
| options?: any | ||
| baseURL?: string | ||
| options?: T | ||
| } | ||
|
|
||
| export interface ImageProviders { | ||
| cloudinary?: InputProvider, | ||
| fastly?: InputProvider, | ||
| imagekit?: InputProvider, | ||
| imgix?: InputProvider, | ||
| twicpics?: InputProvider, | ||
| cloudinary?: any | ||
| fastly?: any | ||
| imagekit?: any | ||
| imgix?: any | ||
| twicpics?: any | ||
| ipx?: Partial<IPXOptions> | ||
| static?: Partial<IPXOptions> | ||
| } | ||
|
|
||
| export interface ModuleOptions extends ImageProviders { | ||
| provider: string | ||
| presets: { [name: string]: ImageOptions } | ||
| static: { | ||
| baseURL: string | ||
| dir: string | ||
| clearCache: boolean | string | ||
| cacheDir: string | ||
| accept: string[] | ||
| sharp: { [key: string]: any } | ||
| } | ||
| sizes?: (number|string)[], | ||
| internalUrl?: string | ||
| accept: any | ||
| dir: string | ||
| domains: string[] | ||
| sharp: {} | ||
| sizes: (number|string)[], | ||
| internalUrl: string | ||
| intersectOptions: object | ||
|
|
||
| providers: { [name: string]: InputProvider | any } & ImageProviders | ||
| } |
Oops, something went wrong.