Merge pull request #3241 from owid/serve-img-local-env

fix(dev): serve gdoc images on local dev

adminSiteServer/mockSiteRouter.tsx

@@ -54,6 +54,7 @@ import { GdocPost } from "../db/model/Gdoc/GdocPost.js"
 import { GdocDataInsight } from "../db/model/Gdoc/GdocDataInsight.js"
 import * as db from "../db/db.js"
 import { calculateDataInsightIndexPageCount } from "../db/model/Gdoc/gdocUtils.js"
+import { DEFAULT_LOCAL_BAKE_DIR } from "../site/SiteConstants.js"
 
 require("express-async-errors")
 
@@ -307,6 +308,13 @@ mockSiteRouter.use(
     })
 )
 
+mockSiteRouter.use(
+    "/images/published",
+    express.static(path.join(DEFAULT_LOCAL_BAKE_DIR, "images/published"), {
+        fallthrough: false,
+    })
+)
+
 mockSiteRouter.use(
     "/exports",
     express.static(path.join(BAKED_SITE_DIR, "exports"))

baker/buildLocalBake.ts

@@ -6,10 +6,11 @@ import { BakeStep, BakeStepConfig, bakeSteps, SiteBaker } from "./SiteBaker.js"
 import fs from "fs-extra"
 import { normalize } from "path"
 import * as db from "../db/db.js"
+import { DEFAULT_LOCAL_BAKE_DIR } from "../site/SiteConstants.js"
 
 const bakeDomainToFolder = async (
     baseUrl = "http://localhost:3000/",
-    dir = "localBake",
+    dir = DEFAULT_LOCAL_BAKE_DIR,
     bakeSteps?: BakeStepConfig
 ) => {
     dir = normalize(dir)

site/SiteConstants.ts

@@ -12,3 +12,5 @@ const polyfillFeatures = [
 export const POLYFILL_URL: string = `https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?features=${polyfillFeatures.join(
     ","
 )}`
+
+export const DEFAULT_LOCAL_BAKE_DIR = "localBake"