@uniformdev/canvas-next 19.8.0 → 19.10.0

package/dist/route/index.d.ts

@@ -3,7 +3,7 @@ import { GetServerSidePropsContext, PreviewData, GetServerSidePropsResult, GetSe
 import { c as UniformGetServerSideProps, a as UniformPreviewData } from '../models-092c0912.js';
 import * as querystring from 'querystring';
 import { ParsedUrlQuery } from 'querystring';
-import { RouteGetResponseEdgehancedComposition, unstable_RouteClient, RouteGetParameters, RootComponentInstance, RouteGetResponseRedirect, RouteGetResponseNotFound, CompositionIssue } from '@uniformdev/canvas';
+import { RouteGetResponseEdgehancedComposition, RouteGetResponseRedirect, unstable_RouteClient, RouteGetParameters, RootComponentInstance, RouteGetResponseNotFound, CompositionIssue } from '@uniformdev/canvas';
 import { ForegroundColorName } from 'chalk';
 import '@uniformdev/canvas-react';
 
@@ -124,6 +124,13 @@ declare function defaultHandleComposition(matched: RouteGetResponseEdgehancedCom
     } | undefined;
 };
 
+declare function defaultHandleRedirect(matched: RouteGetResponseRedirect, requestUrl: string): {
+    redirect: {
+        destination: string;
+        statusCode: number;
+    };
+};
+
 /**
  * Creates an implementation of `getServerSideProps` using the Uniform Route API.
  * Static and dynamic routing as well as redirection is automatically supported.
@@ -153,7 +160,7 @@ declare const unstable_withUniformGetServerSideProps: <TProps extends {
     /** Override handling of a composition route response. Return null to signal not found. */
     handleComposition?: ((composition: RouteGetResponseEdgehancedComposition, context: GetServerSidePropsContext<ParsedUrlQuery, UniformPreviewData>, defaultHandler: typeof defaultHandleComposition) => RootComponentInstance | null) | undefined;
     /** Override default handling of a redirect route response */
