@uniformdev/canvas-next-rsc 19.54.2-alpha.3 → 19.54.3-alpha.1

package/dist/client/routeClient.js

@@ -1,4 +1,4 @@
-import { RouteClient } from '@uniformdev/canvas';
+import { CANVAS_EDITOR_STATE, RouteClient } from '@uniformdev/canvas';
 import { isDevelopmentEnvironment } from '../utils/draft';
 import { buildPathTag } from '../utils/tag';
 export const getRouteClient = (options) => {
@@ -18,10 +18,13 @@ export const getRouteClient = (options) => {
                 requestedUrl = new URL(req.url);
             }
             const tags = [];
+            let state;
             if (requestedUrl) {
                 // this is here so this code breaks if parameters change here
                 const pathKey = 'path';
+                const stateKey = 'state';
                 const path = requestedUrl.searchParams.get(pathKey);
+                state = parseInt(requestedUrl.searchParams.get(stateKey) || '', 10);
                 if (path) {
                     // at this point, we do not know if this path is dynamic or not
                     // so apply each segment as a tag so we can clear any segment, ie:
@@ -43,6 +46,10 @@ export const getRouteClient = (options) => {
                 noCache = true;
                 revalidate = undefined;
             }
+            const extraHeaders = {};
+            if (state === CANVAS_EDITOR_STATE) {
+                extraHeaders['x-bypass-cache'] = 'true';
+            }
             return fetch(req, {
                 ...init,
                 cache: noCache ? 'no-cache' : 'force-cache',
@@ -50,6 +57,10 @@ export const getRouteClient = (options) => {
                     revalidate,
                     tags: tags.length ? tags : undefined,
                 },
+                headers: {
+                    ...((init === null || init === void 0 ? void 0 : init.headers) || {}),
+                    ...extraHeaders,
+                },
             });
         },
     });

package/dist/components/UniformComponent.d.ts

@@ -8,6 +8,8 @@ export type CompositionContext = Omit<RouteGetResponseComposition, 'compositionA
         [key: string]: string | undefined;
     } | undefined;
     cookieValue: string | undefined;
+    isDraftMode: boolean;
+    isContextualEditing: boolean;
 };
 export type ComponentProps<TProps = unknown> = TProps & {
     component: ComponentInstance;

package/dist/components/UniformComposition.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Suspense } from 'react';
+import { isDraftModeEnabled, isIncontextEditingEnabled } from '../utils/draft';
 import { resolveComposition } from './retrieveRoute';
 import { UniformComponent } from './UniformComponent';
 import { UniformProvider } from './UniformContext';
