@uniformdev/next-app-router 20.7.1-alpha.123 → 20.7.1-alpha.136

package/dist/middleware.js

@@ -1608,6 +1608,9 @@ var CANVAS_PUBLISHED_STATE = 64;
 var CANVAS_EDITOR_STATE = 63;
 var CANVAS_PERSONALIZATION_PARAM = "$pzCrit";
 var CANVAS_TEST_VARIANT_PARAM = "$tstVrnt";
+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 IN_CONTEXT_EDITOR_FORCED_SETTINGS_QUERY_STRING_PARAM = "is_incontext_editing_forced_settings";
 var EDGE_MAX_CACHE_TTL = 24 * 60 * 60;
@@ -2288,19 +2291,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;
 };
@@ -2309,9 +2312,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2320,25 +2320,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",
@@ -2363,7 +2358,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()) {
@@ -2564,10 +2562,47 @@ var getCanvasClient = (options) => {
   });
 };
 
+// src/config/helpers.ts
+var import_resolved = __toESM(require("@uniformdev/next-app-router/config/resolved"));
+var getServerConfig = () => {
+  return import_resolved.default;
+};
+var getDefaultConsent = () => {
+  if (typeof import_resolved.default.defaultConsent === "boolean") {
+    return import_resolved.default.defaultConsent;
+  }
+  return false;
+};
+var getQuirkSerialization = () => {
+  if (typeof import_resolved.default.quirkSerialization === "boolean") {
+    return import_resolved.default.quirkSerialization;
+  }
+  return true;
+};
+var getMiddlewareRuntimeCache = () => {
+  if (typeof import_resolved.default.middlewareRuntimeCache === "boolean") {
+    return import_resolved.default.middlewareRuntimeCache;
+  }
+  return true;
+};
+var getPlaygroundPath = () => {
+  if (typeof import_resolved.default.playgroundPath === "string") {
+    return import_resolved.default.playgroundPath;
+  }
+  return "/uniform/playground";
+};
+var getDisableSwrMiddlewareCache = () => {
+  var _a;
+  if (typeof ((_a = import_resolved.default.experimental) == null ? void 0 : _a.disableSwrMiddlewareCache) === "boolean") {
+    return import_resolved.default.experimental.disableSwrMiddlewareCache;
+  }
+  return false;
+};
+
 // src/data/client.ts
 var import_functions = require("@vercel/functions");
 
-// src/clients/route.ts
+// src/clients/manifest.ts
 var import_server_only2 = require("server-only");
 
 // src/clients/tags.ts
@@ -2588,7 +2623,47 @@ var generateManifestCacheTags = () => {
   return ["manifest"];
 };
 
+// src/clients/manifest.ts
+var getManifestClient = (options) => {
+  const cache = resolveManifestCache(options);
+  const manifestClient = new ManifestClient({
+    apiHost: env.getApiHost(),
+    apiKey: env.getApiKey(),
+    projectId: env.getProjectId(),
+    limitPolicy: createLimitPolicy2({
+      limit: 6
+    }),
+    fetch: (req, init2) => {
+      const { cache: fetchCache, revalidate } = determineFetchCacheOptions(cache);
+      return fetch(req, {
+        ...init2,
+        headers: {
+          ...init2 == null ? void 0 : init2.headers,
+          "x-bypass-cache": typeof cache.bypassCache !== "undefined" ? cache.bypassCache.toString() : "false"
+        },
+        cache: fetchCache,
+        next: {
+          revalidate,
+          tags: generateManifestCacheTags()
+        }
+      });
+    }
+  });
+  return manifestClient;
+};
+var getManifest = async (options) => {
+  let preview = false;
+  if (options && isStateCacheMode(options)) {
+    preview = options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE;
+  }
+  const manifestClient = getManifestClient(options);
+  return manifestClient.get({
+    preview
+  });
+};
+
 // src/clients/route.ts
