diff --git a/eleventy.config.js b/eleventy.config.js index 2699e31..e8e33eb 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -1,4 +1,4 @@ -import { EleventyRenderPlugin } from "@11ty/eleventy"; +import { RenderPlugin } from "@11ty/eleventy"; import syntaxHighlightPlugin from "@11ty/eleventy-plugin-syntaxhighlight"; // Import {$} from 'execa'; import newIssueUrl from "./src/_utils/new-issue-url.js"; @@ -11,15 +11,17 @@ export default function eleventy(eleventyConfig) { eleventyConfig.addShortcode("newIssueUrl", newIssueUrl); eleventyConfig.addLayoutAlias("report", "report.njk"); - eleventyConfig.addPlugin(EleventyRenderPlugin); + eleventyConfig.addPlugin(RenderPlugin); eleventyConfig.addPlugin(syntaxHighlightPlugin); eleventyConfig.addFilter("withoutTips", (issues) => issues.filter((item) => Object.hasOwn(item, "sc") && item.sc !== "")); eleventyConfig.addFilter("withoutViolations", (issues) => issues.filter((item) => item.sc === "" || !Object.hasOwn(item, "sc"))); - eleventyConfig.addShortcode("renderString", async function (content, format) { - return eleventyConfig.javascriptFunctions.renderTemplate.call(this, content, format); + eleventyConfig.addShortcode("renderString", async function (content, templateFormat) { + const renderManager = new RenderPlugin.RenderManager(); + const result = await renderManager.compile(content, templateFormat); + return result.call(this); }); eleventyConfig.addAsyncFilter("formatDate", (value) => diff --git a/package-lock.json b/package-lock.json index 3c6f39b..94a0be8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0-alpha.1", "license": "MIT", "dependencies": { - "@11ty/eleventy": "3.0.0-alpha.14", + "@11ty/eleventy": "3.0.0-alpha.16", "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@zachleat/table-saw": "^1.0.6", @@ -67,12 +67,11 @@ } }, "node_modules/@11ty/eleventy": { - "version": "3.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.0.0-alpha.14.tgz", - "integrity": "sha512-SQGvi/0cSrgyjhTocO8nGpivQbZBXnFlVLp1M3H8xcdvpXYgCVHiEYvrY79TnDd9Nxvj5QtsQuCiselJb3X16g==", - "license": "MIT", + "version": "3.0.0-alpha.16", + "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.0.0-alpha.16.tgz", + "integrity": "sha512-nHqFoRWe2xfzMk0HjfQ2D1nFn/p/hLadMIZB0AqVvDJ/NQqDnlOR5LBLJtZf6npflYBWdZG65YjuuF5ENYvMBg==", "dependencies": { - "@11ty/dependency-tree": "^3.0.0", + "@11ty/dependency-tree": "^3.0.1", "@11ty/dependency-tree-esm": "^1.0.0", "@11ty/eleventy-dev-server": "^2.0.1", "@11ty/eleventy-plugin-bundle": "^2.0.2", @@ -91,8 +90,9 @@ "gray-matter": "^4.0.3", "is-glob": "^4.0.3", "iso-639-1": "^3.1.2", + "js-yaml": "^4.1.0", "kleur": "^4.1.5", - "liquidjs": "^10.14.0", + "liquidjs": "10.14.0", "luxon": "^3.4.4", "markdown-it": "^14.1.0", "micromatch": "^4.0.7", @@ -4304,7 +4304,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -4527,7 +4526,6 @@ "version": "10.14.0", "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.14.0.tgz", "integrity": "sha512-Zjg35Yo3L/2aNy7QkICha/ulbXRtZS7oRenWyDDfw+J34Xy3fOKWWHxASC9r0gbxN661nrwmG/kOIKHfYcVk4Q==", - "license": "MIT", "dependencies": { "commander": "^10.0.0" }, @@ -4547,7 +4545,6 @@ "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "license": "MIT", "engines": { "node": ">=14" } diff --git a/package.json b/package.json index 735037c..55fc0b6 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/inclusive-design/idrc-wcag-reporter#readme", "dependencies": { - "@11ty/eleventy": "3.0.0-alpha.14", + "@11ty/eleventy": "3.0.0-alpha.16", "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@zachleat/table-saw": "^1.0.6",