write, upd8: factor out universalUtilities

2 files changed, 3 insertions, 21 deletions

diff --git a/src/write/build-modes/live-dev-server.js b/src/write/build-modes/live-dev-server.js
index c855533b..c0b8c800 100644
--- a/src/write/build-modes/live-dev-server.js
+++ b/src/write/build-modes/live-dev-server.js
@@ -167,6 +167,8 @@ export async function go({
   contentDependenciesWatcher.on('error', () => {});
   await new Promise(resolve => contentDependenciesWatcher.once('ready', resolve));
 
+  const commonUtilities = {...universalUtilities};
+
   let targetSpecPairs = getPageSpecsWithTargets({wikiData});
   const pages = progressCallAll(`Computing page data & paths for ${targetSpecPairs.length} targets.`,
     targetSpecPairs.flatMap(({
@@ -332,17 +334,6 @@ export async function go({
 
     // Other routes determined by page and URL specs
 
-    const commonUtilities = {
-      defaultLanguage,
-      getSizeOfAdditionalFile,
-      getSizeOfImagePath,
-      languages,
-      missingImagePaths,
-      thumbsCache,
-      urls,
-      wikiData,
-    };
-
     const startTiming = () => {
       if (!showTimings) {
         return () => '';
diff --git a/src/write/build-modes/static-build.js b/src/write/build-modes/static-build.js
index d743a64b..3f829ada 100644
--- a/src/write/build-modes/static-build.js
+++ b/src/write/build-modes/static-build.js
@@ -288,16 +288,7 @@ export async function go({
     showAggregate: niceShowAggregate,
   });
 
-  const commonUtilities = {
-    defaultLanguage,
-    getSizeOfAdditionalFile,
-    getSizeOfImagePath,
-    languages,
-    missingImagePaths,
-    thumbsCache,
-    urls,
-    wikiData,
-  };
+  const commonUtilities = {...universalUtilities};
 
   const perLanguageFn = async (language, i, entries) => {
     const baseDirectory =