@uniformdev/canvas-next-rsc 19.79.1-alpha.11 → 19.79.1-alpha.13

package/dist/{UniformComposition-d178d865.d.ts → UniformComposition-0pvEHduc.d.mts}

@@ -61,4 +61,4 @@ type ResolveComponentsOptions = {
     mode: UniformCompositionProps['mode'];
 };
 
-export { ResolveComponentFunction as R, UniformCompositionProps as U, UniformComposition as a, ResolveComponentResult as b, resolveComposition as r };
+export { type ResolveComponentFunction as R, type UniformCompositionProps as U, UniformComposition as a, type ResolveComponentResult as b, resolveComposition as r };

package/dist/UniformComposition-0pvEHduc.d.ts

@@ -0,0 +1,64 @@
+import * as React$1 from 'react';
+import { ComponentType, ReactNode } from 'react';
+import { ResolvedRouteGetResponse, ComponentInstance } from '@uniformdev/canvas';
+import { PageParameters, ComponentProps, CompositionContext, AppDirectoryServerContext } from '@uniformdev/canvas-next-rsc-shared';
+
+type UniformStaticCompositionProps = {
+    /**
+     * How to render the composition.
+     */
+    mode: 'static';
+};
+type UniformServerCompositionProps = {
+    /**
+     * How to render the composition.
+     */
+    mode: 'server';
+    /**
+     * The Context instance to use for server-side rendering.
+     */
+    serverContext?: AppDirectoryServerContext;
+};
+type UniformCompositionProps = PageParameters & {
+    /**
+     * The route data to render.
+     */
+    route: ResolvedRouteGetResponse | undefined;
+    /**
+     * Function to map composition components to React components.
+     */
+    resolveComponent: ResolveComponentFunction;
+} & (UniformStaticCompositionProps | UniformServerCompositionProps);
+declare const UniformComposition: React.FC<UniformCompositionProps>;
+type ResolveComponentFunction = (options: {
+    component: ComponentInstance;
+}) => ResolveComponentResult;
+type ResolveComponentResult = {
+    component: ComponentType<ComponentProps<any, any>> | null;
+    includeContext?: boolean;
+};
+declare const resolveComposition: (props: Omit<ResolveComponentsOptions, 'slotName' | 'slotIndex' | 'target'> & {
+    composition: ComponentInstance;
+    compositionContext: CompositionContext;
+}) => React$1.FunctionComponentElement<{
+    children?: ReactNode;
+}> | null;
+type ResolveComponentsOptions = {
+    serverContext?: AppDirectoryServerContext;
+    target: {
+        type: 'root';
+        composition: ComponentInstance;
+    } | {
+        type: 'slot';
+        components: ComponentInstance[];
+        parent: ComponentInstance;
+        root: ComponentInstance;
+    };
+    slotName: string | undefined;
+    slotIndex: number | undefined;
+    resolveComponent: ResolveComponentFunction;
+    compositionContext: CompositionContext;
+    mode: UniformCompositionProps['mode'];
+};
+
+export { type ResolveComponentFunction as R, type UniformCompositionProps as U, UniformComposition as a, type ResolveComponentResult as b, resolveComposition as r };

package/dist/component.d.mts

@@ -1,7 +1,7 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
 import React__default, { PropsWithChildren, ReactNode, Key } from 'react';
