@uniformdev/next-app-router 20.7.1-alpha.122 → 20.7.1-alpha.134

package/LICENSE.txt

@@ -1,2 +1,2 @@
-© 2024 Uniform Systems, Inc. All Rights Reserved.
+© 2026 Uniform Systems, Inc. All Rights Reserved.
 See details of Uniform Systems, Inc. Master Subscription Agreement here: https://uniform.dev/eula

package/dist/cache.js

@@ -1263,6 +1263,9 @@ __privateAdd2(_DataTypeClient, _url8, "/api/v1/data-types");
 var CANVAS_DRAFT_STATE = 0;
 var CANVAS_PUBLISHED_STATE = 64;
 var CANVAS_EDITOR_STATE = 63;
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var EDGE_MAX_CACHE_TTL = 24 * 60 * 60;
 var _baseUrl;
@@ -1379,19 +1382,19 @@ var env = {
   }
 };
 
-// src/config/helpers.ts
-var import_uniform_server = __toESM(require("uniform.server.config"));
-var getServerConfig = () => {
-  return import_uniform_server.default;
-};
-
 // src/utils/draft.ts
 var isDraftModeEnabled = ({
   draftModeEnabled
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1400,9 +1403,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1411,25 +1411,20 @@ var isDetectCacheMode = (options) => {
 };
 var resolveManifestCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().manifestCache
+    options
   });
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache = defaultCache;
+  let cache = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -1454,7 +1449,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -1675,6 +1673,12 @@ var getRouteClient = (options) => {
   return client;
 };
 
+// src/config/helpers.ts
+var import_uniform_server = __toESM(require("uniform.server.config"));
+var getServerConfig = () => {
+  return import_uniform_server.default;
+};
+
 // src/clients/manifest.ts
 var import_server_only2 = require("server-only");
 var getManifestClient = (options) => {
@@ -1833,12 +1837,12 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
-    var _a;
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? (_a = getServerConfig().canvasCache) != null ? _a : {
+      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
         type: "force-cache"
       } : {
-        type: "no-cache"
+        type: "no-cache",
+        bypassCache: true
       }
     });
     const originalRoute = {

package/dist/cache.mjs

@@ -1252,6 +1252,9 @@ __privateAdd2(_DataTypeClient, _url8, "/api/v1/data-types");
 var CANVAS_DRAFT_STATE = 0;
 var CANVAS_PUBLISHED_STATE = 64;
 var CANVAS_EDITOR_STATE = 63;
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var EDGE_MAX_CACHE_TTL = 24 * 60 * 60;
 var _baseUrl;
@@ -1368,19 +1371,19 @@ var env = {
   }
 };
 
-// src/config/helpers.ts
-import serverConfig from "uniform.server.config";
-var getServerConfig = () => {
-  return serverConfig;
-};
-
 // src/utils/draft.ts
 var isDraftModeEnabled = ({
   draftModeEnabled
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1389,9 +1392,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1400,25 +1400,20 @@ var isDetectCacheMode = (options) => {
 };
 var resolveManifestCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().manifestCache
+    options
   });
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache = defaultCache;
+  let cache = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -1443,7 +1438,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -1664,6 +1662,12 @@ var getRouteClient = (options) => {
   return client;
 };
 
