Include page data in navigation entry

eleventy-navigation.js

@@ -6,10 +6,13 @@ function findNavigationEntries(nodes = [], key = "") {
 		if(entry.data && entry.data.eleventyNavigation) {
 			let nav = entry.data.eleventyNavigation;
 			if(!key && !nav.parent || nav.parent === key) {
+				// Extract the page data without the eleventyNavigation key
+				const {eleventyNavigation, ...pageDataWithoutNav} = entry.data
 				pages.push(Object.assign({}, nav, {
 					url: nav.url || entry.data.page.url,
 					pluginType: "eleventy-navigation"
-				}, key ? { parentKey: key } : {}));
+				}, key ? { parentKey: key } : {},
+				{ data: pageDataWithoutNav }));
 			}
 		}
 	}

test/navigationTest.js

@@ -491,4 +491,28 @@ test("Output markdown", t => {
   * [child1](child1.html)
     * [grandchild1](grandchild1.html)
 `);
-});
+});
+
+test("Navigation entry contains page data", t => {
+	let obj = EleventyNavigation.findNavigationEntries([
+		{
+			data: {
+				eleventyNavigation: {
+					key: "root1"
+				},
+				page: {
+					url: "root1.html"
+				},
+				tags: [
+					"robot",
+					"lesbian"
+				]
+			}
+		}
+	]);
+
+	// Page data like tags should be included in the obj
+	t.deepEqual(obj[0].data.tags, ["robot", "lesbian"])
+	// Don't include the eleventyNavigation data inside the returned data
+	t.false(obj[0].data.hasOwnProperty("eleventyNavigation"))
+});