✨ removing static exports PR improvements

owid · Jan 23, 2025 · 14a3108 · 14a3108
1 parent 43b8c80
commit 14a3108
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/baker/formatWordpressPost.tsx b/baker/formatWordpressPost.tsx
@@ -213,7 +213,7 @@ export const formatWordpressPost = async (
             ReactDOMServer.renderToStaticMarkup(
                 <figure data-explorer-src={src} className={cssClass}>
                     <img
-                        src={`${EXPLORER_DYNAMIC_THUMBNAIL_URL}/${url.slug}.png`}
+                        src={`${EXPLORER_DYNAMIC_THUMBNAIL_URL}/${url.slug}.png${url.queryStr}`}
                     />
                 </figure>
             )

diff --git a/ops/buildkite/deploy-content b/ops/buildkite/deploy-content
@@ -98,7 +98,8 @@ deploy_to_cloudflare() {
 create_dist() {
     echo '--- Creating dist/ folder'
     # Define a list of excluded directories for rsync
-    EXCLUDES=(grapher/data/variables/ .git/ exports/ uploads/ assets-admin/)
+    # grapher/exports/ should be removed once #4464 is merged and we've deleted the static exports folder
+    EXCLUDES=(grapher/data/variables/ .git/ grapher/exports/ exports/ uploads/ assets-admin/)
 
     # Build rsync command with excluded directories
     RSYNC_COMMAND=("rsync" "-havzq" "--delete")

diff --git a/site/multiembedder/MultiEmbedder.tsx b/site/multiembedder/MultiEmbedder.tsx
@@ -299,9 +299,6 @@ class MultiEmbedder {
                 ? "chartView"
                 : "grapher"
 
-        const hasPreview = isExplorer ? false : !!figure.querySelector("img")
-        if (hasPreview) return
-
         // Stop observing visibility as soon as possible
         this.figuresObserver?.unobserve(figure)
 

diff --git a/site/search/ChartHit.tsx b/site/search/ChartHit.tsx
@@ -67,15 +67,13 @@ export function ChartHit({
         slug: string,
         fullQueryParams: string
     ): string {
-        return `${EXPLORER_DYNAMIC_THUMBNAIL_URL}/${slug}.svg${fullQueryParams}`
+        return `${EXPLORER_DYNAMIC_THUMBNAIL_URL}/${slug}.png${fullQueryParams}`
     }
     function createGrapherThumbnailUrl(
         slug: string,
-        fullQueryParams?: string
+        fullQueryParams = ""
     ): string {
-        return fullQueryParams
-            ? `${GRAPHER_DYNAMIC_THUMBNAIL_URL}/${slug}.svg${fullQueryParams}`
-            : `${GRAPHER_DYNAMIC_THUMBNAIL_URL}/${slug}.svg`
+        return `${GRAPHER_DYNAMIC_THUMBNAIL_URL}/${slug}.png${fullQueryParams}`
     }
     const previewUrl = isExplorerView
         ? createExplorerViewThumbnailUrl(hit.slug, fullQueryParams)