bind more utilities in bindUtilities

3 files changed, 20 insertions, 20 deletions

diff --git a/src/write/bind-utilities.js b/src/write/bind-utilities.js
index 1c4dd282..4b037a91 100644
--- a/src/write/bind-utilities.js
+++ b/src/write/bind-utilities.js
@@ -51,8 +51,11 @@ import {
 } from '../util/wiki-data.js';
 
 export function bindUtilities({
+  absoluteTo,
+  getSizeOfAdditionalFile,
   language,
   to,
+  urls,
   wikiData,
 }) {
   // TODO: Is there some nicer way to define these,
@@ -60,8 +63,15 @@ export function bindUtilities({
   // each page?
   const bound = {};
 
-  bound.html = html;
-  bound.language = language;
+  Object.assign(bound, {
+    absoluteTo,
+    getSizeOfAdditionalFile,
+    html,
+    language,
+    to,
+    urls,
+    wikiData,
+  })
 
   bound.img = bindOpts(img, {
     [bindOpts.bindIndex]: 0,
diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js
index d481b480..b6bf662b 100644
--- a/src/write/build-modes/live-dev-server.js
+++ b/src/write/build-modes/live-dev-server.js
@@ -296,20 +296,15 @@ export async function go({
         ]));
 
       const bound = bindUtilities({
+        absoluteTo,
+        getSizeOfAdditionalFile,
         language,
         to,
+        urls,
         wikiData,
       });
 
-      const pageInfo = page.page({
-        ...bound,
-
-        absoluteTo,
-        to,
-        urls,
-
-        getSizeOfAdditionalFile,
-      });
+      const pageInfo = page.page(bound);
 
       const pageHTML = generateDocumentHTML(pageInfo, {
         cachebust,
diff --git a/src/write/build-modes/static-build.js b/src/write/build-modes/static-build.js
index c2bb02f2..dab2598a 100644
--- a/src/write/build-modes/static-build.js
+++ b/src/write/build-modes/static-build.js
@@ -309,20 +309,15 @@ export async function go({
         });
 
         const bound = bindUtilities({
+          absoluteTo,
+          getSizeOfAdditionalFile,
           language,
           to,
+          urls,
           wikiData,
         });
 
-        const pageInfo = page({
-          ...bound,
-
-          absoluteTo,
-          to,
-          urls,
-
-          getSizeOfAdditionalFile,
-        });
+        const pageInfo = page(bound);
 
         const oEmbedJSON = generateOEmbedJSON(pageInfo, {
           language,