@uniformdev/canvas-next-rsc 20.8.1 → 20.8.2-alpha.21

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,19 +638,24 @@ 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) => {
-  const { indexes } = runPersonalization({
-    ...props,
-    contextInstance: void 0
-  });
-  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes });
+  return /* @__PURE__ */ React3.createElement(
+    PersonalizeClient,
+    {
+      component: props.component,
+      count: props.count,
+      slots: props.slots,
+      trackingEventName: props.trackingEventName,
+      algorithm: props.algorithm,
+      indexes: []
+    }
+  );
 };
 
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
-import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
@@ -660,7 +672,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     noStore();
   }
-  const { indexes, event } = runPersonalization2(props);
+  const { indexes, event } = runPersonalization(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -675,10 +687,10 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization as runPersonalization3 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
 var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization3(props);
+  const { indexes } = runPersonalization2(props);
   return /* @__PURE__ */ React5.createElement(
     PersonalizeClient2,
     {
@@ -686,6 +698,7 @@ 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_shared7 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared6 = 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,19 +666,24 @@ 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) => {
-  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 });
+  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: []
+    }
+  );
 };
 
 // src/components/PersonalizeServer.ts
 var import_canvas5 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
 var import_cache = require("next/cache");
 var import_react5 = require("react");
 
@@ -688,7 +700,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_shared4.runPersonalization)(props);
+  const { indexes, event } = (0, import_canvas_next_rsc_shared3.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];
@@ -703,10 +715,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_shared5 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
 var import_react6 = __toESM(require("react"));
 var PersonalizeServerHybrid = (props) => {
-  const { indexes } = (0, import_canvas_next_rsc_shared5.runPersonalization)(props);
+  const { indexes } = (0, import_canvas_next_rsc_shared4.runPersonalization)(props);
   return /* @__PURE__ */ import_react6.default.createElement(
     import_canvas_next_rsc_client5.PersonalizeClient,
     {
@@ -714,6 +726,7 @@ var PersonalizeServerHybrid = (props) => {
       count: props.count,
       slots: props.slots,
       trackingEventName: props.trackingEventName,
+      algorithm: props.algorithm,
       indexes
     }
   );
@@ -721,7 +734,7 @@ var PersonalizeServerHybrid = (props) => {
 
 // src/components/TestServer.ts
 var import_canvas6 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
 var import_cache2 = require("next/cache");
 var import_react8 = require("react");
 
@@ -738,7 +751,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_shared6.runTest)(props);
+  const { index, event } = (0, import_canvas_next_rsc_shared5.runTest)(props);
   if (index === null || event === null) {
     return null;
   }
@@ -785,7 +798,7 @@ var UniformComposition = async ({
     });
   }
   const awaitedParams = await props.params;
-  const { value: path } = (0, import_canvas_next_rsc_shared7.resolvePath)({
+  const { value: path } = (0, import_canvas_next_rsc_shared6.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,19 +638,24 @@ 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) => {
-  const { indexes } = runPersonalization({
-    ...props,
-    contextInstance: void 0
-  });
-  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes });
+  return /* @__PURE__ */ React3.createElement(
+    PersonalizeClient,
+    {
+      component: props.component,
+      count: props.count,
+      slots: props.slots,
+      trackingEventName: props.trackingEventName,
+      algorithm: props.algorithm,
+      indexes: []
+    }
+  );
 };
 
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
-import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
@@ -660,7 +672,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     noStore();
   }
-  const { indexes, event } = runPersonalization2(props);
+  const { indexes, event } = runPersonalization(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -675,10 +687,10 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization as runPersonalization3 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
 var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization3(props);
+  const { indexes } = runPersonalization2(props);
   return /* @__PURE__ */ React5.createElement(
     PersonalizeClient2,
     {
@@ -686,6 +698,7 @@ var PersonalizeServerHybrid = (props) => {
       count: props.count,
       slots: props.slots,
       trackingEventName: props.trackingEventName,
+      algorithm: props.algorithm,
       indexes
     }
   );

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "20.8.1",
+  "version": "20.8.2-alpha.21+42bfa4ce42",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
     "lint": "eslint \"src/**/*.{ts,tsx}\" --fix",
-    "test": "jest --maxWorkers=1 --passWithNoTests"
+    "test": "jest --maxWorkers=1 --passWithNoTests",
+    "document": "api-extractor run --local"
   },
   "sideEffects": false,
   "main": "dist/index.js",
@@ -61,15 +62,15 @@
     "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.8.1",
-    "@uniformdev/canvas-next-rsc-client": "^20.8.1",
-    "@uniformdev/canvas-next-rsc-shared": "^20.8.1",
-    "@uniformdev/canvas-react": "20.8.1",
-    "@uniformdev/context": "20.8.1",
-    "@uniformdev/project-map": "20.8.1",
-    "@uniformdev/redirect": "20.8.1",
-    "@uniformdev/richtext": "20.8.1",
-    "@uniformdev/webhooks": "20.8.1",
+    "@uniformdev/canvas": "20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/canvas-next-rsc-client": "^20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/canvas-next-rsc-shared": "^20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/canvas-react": "20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/context": "20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/project-map": "20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/redirect": "20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/richtext": "20.8.2-alpha.21+42bfa4ce42",
+    "@uniformdev/webhooks": "20.8.2-alpha.21+42bfa4ce42",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +87,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7f4a0fc0650b043561f32bedc6c4cc18683df111"
+  "gitHead": "42bfa4ce42d4efdd35192096f1d4c23577e6cf2b"
 }