Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add an option to convert images to webp #3

Merged
merged 5 commits into from
Mar 15, 2018
Merged

Add an option to convert images to webp #3

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5bb03b
Add option to generate webp images
Mar 15, 2018
fc9c25d
Set correct mime-type for inline webp images
cyrilwanner Mar 15, 2018
2994276
Add webp options to the readme
cyrilwanner Mar 15, 2018
581e1eb
Correctly set default options
cyrilwanner Mar 15, 2018
80f61a4
Add webp configuration options to the readme
cyrilwanner Mar 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correctly set default options
  • Loading branch information
@cyrilwanner
cyrilwanner committed Mar 15, 2018
commit 581e1eb76f306ba3af6a8ae3953784a4b0f041ac
6 changes: 3 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const getOptimizerConfig = (config, defaultOptions = {}) => {
return false;
}

return config || defaultOptions;
return Object.assign({}, defaultOptions, config || {});
};

/**
Expand Down Expand Up @@ -56,7 +56,7 @@ const withOptimizedImages = ({
optipng,
pngquant = false,
gifsicle,
webp = {},
webp,
svgo,
...nextConfig
} = {}) => {
Expand Down Expand Up @@ -148,7 +148,7 @@ const withOptimizedImages = ({
},
{
loader: `webp-loader`,
options: webp,
options: getOptimizerConfig(webp),
},
],
},
Expand Down