@dyrected/nuxt 2.5.26 → 2.5.27

package/dist/module.mjs

@@ -49,14 +49,14 @@ const module = defineNuxtModule({
     addImports([
       { name: "useDyrected", from: resolver.resolve("./runtime/composables/useDyrected") },
       { name: "useDyrectedClient", from: resolver.resolve("./runtime/composables/useDyrected") },
-      { name: "useDyrectedData", from: resolver.resolve("./runtime/composables/useDyrected") },
-      { name: "useDyrectedCollectionData", from: resolver.resolve("./runtime/composables/useDyrected") },
-      { name: "useDyrectedGlobalData", from: resolver.resolve("./runtime/composables/useDyrected") },
+      { name: "useDyrected", from: "@dyrected/vue", as: "useDyrectedData" },
+      { name: "useDyrectedCollection", from: "@dyrected/vue", as: "useDyrectedCollectionData" },
+      { name: "useDyrectedGlobal", from: "@dyrected/vue", as: "useDyrectedGlobalData" },
       { name: "useDyrectedDoc", from: resolver.resolve("./runtime/composables/useDyrected") },
       { name: "useDyrectedCollection", from: resolver.resolve("./runtime/composables/useDyrected") },
       { name: "useDyrectedGlobal", from: resolver.resolve("./runtime/composables/useDyrected") },
       { name: "useDyrectedAuth", from: resolver.resolve("./runtime/composables/useDyrectedAuth") },
-      { name: "useLivePreview", from: resolver.resolve("./runtime/composables/useLivePreview") }
+      { name: "useLivePreview", from: "@dyrected/vue" }
     ]);
     const runtimeConfig = {
       ...options,
@@ -186,12 +186,13 @@ export default defineNitroPlugin(async (nitroApp) => {
       siteId: process.env.NUXT_PUBLIC_DYRECTED_SITE_ID || options.siteId || "default"
     };
     if (nuxt.options.vite) {
+      const adminRequire = createRequire(_require.resolve("@dyrected/admin"));
       nuxt.options.vite.optimizeDeps = nuxt.options.vite.optimizeDeps || {};
       nuxt.options.vite.optimizeDeps.include = nuxt.options.vite.optimizeDeps.include || [];
       const toInclude = ["react", "react-dom", "react-router-dom", "@tanstack/react-query"];
       for (const dep of toInclude) {
         try {
-          _require.resolve(dep);
+          const resolved = dep === "react" || dep === "react-dom" ? _require.resolve(dep) : adminRequire.resolve(dep);
           if (!nuxt.options.vite.optimizeDeps.include.includes(dep)) {
             nuxt.options.vite.optimizeDeps.include.push(dep);
           }
@@ -218,6 +219,10 @@ export default defineNitroPlugin(async (nitroApp) => {
         const reactDomMain = _require.resolve("react-dom");
         nuxt.options.vite.resolve.alias.react = join(reactMain, "..");
         nuxt.options.vite.resolve.alias["react-dom"] = join(reactDomMain, "..");
+        const reactRouterDomMain = adminRequire.resolve("react-router-dom");
+        const reactQueryMain = adminRequire.resolve("@tanstack/react-query");
+        nuxt.options.vite.resolve.alias["react-router-dom"] = join(reactRouterDomMain, "..");
+        nuxt.options.vite.resolve.alias["@tanstack/react-query"] = join(reactQueryMain, "..");
       } catch {
       }
     }

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

@@ -1,10 +1,6 @@
 import { type DyrectedClient, type BaseSchema } from '@dyrected/sdk';
-import { useDyrected as useGenericDyrected, useDyrectedCollection as useGenericCollection, useDyrectedGlobal as useGenericGlobal } from '@dyrected/vue';
 export declare const useDyrectedClient: <TSchema extends BaseSchema = any>() => DyrectedClient<TSchema>;
 export declare const useDyrected: <TSchema extends BaseSchema = any>() => DyrectedClient<TSchema>;
-export declare const useDyrectedData: typeof useGenericDyrected;
-export declare const useDyrectedCollectionData: typeof useGenericCollection;
-export declare const useDyrectedGlobalData: typeof useGenericGlobal;
 export declare const useDyrectedDoc: <T = any, TSchema extends BaseSchema = any>(collection: keyof TSchema["collections"] | string, id: string, options?: {
     depth?: number;
     initialData?: T;

package/dist/runtime/composables/useDyrected.mjs

@@ -1,10 +1,5 @@
 import { useRuntimeConfig, useAsyncData, useRequestFetch } from "#app";
 import { createClient } from "@dyrected/sdk";
-import {
-  useDyrected as useGenericDyrected,
-  useDyrectedCollection as useGenericCollection,
-  useDyrectedGlobal as useGenericGlobal
-} from "@dyrected/vue";
 function getClient() {
   const config = useRuntimeConfig().public.dyrected;
   const fetcher = useRequestFetch();
@@ -19,9 +14,6 @@ export const useDyrectedClient = () => {
   return getClient();
 };
 export const useDyrected = useDyrectedClient;
-export const useDyrectedData = useGenericDyrected;
-export const useDyrectedCollectionData = useGenericCollection;
-export const useDyrectedGlobalData = useGenericGlobal;
 export const useDyrectedDoc = (collection, id, options) => {
   const client = getClient();
   return useAsyncData(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/nuxt",
-  "version": "2.5.26",
+  "version": "2.5.27",
   "type": "module",
   "main": "./dist/module.mjs",
   "types": "./dist/module.d.ts",
@@ -17,10 +17,12 @@
   "dependencies": {
     "@nuxt/kit": "^3.11.2",
     "h3": "^1.15.0",
-    "@dyrected/core": "2.5.26",
-    "@dyrected/sdk": "2.5.26",
-    "@dyrected/vue": "2.5.26",
-    "@dyrected/admin": "2.5.26"
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0",
+    "@dyrected/core": "2.5.27",
+    "@dyrected/sdk": "2.5.27",
+    "@dyrected/admin": "2.5.27",
+    "@dyrected/vue": "2.5.27"
   },
   "peerDependencies": {
     "nuxt": "^3.0.0",