Skip to content

Commit

Permalink
ci(whatislove-dev): uncomment linthtml wd-365 (#537)
Browse files Browse the repository at this point in the history
  • Loading branch information
what1s1ove authored May 31, 2024
1 parent 6ab5f1b commit 0662f07
Show file tree
Hide file tree
Showing 18 changed files with 7,475 additions and 6,997 deletions.
6 changes: 5 additions & 1 deletion apps/whatislove-dev/lint-staged.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ let config = {
() => `npm run ci:lint:js -w apps/whatislove-dev`,
() => `npm run ci:lint:type -w apps/whatislove-dev`,
],
'**/*.njk': [() => `npm run ci:lint:bem -w apps/whatislove-dev`],
'**/*.njk': [
() => `npm run ci:lint:bem -w apps/whatislove-dev`,
() => `npm run ci:lint:html -w apps/whatislove-dev`,
() => `npm run ci:lint:markup -w apps/whatislove-dev`,
],
}

export default config
3 changes: 2 additions & 1 deletion apps/whatislove-dev/linthtml.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
let config = {
extends: `linthtml-config-htmlacademy`,
rules: {
'doctype-first': false,
'no-surrounding-whitespace': false,
'tag-close': false,
},
}

Expand Down
4 changes: 2 additions & 2 deletions apps/whatislove-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build:clean": "rm -rf build",
"build": "npm run build:clean && npx @11ty/eleventy",
"ci:lint:markup": "w3c-html-validator \"build\" '--ignore=/“sizes” attribute must also be specified/'",
"_ci:lint:html": "npx @linthtml/linthtml \"src/**/*.njk\"",
"ci:lint:html": "npx @linthtml/linthtml \"build/**/*.html\"",
"ci:lint:bem": "bemlint \"build/**/*.html\" --errors",
"ci:lint:css": "stylelint \"src/**/*.css\"",
"ci:lint:js": "eslint \"./**/*\"",
Expand All @@ -26,7 +26,7 @@
"@11ty/eleventy": "3.0.0-alpha.10",
"@11ty/eleventy-img": "5.0.0-beta.4",
"@11ty/eleventy-plugin-rss": "1.2.0",
"@linthtml/linthtml": "0.10.0-beta.5",
"@linthtml/linthtml": "0.10.0-beta.8",
"@shikijs/markdown-it": "1.5.2",
"@sindresorhus/slugify": "2.2.1",
"@types/11ty__eleventy-img": "2.0.5",
Expand Down
2 changes: 1 addition & 1 deletion apps/whatislove-dev/src/includes/accordion.njk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="accordion__content">{{ caller() }}</div>
{% if defaultOpenedWidth %}
<!-- prettier-ignore-start -->
<script>
<script type="module" async>
document.currentScript.closest('details').open = window.innerWidth > {{ defaultOpenedWidth }}
</script>
<!-- prettier-ignore-end -->
Expand Down
3 changes: 1 addition & 2 deletions apps/whatislove-dev/src/includes/channel.njk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<div class="channel__content">
<div class="channel__picture-wrapper">
<img
class="channel__image"
src="/images/telegram-avatar.jpg"
width="66"
height="66"
Expand All @@ -34,7 +33,7 @@
/>
{{ icon(className='channel__picture-object', name='telegram', width=22, height=22) }}
</div>
<a class="channel__link" href="{{ global.channelUrl }}" target="_blank">t.me/whatislove_dev</a>
<a class="channel__link" href="{{ global.channelUrl }}" target="_blank" rel="noreferrer noopener">t.me/whatislove_dev</a>
<p class="channel__description">
I run a Telegram channel, sharing insightful dev publications and resources. Thx, peace, frogs, love ✌️
</p>
Expand Down
16 changes: 12 additions & 4 deletions apps/whatislove-dev/src/includes/footer.njk
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
<footer class="footer box">
<ul class="footer__links-list">
<li class="footer__links-item">
<a class="footer__link" href="{{ global.repo }}/issues/new" target="_blank">Report Issue</a>
<a class="footer__link" href="{{ global.repo }}/issues/new" target="_blank" rel="noreferrer noopener">
Report Issue
</a>
</li>
<li class="footer__links-item">
<a class="footer__link" href="/feed.xml">RSS</a>
</li>
<li class="footer__links-item">
<a class="footer__link" href="{{ global.channelUrl }}" target="_blank">Telegram Channel</a>
<a class="footer__link" href="{{ global.channelUrl }}" target="_blank" rel="noreferrer noopener">
Telegram Channel
</a>
</li>
<li class="footer__links-item">
<a class="footer__link" href="/sitemap.xml">Sitemap</a>
Expand All @@ -19,7 +23,9 @@
href="https://🕸💍.ws/previous"
aria-label="Webring go previous"
></a>
<a class="footer__webring-main" href="https://🕸💍.ws" target="_blank">🕸️ IndieWeb Webring 💍</a>
<a class="footer__webring-main" href="https://🕸💍.ws" target="_blank" rel="noreferrer noopener">
🕸️ IndieWeb Webring 💍
</a>
<a
class="footer__webring-link footer__webring-link--next action"
href="https://🕸💍.ws/next"
Expand All @@ -29,6 +35,8 @@
<p class="footer__copyright">&copy; 2020 – {{ global.currentYear }} {{ global.author }}. All rights reserved.</p>
<p class="footer__credits">
Built using {{ eleventy.generator }} with <span class="footer__credits-icon">❤️</span> / Design by
<a class="footer__credits-designer" href="https://t.me/listiqq" target="_blank"> Dima Listiq </a>
<a class="footer__credits-designer" href="https://t.me/listiqq" target="_blank" rel="noreferrer noopener">
Dima Listiq
</a>
</p>
</footer>
9 changes: 8 additions & 1 deletion apps/whatislove-dev/src/includes/header.njk
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,14 @@
<a class="header__menu-link" href="/files/vladyslav-zubko-cv.pdf">CV</a>
</li>
<li class="header__menu-item header__menu-item--careers">
<a class="header__menu-link" href="https://careers.whatislove.dev/" target="_blank">Careers</a>
<a
class="header__menu-link"
href="https://careers.whatislove.dev"
target="_blank"
rel="noreferrer noopener"
>
Careers
</a>
</li>
</ul>
{{ settings(className='header__settings') }}
Expand Down
3 changes: 2 additions & 1 deletion apps/whatislove-dev/src/includes/settings.njk
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% macro settings(className) %}
<section class="{{ className }} settings settings--theme" aria-label="Theme switcher">
<section class="{{ className }} settings settings--theme">
<h2 class="settings__title visually-hidden">Theme switcher</h2>
<label class="settings__theme-label">
<input class="settings__theme-control" type="radio" name="theme" value="light" aria-label="Light" />
</label>
Expand Down
16 changes: 8 additions & 8 deletions apps/whatislove-dev/src/includes/shapes.njk
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<svg class="shapes visually-hidden">
<svg class="shapes visually-hidden" width="0" height="0">
<path
class="shapes__text-curve"
id="text-curved"
d="M0 0C0 15.913 6.32141 31.1742 17.5736 42.4264C28.8258 53.6786 44.087 60 60 60C75.913 60 91.1742 53.6786 102.426 42.4264C113.679 31.1742 120 15.913 120 0"
/>
<filter class="shapes__sticker" id="sticker">
<feMorphology in="SourceAlpha" result="Dilated" operator="dilate" radius="4"></feMorphology>
<feFlood flood-color="#ffffff" result="OutlineColor"></feFlood>
<feComposite in="OutlineColor" in2="Dilated" operator="in" result="Outline"></feComposite>
<feMerge>
<feMergeNode in="Outline"></feMergeNode>
<feMergeNode in="SourceGraphic"></feMergeNode>
</feMerge>
<femorphology in="SourceAlpha" result="Dilated" operator="dilate" radius="4" />
<feflood flood-color="#ffffff" result="OutlineColor" />
<fecomposite in="OutlineColor" in2="Dilated" operator="in" result="Outline" />
<femerge>
<femergenode in="Outline" />
<femergenode in="SourceGraphic" />
</femerge>
</filter>
</svg>
15 changes: 10 additions & 5 deletions apps/whatislove-dev/src/layouts/article.njk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% set lastChangelogItem = changelogs | last %}