-    handleRedirect?: ((redirect: RouteGetResponseRedirect, context: GetServerSidePropsContext<ParsedUrlQuery, UniformPreviewData>) => GetServerSidePropsResult<never>) | undefined;
+    handleRedirect?: ((redirect: RouteGetResponseRedirect, requestUrl: string, context: GetServerSidePropsContext<ParsedUrlQuery, UniformPreviewData>, defaultHandler: typeof defaultHandleRedirect) => GetServerSidePropsResult<never>) | undefined;
     /**
      * Override default handling of a not found route response
      * NOTE: not called when the API returns a 404 error (project map not found), only when the route result is not found

package/dist/route/index.js

@@ -133,14 +133,23 @@ function defaultHandleComposition(matched) {
   return matched.compositionApiResponse.composition;
 }
 
+// src/route/defaultHandleRedirect.ts
+var import_redirect = require("@uniformdev/redirect");
+function defaultHandleRedirect(matched, requestUrl) {
+  return {
+    redirect: {
+      destination: import_redirect.RedirectClient.getTargetVariableExpandedUrl(requestUrl, matched.redirect),
+      statusCode: matched.redirect.targetStatusCode
+    }
+  };
+}
+
 // src/route/withUniformGetServerSideProps.ts
 var unstable_withUniformGetServerSideProps = (options) => {
   var _a, _b, _c, _d;
-  const handleRedirect = (_a = options == null ? void 0 : options.handleRedirect) != null ? _a : () => {
-    throw new Error(`Redirects are not yet implemented by default. Please override handleRedirect option.`);
-  };
-  const handleNotFound = (_b = options == null ? void 0 : options.handleNotFound) != null ? _b : () => ({ notFound: true });
-  const handleComposition = (_c = options == null ? void 0 : options.handleComposition) != null ? _c : defaultHandleComposition;
+  const handleNotFound = (_a = options == null ? void 0 : options.handleNotFound) != null ? _a : () => ({ notFound: true });
+  const handleComposition = (_b = options == null ? void 0 : options.handleComposition) != null ? _b : defaultHandleComposition;
+  const handleRedirect = (_c = options == null ? void 0 : options.handleRedirect) != null ? _c : defaultHandleRedirect;
   const handleModifyPath = (_d = options == null ? void 0 : options.modifyPath) != null ? _d : (path) => decodeURI(path);
   return async function wrappedGetServerSideProps(context) {
     var _a2, _b2;
@@ -165,7 +174,7 @@ var unstable_withUniformGetServerSideProps = (options) => {
           path: nodePath
         });
         if (response.type === "redirect") {
-          return handleRedirect(response, context);
+          return handleRedirect(response, nodePath, context, defaultHandleRedirect);
         }
         if (response.type === "notFound") {
           return handleNotFound(response, context);

package/dist/route/index.mjs

@@ -99,14 +99,23 @@ function defaultHandleComposition(matched) {
   return matched.compositionApiResponse.composition;
 }
 
+// src/route/defaultHandleRedirect.ts
+import { RedirectClient } from "@uniformdev/redirect";
+function defaultHandleRedirect(matched, requestUrl) {
+  return {
+    redirect: {
+      destination: RedirectClient.getTargetVariableExpandedUrl(requestUrl, matched.redirect),
+      statusCode: matched.redirect.targetStatusCode
+    }
+  };
+}
+
 // src/route/withUniformGetServerSideProps.ts
 var unstable_withUniformGetServerSideProps = (options) => {
   var _a, _b, _c, _d;
-  const handleRedirect = (_a = options == null ? void 0 : options.handleRedirect) != null ? _a : () => {
-    throw new Error(`Redirects are not yet implemented by default. Please override handleRedirect option.`);
-  };
-  const handleNotFound = (_b = options == null ? void 0 : options.handleNotFound) != null ? _b : () => ({ notFound: true });
-  const handleComposition = (_c = options == null ? void 0 : options.handleComposition) != null ? _c : defaultHandleComposition;
+  const handleNotFound = (_a = options == null ? void 0 : options.handleNotFound) != null ? _a : () => ({ notFound: true });
+  const handleComposition = (_b = options == null ? void 0 : options.handleComposition) != null ? _b : defaultHandleComposition;
+  const handleRedirect = (_c = options == null ? void 0 : options.handleRedirect) != null ? _c : defaultHandleRedirect;
   const handleModifyPath = (_d = options == null ? void 0 : options.modifyPath) != null ? _d : (path) => decodeURI(path);
   return async function wrappedGetServerSideProps(context) {
     var _a2, _b2;
@@ -131,7 +140,7 @@ var unstable_withUniformGetServerSideProps = (options) => {
           path: nodePath
         });
         if (response.type === "redirect") {
-          return handleRedirect(response, context);
+          return handleRedirect(response, nodePath, context, defaultHandleRedirect);
         }
         if (response.type === "notFound") {
           return handleNotFound(response, context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "19.8.0",
+  "version": "19.10.0",
   "description": "Next.js SDK for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -63,9 +63,10 @@
     "document": "api-extractor run --local"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.8.0",
-    "@uniformdev/canvas-react": "19.8.0",
-    "@uniformdev/project-map": "19.8.0",
+    "@uniformdev/canvas": "19.10.0",
+    "@uniformdev/canvas-react": "19.10.0",
+    "@uniformdev/project-map": "19.10.0",
+    "@uniformdev/redirect": "19.10.0",
     "chalk": "^5.2.0"
   },
   "peerDependencies": {
@@ -74,7 +75,7 @@
     "react-dom": ">=16"
   },
   "devDependencies": {
-    "@types/react": "18.2.5",
+    "@types/react": "18.2.6",
     "next": "13.3.4",
     "react": "18.2.0",
     "react-dom": "18.2.0"
@@ -85,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "70eb9277bbfaee5f9245e1b26b4e77caede22944"
+  "gitHead": "149f942da715ed802545850283f9b99291829a04"
 }