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

package/dist/module.d.mts

@@ -111,6 +111,21 @@ interface WPNuxtConfig {
          * @default true
          */
         swr?: boolean;
+        /**
+         * Secret token for the cache revalidation webhook endpoint.
+         *
+         * When set, WPNuxt registers a POST endpoint at `/api/_wpnuxt/revalidate`
+         * that WordPress can call to purge all cached GraphQL responses immediately.
+         *
+         * On self-hosted (Node.js), purges Nitro's internal handler cache.
+         * On Vercel, also purges the CDN cache when `VERCEL_TOKEN` and
+         * `VERCEL_PROJECT_ID` environment variables are set.
+         *
+         * Can also be set via `WPNUXT_REVALIDATE_SECRET` environment variable.
+         *
+         * @see https://wpnuxt.com/guide/caching#webhook-revalidation
+         */
+        revalidateSecret?: string;
     };
 }
 

package/dist/module.d.ts

@@ -111,6 +111,21 @@ interface WPNuxtConfig {
          * @default true
          */
         swr?: boolean;
+        /**
+         * Secret token for the cache revalidation webhook endpoint.
+         *
+         * When set, WPNuxt registers a POST endpoint at `/api/_wpnuxt/revalidate`
+         * that WordPress can call to purge all cached GraphQL responses immediately.
+         *
+         * On self-hosted (Node.js), purges Nitro's internal handler cache.
+         * On Vercel, also purges the CDN cache when `VERCEL_TOKEN` and
+         * `VERCEL_PROJECT_ID` environment variables are set.
+         *
+         * Can also be set via `WPNUXT_REVALIDATE_SECRET` environment variable.
+         *
+         * @see https://wpnuxt.com/guide/caching#webhook-revalidation
+         */
+        revalidateSecret?: string;
     };
 }
 

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "configKey": "wpNuxt",
   "compatibility": {
     "nuxt": ">=3.17.0"

package/dist/module.mjs

@@ -2,13 +2,13 @@ import { defu } from 'defu';
 import { promises, cpSync, existsSync, readdirSync, statSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { writeFile, rename, readFile, mkdir } from 'node:fs/promises';
 import { join, relative, dirname } from 'node:path';
-import { useLogger, createResolver, resolveFiles, defineNuxtModule, addPlugin, addImports, addComponentsDir, addTemplate, addTypeTemplate, hasNuxtModule, installModule } from '@nuxt/kit';
+import { useLogger, createResolver, resolveFiles, defineNuxtModule, addPlugin, addServerHandler, addImports, addComponentsDir, addTemplate, addTypeTemplate, hasNuxtModule, installModule } from '@nuxt/kit';
 import { upperFirst } from 'scule';
 import { parse, GraphQLError, visit, print } from 'graphql';
 import { execSync } from 'node:child_process';
 import { consola } from 'consola';
 
-const version = "2.0.0-beta.5";
+const version = "2.0.0-beta.7";
 
 function createModuleError(module, message) {
   return new Error(formatErrorMessage(module, message));
@@ -71,9 +71,42 @@ async function mergeQueries(nuxt, wpNuxtConfig, resolver) {
     logger.debug("Extending queries:", userQueryPath);
     copyGraphqlFiles(userQueryPath, queryOutputPath);
   }
+  await addCustomFragmentsToNodeQuery(queryOutputPath, userQueryPath, logger);
   logger.debug("Merged queries folder:", queryOutputPath);
   return queryOutputPath;
 }
+const FRAGMENT_DEF_PATTERN = /fragment\s+(\w+)\s+on\s+(\w+)/;
+async function addCustomFragmentsToNodeQuery(queryOutputPath, userQueryPath, logger) {
+  const userFragmentsDir = join(userQueryPath, "fragments");
+  if (!existsSync(userFragmentsDir)) return;
+  const customFragments = [];
+  for (const file of readdirSync(userFragmentsDir)) {
+    if (!file.endsWith(".gql") && !file.endsWith(".graphql")) continue;
+    const content = await promises.readFile(join(userFragmentsDir, file), "utf-8");
+    const match = content.match(FRAGMENT_DEF_PATTERN);
+    if (!match) continue;
+    const name = match[1];
+    const type = match[2];
+    if (name && type && name === type) {
+      customFragments.push({ name, type });
+    }
+  }
+  if (customFragments.length === 0) return;
+  const nodeGqlPath = join(queryOutputPath, "Node.gql");
+  if (!existsSync(nodeGqlPath)) return;
+  let nodeGql = await promises.readFile(nodeGqlPath, "utf-8");
+  const spreads = customFragments.map((f) => `    ... on ${f.type} { ...${f.name} }`).join("\n");
+  nodeGql = nodeGql.replace(
+    /(\s+\.\.\.Post)\n(\s+\}\n\})/,
+    `$1
+${spreads}
+$2`
+  );
+  await promises.writeFile(nodeGqlPath, nodeGql, "utf-8");
+  logger.debug(
+    `Added custom content type fragments to NodeByUri: ${customFragments.map((f) => f.name).join(", ")}`
+  );
+}
 function findConflicts(userQueryPath, outputPath) {
   const conflicts = [];
   function walk(dir) {
@@ -152,6 +185,11 @@ function processSelections(selections, level, query, canExtract = true) {
   if (hasSingleField && canExtract && firstSelection.kind === "Field") {
     query.nodes?.push(firstSelection.name.value.trim());
   }
+  const hasFragments = selections.some((s) => s.kind === "FragmentSpread");
+  const hasCustomFields = selections.some((s) => s.kind === "Field" && s.name.value !== "__typename");
+  if (hasFragments && hasCustomFields) {
+    query.hasInlineFields = true;
+  }
   selections.forEach((s) => {
     if (s.kind === "FragmentSpread") {
       query.fragments?.push(s.name.value.trim());
@@ -216,21 +254,21 @@ async function prepareContext(ctx) {
   const mutationFnName = (fn) => `useMutation${upperFirst(fn)}`;
   const formatNodes = (nodes) => nodes?.map((n) => `'${n}'`).join(",") ?? "";
   const getFragmentType = (q) => {
-    if (q.fragments?.length) {
-      const fragmentSuffix = q.nodes?.includes("nodes") ? "[]" : "";
-      return q.fragments.map((f) => `WithImagePath<${f}Fragment>${fragmentSuffix}`).join(" | ");
-    }
-    if (q.nodes?.length) {
-      let typePath = `${q.name}RootQuery`;
-      for (const node of q.nodes) {
-        typePath = `NonNullable<${typePath}>['${node}']`;
-      }
-      if (q.nodes.includes("nodes")) {
-        typePath = `${typePath}[number]`;
+    if (q.hasInlineFields || !q.fragments?.length) {
+      if (q.nodes?.length) {
+        let typePath = `${q.name}RootQuery`;
+        for (const node of q.nodes) {
+          typePath = `NonNullable<${typePath}>['${node}']`;
+        }
+        if (q.nodes.includes("nodes")) {
+          typePath = `${typePath}[number]`;
+        }
+        return typePath;
       }
-      return typePath;
+      return `${q.name}RootQuery`;
     }
-    return `${q.name}RootQuery`;
+    const fragmentSuffix = q.nodes?.includes("nodes") ? "[]" : "";
+    return q.fragments.map((f) => `WithImagePath<${f}Fragment>${fragmentSuffix}`).join(" | ");
   };
   const queryFnExp = (q, typed = false) => {
     const functionName = fnName(q.name);
@@ -270,10 +308,10 @@ async function prepareContext(ctx) {
   const typeSet = /* @__PURE__ */ new Set();
   queries.forEach((o) => {
     typeSet.add(`${o.name}QueryVariables`);
-    if (o.fragments?.length) {
-      o.fragments.forEach((f) => typeSet.add(`${f}Fragment`));
-    } else {
+    if (o.hasInlineFields || !o.fragments?.length) {
       typeSet.add(`${o.name}RootQuery`);
+    } else {
+      o.fragments.forEach((f) => typeSet.add(`${f}Fragment`));
     }
   });
   mutations.forEach((m) => {
@@ -431,6 +469,7 @@ URL: ${fullUrl}
 Make sure WPGraphQL plugin is installed and activated on your WordPress site.`
       );
     }
+    await checkWPGraphQLVersion(fullUrl, headers);
     if (options.schemaPath && !existsSync(options.schemaPath)) {
       try {
         const authFlag = options.authToken ? ` -h "Authorization=Bearer ${options.authToken}"` : "";
@@ -500,6 +539,41 @@ Check your wpNuxt.wordpressUrl configuration in nuxt.config.ts`
     );
   }
 }
+async function checkWPGraphQLVersion(fullUrl, headers) {
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 1e4);
+    const response = await fetch(fullUrl, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        query: '{ __type(name: "MediaDetails") { fields { name } } }'
+      }),
+      signal: controller.signal
+    });
+    clearTimeout(timeout);
+    if (!response.ok) return;
+    const data = await response.json();
+    const fields = data?.data?.__type?.fields || [];
+    const hasFilePath = fields.some((f) => f.name === "filePath");
+    if (!hasFilePath) {
+      throw new Error(
+        `[wpnuxt:core] WPGraphQL version is too old. WPNuxt v2 requires WPGraphQL >= 2.0.0.
+
+URL: ${fullUrl}
+
+The installed WPGraphQL version does not support required schema features.
+Please update the WPGraphQL plugin on your WordPress site to version 2.0.0 or later.
+
+Download: https://wordpress.org/plugins/wp-graphql/`
+      );
+    }
+  } catch (error) {
+    if (error instanceof Error && error.message.startsWith("[wpnuxt:core]")) {
+      throw error;
+    }
+  }
+}
 const PROBLEMATIC_INTERFACES = /* @__PURE__ */ new Set([
   "Connection",
   "Edge",
@@ -809,16 +883,38 @@ const module$1 = defineNuxtModule({
     });
     if (wpNuxtConfig.cache?.enabled !== false) {
       const maxAge = wpNuxtConfig.cache?.maxAge ?? 300;
+      const swr = wpNuxtConfig.cache?.swr !== false;
       const nitroOptions = nuxt.options;
       nitroOptions.nitro = nitroOptions.nitro || {};
       nitroOptions.nitro.routeRules = nitroOptions.nitro.routeRules || {};
-      nitroOptions.nitro.routeRules["/api/wpnuxt/query/**"] = {
-        cache: {
-          maxAge,
-          swr: wpNuxtConfig.cache?.swr !== false
-        }
-      };
-      logger.debug(`Server-side caching enabled for GraphQL queries (maxAge: ${maxAge}s, SWR: ${wpNuxtConfig.cache?.swr !== false})`);
+      const isVercel = process.env.VERCEL === "1" || nitroOptions.nitro.preset === "vercel";
+      if (isVercel) {
+        const swrValue = swr ? `, stale-while-revalidate=${maxAge}` : "";
+        nitroOptions.nitro.routeRules["/api/wpnuxt/query/**"] = {
+          headers: {
+            "Vercel-CDN-Cache-Control": `s-maxage=${maxAge}${swrValue}`,
+            "Vercel-Cache-Tag": "wpnuxt"
+          }
+        };
+        logger.debug(`Vercel CDN caching enabled for GraphQL queries (s-maxage: ${maxAge}s, SWR: ${swr})`);
+      } else {
+        nitroOptions.nitro.routeRules["/api/wpnuxt/query/**"] = {
+          cache: {
+            maxAge,
+            swr
+          }
+        };
+        logger.debug(`Server-side caching enabled for GraphQL queries (maxAge: ${maxAge}s, SWR: ${swr})`);
+      }
+    }
+    if (wpNuxtConfig.cache?.revalidateSecret) {
+      const revalidateHandler = resolver.resolve("./runtime/server/api/wpnuxt/revalidate.post");
+      addServerHandler({
+        route: "/api/_wpnuxt/revalidate",
+        method: "post",
+        handler: revalidateHandler
+      });
+      logger.info("Cache revalidation endpoint registered at POST /api/_wpnuxt/revalidate");
     }
     {
       const nitroOptions = nuxt.options;
@@ -906,7 +1002,8 @@ async function loadConfig(options, nuxt) {
     schemaAuthToken: process.env.WPNUXT_SCHEMA_AUTH_TOKEN,
     // Only override downloadSchema if env var is explicitly set
     downloadSchema: process.env.WPNUXT_DOWNLOAD_SCHEMA !== void 0 ? process.env.WPNUXT_DOWNLOAD_SCHEMA === "true" : void 0,
-    debug: process.env.WPNUXT_DEBUG ? process.env.WPNUXT_DEBUG === "true" : void 0
+    debug: process.env.WPNUXT_DEBUG ? process.env.WPNUXT_DEBUG === "true" : void 0,
+    cache: process.env.WPNUXT_REVALIDATE_SECRET ? { revalidateSecret: process.env.WPNUXT_REVALIDATE_SECRET } : void 0
   }, options);
   if (config.downloadSchema === void 0) {
     config.downloadSchema = true;
@@ -935,6 +1032,9 @@ async function loadConfig(options, nuxt) {
       swr: config.cache?.swr ?? true
     }
   };
+  if (config.cache?.revalidateSecret) {
+    nuxt.options.runtimeConfig.wpNuxtRevalidateSecret = config.cache.revalidateSecret;
+  }
   return config;
 }
 async function setupServerOptions(nuxt, resolver, logger) {

package/dist/runtime/composables/useWPContent.js

@@ -53,11 +53,12 @@ export const useWPContent = (queryName, nodes, fixImagePaths, params, options) =
       }
     }
   };
-  const { data, pending, refresh, execute, clear, error, status } = useAsyncGraphqlQuery(
+  const asyncResult = useAsyncGraphqlQuery(
     String(queryName),
     normalizedParams ?? {},
     asyncDataOptions
   );
+  const { data, pending, refresh, execute, clear, error, status } = asyncResult;
   const transformError = ref(null);
   if (timeoutId !== void 0) {
     vueWatch(pending, (isPending) => {
@@ -118,7 +119,7 @@ See: https://wpnuxt.com/guide/menus`
       return void 0;
     }
   });
-  return {
+  const returnValue = {
     data: transformedData,
     pending,
     refresh,
@@ -133,4 +134,9 @@ See: https://wpnuxt.com/guide/menus`
     /** Whether a retry is currently in progress */
     isRetrying
   };
+  const thenable = asyncResult;
+  return Object.assign(
+    thenable.then(() => returnValue),
+    returnValue
+  );
 };

package/dist/runtime/queries/Node.gql

@@ -1,5 +1,6 @@
 query NodeByUri($uri: String!) {
   nodeByUri(uri: $uri) {
+    __typename
     ...Page
     ...Post
   }

package/dist/runtime/server/api/wpnuxt/revalidate.post.js

@@ -0,0 +1,36 @@
+import { createConsola } from "consola";
+import { defineEventHandler, readBody, createError } from "h3";
+const logger = createConsola().withTag("wpnuxt");
+export default defineEventHandler(async (event) => {
+  const body = await readBody(event);
+  const { wpNuxtRevalidateSecret } = useRuntimeConfig(event);
+  if (!wpNuxtRevalidateSecret || body?.secret !== wpNuxtRevalidateSecret) {
+    throw createError({ statusCode: 401, statusMessage: "Invalid secret" });
+  }
+  const storage = useStorage("cache:nitro:handlers");
+  const keys = await storage.getKeys();
+  const wpnuxtKeys = keys.filter((k) => k.includes("wpnuxt"));
+  await Promise.all(wpnuxtKeys.map((key) => storage.removeItem(key)));
+  let vercelPurged = false;
+  if (process.env.VERCEL && process.env.VERCEL_TOKEN && process.env.VERCEL_PROJECT_ID) {
+    try {
+      const response = await fetch(`https://api.vercel.com/v1/edge-cache/invalidate-by-tags?projectIdOrName=${process.env.VERCEL_PROJECT_ID}`, {
+        method: "POST",
+        headers: {
+          "Authorization": `Bearer ${process.env.VERCEL_TOKEN}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ tags: ["wpnuxt"] })
+      });
+      vercelPurged = response.ok;
+      if (!response.ok) {
+        logger.warn(`Vercel cache purge failed: ${response.status} ${response.statusText}`);
+      }
+    } catch (error) {
+      logger.warn("Vercel cache purge request failed:", error);
+    }
+  }
+  const purged = wpnuxtKeys.length;
+  logger.info(`Cache revalidated: purged ${purged} Nitro entries${vercelPurged ? ", Vercel CDN cache purged" : ""}`);
+  return { success: true, purged, vercelPurged };
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "description": "Nuxt module for WordPress integration via GraphQL (WPGraphQL)",
   "keywords": [
     "nuxt",
@@ -46,23 +46,23 @@
     "access": "public"
   },
   "dependencies": {
-    "@nuxt/kit": "4.3.1",
-    "consola": "^3.4.0",
+    "@nuxt/kit": "4.4.2",
+    "consola": "^3.4.2",
     "defu": "^6.1.4",
-    "dompurify": "^3.1.7",
-    "graphql": "^16.12.0",
+    "dompurify": "^3.3.3",
+    "graphql": "^16.13.1",
     "nuxt-graphql-middleware": "5.3.2",
     "scule": "^1.3.0"
   },
   "devDependencies": {
-    "@nuxt/devtools": "^3.2.1",
+    "@nuxt/devtools": "^3.2.3",
     "@nuxt/module-builder": "^1.0.2",
-    "@nuxt/schema": "4.3.1",
+    "@nuxt/schema": "4.4.2",
     "@nuxt/test-utils": "^4.0.0",
-    "@types/node": "^25.2.3",
-    "nuxt": "4.3.1",
-    "vitest": "^4.0.18",
-    "vue-tsc": "^3.2.3"
+    "@types/node": "^25.5.0",
+    "nuxt": "^4.4.2",
+    "vitest": "^4.1.0",
+    "vue-tsc": "^3.2.5"
   },
   "peerDependencies": {
     "nuxt": ">=3.17.0"