-export { R as ResolveComponentFunction, b as ResolveComponentResult } from './UniformComposition-d178d865.js';
+export { R as ResolveComponentFunction, b as ResolveComponentResult } from './UniformComposition-0pvEHduc.mjs';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';
@@ -59,6 +59,8 @@ type CustomSlotChildRenderFunc = (options: {
     child: ReactNode;
     component: ComponentInstance;
     key: Key;
+    slotName: string;
+    slotIndex: number;
 }) => JSX.Element;
 type UniformSlotProps = {
     data: ComponentInstance;
@@ -73,4 +75,4 @@ type UniformTextProps = {
 } & Omit<PureUniformTextProps, 'skipCustomRendering' | 'isContextualEditing'>;
 declare const UniformText: ({ context, ...rest }: UniformTextProps) => React__default.JSX.Element;
 
-export { CustomSlotChildRenderFunc, DefaultNotImplementedComponent, UniformRichText, UniformRichTextProps, UniformSlot, UniformSlotProps, UniformText, UniformTextProps };
+export { type CustomSlotChildRenderFunc, DefaultNotImplementedComponent, UniformRichText, type UniformRichTextProps, UniformSlot, type UniformSlotProps, UniformText, type UniformTextProps };

package/dist/component.d.ts

@@ -1,7 +1,7 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
 import React__default, { PropsWithChildren, ReactNode, Key } from 'react';
-export { R as ResolveComponentFunction, b as ResolveComponentResult } from './UniformComposition-d178d865.js';
+export { R as ResolveComponentFunction, b as ResolveComponentResult } from './UniformComposition-0pvEHduc.js';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';
@@ -59,6 +59,8 @@ type CustomSlotChildRenderFunc = (options: {
     child: ReactNode;
     component: ComponentInstance;
     key: Key;
+    slotName: string;
+    slotIndex: number;
 }) => JSX.Element;
 type UniformSlotProps = {
     data: ComponentInstance;
@@ -73,4 +75,4 @@ type UniformTextProps = {
 } & Omit<PureUniformTextProps, 'skipCustomRendering' | 'isContextualEditing'>;
 declare const UniformText: ({ context, ...rest }: UniformTextProps) => React__default.JSX.Element;
 
-export { CustomSlotChildRenderFunc, DefaultNotImplementedComponent, UniformRichText, UniformRichTextProps, UniformSlot, UniformSlotProps, UniformText, UniformTextProps };
+export { type CustomSlotChildRenderFunc, DefaultNotImplementedComponent, UniformRichText, type UniformRichTextProps, UniformSlot, type UniformSlotProps, UniformText, type UniformTextProps };

package/dist/component.js

@@ -181,7 +181,9 @@ var UniformSlot = ({ data, slot, children }) => {
         const result = children({
           child,
           component: targetSlotData[i],
-          key: `inner-${i}`
+          key: `inner-${i}`,
+          slotName: slot.name,
+          slotIndex: i
         });
         resolved.push(result);
       }

package/dist/component.mjs

@@ -142,7 +142,9 @@ var UniformSlot = ({ data, slot, children }) => {
         const result = children({
           child,
           component: targetSlotData[i],
-          key: `inner-${i}`
+          key: `inner-${i}`,
+          slotName: slot.name,
+          slotIndex: i
         });
         resolved.push(result);
       }

package/dist/handler.d.mts

@@ -7,6 +7,6 @@ declare const createPreviewGETRouteHandler: (options?: CreatePreviewGETRouteHand
 
 declare const createPreviewOPTIONSRouteHandler: () => () => Promise<Response>;
 
-declare const createPreviewPOSTRouteHandler: () => (request: Request) => Promise<Response>;
+declare const createPreviewPOSTRouteHandler: () => (request: NextRequest) => Promise<Response>;
 
-export { CreatePreviewGETRouteHandlerOptions, createPreviewGETRouteHandler, createPreviewOPTIONSRouteHandler, createPreviewPOSTRouteHandler };
+export { type CreatePreviewGETRouteHandlerOptions, createPreviewGETRouteHandler, createPreviewOPTIONSRouteHandler, createPreviewPOSTRouteHandler };

package/dist/handler.d.ts

@@ -7,6 +7,6 @@ declare const createPreviewGETRouteHandler: (options?: CreatePreviewGETRouteHand
 
 declare const createPreviewOPTIONSRouteHandler: () => () => Promise<Response>;
 
-declare const createPreviewPOSTRouteHandler: () => (request: Request) => Promise<Response>;
+declare const createPreviewPOSTRouteHandler: () => (request: NextRequest) => Promise<Response>;
 
-export { CreatePreviewGETRouteHandlerOptions, createPreviewGETRouteHandler, createPreviewOPTIONSRouteHandler, createPreviewPOSTRouteHandler };
+export { type CreatePreviewGETRouteHandlerOptions, createPreviewGETRouteHandler, createPreviewOPTIONSRouteHandler, createPreviewPOSTRouteHandler };

package/dist/handler.js

@@ -27,15 +27,18 @@ __export(handler_exports, {
 module.exports = __toCommonJS(handler_exports);
 
 // src/handler/createPreviewGETRouteHandler.ts
-var import_canvas4 = require("@uniformdev/canvas");
+var import_canvas5 = require("@uniformdev/canvas");
 var import_headers2 = require("next/headers");
 var import_navigation = require("next/navigation");
 
 // src/utils/route.ts
-var import_canvas3 = require("@uniformdev/canvas");
+var import_canvas4 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_shared2 = require("@uniformdev/canvas-next-rsc-shared");
 var import_redirect = require("@uniformdev/redirect");
 
+// src/clients/canvasClient.ts
+var import_canvas2 = require("@uniformdev/canvas");
+
 // src/config/helpers.ts
 var import_canvas_next_rsc_shared = require("@uniformdev/canvas-next-rsc-shared");
 
@@ -145,10 +148,58 @@ var determineFetchCacheOptions = (mode) => {
   };
 };
 
+// src/clients/canvasClient.ts
+var getCanvasClient = (options) => {
+  return new import_canvas2.CanvasClient({
+    projectId: env.getProjectId(),
+    apiHost: env.getApiHost(),
+    apiKey: env.getApiKey(),
+    edgeApiHost: env.getEdgeApiHost(),
+    fetch: (req, init) => {
+      let requestedUrl;
+      if (typeof req === "string") {
+        requestedUrl = new URL(req);
+      } else if (req instanceof URL) {
+        requestedUrl = req;
+      } else {
+        requestedUrl = new URL(req.url);
+      }
+      const tags = [];
+      if (requestedUrl) {
+        const compositionIdKey = "compositionId";
+        const compositionIdsKey = "compositionIDs";
+        const compositionId = requestedUrl.searchParams.get(compositionIdKey);
+        const compositionIds = requestedUrl.searchParams.get(compositionIdsKey);
+        if (compositionId) {
+          tags.push(buildCompositionTag(compositionId));
+        }
+        if (compositionIds) {
+          const ids = compositionIds.split(",");
+          for (let i = 0; i < ids.length; i++) {
+            tags.push(buildCompositionTag(ids[i]));
+          }
+        }
+      }
+      const { cache, revalidate } = determineFetchCacheOptions(options.cache);
+      return fetch(req, {
+        ...init,
+        cache,
+        headers: {
+          ...init == null ? void 0 : init.headers,
+          "x-bypass-cache": "true"
+        },
+        next: {
+          revalidate
+        }
+      });
+    }
+  });
+};
+
 // src/clients/routeClient.ts
-var import_canvas2 = require("@uniformdev/canvas");
+var import_canvas3 = require("@uniformdev/canvas");
 var getRouteClient = (options) => {
-  const client = new import_canvas2.RouteClient({
+  const client = new import_canvas3.RouteClient({
     projectId: env.getProjectId(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
@@ -161,7 +212,7 @@ var getRouteClient = (options) => {
       } else {
         requestedUrl = new URL(req.url);
       }
-      const tags = [];
+      const tags = ["route"];
       if (requestedUrl) {
         const pathKey = "path";
         const path = requestedUrl.searchParams.get(pathKey);
@@ -203,30 +254,39 @@ var getDefaultRouteClient = ({ searchParams }) => {
 var retrieveRouteByPath = async ({
   path,
   state,
-  searchParams
+  searchParams,
+  fetchOptions
 }) => {
   var _a;
   const client = getDefaultRouteClient({
     searchParams
   });
+  let queryPath = path;
+  if (searchParams && Object.keys(searchParams).length > 0) {
+    const helper = new URL((0, import_canvas_next_rsc_shared2.getBaseUrl)());
+    helper.pathname = path;
+    Object.entries(searchParams).forEach(([key, value]) => {
+      if (typeof value === "string") {
+        helper.searchParams.set(key, value);
+      }
+    });
+    if (helper.searchParams.size > 0) {
+      queryPath = `${helper.pathname}${helper.search}`;
+    }
+  }
   return await client.getRoute({
-    path,
+    ...fetchOptions,
+    path: queryPath,
     state,
     withComponentIDs: true,
     withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = (0, import_canvas_next_rsc_shared2.getServerConfig)().experimental) == null ? void 0 : _a.vercelVisualEditing)
   });
 };
 var resolveRedirectHref = (resolveResult, path) => {
-  let href;
-  if (resolveResult.redirect.targetProjectMapNodeId) {
-    const requestUrl = `${(0, import_canvas_next_rsc_shared2.getBaseUrl)()}${path}`;
-    const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
-    const url = new URL(expandedUrl);
-    href = url.pathname;
-  } else {
-    href = resolveResult.redirect.targetUrl;
-  }
-  return href;
+  const requestUrl = `${(0, import_canvas_next_rsc_shared2.getBaseUrl)()}${path}`;
+  const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
+  const url = new URL(expandedUrl);
+  return url.pathname;
 };
 
 // src/handler/createPreviewGETRouteHandler.ts
@@ -262,7 +322,7 @@ var createPreviewGETRouteHandler = (options) => {
     const { searchParams } = new URL(request.url);
     const secret = searchParams.get("secret");
     const path = searchParams.get("path");
-    const isPlayground = searchParams.get(import_canvas4.IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM) === "true";
+    const isPlayground = searchParams.get(import_canvas5.IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM) === "true";
     const id = searchParams.get("id");
     if (secret !== process.env.UNIFORM_PREVIEW_SECRET) {
       return new Response("Invalid preview secret", { status: 401 });
@@ -273,17 +333,17 @@ var createPreviewGETRouteHandler = (options) => {
       }
       const resolveResult = await retrieveRouteByPath({
         path,
-        state: import_canvas4.CANVAS_DRAFT_STATE,
+        state: import_canvas5.CANVAS_DRAFT_STATE,
         searchParams: {
           // about to be in draft mode so pretend for now.
-          [import_canvas4.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]: "true"
+          [import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]: "true"
         }
       });
       (0, import_headers2.draftMode)().enable();
       if (resolveResult.type === "redirect") {
         const href = resolveRedirectHref(resolveResult, path);
         if (resolveResult.redirect.targetProjectMapNodeId) {
-          (0, import_navigation.redirect)(`${href}?${import_canvas4.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
+          (0, import_navigation.redirect)(`${href}?${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
         } else {
           (0, import_navigation.redirect)(href);
         }
@@ -291,13 +351,13 @@ var createPreviewGETRouteHandler = (options) => {
       if (resolveResult.type === "notFound") {
         return new Response("Invalid path", { status: 401 });
       }
-      (0, import_navigation.redirect)(`${path}?${import_canvas4.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
+      (0, import_navigation.redirect)(`${path}?${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
     } else {
       if (!(options == null ? void 0 : options.playgroundPath)) {
         return new Response("No playground path is configured", { status: 401 });
       }
       (0, import_headers2.draftMode)().enable();
-      (0, import_navigation.redirect)(`${options.playgroundPath}?id=${id}&${import_canvas4.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
+      (0, import_navigation.redirect)(`${options.playgroundPath}?id=${id}&${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
     }
   };
 };
@@ -316,9 +376,11 @@ var createPreviewOPTIONSRouteHandler = () => {
 };
 
 // src/handler/createPreviewPOSTRouteHandler.ts
+var import_canvas7 = require("@uniformdev/canvas");
 var import_cache = require("next/cache");
 
 // src/handler/helpers.ts
+var import_canvas6 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
 var import_edge_config = require("@vercel/edge-config");
 var import_svix = require("svix");
@@ -382,10 +444,16 @@ var processCompositionChange = async (compositionId) => {
       type: "no-cache"
     }
   });
-  const { nodes } = await projectMapClient.getNodes({
-    compositionId
-  });
+  const [{ nodes }, composition] = await Promise.all([
+    projectMapClient.getNodes({
+      compositionId
+    }),
+    getComposition({ compositionId })
+  ]);
   const tags = [];
+  if (composition == null ? void 0 : composition.pattern) {
+    tags.push("route");
+  }
   if (nodes) {
     for (let i = 0; i < nodes.length; i++) {
       const node = nodes[i];
@@ -400,6 +468,24 @@ var processCompositionChange = async (compositionId) => {
     tags
   };
 };
+var getComposition = async ({ compositionId }) => {
+  const canvasClient = getCanvasClient({
+    cache: {
+      type: "no-cache"
+    }
+  });
+  try {
+    const composition = await canvasClient.getCompositionById({
+      compositionId
+    });
+    return composition;
+  } catch (err) {
+    if (err instanceof import_canvas6.ApiClientError && err.statusCode === 404) {
+      return null;
+    }
+    throw err;
+  }
+};
 var buildProjectMapNodePaths = (path) => {
   const tags = [];
   const isDynamic = path.includes(":");
@@ -649,6 +735,25 @@ var handleRedirectUpdate = async (body) => {
 // src/handler/createPreviewPOSTRouteHandler.ts
 var createPreviewPOSTRouteHandler = () => {
   return async (request) => {
+    let previewSecretPassed = false;
+    if (process.env.UNIFORM_PREVIEW_SECRET) {
+      const secretValue = request.nextUrl.searchParams.get(import_canvas7.SECRET_QUERY_STRING_PARAM);
+      if (secretValue !== process.env.UNIFORM_PREVIEW_SECRET) {
+        console.warn(
+          "The preview secret passed in the query string does not match the UNIFORM_PREVIEW_SECRET env var."
+        );
+      } else {
+        previewSecretPassed = true;
+      }
+    } else {
+      if (!process.env.UNIFORM_WEBHOOK_SECRET) {
+        console.warn("Both UNIFORM_PREVIEW_SECRET and UNIFORM_WEBHOOK_SECRET are not set.");
+      }
+      previewSecretPassed = true;
+    }
+    if (!previewSecretPassed) {
+      return new Response("The request could not be validated.", { status: 401 });
+    }
     const { looksLikeMessage, validation } = await isSvixMessage(request);
     if (looksLikeMessage) {
       if (!validation) {
@@ -673,7 +778,13 @@ var handleSvixMessage = async (request) => {
     handleManifestPublished
   ];
   let tags = void 0;
-  const jsonBody = await request.json();
+  let jsonBody;
+  try {
+    jsonBody = await request.json();
+  } catch (err) {
+    console.error("Error parsing the request body as JSON.", err);
+    return new Response("Error parsing the request body as JSON.", { status: 400 });
+  }
   for (let i = 0; i < handlers.length; i++) {
     const handler = handlers[i];
     const result = await handler(jsonBody);

package/dist/handler.mjs

@@ -16,6 +16,9 @@ import {
 import { getBaseUrl, getServerConfig as getServerConfig2, resolvePath } from "@uniformdev/canvas-next-rsc-shared";
 import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
 
+// src/clients/canvasClient.ts
+import { CanvasClient } from "@uniformdev/canvas";
+
 // src/config/helpers.ts
 import { getServerConfig } from "@uniformdev/canvas-next-rsc-shared";
 
@@ -125,6 +128,54 @@ var determineFetchCacheOptions = (mode) => {
   };
 };
 
+// src/clients/canvasClient.ts
+var getCanvasClient = (options) => {
+  return new CanvasClient({
+    projectId: env.getProjectId(),
+    apiHost: env.getApiHost(),
+    apiKey: env.getApiKey(),
+    edgeApiHost: env.getEdgeApiHost(),
+    fetch: (req, init) => {
+      let requestedUrl;
+      if (typeof req === "string") {
+        requestedUrl = new URL(req);
+      } else if (req instanceof URL) {
+        requestedUrl = req;
+      } else {
+        requestedUrl = new URL(req.url);
+      }
+      const tags = [];
+      if (requestedUrl) {
+        const compositionIdKey = "compositionId";
+        const compositionIdsKey = "compositionIDs";
+        const compositionId = requestedUrl.searchParams.get(compositionIdKey);
+        const compositionIds = requestedUrl.searchParams.get(compositionIdsKey);
+        if (compositionId) {
+          tags.push(buildCompositionTag(compositionId));
+        }
+        if (compositionIds) {
+          const ids = compositionIds.split(",");
+          for (let i = 0; i < ids.length; i++) {
+            tags.push(buildCompositionTag(ids[i]));
+          }
+        }
+      }
+      const { cache, revalidate } = determineFetchCacheOptions(options.cache);
+      return fetch(req, {
+        ...init,
+        cache,
+        headers: {
+          ...init == null ? void 0 : init.headers,
+          "x-bypass-cache": "true"
+        },
+        next: {
+          revalidate
+        }
+      });
+    }
+  });
+};
+
 // src/clients/routeClient.ts
 import { RouteClient } from "@uniformdev/canvas";
 var getRouteClient = (options) => {
@@ -141,7 +192,7 @@ var getRouteClient = (options) => {
       } else {
         requestedUrl = new URL(req.url);
       }
-      const tags = [];
+      const tags = ["route"];
       if (requestedUrl) {
         const pathKey = "path";
         const path = requestedUrl.searchParams.get(pathKey);
@@ -183,30 +234,39 @@ var getDefaultRouteClient = ({ searchParams }) => {
 var retrieveRouteByPath = async ({
   path,
   state,
-  searchParams
+  searchParams,
+  fetchOptions
 }) => {
   var _a;
   const client = getDefaultRouteClient({
     searchParams
   });
+  let queryPath = path;
+  if (searchParams && Object.keys(searchParams).length > 0) {
+    const helper = new URL(getBaseUrl());
+    helper.pathname = path;
+    Object.entries(searchParams).forEach(([key, value]) => {
+      if (typeof value === "string") {
+        helper.searchParams.set(key, value);
+      }
+    });
+    if (helper.searchParams.size > 0) {
+      queryPath = `${helper.pathname}${helper.search}`;
+    }
+  }
   return await client.getRoute({
-    path,
+    ...fetchOptions,
+    path: queryPath,
     state,
     withComponentIDs: true,
     withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig2().experimental) == null ? void 0 : _a.vercelVisualEditing)
   });
 };
 var resolveRedirectHref = (resolveResult, path) => {
-  let href;
-  if (resolveResult.redirect.targetProjectMapNodeId) {
-    const requestUrl = `${getBaseUrl()}${path}`;
-    const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
-    const url = new URL(expandedUrl);
-    href = url.pathname;
-  } else {
-    href = resolveResult.redirect.targetUrl;
-  }
-  return href;
+  const requestUrl = `${getBaseUrl()}${path}`;
+  const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
+  const url = new URL(expandedUrl);
+  return url.pathname;
 };
 
 // src/handler/createPreviewGETRouteHandler.ts
@@ -296,9 +356,11 @@ var createPreviewOPTIONSRouteHandler = () => {
 };
 
 // src/handler/createPreviewPOSTRouteHandler.ts
+import { SECRET_QUERY_STRING_PARAM } from "@uniformdev/canvas";
 import { revalidateTag } from "next/cache";
 
 // src/handler/helpers.ts
+import { ApiClientError } from "@uniformdev/canvas";
 import { getServerConfig as getServerConfig3 } from "@uniformdev/canvas-next-rsc-shared";
 import { parseConnectionString } from "@vercel/edge-config";
 import { Webhook } from "svix";
@@ -362,10 +424,16 @@ var processCompositionChange = async (compositionId) => {
       type: "no-cache"
     }
   });
-  const { nodes } = await projectMapClient.getNodes({
-    compositionId
-  });
+  const [{ nodes }, composition] = await Promise.all([
+    projectMapClient.getNodes({
+      compositionId
+    }),
+    getComposition({ compositionId })
+  ]);
   const tags = [];
+  if (composition == null ? void 0 : composition.pattern) {
+    tags.push("route");
+  }
   if (nodes) {
     for (let i = 0; i < nodes.length; i++) {
       const node = nodes[i];
@@ -380,6 +448,24 @@ var processCompositionChange = async (compositionId) => {
     tags
   };
 };
+var getComposition = async ({ compositionId }) => {
+  const canvasClient = getCanvasClient({
+    cache: {
+      type: "no-cache"
+    }
+  });
+  try {
+    const composition = await canvasClient.getCompositionById({
+      compositionId
+    });
+    return composition;
+  } catch (err) {
+    if (err instanceof ApiClientError && err.statusCode === 404) {
+      return null;
+    }
+    throw err;
+  }
+};
 var buildProjectMapNodePaths = (path) => {
   const tags = [];
   const isDynamic = path.includes(":");
@@ -629,6 +715,25 @@ var handleRedirectUpdate = async (body) => {
 // src/handler/createPreviewPOSTRouteHandler.ts
 var createPreviewPOSTRouteHandler = () => {
   return async (request) => {
+    let previewSecretPassed = false;
+    if (process.env.UNIFORM_PREVIEW_SECRET) {
+      const secretValue = request.nextUrl.searchParams.get(SECRET_QUERY_STRING_PARAM);
+      if (secretValue !== process.env.UNIFORM_PREVIEW_SECRET) {
+        console.warn(
+          "The preview secret passed in the query string does not match the UNIFORM_PREVIEW_SECRET env var."
+        );
+      } else {
+        previewSecretPassed = true;
+      }
+    } else {
+      if (!process.env.UNIFORM_WEBHOOK_SECRET) {
+        console.warn("Both UNIFORM_PREVIEW_SECRET and UNIFORM_WEBHOOK_SECRET are not set.");
+      }
+      previewSecretPassed = true;
+    }
+    if (!previewSecretPassed) {
+      return new Response("The request could not be validated.", { status: 401 });
+    }
     const { looksLikeMessage, validation } = await isSvixMessage(request);
     if (looksLikeMessage) {
       if (!validation) {
@@ -653,7 +758,13 @@ var handleSvixMessage = async (request) => {
     handleManifestPublished
   ];
   let tags = void 0;
-  const jsonBody = await request.json();
+  let jsonBody;
+  try {
+    jsonBody = await request.json();
+  } catch (err) {
+    console.error("Error parsing the request body as JSON.", err);
+    return new Response("Error parsing the request body as JSON.", { status: 400 });
+  }
   for (let i = 0; i < handlers.length; i++) {
     const handler = handlers[i];
     const result = await handler(jsonBody);