Proposed fix for #22 but it was passing prior to code change

zachleat · zachleat · commit f7bc146888a1 · 2022-11-02T17:00:23.000-05:00
diff --git a/src/eleventyWebcTemplate.js b/src/eleventyWebcTemplate.js
@@ -1,7 +1,7 @@
 const path = require("path");
 
 const { EleventyRenderPlugin } = require("@11ty/eleventy");
-const EleventyRenderManager = EleventyRenderPlugin.RenderManager;
+const CompileString = EleventyRenderPlugin.String;
 
 const CodeManager = require("./codeManager.js");
 const WebCIncremental = require("./incremental.js");
@@ -22,7 +22,6 @@ function relativePath(inputPath, newGlob) {
 module.exports = function(eleventyConfig, options = {}) {
 	eleventyConfig.addTemplateFormats("webc");
 
-	let renderManager = new EleventyRenderManager();
 	let cssManager = new CodeManager();
 	let jsManager = new CodeManager();
 	let incremental = new WebCIncremental();
@@ -112,8 +111,10 @@ module.exports = function(eleventyConfig, options = {}) {
 			page.setTransform("11ty", async function(content) {
 				let syntax = this["11ty:type"];
 				if(syntax) {
-					let fn = await renderManager.compile(content, syntax);
-					return renderManager.render(fn, this, {});
+					let fn = await CompileString(content, syntax, {
+						templateConfig: eleventyConfig
+					});
+					return fn(data);
 				}
 				return content;
 			});
diff --git a/test/render-plugin/eleventy.config.js b/test/render-plugin/eleventy.config.js
@@ -0,0 +1,10 @@
+const EleventyWebcPlugin = require("../../eleventyWebcPlugin.js");
+const { EleventyRenderPlugin } = require("@11ty/eleventy");
+
+module.exports = function (eleventyConfig) {
+	eleventyConfig.addPlugin(EleventyWebcPlugin, {
+		components: "./test/render-plugin/webc/*.webc"
+	});
+
+	eleventyConfig.addPlugin(EleventyRenderPlugin);
+}
diff --git a/test/render-plugin/page.md b/test/render-plugin/page.md
@@ -0,0 +1,3 @@
+# Hello
+
+<p>{% renderTemplate "webc" %}<my-component></my-component>{% endrenderTemplate %}</p>
diff --git a/test/render-plugin/webc/my-component.webc b/test/render-plugin/webc/my-component.webc
@@ -0,0 +1 @@
+My component<slot></slot>
diff --git a/test/test.js b/test/test.js
@@ -235,3 +235,17 @@ test("Add JS Functions as helpers (universal filters) (issue #3)", async t => {
 	<body>helloAlways return this</body>
 </html>`);
 });
+
+
+
+test("Use render plugin #22", async t => {
+	let elev = new Eleventy("./test/render-plugin/page.md", "./test/render-plugin/_site", {
+		configPath: "./test/render-plugin/eleventy.config.js"
+	});
+
+	let results = await elev.toJSON();
+	let [result] = results;
+
+	t.is(normalize(result.content), `<h1>Hello</h1>
+<p>My component</p>`);
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Hello`
	`2`	`+`
	`3`	`+<p>{% renderTemplate "webc" %}<my-component></my-component>{% endrenderTemplate %}</p>`