Fixes #3262

11ty · Apr 24, 2024 · 09e9dda · 09e9dda
1 parent 4500cdc
commit 09e9dda
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/Util/ProxyWrap.js b/src/Util/ProxyWrap.js
@@ -5,6 +5,10 @@ import { isPlainObject } from "@11ty/eleventy-utils";
 const debug = debugUtil("Dev:Eleventy:Proxy");
 
 function wrapObject(target, fallback) {
+	if (Object.isFrozen(target)) {
+		return target;
+	}
+
 	return new Proxy(target, {
 		getOwnPropertyDescriptor(target, prop) {
 			let ret;
@@ -48,6 +52,10 @@ function wrapObject(target, fallback) {
 				}
 
 				if (isPlainObject(value) && Reflect.has(fallback, prop)) {
+					if (Object.isFrozen(value)) {
+						return value;
+					}
+
 					let ret = wrapObject(value, Reflect.get(fallback, prop));
 					debug("handler:get (primary, object)", prop);
 					return ret;
@@ -68,6 +76,10 @@ function wrapObject(target, fallback) {
 					let emptyObject = {};
 					Reflect.set(target, prop, emptyObject);
 
+					if (Object.isFrozen(fallbackValue)) {
+						return fallbackValue;
+					}
+
 					return wrapObject(emptyObject, fallbackValue);
 				}
 

diff --git a/test/EleventyTest.js b/test/EleventyTest.js
@@ -987,6 +987,27 @@ pkg:
   t.is(e.originalError.toString(), "TypeError: Cannot add property myOwn, object is not extensible");
 });
 
+test("Eleventy pagination works okay with reserved data throws (eleventy) Issue #3262", async (t) => {
+  let elev = new Eleventy("./test/stubs-virtual/", undefined, {
+    config: eleventyConfig => {
+      eleventyConfig.addTemplate("index.html", `---
+pagination:
+  data: "test"
+  size: 1
+test:
+  - a
+  - b
+  - c
+---
+{{ eleventy.generator }}`);
+    }
+  });
+  elev.disableLogger();
+
+  let result = await elev.toJSON();
+  t.is(result.length, 3);
+});
+
 test("Eleventy setting reserved data throws error (page)", async (t) => {
   let elev = new Eleventy("./test/stubs-virtual/", undefined, {
     config: eleventyConfig => {