@wpnuxt/core 1.0.0-edge.7 → 1.0.0-edge.9

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "1.0.0-edge.7",
+  "version": "1.0.0-edge.9",
   "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.7";
+const version = "1.0.0-edge.9";
 
 const loggerRef = ref();
 const initLogger = (logLevel) => {
@@ -225,12 +225,12 @@ const module = defineNuxtModule({
     const userQueryPathExists = existsSync(userQueryPath);
     cpSync(resolveRuntimeModule("./queries/"), queryOutputPath, { recursive: true });
     if (hasNuxtModule("@wpnuxt/blocks")) {
-      logger.debug("Loading @wpnuxt/blocks");
       for (const m of nuxt.options._installedModules) {
         if (m.meta.name === "@wpnuxt/blocks" && m.entryPath) {
+          logger.debug("Loading queries from @wpnuxt/blocks");
           let blocksQueriesPath;
-          if (m.entryPath.startsWith("../src/module")) {
-            blocksQueriesPath = join(nuxt.options.rootDir, "../src/runtime/queries/");
+          if (m.entryPath.startsWith("../")) {
+            blocksQueriesPath = join(nuxt.options.rootDir, "../", m.entryPath, "./runtime/queries/");
           } else {
             blocksQueriesPath = join("./node_modules", m.entryPath, "dist/runtime/queries/");
           }
@@ -239,6 +239,12 @@ const module = defineNuxtModule({
       }
     } else {
       logger.debug("Tip: Install the @wpnuxt/blocks module if you want to render Gutenberg blocks with separate vue components");
+      addTemplate({
+        write: true,
+        filename: "wpnuxt/blocks.mjs",
+        getContents: () => `export { }`
+      });
+      nuxt.options.alias["#wpnuxt/blocks"] = resolve(nuxt.options.buildDir, "wpnuxt/blocks");
     }
     if (userQueryPathExists) {
       logger.debug("Extending queries:", userQueryPath);

package/dist/runtime/components/WPNuxtLogo.vue

@@ -13,5 +13,5 @@ const wpDark = props.wpColor ? props.wpColor : 'white'
 </template>
 
 <style scoped>
-.wpnuxt-logo{display:none;font-size:1.5rem;font-weight:700;line-height:2rem}@media (min-width:640px){.wpnuxt-logo{display:inline-flex}}.wpnuxt-logo-wp{color:v-bind(wpLight);font-family:ui-serif,Times,serif}html.dark .wpnuxt-logo-wp{color:v-bind(wpDark);font-family:ui-serif,Times,serif}.wpnuxt-logo-nuxt{margin-top:-1px;--tw-text-opacity:1;color:rgb(186 175 78/var(--tw-text-opacity))}
+.wpnuxt-logo{display:inline-flex;font-size:1.5rem;font-weight:700;line-height:2rem}.wpnuxt-logo-wp{color:v-bind(wpLight);font-family:ui-serif,Times,serif}html.dark .wpnuxt-logo-wp{color:v-bind(wpDark);font-family:ui-serif,Times,serif}.wpnuxt-logo-nuxt{margin-top:-1px;--tw-text-opacity:1;color:rgb(186 175 78/var(--tw-text-opacity))}
 </style>

package/dist/runtime/composables/usePrevNextPost.js

@@ -12,9 +12,9 @@ const _usePrevNextPost = async (currentPostSlug) => {
 };
 const getAllPosts = async () => {
   const { data: allPosts } = await useWPContent("Posts", ["posts", "nodes"], false);
-  if (allPosts.value) {
+  if (allPosts) {
     return {
-      slugs: allPosts.value?.map((post) => {
+      slugs: allPosts?.map((post) => {
         if (post) return post.slug;
         else return null;
       })

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

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

package/dist/runtime/composables/useWPContent.js

@@ -1,28 +1,23 @@
-import { FetchError } from "ofetch";
 import { getRelativeImagePath } from "../util/images.js";
-import { useFetch, useNuxtApp } from "#app";
 const _useWPContent = async (queryName, nodes, fixImagePaths, params) => {
-  const nuxtApp = useNuxtApp();
-  const cacheKey = `wp-${queryName}-${nodes}-${JSON.stringify(params)}`;
-  return useFetch("/api/wpContent", {
+  const { data, error } = await $fetch("/api/wpContent", {
     method: "POST",
     body: {
       queryName,
       params
-    },
-    key: cacheKey,
-    transform(data) {
-      const transformedData = findData(data.data, nodes);
-      if (fixImagePaths && transformedData?.featuredImage?.node?.sourceUrl) {
-        transformedData.featuredImage.node.relativePath = getRelativeImagePath(transformedData.featuredImage.node.sourceUrl);
-      }
-      if (transformedData) return transformedData;
-      throw new FetchError("No data found");
-    },
-    getCachedData(key) {
-      return nuxtApp.payload.data[key] || nuxtApp.static.data[key];
     }
   });
+  return {
+    data: transformData(data, nodes, fixImagePaths),
+    error
+  };
+};
+const transformData = (data, nodes, fixImagePaths) => {
+  const transformedData = findData(data, nodes);
+  if (fixImagePaths && transformedData?.featuredImage?.node?.sourceUrl) {
+    transformedData.featuredImage.node.relativePath = getRelativeImagePath(transformedData.featuredImage.node.sourceUrl);
+  }
+  return transformedData;
 };
 const findData = (data, nodes) => {
   if (nodes.length === 0) return data;

package/dist/runtime/queries/fragments/NodeWithContentEditor.fragment.gql

@@ -0,0 +1,3 @@
+fragment NodeWithContentEditor on NodeWithContentEditor {
+  content
+}

package/dist/runtime/queries/fragments/Page.fragment.gql

@@ -1,10 +1,11 @@
 #import '~/.queries/fragments/ContentNode.fragment.gql';
 #import '~/.queries/fragments/NodeWithFeaturedImage.fragment.gql';
+#import '~/.queries/fragments/NodeWithContentEditor.fragment.gql';
 
 fragment Page on Page {
   ...ContentNode
   ...NodeWithFeaturedImage
-  content
+  ...NodeWithContentEditor
   isFrontPage
   isPostsPage
   isPreview

package/dist/runtime/queries/fragments/Post.fragment.gql

@@ -1,11 +1,12 @@
 #import "~/.queries/fragments/NodeWithExcerpt.fragment.gql";
 #import '~/.queries/fragments/ContentNode.fragment.gql';
 #import '~/.queries/fragments/NodeWithFeaturedImage.fragment.gql';
+#import '~/.queries/fragments/NodeWithContentEditor.fragment.gql';
 
 fragment Post on Post {
   ...NodeWithExcerpt
   ...ContentNode
   ...NodeWithFeaturedImage
-  content
+  ...NodeWithContentEditor
   title
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "1.0.0-edge.7",
+  "version": "1.0.0-edge.9",
   "description": "WPNuxt",
   "repository": {
     "type": "git",
@@ -72,7 +72,7 @@
     "@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.3.0",
+    "@types/node": "22.4.1",
     "@vitest/coverage-v8": "^2.0.5",
     "@vue/test-utils": "^2.4.6",
     "@wordpress/env": "^10.5.0",