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

Рефакторит структуру проекта #347

Merged
merged 3 commits into from
Oct 21, 2023
Merged

Рефакторит структуру проекта #347

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
9da9683
Рефакторит структуру проекта
monochromer Oct 18, 2023
5b42256
Переименовывает в `index`
monochromer Oct 18, 2023
a0e1c70
Удаляет псевдонимы для импортов
monochromer Oct 19, 2023
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
339 changes: 10 additions & 329 deletions eleventy.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,340 +1,21 @@
const path = require('node:path');
const { parseHTML } = require('linkedom');
const Image = require('@11ty/eleventy-img');
module.exports = function(eleventyConfig) {
// Настройка Markdown
require('./src/eleventy-config/markdown-library.js')(eleventyConfig);

Image.concurrency = require('os').cpus().length;
// Коллекции
require('./src/eleventy-config/collections.js')(eleventyConfig);

const isProdMode = process.env.NODE_ENV === 'production';

module.exports = function(config) {
// Markdown Options

const markdownItAnchor = require('./src/helpers/markdown-it-anchor.js');

const md = require('markdown-it')({
html: true,
highlight: function(str, lang) {
return `<pre><code tabindex="0"${lang ? ` class="language-${lang}"` : ''}>${md.utils.escapeHtml(str)}</code></pre>`;
},
}).use(markdownItAnchor, {
permalink: true,
permalinkClass: 'tooltip__button',
permalinkSymbol: '',
permalinkSpace: false,
slugify: () => 'section',
}).use(require('markdown-it-multimd-table'));

md.renderer.rules = { ...md.renderer.rules,
table_close: () => '</table></div>',
table_open: () => '<div class="content__table-wrapper"><table>',
};

config.setLibrary('md', md);

config.addCollection('tagList', (collection) => {
const set = new Set();
for (const item of collection.getAllSorted()) {
if ('tags' in item.data) {
let tags = item.data.tags;
if (typeof tags === 'string') {
tags = [tags];
}
for (const tag of tags) {
set.add(tag);
}
}
}
return [...set].sort();
});

/*
Коллекция для выпусков подкаста.
Формат данных одного выпуска:
- episode
- title
- date
- chapters
- time
- title
- content
- hosts
- audio
*/
config.addCollection('episodes', () => {
const { getEpisodesData } = require('./src/helpers/podcasts-service');
return getEpisodesData();
});

config.addCollection('people', (collectionAPI) => {
return collectionAPI.getFilteredByGlob('src/people/*/*.md');
});

config.addCollection('articles', (collectionAPI) => {
return collectionAPI.getFilteredByGlob('src/articles/*/*.md');
});

config.addFilter('limit', (array, limit) => {
return array.slice(0, limit);
});

config.addFilter('addHyphens', (content, maxLength = 0) => {
if (!content || content.length <= maxLength) {
return content;
}
let hyphenLibRu = require('hyphen/ru');
let contentWithHyps = hyphenLibRu.hyphenateSync(content);
return contentWithHyps;
});

config.addFilter('fixLinks', (content) => {
const reg = /(src="[^(https://)])|(src="\/)|(href="[^(https://)])|(href="\/)/g;
const prefix = `https://web-standards.ru` + content.url;
return content.templateContent.replace(reg, (match) => {
if (match === `src="/` || match === `href="/`) {
match = match.slice(0, -1);
return match + prefix;
} else {
return match.slice(0, -1) + prefix + match.slice(-1);
}
});
});

// Даты

config.addFilter('ruDate', (value) => {
return value.toLocaleString('ru', {
year: 'numeric',
month: 'long',
day: 'numeric',
}).replace(' г.', '');
});

config.addFilter('shortDate', (value) => {
return value.toLocaleString('ru', {
month: 'short',
day: 'numeric',
}).replace('.', '');
});

config.addFilter('isoDate', (value) => {
return value.toISOString();
});

config.addFilter('markdown', (value) => {
let markdown = require('markdown-it')({
html: true,
});
return markdown.render(value);
});
// Фильтры
require('./src/eleventy-config/filters.js')(eleventyConfig);

// Трансформации

config.addTransform('optimizeContentImages', async function(content) {
if (!this.page.inputPath.includes('/articles/')) {
return content;
}

if (!this.page.outputPath.endsWith('.html')) {
return content;
}

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

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

const articleSourceFolder = path.dirname(this.page.inputPath);
const outputArticleImagesFolder = path.join(path.dirname(this.page.outputPath), 'images');

await Promise.all(images.map(async(image) => {
const fullImagePath = path.join(articleSourceFolder, image.src);
const imageStats = await Image(fullImagePath, {
widths: ['auto', 600, 1200, 2400],
formats: isProdMode
? ['svg', 'avif', 'webp', 'auto']
: ['svg', 'webp', 'auto'],
outputDir: outputArticleImagesFolder,
urlPath: 'images/',
svgShortCircuit: true,
filenameFormat: (hash, src, width, format) => {
const extension = path.extname(src);
const name = path.basename(src, extension);
return `${hash}-${name}-${width}.${format}`;
},
});

const imageAttributes = Object.assign(
{
loading: 'lazy',
decoding: 'async',
sizes: [
'(min-width: 1920px) calc((1920px - 2 * 64px) * 5 / 8 - 2 * 16px)',
'(min-width: 1240px) calc((100vw - 2 * 64px) * 5 / 8 - 2 * 16px)',
'(min-width: 700px) calc(700px - 2 * 16px)',
'calc(100vw - 2 * 16px)',
].join(','),
},
Object.fromEntries(
[...image.attributes].map((attr) => [attr.name, attr.value])
)
);

const newImageHTML = Image.generateHTML(imageStats, imageAttributes);
image.outerHTML = newImageHTML;
}));

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');
let result = htmlmin.minify(
content, {
removeComments: true,
collapseWhitespace: true,
collapseBooleanAttributes: true,
}
);
return result;
}
return content;
});

config.addTransform('xmlmin', function(content, outputPath) {
if (outputPath && outputPath.endsWith('.xml')) {
let prettydata = require('pretty-data');
let result = prettydata.pd.xmlmin(content);
return result;
}
return content;
});

config.addTransform('lazyYouTube', (content, outputPath) => {
let articles = /articles\/([a-zA-Z0-9_-]+)\/index\.html/i;
let iframes = /<iframe src="https:\/\/www\.youtube\.com\/embed\/([a-zA-Z0-9_-]+)"(.*?)><\/iframe>/ig;

if (outputPath && outputPath.match(articles)) {
content = content.replace(iframes, (match, p1) => {
return `
<div class="video">
<a class="video__link" href="https://youtu.be/${p1}">
<picture>
<source srcset="https://img.youtube.com/vi/${p1}/maxresdefault.jpg" media="(min-width: 736px)">
<img class="video__media" src="https://img.youtube.com/vi/${p1}/mqdefault.jpg" alt="">
</picture>
</a>
<button class="video__button" type="button" aria-label="Запустить видео">
<svg width="68" height="48" viewBox="0 0 68 48"><path class="video__button-shape" d="M66.52,7.74c-0.78-2.93-2.49-5.41-5.42-6.19C55.79,.13,34,0,34,0S12.21,.13,6.9,1.55 C3.97,2.33,2.27,4.81,1.48,7.74C0.06,13.05,0,24,0,24s0.06,10.95,1.48,16.26c0.78,2.93,2.49,5.41,5.42,6.19 C12.21,47.87,34,48,34,48s21.79-0.13,27.1-1.55c2.93-0.78,4.64-3.26,5.42-6.19C67.94,34.95,68,24,68,24S67.94,13.05,66.52,7.74z"></path><path class="video__button-icon" d="M 45,24 27,14 27,34"></path></svg>
</button>
</div>`;
});
}
return content;
});
require('./src/eleventy-config/transforms.js')(eleventyConfig);

// Теги

config.addShortcode('blob', function(authorName) {
const blobColors = [1, 2, 3, 4];
const blobShapes = [1, 2, 3, 4, 5, 6, 7];
const shapePrefix = 'blob--shape-';
const colorPrefix = 'blob--color-';

const getBlobClass = (basis, array, name) => (
name.concat(array[basis % array.length])
);

const shapeBasis = authorName.split('').reduce(
(previous, current) => previous + current.charCodeAt(0), 0
);
const colorBasis = authorName.length;

const colorClass = getBlobClass(colorBasis, blobColors, colorPrefix);
const shapeClass = getBlobClass(shapeBasis, blobShapes, shapePrefix);

return colorClass.concat(' ', shapeClass);
});
require('./src/eleventy-config/shortcodes.js')(eleventyConfig);

// Копирование

[
'src/favicon.ico',
'src/manifest.json',
'src/fonts',
'src/images',
'src/styles',
'src/scripts',
'src/{articles,people}/**/*.!(md)',
].forEach((path) => config.addPassthroughCopy(path));
require('./src/eleventy-config/static-files.js')(eleventyConfig);

return {
dir: {
Expand Down
44 changes: 44 additions & 0 deletions src/eleventy-config/collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
const { getEpisodesData } = require('../libs/podcasts-service.js');

module.exports = function(eleventyConfig) {
eleventyConfig.addCollection('tagList', (collection) => {
const set = new Set();
for (const item of collection.getAllSorted()) {
if ('tags' in item.data) {
let tags = item.data.tags;
if (typeof tags === 'string') {
tags = [tags];
}
for (const tag of tags) {
set.add(tag);
}
}
}
return [...set].sort();
});

/*
Коллекция для выпусков подкаста.
Формат данных одного выпуска:
- episode
- title
- date
- chapters
- time
- title
- content
- hosts
- audio
*/
eleventyConfig.addCollection('episodes', () => {
return getEpisodesData();
});

eleventyConfig.addCollection('people', (collectionAPI) => {
return collectionAPI.getFilteredByGlob('src/people/*/*.md');
});

eleventyConfig.addCollection('articles', (collectionAPI) => {
return collectionAPI.getFilteredByGlob('src/articles/*/*.md');
});
};
Loading