@uniformdev/canvas-next-rsc 19.30.1-alpha.0 → 19.30.1-alpha.5

package/dist/components/resolveRoute.d.ts

@@ -23,3 +23,4 @@ export type ResolveRouteOptions = {
     } | undefined;
 };
 export declare const resolveRoute: (data: ResolveRouteOptions) => Promise<ResolveRouteResult>;
+export declare const resolveRouteByRouteApi: (data: Pick<ResolveRouteOptions, 'path' | 'state' | 'searchParams'>) => Promise<ResolveRouteResult | undefined>;

package/dist/components/resolveRoute.js

@@ -1,55 +1,19 @@
 import { CANVAS_DRAFT_STATE } from '@uniformdev/canvas';
 import { RedirectClient } from '@uniformdev/redirect';
-import { get } from '@vercel/edge-config';
 import { getRouteClient } from '../client/routeClient';
 import { getRouteRevalidateInterval } from '../config/helpers';
-import config from '../config/uniform.server.config';
 import { isOnVercelPreviewEnvironment } from '../utils/draft';
-import { buildPathTag } from '../utils/tag';
 import { getBaseUrl } from '../utils/url';
 export const resolveRoute = async (data) => {
-    const apiPromise = resolveRouteByRouteApi(data);
-    const edgeConfigPromise = resolveRouteByEdgeConfig(data);
-    const first = await Promise.race([apiPromise, edgeConfigPromise]);
-    let result;
-    if (first === null || first === void 0 ? void 0 : first.value) {
-        result = first.value;
-    }
-    else if ((first === null || first === void 0 ? void 0 : first.source) === 'edgeConfig') {
-        const apiResult = await apiPromise;
-        result = apiResult === null || apiResult === void 0 ? void 0 : apiResult.value;
-    }
-    else if ((first === null || first === void 0 ? void 0 : first.source) === 'routeApi') {
-        const edgeConfigResult = await edgeConfigPromise;
-        result = edgeConfigResult === null || edgeConfigResult === void 0 ? void 0 : edgeConfigResult.value;
-    }
-    if (result) {
-        const processed = processRouteResponse(data.path, result);
-        if (processed) {
-            return processed;
-        }
+    const routeResult = await resolveRouteByRouteApi(data);
+    if (routeResult) {
+        return routeResult;
     }
     return {
         type: 'notFound',
     };
 };
-const resolveRouteByEdgeConfig = async (data) => {
-    var _a;
-    if (!((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) || !process.env.EDGE_CONFIG) {
-        return undefined;
-    }
-    const soucrcePathKey = buildPathTag(data.path);
-    const key = soucrcePathKey.replace(/\W+/g, '');
-    const edgeConfig = await get(key);
-    if (!edgeConfig) {
-        return undefined;
-    }
-    return {
-        source: 'edgeConfig',
-        value: edgeConfig,
-    };
-};
-const resolveRouteByRouteApi = async (data) => {
+export const resolveRouteByRouteApi = async (data) => {
     const routeClient = getRouteClient({
         revalidate: getRouteRevalidateInterval({
             searchParams: data.searchParams,
@@ -61,12 +25,6 @@ const resolveRouteByRouteApi = async (data) => {
         withComponentIDs: data.state === CANVAS_DRAFT_STATE,
         withContentSourceMap: isOnVercelPreviewEnvironment(),
     });
-    return {
-        source: 'routeApi',
-        value: routeResult,
-    };
-};
-const processRouteResponse = (path, routeResult) => {
     if (routeResult.type === 'notFound') {
         return {
             type: 'notFound',
@@ -81,7 +39,7 @@ const processRouteResponse = (path, routeResult) => {
     else if (routeResult.type === 'redirect') {
         let href;
         if (routeResult.redirect.targetProjectMapNodeId) {
-            const requestUrl = `${getBaseUrl()}${path}`;
+            const requestUrl = `${getBaseUrl()}${data.path}`;
             const expandedUrl = RedirectClient.getTargetVariableExpandedUrl(requestUrl, routeResult.redirect);
             const url = new URL(expandedUrl);
             href = url.pathname;
@@ -98,9 +56,4 @@ const processRouteResponse = (path, routeResult) => {
             },
         };
     }
-    else {
-        return {
-            type: 'notFound',
-        };
-    }
 };

package/dist/config/models.d.ts

@@ -23,15 +23,4 @@ export type UniformServerConfig = {
      * @default 10
      */
     canvasRevalidateInterval?: number;
-    /**
-     * 😅
-     */
-    experimental?: {
-        /**
-         * Enables edge cache of redirects.
-         *
-         * @default false
-         */
-        edgeRedirects?: boolean;
-    };
 };

package/dist/handler/helpers.d.ts

@@ -5,13 +5,9 @@ export declare const isSvixMessage: (request: Request) => Promise<{
 export declare const processCompositionChange: (compositionId: string) => Promise<{
     tags: string[];
 }>;
-export declare const getPathName: (url: string) => string;
 export declare const processRedirectChange: (sourceUrl: string) => Promise<{
     tags: string[];
 }>;
-export declare const processEdgeConfigChange: ({ source_url }: {
-    source_url: string;
-}) => Promise<void>;
 export type MessageHandlerResponse = {
     tags: string[];
 };

package/dist/handler/helpers.js

@@ -1,6 +1,5 @@
 import { Webhook } from 'svix';
 import { getProjectMapClient } from '../client/projectMapClient';
-import { getRouteClient } from '../client/routeClient';
 import { buildPathTag } from '../utils/tag';
 export const isSvixMessage = async (request) => {
     const requiredHeaders = ['svix-id', 'svix-timestamp', 'svix-signature'];
@@ -46,59 +45,16 @@ export const processCompositionChange = async (compositionId) => {
         tags,
     };
 };
-export const getPathName = (url) => {
+export const processRedirectChange = async (sourceUrl) => {
+    const tags = [];
     try {
-        const { pathname } = new URL(url);
-        return pathname;
+        const url = new URL(sourceUrl);
+        tags.push(buildPathTag(url.pathname));
     }
-    catch (_a) {
-        return url;
+    catch (e) {
+        tags.push(buildPathTag(sourceUrl));
     }
-};
-export const processRedirectChange = async (sourceUrl) => {
-    const tags = [];
-    const pathName = getPathName(sourceUrl);
-    tags.push(buildPathTag(pathName));
     return {
         tags,
     };
 };
-export const processEdgeConfigChange = async ({ source_url }) => {
-    if (!process.env.UNIFORM_VERCEL_EDGE_CONFIG_TOKEN) {
-        // eslint-disable-next-line no-console
-        console.warn('UNIFORM_VERCEL_EDGE_CONFIG_TOKEN is not set, skipping edge redirect upsert');
-        return;
-    }
-    const routeClient = getRouteClient({
-        revalidate: -1,
-    });
-    const route = await routeClient.getRoute({
-        path: source_url,
-    });
-    let valueToStore = undefined;
-    if (route.type === 'redirect') {
-        valueToStore = route;
-    }
-    const sourcePath = getPathName(source_url);
-    const soucrcePathKey = buildPathTag(sourcePath);
-    const response = await fetch(`https://api.vercel.com/v1/edge-config/${process.env.UNIFORM_EDGE_CONFIG_ID}/items?teamId=${process.env.UNIFORM_EDGE_CONFIG_TEAM_ID}`, {
-        method: 'PATCH',
-        headers: {
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${process.env.UNIFORM_VERCEL_EDGE_CONFIG_TOKEN}`,
-        },
-        body: JSON.stringify({
-            items: [
-                {
-                    operation: valueToStore ? 'upsert' : 'delete',
-                    key: soucrcePathKey.replace(/\W+/g, ''),
-                    value: valueToStore !== null && valueToStore !== void 0 ? valueToStore : null,
-                },
-            ],
-        }),
-    });
-    if (!response.ok) {
-        // eslint-disable-next-line no-console
-        console.warn(`Failed to upsert edge redirect for ${source_url}`, await response.text());
-    }
-};

package/dist/handler/messages/handleRedirectDelete.js

@@ -1,14 +1,9 @@
 import { RedirectDeleteDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
-import { processEdgeConfigChange, processRedirectChange } from '../helpers';
+import { processRedirectChange } from '../helpers';
 export const handleRedirectDelete = async (body) => {
-    var _a;
     const parsed = RedirectDeleteDefinition.schema.safeParse(body);
     if (!parsed.success) {
         return undefined;
     }
-    if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) {
-        await processEdgeConfigChange(parsed.data);
-    }
     return processRedirectChange(parsed.data.source_url);
 };

package/dist/handler/messages/handleRedirectInsert.js

@@ -1,14 +1,9 @@
 import { RedirectInsertDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
-import { processEdgeConfigChange, processRedirectChange } from '../helpers';
+import { processRedirectChange } from '../helpers';
 export const handleRedirectInsert = async (body) => {
-    var _a;
     const parsed = RedirectInsertDefinition.schema.safeParse(body);
     if (!parsed.success) {
         return undefined;
     }
-    if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) {
-        await processEdgeConfigChange(parsed.data);
-    }
     return processRedirectChange(parsed.data.source_url);
 };

package/dist/handler/messages/handleRedirectUpdate.js

@@ -1,14 +1,9 @@
 import { RedirectUpdateDefinition } from '@uniformdev/webhooks';
-import config from '../../config/uniform.server.config';
-import { processEdgeConfigChange, processRedirectChange } from '../helpers';
+import { processRedirectChange } from '../helpers';
 export const handleRedirectUpdate = async (body) => {
-    var _a;
     const parsed = RedirectUpdateDefinition.schema.safeParse(body);
     if (!parsed.success) {
         return undefined;
     }
-    if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeRedirects) {
-        await processEdgeConfigChange(parsed.data);
-    }
     return processRedirectChange(parsed.data.source_url);
 };

package/dist/utils/tag.js

@@ -1,3 +1,4 @@
 export const buildPathTag = (path) => {
-    return `path:${path}`;
+    const actualPath = path.startsWith('/') ? path : `/${path}`;
+    return `path:${actualPath}`;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.30.1-alpha.0+fa7b5018a",
+  "version": "19.30.1-alpha.5+2a53a5820",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "dev": "pnpm build --watch",
@@ -56,12 +56,12 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@uniformdev/canvas": "^19.30.1-alpha.0+fa7b5018a",
-    "@uniformdev/canvas-react": "^19.30.1-alpha.0+fa7b5018a",
-    "@uniformdev/context": "^19.30.1-alpha.0+fa7b5018a",
-    "@uniformdev/project-map": "^19.30.1-alpha.0+fa7b5018a",
-    "@uniformdev/redirect": "^19.30.1-alpha.0+fa7b5018a",
-    "@uniformdev/webhooks": "^19.30.1-alpha.0+fa7b5018a",
+    "@uniformdev/canvas": "^19.30.1-alpha.5+2a53a5820",
+    "@uniformdev/canvas-react": "^19.30.1-alpha.5+2a53a5820",
+    "@uniformdev/context": "^19.30.1-alpha.5+2a53a5820",
+    "@uniformdev/project-map": "^19.30.1-alpha.5+2a53a5820",
+    "@uniformdev/redirect": "^19.30.1-alpha.5+2a53a5820",
+    "@uniformdev/webhooks": "^19.30.1-alpha.5+2a53a5820",
     "@vercel/edge-config": "^0.1.5",
     "dequal": "^2.0.3",
     "js-cookie": "^3.0.5",
@@ -75,5 +75,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fa7b5018a6723a15f1932d306a1e674e4a8baf5d"
+  "gitHead": "2a53a5820c0343ca6bc8d883ed6737717afba488"
 }