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.

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

Добавляет оптимизацию изображений аватаров #342

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
65 changes: 65 additions & 0 deletions eleventy.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,71 @@ module.exports = function(config) {
return document.toString();
});

{
const avatarImageFormats = isProdMode
? ['avif', 'webp', 'jpeg']
: ['webp', 'jpeg'];

const formatsOrder = ['avif', 'webp', 'jpeg'];

config.addTransform('optimizeAvatarImages', async function(content) {
if (!this.page.outputPath.endsWith?.('.html')) {
return content;
}

const { document } = parseHTML(content);
const images = Array.from(document.querySelectorAll('.blob__photo'))
.filter((image) => !image.src.match(/^https?:/));

if (images.length === 0) {
return content;
}

await Promise.all(images.map(async(image) => {
const fullImagePath = path.join(config.dir.input, image.src);
const avatarsOutputFolder = path.dirname(path.join(config.dir.output, image.src));

const imageStats = await Image(fullImagePath, {
widths: image.sizes
.split(',')
.flatMap((entry) => {
entry = entry.split(/\s+/).at(-1);
entry = parseFloat(entry);
return [entry, entry * 2];
}),
formats: avatarImageFormats,
outputDir: avatarsOutputFolder,
urlPath: image.src.split('/').slice(0, -1).join('/'),
svgShortCircuit: true,
filenameFormat: (hash, src, width, format) => {
const extension = path.extname(src);
const name = path.basename(src, extension);
return `${hash}-${name}-${width}.${format}`;
},
});

image.outerHTML = `
<picture>
${
formatsOrder
.map(((format) => imageStats[format]))
.filter(Boolean)
.map((stats) => {
const type = stats[0].sourceType;
const srcset = stats.map((statsItem) => statsItem.srcset).join(',');
return `<source type="${type}" srcset="${srcset}"/>`;
})
.join('')
}
${image.outerHTML}
</picture>
`;
}));

return document.toString();
});
}

config.addTransform('htmlmin', (content, outputPath) => {
if (outputPath && outputPath.endsWith('.html')) {
let htmlmin = require('html-minifier');
Expand Down
1 change: 1 addition & 0 deletions src/includes/article-card.njk
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
blob__photo"
src="/people/{{ personPhoto }}"
width="80" height="80"
sizes="(min-width: 1024px) 112px, 80px"
{% if articleType === '--articles' %}loading="lazy"{% endif %}
alt="{{ person.name }}">
</div>
Expand Down
8 changes: 6 additions & 2 deletions src/layouts/article.njk
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ layout: page.njk
<span class="creators__author-avatar blob {% blob person.name %}">
<img class="blob__photo"
src="/people/{{ personPhoto }}"
width="100" height="100" alt="{{ person.name }}">
width="100" height="100"
sizes="(min-width: 1240px) 128px, (min-width: 1024px) 112px, 100px"
alt="{{ person.name }}">
</span>
<span class="creators__author-name" itemprop="author">
{{ person.name }}
Expand All @@ -76,7 +78,9 @@ layout: page.njk
<span class="creators__author-avatar blob {% blob person.name %}">
<img class="blob__photo"
src="/people/{{ personPhoto }}"
width="100" height="100" alt="{{ person.name }}">
width="100" height="100"
sizes="(min-width: 1240px) 128px, (min-width: 1024px) 112px, 100px"
alt="{{ person.name }}">
</span>
<span class="creators__author-name" itemprop="author">
{{ person.name }}
Expand Down
4 changes: 2 additions & 2 deletions src/styles/blocks/creators.css
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@

@media (min-width: 1024px) {
.creators__author-avatar {
width: 113px;
height: 113px;
width: 112px;
height: 112px;
}
}

Expand Down