@uniformdev/canvas-next 19.56.0 → 19.56.1-alpha.22

package/dist/index.esm.js

@@ -53,7 +53,8 @@ import {
   IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM,
   IN_CONTEXT_EDITOR_QUERY_STRING_PARAM
 } from "@uniformdev/canvas";
-var BASE_URL_EXAMPLE = "https://exmaple.com";
+import { isAllowedReferrer } from "@uniformdev/canvas";
+var BASE_URL_EXAMPLE = "https://example.com";
 var getQueryParam = (req, paramName) => {
   const value = req.query[paramName];
   if (typeof value === "undefined") {
@@ -102,7 +103,7 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
-  const isUniformContextualEditing = req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true";
+  const isUniformContextualEditing = req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true" && isAllowedReferrer(req.headers.referer);
   res.setPreviewData(
     {
       isUniformContextualEditing,
@@ -126,12 +127,14 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
     cookies == null ? void 0 : cookies.map((cookie) => cookie.replace("SameSite=Lax", "SameSite=None;Secure"))
   );
   const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
-  queryParamsToPreserve.forEach((param) => {
-    const paramValue = req.query[param];
-    if (typeof paramValue === "string") {
-      redirectionUrl.searchParams.append(param, paramValue);
-    }
-  });
+  if (isUniformContextualEditing) {
+    queryParamsToPreserve.forEach((param) => {
+      const paramValue = req.query[param];
+      if (typeof paramValue === "string") {
+        redirectionUrl.searchParams.append(param, paramValue);
+      }
+    });
+  }
   const fullPathToRedirectTo = redirectionUrl.href.replace(BASE_URL_EXAMPLE, "");
   res.redirect(fullPathToRedirectTo);
 };

package/dist/index.js

@@ -96,7 +96,8 @@ var resolveSlugFromParams = ({
 
 // src/preview/previewHandlerGet.ts
 var import_canvas = require("@uniformdev/canvas");
-var BASE_URL_EXAMPLE = "https://exmaple.com";
+var import_canvas2 = require("@uniformdev/canvas");
+var BASE_URL_EXAMPLE = "https://example.com";
 var getQueryParam = (req, paramName) => {
   const value = req.query[paramName];
   if (typeof value === "undefined") {
@@ -145,7 +146,7 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
-  const isUniformContextualEditing = req.query[import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true";
+  const isUniformContextualEditing = req.query[import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true" && (0, import_canvas2.isAllowedReferrer)(req.headers.referer);
   res.setPreviewData(
     {
       isUniformContextualEditing,
@@ -169,12 +170,14 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
     cookies == null ? void 0 : cookies.map((cookie) => cookie.replace("SameSite=Lax", "SameSite=None;Secure"))
   );
   const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
-  queryParamsToPreserve.forEach((param) => {
-    const paramValue = req.query[param];
-    if (typeof paramValue === "string") {
-      redirectionUrl.searchParams.append(param, paramValue);
-    }
-  });
+  if (isUniformContextualEditing) {
+    queryParamsToPreserve.forEach((param) => {
+      const paramValue = req.query[param];
+      if (typeof paramValue === "string") {
+        redirectionUrl.searchParams.append(param, paramValue);
+      }
+    });
+  }
   const fullPathToRedirectTo = redirectionUrl.href.replace(BASE_URL_EXAMPLE, "");
   res.redirect(fullPathToRedirectTo);
 };
@@ -188,7 +191,7 @@ function validateLocalRedirectUrl(pathToRedirectTo) {
 }
 
 // src/preview/previewHandlerPost.ts
-var import_canvas2 = require("@uniformdev/canvas");
+var import_canvas3 = require("@uniformdev/canvas");
 var createPreviewHandlerPost = ({ secret, enhance } = {}) => async (req, res) => {
   const { composition, hash } = req.body;
   if (!composition) {
@@ -198,7 +201,7 @@ var createPreviewHandlerPost = ({ secret, enhance } = {}) => async (req, res) =>
   const hasProvidedHash = Boolean(hash);
   const hasConfiguredHash = Boolean(previewSecret);
   if (hasProvidedHash && hasConfiguredHash) {
-    const calculatedHash = (0, import_canvas2.generateHash)({
+    const calculatedHash = (0, import_canvas3.generateHash)({
       composition,
       secret: previewSecret
     });

package/dist/index.mjs

@@ -53,7 +53,8 @@ import {
   IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM,
   IN_CONTEXT_EDITOR_QUERY_STRING_PARAM
 } from "@uniformdev/canvas";
-var BASE_URL_EXAMPLE = "https://exmaple.com";
+import { isAllowedReferrer } from "@uniformdev/canvas";
+var BASE_URL_EXAMPLE = "https://example.com";
 var getQueryParam = (req, paramName) => {
   const value = req.query[paramName];
   if (typeof value === "undefined") {
@@ -102,7 +103,7 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
-  const isUniformContextualEditing = req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true";
+  const isUniformContextualEditing = req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true" && isAllowedReferrer(req.headers.referer);
   res.setPreviewData(
     {
       isUniformContextualEditing,
@@ -126,12 +127,14 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
     cookies == null ? void 0 : cookies.map((cookie) => cookie.replace("SameSite=Lax", "SameSite=None;Secure"))
   );
   const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
-  queryParamsToPreserve.forEach((param) => {
-    const paramValue = req.query[param];
-    if (typeof paramValue === "string") {
-      redirectionUrl.searchParams.append(param, paramValue);
-    }
-  });
+  if (isUniformContextualEditing) {
+    queryParamsToPreserve.forEach((param) => {
+      const paramValue = req.query[param];
+      if (typeof paramValue === "string") {
+        redirectionUrl.searchParams.append(param, paramValue);
+      }
+    });
+  }
   const fullPathToRedirectTo = redirectionUrl.href.replace(BASE_URL_EXAMPLE, "");
   res.redirect(fullPathToRedirectTo);
 };

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

@@ -1,10 +1,10 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, PreviewData, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { c as UniformGetServerSideProps, a as UniformPreviewData, b as UniformGetStaticProps } from '../models-f9fd03c4.js';
-import * as querystring from 'querystring';
-import { ParsedUrlQuery } from 'querystring';
+import * as node_querystring from 'node:querystring';
 import * as _uniformdev_canvas from '@uniformdev/canvas';
 import { CanvasClient, DataResolutionOption } from '@uniformdev/canvas';
+import { ParsedUrlQuery } from 'querystring';
 export { w as withUniformGetStaticPaths } from '../withUniformGetStaticPaths-77db0164.js';
 import '@uniformdev/canvas-react';
 import '@uniformdev/project-map';
@@ -75,11 +75,11 @@ declare const withUniformGetStaticProps: <TProps extends {
 
 declare const getServerSideProps: next.GetServerSideProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 /** Ready to go getStaticProps for dynamic route with 'path' param for [[...path]].jsx */
 declare const getStaticProps: next.GetStaticProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 declare const getStaticPaths: () => Promise<{
     paths: string[] | undefined;
     fallback: boolean;

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

@@ -1,10 +1,10 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, PreviewData, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { c as UniformGetServerSideProps, a as UniformPreviewData, b as UniformGetStaticProps } from '../models-f9fd03c4.js';
-import * as querystring from 'querystring';
-import { ParsedUrlQuery } from 'querystring';
+import * as node_querystring from 'node:querystring';
 import * as _uniformdev_canvas from '@uniformdev/canvas';
 import { CanvasClient, DataResolutionOption } from '@uniformdev/canvas';
+import { ParsedUrlQuery } from 'querystring';
 export { w as withUniformGetStaticPaths } from '../withUniformGetStaticPaths-77db0164.js';
 import '@uniformdev/canvas-react';
 import '@uniformdev/project-map';
@@ -75,11 +75,11 @@ declare const withUniformGetStaticProps: <TProps extends {
 
 declare const getServerSideProps: next.GetServerSideProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 /** Ready to go getStaticProps for dynamic route with 'path' param for [[...path]].jsx */
 declare const getStaticProps: next.GetStaticProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 declare const getStaticPaths: () => Promise<{
     paths: string[] | undefined;
     fallback: boolean;

package/dist/route/index.d.mts

@@ -1,10 +1,10 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSidePropsResult, GetServerSideProps, GetStaticPropsContext, GetStaticPropsResult, GetStaticProps } from 'next';
 import { a as UniformPreviewData } from '../models-f9fd03c4.js';
-import * as querystring from 'querystring';
-import { ParsedUrlQuery } from 'querystring';
+import * as node_querystring from 'node:querystring';
 export { w as withUniformGetStaticPaths } from '../withUniformGetStaticPaths-77db0164.js';
 import { RouteGetResponseEdgehancedComposition, RouteGetResponseNotFound, RouteGetResponseRedirect, RouteClient, RouteGetParameters, RootComponentInstance } from '@uniformdev/canvas';
+import { ParsedUrlQuery } from 'querystring';
 import '@uniformdev/canvas-react';
 import '@uniformdev/project-map';
 
@@ -182,7 +182,7 @@ declare const getServerSideProps: next.GetServerSideProps<{
             variants?: boolean | undefined;
         } | undefined;
     };
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 
 /**
  * Default implementation of getStaticProps with routes
@@ -306,7 +306,7 @@ declare const getStaticProps: next.GetStaticProps<{
             variants?: boolean | undefined;
         } | undefined;
     };
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 /**
  * Default implementation of getStaticPaths with routes
  * To configure custom behavior, use:

package/dist/route/index.d.ts

@@ -1,10 +1,10 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSidePropsResult, GetServerSideProps, GetStaticPropsContext, GetStaticPropsResult, GetStaticProps } from 'next';
 import { a as UniformPreviewData } from '../models-f9fd03c4.js';
-import * as querystring from 'querystring';
-import { ParsedUrlQuery } from 'querystring';
+import * as node_querystring from 'node:querystring';
 export { w as withUniformGetStaticPaths } from '../withUniformGetStaticPaths-77db0164.js';
 import { RouteGetResponseEdgehancedComposition, RouteGetResponseNotFound, RouteGetResponseRedirect, RouteClient, RouteGetParameters, RootComponentInstance } from '@uniformdev/canvas';
+import { ParsedUrlQuery } from 'querystring';
 import '@uniformdev/canvas-react';
 import '@uniformdev/project-map';
 
@@ -182,7 +182,7 @@ declare const getServerSideProps: next.GetServerSideProps<{
             variants?: boolean | undefined;
         } | undefined;
     };
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 
 /**
  * Default implementation of getStaticProps with routes
@@ -306,7 +306,7 @@ declare const getStaticProps: next.GetStaticProps<{
             variants?: boolean | undefined;
         } | undefined;
     };
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 /**
  * Default implementation of getStaticPaths with routes
  * To configure custom behavior, use:

package/dist/route/index.js

@@ -502,9 +502,9 @@ var withUniformGetServerSideProps2 = (options) => {
     defaultHandleNotFound,
     defaultHandleRedirect,
     parseContext(context) {
-      var _a;
+      var _a, _b;
       return {
-        contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
+        contextualEditingCompositionId: ((_a = context.previewData) == null ? void 0 : _a.isUniformContextualEditing) ? (_b = context.previewData) == null ? void 0 : _b.compositionId : void 0,
         resolvedUrl: context.resolvedUrl,
         // auto engage draft content when in next preview mode
         // (can override with explicit setting of request options)'
@@ -543,12 +543,12 @@ var withUniformGetStaticProps2 = (options) => {
     defaultHandleNotFound,
     defaultHandleRedirect,
     parseContext(context) {
-      var _a, _b;
+      var _a, _b, _c;
       return {
-        contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
+        contextualEditingCompositionId: ((_a = context.previewData) == null ? void 0 : _a.isUniformContextualEditing) ? (_b = context.previewData) == null ? void 0 : _b.compositionId : void 0,
         resolvedUrl: resolveSlugFromParams({
           params: context.params,
-          param: (_b = options == null ? void 0 : options.param) != null ? _b : "route"
+          param: (_c = options == null ? void 0 : options.param) != null ? _c : "route"
         }),
         // auto engage draft content when in next preview mode
         // (can override with explicit setting of request options)

package/dist/route/index.mjs

@@ -229,9 +229,9 @@ var withUniformGetServerSideProps = (options) => {
     defaultHandleNotFound,
     defaultHandleRedirect,
     parseContext(context) {
-      var _a;
+      var _a, _b;
       return {
-        contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
+        contextualEditingCompositionId: ((_a = context.previewData) == null ? void 0 : _a.isUniformContextualEditing) ? (_b = context.previewData) == null ? void 0 : _b.compositionId : void 0,
         resolvedUrl: context.resolvedUrl,
         // auto engage draft content when in next preview mode
         // (can override with explicit setting of request options)'
@@ -270,12 +270,12 @@ var withUniformGetStaticProps = (options) => {
     defaultHandleNotFound,
     defaultHandleRedirect,
     parseContext(context) {
-      var _a, _b;
+      var _a, _b, _c;
       return {
-        contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
+        contextualEditingCompositionId: ((_a = context.previewData) == null ? void 0 : _a.isUniformContextualEditing) ? (_b = context.previewData) == null ? void 0 : _b.compositionId : void 0,
         resolvedUrl: resolveSlugFromParams({
           params: context.params,
-          param: (_b = options == null ? void 0 : options.param) != null ? _b : "route"
+          param: (_c = options == null ? void 0 : options.param) != null ? _c : "route"
         }),
         // auto engage draft content when in next preview mode
         // (can override with explicit setting of request options)

package/dist/slug/index.d.mts

@@ -1,10 +1,10 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { a as UniformPreviewData, c as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models-f9fd03c4.js';
-import * as querystring from 'querystring';
-import { ParsedUrlQuery } from 'querystring';
+import * as node_querystring from 'node:querystring';
 import * as _uniformdev_canvas from '@uniformdev/canvas';
 import { CanvasClient, DataResolutionOption, CompositionGetParameters, CompositionGetResponse } from '@uniformdev/canvas';
+import { ParsedUrlQuery } from 'querystring';
 import '@uniformdev/canvas-react';
 
 declare const withUniformGetServerSideProps: <TProps extends {
@@ -86,11 +86,11 @@ declare const withUniformGetStaticProps: <TProps extends {
 
 declare const getServerSideProps: next.GetServerSideProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 /** Ready to go getStaticProps for dynamic route with 'slug' param for [[...slug]].jsx */
 declare const getStaticProps: next.GetStaticProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 declare const getStaticPaths: () => Promise<{
     paths: string[];
     fallback: boolean;

package/dist/slug/index.d.ts

@@ -1,10 +1,10 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
 import { a as UniformPreviewData, c as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models-f9fd03c4.js';
-import * as querystring from 'querystring';
-import { ParsedUrlQuery } from 'querystring';
+import * as node_querystring from 'node:querystring';
 import * as _uniformdev_canvas from '@uniformdev/canvas';
 import { CanvasClient, DataResolutionOption, CompositionGetParameters, CompositionGetResponse } from '@uniformdev/canvas';
+import { ParsedUrlQuery } from 'querystring';
 import '@uniformdev/canvas-react';
 
 declare const withUniformGetServerSideProps: <TProps extends {
@@ -86,11 +86,11 @@ declare const withUniformGetStaticProps: <TProps extends {
 
 declare const getServerSideProps: next.GetServerSideProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 /** Ready to go getStaticProps for dynamic route with 'slug' param for [[...slug]].jsx */
 declare const getStaticProps: next.GetStaticProps<{
     [key: string]: any;
-}, querystring.ParsedUrlQuery, UniformPreviewData>;
+}, node_querystring.ParsedUrlQuery, UniformPreviewData>;
 declare const getStaticPaths: () => Promise<{
     paths: string[];
     fallback: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "19.56.0",
+  "version": "19.56.1-alpha.22+a6fd2a3df",
   "description": "Next.js SDK for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -16,7 +16,7 @@
     },
     "./slug": {
       "import": {
-        "types": "./dist/index.d.mts",
+        "types": "./dist/slug/index.d.mts",
         "node": "./dist/slug/index.mjs",
         "default": "./dist/slug/index.esm.js"
       },
@@ -24,7 +24,7 @@
     },
     "./project-map": {
       "import": {
-        "types": "./dist/index.d.mts",
+        "types": "./dist/project-map/index.d.mts",
         "node": "./dist/project-map/index.mjs",
         "default": "./dist/project-map/index.esm.js"
       },
@@ -32,7 +32,7 @@
     },
     "./route": {
       "import": {
-        "types": "./dist/index.d.mts",
+        "types": "./dist/route/index.d.mts",
         "node": "./dist/route/index.mjs",
         "default": "./dist/route/index.esm.js"
       },
@@ -67,11 +67,11 @@
     "document": "api-extractor run --local"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.56.0",
-    "@uniformdev/canvas-react": "19.56.0",
-    "@uniformdev/project-map": "19.56.0",
-    "@uniformdev/redirect": "19.56.0",
-    "@uniformdev/richtext": "19.56.0",
+    "@uniformdev/canvas": "19.56.1-alpha.22+a6fd2a3df",
+    "@uniformdev/canvas-react": "19.56.1-alpha.22+a6fd2a3df",
+    "@uniformdev/project-map": "19.56.1-alpha.22+a6fd2a3df",
+    "@uniformdev/redirect": "19.56.1-alpha.22+a6fd2a3df",
+    "@uniformdev/richtext": "19.56.1-alpha.22+a6fd2a3df",
     "colorette": "2.0.20"
   },
   "peerDependencies": {
@@ -91,5 +91,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "56938585920b817df15d278b46cbb3bd56f18790"
+  "gitHead": "a6fd2a3dfdfa76a6610f664a81f3d531f98388f0"
 }