refactor: rename viteAssetMap -> staticAssetMap

owid · Feb 4, 2025 · 626aa73 · 626aa73
1 parent 26374c8
commit 626aa73
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/baker/GrapherBaker.tsx b/baker/GrapherBaker.tsx
@@ -61,11 +61,11 @@ const renderDatapageIfApplicable = async (
     knex: db.KnexReadonlyTransaction,
     {
         imageMetadataDictionary,
-        viteAssetMap,
+        staticAssetMap,
         runtimeAssetMap,
     }: {
         imageMetadataDictionary?: Record<string, DbEnrichedImage>
-        viteAssetMap?: AssetMapEntry
+        staticAssetMap?: AssetMapEntry
         runtimeAssetMap?: AssetMapEntry
     } = {}
 ) => {
@@ -90,7 +90,7 @@ const renderDatapageIfApplicable = async (
             useIndicatorGrapherConfigs: false,
             pageGrapher: grapher,
             imageMetadataDictionary,
-            viteAssetMap,
+            staticAssetMap,
             runtimeAssetMap,
         },
         knex
@@ -107,17 +107,17 @@ export const renderDataPageOrGrapherPage = async (
     knex: db.KnexReadonlyTransaction,
     {
         imageMetadataDictionary,
-        viteAssetMap,
+        staticAssetMap,
         runtimeAssetMap,
     }: {
         imageMetadataDictionary?: Record<string, DbEnrichedImage>
-        viteAssetMap?: AssetMapEntry
+        staticAssetMap?: AssetMapEntry
         runtimeAssetMap?: AssetMapEntry
     } = {}
 ): Promise<string> => {
     const datapage = await renderDatapageIfApplicable(grapher, false, knex, {
         imageMetadataDictionary,
-        viteAssetMap,
+        staticAssetMap,
         runtimeAssetMap,
     })
     if (datapage) return datapage
@@ -132,7 +132,7 @@ export async function renderDataPageV2(
         useIndicatorGrapherConfigs,
         pageGrapher,
         imageMetadataDictionary = {},
-        viteAssetMap,
+        staticAssetMap,
         runtimeAssetMap,
     }: {
         variableId: number
@@ -141,7 +141,7 @@ export async function renderDataPageV2(
         useIndicatorGrapherConfigs: boolean
         pageGrapher?: GrapherInterface
         imageMetadataDictionary?: Record<string, ImageMetadata>
-        viteAssetMap?: AssetMapEntry
+        staticAssetMap?: AssetMapEntry
         runtimeAssetMap?: AssetMapEntry
     },
     knex: db.KnexReadonlyTransaction
@@ -239,7 +239,7 @@ export async function renderDataPageV2(
             imageMetadata={imageMetadata}
             faqEntries={faqEntries}
             tagToSlugMap={tagToSlugMap}
-            viteAssetMap={viteAssetMap}
+            staticAssetMap={staticAssetMap}
             runtimeAssetMap={runtimeAssetMap}
         />
     )
@@ -292,11 +292,11 @@ export const bakeSingleGrapherPageForArchival = async (
     knex: db.KnexReadonlyTransaction,
     {
         imageMetadataDictionary,
-        viteAssetMap,
+        staticAssetMap,
         runtimeAssetMap,
     }: {
         imageMetadataDictionary?: Record<string, DbEnrichedImage>
-        viteAssetMap?: AssetMapEntry
+        staticAssetMap?: AssetMapEntry
         runtimeAssetMap?: AssetMapEntry
     } = {}
 ) => {
@@ -305,7 +305,7 @@ export const bakeSingleGrapherPageForArchival = async (
         outPathHtml,
         await renderDataPageOrGrapherPage(grapher, knex, {
             imageMetadataDictionary,
-            viteAssetMap,
+            staticAssetMap,
             runtimeAssetMap,
         })
     )
@@ -315,7 +315,7 @@ export const bakeSingleGrapherPageForArchival = async (
     // hashes of the config and data files.
     await fs.writeFile(
         outPathManifest,
-        JSON.stringify({ viteAssetMap, runtimeAssetMap }, undefined, 2)
+        JSON.stringify({ staticAssetMap, runtimeAssetMap }, undefined, 2)
     )
     console.log(outPathHtml, outPathManifest)
 }

diff --git a/baker/buildLocalArchivalBake.ts b/baker/buildLocalArchivalBake.ts
@@ -95,15 +95,15 @@ const bakeAssets = async () => {
 
     await fs.mkdirp(targetDir)
 
-    const viteAssetMap: AssetMapEntry = {}
+    const staticAssetMap: AssetMapEntry = {}
 
     for (const dirent of await fs.readdir(srcDir, { withFileTypes: true })) {
         if (!dirent.isFile()) continue
         const srcFile = path.join(srcDir, dirent.name)
         const filename = await hashAndCopyFile(srcFile, targetDir)
-        viteAssetMap[dirent.name] = `/${filename}`
+        staticAssetMap[dirent.name] = `/${filename}`
     }
-    return { viteAssetMap }
+    return { staticAssetMap }
 }
 
 const bakeDomainToFolder = async (
@@ -116,8 +116,8 @@ const bakeDomainToFolder = async (
     await fs.mkdirp(dir)
     await fs.mkdirp(path.join(dir, "grapher"))
 
-    const { viteAssetMap } = await bakeAssets()
-    const baker = new SiteBaker(dir, baseUrl, bakeSteps, viteAssetMap)
+    const { staticAssetMap } = await bakeAssets()
+    const baker = new SiteBaker(dir, baseUrl, bakeSteps, staticAssetMap)
 
     console.log(`Baking site locally with baseUrl '${baseUrl}' to dir '${dir}'`)
 
@@ -143,7 +143,7 @@ const bakeDomainToFolder = async (
 
         await bakeSingleGrapherPageForArchival(dir, chart.config, trx, {
             imageMetadataDictionary,
-            viteAssetMap,
+            staticAssetMap,
             runtimeAssetMap: runtimeFiles,
         })
     }, db.TransactionCloseMode.Close)

diff --git a/site/DataPageV2.tsx b/site/DataPageV2.tsx
@@ -44,7 +44,7 @@ export const DataPageV2 = (props: {
     faqEntries?: FaqEntryData
     imageMetadata: Record<string, ImageMetadata>
     tagToSlugMap: Record<string | number, string>
-    viteAssetMap?: AssetMapEntry
+    staticAssetMap?: AssetMapEntry
     runtimeAssetMap?: AssetMapEntry
     dataApiUrl?: string
 }) => {
@@ -57,7 +57,7 @@ export const DataPageV2 = (props: {
         faqEntries,
         tagToSlugMap,
         imageMetadata,
-        viteAssetMap,
+        staticAssetMap,
         runtimeAssetMap,
     } = props
     const pageTitle = grapher?.title ?? datapageData.title.title
@@ -113,7 +113,7 @@ export const DataPageV2 = (props: {
                 pageDesc={pageDesc}
                 imageUrl={imageUrl}
                 baseUrl={baseUrl}
-                viteAssetMap={viteAssetMap}
+                staticAssetMap={staticAssetMap}
             >
                 <meta property="og:image:width" content={imageWidth} />
                 <meta property="og:image:height" content={imageHeight} />
@@ -184,7 +184,7 @@ export const DataPageV2 = (props: {
                     baseUrl={baseUrl}
                     context={SiteFooterContext.dataPageV2}
                     isPreviewing={isPreviewing}
-                    viteAssetMap={viteAssetMap}
+                    staticAssetMap={staticAssetMap}
                     runtimeAssetMap={runtimeAssetMap}
                 />
                 <script

diff --git a/site/Head.tsx b/site/Head.tsx
@@ -45,7 +45,7 @@ export const Head = (props: {
         title: string
         href: string
     }
-    viteAssetMap?: AssetMapEntry
+    staticAssetMap?: AssetMapEntry
 }) => {
     const { canonicalUrl, hideCanonicalUrl, baseUrl } = props
     const pageTitle = props.pageTitle || `Our World in Data`
@@ -63,7 +63,7 @@ export const Head = (props: {
     }
 
     const stylesheets = viteAssetsForSite({
-        viteAssetMap: props.viteAssetMap,
+        staticAssetMap: props.staticAssetMap,
     }).forHeader
 
     return (

diff --git a/site/SiteFooter.tsx b/site/SiteFooter.tsx
@@ -12,7 +12,7 @@ interface SiteFooterProps {
     context?: SiteFooterContext
     debug?: boolean
     isPreviewing?: boolean
-    viteAssetMap?: AssetMapEntry
+    staticAssetMap?: AssetMapEntry
     runtimeAssetMap?: AssetMapEntry
 }
 
@@ -278,7 +278,10 @@ export const SiteFooter = (props: SiteFooterProps) => (
                 </div>
             </div>
             <div className="site-tools" />
-            {viteAssetsForSite({ viteAssetMap: props.viteAssetMap }).forFooter}
+            {
+                viteAssetsForSite({ staticAssetMap: props.staticAssetMap })
+                    .forFooter
+            }
             <ScriptLoadErrorDetector />
             <script
                 type="module"

diff --git a/site/viteUtils.tsx b/site/viteUtils.tsx
@@ -217,9 +217,9 @@ const viteAssets = (
 
 export const viteAssetsForAdmin = () => viteAssets(ViteEntryPoint.Admin)
 export const viteAssetsForSite = ({
-    viteAssetMap,
-}: { viteAssetMap?: AssetMapEntry } = {}) =>
-    viteAssets(ViteEntryPoint.Site, { prodAssetMap: viteAssetMap })
+    staticAssetMap,
+}: { staticAssetMap?: AssetMapEntry } = {}) =>
+    viteAssets(ViteEntryPoint.Site, { prodAssetMap: staticAssetMap })
 
 export const generateEmbedSnippet = () => {
     // Make sure we're using an absolute URL here, since we don't know in what context the embed snippet is used.