@wpnuxt/core 2.2.0 → 2.2.2

package/app/graphqlMiddleware.clientOptions.ts

@@ -0,0 +1,28 @@
+import { defineGraphqlClientOptions } from 'nuxt-graphql-middleware/client-options'
+import { useRoute } from '#imports'
+
+/**
+ * WPNuxt default client options for nuxt-graphql-middleware.
+ *
+ * This enables passing client context to the server for:
+ * - Preview mode (passes preview flag and token from URL query params)
+ *
+ * The context is available in serverFetchOptions via context.client
+ * All values must be strings (nuxt-graphql-middleware requirement)
+ *
+ * Users can customize by creating their own app/graphqlMiddleware.clientOptions.ts
+ */
+export default defineGraphqlClientOptions<{
+  preview?: string
+  previewToken?: string
+}>({
+  buildClientContext() {
+    const route = useRoute()
+
+    return {
+      // Context values must be strings - use 'true'/'false' instead of boolean
+      preview: route.query.preview === 'true' ? 'true' : undefined,
+      previewToken: route.query.token as string | undefined
+    }
+  }
+})

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "configKey": "wpNuxt",
   "compatibility": {
     "nuxt": ">=4.0.0"

package/dist/module.mjs

@@ -8,7 +8,7 @@ import { parse, GraphQLError, visit, print } from 'graphql';
 import { execSync } from 'node:child_process';
 import { consola } from 'consola';
 
-const version = "2.2.0";
+const version = "2.2.2";
 
 function createModuleError(module, message) {
   return new Error(formatErrorMessage(module, message));
@@ -891,8 +891,18 @@ const module$1 = defineNuxtModule({
     addPlugin(resolver.resolve("./runtime/plugins/sanitizeHtml"));
     configureTrailingSlash(nuxt, logger);
     const mergedQueriesFolder = await mergeQueries(nuxt, wpNuxtConfig, resolver);
-    await setupServerOptions(nuxt, resolver, logger);
-    await setupClientOptions(nuxt, resolver, logger);
+    const packageRoot = resolver.resolve("..");
+    nuxt.options._layers.push({
+      cwd: packageRoot,
+      configFile: "",
+      config: {
+        rootDir: packageRoot,
+        srcDir: packageRoot,
+        serverDir: join(packageRoot, "server"),
+        appDir: join(packageRoot, "app")
+      }
+    });
+    logger.debug("Registered WPNuxt layer for graphqlMiddleware options auto-discovery");
     const schemaPath = join(nuxt.options.rootDir, "schema.graphql");
     const schemaExists = existsSync(schemaPath);
     if (wpNuxtConfig.downloadSchema) {
@@ -1091,40 +1101,6 @@ async function loadConfig(options, nuxt) {
   }
   return config;
 }
-async function setupServerOptions(nuxt, resolver, logger) {
-  const serverDir = nuxt.options.serverDir;
-  const targetPath = join(serverDir, "graphqlMiddleware.serverOptions.ts");
-  if (existsSync(targetPath)) {
-    logger.debug("Using existing graphqlMiddleware.serverOptions.ts from project");
-    return;
-  }
-  if (!existsSync(serverDir)) {
-    await mkdir(serverDir, { recursive: true });
-  }
-  const template = readFileSync(
-    resolver.resolve("./runtime/server/graphqlMiddleware.serverOptions.ts"),
-    "utf-8"
-  );
-  await writeFile(targetPath, template);
-  logger.debug("Created graphqlMiddleware.serverOptions.ts with WPNuxt defaults (cookie/auth forwarding)");
-}
-async function setupClientOptions(nuxt, resolver, logger) {
-  const appDir = nuxt.options.dir.app;
-  const targetPath = join(appDir, "graphqlMiddleware.clientOptions.ts");
-  if (existsSync(targetPath)) {
-    logger.debug("Using existing graphqlMiddleware.clientOptions.ts from project");
-    return;
-  }
-  if (!existsSync(appDir)) {
-    await mkdir(appDir, { recursive: true });
-  }
-  const template = readFileSync(
-    resolver.resolve("./runtime/app/graphqlMiddleware.clientOptions.ts"),
-    "utf-8"
-  );
-  await writeFile(targetPath, template);
-  logger.debug("Created graphqlMiddleware.clientOptions.ts with WPNuxt defaults (preview mode support)");
-}
 function configureTrailingSlash(nuxt, logger) {
   const handlerPath = join(nuxt.options.buildDir, "wpnuxt", "trailing-slash-handler.ts").replace(/\\/g, "/");
   const handlerCode = `import { defineEventHandler, sendRedirect, getRequestURL } from 'h3'

package/dist/runtime/composables/useWPContent.js

@@ -4,7 +4,7 @@ const defaultGetCachedData = (key, app, ctx) => {
   if (app.isHydrating) {
     return app.payload.data[key];
   }
-  if (ctx.cause === "refresh:manual" || ctx.cause === "refresh:hook") {
+  if (ctx.cause === "refresh:manual" || ctx.cause === "refresh:hook" || ctx.cause === "watch") {
     return void 0;
   }
   return app.static?.data?.[key] ?? app.payload.data[key] ?? app.$graphqlCache?.get(key);

package/dist/runtime/queries/Posts.gql

@@ -1,5 +1,5 @@
-query Posts($limit: Int = 10) {
-  posts(first: $limit) {
+query Posts($limit: Int = 10, $order: OrderEnum = DESC, $orderField: PostObjectsConnectionOrderbyEnum = DATE) {
+  posts(first: $limit, where: { orderby: { field: $orderField, order: $order } }) {
     nodes {
       ...Post
     }
@@ -16,15 +16,15 @@ query PostById($id: ID!, $asPreview: Boolean = false) {
   }
 }
 
-query PostsByCategoryName($categoryName: String!, $limit: Int = 10) {
-  posts(first: $limit, where: {categoryName: $categoryName}) {
+query PostsByCategoryName($categoryName: String!, $limit: Int = 10, $order: OrderEnum = DESC, $orderField: PostObjectsConnectionOrderbyEnum = DATE) {
+  posts(first: $limit, where: {categoryName: $categoryName, orderby: { field: $orderField, order: $order }}) {
     nodes {
       ...Post
     }
   }
 }
-query PostsByCategoryId($categoryId: Int!, $limit: Int = 10) {
-  posts(first: $limit, where: {categoryId: $categoryId}) {
+query PostsByCategoryId($categoryId: Int!, $limit: Int = 10, $order: OrderEnum = DESC, $orderField: PostObjectsConnectionOrderbyEnum = DATE) {
+  posts(first: $limit, where: {categoryId: $categoryId, orderby: { field: $orderField, order: $order }}) {
     nodes {
       ...Post
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Nuxt module for WordPress integration via GraphQL (WPGraphQL)",
   "keywords": [
     "nuxt",
@@ -40,7 +40,9 @@
   "main": "./dist/module.mjs",
   "types": "./dist/types.d.mts",
   "files": [
-    "dist"
+    "dist",
+    "server",
+    "app"
   ],
   "publishConfig": {
     "access": "public"
@@ -48,21 +50,21 @@
   "dependencies": {
     "@nuxt/kit": "4.4.2",
     "consola": "^3.4.2",
-    "defu": "^6.1.4",
-    "dompurify": "^3.3.3",
-    "graphql": "^16.13.1",
-    "nuxt-graphql-middleware": "5.3.2",
+    "defu": "^6.1.7",
+    "dompurify": "^3.4.0",
+    "graphql": "^16.13.2",
+    "nuxt-graphql-middleware": "5.4.0",
     "scule": "^1.3.0"
   },
   "devDependencies": {
     "@nuxt/devtools": "^3.2.3",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/schema": "4.4.2",
-    "@nuxt/test-utils": "^4.0.0",
-    "@types/node": "^25.5.0",
+    "@nuxt/test-utils": "^4.0.2",
+    "@types/node": "^25.6.0",
     "nuxt": "^4.4.2",
-    "vitest": "^4.1.0",
-    "vue-tsc": "^3.2.5"
+    "vitest": "^4.1.4",
+    "vue-tsc": "^3.2.6"
   },
   "peerDependencies": {
     "nuxt": ">=4.0.0"

package/server/graphqlMiddleware.serverOptions.ts

@@ -0,0 +1,45 @@
+import { defineGraphqlServerOptions } from 'nuxt-graphql-middleware/server-options'
+import { getHeader, getCookie } from 'h3'
+import { useRuntimeConfig } from '#imports'
+
+/**
+ * WPNuxt default server options for nuxt-graphql-middleware.
+ *
+ * This enables:
+ * - Cookie forwarding for WordPress preview mode
+ * - Authorization header forwarding for authenticated requests
+ * - Auth token from cookie for @wpnuxt/auth
+ * - Consistent error logging
+ *
+ * Users can customize by creating their own server/graphqlMiddleware.serverOptions.ts
+ */
+export default defineGraphqlServerOptions({
+  async serverFetchOptions(event, _operation, _operationName, _context) {
+    // Get auth token from Authorization header or from cookie
+    let authorization = getHeader(event, 'authorization') || ''
+
+    // If no Authorization header, check for auth token in cookie (@wpnuxt/auth)
+    if (!authorization) {
+      const config = (useRuntimeConfig().public as Record<string, unknown>).wpNuxtAuth as { cookieName?: string } | undefined
+      const cookieName = config?.cookieName || 'wpnuxt-auth-token'
+      const authToken = getCookie(event, cookieName)
+      if (authToken) {
+        authorization = `Bearer ${authToken}`
+      }
+    }
+
+    return {
+      headers: {
+        // Forward WordPress auth cookies for previews
+        Cookie: getHeader(event, 'cookie') || '',
+        // Forward authorization header or token from cookie
+        Authorization: authorization
+      }
+    }
+  },
+
+  async onServerError(event, error, _operation, operationName) {
+    const url = event.node.req.url || 'unknown'
+    console.error(`[WPNuxt] GraphQL error in ${operationName} (${url}):`, error.message)
+  }
+})

package/dist/runtime/app/graphqlMiddleware.clientOptions.js

@@ -1,12 +0,0 @@
-import { defineGraphqlClientOptions } from "@wpnuxt/core/client-options";
-import { useRoute } from "#imports";
-export default defineGraphqlClientOptions({
-  buildClientContext() {
-    const route = useRoute();
-    return {
-      // Context values must be strings - use 'true'/'false' instead of boolean
-      preview: route.query.preview === "true" ? "true" : void 0,
-      previewToken: route.query.token
-    };
-  }
-});

package/dist/runtime/server/graphqlMiddleware.serverOptions.js

@@ -1,28 +0,0 @@
-import { defineGraphqlServerOptions } from "@wpnuxt/core/server-options";
-import { getHeader, getCookie } from "h3";
-import { useRuntimeConfig } from "#imports";
-export default defineGraphqlServerOptions({
-  async serverFetchOptions(event, _operation, _operationName, _context) {
-    let authorization = getHeader(event, "authorization") || "";
-    if (!authorization) {
-      const config = useRuntimeConfig().public.wpNuxtAuth;
-      const cookieName = config?.cookieName || "wpnuxt-auth-token";
-      const authToken = getCookie(event, cookieName);
-      if (authToken) {
-        authorization = `Bearer ${authToken}`;
-      }
-    }
-    return {
-      headers: {
-        // Forward WordPress auth cookies for previews
-        Cookie: getHeader(event, "cookie") || "",
-        // Forward authorization header or token from cookie
-        Authorization: authorization
-      }
-    };
-  },
-  async onServerError(event, error, _operation, operationName) {
-    const url = event.node.req.url || "unknown";
-    console.error(`[WPNuxt] GraphQL error in ${operationName} (${url}):`, error.message);
-  }
-});