fix: ensure static image map is available on first load

nuxt · Apr 27, 2021 · 6b82aad · 6b82aad
1 parent 9561daf
commit 6b82aad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/runtime/image.ts b/src/runtime/image.ts
@@ -40,8 +40,9 @@ export function createImage (globalOptions: CreateImageOptions, nuxtContext: any
 
       if (process.server) {
         const { ssrContext } = ctx.nuxtContext
+        const ssrState = ssrContext.nuxt
         const ssrData = ssrContext.nuxt.data[0]
-        const staticImages = ssrData._img = ssrData._img || {}
+        const staticImages = ssrState._img = ssrData._img = ssrData._img || {}
         const mapToStatic: MapToStatic = ssrContext.image?.mapToStatic
         if (typeof mapToStatic === 'function') {
           const mappedURL = mapToStatic(image)

diff --git a/src/runtime/utils/static-map.ts b/src/runtime/utils/static-map.ts
@@ -4,8 +4,13 @@ const staticImageMap = {}
 
 function updateImageMap () {
   if (typeof window.$nuxt !== 'undefined') {
+    // Client-side navigation
     const pageImages = (window.$nuxt as any)._pagePayload?.data?.[0]?._img || {}
     Object.assign(staticImageMap, pageImages)
+  } else if (typeof (window as any).__NUXT__ !== 'undefined') {
+    // Initial load
+    const pageImages = (window as any).__NUXT__?._img || {}
+    Object.assign(staticImageMap, pageImages)
   }
 }