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

package/dist/handler.mjs

@@ -1521,9 +1521,18 @@ import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
 
 // src/config/helpers.ts
-import serverConfig from "uniform.server.config";
-var getServerConfig = () => {
-  return serverConfig;
+import config from "@uniformdev/next-app-router/config/resolved";
+var getMiddlewareRuntimeCache = () => {
+  if (typeof config.middlewareRuntimeCache === "boolean") {
+    return config.middlewareRuntimeCache;
+  }
+  return true;
+};
+var getPlaygroundPath = () => {
+  if (typeof config.playgroundPath === "string") {
+    return config.playgroundPath;
+  }
+  return "/uniform/playground";
 };
 
 // src/handler/createPreviewGETRouteHandler.ts
@@ -1542,7 +1551,7 @@ var contextualEditingQueryParams = [
 var createPreviewGETRouteHandler = (options) => {
   return async (request) => {
     const isConfigCheck = getQueryParam(request, "is_config_check") === "true";
-    const { playgroundPath } = getServerConfig();
+    const playgroundPath = getPlaygroundPath();
     if (isConfigCheck) {
       return Response.json(
         {
@@ -2588,7 +2597,6 @@ var createPreviewPOSTRouteHandler = () => {
   };
 };
 var handleSvixMessage = async (request) => {
-  var _a;
   const handlers = [
     handleProjectMapNodeUpdate,
     handleProjectMapNodeInsert,
@@ -2622,7 +2630,7 @@ var handleSvixMessage = async (request) => {
     }
   }
   if (tags == null ? void 0 : tags.length) {
-    const cache = ((_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) ? getCache() : void 0;
+    const cache = getMiddlewareRuntimeCache() ? getCache() : void 0;
     for (let i = 0; i < tags.length; i++) {
       const tag = tags[i];
       revalidateTag(tag, "max");

package/dist/index.d.mts

@@ -2,8 +2,8 @@ import { CanvasClient, RouteClient, ComponentInstance } from '@uniformdev/canvas
 import { CacheMode, CanvasCacheMode, ManifestCacheMode, ProjectMapCacheMode, RewriteRequestPathResult } from '@uniformdev/next-app-router-shared';
 import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient } from '@uniformdev/project-map';
-import { U as UniformCompositionProps } from './UniformComposition-CHUPULqc.mjs';
-export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-CHUPULqc.mjs';
+import { U as UniformCompositionProps } from './UniformComposition-hhRIBHmn.mjs';
+export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-hhRIBHmn.mjs';
 import React from 'react';
 export { D as DataClient, a as DefaultDataClient, E as EnhanceRouteOptions, G as GetRouteFromMiddlewareOptions, b as GetRouteFromPageStateOptions, c as GetRouteOptions, R as RewriteRouteOptions, d as RewriteRouteResult, e as expireMiddlewareCacheTag } from './client-BCGVjYM-.mjs';
 import { a as ResolvedRouteResult } from './resolveRouteFromCode-CKaYNXte.mjs';

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import { CanvasClient, RouteClient, ComponentInstance } from '@uniformdev/canvas
 import { CacheMode, CanvasCacheMode, ManifestCacheMode, ProjectMapCacheMode, RewriteRequestPathResult } from '@uniformdev/next-app-router-shared';
 import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient } from '@uniformdev/project-map';
-import { U as UniformCompositionProps } from './UniformComposition-r8a9xGZn.js';
-export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-r8a9xGZn.js';
+import { U as UniformCompositionProps } from './UniformComposition-d7_93l3F.js';
+export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-d7_93l3F.js';
 import React from 'react';
 export { D as DataClient, a as DefaultDataClient, E as EnhanceRouteOptions, G as GetRouteFromMiddlewareOptions, b as GetRouteFromPageStateOptions, c as GetRouteOptions, R as RewriteRouteOptions, d as RewriteRouteResult, e as expireMiddlewareCacheTag } from './client-BCGVjYM-.js';
 import { a as ResolvedRouteResult } from './resolveRouteFromCode-DgTsfMK8.js';

package/dist/index.esm.js

@@ -2829,14 +2829,43 @@ 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;
+import config from "@uniformdev/next-app-router/config/resolved";
+var getDisabledDevTools = () => {
+  var _a;
+  if (typeof ((_a = config.context) == null ? void 0 : _a.disableDevTools) === "boolean") {
+    return config.context.disableDevTools;
+  }
+  return false;
+};
+var getDefaultConsent = () => {
+  if (typeof config.defaultConsent === "boolean") {
+    return config.defaultConsent;
+  }
+  return false;
+};
+var getQuirkSerialization = () => {
+  if (typeof config.quirkSerialization === "boolean") {
+    return config.quirkSerialization;
+  }
+  return true;
+};
+var getMiddlewareRuntimeCache = () => {
+  if (typeof config.middlewareRuntimeCache === "boolean") {
+    return config.middlewareRuntimeCache;
+  }
+  return true;
+};
+var getDisableSwrMiddlewareCache = () => {
+  var _a;
+  if (typeof ((_a = config.experimental) == null ? void 0 : _a.disableSwrMiddlewareCache) === "boolean") {
+    return config.experimental.disableSwrMiddlewareCache;
+  }
+  return false;
 };
 
 // src/components/UniformContext.tsx
 var UniformContext = async ({ clientContextComponent, result }) => {
-  var _a, _b, _c, _d;
+  var _a;
   const manifest = await getManifest({
     state: CANVAS_PUBLISHED_STATE
   });
@@ -2847,10 +2876,9 @@ var UniformContext = async ({ clientContextComponent, result }) => {
     matchedRoute: route.matchedRoute
   } : void 0;
   const ContextComponent = clientContextComponent || DefaultUniformClientContext;
-  const serverConfig2 = getServerConfig();
-  const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
-  const defaultConsent = (_c = (_b = result == null ? void 0 : result.pageState.defaultConsent) != null ? _b : serverConfig2.defaultConsent) != null ? _c : false;
-  const experimentalQuirkSerialization = ((_d = serverConfig2.experimental) == null ? void 0 : _d.quirkSerialization) || false;
+  const disableDevTools = getDisabledDevTools();
+  const defaultConsent = (_a = result == null ? void 0 : result.pageState.defaultConsent) != null ? _a : getDefaultConsent();
+  const experimentalQuirkSerialization = getQuirkSerialization();
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(
     ContextComponent,
     {
@@ -2884,11 +2912,13 @@ async function UniformCompositionInner({
   resolveComponent,
   resolveEmptyPlaceholder,
   compositionCache,
-  clientContextComponent
+  clientContextComponent,
+  dataClient
 }) {
   var _a, _b;
   const result = await resolveRoute({
-    code
+    code,
+    dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
     notFound();
@@ -3571,7 +3601,7 @@ function permutationsWithoutRepetition(options, k) {
 }
 function combineAcrossGroups(perGroupSelections) {
   return perGroupSelections.reduce(
-    (acc, group) => acc.flatMap((config) => group.map((selection) => [...config, selection])),
+    (acc, group) => acc.flatMap((config2) => group.map((selection) => [...config2, selection])),
     [[]]
   );
 }
@@ -3585,8 +3615,7 @@ import { getCache, waitUntil } from "@vercel/functions";
 var MANIFEST_CACHE_KEY = "uniform-manifest";
 var DefaultDataClient = class {
   async getManifest(options) {
-    var _a, _b;
-    const cache2 = options.source === "middleware" && ((_b = (_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false) ? getCache() : null;
+    const cache2 = options.source === "middleware" && getMiddlewareRuntimeCache() ? getCache() : null;
     if (cache2) {
       const cachedManifest = await cache2.get(MANIFEST_CACHE_KEY);
       if (cachedManifest) {
@@ -3672,18 +3701,16 @@ var DefaultDataClient = class {
   async enhanceRoute(_options) {
   }
   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({
@@ -3736,8 +3763,7 @@ var DefaultDataClient = class {
   }
 };
 var expireMiddlewareCacheTag = async (tag) => {
-  var _a;
-  const cache2 = ((_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) ? getCache() : null;
+  const cache2 = getMiddlewareRuntimeCache() ? getCache() : null;
   if (cache2) {
     await cache2.expireTag(tag);
   } else {

package/dist/index.js

@@ -2852,14 +2852,43 @@ 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;
+var import_resolved = __toESM(require("@uniformdev/next-app-router/config/resolved"));
+var getDisabledDevTools = () => {
+  var _a;
+  if (typeof ((_a = import_resolved.default.context) == null ? void 0 : _a.disableDevTools) === "boolean") {
+    return import_resolved.default.context.disableDevTools;
+  }
+  return false;
+};
+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 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/components/UniformContext.tsx
 var UniformContext = async ({ clientContextComponent, result }) => {
-  var _a, _b, _c, _d;
+  var _a;
   const manifest = await getManifest({
     state: CANVAS_PUBLISHED_STATE
   });
@@ -2870,10 +2899,9 @@ var UniformContext = async ({ clientContextComponent, result }) => {
     matchedRoute: route.matchedRoute
   } : void 0;
   const ContextComponent = clientContextComponent || import_next_app_router_client2.DefaultUniformClientContext;
-  const serverConfig2 = getServerConfig();
-  const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
-  const defaultConsent = (_c = (_b = result == null ? void 0 : result.pageState.defaultConsent) != null ? _b : serverConfig2.defaultConsent) != null ? _c : false;
-  const experimentalQuirkSerialization = ((_d = serverConfig2.experimental) == null ? void 0 : _d.quirkSerialization) || false;
+  const disableDevTools = getDisabledDevTools();
+  const defaultConsent = (_a = result == null ? void 0 : result.pageState.defaultConsent) != null ? _a : getDefaultConsent();
+  const experimentalQuirkSerialization = getQuirkSerialization();
   return /* @__PURE__ */ import_react4.default.createElement(import_react4.default.Fragment, null, /* @__PURE__ */ import_react4.default.createElement(
     ContextComponent,
     {
@@ -2907,11 +2935,13 @@ async function UniformCompositionInner({
   resolveComponent,
   resolveEmptyPlaceholder,
   compositionCache,
-  clientContextComponent
+  clientContextComponent,
+  dataClient
 }) {
   var _a, _b;
   const result = await resolveRoute({
-    code
+    code,
+    dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
     (0, import_navigation.notFound)();
@@ -3592,7 +3622,7 @@ function permutationsWithoutRepetition(options, k) {
 }
 function combineAcrossGroups(perGroupSelections) {
   return perGroupSelections.reduce(
-    (acc, group) => acc.flatMap((config) => group.map((selection) => [...config, selection])),
+    (acc, group) => acc.flatMap((config2) => group.map((selection) => [...config2, selection])),
     [[]]
   );
 }
@@ -3606,8 +3636,7 @@ var import_functions = require("@vercel/functions");
 var MANIFEST_CACHE_KEY = "uniform-manifest";
 var DefaultDataClient = class {
   async getManifest(options) {
-    var _a, _b;
-    const cache2 = options.source === "middleware" && ((_b = (_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false) ? (0, import_functions.getCache)() : null;
+    const cache2 = options.source === "middleware" && getMiddlewareRuntimeCache() ? (0, import_functions.getCache)() : null;
     if (cache2) {
       const cachedManifest = await cache2.get(MANIFEST_CACHE_KEY);
       if (cachedManifest) {
@@ -3693,18 +3722,16 @@ var DefaultDataClient = class {
   async enhanceRoute(_options) {
   }
   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({
@@ -3757,8 +3784,7 @@ var DefaultDataClient = class {
   }
 };
 var expireMiddlewareCacheTag = async (tag) => {
-  var _a;
-  const cache2 = ((_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) ? (0, import_functions.getCache)() : null;
+  const cache2 = getMiddlewareRuntimeCache() ? (0, import_functions.getCache)() : null;
   if (cache2) {
     await cache2.expireTag(tag);
   } else {

package/dist/index.mjs

@@ -2829,14 +2829,43 @@ 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;
+import config from "@uniformdev/next-app-router/config/resolved";
+var getDisabledDevTools = () => {
+  var _a;
+  if (typeof ((_a = config.context) == null ? void 0 : _a.disableDevTools) === "boolean") {
+    return config.context.disableDevTools;
+  }
+  return false;
+};
+var getDefaultConsent = () => {
+  if (typeof config.defaultConsent === "boolean") {
+    return config.defaultConsent;
+  }
+  return false;
+};
+var getQuirkSerialization = () => {
+  if (typeof config.quirkSerialization === "boolean") {
+    return config.quirkSerialization;
+  }
+  return true;
+};
+var getMiddlewareRuntimeCache = () => {
+  if (typeof config.middlewareRuntimeCache === "boolean") {
+    return config.middlewareRuntimeCache;
+  }
+  return true;
+};
+var getDisableSwrMiddlewareCache = () => {
+  var _a;
+  if (typeof ((_a = config.experimental) == null ? void 0 : _a.disableSwrMiddlewareCache) === "boolean") {
+    return config.experimental.disableSwrMiddlewareCache;
+  }
+  return false;
 };
 
 // src/components/UniformContext.tsx
 var UniformContext = async ({ clientContextComponent, result }) => {
-  var _a, _b, _c, _d;
+  var _a;
   const manifest = await getManifest({
     state: CANVAS_PUBLISHED_STATE
   });
@@ -2847,10 +2876,9 @@ var UniformContext = async ({ clientContextComponent, result }) => {
     matchedRoute: route.matchedRoute
   } : void 0;
   const ContextComponent = clientContextComponent || DefaultUniformClientContext;
-  const serverConfig2 = getServerConfig();
-  const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
-  const defaultConsent = (_c = (_b = result == null ? void 0 : result.pageState.defaultConsent) != null ? _b : serverConfig2.defaultConsent) != null ? _c : false;
-  const experimentalQuirkSerialization = ((_d = serverConfig2.experimental) == null ? void 0 : _d.quirkSerialization) || false;
+  const disableDevTools = getDisabledDevTools();
+  const defaultConsent = (_a = result == null ? void 0 : result.pageState.defaultConsent) != null ? _a : getDefaultConsent();
+  const experimentalQuirkSerialization = getQuirkSerialization();
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(
     ContextComponent,
     {
@@ -2884,11 +2912,13 @@ async function UniformCompositionInner({
   resolveComponent,
   resolveEmptyPlaceholder,
   compositionCache,
-  clientContextComponent
+  clientContextComponent,
+  dataClient
 }) {
   var _a, _b;
   const result = await resolveRoute({
-    code
+    code,
+    dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
     notFound();
@@ -3571,7 +3601,7 @@ function permutationsWithoutRepetition(options, k) {
 }
 function combineAcrossGroups(perGroupSelections) {
   return perGroupSelections.reduce(
-    (acc, group) => acc.flatMap((config) => group.map((selection) => [...config, selection])),
+    (acc, group) => acc.flatMap((config2) => group.map((selection) => [...config2, selection])),
     [[]]
   );
 }
@@ -3585,8 +3615,7 @@ import { getCache, waitUntil } from "@vercel/functions";
 var MANIFEST_CACHE_KEY = "uniform-manifest";
 var DefaultDataClient = class {
   async getManifest(options) {
-    var _a, _b;
-    const cache2 = options.source === "middleware" && ((_b = (_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false) ? getCache() : null;
+    const cache2 = options.source === "middleware" && getMiddlewareRuntimeCache() ? getCache() : null;
     if (cache2) {
       const cachedManifest = await cache2.get(MANIFEST_CACHE_KEY);
       if (cachedManifest) {
@@ -3672,18 +3701,16 @@ var DefaultDataClient = class {
   async enhanceRoute(_options) {
   }
   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({
@@ -3736,8 +3763,7 @@ var DefaultDataClient = class {
   }
 };
 var expireMiddlewareCacheTag = async (tag) => {
-  var _a;
-  const cache2 = ((_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) ? getCache() : null;
+  const cache2 = getMiddlewareRuntimeCache() ? getCache() : null;
   if (cache2) {
     await cache2.expireTag(tag);
   } else {