Fixes #52, changes failure case for permalink to return raw string

11ty · Feb 22, 2023 · c45e699 · c45e699
1 parent 56604ae
commit c45e699
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/src/eleventyWebcTemplate.js b/src/eleventyWebcTemplate.js
@@ -1,4 +1,6 @@
 const path = require("path");
+const debug = require("debug")("Eleventy:WebC");
+
 
 const { EleventyRenderPlugin } = require("@11ty/eleventy");
 const CompileString = EleventyRenderPlugin.String;
@@ -55,11 +57,18 @@ module.exports = function(eleventyConfig, options = {}) {
 		compileOptions: {
 			permalink: function(contents, inputPath) {
 				if(contents && typeof contents === "string") {
-					return (data) => {
-						return moduleScript.evaluateScript(contents, {
-							...this,
-							...data,
-						}, `Check the permalink for ${inputPath}`);
+					return async (data) => {
+						try {
+							// Hard to know if this is JavaScript code or just a raw string value.
+							let evaluatedString = await moduleScript.evaluateScript(contents, {
+								...this,
+								...data,
+							}, `Check the permalink for ${inputPath}`);
+							return evaluatedString;
+						} catch(e) {
+							debug("Error evaluating dynamic permalink, returning raw string contents instead: %o\n%O", contents, e);
+							return contents;
+						}
 					}
 				}
 

diff --git a/test/permalink-string/eleventy.config.js b/test/permalink-string/eleventy.config.js
@@ -0,0 +1,5 @@
+const EleventyWebcPlugin = require("../../eleventyWebcPlugin.js");
+
+module.exports = function (eleventyConfig) {
+	eleventyConfig.addPlugin(EleventyWebcPlugin);
+}
diff --git a/test/permalink-string/page.webc b/test/permalink-string/page.webc
@@ -0,0 +1,4 @@
+---
+permalink: "index.html"
+---
+Hello
diff --git a/test/permalink-string/page2.webc b/test/permalink-string/page2.webc
@@ -0,0 +1,4 @@
+---
+permalink: "`index2.html`"
+---
+Hello
diff --git a/test/test.js b/test/test.js
@@ -482,3 +482,15 @@ Hello
 </body>
 </html>`);
 });
+
+test("Permalink string, issue #52", async t => {
+	let elev = new Eleventy("./test/permalink-string/", "./test/permalink-string/_site", {
+		configPath: "./test/permalink-string/eleventy.config.js"
+	});
+
+	let results = await elev.toJSON();
+	let [result1, result2] = results.sort((a, b) => a.inputPath < b.inputPath ? -1 : 1);
+
+	t.is(result1.url, "/");
+	t.is(result2.url, "index2.html");
+});