Skip to content

Rebase of avif support #1074

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

Merged
merged 3 commits into from
Jan 21, 2022
Merged

Rebase of avif support #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d0c725
Support AVIF images
benbankes Oct 28, 2021
abd66f4
Also modify the test images rule
benbankes Oct 28, 2021
1f6874e
updating tests
weaverryan Jan 21, 2022
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
2 changes: 1 addition & 1 deletion lib/config-generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class ConfigGenerator {

if (this.webpackConfig.imageRuleOptions.enabled) {
rules.push(generateAssetRuleConfig(
/\.(png|jpg|jpeg|gif|ico|svg|webp)$/,
/\.(png|jpg|jpeg|gif|ico|svg|webp|avif)$/,
this.webpackConfig.imageRuleOptions,
this.webpackConfig.imageRuleCallback,
'images'
Expand Down
10 changes: 5 additions & 5 deletions test/config-generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ describe('The config-generator function', () => {

const actualConfig = configGenerator(config);

const imagesRule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp)$/, actualConfig.module.rules).oneOf[1];
const imagesRule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp|avif)$/, actualConfig.module.rules).oneOf[1];
expect(imagesRule.type).to.equal('asset/resource');
expect(imagesRule.generator).to.eql({ filename: 'images/[name].[hash:8][ext]' });
expect(imagesRule.parser).to.eql({});
Expand All @@ -904,7 +904,7 @@ describe('The config-generator function', () => {

const actualConfig = configGenerator(config);

const imagesRule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp)$/, actualConfig.module.rules).oneOf[1];
const imagesRule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp|avif)$/, actualConfig.module.rules).oneOf[1];
expect(imagesRule.type).to.equal('asset/resource');
expect(imagesRule.generator).to.eql({ filename: 'file.[hash][ext]' });
});
Expand All @@ -921,7 +921,7 @@ describe('The config-generator function', () => {

const actualConfig = configGenerator(config);

const imagesRule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp)$/, actualConfig.module.rules).oneOf[1];
const imagesRule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp|avif)$/, actualConfig.module.rules).oneOf[1];
expect(imagesRule.parser).to.eql({ dataUrlCondition: { maxSize: 3000 } });
});

Expand All @@ -937,7 +937,7 @@ describe('The config-generator function', () => {
const actualConfig = configGenerator(config);

expect(function() {
findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp)$/, actualConfig.module.rules);
findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp|avif)$/, actualConfig.module.rules);
}).to.throw();
});
});
Expand Down Expand Up @@ -1229,7 +1229,7 @@ describe('The config-generator function', () => {
});

const webpackConfig = configGenerator(config);
const rule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp)$/, webpackConfig.module.rules).oneOf[1];
const rule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp|avif)$/, webpackConfig.module.rules).oneOf[1];

expect(rule.generator.filename).to.equal('dirname-images/[hash:42][ext]');
});
Expand Down