+var import_server_only3 = require("server-only");
 var getRouteCacheTags = (requestedUrl) => {
   const tags = ["route"];
   if (requestedUrl) {
@@ -2638,52 +2713,11 @@ var getRouteClient = (options) => {
   return client;
 };
 
-// src/clients/manifest.ts
-var import_server_only3 = require("server-only");
-var getManifestClient = (options) => {
-  const cache = resolveManifestCache(options);
-  const manifestClient = new ManifestClient({
-    apiHost: env.getApiHost(),
-    apiKey: env.getApiKey(),
-    projectId: env.getProjectId(),
-    limitPolicy: createLimitPolicy2({
-      limit: 6
-    }),
-    fetch: (req, init2) => {
-      const { cache: fetchCache, revalidate } = determineFetchCacheOptions(cache);
-      return fetch(req, {
-        ...init2,
-        headers: {
-          ...init2 == null ? void 0 : init2.headers,
-          "x-bypass-cache": typeof cache.bypassCache !== "undefined" ? cache.bypassCache.toString() : "false"
-        },
-        cache: fetchCache,
-        next: {
-          revalidate,
-          tags: generateManifestCacheTags()
-        }
-      });
-    }
-  });
-  return manifestClient;
-};
-var getManifest = async (options) => {
-  let preview = false;
-  if (options && isStateCacheMode(options)) {
-    preview = options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE;
-  }
-  const manifestClient = getManifestClient(options);
-  return manifestClient.get({
-    preview
-  });
-};
-
 // src/data/client.ts
 var MANIFEST_CACHE_KEY = "uniform-manifest";
 var DefaultDataClient = class {
   async getManifest(options) {
-    var _a, _b;
-    const cache = options.source === "middleware" && ((_b = (_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false) ? (0, import_functions.getCache)() : null;
+    const cache = options.source === "middleware" && getMiddlewareRuntimeCache() ? (0, import_functions.getCache)() : null;
     if (cache) {
       const cachedManifest = await cache.get(MANIFEST_CACHE_KEY);
       if (cachedManifest) {
@@ -2769,18 +2803,16 @@ var DefaultDataClient = class {
   async enhanceRoute(_options3) {
   }
   async getRouteMiddleware(options) {
-    var _a, _b, _c, _d;
     const routeClient = getRouteClient({
       searchParams: options.searchParams,
       draftModeEnabled: options.draftModeEnabled
     });
-    const config = getServerConfig();
     const resolvedRoute = await this.getRouteFromApi({
       source: "middleware",
       route: options.route,
       routeClient,
-      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && ((_b = (_a = config.experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false),
-      disableSwrCache: (_d = (_c = config.experimental) == null ? void 0 : _c.disableSwrMiddlewareCache) != null ? _d : false
+      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && getMiddlewareRuntimeCache(),
+      disableSwrCache: getDisableSwrMiddlewareCache()
     });
     if (resolvedRoute.type === "composition") {
       await this.enhanceRoute({
@@ -2796,12 +2828,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 = {
@@ -5265,18 +5297,17 @@ var OnDemandContext = class {
     __privateSet(this, _options2, options);
   }
   async getContext() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     if (!this._context) {
       const uniformCookie = __privateGet(this, _options2).cookies.get(UNIFORM_DEFAULT_COOKIE_NAME);
       const quirkCookie = __privateGet(this, _options2).cookies.get(UNIFORM_DEFAULT_QUIRK_COOKIE_NAME);
-      const serverConfig2 = getServerConfig();
       this._context = new Context({
         manifest: __privateGet(this, _options2).manifest,
-        defaultConsent: (_b = (_a = __privateGet(this, _options2).defaultConsent) != null ? _a : serverConfig2.defaultConsent) != null ? _b : false,
+        defaultConsent: (_a = __privateGet(this, _options2).defaultConsent) != null ? _a : getDefaultConsent(),
         transitionStore: new CookieTransitionDataStore({
-          serverCookieValue: (_c = uniformCookie == null ? void 0 : uniformCookie.value) != null ? _c : "",
-          experimental_quirksEnabled: (_d = serverConfig2.experimental) == null ? void 0 : _d.quirkSerialization,
-          quirkCookieValue: (_e = quirkCookie == null ? void 0 : quirkCookie.value) != null ? _e : ""
+          serverCookieValue: (_b = uniformCookie == null ? void 0 : uniformCookie.value) != null ? _b : "",
+          experimental_quirksEnabled: getQuirkSerialization(),
+          quirkCookieValue: (_c = quirkCookie == null ? void 0 : quirkCookie.value) != null ? _c : ""
         })
       });
     }
@@ -5368,6 +5399,7 @@ var determineState = async ({
     draftModeEnabled
   });
   const isCanvasEditing = isIncontextEditingEnabled({
+    isDraftModeEnabled: draftModeEnabled,
     searchParams
   });
   return isDraftMode ? (isCanvasEditing ? [CANVAS_EDITOR_STATE] : []).concat([CANVAS_DRAFT_STATE]) : [CANVAS_PUBLISHED_STATE];
@@ -5430,7 +5462,7 @@ var handlePlaygroundRequest = async ({
   options,
   dataClient
 }) => {
-  var _a, _b, _c;
+  var _a, _b;
   const id = request.nextUrl.searchParams.get("id");
   if (!id) {
     return import_server.NextResponse.json(
@@ -5470,12 +5502,13 @@ var handlePlaygroundRequest = async ({
       { status: 404 }
     );
   }
-  const serverConfig2 = getServerConfig();
+  const serverConfig = getServerConfig();
+  const playgroundPath = getPlaygroundPath();
   const onDemandContext = await createOnDemandContext({
     cookies: request.cookies,
     dataClient,
     defaultConsent: determineDefaultConsent({
-      serverConfig: serverConfig2,
+      serverConfig,
       defaultConsent: options.defaultConsent
     })
   });
@@ -5489,7 +5522,7 @@ var handlePlaygroundRequest = async ({
     dynamicInputs: {},
     releaseId: (_a = options.release) == null ? void 0 : _a.id,
     defaultConsent: determineDefaultConsent({
-      serverConfig: serverConfig2,
+      serverConfig,
       defaultConsent: options.defaultConsent
     }),
     keys: void 0,
@@ -5506,7 +5539,7 @@ var handlePlaygroundRequest = async ({
     keys: void 0,
     releaseId: (_b = options.release) == null ? void 0 : _b.id,
     defaultConsent: determineDefaultConsent({
-      serverConfig: serverConfig2,
+      serverConfig,
       defaultConsent: options.defaultConsent
     }),
     previewMode: determinePreviewMode({
@@ -5522,7 +5555,7 @@ var handlePlaygroundRequest = async ({
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "playground" }) : void 0);
   if (!pathToRewriteTo) {
-    pathToRewriteTo = `${serverConfig2.playgroundPath}${((_c = serverConfig2.playgroundPath) == null ? void 0 : _c.endsWith("/")) ? "" : "/"}${code}`;
+    pathToRewriteTo = `${playgroundPath}${(playgroundPath == null ? void 0 : playgroundPath.endsWith("/")) ? "" : "/"}${code}`;
   }
   return import_server.NextResponse.rewrite(new URL(pathToRewriteTo, request.nextUrl.origin));
 };
@@ -5543,7 +5576,7 @@ var handleRouteRequest = async ({
   }))) != null ? _b : {
     path: `${request.nextUrl.pathname}${request.nextUrl.search}`
   };
-  const serverConfig2 = getServerConfig();
+  const serverConfig = getServerConfig();
   const [routeResult, onDemandContext] = await Promise.all([
     resolveRoute({
       path: requestPath.path,
@@ -5558,7 +5591,7 @@ var handleRouteRequest = async ({
       cookies: request.cookies,
       dataClient,
       defaultConsent: determineDefaultConsent({
-        serverConfig: serverConfig2,
+        serverConfig,
         defaultConsent: options.defaultConsent
       })
     })
@@ -5608,7 +5641,7 @@ var handleRouteRequest = async ({
     dynamicInputs: (_f = route.dynamicInputs) != null ? _f : {},
     releaseId: (_g = options.release) == null ? void 0 : _g.id,
     defaultConsent: determineDefaultConsent({
-      serverConfig: serverConfig2,
+      serverConfig,
       defaultConsent: options.defaultConsent
     }),
     keys: requestPath.keys,
@@ -5625,7 +5658,7 @@ var handleRouteRequest = async ({
     keys: requestPath.keys,
     releaseId: (_h = options.release) == null ? void 0 : _h.id,
     defaultConsent: determineDefaultConsent({
-      serverConfig: serverConfig2,
+      serverConfig,
       defaultConsent: options.defaultConsent
     }),
     previewMode,
@@ -5724,8 +5757,8 @@ var buildRoutePath = ({
     }
     return ((_b2 = (_a2 = node.locales) == null ? void 0 : _a2[locale]) == null ? void 0 : _b2.path) === route.matchedRoute;
   });
+  const searchParams = new URLSearchParams();
   if ((_c = projectMapNode == null ? void 0 : projectMapNode.data) == null ? void 0 : _c.queryStrings) {
-    const searchParams = new URLSearchParams();
     if (search) {
       const existingSearchParams = new URLSearchParams(search);
       for (const [key, value] of existingSearchParams.entries()) {
@@ -5738,17 +5771,20 @@ var buildRoutePath = ({
         searchParams.set(qs.name, qsValue != null ? qsValue : "");
       }
     }
-    if (searchParams.size) {
-      return `${routePath}?${searchParams.toString()}`;
-    }
+  }
+  if (process.env.NODE_ENV === "development") {
+    searchParams.set("cache", (/* @__PURE__ */ new Date()).valueOf().toString());
+  }
+  if (searchParams.size) {
+    return `${routePath}?${searchParams.toString()}`;
   }
   return routePath;
 };
 var determineDefaultConsent = ({
-  serverConfig: serverConfig2,
+  serverConfig,
   defaultConsent
 }) => {
-  return defaultConsent !== serverConfig2.defaultConsent ? defaultConsent : void 0;
+  return defaultConsent !== serverConfig.defaultConsent ? defaultConsent : void 0;
 };
 var determinePreviewMode = ({
   searchParams,
@@ -5768,7 +5804,7 @@ var determinePreviewMode = ({
   if (previewSettings == null ? void 0 : previewSettings.isVisualEditingDisabled) {
     return "preview";
   }
-  const isInContextEditingEnabled = isIncontextEditingEnabled({ searchParams });
+  const isInContextEditingEnabled = isIncontextEditingEnabled({ isDraftModeEnabled: isDraftModeEnabled2, searchParams });
   if (isInContextEditingEnabled) {
     return "editor";
   }