@uniformdev/canvas-next 18.4.0 → 18.6.0

package/dist/chunk-SH3D2DYY.mjs

@@ -0,0 +1,14 @@
+// src/helpers/slug.ts
+var resolveSlugFromParams = ({
+  param = "slug",
+  params,
+  prefix
+}) => {
+  const slug = (params == null ? void 0 : params[param]) || "";
+  const slugString = Array.isArray(slug) ? slug.join("/") : slug;
+  return `/${slugString}` || prefix || "/";
+};
+
+export {
+  resolveSlugFromParams
+};

package/dist/index.d.ts

@@ -1,8 +1,14 @@
-export { U as UniformCompositionNextPage, b as UniformGetServerSideProps, a as UniformGetStaticProps } from './models-ed92e2bd.js';
+import { ParsedUrlQuery } from 'querystring';
+export { U as UniformCompositionNextPage, c as UniformGetServerSideProps, b as UniformGetStaticProps, a as UniformPreviewData } from './models-6ff72d91.js';
 import { NextApiHandler } from 'next';
 import { RootComponentInstance } from '@uniformdev/canvas';
 import '@uniformdev/canvas-react';
-import 'querystring';
+
+declare const resolveSlugFromParams: ({ param, params, prefix, }: {
+    param: string | undefined;
+    params: ParsedUrlQuery | undefined;
+    prefix?: string | undefined;
+}) => string;
 
 type ResolveFullPath = (options: {
     id?: string;
@@ -30,4 +36,4 @@ declare const createPreviewHandlerPost: CreatePreviewHandlerPost;
 type CreatePreviewHandler = (options?: CreatePreviewHandlerGetOptions & CreatePreviewHandlerPostOptions) => NextApiHandler;
 declare const createPreviewHandler: CreatePreviewHandler;
 
-export { CreatePreviewHandler, CreatePreviewHandlerGet, CreatePreviewHandlerGetOptions, CreatePreviewHandlerPost, CreatePreviewHandlerPostOptions, ResolveFullPath, createPreviewHandler, createPreviewHandlerGet, createPreviewHandlerPost };
+export { CreatePreviewHandler, CreatePreviewHandlerGet, CreatePreviewHandlerGetOptions, CreatePreviewHandlerPost, CreatePreviewHandlerPostOptions, ResolveFullPath, createPreviewHandler, createPreviewHandlerGet, createPreviewHandlerPost, resolveSlugFromParams };

package/dist/index.esm.js

@@ -1,3 +1,7 @@
+import {
+  resolveSlugFromParams
+} from "./chunk-SH3D2DYY.mjs";
+
 // src/preview/previewHandlerGet.ts
 import { IN_CONTEXT_EDITOR_QUERY_STRING_PARAM } from "@uniformdev/canvas";
 var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefault } = {}) => async (req, res) => {
@@ -19,7 +23,9 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
-  res.setPreviewData({});
+  res.setPreviewData({
+    isUniformContextualEditing: req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true"
+  });
   const newQuery = new URLSearchParams();
   queryParamsToPreserve.forEach((param) => {
     const paramValue = req.query[param];
@@ -76,5 +82,6 @@ var createPreviewHandler = ({ secret, enhance, resolveFullPath } = {}) => async
 export {
   createPreviewHandler,
   createPreviewHandlerGet,
-  createPreviewHandlerPost
+  createPreviewHandlerPost,
+  resolveSlugFromParams
 };

package/dist/index.js

@@ -22,10 +22,22 @@ var src_exports = {};
 __export(src_exports, {
   createPreviewHandler: () => createPreviewHandler,
   createPreviewHandlerGet: () => createPreviewHandlerGet,
-  createPreviewHandlerPost: () => createPreviewHandlerPost
+  createPreviewHandlerPost: () => createPreviewHandlerPost,
+  resolveSlugFromParams: () => resolveSlugFromParams
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/helpers/slug.ts
+var resolveSlugFromParams = ({
+  param = "slug",
+  params,
+  prefix
+}) => {
+  const slug = (params == null ? void 0 : params[param]) || "";
+  const slugString = Array.isArray(slug) ? slug.join("/") : slug;
+  return `/${slugString}` || prefix || "/";
+};
+
 // src/preview/previewHandlerGet.ts
 var import_canvas = require("@uniformdev/canvas");
 var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefault } = {}) => async (req, res) => {
@@ -47,7 +59,9 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
-  res.setPreviewData({});
+  res.setPreviewData({
+    isUniformContextualEditing: req.query[import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true"
+  });
   const newQuery = new URLSearchParams();
   queryParamsToPreserve.forEach((param) => {
     const paramValue = req.query[param];
@@ -105,5 +119,6 @@ var createPreviewHandler = ({ secret, enhance, resolveFullPath } = {}) => async
 0 && (module.exports = {
   createPreviewHandler,
   createPreviewHandlerGet,
-  createPreviewHandlerPost
+  createPreviewHandlerPost,
+  resolveSlugFromParams
 });

package/dist/index.mjs

@@ -1,3 +1,7 @@
+import {
+  resolveSlugFromParams
+} from "./chunk-SH3D2DYY.mjs";
+
 // src/preview/previewHandlerGet.ts
 import { IN_CONTEXT_EDITOR_QUERY_STRING_PARAM } from "@uniformdev/canvas";
 var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefault } = {}) => async (req, res) => {
@@ -19,7 +23,9 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
-  res.setPreviewData({});
+  res.setPreviewData({
+    isUniformContextualEditing: req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true"
+  });
   const newQuery = new URLSearchParams();
   queryParamsToPreserve.forEach((param) => {
     const paramValue = req.query[param];
@@ -76,5 +82,6 @@ var createPreviewHandler = ({ secret, enhance, resolveFullPath } = {}) => async
 export {
   createPreviewHandler,
   createPreviewHandlerGet,
-  createPreviewHandlerPost
+  createPreviewHandlerPost,
+  resolveSlugFromParams
 };

package/dist/{models-ed92e2bd.d.ts → models-6ff72d91.d.ts}

@@ -1,18 +1,21 @@
 import { RootComponentInstance } from '@uniformdev/canvas';
-import { CompositionProps } from '@uniformdev/canvas-react';
+import { UniformCompositionProps } from '@uniformdev/canvas-react';
 import { NextPage, PreviewData, GetStaticPropsContext, GetStaticPropsResult, GetServerSidePropsContext, GetServerSidePropsResult } from 'next';
 import { ParsedUrlQuery } from 'querystring';
 
-type UniformCompositionNextPage<TProps = unknown> = NextPage<TProps & CompositionProps>;
+type UniformCompositionNextPage<TProps = unknown> = NextPage<TProps & UniformCompositionProps>;
+type UniformPreviewData = PreviewData & {
+    isUniformContextualEditing: boolean;
+};
 type UniformGetStaticProps<P extends {
     [key: string]: any;
 } = {
     [key: string]: any;
-}, Q extends ParsedUrlQuery = ParsedUrlQuery, D extends PreviewData = PreviewData> = (context: GetStaticPropsContext<Q, D>, composition: RootComponentInstance | undefined) => Promise<GetStaticPropsResult<P>> | GetStaticPropsResult<P>;
+}, Q extends ParsedUrlQuery = ParsedUrlQuery, D extends UniformPreviewData = UniformPreviewData> = (context: GetStaticPropsContext<Q, D>, composition: RootComponentInstance | undefined) => Promise<GetStaticPropsResult<P>> | GetStaticPropsResult<P>;
 type UniformGetServerSideProps<P extends {
     [key: string]: any;
 } = {
     [key: string]: any;
 }, Q extends ParsedUrlQuery = ParsedUrlQuery, D extends PreviewData = PreviewData> = (context: GetServerSidePropsContext<Q, D>, composition: RootComponentInstance | undefined) => Promise<GetServerSidePropsResult<P>> | GetServerSidePropsResult<P>;
 
-export { UniformCompositionNextPage as U, UniformGetStaticProps as a, UniformGetServerSideProps as b };
+export { UniformCompositionNextPage as U, UniformPreviewData as a, UniformGetStaticProps as b, UniformGetServerSideProps as c };

package/dist/project-map/index.d.ts

@@ -1,8 +1,9 @@
+import * as querystring from 'querystring';
+import { ParsedUrlQuery } from 'querystring';
+import { c as UniformGetServerSideProps, b as UniformGetStaticProps, a as UniformPreviewData } from '../models-6ff72d91.js';
 import * as next from 'next';
 import { GetServerSideProps, GetStaticProps } from 'next';
-import * as querystring from 'querystring';
 import { CanvasClient } from '@uniformdev/canvas';
-import { b as UniformGetServerSideProps, a as UniformGetStaticProps } from '../models-ed92e2bd.js';
 import { ProjectMapClient } from '@uniformdev/project-map';
 import '@uniformdev/canvas-react';
 
@@ -30,19 +31,19 @@ declare const withUniformGetStaticProps: <TProps extends {
     [key: string]: any;
 } = {
     [key: string]: any;
-}>(callback?: UniformGetStaticProps<TProps, querystring.ParsedUrlQuery, next.PreviewData> | undefined, options?: {
+}>(callback?: UniformGetStaticProps<TProps, ParsedUrlQuery, UniformPreviewData> | undefined, options?: {
     projectMapId?: string;
     param?: string;
     prefix?: string;
     client?: CanvasClient;
-}) => GetStaticProps<TProps, querystring.ParsedUrlQuery, next.PreviewData>;
+}) => GetStaticProps<TProps, ParsedUrlQuery, UniformPreviewData>;
 
 declare const getServerSideProps: next.GetServerSideProps<{
     [key: string]: any;
 }, querystring.ParsedUrlQuery, next.PreviewData>;
 declare const getStaticProps: next.GetStaticProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, next.PreviewData>;
+}, querystring.ParsedUrlQuery, UniformPreviewData>;
 declare const getStaticPaths: () => Promise<{
     paths: string[] | undefined;
     fallback: boolean;

package/dist/project-map/index.js

@@ -112,10 +112,9 @@ var withUniformGetStaticPaths = (options) => {
 };
 
 // src/project-map/withUniformGetStaticProps.ts
-var import_canvas4 = require("@uniformdev/canvas");
-
-// src/slug/withUniformGetStaticProps.ts
 var import_canvas3 = require("@uniformdev/canvas");
+
+// src/helpers/slug.ts
 var resolveSlugFromParams = ({
   param = "slug",
   params,
@@ -147,23 +146,28 @@ var withUniformGetStaticProps = (callback, options) => {
       params: context == null ? void 0 : context.params,
       prefix: options == null ? void 0 : options.prefix
     });
-    const canvasClient = (_c = options == null ? void 0 : options.client) != null ? _c : new import_canvas4.CanvasClient({
+    const canvasClient = (_c = options == null ? void 0 : options.client) != null ? _c : new import_canvas3.CanvasClient({
       apiKey: process.env.UNIFORM_API_KEY,
       projectId: process.env.UNIFORM_PROJECT_ID,
       apiHost: process.env.UNIFORM_CLI_BASE_URL
     });
-    const { preview } = context;
-    const response = await canvasClient.unstable_getCompositionByNodePath({
-      projectMapId,
-      projectMapNodePath: pathString,
-      state: preview ? import_canvas4.CANVAS_DRAFT_STATE : import_canvas4.CANVAS_PUBLISHED_STATE
-    });
-    if (!response.composition) {
-      return {
-        notFound: true
-      };
+    const { preview, previewData } = context;
+    let composition = void 0;
+    try {
+      const response = await canvasClient.unstable_getCompositionByNodePath({
+        projectMapId,
+        projectMapNodePath: pathString,
+        state: preview ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.CANVAS_PUBLISHED_STATE
+      });
+      composition = response.composition;
+    } catch (e) {
+      console.error("[canvas-next] Failed to fetch composition", e);
+      if (!(previewData == null ? void 0 : previewData.isUniformContextualEditing)) {
+        return {
+          notFound: true
+        };
+      }
     }
-    const { composition } = response;
     const ret = callback ? await callback(context, composition) : { props: {} };
     if (Object.hasOwn(ret, "props")) {
       const casted = ret;

package/dist/project-map/index.mjs

@@ -1,6 +1,6 @@
 import {
   resolveSlugFromParams
-} from "../chunk-NKFDQUQK.mjs";
+} from "../chunk-SH3D2DYY.mjs";
 
 // src/project-map/withUniformGetServerSideProps.ts
 import { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE, CanvasClient } from "@uniformdev/canvas";
@@ -85,7 +85,11 @@ var withUniformGetStaticPaths = (options) => {
 };
 
 // src/project-map/withUniformGetStaticProps.ts
-import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3, CanvasClient as CanvasClient2 } from "@uniformdev/canvas";
+import {
+  CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3,
+  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3,
+  CanvasClient as CanvasClient2
+} from "@uniformdev/canvas";
 var withUniformGetStaticProps = (callback, options) => {
   return async function wrappedGetStaticProps(context) {
     var _a, _b, _c;
@@ -111,18 +115,23 @@ var withUniformGetStaticProps = (callback, options) => {
       projectId: process.env.UNIFORM_PROJECT_ID,
       apiHost: process.env.UNIFORM_CLI_BASE_URL
     });
-    const { preview } = context;
-    const response = await canvasClient.unstable_getCompositionByNodePath({
-      projectMapId,
-      projectMapNodePath: pathString,
-      state: preview ? CANVAS_DRAFT_STATE3 : CANVAS_PUBLISHED_STATE3
-    });
-    if (!response.composition) {
-      return {
-        notFound: true
-      };
+    const { preview, previewData } = context;
+    let composition = void 0;
+    try {
+      const response = await canvasClient.unstable_getCompositionByNodePath({
+        projectMapId,
+        projectMapNodePath: pathString,
+        state: preview ? CANVAS_DRAFT_STATE3 : CANVAS_PUBLISHED_STATE3
+      });
+      composition = response.composition;
+    } catch (e) {
+      console.error("[canvas-next] Failed to fetch composition", e);
+      if (!(previewData == null ? void 0 : previewData.isUniformContextualEditing)) {
+        return {
+          notFound: true
+        };
+      }
     }
-    const { composition } = response;
     const ret = callback ? await callback(context, composition) : { props: {} };
     if (Object.hasOwn(ret, "props")) {
       const casted = ret;

package/dist/slug/index.d.ts

@@ -2,17 +2,19 @@ import * as next from 'next';
 import { GetServerSideProps, GetStaticProps } from 'next';
 import * as querystring from 'querystring';
 import { ParsedUrlQuery } from 'querystring';
+import { c as UniformGetServerSideProps, a as UniformPreviewData, b as UniformGetStaticProps } from '../models-6ff72d91.js';
 import { CanvasClient } from '@uniformdev/canvas';
-import { b as UniformGetServerSideProps, a as UniformGetStaticProps } from '../models-ed92e2bd.js';
 import '@uniformdev/canvas-react';
 
 declare const withUniformGetServerSideProps: <TProps extends {
     [key: string]: any;
 } = {
     [key: string]: any;
-}>(callback?: UniformGetServerSideProps<TProps, querystring.ParsedUrlQuery, next.PreviewData> | undefined, options?: {
+}>(callback?: UniformGetServerSideProps<TProps, ParsedUrlQuery, next.PreviewData> | undefined, options?: {
+    param?: string;
+    prefix?: string;
     client?: CanvasClient;
-}) => GetServerSideProps<TProps, querystring.ParsedUrlQuery, next.PreviewData>;
+}) => GetServerSideProps<TProps, ParsedUrlQuery, UniformPreviewData>;
 
 declare const withUniformGetStaticPaths: (options?: {
     prefix?: string;
@@ -27,18 +29,18 @@ declare const withUniformGetStaticProps: <TProps extends {
     [key: string]: any;
 } = {
     [key: string]: any;
-}>(callback?: UniformGetStaticProps<TProps, ParsedUrlQuery, next.PreviewData> | undefined, options?: {
+}>(callback?: UniformGetStaticProps<TProps, ParsedUrlQuery, UniformPreviewData> | undefined, options?: {
     param?: string;
     prefix?: string;
     client?: CanvasClient;
-}) => GetStaticProps<TProps, ParsedUrlQuery, next.PreviewData>;
+}) => GetStaticProps<TProps, ParsedUrlQuery, UniformPreviewData>;
 
 declare const getServerSideProps: next.GetServerSideProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, next.PreviewData>;
+}, querystring.ParsedUrlQuery, UniformPreviewData>;
 declare const getStaticProps: next.GetStaticProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, next.PreviewData>;
+}, querystring.ParsedUrlQuery, UniformPreviewData>;
 declare const getStaticPaths: () => Promise<{
     paths: string[];
     fallback: boolean;

package/dist/slug/index.js

@@ -31,6 +31,19 @@ module.exports = __toCommonJS(slug_exports);
 
 // src/slug/withUniformGetServerSideProps.ts
 var import_canvas = require("@uniformdev/canvas");
+
+// src/helpers/slug.ts
+var resolveSlugFromParams = ({
+  param = "slug",
+  params,
+  prefix
+}) => {
+  const slug = (params == null ? void 0 : params[param]) || "";
+  const slugString = Array.isArray(slug) ? slug.join("/") : slug;
+  return `/${slugString}` || prefix || "/";
+};
+
+// src/slug/withUniformGetServerSideProps.ts
 var withUniformGetServerSideProps = (callback, options) => {
   return async function wrappedGetServerSideProps(context) {
     if (!process.env.UNIFORM_API_KEY) {
@@ -39,26 +52,36 @@ var withUniformGetServerSideProps = (callback, options) => {
     if (!process.env.UNIFORM_PROJECT_ID) {
       throw new Error("UNIFORM_PROJECT_ID is not defined.");
     }
+    const slugString = resolveSlugFromParams({
+      param: options == null ? void 0 : options.param,
+      params: context == null ? void 0 : context.params,
+      prefix: options == null ? void 0 : options.prefix
+    });
     const canvasClient = (options == null ? void 0 : options.client) || new import_canvas.CanvasClient({
       apiKey: process.env.UNIFORM_API_KEY,
       projectId: process.env.UNIFORM_PROJECT_ID,
       apiHost: process.env.UNIFORM_CLI_BASE_URL
     });
-    const { preview } = context;
-    const url = new URL(context.resolvedUrl, `http://${context.req.headers.host}/`);
-    const response = await canvasClient.getCompositionBySlug({
-      slug: url.pathname,
-      state: preview ? import_canvas.CANVAS_DRAFT_STATE : import_canvas.CANVAS_PUBLISHED_STATE
-    });
-    if (!response) {
-      return {
-        notFound: true
-      };
+    const { preview, previewData } = context;
+    let composition = void 0;
+    try {
+      const response = await canvasClient.getCompositionBySlug({
+        slug: slugString,
+        state: preview ? import_canvas.CANVAS_DRAFT_STATE : import_canvas.CANVAS_PUBLISHED_STATE
+      });
+      composition = response.composition;
+    } catch (e) {
+      console.error("[canvas-next] Failed to fetch composition", e);
+      if (!(previewData == null ? void 0 : previewData.isUniformContextualEditing)) {
+        return {
+          notFound: true
+        };
+      }
     }
-    const ret = callback ? await callback(context, response.composition) : { props: {} };
-    if (Object.hasOwn(ret, "props")) {
+    const ret = callback ? await callback(context, composition) : { props: {} };
+    if (composition && Object.hasOwn(ret, "props")) {
       const casted = ret;
-      casted.props["data"] = response.composition;
+      casted.props["data"] = composition;
     }
     return ret;
   };
@@ -117,34 +140,30 @@ var withUniformGetStaticProps = (callback, options) => {
       projectId: process.env.UNIFORM_PROJECT_ID,
       apiHost: process.env.UNIFORM_CLI_BASE_URL
     });
-    const { preview } = context;
-    const response = await canvasClient.getCompositionBySlug({
-      slug: slugString,
-      state: preview ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.CANVAS_PUBLISHED_STATE
-    });
-    if (!response.composition) {
-      return {
-        notFound: true
-      };
+    const { preview, previewData } = context;
+    let composition = void 0;
+    try {
+      const response = await canvasClient.getCompositionBySlug({
+        slug: slugString,
+        state: preview ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.CANVAS_PUBLISHED_STATE
+      });
+      composition = response.composition;
+    } catch (e) {
+      console.error("[canvas-next] Failed to fetch composition", e);
+      if (!(previewData == null ? void 0 : previewData.isUniformContextualEditing)) {
+        return {
+          notFound: true
+        };
+      }
     }
-    const { composition } = response;
     const ret = callback ? await callback(context, composition) : { props: {} };
-    if (Object.hasOwn(ret, "props")) {
+    if (composition && Object.hasOwn(ret, "props")) {
       const casted = ret;
       casted.props["data"] = composition;
     }
     return ret;
   };
 };
-var resolveSlugFromParams = ({
-  param = "slug",
-  params,
-  prefix
-}) => {
-  const slug = (params == null ? void 0 : params[param]) || "";
-  const slugString = Array.isArray(slug) ? slug.join("/") : slug;
-  return `/${slugString}` || prefix || "/";
-};
 
 // src/slug/index.ts
 var getServerSideProps = withUniformGetServerSideProps();

package/dist/slug/index.mjs

@@ -1,9 +1,13 @@
 import {
-  withUniformGetStaticProps
-} from "../chunk-NKFDQUQK.mjs";
+  resolveSlugFromParams
+} from "../chunk-SH3D2DYY.mjs";
 
 // src/slug/withUniformGetServerSideProps.ts
-import { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE, CanvasClient } from "@uniformdev/canvas";
+import {
+  CANVAS_DRAFT_STATE,
+  CANVAS_PUBLISHED_STATE,
+  CanvasClient
+} from "@uniformdev/canvas";
 var withUniformGetServerSideProps = (callback, options) => {
   return async function wrappedGetServerSideProps(context) {
     if (!process.env.UNIFORM_API_KEY) {
@@ -12,26 +16,36 @@ var withUniformGetServerSideProps = (callback, options) => {
     if (!process.env.UNIFORM_PROJECT_ID) {
       throw new Error("UNIFORM_PROJECT_ID is not defined.");
     }
+    const slugString = resolveSlugFromParams({
+      param: options == null ? void 0 : options.param,
+      params: context == null ? void 0 : context.params,
+      prefix: options == null ? void 0 : options.prefix
+    });
     const canvasClient = (options == null ? void 0 : options.client) || new CanvasClient({
       apiKey: process.env.UNIFORM_API_KEY,
       projectId: process.env.UNIFORM_PROJECT_ID,
       apiHost: process.env.UNIFORM_CLI_BASE_URL
     });
-    const { preview } = context;
-    const url = new URL(context.resolvedUrl, `http://${context.req.headers.host}/`);
-    const response = await canvasClient.getCompositionBySlug({
-      slug: url.pathname,
-      state: preview ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE
-    });
-    if (!response) {
-      return {
-        notFound: true
-      };
+    const { preview, previewData } = context;
+    let composition = void 0;
+    try {
+      const response = await canvasClient.getCompositionBySlug({
+        slug: slugString,
+        state: preview ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE
+      });
+      composition = response.composition;
+    } catch (e) {
+      console.error("[canvas-next] Failed to fetch composition", e);
+      if (!(previewData == null ? void 0 : previewData.isUniformContextualEditing)) {
+        return {
+          notFound: true
+        };
+      }
     }
-    const ret = callback ? await callback(context, response.composition) : { props: {} };
-    if (Object.hasOwn(ret, "props")) {
+    const ret = callback ? await callback(context, composition) : { props: {} };
+    if (composition && Object.hasOwn(ret, "props")) {
       const casted = ret;
-      casted.props["data"] = response.composition;
+      casted.props["data"] = composition;
     }
     return ret;
   };
@@ -69,6 +83,56 @@ var withUniformGetStaticPaths = (options) => {
   };
 };
 
+// src/slug/withUniformGetStaticProps.ts
+import {
+  CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3,
+  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3,
+  CanvasClient as CanvasClient3
+} from "@uniformdev/canvas";
+var withUniformGetStaticProps = (callback, options) => {
+  return async function wrappedGetStaticProps(context) {
+    var _a;
+    if (!process.env.UNIFORM_API_KEY) {
+      throw new Error("UNIFORM_API_KEY is not defined.");
+    }
+    if (!process.env.UNIFORM_PROJECT_ID) {
+      throw new Error("UNIFORM_PROJECT_ID is not defined.");
+    }
+    const slugString = resolveSlugFromParams({
+      param: options == null ? void 0 : options.param,
+      params: context == null ? void 0 : context.params,
+      prefix: options == null ? void 0 : options.prefix
+    });
+    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CanvasClient3({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL
+    });
+    const { preview, previewData } = context;
+    let composition = void 0;
+    try {
+      const response = await canvasClient.getCompositionBySlug({
+        slug: slugString,
+        state: preview ? CANVAS_DRAFT_STATE3 : CANVAS_PUBLISHED_STATE3
+      });
+      composition = response.composition;
+    } catch (e) {
+      console.error("[canvas-next] Failed to fetch composition", e);
+      if (!(previewData == null ? void 0 : previewData.isUniformContextualEditing)) {
+        return {
+          notFound: true
+        };
+      }
+    }
+    const ret = callback ? await callback(context, composition) : { props: {} };
+    if (composition && Object.hasOwn(ret, "props")) {
+      const casted = ret;
+      casted.props["data"] = composition;
+    }
+    return ret;
+  };
+};
+
 // src/slug/index.ts
 var getServerSideProps = withUniformGetServerSideProps();
 var getStaticProps = withUniformGetStaticProps();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "18.4.0",
+  "version": "18.6.0",
   "description": "Next.js SDK for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -52,9 +52,9 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
-    "@uniformdev/canvas": "18.4.0",
-    "@uniformdev/canvas-react": "18.4.0",
-    "@uniformdev/project-map": "18.4.0"
+    "@uniformdev/canvas": "18.6.0",
+    "@uniformdev/canvas-react": "18.6.0",
+    "@uniformdev/project-map": "18.6.0"
   },
   "peerDependencies": {
     "next": ">= 12.0.0",
@@ -73,5 +73,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "34456ffbb8609bfaa0c2e321e1ebea82f02e040a"
+  "gitHead": "2e2b4d179180900386f8b3ceb30d4a854a7e22fd"
 }

package/dist/chunk-NKFDQUQK.mjs

@@ -1,54 +0,0 @@
-// src/slug/withUniformGetStaticProps.ts
-import { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE, CanvasClient } from "@uniformdev/canvas";
-var withUniformGetStaticProps = (callback, options) => {
-  return async function wrappedGetStaticProps(context) {
-    var _a;
-    if (!process.env.UNIFORM_API_KEY) {
-      throw new Error("UNIFORM_API_KEY is not defined.");
-    }
-    if (!process.env.UNIFORM_PROJECT_ID) {
-      throw new Error("UNIFORM_PROJECT_ID is not defined.");
-    }
-    const slugString = resolveSlugFromParams({
-      param: options == null ? void 0 : options.param,
-      params: context == null ? void 0 : context.params,
-      prefix: options == null ? void 0 : options.prefix
-    });
-    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CanvasClient({
-      apiKey: process.env.UNIFORM_API_KEY,
-      projectId: process.env.UNIFORM_PROJECT_ID,
-      apiHost: process.env.UNIFORM_CLI_BASE_URL
-    });
-    const { preview } = context;
-    const response = await canvasClient.getCompositionBySlug({
-      slug: slugString,
-      state: preview ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE
-    });
-    if (!response.composition) {
-      return {
-        notFound: true
-      };
-    }
-    const { composition } = response;
-    const ret = callback ? await callback(context, composition) : { props: {} };
-    if (Object.hasOwn(ret, "props")) {
-      const casted = ret;
-      casted.props["data"] = composition;
-    }
-    return ret;
-  };
-};
-var resolveSlugFromParams = ({
-  param = "slug",
-  params,
-  prefix
-}) => {
-  const slug = (params == null ? void 0 : params[param]) || "";
-  const slugString = Array.isArray(slug) ? slug.join("/") : slug;
-  return `/${slugString}` || prefix || "/";
-};
-
-export {
-  withUniformGetStaticProps,
-  resolveSlugFromParams
-};