@@ -24,6 +25,10 @@ const UniformCompositionInner = async ({ params, searchParams, update, children,
         path,
         searchParams,
         cookieValue,
+        isDraftMode: isDraftModeEnabled({ searchParams }),
+        isContextualEditing: isIncontextEditingEnabled({
+            searchParams,
+        }),
         ...rest,
     };
     return (_jsxs(UniformProvider, { cookieValue: cookieValue, seenComponents: seenComponents, children: [_jsx(UniformScript, { enabled: isCanvasEditing }), _jsx(UniformComponent, { data: evaluatedComposition, context: context }), Boolean(children) && children] }));

package/dist/components/UniformText.js

@@ -1,7 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { PureUniformText } from '@uniformdev/canvas-react/core';
-import { isIncontextEditingEnabled } from '../utils/draft';
 export const UniformText = ({ context, ...rest }) => {
-    const isEditing = isIncontextEditingEnabled(context);
-    return _jsx(PureUniformText, { ...rest, isContextualEditing: isEditing, skipCustomRendering: isEditing });
+    return (_jsx(PureUniformText, { ...rest, isContextualEditing: context.isContextualEditing, skipCustomRendering: context.isContextualEditing }));
 };

package/dist/components/renderComponent.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { CANVAS_LOCALE_TAG_PARAM, CANVAS_PERSONALIZE_SLOT, CANVAS_PERSONALIZE_TYPE, CANVAS_TEST_SLOT, CANVAS_TEST_TYPE, IN_CONTEXT_EDITOR_COMPONENT_START_ROLE, PLACEHOLDER_ID, } from '@uniformdev/canvas';
 import { componentStoreResolver } from '../register/componentStoreResolver';
+import { isIncontextEditingEnabled } from '../utils/draft';
 import { convertComponentToProps } from './convertComponentToProps';
 import { UniformComponent } from './UniformComponent';
 export function renderComponent({ component, context, resolveSystem, key = 0, indexInSlot, slotName, parentComponent, slotChildrenCount, emptyPlaceholder, }) {
@@ -42,7 +43,7 @@ export function renderComponent({ component, context, resolveSystem, key = 0, in
             component,
             context,
         });
-        const shouldRenderContextualEditingTags = Boolean(component._id);
+        const shouldRenderContextualEditingTags = Boolean(component._id) && isIncontextEditingEnabled(context);
         const isPlaceholder = component._id === PLACEHOLDER_ID;
         const isReadOnly = ((_a = component === null || component === void 0 ? void 0 : component._contextualEditing) === null || _a === void 0 ? void 0 : _a.isEditable)
             ? undefined

package/dist/components/retrieveRoute.js

@@ -130,6 +130,7 @@ const resolveRouteByEdgeConfig = async (data) => {
     return edgeConfig;
 };
 const resolveRouteByRouteApi = async (data) => {
+    var _a;
     const routeClient = getRouteClient({
         revalidate: getRouteRevalidateInterval({
             searchParams: data.searchParams,
@@ -139,7 +140,7 @@ const resolveRouteByRouteApi = async (data) => {
         path: data.path,
         state: data.state,
         withComponentIDs: data.state === CANVAS_DRAFT_STATE || data.state === CANVAS_EDITOR_STATE,
-        withContentSourceMap: isOnVercelPreviewEnvironment(),
+        withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) === null || _a === void 0 ? void 0 : _a.vercelVisualEditing),
     });
     return routeResult;
 };

package/dist/config/models.d.ts

@@ -43,5 +43,9 @@ export type UniformServerConfig = {
          * Dynamic tokens names that should be used for localization.
          */
         localeDynamicInputs?: string[];
+        /**
+         * Enables visual editing mode.
+         */
+        vercelVisualEditing?: boolean;
     };
 };

package/dist/config.js

@@ -21,7 +21,7 @@ module.exports.withUniformConfig = (nextConfig) => ({
                 config.module.rules.push({
                     test: /uniform\.server\.config\.js$/,
                     include: uniformConfigPath,
-                    use: context.defaultLoaders.babel, // Use ts-loader for TypeScript files, or babel-loader for JavaScript files
+                    use: context.defaultLoaders.babel,
                 });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.54.2-alpha.3+f67adafcc",
+  "version": "19.54.3-alpha.1+c169f04b0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "dev": "tsc --watch",
@@ -55,13 +55,13 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.54.2-alpha.3+f67adafcc",
-    "@uniformdev/canvas-react": "19.54.2-alpha.3+f67adafcc",
-    "@uniformdev/context": "19.54.2-alpha.3+f67adafcc",
-    "@uniformdev/project-map": "19.54.2-alpha.3+f67adafcc",
-    "@uniformdev/redirect": "19.54.2-alpha.3+f67adafcc",
-    "@uniformdev/richtext": "19.54.2-alpha.3+f67adafcc",
-    "@uniformdev/webhooks": "19.54.2-alpha.3+f67adafcc",
+    "@uniformdev/canvas": "19.54.3-alpha.1+c169f04b0",
+    "@uniformdev/canvas-react": "19.54.3-alpha.1+c169f04b0",
+    "@uniformdev/context": "19.54.3-alpha.1+c169f04b0",
+    "@uniformdev/project-map": "19.54.3-alpha.1+c169f04b0",
+    "@uniformdev/redirect": "19.54.3-alpha.1+c169f04b0",
+    "@uniformdev/richtext": "19.54.3-alpha.1+c169f04b0",
+    "@uniformdev/webhooks": "19.54.3-alpha.1+c169f04b0",
     "@vercel/edge-config": "^0.2.0",
     "dequal": "^2.0.3",
     "js-cookie": "^3.0.5",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f67adafccc67437fbeb610b57f759ca45bd6140c"
+  "gitHead": "c169f04b0eaffb4956c91d3ca0a3ab0c44d64dd4"
 }