Skip to content

Commit

Permalink
Fixes #2356
Browse files Browse the repository at this point in the history
  • Loading branch information
zachleat committed May 2, 2022
1 parent 85316e0 commit ce045a5
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 194 deletions.
35 changes: 0 additions & 35 deletions src/Template.js
Original file line number Diff line number Diff line change
Expand Up @@ -351,33 +351,6 @@ class Template extends TemplateContent {
this.paginationData = paginationData;
}

async mapDataAsRenderedTemplates(data, templateData) {
// function supported in JavaScript type
if (typeof data === "string" || typeof data === "function") {
debug("rendering data.renderData for %o", this.inputPath);
// bypassMarkdown
let str = await super.render(data, templateData, true);
return str;
} else if (Array.isArray(data)) {
return Promise.all(
data.map((item) => this.mapDataAsRenderedTemplates(item, templateData))
);
} else if (isPlainObject(data)) {
let obj = {};
await Promise.all(
Object.keys(data).map(async (value) => {
obj[value] = await this.mapDataAsRenderedTemplates(
data[value],
templateData
);
})
);
return obj;
}

return data;
}

async _testGetAllLayoutFrontMatterData() {
let frontMatterData = await this.getFrontMatterData();
if (frontMatterData[this.config.keys.layout]) {
Expand Down Expand Up @@ -661,14 +634,6 @@ class Template extends TemplateContent {
data.page.url = href;
data.page.outputPath = path;
}

// Deprecated, use eleventyComputed instead.
if ("renderData" in data) {
data.renderData = await this.mapDataAsRenderedTemplates(
data.renderData,
data
);
}
}

async resolveRemainingComputedData(data) {
Expand Down
15 changes: 0 additions & 15 deletions test/TemplateTest-JavaScript.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,21 +193,6 @@ test("JavaScript template type (class with data permalink function using a filte
);
});

test("JavaScript template type (class with renderData)", async (t) => {
let tmpl = getNewTemplate(
"./test/stubs/class-data-renderdata.11ty.js",
"./test/stubs/",
"./dist"
);

let data = await tmpl.getData();
let pages = await tmpl.getRenderedTemplates(data);
t.is(
pages[0].templateContent.trim(),
"<p>StringTesthowdy Zach, meet Thanos</p>"
);
});

test("JavaScript template type (should use the same class instance for data and render)", async (t) => {
let tmpl = getNewTemplate(
"./test/stubs/oneinstance.11ty.js",
Expand Down
72 changes: 0 additions & 72 deletions test/TemplateTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -597,78 +597,6 @@ test("Clone the template", async (t) => {
t.is(cloned.extensionMap, tmpl.extensionMap);
});

test("mapDataAsRenderedTemplates", async (t) => {
let tmpl = getNewTemplate(
"./test/stubs/default.ejs",
"./test/stubs/",
"./dist"
);

t.deepEqual(
await tmpl.mapDataAsRenderedTemplates(
{
key1: "value1",
key2: "value2",
key3: "value3",
},
{ parsedKey: "parsedValue" }
),
{
key1: "value1",
key2: "value2",
key3: "value3",
}
);

t.deepEqual(
await tmpl.mapDataAsRenderedTemplates(
{
key1: "value1",
key2: "<%= parsedKey %>",
},
{ parsedKey: "parsedValue" }
),
{
key1: "value1",
key2: "parsedValue",
}
);

t.deepEqual(
await tmpl.mapDataAsRenderedTemplates(
{
key1: "value1",
key2: ["<%= parsedKey %>", 2],
},
{ parsedKey: "parsedValue" }
),
{
key1: "value1",
key2: ["parsedValue", 2],
}
);
});

test("renderData", async (t) => {
let tmpl = getNewTemplate(
"./test/stubs/renderData/renderData.njk",
"./test/stubs/",
"./dist"
);
let data = await getRenderedData(tmpl);
t.is((await tmpl.render(data)).trim(), "hi:value2-value1.css");
});

test("renderData markdown (issue #40)", async (t) => {
let tmpl = getNewTemplate(
"./test/stubs/renderData/renderData.md",
"./test/stubs/",
"./dist"
);
let data = await getRenderedData(tmpl);
t.is((await tmpl.render(data)).trim(), "<title>value2-value1.css</title>");
});

test("getMappedDate (empty, assume created)", async (t) => {
let tmpl = getNewTemplate(
"./test/stubs/dates/file1.md",
Expand Down
26 changes: 0 additions & 26 deletions test/TemplateWriterTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -548,32 +548,6 @@ test("fileSlug should exist in a collection", async (t) => {
t.is(templates[0].templateContent.trim(), "fileSlug:/dog1/:dog1");
});

test("renderData should exist and be resolved in a collection (Issue #289)", async (t) => {
let eleventyConfig = new TemplateConfig();
let tw = new TemplateWriter(
"./test/stubs/collection-renderdata",
"./test/stubs/collection-renderdata/_site",
["njk"],
null,
eleventyConfig
);

let paths = await tw._getAllPaths();
let templateMap = await tw._createTemplateMap(paths);

let collectionsData = await templateMap._testGetCollectionsData();
t.is(collectionsData.dog.length, 1);

let mapEntry = templateMap.getMapEntryForInputPath(
"./test/stubs/collection-renderdata/template.njk"
);
t.truthy(mapEntry);
t.is(mapEntry.inputPath, "./test/stubs/collection-renderdata/template.njk");

let templates = await mapEntry.template.getRenderedTemplates(mapEntry.data);
t.is(templates[0].templateContent.trim(), "value2-value1.css");
});

test("Write Test 11ty.js", async (t) => {
let eleventyConfig = new TemplateConfig();
let tw = new TemplateWriter(
Expand Down
24 changes: 0 additions & 24 deletions test/stubs/class-data-renderdata.11ty.js

This file was deleted.

7 changes: 0 additions & 7 deletions test/stubs/collection-renderdata/dog.njk

This file was deleted.

1 change: 0 additions & 1 deletion test/stubs/collection-renderdata/template.njk

This file was deleted.

7 changes: 0 additions & 7 deletions test/stubs/renderData/renderData.md

This file was deleted.

7 changes: 0 additions & 7 deletions test/stubs/renderData/renderData.njk

This file was deleted.

0 comments on commit ce045a5

Please sign in to comment.