From 0662f07e411e999ae21095a058c6dcf79c6de1a5 Mon Sep 17 00:00:00 2001 From: Vladyslav Zubko <42296182+what1s1ove@users.noreply.github.com> Date: Fri, 31 May 2024 15:42:05 +0300 Subject: [PATCH] ci(whatislove-dev): uncomment linthtml wd-365 (#537) --- apps/whatislove-dev/lint-staged.config.js | 6 +- apps/whatislove-dev/linthtml.config.js | 3 +- apps/whatislove-dev/package.json | 4 +- .../whatislove-dev/src/includes/accordion.njk | 2 +- apps/whatislove-dev/src/includes/channel.njk | 3 +- apps/whatislove-dev/src/includes/footer.njk | 16 +- apps/whatislove-dev/src/includes/header.njk | 9 +- apps/whatislove-dev/src/includes/settings.njk | 3 +- apps/whatislove-dev/src/includes/shapes.njk | 16 +- apps/whatislove-dev/src/layouts/article.njk | 15 +- apps/whatislove-dev/src/layouts/page.njk | 16 +- apps/whatislove-dev/src/pages/form/index.njk | 2 +- apps/whatislove-dev/src/pages/index/index.njk | 5 +- .../get-timeline-template.helper.js | 4 +- .../src/styles/blocks/channel.css | 2 +- .../src/styles/blocks/intro.css | 2 +- .../replace-img-wrapper.transform.js | 7 + package-lock.json | 14357 ++++++++-------- 18 files changed, 7475 insertions(+), 6997 deletions(-) diff --git a/apps/whatislove-dev/lint-staged.config.js b/apps/whatislove-dev/lint-staged.config.js index 23f8257c..39eb3c2b 100644 --- a/apps/whatislove-dev/lint-staged.config.js +++ b/apps/whatislove-dev/lint-staged.config.js @@ -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 diff --git a/apps/whatislove-dev/linthtml.config.js b/apps/whatislove-dev/linthtml.config.js index cb5a8679..c72c55fd 100644 --- a/apps/whatislove-dev/linthtml.config.js +++ b/apps/whatislove-dev/linthtml.config.js @@ -2,7 +2,8 @@ let config = { extends: `linthtml-config-htmlacademy`, rules: { - 'doctype-first': false, + 'no-surrounding-whitespace': false, + 'tag-close': false, }, } diff --git a/apps/whatislove-dev/package.json b/apps/whatislove-dev/package.json index 27a0c2ff..6146b9fe 100644 --- a/apps/whatislove-dev/package.json +++ b/apps/whatislove-dev/package.json @@ -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 \"./**/*\"", @@ -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", diff --git a/apps/whatislove-dev/src/includes/accordion.njk b/apps/whatislove-dev/src/includes/accordion.njk index 02cb12a7..823f1573 100644 --- a/apps/whatislove-dev/src/includes/accordion.njk +++ b/apps/whatislove-dev/src/includes/accordion.njk @@ -4,7 +4,7 @@
{{ caller() }}
{% if defaultOpenedWidth %} - diff --git a/apps/whatislove-dev/src/includes/channel.njk b/apps/whatislove-dev/src/includes/channel.njk index 611d344b..597d5319 100644 --- a/apps/whatislove-dev/src/includes/channel.njk +++ b/apps/whatislove-dev/src/includes/channel.njk @@ -22,7 +22,6 @@
{{ icon(className='channel__picture-object', name='telegram', width=22, height=22) }}
- t.me/whatislove_dev + t.me/whatislove_dev

I run a Telegram channel, sharing insightful dev publications and resources. Thx, peace, frogs, love ✌️

diff --git a/apps/whatislove-dev/src/includes/footer.njk b/apps/whatislove-dev/src/includes/footer.njk index 193a0b53..69135a70 100644 --- a/apps/whatislove-dev/src/includes/footer.njk +++ b/apps/whatislove-dev/src/includes/footer.njk @@ -1,13 +1,17 @@ diff --git a/apps/whatislove-dev/src/includes/header.njk b/apps/whatislove-dev/src/includes/header.njk index e5e9aa97..191e12b7 100644 --- a/apps/whatislove-dev/src/includes/header.njk +++ b/apps/whatislove-dev/src/includes/header.njk @@ -114,7 +114,14 @@ CV
  • - Careers + + Careers +
    • {{ settings(className='header__settings') }} diff --git a/apps/whatislove-dev/src/includes/settings.njk b/apps/whatislove-dev/src/includes/settings.njk index e7d422e1..884c35d3 100644 --- a/apps/whatislove-dev/src/includes/settings.njk +++ b/apps/whatislove-dev/src/includes/settings.njk @@ -1,5 +1,6 @@ {% macro settings(className) %} -
    +
    + diff --git a/apps/whatislove-dev/src/includes/shapes.njk b/apps/whatislove-dev/src/includes/shapes.njk index 3ed6d9c3..d4ced9ce 100644 --- a/apps/whatislove-dev/src/includes/shapes.njk +++ b/apps/whatislove-dev/src/includes/shapes.njk @@ -1,16 +1,16 @@ -

    - These are webmentions via the - IndieWeb and - webmention.io. Mention this post from your - site: + These are + + webmentions + + via the + IndieWeb and + webmention.io. + Mention this post from your site:

    - - + + {% block font %}{% endblock %} diff --git a/apps/whatislove-dev/src/pages/form/index.njk b/apps/whatislove-dev/src/pages/form/index.njk index 854c6c13..db5dd275 100644 --- a/apps/whatislove-dev/src/pages/form/index.njk +++ b/apps/whatislove-dev/src/pages/form/index.njk @@ -103,5 +103,5 @@ stickersCount: 5
    - + {% endblock %} diff --git a/apps/whatislove-dev/src/pages/index/index.njk b/apps/whatislove-dev/src/pages/index/index.njk index a68bbd10..fd2cd48c 100644 --- a/apps/whatislove-dev/src/pages/index/index.njk +++ b/apps/whatislove-dev/src/pages/index/index.njk @@ -41,12 +41,11 @@ stickersCount: 0 aria-hidden="true" > - {{ LAPKA_PHRASE }} + {{ LAPKA_PHRASE }}

    Experience

    -
    +