+// src/config/helpers.ts
+import serverConfig from "uniform.server.config";
+var getServerConfig = () => {
+  return serverConfig;
+};
+
 // src/clients/manifest.ts
 import "server-only";
 var getManifestClient = (options) => {
@@ -1822,12 +1826,12 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
-    var _a;
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? (_a = getServerConfig().canvasCache) != null ? _a : {
+      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
         type: "force-cache"
       } : {
-        type: "no-cache"
+        type: "no-cache",
+        bypassCache: true
       }
     });
     const originalRoute = {

package/dist/component.js

@@ -1123,6 +1123,9 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
 };
 _url8 = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_DataTypeClient, _url8, "/api/v1/data-types");
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var EDGE_MAX_CACHE_TTL = 24 * 60 * 60;
 var _baseUrl;
 var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2 extends ApiClient {

package/dist/component.mjs

@@ -1108,6 +1108,9 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
 };
 _url8 = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_DataTypeClient, _url8, "/api/v1/data-types");
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var EDGE_MAX_CACHE_TTL = 24 * 60 * 60;
 var _baseUrl;
 var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2 extends ApiClient {

package/dist/handler.js

@@ -1378,6 +1378,9 @@ _url8 = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_DataTypeClient, _url8, "/api/v1/data-types");
 var CANVAS_DRAFT_STATE = 0;
 var CANVAS_EDITOR_STATE = 63;
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var SECRET_QUERY_STRING_PARAM = "secret";
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM = "is_incontext_editing_playground";
@@ -1738,7 +1741,13 @@ var isDraftModeEnabled = ({
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1747,9 +1756,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1758,25 +1764,20 @@ var isDetectCacheMode = (options) => {
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveProjectMapCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().projectMapCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache = defaultCache;
+  let cache = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -1801,7 +1802,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {

package/dist/handler.mjs

@@ -1363,6 +1363,9 @@ _url8 = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_DataTypeClient, _url8, "/api/v1/data-types");
 var CANVAS_DRAFT_STATE = 0;
 var CANVAS_EDITOR_STATE = 63;
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var SECRET_QUERY_STRING_PARAM = "secret";
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM = "is_incontext_editing_playground";
@@ -1723,7 +1726,13 @@ var isDraftModeEnabled = ({
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1732,9 +1741,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1743,25 +1749,20 @@ var isDetectCacheMode = (options) => {
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveProjectMapCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().projectMapCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache = defaultCache;
+  let cache = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -1786,7 +1787,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {

package/dist/index.esm.js

@@ -1404,6 +1404,9 @@ var CANVAS_EDITOR_STATE = 63;
 var CANVAS_PERSONALIZATION_PARAM = "$pzCrit";
 var CANVAS_TEST_VARIANT_PARAM = "$tstVrnt";
 var CANVAS_ENRICHMENT_TAG_PARAM = "$enr";
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var CANVAS_CONTEXTUAL_EDITING_PARAM = "$contextualEditing";
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var PLACEHOLDER_ID = "placeholder";
@@ -1951,19 +1954,19 @@ var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
 };
 
-// src/config/helpers.ts
-import serverConfig from "uniform.server.config";
-var getServerConfig = () => {
-  return serverConfig;
-};
-
 // src/utils/draft.ts
 var isDraftModeEnabled = ({
   draftModeEnabled
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1972,9 +1975,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1983,31 +1983,25 @@ var isDetectCacheMode = (options) => {
 };
 var resolveManifestCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().manifestCache
+    options
   });
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveProjectMapCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().projectMapCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache2 = defaultCache;
+  let cache2 = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache2 = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2032,7 +2026,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -2799,7 +2796,6 @@ var Test = ({ index, slots, test, component, context: compositionContext }) => {
   const indexToShow = typeof index === "number" ? (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null : null;
   const event = {
     name: test.name,
-    // todo: add Control Group support
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
     variantAssigned: true,
     variantId: (_f = (_e = test.variations[index]) == null ? void 0 : _e.id) != null ? _f : "NO_VARIANTS",
@@ -2831,6 +2827,14 @@ var UniformCompositionWrapper = ({
 // src/components/UniformContext.tsx
 import { DefaultUniformClientContext } from "@uniformdev/next-app-router-client";
 import React3 from "react";
+
+// src/config/helpers.ts
+import serverConfig from "uniform.server.config";
+var getServerConfig = () => {
+  return serverConfig;
+};
+
+// src/components/UniformContext.tsx
 var UniformContext = async ({ clientContextComponent, result }) => {
   var _a, _b, _c, _d;
   const manifest = await getManifest({
@@ -3695,12 +3699,12 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
-    var _a;
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? (_a = getServerConfig().canvasCache) != null ? _a : {
+      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
         type: "force-cache"
       } : {
-        type: "no-cache"
+        type: "no-cache",
+        bypassCache: true
       }
     });
     const originalRoute = {

package/dist/index.js

@@ -1431,6 +1431,9 @@ var CANVAS_EDITOR_STATE = 63;
 var CANVAS_PERSONALIZATION_PARAM = "$pzCrit";
 var CANVAS_TEST_VARIANT_PARAM = "$tstVrnt";
 var CANVAS_ENRICHMENT_TAG_PARAM = "$enr";
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var CANVAS_CONTEXTUAL_EDITING_PARAM = "$contextualEditing";
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var PLACEHOLDER_ID = "placeholder";
@@ -1978,19 +1981,19 @@ var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
 };
 
-// src/config/helpers.ts
-var import_uniform_server = __toESM(require("uniform.server.config"));
-var getServerConfig = () => {
-  return import_uniform_server.default;
-};
-
 // src/utils/draft.ts
 var isDraftModeEnabled = ({
   draftModeEnabled
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1999,9 +2002,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2010,31 +2010,25 @@ var isDetectCacheMode = (options) => {
 };
 var resolveManifestCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().manifestCache
+    options
   });
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveProjectMapCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().projectMapCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache2 = defaultCache;
+  let cache2 = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache2 = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2059,7 +2053,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -2822,7 +2819,6 @@ var Test = ({ index, slots, test, component, context: compositionContext }) => {
   const indexToShow = typeof index === "number" ? (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null : null;
   const event = {
     name: test.name,
-    // todo: add Control Group support
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
     variantAssigned: true,
     variantId: (_f = (_e = test.variations[index]) == null ? void 0 : _e.id) != null ? _f : "NO_VARIANTS",
@@ -2854,6 +2850,14 @@ var UniformCompositionWrapper = ({
 // src/components/UniformContext.tsx
 var import_next_app_router_client2 = require("@uniformdev/next-app-router-client");
 var import_react4 = __toESM(require("react"));
+
+// src/config/helpers.ts
+var import_uniform_server = __toESM(require("uniform.server.config"));
+var getServerConfig = () => {
+  return import_uniform_server.default;
+};
+
+// src/components/UniformContext.tsx
 var UniformContext = async ({ clientContextComponent, result }) => {
   var _a, _b, _c, _d;
   const manifest = await getManifest({
@@ -3716,12 +3720,12 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
-    var _a;
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? (_a = getServerConfig().canvasCache) != null ? _a : {
+      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
         type: "force-cache"
       } : {
-        type: "no-cache"
+        type: "no-cache",
+        bypassCache: true
       }
     });
     const originalRoute = {