Add support for directories methods for Eleventy Virtual Layout Tem…

…plates #1612
11ty · Jul 2, 2024 · f28ca21 · f28ca21
1 parent 510c336
commit f28ca21
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/Util/ProjectDirectories.js b/src/Util/ProjectDirectories.js
@@ -258,10 +258,10 @@ class ProjectDirectories {
  }
 
  // for a hypothetical template file
- getInputPath(filePath) {
+ getInputPath(filePathRelativeToInputDir) {
  // TODO change ~/ to project root dir
  return TemplatePath.addLeadingDotSlash(
- TemplatePath.join(this.input, TemplatePath.standardizeFilePath(filePath)),
+ TemplatePath.join(this.input, TemplatePath.standardizeFilePath(filePathRelativeToInputDir)),
  );
  }
 
@@ -274,9 +274,13 @@ class ProjectDirectories {
  return TemplatePath.stripLeadingSubPath(filePathRelativeToInputDir, inputDir);
  }
 
- getLayoutPath(filePath) {
+ // for a hypothetical Eleventy layout file
+ getLayoutPath(filePathRelativeToLayoutDir) {
  return TemplatePath.addLeadingDotSlash(
- TemplatePath.join(this.layouts || this.includes, TemplatePath.standardizeFilePath(filePath)),
+ TemplatePath.join(
+ this.layouts || this.includes,
+ TemplatePath.standardizeFilePath(filePathRelativeToLayoutDir),
+ ),
  );
  }
 

diff --git a/test/EleventyVirtualTemplatesTest.js b/test/EleventyVirtualTemplatesTest.js
@@ -162,10 +162,12 @@ test("RSS virtual templates plugin", async (t) => {
 test("Virtual templates as layouts, issue #2307", async (t) => {
  let elev = new Eleventy("./test/stubs-virtual-nowrite", "./test/stubs-virtual-nowrite/_site", {
  config: function (eleventyConfig) {
- eleventyConfig.addTemplate("virtual.md", `# Hello`, {
- layout: "virtual.html"
- });
- eleventyConfig.addTemplate("_includes/virtual.html", `<!-- Layout -->{{ content }}`)
+ eleventyConfig.addTemplate("virtual.md", `# Hello`, {
+ layout: "virtual.html"
+ });
+
+ let layoutPath = eleventyConfig.directories.getLayoutPathRelativeToInputDirectory("virtual.html");
+ eleventyConfig.addTemplate(layoutPath, `<!-- Layout -->{{ content }}`);
  },
  });