upgrade to bliss 2.3.4 (#48)

.eleventy.js

@@ -2,12 +2,16 @@ const {
   initialSetup,
   layoutAliases,
   collections,
-  transforms,
   shortcodes,
   filters,
   plugins,
   constants,
+  events,
 } = require('./_11ty');
+const minifyHTML = require('./_11ty/transforms/minifyHTML');
+const minifyJS = require('./_11ty/transforms/minifyJS');
+const minifyJSON = require('./_11ty/transforms/minifyJSON');
+const minifyXML = require('./_11ty/transforms/minifyXML');
 
 module.exports = function (eleventyConfig) {
   // --- Initial config
@@ -28,9 +32,10 @@ module.exports = function (eleventyConfig) {
 
   // --- Transformations
 
-  Object.values(transforms).forEach(({ name, body }) => {
-    eleventyConfig.addTransform(name, body);
-  });
+  eleventyConfig.addTransform('minifyHTML', minifyHTML);
+  eleventyConfig.addTransform('minifyJSON', minifyJSON);
+  eleventyConfig.addTransform('minifyXML', minifyXML);
+  eleventyConfig.addTransform('minifyJS', minifyJS);
 
   // --- Filters
 
@@ -50,6 +55,14 @@ module.exports = function (eleventyConfig) {
     eleventyConfig.addPlugin(body, options && options);
   });
 
+  // --- After build events
+
+  if (events.after.length > 0) {
+    Object.values(events.after).forEach((afterBuildEvent) => {
+      eleventyConfig.on('eleventy.after', afterBuildEvent);
+    });
+  }
+
   // --- Consolidating everything under content folder
 
   return {

.mergify.yml

@@ -0,0 +1,63 @@
+queue_rules:
+  - name: default
+    conditions:
+      - status-success=Vercel
+
+pull_request_rules:
+  - name: Automatic merge of Snyk dependency upgrades (bot)
+    conditions:
+      - author=snyk-bot
+      - -conflict
+      - status-success=Vercel
+    actions:
+      queue:
+        method: squash
+        name: default
+  - name: Automatic merge of Snyk dependency upgrades (me)
+    conditions:
+      - author=lwojcik
+      - title~=[Snyk]
+      - title~=Upgrade
+      - -conflict
+      - status-success=Vercel
+    actions:
+      queue:
+        method: squash
+        name: default
+  - name: Automatic merge of Dependabot dependency upgrades
+    conditions:
+      - author=dependabot[bot]
+      - -conflict
+      - status-success=Vercel
+    actions:
+      queue:
+        method: squash
+        name: default
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: This pull request is now in conflicts. Could you fix it @{{author}}?
+  - name: Automatic merge of owner-made PRs for main when CI passes and owner approves
+    conditions:
+      - status-success=Vercel
+      - author=lwojcik
+      - base=main
+      - label!=work-in-progress
+      - label=ready-to-merge
+    actions:
+      queue:
+        method: squash
+        name: default
+  - name: Automatic merge of PRs for main when CI passes and owner approves
+    conditions:
+      - status-success=Vercel
+      - base=main
+      - label!=work-in-progress
+      - approved-reviews-by=lwojcik
+      - label=ready-to-merge
+    actions:
+      queue:
+        method: squash
+        name: default

_11ty/collections/tagList.js

@@ -1,5 +1,8 @@
 const moduleName = require('../helpers/moduleName');
 const { EXCLUDED_TAGS } = require('../constants');
+const siteConfig = require('../../content/_data/siteConfig');
+
+const { language, options } = siteConfig.localeSort;
 
 module.exports = {
   name: moduleName(__filename),
@@ -11,6 +14,8 @@ module.exports = {
         .filter((tag) => !EXCLUDED_TAGS.includes(tag))
         .forEach((tag) => tagsSet.add(tag));
     });
-    return Array.from(tagsSet).sort();
+    return Array.from(tagsSet).sort((a, b) =>
+      a.localeCompare(b, language, options)
+    );
   },
 };

_11ty/constants.js

@@ -18,7 +18,7 @@ module.exports = {
   POST_COLLECTION_TAG_NAME: 'post',
   PAGE_COLLECTION_TAG_NAME: 'page',
   POSTS_PER_TAG_PAGE: siteConfig.tags.postsPerPage,
-  IS_PRODUCTION: process.env.NODE_ENV === 'production',
+  IS_PRODUCTION: process.env.ELEVENTY_ENV === 'production',
   SLUGIFY_CONFIG: {
     replacement: '-',
     lower: true,

_11ty/events.js

@@ -0,0 +1,7 @@
+const socialImages = require('./events/socialImages');
+
+const afterBuildEvents = [socialImages];
+
+module.exports = {
+  after: afterBuildEvents,
+};

_11ty/events/socialImages.js

@@ -0,0 +1,39 @@
+const fs = require('fs');
+const path = require('path');
+const Image = require('@11ty/eleventy-img');
+const siteConfig = require('../../content/_data/siteConfig');
+
+const SOCIAL_PREVIEW_IMAGES_DIR = path.join('_site', 'images', 'share');
+const OUTPUT_IMAGE_EXTENSION = 'jpg';
+
+module.exports = () => {
+  const files = fs.readdirSync(SOCIAL_PREVIEW_IMAGES_DIR);
+
+  if (siteConfig.opengraph.enableImageGeneration) {
+    if (files && files.length > 0) {
+      files.forEach(async (filename) => {
+        if (filename.endsWith('.svg')) {
+          const imageUrl = path.join(SOCIAL_PREVIEW_IMAGES_DIR, filename);
+
+          await Image(imageUrl, {
+            formats: ['jpeg'],
+            outputDir: path.join('.', SOCIAL_PREVIEW_IMAGES_DIR),
+            filenameFormat: () => {
+              const outputFilename = filename.substring(0, filename.length - 4);
+
+              return `${outputFilename}.${OUTPUT_IMAGE_EXTENSION}`;
+            },
+          });
+
+          // we no longer need SVG files after converting to JPG so we remove them
+
+          // fs.unlinkSync(imageUrl);
+        }
+      });
+    }
+  } else {
+    // If OG image generation is off, SVG files are not needed,
+    // so we remove them from the build
+    fs.rmSync(SOCIAL_PREVIEW_IMAGES_DIR, { recursive: true, force: true });
+  }
+};

_11ty/filters/splitlines.js

@@ -0,0 +1,30 @@
+const moduleName = require('../helpers/moduleName');
+
+const CHARACTERS_PER_LINE = 14;
+
+const body = (input) => {
+  const parts = input.split(' ');
+
+  const lines = parts.reduce((prev, current) => {
+    if (!prev.length) {
+      return [current];
+    }
+
+    const lastOne = prev[prev.length - 1];
+
+    if (lastOne.length + current.length > CHARACTERS_PER_LINE) {
+      return [...prev, current];
+    }
+
+    prev[prev.length - 1] = lastOne + ' ' + current;
+
+    return prev;
+  }, []);
+
+  return lines;
+};
+
+module.exports = {
+  name: moduleName(__filename),
+  body,
+};

_11ty/helpers/getCollectionKeyValues.js

@@ -1,4 +1,7 @@
 const slugifyString = require('./slugifyString');
+const siteConfig = require('../../content/_data/siteConfig');
+
+const { language, options } = siteConfig.localeSort;
 
 /**
  * Returns array of unique key values for passed collection
@@ -12,7 +15,7 @@ const uniqueKeyValues = (collection, key) => {
   let collectionKeyValues = collection
     .filter((item) => key in item.data)
     .flatMap((item) => item.data[key])
-    .sort((a, b) => a.localeCompare(b, 'en', { sensitivity: 'base' }));
+    .sort((a, b) => a.localeCompare(b, language, options));
 
   // dedupe
   let uniqueValues = [...new Set(collectionKeyValues)];

_11ty/index.js

@@ -7,6 +7,7 @@ const shortcodes = requireDir('./shortcodes');
 const filters = requireDir('./filters');
 const plugins = require('./plugins');
 const constants = require('./constants');
+const events = require('./events');
 
 module.exports = {
   initialSetup,
@@ -17,4 +18,5 @@ module.exports = {
   filters,
   plugins,
   constants,
+  events,
 };