@wpnuxt/core 2.0.0-alpha.5 → 2.0.0-alpha.7

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.6",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/composables/useWPContent.js

@@ -1,18 +1,8 @@
 import { getRelativeImagePath } from "../util/images.js";
 import { computed, ref, watch as vueWatch, useAsyncGraphqlQuery } from "#imports";
-function defaultGetCachedData(key, nuxtApp, ctx) {
-  if (nuxtApp.isHydrating) {
-    return nuxtApp.payload.data[key];
-  }
-  if (ctx.cause === "refresh:manual" || ctx.cause === "refresh:hook") {
-    return void 0;
-  }
-  return nuxtApp.payload.data[key] ?? nuxtApp.static.data[key];
-}
 export const useWPContent = (queryName, nodes, fixImagePaths, params, options) => {
   const {
     clientCache,
-    cacheKey,
     getCachedData: userGetCachedData,
     retry: retryOption,
     retryDelay: retryDelayOption,
@@ -23,12 +13,7 @@ export const useWPContent = (queryName, nodes, fixImagePaths, params, options) =
   const baseRetryDelay = retryDelayOption ?? 1e3;
   const retryCount = ref(0);
   const isRetrying = ref(false);
-  const timeoutMs = timeoutOption ?? 3e4;
-  const graphqlCaching = clientCache === false ? { client: false } : restOptions.graphqlCaching ?? { client: true };
-  const paramsKey = params ? JSON.stringify(params) : "{}";
-  const baseKey = `wpnuxt-${String(queryName)}-${paramsKey}`;
-  const finalKey = cacheKey ? `${baseKey}-${cacheKey}` : baseKey;
-  const effectiveGetCachedData = userGetCachedData ?? (clientCache === false ? () => void 0 : defaultGetCachedData);
+  const timeoutMs = timeoutOption ?? 0;
   let abortController;
   let timeoutId;
   if (timeoutMs > 0) {
@@ -40,12 +25,21 @@ export const useWPContent = (queryName, nodes, fixImagePaths, params, options) =
       }
     }, timeoutMs);
   }
-  const mergedOptions = {
+  const ssgGetCachedData = userGetCachedData ?? (clientCache === false ? () => void 0 : (key, app, ctx) => {
+    if (app.isHydrating) {
+      return app.payload.data[key];
+    }
+    if (ctx.cause === "refresh:manual" || ctx.cause === "refresh:hook") {
+      return void 0;
+    }
+    return app.static?.data?.[key] ?? app.payload.data[key] ?? app.$graphqlCache?.get(key);
+  });
+  const asyncDataOptions = {
     ...restOptions,
-    graphqlCaching,
-    // Explicit key ensures consistent cache lookups
-    key: finalKey,
-    getCachedData: effectiveGetCachedData,
+    // Our getCachedData that properly checks static.data for SSG
+    getCachedData: ssgGetCachedData,
+    // Enable graphql caching so the LRU cache is populated for subsequent navigations
+    graphqlCaching: { client: clientCache !== false },
     // Pass abort signal for timeout support
     ...abortController && {
       fetchOptions: {
@@ -55,9 +49,9 @@ export const useWPContent = (queryName, nodes, fixImagePaths, params, options) =
     }
   };
   const { data, pending, refresh, execute, clear, error, status } = useAsyncGraphqlQuery(
-    queryName,
+    String(queryName),
     params ?? {},
-    mergedOptions
+    asyncDataOptions
   );
   const transformError = ref(null);
   if (timeoutId !== void 0) {
@@ -66,7 +60,7 @@ export const useWPContent = (queryName, nodes, fixImagePaths, params, options) =
         clearTimeout(timeoutId);
         timeoutId = void 0;
       }
-    });
+    }, { immediate: true });
   }
   if (maxRetries > 0) {
     vueWatch(error, async (newError) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.7",
   "description": "Nuxt module for WordPress integration via GraphQL (WPGraphQL)",
   "keywords": [
     "nuxt",