{% block font %}
<link rel="preload" href="/fonts/monaspace-neon.woff2" crossorigin as="font" type="font/woff2" />
<link rel="preload" href="/fonts/monaspace-neon.woff2" crossorigin="anonymous" as="font" type="font/woff2" />
{% endblock %}

{% block content %}
Expand Down Expand Up @@ -104,6 +104,7 @@
class="mentions__origin action"
href="{{ mention.url }}"
target="_blank"
rel="noreferrer noopener"
aria-label="View original"
></a>
</li>
Expand All @@ -112,10 +113,14 @@
{% endif %}
<div class="mentions__form-wrapper">
<p class="mentions__form-description">
These are <a href="https://indieweb.org/webmention" target="_blank">webmentions</a> via the
<a href="https://indieweb.org/" target="_blank">IndieWeb</a> and
<a href="https://webmention.io/" target="_blank">webmention.io</a>. Mention this post from your
site:
These are
<a href="https://indieweb.org/webmention" target="_blank" rel="noreferrer noopener">
webmentions
</a>
via the
<a href="https://indieweb.org/" target="_blank" rel="noreferrer noopener">IndieWeb</a> and
<a href="https://webmention.io/" target="_blank" rel="noreferrer noopener">webmention.io</a>.
Mention this post from your site:
</p>
<form
class="mentions__form"
Expand Down
16 changes: 14 additions & 2 deletions apps/whatislove-dev/src/layouts/page.njk
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,20 @@

