@chrisburnell/eleventy-cache-webmentions 0.1.2 → 0.1.6

package/eleventy-cache-webmentions.js

@@ -3,8 +3,6 @@ const sanitizeHTML = require("sanitize-html")
 const uniqBy = require("lodash/uniqBy")
 const { AssetCache } = require("@11ty/eleventy-cache-assets")
 
-// Load .env variables with dotenv
-require("dotenv").config()
 const TOKEN = process.env.WEBMENTION_IO_TOKEN
 
 const absoluteURL = (url, domain) => {
@@ -41,7 +39,7 @@ const epoch = (value) => {
 	return new Date(value).getTime()
 }
 
-module.exports = (config, options = {}) => {
+module.exports = (eleventyConfig, options = {}) => {
 	options = Object.assign(
 		{
 			duration: "23h",
@@ -152,8 +150,10 @@ module.exports = (config, options = {}) => {
 				const { html, text } = entry.content
 				if (html && html.length > options.maximumHtmlLength) {
 					entry.content.value = `${options.maximumHtmlText} <a href="${entry["wm-source"]}">${entry["wm-source"]}</a>`
-				} else {
+				} else if (Object.keys(options.allowedHTML).length) {
 					entry.content.value = sanitizeHTML(html || text, options.allowedHTML)
+				} else {
+					entry.content.value = html || text
 				}
 				return entry
 			})
@@ -174,14 +174,19 @@ module.exports = (config, options = {}) => {
 		callback(null, webmentions)
 	}
 
-	if (config && options) {
+	if (eleventyConfig && options) {
 		if (!options.domain) {
-			throw new Error("domain is a required option to be passed when adding the plugin to your config using addPlugin.")
+			throw new Error("domain is a required option to be passed when adding the plugin to your eleventyConfig using addPlugin.")
 		}
 
-		config.addLiquidFilter("getWebmentions", getWebmentionsFilter)
-		config.addNunjucksAsyncFilter("getWebmentions", getWebmentionsFilter)
+		// Liquid/Nunjucks Filters
+		eleventyConfig.addLiquidFilter("getWebmentions", getWebmentionsFilter)
+		eleventyConfig.addNunjucksAsyncFilter("getWebmentions", getWebmentionsFilter)
+
+		// Eleventy Data
+		eleventyConfig.addGlobalData("webmentions", filteredWebmentions)
 	} else {
+		// JavaScript
 		return filteredWebmentions
 	}
 }

package/package.json

@@ -1,23 +1,22 @@
 {
   "name": "@chrisburnell/eleventy-cache-webmentions",
-  "version": "0.1.2",
+  "version": "0.1.6",
   "description": "Cache webmentions from webmention.io using eleventy-cache-assets.",
   "main": "eleventy-cache-webmentions.js",
   "author": "Chris Burnell <me@chrisburnell.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git@github.com:chrisburnell/chrisburnell.com.git"
+    "url": "git@github.com:chrisburnell/eleventy-cache-webmentions.git"
   },
   "bugs": {
-    "url": "https://github.com/chrisburnell/chrisburnell.com/issues"
+    "url": "https://github.com/chrisburnell/eleventy-cache-webmentions/issues"
   },
   "engines": {
     "node": ">=10"
   },
   "dependencies": {
     "@11ty/eleventy-cache-assets": "^2.3.0",
-    "dotenv": "^10.0.0",
     "lodash": "^4.17.21",
     "node-fetch": "2.6.5",
     "sanitize-html": "^2.5.2"