diff --git a/baker/GrapherBaker.tsx b/baker/GrapherBaker.tsx index 56e4a1a9fb..a8dc290785 100644 --- a/baker/GrapherBaker.tsx +++ b/baker/GrapherBaker.tsx @@ -33,7 +33,7 @@ import { DbPlainChart, DbRawChartConfig, DbEnrichedImage, - AssetMapEntry, + AssetMap, } from "@ourworldindata/types" import ProgressBar from "progress" import { @@ -65,8 +65,8 @@ const renderDatapageIfApplicable = async ( runtimeAssetMap, }: { imageMetadataDictionary?: Record - staticAssetMap?: AssetMapEntry - runtimeAssetMap?: AssetMapEntry + staticAssetMap?: AssetMap + runtimeAssetMap?: AssetMap } = {} ) => { const variable = await getVariableOfDatapageIfApplicable(grapher) @@ -111,8 +111,8 @@ export const renderDataPageOrGrapherPage = async ( runtimeAssetMap, }: { imageMetadataDictionary?: Record - staticAssetMap?: AssetMapEntry - runtimeAssetMap?: AssetMapEntry + staticAssetMap?: AssetMap + runtimeAssetMap?: AssetMap } = {} ): Promise => { const datapage = await renderDatapageIfApplicable(grapher, false, knex, { @@ -141,8 +141,8 @@ export async function renderDataPageV2( useIndicatorGrapherConfigs: boolean pageGrapher?: GrapherInterface imageMetadataDictionary?: Record - staticAssetMap?: AssetMapEntry - runtimeAssetMap?: AssetMapEntry + staticAssetMap?: AssetMap + runtimeAssetMap?: AssetMap }, knex: db.KnexReadonlyTransaction ) { @@ -296,8 +296,8 @@ export const bakeSingleGrapherPageForArchival = async ( runtimeAssetMap, }: { imageMetadataDictionary?: Record - staticAssetMap?: AssetMapEntry - runtimeAssetMap?: AssetMapEntry + staticAssetMap?: AssetMap + runtimeAssetMap?: AssetMap } = {} ) => { const outPathHtml = `${bakedSiteDir}/grapher/${grapher.slug}.html` diff --git a/baker/buildLocalArchivalBake.ts b/baker/buildLocalArchivalBake.ts index 5f74edfadf..ebd80bade0 100644 --- a/baker/buildLocalArchivalBake.ts +++ b/baker/buildLocalArchivalBake.ts @@ -12,7 +12,7 @@ import { getAllImages } from "../db/model/Image.js" import { getChartConfigBySlug } from "../db/model/Chart.js" import findProjectBaseDir from "../settings/findBaseDir.js" import crypto from "crypto" -import { AssetMapEntry } from "@ourworldindata/types" +import { AssetMap } from "@ourworldindata/types" import { getVariableData } from "../db/model/Variable.js" import dayjs from "dayjs" import { glob } from "glob" @@ -124,7 +124,7 @@ const bakeAssets = async () => { await fs.mkdirp(targetDir) - const staticAssetMap: AssetMapEntry = {} + const staticAssetMap: AssetMap = {} for (const dirent of await fs.readdir(srcDir, { withFileTypes: true })) { if (!dirent.isFile()) continue diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx index bc2bb8ea79..fc27abf93f 100644 --- a/packages/@ourworldindata/grapher/src/core/Grapher.tsx +++ b/packages/@ourworldindata/grapher/src/core/Grapher.tsx @@ -115,7 +115,7 @@ import { SeriesName, ChartViewInfo, OwidChartDimensionInterfaceWithMandatorySlug, - AssetMapEntry, + AssetMap, } from "@ourworldindata/types" import { BlankOwidTable, @@ -277,7 +277,7 @@ async function loadVariablesDataAdmin( async function loadVariablesDataSite( variableIds: number[], dataApiUrl: string, - assetMap?: AssetMapEntry + assetMap?: AssetMap ): Promise { const loadVariableDataPromises = variableIds.map((variableId) => loadVariableDataAndMetadata(variableId, dataApiUrl, assetMap) @@ -341,7 +341,7 @@ export interface GrapherProgrammaticInterface extends GrapherInterface { ChartViewInfo, "parentChartSlug" | "queryParamsForParentChart" > - runtimeAssetMap?: AssetMapEntry + runtimeAssetMap?: AssetMap manager?: GrapherManager instanceRef?: React.RefObject @@ -522,7 +522,7 @@ export class Grapher "name" | "parentChartSlug" | "queryParamsForParentChart" > = undefined - runtimeAssetMap?: AssetMapEntry = this.props.runtimeAssetMap + runtimeAssetMap?: AssetMap = this.props.runtimeAssetMap selection = this.manager?.selection ?? diff --git a/packages/@ourworldindata/grapher/src/core/loadVariable.ts b/packages/@ourworldindata/grapher/src/core/loadVariable.ts index b3431f3cba..07388603a0 100644 --- a/packages/@ourworldindata/grapher/src/core/loadVariable.ts +++ b/packages/@ourworldindata/grapher/src/core/loadVariable.ts @@ -1,5 +1,5 @@ import { - AssetMapEntry, + AssetMap, OwidVariableDataMetadataDimensions, } from "@ourworldindata/types" import { fetchWithRetry } from "@ourworldindata/utils" @@ -7,7 +7,7 @@ import { fetchWithRetry } from "@ourworldindata/utils" export const getVariableDataRoute = ( dataApiUrl: string, variableId: number, - assetMap?: AssetMapEntry + assetMap?: AssetMap ): string => { if (dataApiUrl.includes("v1/indicators/")) { const filename = `${variableId}.data.json` @@ -22,7 +22,7 @@ export const getVariableDataRoute = ( export const getVariableMetadataRoute = ( dataApiUrl: string, variableId: number, - assetMap?: AssetMapEntry + assetMap?: AssetMap ): string => { if (dataApiUrl.includes("v1/indicators/")) { const filename = `${variableId}.metadata.json` @@ -37,7 +37,7 @@ export const getVariableMetadataRoute = ( export async function loadVariableDataAndMetadata( variableId: number, dataApiUrl: string, - assetMap?: AssetMapEntry + assetMap?: AssetMap ): Promise { const dataPromise = fetchWithRetry( getVariableDataRoute(dataApiUrl, variableId, assetMap) diff --git a/packages/@ourworldindata/types/src/domainTypes/Site.ts b/packages/@ourworldindata/types/src/domainTypes/Site.ts index 038743cb07..5c0c705d53 100644 --- a/packages/@ourworldindata/types/src/domainTypes/Site.ts +++ b/packages/@ourworldindata/types/src/domainTypes/Site.ts @@ -7,8 +7,8 @@ export interface KeyValueProps { [key: string]: string | boolean | undefined } -export type AssetMapEntry = Record +export type AssetMap = Record export interface AssetMap { - viteAssets: AssetMapEntry - runtimeResources: AssetMapEntry + viteAssets: AssetMap + runtimeResources: AssetMap } diff --git a/packages/@ourworldindata/types/src/index.ts b/packages/@ourworldindata/types/src/index.ts index 9e94c354eb..1b5164810a 100644 --- a/packages/@ourworldindata/types/src/index.ts +++ b/packages/@ourworldindata/types/src/index.ts @@ -25,7 +25,7 @@ export { export { type BreadcrumbItem, type KeyValueProps, - type AssetMapEntry, + type AssetMap, type AssetMap, } from "./domainTypes/Site.js" export { diff --git a/site/DataPageV2.tsx b/site/DataPageV2.tsx index f88ae35e2f..a1a2513630 100644 --- a/site/DataPageV2.tsx +++ b/site/DataPageV2.tsx @@ -15,7 +15,7 @@ import { GrapherInterface, ImageMetadata, Url, - AssetMapEntry, + AssetMap, } from "@ourworldindata/utils" import { MarkdownTextWrap } from "@ourworldindata/components" import urljoin from "url-join" @@ -44,8 +44,8 @@ export const DataPageV2 = (props: { faqEntries?: FaqEntryData imageMetadata: Record tagToSlugMap: Record - staticAssetMap?: AssetMapEntry - runtimeAssetMap?: AssetMapEntry + staticAssetMap?: AssetMap + runtimeAssetMap?: AssetMap dataApiUrl?: string }) => { const { diff --git a/site/DataPageV2Content.tsx b/site/DataPageV2Content.tsx index e587ce35f7..430fe88a2e 100644 --- a/site/DataPageV2Content.tsx +++ b/site/DataPageV2Content.tsx @@ -11,7 +11,7 @@ import { GrapherInterface, joinTitleFragments, ImageMetadata, - AssetMapEntry, + AssetMap, } from "@ourworldindata/utils" import { DocumentContext } from "./gdocs/DocumentContext.js" import { AttachmentsContext } from "./gdocs/AttachmentsContext.js" @@ -42,7 +42,7 @@ export const DataPageV2Content = ({ }: DataPageV2ContentFields & { grapherConfig: GrapherInterface imageMetadata: Record - runtimeAssetMap?: AssetMapEntry + runtimeAssetMap?: AssetMap }) => { const [grapher, setGrapher] = useState(undefined) diff --git a/site/Head.tsx b/site/Head.tsx index 3abbd9d8ab..9568e01530 100644 --- a/site/Head.tsx +++ b/site/Head.tsx @@ -1,10 +1,7 @@ import { viteAssetsForSite } from "./viteUtils.js" import { GOOGLE_TAG_MANAGER_ID } from "../settings/clientSettings.js" import { NoJSDetector } from "./NoJSDetector.js" -import { - AssetMapEntry, - DEFAULT_THUMBNAIL_FILENAME, -} from "@ourworldindata/types" +import { AssetMap, DEFAULT_THUMBNAIL_FILENAME } from "@ourworldindata/types" export const GTMScriptTags = ({ gtmId }: { gtmId: string }) => { if (!gtmId || /["']/.test(gtmId)) return null @@ -45,7 +42,7 @@ export const Head = (props: { title: string href: string } - staticAssetMap?: AssetMapEntry + staticAssetMap?: AssetMap }) => { const { canonicalUrl, hideCanonicalUrl, baseUrl } = props const pageTitle = props.pageTitle || `Our World in Data` diff --git a/site/SiteFooter.tsx b/site/SiteFooter.tsx index 84c473a020..66f8b0b830 100644 --- a/site/SiteFooter.tsx +++ b/site/SiteFooter.tsx @@ -1,6 +1,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome/index.js" import { faAngleRight } from "@fortawesome/free-solid-svg-icons" -import { AssetMapEntry, SiteFooterContext } from "@ourworldindata/utils" +import { AssetMap, SiteFooterContext } from "@ourworldindata/utils" import { viteAssetsForSite } from "./viteUtils.js" import { ScriptLoadErrorDetector } from "./NoJSDetector.js" import { RSS_FEEDS, SOCIALS } from "./SiteConstants.js" @@ -12,8 +12,8 @@ interface SiteFooterProps { context?: SiteFooterContext debug?: boolean isPreviewing?: boolean - staticAssetMap?: AssetMapEntry - runtimeAssetMap?: AssetMapEntry + staticAssetMap?: AssetMap + runtimeAssetMap?: AssetMap } export const SiteFooter = (props: SiteFooterProps) => ( diff --git a/site/detailsOnDemand.tsx b/site/detailsOnDemand.tsx index 028c5a3e33..1a933cb929 100644 --- a/site/detailsOnDemand.tsx +++ b/site/detailsOnDemand.tsx @@ -4,7 +4,7 @@ import { BAKED_BASE_URL } from "../settings/clientSettings.js" import { renderToStaticMarkup } from "react-dom/server.js" import { ArticleBlocks } from "./gdocs/components/ArticleBlocks.js" import { - AssetMapEntry, + AssetMap, DetailDictionary, fetchWithRetry, } from "@ourworldindata/utils" @@ -25,7 +25,7 @@ const siteAnalytics = new SiteAnalytics() export async function runDetailsOnDemand({ runtimeAssetMap, }: { - runtimeAssetMap?: AssetMapEntry + runtimeAssetMap?: AssetMap } = {}) { const dodFetchUrl = runtimeAssetMap?.["dods.json"] ?? `${BAKED_BASE_URL}/dods.json` diff --git a/site/runSiteFooterScripts.tsx b/site/runSiteFooterScripts.tsx index d1250b680b..c0e74bee2e 100644 --- a/site/runSiteFooterScripts.tsx +++ b/site/runSiteFooterScripts.tsx @@ -1,7 +1,7 @@ import { StrictMode } from "react" import { hydrate, render } from "react-dom" import { - AssetMapEntry, + AssetMap, DataPageV2ContentFields, getOwidGdocFromJSON, getWindowQueryStr, @@ -80,7 +80,7 @@ function hydrateDataInsightsIndexPage() { function hydrateDataPageV2Content({ isPreviewing, runtimeAssetMap, -}: { isPreviewing?: boolean; runtimeAssetMap?: AssetMapEntry } = {}) { +}: { isPreviewing?: boolean; runtimeAssetMap?: AssetMap } = {}) { const wrapper = document.querySelector(`#${OWID_DATAPAGE_CONTENT_ROOT_ID}`) const props: DataPageV2ContentFields = window._OWID_DATAPAGEV2_PROPS const grapherConfig = window._OWID_GRAPHER_CONFIG @@ -272,7 +272,7 @@ export const runSiteFooterScripts = ( context?: SiteFooterContext container?: HTMLElement hideDonationFlag?: boolean - runtimeAssetMap?: AssetMapEntry + runtimeAssetMap?: AssetMap } | undefined ) => { diff --git a/site/viteUtils.tsx b/site/viteUtils.tsx index 1f5b13aad7..7f615079b8 100644 --- a/site/viteUtils.tsx +++ b/site/viteUtils.tsx @@ -10,7 +10,7 @@ import { POLYFILL_URL } from "./SiteConstants.js" import type { Manifest, ManifestChunk } from "vite" import { sortBy } from "@ourworldindata/utils" import urljoin from "url-join" -import { AssetMapEntry } from "@ourworldindata/types" +import { AssetMap } from "@ourworldindata/types" const VITE_DEV_URL = process.env.VITE_DEV_URL ?? "http://localhost:8090" @@ -99,7 +99,7 @@ export const createTagsForManifestEntry = ( manifest: Manifest, entry: string, assetBaseUrl: string, - assetMap?: AssetMapEntry + assetMap?: AssetMap ): Assets => { const createTags = (entry: string): React.ReactElement[] => { const manifestEntry = @@ -171,7 +171,7 @@ export const createTagsForManifestEntry = ( const prodAssets = ( entrypoint: ViteEntryPoint, baseUrl: string, - prodAssetMap?: AssetMapEntry + prodAssetMap?: AssetMap ): Assets => { const baseDir = findBaseDir(__dirname) const entrypointInfo = VITE_ENTRYPOINT_INFO[entrypoint] @@ -209,7 +209,7 @@ const viteAssets = ( { prodBaseUrl, prodAssetMap, - }: { prodBaseUrl?: string; prodAssetMap?: AssetMapEntry } = {} + }: { prodBaseUrl?: string; prodAssetMap?: AssetMap } = {} ) => useProductionAssets ? prodAssets(entrypoint, prodBaseUrl ?? "", prodAssetMap) @@ -218,7 +218,7 @@ const viteAssets = ( export const viteAssetsForAdmin = () => viteAssets(ViteEntryPoint.Admin) export const viteAssetsForSite = ({ staticAssetMap, -}: { staticAssetMap?: AssetMapEntry } = {}) => +}: { staticAssetMap?: AssetMap } = {}) => viteAssets(ViteEntryPoint.Site, { prodAssetMap: staticAssetMap }) export const generateEmbedSnippet = () => {