Fix bad promise caching pattern

11ty · Jun 26, 2024 · 643da17 · 643da17
1 parent 65de3af
commit 643da17
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/Template.js b/src/Template.js
@@ -118,7 +118,7 @@ class Template extends TemplateContent {
 
  if (types.render) {
  delete this._cacheRenderedPromise;
- delete this._cacheFinalContent;
+ delete this._cacheRenderedTransformsAndLayoutsPromise;
  }
  }
 
@@ -744,12 +744,7 @@ class Template extends TemplateContent {
  return ret;
  }
 
- async renderPageEntry(pageEntry) {
- // cache with transforms output
- if (pageEntry.template._cacheFinalContent) {
- return pageEntry.template._cacheFinalContent;
- }
-
+ async #renderPageEntryWithLayoutsAndTransforms(pageEntry) {
  let content;
  let layoutKey = pageEntry.data[this.config.keys.layout];
  if (layoutKey) {
@@ -760,13 +755,22 @@ class Template extends TemplateContent {
  }
 
  await this.runLinters(content, pageEntry);
- content = await this.runTransforms(content, pageEntry);
 
- pageEntry.template._cacheFinalContent = content;
+ content = await this.runTransforms(content, pageEntry);
 
  return content;
  }
 
+ async renderPageEntry(pageEntry) {
+ // cache with transforms output
+ if (!pageEntry.template._cacheRenderedTransformsAndLayoutsPromise) {
+ pageEntry.template._cacheRenderedTransformsAndLayoutsPromise =
+ this.#renderPageEntryWithLayoutsAndTransforms(pageEntry);
+ }
+
+ return pageEntry.template._cacheRenderedTransformsAndLayoutsPromise;
+ }
+
  retrieveDataForJsonOutput(data, selectors) {
  let filtered = {};
  for (let selector of selectors) {