@wpnuxt/core 1.0.0-edge.17 → 1.0.0-edge.19

package/dist/module.d.mts

@@ -40,6 +40,9 @@ interface WPNuxtConfig {
    * @default true
    */
   downloadSchema?: boolean
+
+  hasBlocksModule?: boolean
+  hasAuthModule?: boolean
 }
 
 interface WPNuxtConfigQueries {

package/dist/module.d.ts

@@ -40,6 +40,9 @@ interface WPNuxtConfig {
    * @default true
    */
   downloadSchema?: boolean
+
+  hasBlocksModule?: boolean
+  hasAuthModule?: boolean
 }
 
 interface WPNuxtConfigQueries {

package/dist/module.json

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

package/dist/module.mjs

@@ -1,13 +1,13 @@
-import { promises, statSync, existsSync, cpSync } from 'node:fs';
-import { resolveFiles, defineNuxtModule, createResolver, addPlugin, addImports, addComponentsDir, addServerHandler, installModule, hasNuxtModule, addTemplate, addTypeTemplate } from '@nuxt/kit';
-import { join } from 'pathe';
+import { createResolver, hasNuxtModule, addTemplate, resolveFiles, defineNuxtModule, addPlugin, addImports, addComponentsDir, addServerHandler, installModule, addTypeTemplate } from '@nuxt/kit';
 import consola, { createConsola } from 'consola';
+import { promises, existsSync, cpSync, statSync } from 'node:fs';
 import { ref } from 'vue';
+import { join } from 'pathe';
 import { upperFirst } from 'scule';
 import { parse } from 'graphql';
 
 const name = "@wpnuxt/core";
-const version = "1.0.0-edge.17";
+const version = "1.0.0-edge.19";
 
 const loggerRef = ref();
 const initLogger = (logLevel) => {
@@ -37,6 +37,53 @@ function validateConfig(options) {
     throw new Error("WPNuxt error: frontend url should not have a trailing slash: " + options.frontendUrl);
   }
 }
+async function mergeQueries(nuxt) {
+  const { resolve } = createResolver(import.meta.url);
+  const resolveRuntimeModule = (path) => resolve("./runtime", path);
+  const logger = getLogger();
+  const queryOutputPath = resolve((nuxt.options.srcDir || nuxt.options.rootDir) + "/.queries/");
+  await promises.rm(queryOutputPath, { recursive: true, force: true });
+  const userQueryPath = "~/extend/queries/".replace(/^(~~|@@)/, nuxt.options.rootDir).replace(/^(~|@)/, nuxt.options.srcDir);
+  const userQueryPathExists = existsSync(userQueryPath);
+  cpSync(resolveRuntimeModule("./queries/"), queryOutputPath, { recursive: true });
+  addQueriesFromAddOnModule("@wpnuxt/blocks", queryOutputPath, nuxt, resolve);
+  addQueriesFromAddOnModule("@wpnuxt/auth", queryOutputPath, nuxt, resolve);
+  if (userQueryPathExists) {
+    logger.debug("Extending queries:", userQueryPath);
+    cpSync(resolve(userQueryPath), queryOutputPath, { recursive: true });
+  }
+  logger.debug("Copied merged queries in folder:", queryOutputPath);
+  return queryOutputPath;
+}
+function addQueriesFromAddOnModule(addOnModuleName, queryOutputPath, nuxt, resolve) {
+  const logger = getLogger();
+  if (hasNuxtModule(addOnModuleName)) {
+    console.log("addOnModule found:", addOnModuleName);
+    for (const m of nuxt.options._installedModules) {
+      if (m.meta.name === addOnModuleName && m.entryPath) {
+        logger.debug("Loading queries from " + addOnModuleName);
+        let blocksQueriesPath;
+        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/");
+        }
+        console.log("blocksQueriesPath", blocksQueriesPath);
+        cpSync(blocksQueriesPath, queryOutputPath, { recursive: true });
+      }
+    }
+  } else {
+    const moduleName = addOnModuleName.replace("@", "");
+    addTemplate({
+      write: true,
+      filename: moduleName + ".mjs",
+      getContents: () => `export { }`
+    });
+    nuxt.options.alias["#" + moduleName] = resolve(nuxt.options.buildDir, moduleName);
+  }
+}
 
 const _parseDoc = async (doc) => {
   const { definitions } = parse(doc);
@@ -148,7 +195,9 @@ const defaultConfigs = {
   enableCache: true,
   staging: false,
   logLevel: 3,
-  composablesPrefix: "useWP"
+  composablesPrefix: "useWP",
+  hasBlocksModule: false,
+  hasAuthModule: false
 };
 const module = defineNuxtModule({
   meta: {
@@ -170,11 +219,14 @@ const module = defineNuxtModule({
       staging: process.env.WPNUXT_STAGING === "true" || options.staging,
       downloadSchema: process.env.WPNUXT_DOWNLOAD_SCHEMA === "true" || options.downloadSchema,
       logLevel: process.env.WPNUXT_LOG_LEVEL ? Number.parseInt(process.env.WPNUXT_LOG_LEVEL) : options.logLevel,
-      composablesPrefix: process.env.WPNUXT_COMPOSABLES_PREFIX || options.composablesPrefix
+      composablesPrefix: process.env.WPNUXT_COMPOSABLES_PREFIX || options.composablesPrefix,
+      hasBlocksModule: hasNuxtModule("@wpnuxt/blocks"),
+      hasAuthModule: hasNuxtModule("@wpnuxt/auth")
     };
     nuxt.options.runtimeConfig.public.wpNuxt = publicWPNuxtConfig;
     validateConfig(publicWPNuxtConfig);
     const logger = initLogger(publicWPNuxtConfig.logLevel);
+    logger.info("config:", publicWPNuxtConfig);
     logger.info("Connecting GraphQL to", publicWPNuxtConfig.wordpressUrl);
     logger.info("frontendUrl:", publicWPNuxtConfig.frontendUrl);
     if (publicWPNuxtConfig.enableCache)
@@ -218,41 +270,13 @@ const module = defineNuxtModule({
       route: "/api/wpContent",
       handler: resolveRuntimeModule("./server/api/wpContent.post")
     });
+    addServerHandler({
+      route: "/api/config",
+      handler: resolveRuntimeModule("./server/api/config")
+    });
     await installModule("@vueuse/nuxt", {});
-    const queryOutputPath = resolve((nuxt.options.srcDir || nuxt.options.rootDir) + "/.queries/");
-    await promises.rm(queryOutputPath, { recursive: true, force: true });
-    const userQueryPath = "~/extend/queries/".replace(/^(~~|@@)/, nuxt.options.rootDir).replace(/^(~|@)/, nuxt.options.srcDir);
-    const userQueryPathExists = existsSync(userQueryPath);
-    cpSync(resolveRuntimeModule("./queries/"), queryOutputPath, { recursive: true });
-    if (hasNuxtModule("@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 == "../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/");
-          }
-          cpSync(blocksQueriesPath, queryOutputPath, { recursive: true });
-        }
-      }
-    } 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);
-      cpSync(resolve(userQueryPath), queryOutputPath, { recursive: true });
-    }
-    logger.debug("Copied merged queries in folder:", queryOutputPath);
+    const mergedQueriesFolder = await mergeQueries(nuxt);
+    console.log("mergedQueriesFolder", mergedQueriesFolder);
     await installModule("nuxt-graphql-middleware", {
       debug: publicWPNuxtConfig.logLevel ? publicWPNuxtConfig.logLevel > 3 : false,
       graphqlEndpoint: `${publicWPNuxtConfig.wordpressUrl}/graphql`,
@@ -283,7 +307,7 @@ const module = defineNuxtModule({
         }
       },
       outputDocuments: true,
-      autoImportPatterns: queryOutputPath,
+      autoImportPatterns: mergedQueriesFolder,
       includeComposables: true,
       devtools: true
     });
@@ -315,7 +339,7 @@ const module = defineNuxtModule({
       fnImports: [],
       composablesPrefix: publicWPNuxtConfig.composablesPrefix
     };
-    await generateWPNuxtComposables(ctx, queryOutputPath, srcResolver);
+    await generateWPNuxtComposables(ctx, mergedQueriesFolder, srcResolver);
     addTemplate({
       write: true,
       filename: "wpnuxt/index.mjs",

package/dist/runtime/composables/useWPContent.js

@@ -9,7 +9,7 @@ const _useWPContent = async (operation, queryName, nodes, fixImagePaths, params)
     }
   });
   return {
-    data: error ? void 0 : transformData(data, nodes, fixImagePaths),
+    data: data ? transformData(data, nodes, fixImagePaths) : void 0,
     error
   };
 };

package/dist/runtime/server/api/config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/dist/runtime/server/api/config.js

@@ -0,0 +1,7 @@
+export default defineEventHandler(async (event) => {
+  const config = useRuntimeConfig(event);
+  console.log("config", config);
+  return {
+    wpNuxt: config.public.wpNuxt
+  };
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "1.0.0-edge.17",
+  "version": "1.0.0-edge.19",
   "description": "WPNuxt",
   "repository": {
     "type": "git",
@@ -66,12 +66,12 @@
     "@graphql-codegen/client-preset": "^4.3.3",
     "@graphql-codegen/typescript-operations": "^4.2.3",
     "@nuxt/devtools": "^1.4.1",
-    "@nuxt/eslint-config": "^0.5.3",
+    "@nuxt/eslint-config": "^0.5.4",
     "@nuxt/module-builder": "^0.8.3",
     "@nuxt/schema": "3.13.0",
     "@nuxt/test-utils": "^3.14.1",
-    "@rollup/rollup-linux-arm64-gnu": "^4.21.1",
-    "@rollup/rollup-linux-arm64-musl": "^4.21.1",
+    "@rollup/rollup-linux-arm64-gnu": "^4.21.2",
+    "@rollup/rollup-linux-arm64-musl": "^4.21.2",
     "@types/node": "22.5.1",
     "@vitest/coverage-v8": "^2.0.5",
     "@vue/test-utils": "^2.4.6",
@@ -81,14 +81,14 @@
     "nuxt": "^3.13.0",
     "nuxt-content-twoslash": "^0.1.1",
     "release-it": "^17.6.0",
-    "shiki": "^1.13.0",
+    "shiki": "^1.15.0",
     "twoslash": "^0.2.9",
     "typescript": "^5.5.4",
     "untyped": "1.4.2",
     "vite": "^5.4.2",
     "vitest": "^2.0.5",
     "vue-docgen-web-types": "^0.1.8",
-    "vue-tsc": "2.1.0"
+    "vue-tsc": "2.1.2"
   },
   "peerDependencies": {
     "consola": "^3.2.3",