@uniformdev/canvas-next-rsc 19.45.0 → 19.45.1

package/dist/components/UniformComposition.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE } from '@uniformdev/canvas';
+import { CANVAS_DRAFT_STATE, CANVAS_EDITOR_STATE, CANVAS_PUBLISHED_STATE } from '@uniformdev/canvas';
 import { notFound, redirect } from 'next/navigation';
 import { Suspense } from 'react';
 import { getManifestFromApi } from '../client/manifestClient';
@@ -34,10 +34,17 @@ const UniformCompositionInner = async ({ params, searchParams, children }) => {
     const path = resolvePath({
         params,
     });
+    let state;
+    if (isCanvasEditing) {
+        state = CANVAS_EDITOR_STATE;
+    }
+    else {
+        state = draftMode || previewEnvironment || isDevelopment ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE;
+    }
     // resolve the route from the path
     const resolveResult = await retrieveRoute({
         path,
-        state: draftMode || previewEnvironment || isDevelopment ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE,
+        state,
         searchParams,
     });
     // if the route is a redirect, redirect

package/dist/components/UniformScript.js

@@ -1,8 +1,10 @@
 'use client';
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-import { createCanvasChannel, isUpdateCompositionInternalMessage } from '@uniformdev/canvas';
+import { createCanvasChannel } from '@uniformdev/canvas';
+import { useRouter } from 'next/navigation';
 import { useEffect, useMemo } from 'react';
 export const UniformScript = ({ enabled }) => {
+    const router = useRouter();
     const channel = useMemo(() => {
         var _a;
         if (typeof window === 'undefined') {
@@ -18,39 +20,13 @@ export const UniformScript = ({ enabled }) => {
         if (!channel) {
             return;
         }
-        const unsubscribeFromCompositionUpdates = channel.on('update-composition-internal', async (data) => {
-            var _a, _b, _c;
-            if (isUpdateCompositionInternalMessage(data)) {
-                const url = new URL(window.location.href);
-                if (url.searchParams.get('vcdiffhash') === ((_a = data.hash) === null || _a === void 0 ? void 0 : _a.toString())) {
-                    // eslint-disable-next-line no-console
-                    console.log("Skipping composition update because it's already been applied.");
-                    return;
-                }
-                const response = await fetch('/api/uniform', {
-                    method: 'POST',
-                    body: JSON.stringify(data),
-                });
-                if (!response.ok) {
-                    // eslint-disable-next-line no-console
-                    console.error(response);
-                    return;
-                }
-                const json = (await response.json());
-                if (json.diff.length) {
-                    const serialized = Buffer.from(JSON.stringify(json.diff)).toString('base64');
-                    // set serialized as query string param
-                    url.searchParams.set('vcdiff', serialized);
-                    url.searchParams.set('vcdiffhash', (_c = (_b = data.hash) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : '');
-                    // set url
-                    window.location.href = url.toString();
-                }
-            }
+        const unsubscribeFromEditorUpdates = channel.on('editor-state-updated', () => {
+            router.refresh();
         });
         return () => {
-            unsubscribeFromCompositionUpdates();
+            unsubscribeFromEditorUpdates();
         };
-    }, [channel]);
+    }, [channel, router]);
     useEffect(() => {
         if (typeof window === 'undefined') {
             return;

package/dist/components/retrieveRoute.js

@@ -1,4 +1,4 @@
-import { CANVAS_DRAFT_STATE } from '@uniformdev/canvas';
+import { CANVAS_DRAFT_STATE, CANVAS_EDITOR_STATE, } from '@uniformdev/canvas';
 import { RedirectClient } from '@uniformdev/redirect';
 import { get } from '@vercel/edge-config';
 import { getRouteClient } from '../client/routeClient';
@@ -19,6 +19,13 @@ export const retrieveRoute = async (data) => {
         const routeApiValue = await resolveRouteByRouteApi(data);
         result = routeApiValue;
     }
+    // fall back to draft if requesting editor state
+    if (result.type === 'notFound' && data.state === CANVAS_EDITOR_STATE) {
+        return retrieveRoute({
+            ...data,
+            state: CANVAS_DRAFT_STATE,
+        });
+    }
     return result;
 };
 export const resolveRedirectHref = (resolveResult, path) => {
@@ -63,7 +70,7 @@ const resolveRouteByRouteApi = async (data) => {
     const routeResult = await routeClient.getRoute({
         path: data.path,
         state: data.state,
-        withComponentIDs: data.state === CANVAS_DRAFT_STATE,
+        withComponentIDs: data.state === CANVAS_DRAFT_STATE || data.state === CANVAS_EDITOR_STATE,
         withContentSourceMap: isOnVercelPreviewEnvironment(),
     });
     return routeResult;

package/dist/utils/draft.js

@@ -11,7 +11,7 @@ export const isDraftModeEnabled = ({ searchParams, }) => {
 export const isIncontextEditingEnabled = ({ searchParams, }) => {
     // workaround for this https://github.com/vercel/next.js/issues/49927, as draftMode() is not working in dev mode
     // so we just need to check if the query string contains the IN_CONTEXT_EDITOR_QUERY_STRING_PARAM blindly
-    if (isDevelopmentEnvironment()) {
+    if (isDevelopmentEnvironment() || draftMode().isEnabled) {
         const containsKey = typeof (searchParams === null || searchParams === void 0 ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== 'undefined';
         return containsKey;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.45.0",
+  "version": "19.45.1",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "dev": "pnpm build --watch",
@@ -56,13 +56,13 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.45.0",
-    "@uniformdev/canvas-react": "19.45.0",
-    "@uniformdev/context": "19.45.0",
-    "@uniformdev/project-map": "19.45.0",
-    "@uniformdev/redirect": "19.45.0",
-    "@uniformdev/richtext": "19.45.0",
-    "@uniformdev/webhooks": "19.45.0",
+    "@uniformdev/canvas": "19.45.1",
+    "@uniformdev/canvas-react": "19.45.1",
+    "@uniformdev/context": "19.45.1",
+    "@uniformdev/project-map": "19.45.1",
+    "@uniformdev/redirect": "19.45.1",
+    "@uniformdev/richtext": "19.45.1",
+    "@uniformdev/webhooks": "19.45.1",
     "@vercel/edge-config": "^0.2.0",
     "dequal": "^2.0.3",
     "js-cookie": "^3.0.5",
@@ -76,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff90cd6bd6d9db14f0d3a2ba8bd4db538b66548c"
+  "gitHead": "27d329b913db64152e9d49bcfa7dddf8b3b31bb6"
 }