From f7512c7e8c0c5c381d67e8288a57040182d1a827 Mon Sep 17 00:00:00 2001
From: Farnabaz <farnabaz@gmail.com>
Date: Fri, 25 Sep 2020 19:03:07 +0330
Subject: [PATCH] fix(full-static): find hashed images from page payload

---
 src/runtime/image.ts | 25 ++++++++++++++++++-------
 src/types.ts         |  6 ++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/runtime/image.ts b/src/runtime/image.ts
index b02aa3c6c..d2fbd90a8 100644
--- a/src/runtime/image.ts
+++ b/src/runtime/image.ts
@@ -60,22 +60,33 @@ export function createImage(context, { providers, defaultProvider, presets }: Cr
       presetMap[options.preset] ? presetMap[options.preset].modifiers : modifiers,
       { ...provider.defaults, ...options }
     )
-    
-    const { data } = context.nuxtState || context.ssrContext.nuxt
-    const nuxtState = data[0]
-    nuxtState.images = nuxtState.images || {}
+
+    if (typeof window !== "undefined" && window.__NUXT_JSONP_CACHE__) {
+      const jsonPData = window.__NUXT_JSONP_CACHE__[context.route.path].data[0]
+      if (jsonPData.images[providerUrl]) {
+        // Hydration with hash
+        return jsonPData.images[providerUrl]
+      }
+      // return original source on cache fail in full static mode
+      return src
+    } 
+
+    const nuxtState = context.nuxtState || context.ssrContext.nuxt
+    const data = nuxtState.data[0]
+
+    data.images = data.images || {}
     
     let url = providerUrl
-    if (nuxtState.images[url]) {
+    if (data.images[url]) {
       // Hydration with hash
-      url = nuxtState.images[url]
+      url = data.images[url]
     } else if (context.ssrContext && typeof context.ssrContext.mapImage === 'function') {
        // Full Static
        const originalURL = url
        url = context.ssrContext.mapImage({ url, isStatic, format: modifiers.format, src })
        
        if (url) {
-          nuxtState.images[providerUrl] = url
+          data.images[providerUrl] = url
        } else {
           url = originalURL
        }
diff --git a/src/types.ts b/src/types.ts
index fa1f544bc..80c55734a 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,3 +1,9 @@
+declare global {
+  interface Window {
+    __NUXT_JSONP_CACHE__: { [key: string]: any }
+  }
+}
+
 export interface ModuleOptions {
     defaultProvider: string;
     presets: ImagePreset[],