-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
feat: Allow configuring cache directory for @sveltejs/enhanced-img #14991
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
strfx
wants to merge
2
commits into
sveltejs:main
Choose a base branch
from
strfx:feat/sveltejs-enhanced-img-cache-dir
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+26
−3
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sveltejs/enhanced-img': minor | ||
| --- | ||
|
|
||
| feat: Allow configuring cache directory |
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -4,10 +4,16 @@ import { imagetools } from 'vite-imagetools'; | |
| import { image_plugin } from './vite-plugin.js'; | ||
|
|
||
| /** | ||
| * @typedef {{cache?: CacheOptions}} EnhancedImageOptions | ||
| * @typedef {{enabled?: boolean, directory?: string, retention?: number}} CacheOptions | ||
| */ | ||
|
|
||
| /** | ||
| * @param { EnhancedImageOptions } opts | ||
| * @returns {import('vite').Plugin[]} | ||
| */ | ||
| export function enhancedImages() { | ||
| const imagetools_instance = imagetools_plugin(); | ||
| export function enhancedImages(opts = {}) { | ||
| const imagetools_instance = imagetools_plugin(opts); | ||
| return !process.versions.webcontainer | ||
| ? [image_plugin(imagetools_instance), imagetools_instance] | ||
| : []; | ||
|
|
@@ -25,7 +31,11 @@ const fallback = { | |
| '.webp': 'png' | ||
| }; | ||
|
|
||
| function imagetools_plugin() { | ||
| /** | ||
| * @param { EnhancedImageOptions } opts | ||
| * @returns {import('vite').Plugin} | ||
| */ | ||
| function imagetools_plugin(opts = {}) { | ||
| /** @type {Partial<import('vite-imagetools').VitePluginOptions>} */ | ||
| const imagetools_opts = { | ||
| defaultDirectives: async ({ pathname, searchParams: qs }, metadata) => { | ||
|
|
@@ -49,6 +59,14 @@ function imagetools_plugin() { | |
| namedExports: false | ||
| }; | ||
|
|
||
| if (opts.cache) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is there a reason to not pass the opts to imagetools directly? |
||
| imagetools_opts.cache = { | ||
| enabled: opts.cache.enabled, | ||
| dir: opts.cache.directory, | ||
| retention: opts.cache.retention | ||
| }; | ||
| } | ||
|
|
||
| // TODO: should we make formats or sizes configurable besides just letting people override defaultDirectives? | ||
| // TODO: generate img rather than picture if only a single format is provided | ||
| // by resolving the directives for the URL in the preprocessor | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these should use the types exported by vite-imagetools so that we don't have to update here if they add new options
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right - I've originally opted for a custom interface following the discussion in the linked issue. But looking at it now, using vite-imagetools's types makes more sense. I'll update the PR accordingly.