@uniformdev/canvas-next-rsc 20.6.2-alpha.11 → 20.7.1-alpha.4

package/dist/index.esm.js

@@ -529,10 +529,17 @@ var retrieveRoute = async ({ params, searchParams: providedSearchParams, skipPre
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const releaseId = determineReleaseId({
+    const releaseIdFromSearchParams = determineReleaseId({
       searchParams,
       state
     });
+    const releaseIdFromFetchOptions = fetchOptions == null ? void 0 : fetchOptions.releaseId;
+    if (releaseIdFromSearchParams && releaseIdFromFetchOptions && releaseIdFromSearchParams !== releaseIdFromFetchOptions) {
+      console.warn(
+        "retrieveRoute: releaseId provided in both searchParams and fetchOptions, using fetchOptions"
+      );
+    }
+    const releaseId = releaseIdFromFetchOptions != null ? releaseIdFromFetchOptions : releaseIdFromSearchParams;
     try {
       result = await retrieveRouteByPath({
         path: value,
@@ -631,24 +638,19 @@ var ContextUpdateTrigger = ({ path }) => {
 
 // src/components/PersonalizeClientWrapper.tsx
 import { PersonalizeClient } from "@uniformdev/canvas-next-rsc-client";
+import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import React3 from "react";
 var PersonalizeClientWrapper = (props) => {
-  return /* @__PURE__ */ React3.createElement(
-    PersonalizeClient,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes: []
-    }
-  );
+  const { indexes } = runPersonalization({
+    ...props,
+    contextInstance: void 0
+  });
+  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes });
 };
 
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
-import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
@@ -665,7 +667,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     noStore();
   }
-  const { indexes, event } = runPersonalization(props);
+  const { indexes, event } = runPersonalization2(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -680,10 +682,10 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization3 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
 var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization2(props);
+  const { indexes } = runPersonalization3(props);
   return /* @__PURE__ */ React5.createElement(
     PersonalizeClient2,
     {
@@ -691,7 +693,6 @@ var PersonalizeServerHybrid = (props) => {
       count: props.count,
       slots: props.slots,
       trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
       indexes
     }
   );

package/dist/index.js

@@ -457,7 +457,7 @@ async function generateStaticParams() {
 // src/components/UniformComposition.ts
 var import_canvas8 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_client8 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared7 = require("@uniformdev/canvas-next-rsc-shared");
 var import_core = require("@uniformdev/canvas-react/core");
 var import_headers3 = require("next/headers");
 var import_navigation = require("next/navigation");
@@ -557,10 +557,17 @@ var retrieveRoute = async ({ params, searchParams: providedSearchParams, skipPre
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const releaseId = determineReleaseId({
+    const releaseIdFromSearchParams = determineReleaseId({
       searchParams,
       state
     });
+    const releaseIdFromFetchOptions = fetchOptions == null ? void 0 : fetchOptions.releaseId;
+    if (releaseIdFromSearchParams && releaseIdFromFetchOptions && releaseIdFromSearchParams !== releaseIdFromFetchOptions) {
+      console.warn(
+        "retrieveRoute: releaseId provided in both searchParams and fetchOptions, using fetchOptions"
+      );
+    }
+    const releaseId = releaseIdFromFetchOptions != null ? releaseIdFromFetchOptions : releaseIdFromSearchParams;
     try {
       result = await retrieveRouteByPath({
         path: value,
@@ -659,24 +666,19 @@ var ContextUpdateTrigger = ({ path }) => {
 
 // src/components/PersonalizeClientWrapper.tsx
 var import_canvas_next_rsc_client3 = require("@uniformdev/canvas-next-rsc-client");
+var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
 var import_react3 = __toESM(require("react"));
 var PersonalizeClientWrapper = (props) => {
-  return /* @__PURE__ */ import_react3.default.createElement(
-    import_canvas_next_rsc_client3.PersonalizeClient,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes: []
-    }
-  );
+  const { indexes } = (0, import_canvas_next_rsc_shared3.runPersonalization)({
+    ...props,
+    contextInstance: void 0
+  });
+  return /* @__PURE__ */ import_react3.default.createElement(import_canvas_next_rsc_client3.PersonalizeClient, { ...props, indexes });
 };
 
 // src/components/PersonalizeServer.ts
 var import_canvas5 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
 var import_cache = require("next/cache");
 var import_react5 = require("react");
 
@@ -693,7 +695,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     (0, import_cache.unstable_noStore)();
   }
-  const { indexes, event } = (0, import_canvas_next_rsc_shared3.runPersonalization)(props);
+  const { indexes, event } = (0, import_canvas_next_rsc_shared4.runPersonalization)(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[import_canvas5.CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -708,10 +710,10 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 var import_canvas_next_rsc_client5 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
 var import_react6 = __toESM(require("react"));
 var PersonalizeServerHybrid = (props) => {
-  const { indexes } = (0, import_canvas_next_rsc_shared4.runPersonalization)(props);
+  const { indexes } = (0, import_canvas_next_rsc_shared5.runPersonalization)(props);
   return /* @__PURE__ */ import_react6.default.createElement(
     import_canvas_next_rsc_client5.PersonalizeClient,
     {
@@ -719,7 +721,6 @@ var PersonalizeServerHybrid = (props) => {
       count: props.count,
       slots: props.slots,
       trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
       indexes
     }
   );
@@ -727,7 +728,7 @@ var PersonalizeServerHybrid = (props) => {
 
 // src/components/TestServer.ts
 var import_canvas6 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
 var import_cache2 = require("next/cache");
 var import_react8 = require("react");
 
@@ -744,7 +745,7 @@ var TestServer = async (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.testSuspense) {
     (0, import_cache2.unstable_noStore)();
   }
-  const { index, event } = (0, import_canvas_next_rsc_shared5.runTest)(props);
+  const { index, event } = (0, import_canvas_next_rsc_shared6.runTest)(props);
   if (index === null || event === null) {
     return null;
   }
@@ -791,7 +792,7 @@ var UniformComposition = async ({
     });
   }
   const awaitedParams = await props.params;
-  const { value: path } = (0, import_canvas_next_rsc_shared6.resolvePath)({
+  const { value: path } = (0, import_canvas_next_rsc_shared7.resolvePath)({
     params: awaitedParams
   });
   if (!route || route.type === "notFound") {

package/dist/index.mjs

@@ -529,10 +529,17 @@ var retrieveRoute = async ({ params, searchParams: providedSearchParams, skipPre
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const releaseId = determineReleaseId({
+    const releaseIdFromSearchParams = determineReleaseId({
       searchParams,
       state
     });
+    const releaseIdFromFetchOptions = fetchOptions == null ? void 0 : fetchOptions.releaseId;
+    if (releaseIdFromSearchParams && releaseIdFromFetchOptions && releaseIdFromSearchParams !== releaseIdFromFetchOptions) {
+      console.warn(
+        "retrieveRoute: releaseId provided in both searchParams and fetchOptions, using fetchOptions"
+      );
+    }
+    const releaseId = releaseIdFromFetchOptions != null ? releaseIdFromFetchOptions : releaseIdFromSearchParams;
     try {
       result = await retrieveRouteByPath({
         path: value,
@@ -631,24 +638,19 @@ var ContextUpdateTrigger = ({ path }) => {
 
 // src/components/PersonalizeClientWrapper.tsx
 import { PersonalizeClient } from "@uniformdev/canvas-next-rsc-client";
+import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import React3 from "react";
 var PersonalizeClientWrapper = (props) => {
-  return /* @__PURE__ */ React3.createElement(
-    PersonalizeClient,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes: []
-    }
-  );
+  const { indexes } = runPersonalization({
+    ...props,
+    contextInstance: void 0
+  });
+  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes });
 };
 
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
-import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
@@ -665,7 +667,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     noStore();
   }
-  const { indexes, event } = runPersonalization(props);
+  const { indexes, event } = runPersonalization2(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -680,10 +682,10 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization3 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
 var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization2(props);
+  const { indexes } = runPersonalization3(props);
   return /* @__PURE__ */ React5.createElement(
     PersonalizeClient2,
     {
@@ -691,7 +693,6 @@ var PersonalizeServerHybrid = (props) => {
       count: props.count,
       slots: props.slots,
       trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
       indexes
     }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "20.6.2-alpha.11+af78064791",
+  "version": "20.7.1-alpha.4+20185a97ff",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -61,15 +61,15 @@
     "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.6.2-alpha.11+af78064791",
-    "@uniformdev/canvas-next-rsc-client": "^20.6.2-alpha.11+af78064791",
-    "@uniformdev/canvas-next-rsc-shared": "^20.6.2-alpha.11+af78064791",
-    "@uniformdev/canvas-react": "20.6.2-alpha.11+af78064791",
-    "@uniformdev/context": "20.6.2-alpha.11+af78064791",
-    "@uniformdev/project-map": "20.6.2-alpha.11+af78064791",
-    "@uniformdev/redirect": "20.6.2-alpha.11+af78064791",
-    "@uniformdev/richtext": "20.6.2-alpha.11+af78064791",
-    "@uniformdev/webhooks": "20.6.2-alpha.11+af78064791",
+    "@uniformdev/canvas": "20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/canvas-next-rsc-client": "^20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/canvas-next-rsc-shared": "^20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/canvas-react": "20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/context": "20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/project-map": "20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/redirect": "20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/richtext": "20.7.1-alpha.4+20185a97ff",
+    "@uniformdev/webhooks": "20.7.1-alpha.4+20185a97ff",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "af78064791c47044f8ba447bbe1221f672f6de3e"
+  "gitHead": "20185a97ff6c2de2f871223af12d73583fe300af"
 }