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

package/dist/index.mjs

@@ -299,7 +299,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);
@@ -394,6 +394,7 @@ import {
   CANVAS_ENRICHMENT_TAG_PARAM,
   CANVAS_PERSONALIZE_TYPE,
   CANVAS_TEST_TYPE,
+  isComponentPlaceholderId,
   walkNodeTree
 } from "@uniformdev/canvas";
 import { ClientContextualEditingComponentWrapper, TestClient } from "@uniformdev/canvas-next-rsc-client";
@@ -442,11 +443,7 @@ import {
 } from "@uniformdev/canvas";
 import { getBaseUrl, getServerConfig as getServerConfig2, resolvePath } from "@uniformdev/canvas-next-rsc-shared";
 import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
-var retrieveRoute = async ({
-  params,
-  searchParams,
-  skipPrefetch
-}) => {
+var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
   if (!skipPrefetch) {
     void getManifest({
       searchParams
@@ -466,7 +463,8 @@ var retrieveRoute = async ({
         result = await retrieveRouteByPath({
           path: value,
           state,
-          searchParams
+          searchParams,
+          fetchOptions
         });
       } catch (e) {
         console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -500,30 +498,39 @@ var retrieveRoute = async ({
 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;
 };
 var determineState = ({ searchParams }) => {
   const draftMode2 = isDraftModeEnabled({ searchParams });
@@ -564,38 +571,50 @@ var PersonalizeClientWrapper = (props) => {
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
 import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import { createElement, Fragment } from "react";
+
+// src/components/ContextPersonalizationTransfer.tsx
+import { ClientContextPersonalizationTransfer } from "@uniformdev/canvas-next-rsc-client";
+import React4 from "react";
+var ContextPersonalizationTransfer = ({ event }) => {
+  return /* @__PURE__ */ React4.createElement(ClientContextPersonalizationTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+};
+
+// src/components/PersonalizeServer.ts
 var PersonalizeServer = (props) => {
   var _a;
-  const { indexes } = runPersonalization2(props);
+  const { indexes, event } = runPersonalization2(props);
   const slot = (_a = props.slots) == null ? void 0 : _a[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
     return component;
   });
-  return createElement(Fragment, void 0, components);
+  const eventElement = createElement(ContextPersonalizationTransfer, {
+    event
+  });
+  return createElement(Fragment, void 0, [...components, eventElement]);
 };
 
 // src/components/TestServer.ts
-import { CANVAS_TEST_SLOT, CANVAS_TEST_VARIANT_PARAM } from "@uniformdev/canvas";
+import { CANVAS_TEST_SLOT } from "@uniformdev/canvas";
+import { runTest } from "@uniformdev/canvas-next-rsc-shared";
 import { createElement as createElement2, Fragment as Fragment2 } from "react";
-var TestServer = ({ test, component, contextInstance, slots }) => {
+
+// src/components/ContextTestTransfer.tsx
+import { ClientContextTestTransfer } from "@uniformdev/canvas-next-rsc-client";
+import React5 from "react";
+var ContextTestTransfer = ({ event }) => {
+  return /* @__PURE__ */ React5.createElement(ClientContextTestTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+};
+
+// src/components/TestServer.ts
+var TestServer = (props) => {
   var _a, _b, _c;
-  const slot = ((_a = component.slots) == null ? void 0 : _a[CANVAS_TEST_SLOT]) || [];
-  const { result } = contextInstance.test({
-    name: test,
-    variations: slot.map((v, i) => {
-      var _a2, _b2, _c2;
-      const contextTag = (_b2 = (_a2 = v.parameters) == null ? void 0 : _a2[CANVAS_TEST_VARIANT_PARAM]) == null ? void 0 : _b2.value;
-      const id = (_c2 = contextTag == null ? void 0 : contextTag.id) != null ? _c2 : "testId" in v ? v.testId : `ab-${i}-${v.type}`;
-      return {
-        id,
-        testDistribution: contextTag == null ? void 0 : contextTag.testDistribution,
-        index: i
-      };
-    })
+  const { index, event } = runTest(props);
+  const component = typeof index === "number" ? (_c = (_b = (_a = props.slots) == null ? void 0 : _a[CANVAS_TEST_SLOT]) == null ? void 0 : _b.items[index]) != null ? _c : null : null;
+  const eventElement = createElement2(ContextTestTransfer, {
+    event
   });
-  const components = result ? (_c = (_b = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _b.items[result.index]) != null ? _c : null : null;
-  return createElement2(Fragment2, void 0, components);
+  return createElement2(Fragment2, void 0, [component, eventElement]);
 };
 
 // src/components/UniformComposition.ts
@@ -814,7 +833,9 @@ var resolveComponents = ({
       component,
       slots,
       contextInstance: isServer || includeContext ? serverContext : void 0,
-      context: compositionContext
+      context: compositionContext,
+      slotName,
+      slotIndex: isRoot ? void 0 : componentIndex
     };
     const element = createElement3(resolvedComponent, componentProps);
     let tagElement = null;
@@ -833,11 +854,12 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
+      const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
       childNode = createElement3(
         PureContextualEditingComponentWrapper,
         {
           key: `${slotName}-${componentIndex}-wrapper`,
-          isPlaceholder: false,
+          isPlaceholder,
           parentComponent: parent,
           component,
           slotName,
@@ -891,7 +913,7 @@ import {
 } from "@uniformdev/canvas-next-rsc-client";
 import { getServerConfig as getServerConfig4 } from "@uniformdev/canvas-next-rsc-shared";
 import { Suspense } from "react";
-import React4 from "react";
+import React6 from "react";
 var UniformContext = async ({
   clientContextComponent,
   children
@@ -902,16 +924,16 @@ var UniformContext = async ({
   });
   const ContextComponent = clientContextComponent || DefaultUniformClientContext;
   const disableDevTools = ((_a = getServerConfig4().context) == null ? void 0 : _a.disableDevTools) || false;
-  return /* @__PURE__ */ React4.createElement(React4.Fragment, null, children, /* @__PURE__ */ React4.createElement(ContextComponent, { manifest, disableDevTools }), /* @__PURE__ */ React4.createElement(Suspense, { fallback: /* @__PURE__ */ React4.createElement(React4.Fragment, null) }, /* @__PURE__ */ React4.createElement(UniformScript, null)));
+  return /* @__PURE__ */ React6.createElement(React6.Fragment, null, children, /* @__PURE__ */ React6.createElement(ContextComponent, { manifest, disableDevTools }), /* @__PURE__ */ React6.createElement(Suspense, { fallback: /* @__PURE__ */ React6.createElement(React6.Fragment, null) }, /* @__PURE__ */ React6.createElement(UniformScript, null)));
 };
 
 // src/components/UniformPlayground.tsx
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, CANVAS_EDITOR_STATE as CANVAS_EDITOR_STATE3 } from "@uniformdev/canvas";
 import { notFound as notFound2 } from "next/navigation";
-import React5 from "react";
+import React7 from "react";
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!isDraftModeEnabled({ searchParams })) {
-    return /* @__PURE__ */ React5.createElement("div", null, /* @__PURE__ */ React5.createElement("h1", null, "Playground is only available in draft mode"));
+    return /* @__PURE__ */ React7.createElement("div", null, /* @__PURE__ */ React7.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = searchParams["id"];
   if (!id) {
@@ -942,7 +964,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     notFound2();
   }
-  return /* @__PURE__ */ React5.createElement(
+  return /* @__PURE__ */ React7.createElement(
     UniformComposition,
     {
       mode: "server",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.79.1-alpha.11+4547ef846",
+  "version": "19.79.1-alpha.8+5ba1ad1ca",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -54,22 +54,22 @@
   ],
   "devDependencies": {
     "@types/node": "^18.0.0",
-    "@types/react": "^18.2.20",
-    "eslint": "^8.11.0",
+    "@types/react": "18.2.40",
+    "eslint": "8.54.0",
     "next": "^13.4.12",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.79.1-alpha.11+4547ef846",
-    "@uniformdev/canvas-next-rsc-client": "^19.79.1-alpha.11+4547ef846",
-    "@uniformdev/canvas-next-rsc-shared": "^19.79.1-alpha.11+4547ef846",
-    "@uniformdev/canvas-react": "19.79.1-alpha.11+4547ef846",
-    "@uniformdev/context": "19.79.1-alpha.11+4547ef846",
-    "@uniformdev/project-map": "19.79.1-alpha.11+4547ef846",
-    "@uniformdev/redirect": "19.79.1-alpha.11+4547ef846",
-    "@uniformdev/richtext": "19.79.1-alpha.11+4547ef846",
-    "@uniformdev/webhooks": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/canvas": "19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/canvas-next-rsc-client": "^19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/canvas-next-rsc-shared": "^19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/canvas-react": "19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/context": "19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/project-map": "19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/redirect": "19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/richtext": "19.79.1-alpha.8+5ba1ad1ca",
+    "@uniformdev/webhooks": "19.79.1-alpha.8+5ba1ad1ca",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4547ef8469f21f7f2341bcd87203372c4646bc08"
+  "gitHead": "5ba1ad1ca42f7a035f32e8bb6f51bd1e955f0792"
 }