feat(linter): added option to disable rules by default. Split H017 an…

…d disabled by default closes #372
djlint · Apr 12, 2023 · 2dd3675 · 2dd3675
1 parent 95a3b7f
commit 2dd3675
Show file tree

Hide file tree

Showing 17 changed files with 396 additions and 212 deletions.
diff --git a/docs/.eleventy.js b/docs/.eleventy.js
@@ -1,6 +1,5 @@
 const Image = require('@11ty/eleventy-img');
 const syntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight');
-const criticalCss = require('eleventy-critical-css');
 const slugify = require('slugify');
 const metagen = require('eleventy-plugin-metagen');
 const i18n = require('eleventy-plugin-i18n');
@@ -13,8 +12,10 @@ const editOnGithub = require('eleventy-plugin-edit-on-github');
 const i18n_func = require('eleventy-plugin-i18n/i18n.js');
 const rollupper = require('./src/_utils/rollupper');
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
-
-process.setMaxListeners(0);
+const eleventySass = require('eleventy-sass');
+const pluginRev = require('eleventy-plugin-rev');
+const purgecss = require('@fullhuman/postcss-purgecss');
+const postcss = require('postcss');
 
 const slugifyCustom = (s) =>
   slugify(s, { lower: true, remove: /[*+~.()'"!:@]/g });
@@ -93,13 +94,14 @@ module.exports = function (eleventyConfig) {
   eleventyConfig.addFilter('widont', widont);
   eleventyConfig.addWatchTarget('./src/static/');
   eleventyConfig.addNunjucksAsyncShortcode('image', imageShortcode);
-  eleventyConfig.addTransform(
-    'htmlmin',
-    require('./src/_utils/minify-html.js'),
-  );
+  if (process.env.ELEVENTY_PRODUCTION == true) {
+    eleventyConfig.addTransform(
+      'htmlmin',
+      require('./src/_utils/minify-html.js'),
+    );
+  }
   eleventyConfig.addPlugin(syntaxHighlight);
   eleventyConfig.addPlugin(metagen);
-  eleventyConfig.addPlugin(criticalCss);
   eleventyConfig.addPlugin(schema);
   eleventyConfig.addPlugin(rollupper, {
     rollup: {
@@ -268,6 +270,50 @@ module.exports = function (eleventyConfig) {
     return `${markdownIt.render(value)}`;
   });
 
+  eleventyConfig.addPlugin(pluginRev);
+
+  eleventyConfig.addPlugin(eleventySass, [
+    {
+      rev: true,
+      postcss: postcss([
+        require('postcss-nested'),
+        purgecss({
+          content: ['./src/**/*.njk', './src/**/*.md', './src/**/*.js'],
+          safelist: {
+            deep: [
+              /headShake/,
+              /zoomIn/,
+              /fadeInUp/,
+              /pre/,
+              /code/,
+              /block/,
+              /box/,
+              /title/,
+              /is-\d/,
+              /table/,
+              /message/,
+              /message-header/,
+              /message-body/,
+              /panel-block/,
+              /p-3/,
+              /is-block/,
+              /is-justify-content-space-between/,
+              /is-light/,
+              /is-active/,
+              /is-info/,
+              /fa-*/,
+              /mr-1/,
+              /mr-2/,
+              /has-text-info/,
+            ],
+          },
+        }),
+        require('autoprefixer'),
+        require('cssnano'),
+      ]),
+    },
+  ]);
+
   const { fontawesomeSubset } = require('fontawesome-subset');
   fontawesomeSubset(
     {

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -26,6 +26,8 @@
     "codemirror": "^6.0.1",
     "eleventy-critical-css": "^1.1.0",
     "eleventy-plugin-i18n": "^0.1.3",
+    "eleventy-plugin-rev": "^1.1.1",
+    "eleventy-sass": "^2.2.1",
     "md5": "^2.3.0",
     "rollup": "^3.20.2"
   },

diff --git a/docs/src/_data/configuration.json b/docs/src/_data/configuration.json
@@ -17,6 +17,24 @@
       }
     ]
   },
+  {
+    "name": "include",
+    "description": {
+      "en": "Include linter codes.",
+      "ru": "Включите коды линтера.",
+      "fr": "Inclure les codes des liners."
+    },
+    "usage": [
+      {
+        "name": "pyproject.toml",
+        "value": "include=\"H014,H015\""
+      },
+      {
+        "name": ".djlintrc",
+        "value": "\"include\": \"H014,H015\""
+      }
+    ]
+  },
   {
     "name": "extension",
     "description": {

diff --git a/docs/src/_includes/layout.njk b/docs/src/_includes/layout.njk
@@ -36,11 +36,8 @@
         <!-- languages -->
         <link rel="alternate" hreflang="en-US" href="{{site.url}}{{ page.url | baseUrl }}" />
         <link rel="alternate" hreflang="ru" href="{{site.url}}/ru{{ page.url | baseUrl }}" />
-
-        <!-- critical css is inlined, so we can async the rest -->
-        <link rel="stylesheet preload"
-              href="{{ css.stylesCss }}"
-              as="style" />
+        <link rel="stylesheet"
+              href="{{ "/static/css/site.css" | rev }}"/>
          <link rel="preload"
               href="/static/font/crimson-pro/files/crimson-pro-latin-400-normal.woff2"
               as="font"

diff --git a/docs/src/_includes/nav.njk b/docs/src/_includes/nav.njk
@@ -71,11 +71,11 @@
                         <span class="icon is-large">
                             <i class="fas fa-lg  fa-globe"></i>
                         </span>
-                        <span>{{ locale | i18n_locale(locales) }}
+                        <span>{{ locale | i18n_locale(locales) }}</span>
                     </div>
                     <div class="navbar-dropdown">
                         {%  for page in page.url | i18n_urls(collections.all) %}
-                            <a class="navbar-item" href="{{ page.url }}">{{ page.meta.label }}
+                            <a class="navbar-item" href="{{ page.url }}">{{ page.meta.label }}</a>
                         {%  endfor %}
                     </div>
                 </div>

diff --git a/docs/src/_utils/styles.11ty.js b/docs/src/_utils/styles.11ty.js