@wpnuxt/core 1.0.0-edge.11 → 1.0.0-edge.13

package/dist/module.d.mts

@@ -63,7 +63,7 @@ interface WPNuxtConfigQueries {
   outputDir?: string
 }
 
-declare const _default: _nuxt_schema.NuxtModule<WPNuxtConfig>;
+declare const _default: _nuxt_schema.NuxtModule<WPNuxtConfig, WPNuxtConfig, false>;
 
 declare module '@nuxt/schema' {
     interface RuntimeConfig {

package/dist/module.d.ts

@@ -63,7 +63,7 @@ interface WPNuxtConfigQueries {
   outputDir?: string
 }
 
-declare const _default: _nuxt_schema.NuxtModule<WPNuxtConfig>;
+declare const _default: _nuxt_schema.NuxtModule<WPNuxtConfig, WPNuxtConfig, false>;
 
 declare module '@nuxt/schema' {
     interface RuntimeConfig {

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "1.0.0-edge.11",
+  "version": "1.0.0-edge.13",
   "configKey": "wpNuxt",
   "nuxt": ">=3.1.0",
   "builder": {

package/dist/module.mjs

@@ -7,7 +7,7 @@ import { upperFirst } from 'scule';
 import { parse } from 'graphql';
 
 const name = "@wpnuxt/core";
-const version = "1.0.0-edge.11";
+const version = "1.0.0-edge.13";
 
 const loggerRef = ref();
 const initLogger = (logLevel) => {
@@ -217,10 +217,6 @@ const module = defineNuxtModule({
       route: "/api/wpContent",
       handler: resolveRuntimeModule("./server/api/wpContent.post")
     });
-    addServerHandler({
-      route: "/api/purgeCache",
-      handler: resolveRuntimeModule("./server/api/purgeCache.get")
-    });
     await installModule("@vueuse/nuxt", {});
     const queryOutputPath = resolve((nuxt.options.srcDir || nuxt.options.rootDir) + "/.queries/");
     await promises.rm(queryOutputPath, { recursive: true, force: true });
@@ -232,7 +228,9 @@ const module = defineNuxtModule({
         if (m.meta.name === "@wpnuxt/blocks" && m.entryPath) {
           logger.debug("Loading queries from @wpnuxt/blocks");
           let blocksQueriesPath;
-          if (m.entryPath.startsWith("../")) {
+          if (m.entryPath == "../src/module") {
+            blocksQueriesPath = join(nuxt.options.rootDir, "../src/runtime/queries/");
+          } else if (m.entryPath.startsWith("../")) {
             blocksQueriesPath = join(nuxt.options.rootDir, "../", m.entryPath, "./runtime/queries/");
           } else {
             blocksQueriesPath = join("./node_modules", m.entryPath, "dist/runtime/queries/");
@@ -331,9 +329,9 @@ const module = defineNuxtModule({
       autoimports.push(...ctx.fnImports || []);
     });
     nuxt.hook("nitro:init", async (nitro) => {
-      const keys = await nitro.storage.getKeys("cache:content");
+      const keys = await nitro.storage.getKeys("cache:api:wpContent");
       keys.forEach(async (key) => {
-        if (key.startsWith("cache:content"))
+        if (key.startsWith("cache:api:wpContent"))
           await nitro.storage.removeItem(key);
       });
     });

package/dist/runtime/components/ContentRenderer.vue

@@ -2,12 +2,12 @@
 import type { NodeWithContentEditorFragment } from '#build/graphql-operations'
 
 defineProps<{
-  post: NodeWithContentEditorFragment
+  node: NodeWithContentEditorFragment
 }>()
 </script>
 
 <template>
   <div
-    v-sanitize="post.content"
+    v-sanitize="node.content"
   />
 </template>

package/dist/runtime/components/WPContent.vue

@@ -20,7 +20,7 @@ const componentToRender = await findComponentToRender()
 <template>
   <component
     :is="componentToRender"
-    v-if="componentToRender"
+    v-if="componentToRender && node"
     :node="node"
   />
 </template>

package/dist/runtime/composables/useWPContent.d.ts

@@ -1,5 +1,5 @@
 import type { FetchError } from 'ofetch';
 export declare const useWPContent: <T>(queryName: string, nodes: string[], fixImagePaths: boolean, params?: T) => Promise<{
-    data: T;
+    data: unknown;
     error: import("vue").Ref<FetchError<any> | null>;
 }>;

package/dist/runtime/server/api/wpContent.post.d.ts

@@ -1,7 +1,4 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
-    data: any;
-    errors: any;
-}>>;
+declare const _default: any;
 export default _default;
 /**
  * Get the parameters for the GraphQL middleware query.

package/dist/runtime/server/api/wpContent.post.js

@@ -1,39 +1,33 @@
-import { defineEventHandler, readBody } from "h3";
-import { cacheStorage } from "../storage.js";
-import { isStaging } from "../../composables/isStaging.js";
-import { useRuntimeConfig } from "#imports";
-export default defineEventHandler(async (event) => {
-  const config = useRuntimeConfig();
+import { readBody } from "h3";
+import { defineCachedEventHandler } from "#internal/nitro";
+export default defineCachedEventHandler(async (event) => {
   const body = await readBody(event);
-  const staging = await isStaging();
   if (!body || !body.queryName) {
     throw new Error(
       "The request must contain a queryName"
     );
   }
-  const cacheKey = `wpContent-${body.queryName}-${body.params ? JSON.stringify(body.params).replaceAll('"', "").replaceAll(":", "-") : ""}`;
-  if (config.public.wpNuxt.enableCache && !staging) {
-    const cachedContent = await cacheStorage.getItem(cacheKey);
-    if (cachedContent) {
-      return {
-        data: cachedContent,
-        errors: []
-      };
-    }
-  }
   return $fetch("/api/graphql_middleware/query/" + body.queryName, {
     params: buildRequestParams(body.params),
     headers: {
       Authorization: `Bearer ${event.context.accessToken}`
     }
   }).then((v) => {
-    cacheStorage.setItem(cacheKey, v.data).catch(() => {
-    });
     return {
       data: v.data,
       errors: v.errors || []
     };
   });
+}, {
+  group: "api",
+  name: "wpContent",
+  getKey: async (event) => {
+    const body = await readBody(event);
+    return `${body.queryName}${body.params ? "_" + JSON.stringify(body.params).replaceAll('"', "").replaceAll(":", "_") : ""}`;
+  },
+  swr: true,
+  maxAge: 60 * 5
+  // 5 minutes
 });
 export function buildRequestParams(variables) {
   if (!variables) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "1.0.0-edge.11",
+  "version": "1.0.0-edge.13",
   "description": "WPNuxt",
   "repository": {
     "type": "git",
@@ -52,7 +52,7 @@
     "start": "pnpm run wp-env:create && pnpm run dev"
   },
   "dependencies": {
-    "@nuxt/kit": "3.12.4",
+    "@nuxt/kit": "3.13.0",
     "@vueuse/nuxt": "^11.0.0",
     "defu": "^6.1.4",
     "graphql": "^16.9.0",
@@ -65,27 +65,27 @@
     "@graphql-codegen/cli": "^5.0.2",
     "@graphql-codegen/client-preset": "^4.3.3",
     "@graphql-codegen/typescript-operations": "^4.2.3",
-    "@nuxt/devtools": "^1.3.9",
-    "@nuxt/eslint-config": "^0.5.0",
+    "@nuxt/devtools": "^1.3.14",
+    "@nuxt/eslint-config": "^0.5.2",
     "@nuxt/module-builder": "^0.8.3",
-    "@nuxt/schema": "3.12.4",
+    "@nuxt/schema": "3.13.0",
     "@nuxt/test-utils": "^3.14.1",
     "@rollup/rollup-linux-arm64-gnu": "^4.20.0",
     "@rollup/rollup-linux-arm64-musl": "^4.20.0",
-    "@types/node": "22.4.1",
+    "@types/node": "22.5.0",
     "@vitest/coverage-v8": "^2.0.5",
     "@vue/test-utils": "^2.4.6",
-    "@wordpress/env": "^10.5.0",
+    "@wordpress/env": "^10.6.0",
     "changelogen": "^0.5.5",
     "markdownlint-cli": "^0.41.0",
-    "nuxt": "^3.12.4",
+    "nuxt": "^3.13.0",
     "nuxt-content-twoslash": "^0.1.1",
     "release-it": "^17.6.0",
     "shiki": "^1.13.0",
     "twoslash": "^0.2.9",
     "typescript": "^5.5.4",
     "untyped": "1.4.2",
-    "vite": "^5.4.1",
+    "vite": "^5.4.2",
     "vitest": "^2.0.5",
     "vue-docgen-web-types": "^0.1.8",
     "vue-tsc": "2.0.29"

package/dist/runtime/server/api/purgeCache.get.d.ts

@@ -1,5 +0,0 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
-    data: string;
-    errors: never[];
-}>>;
-export default _default;

package/dist/runtime/server/api/purgeCache.get.js

@@ -1,9 +0,0 @@
-import { defineEventHandler } from "h3";
-import { purgeCache } from "../storage.js";
-export default defineEventHandler(async () => {
-  purgeCache();
-  return {
-    data: "Cache purged!",
-    errors: []
-  };
-});

package/dist/runtime/server/storage.d.ts

@@ -1,3 +0,0 @@
-import { type Storage } from 'unstorage';
-export declare const cacheStorage: Storage;
-export declare const purgeCache: () => Promise<void>;

package/dist/runtime/server/storage.js

@@ -1,11 +0,0 @@
-import { prefixStorage } from "unstorage";
-import { useLogger } from "../util/logger.js";
-import { useStorage } from "#imports";
-export const cacheStorage = prefixStorage(useStorage(), "cache:wpnuxt-content");
-export const purgeCache = async () => {
-  const keys = await cacheStorage.getKeys("cache:wpnuxt-content");
-  keys.forEach(async (key) => {
-    await cacheStorage.removeItem(key);
-  });
-  useLogger().info("ServerSide cache purged!");
-};