@uniformdev/uniform-nuxt 17.5.1-alpha.130 → 17.5.1-alpha.131

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "nuxt-uniform",
   "configKey": "uniform",
-  "version": "17.5.1-alpha.130+3fac779b1"
+  "version": "17.5.1-alpha.131+1a06e230b"
 }

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

@@ -1,4 +1,4 @@
-import { type RootComponentInstance, type CompositionGetByNodePathParameters, type CompositionGetBySlugParameters, type CompositionGetByNodeIdParameters, type CompositionGetByIdParameters, type DataResolutionOption } from '@uniformdev/canvas';
+import { type CompositionGetByIdParameters, type CompositionGetByNodeIdParameters, type CompositionGetByNodePathParameters, type CompositionGetBySlugParameters, type DataResolutionOption, type RootComponentInstance } from '@uniformdev/canvas';
 export declare const useUniformComposition: (options: (CompositionGetBySlugParameters | CompositionGetByIdParameters | CompositionGetByNodePathParameters | CompositionGetByNodeIdParameters) & DataResolutionOption & {
     enhance?: ((composition: RootComponentInstance) => RootComponentInstance | Promise<RootComponentInstance>) | undefined;
 }) => Promise<{
@@ -60,6 +60,7 @@ export declare const useUniformComposition: (options: (CompositionGetBySlugParam
         _id: string;
         _slug?: string | null | undefined;
         _name: string;
+        _branch: string;
         _dataResources?: {
             [key: string]: {
                 type: string;

package/dist/runtime/composables/useUniformComposable.mjs

@@ -1,10 +1,10 @@
-import { useAsyncData, useNuxtApp } from "#app";
-import { watch, ref, toRaw } from "vue-demi";
 import {
   CANVAS_DRAFT_STATE,
   CANVAS_PUBLISHED_STATE
 } from "@uniformdev/canvas";
 import { useContextualEditing } from "@uniformdev/canvas-vue";
+import { ref, toRaw, watch } from "vue-demi";
+import { useAsyncData, useNuxtApp } from "#app";
 export const useUniformComposition = async (options) => {
   const { enhance = (c) => c, ...parameters } = options;
   const { $uniformCanvasClient, $preview: preview } = useNuxtApp();
@@ -28,37 +28,41 @@ export const useUniformComposition = async (options) => {
     `composition-${JSON.stringify(parameters)}`,
     async () => {
       const state = preview ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE;
+      let response = void 0;
       if ("slug" in parameters) {
-        const slug = parameters.slug;
-        return await canvasClient.getCompositionBySlug({
+        response = await canvasClient.getCompositionBySlug({
           ...parameters,
-          slug,
           state
         });
       } else if ("compositionId" in parameters) {
-        const compositionId = parameters.compositionId;
-        return await canvasClient.getCompositionById({
+        response = await canvasClient.getCompositionById({
           ...parameters,
-          compositionId,
           state
         });
       } else if ("projectMapNodeId" in parameters) {
-        return await canvasClient.unstable_getCompositionByNodeId({
+        response = await canvasClient.unstable_getCompositionByNodeId({
           ...parameters,
           state
         });
       } else if ("projectMapNodePath" in parameters) {
-        return await canvasClient.unstable_getCompositionByNodePath({
+        response = await canvasClient.unstable_getCompositionByNodePath({
           ...parameters,
           state
         });
       }
+      if (!response) {
+        throw new Error(
+          `Failed to fetch the composition with the given parameters: ${JSON.stringify(parameters)}`
+        );
+      }
+      const composition = await enhance(response.composition);
+      return { composition, response };
     }
   );
-  activeComposition.value = data.value?.composition ? await enhance(data.value.composition) : void 0;
+  activeComposition.value = data.value?.composition;
   return {
     composition: activeComposition,
-    fullResponse: data.value,
+    fullResponse: data.value?.response,
     pending,
     error
   };

package/dist/runtime/plugin.mjs

@@ -19,7 +19,6 @@ import {
 import { toRaw, watch } from "vue-demi";
 import {
   defineNuxtPlugin,
-  navigateTo,
   refreshNuxtData,
   useAsyncData,
   useCookie,
@@ -38,7 +37,7 @@ export default defineNuxtPlugin((nuxtApp) => {
   }
   try {
     const currentCompositionId = useState("currentCompositionId", () => "");
-    const preview = setupPreview();
+    const preview = setupPreview(nuxtApp);
     const uniformContextData = setupContext(nuxtApp);
     const uniformCanvasClient = setupCanvas(nuxtApp);
     setupLivePreview(currentCompositionId, Boolean(preview));
@@ -114,7 +113,7 @@ function setupCanvas(nuxtApp) {
   });
   return uniformCanvasClient;
 }
-function setupPreview() {
+function setupPreview(nuxtApp) {
   const router = useRouter();
   const route = useRoute();
   let preview;
@@ -125,16 +124,18 @@ function setupPreview() {
       compositionId: route.query.id
     };
   }
-  if (preview && route.query.redirectedForPreview !== "true") {
-    navigateTo({
-      path: preview.slug,
-      query: {
-        ...route.query,
-        redirectedForPreview: "true"
-      },
-      replace: true
-    });
-  }
+  nuxtApp.hook("app:beforeMount", () => {
+    if (preview && route.query.slug) {
+      router.push({
+        path: preview?.slug,
+        query: {
+          ...route.query,
+          slug: void 0,
+          id: void 0
+        }
+      });
+    }
+  });
   router.beforeEach((to, from, next) => {
     if (!next) {
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/uniform-nuxt",
-  "version": "17.5.1-alpha.130+3fac779b1",
+  "version": "17.5.1-alpha.131+1a06e230b",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -35,10 +35,10 @@
     "@nuxt/module-builder": "0.2.1",
     "@nuxt/schema": "3.0.0",
     "@nuxtjs/eslint-config-typescript": "11.0.0",
-    "@uniformdev/canvas": "^17.5.1-alpha.130+3fac779b1",
-    "@uniformdev/canvas-vue": "^17.5.1-alpha.130+3fac779b1",
-    "@uniformdev/context": "^17.5.1-alpha.130+3fac779b1",
-    "@uniformdev/context-vue": "^17.5.1-alpha.130+3fac779b1",
+    "@uniformdev/canvas": "^17.5.1-alpha.131+1a06e230b",
+    "@uniformdev/canvas-vue": "^17.5.1-alpha.131+1a06e230b",
+    "@uniformdev/context": "^17.5.1-alpha.131+1a06e230b",
+    "@uniformdev/context-vue": "^17.5.1-alpha.131+1a06e230b",
     "esbuild": "0.15.15",
     "eslint": "latest",
     "nuxt": "3.0.0",
@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3fac779b1b42a1afeb05156cb51768a98573438f"
+  "gitHead": "1a06e230be7112298a5d5bf6d93bd66c9cbc39f6"
 }