<link rel="stylesheet" href="/styles/index.css" />

<link rel="preload" href="/fonts/red-hat-display-variable.woff2" crossorigin as="font" type="font/woff2" />
<link rel="preload" href="/fonts/saira-extra-condensed-400.woff2" crossorigin as="font" type="font/woff2" />
<link
rel="preload"
href="/fonts/red-hat-display-variable.woff2"
crossorigin="anonymous"
as="font"
type="font/woff2"
/>
<link
rel="preload"
href="/fonts/saira-extra-condensed-400.woff2"
crossorigin="anonymous"
as="font"
type="font/woff2"
/>
{% block font %}{% endblock %}

<link rel="icon" href="/images/favicons/favicon.ico" sizes="any" />
Expand Down
2 changes: 1 addition & 1 deletion apps/whatislove-dev/src/pages/form/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ stickersCount: 5
</form>
</div>

<script src="https://cdn.tailwindcss.com" defer></script>
<script src="https://cdn.tailwindcss.com" async></script>
{% endblock %}
5 changes: 2 additions & 3 deletions apps/whatislove-dev/src/pages/index/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ stickersCount: 0
aria-hidden="true"
>
<text x="30">
<textPath class="intro__paw-text" xlink:href="#text-curved">{{ LAPKA_PHRASE }}</textPath>
<textpath class="intro__paw-text" href="#text-curved">{{ LAPKA_PHRASE }}</textpath>
</text>
</svg>
</button>
<img
class="intro__photo"
src="/images/vladyslav-zubko.png"
width="226"
height="300"
Expand Down Expand Up @@ -74,7 +73,7 @@ stickersCount: 0
<div class="main__row main__row--experience-stickers box">
<section class="experience">
<h2 class="experience__title">Experience</h2>
<form class="experience__form">
<form class="experience__form" action="/timeline">
<label class="experience__form-label">
<input
class="experience__form-control visually-hidden"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ let getTimelineTemplate = (timeline) => {
)
let originStringNode = getStringWitCheck(
origin,
`<a class="timeline__item-origin" href="${origin}" target="_blank">${originDesc}</a>`,
`<a class="timeline__item-origin" href="${origin}" target="_blank" rel="noreferrer noopener">${originDesc}</a>`,
)
let descStringNode = getStringWitCheck(
desc,
`<p class="timeline__item-description">${desc}</p>`,
)
let linkStringNode = getStringWitCheck(
link,
`<a class="timeline__item-link" href="${link}" target="_blank">${linkDesc}</a>`,
`<a class="timeline__item-link" href="${link}" target="_blank" rel="noreferrer noopener">${linkDesc}</a>`,
)
let endDateStringNode = getStringWitCheck(
endDate,
Expand Down
2 changes: 1 addition & 1 deletion apps/whatislove-dev/src/styles/blocks/channel.css
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
position: relative;
}

.channel__image {
.channel img {
display: block;
inline-size: 66px;
block-size: auto;
Expand Down
2 changes: 1 addition & 1 deletion apps/whatislove-dev/src/styles/blocks/intro.css
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
}
}

.intro__photo {
.intro img {
display: block;
inline-size: 226px;
block-size: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,19 @@ let replaceImgWrapper = (window) => {
let pictureNodes = contentNode.querySelectorAll(`p > picture`)

for (let pictureNode of pictureNodes) {
let imgNode = /** @type {HTMLImageElement} */ (
pictureNode.querySelector(`img`)
)
let paragraphNode = /** @type {HTMLParagraphElement} */ (
pictureNode.parentNode
)
let figureNode = window.document.createElement(`figure`)
let figureCaptionNode = window.document.createElement(`figcaption`)

figureCaptionNode.textContent = imgNode.alt

figureNode.append(pictureNode)
figureNode.append(figureCaptionNode)

paragraphNode.replaceWith(figureNode)
}
Expand Down
Loading

0 comments on commit 0662f07

Please sign in to comment.