@uniformdev/next-app-router 20.75.1-alpha.0 → 20.76.1-alpha.3

package/dist/{UniformComposition-BWxMuY7i.d.ts → UniformComposition-Ck7mRTp-.d.ts}

@@ -63,6 +63,11 @@ type UniformCompositionProps = {
     resolveComponent: ResolveComponentFunction;
     /**
      * If provided, the composition will use the data client to retrieve data.
+     *
+     * Pass the same client here that you pass to `handleUniformRoute`. Without it, this component
+     * falls back to `DefaultDataClient` for the route it resolves and, on draft requests,
+     * for the manifest it evaluates personalization against - so a custom manifest source
+     * configured only on the middleware would not apply while the page renders.
      */
     dataClient?: DataClient;
     /**

package/dist/{UniformComposition-Bo6UsTDC.d.mts → UniformComposition-CpEVJ-SR.d.mts}

@@ -63,6 +63,11 @@ type UniformCompositionProps = {
     resolveComponent: ResolveComponentFunction;
     /**
      * If provided, the composition will use the data client to retrieve data.
+     *
+     * Pass the same client here that you pass to `handleUniformRoute`. Without it, this component
+     * falls back to `DefaultDataClient` for the route it resolves and, on draft requests,
+     * for the manifest it evaluates personalization against - so a custom manifest source
+     * configured only on the middleware would not apply while the page renders.
      */
     dataClient?: DataClient;
     /**

package/dist/cache.js

@@ -2039,7 +2039,9 @@ var DefaultDataClient = class {
       source: "middleware",
       route: options.route,
       routeClient,
-      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && getMiddlewareRuntimeCache(),
+      // The runtime cache is keyed on the route path. Development bypasses it so an author sees
+      // an edit right away, the same way the fetch cache is bypassed for development.
+      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && getMiddlewareRuntimeCache() && !isDevelopmentEnvironment(),
       disableSwrCache: getDisableSwrMiddlewareCache()
     });
     if (resolvedRoute.type === "composition") {

package/dist/cache.mjs

@@ -2026,7 +2026,9 @@ var DefaultDataClient = class {
       source: "middleware",
       route: options.route,
       routeClient,
-      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && getMiddlewareRuntimeCache(),
+      // The runtime cache is keyed on the route path. Development bypasses it so an author sees
+      // an edit right away, the same way the fetch cache is bypassed for development.
+      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && getMiddlewareRuntimeCache() && !isDevelopmentEnvironment(),
       disableSwrCache: getDisableSwrMiddlewareCache()
     });
     if (resolvedRoute.type === "composition") {

package/dist/compat.d.mts

@@ -1,7 +1,7 @@
 import React, { ComponentType } from 'react';
 import { ComponentProps as ComponentProps$1, ComponentParameter } from '@uniformdev/next-app-router-shared';
 import { U as UniformTextProps$1 } from './UniformText-ChMwHBw4.mjs';
-import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-Bo6UsTDC.mjs';
+import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-CpEVJ-SR.mjs';
 import '@uniformdev/next-app-router-client';
 import '@uniformdev/canvas';
 import './client-DRMp2gpi.mjs';

package/dist/compat.d.ts

@@ -1,7 +1,7 @@
 import React, { ComponentType } from 'react';
 import { ComponentProps as ComponentProps$1, ComponentParameter } from '@uniformdev/next-app-router-shared';
 import { U as UniformTextProps$1 } from './UniformText-ChMwHBw4.js';
-import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-BWxMuY7i.js';
+import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-Ck7mRTp-.js';
 import '@uniformdev/next-app-router-client';
 import '@uniformdev/canvas';
 import './client-DRMp2gpi.js';

package/dist/component.d.mts

@@ -36,7 +36,7 @@ type RenderRichTextComponentResolver = (node: RichTextNode) => RichTextRendererC
 declare const UniformRichText: React.ForwardRefExoticComponent<{
     /**
      * The name of the  HTML tag to render.
-     * @default "div"
+     * @defaultValue "div"
      */
     as?: React.ElementType;
     /**
@@ -51,7 +51,7 @@ declare const UniformRichText: React.ForwardRefExoticComponent<{
     /**
      * Sets the value to show in Canvas editor when the parameter value is empty.
      * Can be a static string, or a function to generate the placeholder out of parameter info.
-     * @default undefined
+     * @defaultValue undefined
      */
     placeholder?: string | ((parameter: {
         id: string;

package/dist/component.d.ts

@@ -36,7 +36,7 @@ type RenderRichTextComponentResolver = (node: RichTextNode) => RichTextRendererC
 declare const UniformRichText: React.ForwardRefExoticComponent<{
     /**
      * The name of the  HTML tag to render.
-     * @default "div"
+     * @defaultValue "div"
      */
     as?: React.ElementType;
     /**
@@ -51,7 +51,7 @@ declare const UniformRichText: React.ForwardRefExoticComponent<{
     /**
      * Sets the value to show in Canvas editor when the parameter value is empty.
      * Can be a static string, or a function to generate the placeholder out of parameter info.
-     * @default undefined
+     * @defaultValue undefined
      */
     placeholder?: string | ((parameter: {
         id: string;

package/dist/component.js

@@ -936,11 +936,11 @@ var ATTRIBUTE_PARAMETER_ID = "data-uniform-parameter-id";
 var ATTRIBUTE_PARAMETER_TYPE = "data-uniform-parameter-type";
 
 // src/components/UniformRichText.tsx
-var import_richtext6 = require("@uniformdev/richtext");
+var import_richtext8 = require("@uniformdev/richtext");
 var import_react12 = __toESM(require("react"));
 
 // src/components/UniformRichTextNode.tsx
-var import_richtext5 = require("@uniformdev/richtext");
+var import_richtext7 = require("@uniformdev/richtext");
 var import_react11 = __toESM(require("react"));
 
 // src/components/nodes/AssetRichTextNode.tsx
@@ -986,41 +986,57 @@ var LinkRichTextNode = ({ children, node }) => {
 };
 
 // src/components/nodes/ListItemRichTextNode.tsx
+var import_richtext2 = require("@uniformdev/richtext");
 var import_react5 = __toESM(require("react"));
 var ListItemRichTextNode = ({ children, node }) => {
   const { value } = node;
-  return /* @__PURE__ */ import_react5.default.createElement("li", { value: Number.isFinite(value) && value > 0 ? value : void 0 }, children);
+  const normalizedValue = (0, import_richtext2.getRichTextListItemValue)(value);
+  return /* @__PURE__ */ import_react5.default.createElement(
+    "li",
+    {
+      value: typeof normalizedValue === "number" && Number.isFinite(normalizedValue) && normalizedValue > 0 ? normalizedValue : void 0
+    },
+    children
+  );
 };
 
 // src/components/nodes/ListRichTextNode.tsx
+var import_richtext3 = require("@uniformdev/richtext");
 var import_react6 = __toESM(require("react"));
 var ListRichTextNode = ({ children, node }) => {
   const { tag, start } = node;
   const ListTag = tag != null ? tag : "ul";
-  return /* @__PURE__ */ import_react6.default.createElement(ListTag, { start: Number.isFinite(start) && start > 0 ? start : void 0 }, children);
+  const normalizedStart = (0, import_richtext3.getRichTextListStart)(start);
+  return /* @__PURE__ */ import_react6.default.createElement(
+    ListTag,
+    {
+      start: typeof normalizedStart === "number" && Number.isFinite(normalizedStart) && normalizedStart > 0 ? normalizedStart : void 0
+    },
+    children
+  );
 };
 
 // src/components/nodes/ParagraphRichTextNode.tsx
-var import_richtext2 = require("@uniformdev/richtext");
+var import_richtext4 = require("@uniformdev/richtext");
 var import_react7 = __toESM(require("react"));
 var ParagraphRichTextNode = ({ children, node }) => {
   const { format, direction } = node;
   return /* @__PURE__ */ import_react7.default.createElement(
     "p",
     {
-      dir: (0, import_richtext2.isPureDirection)(direction) ? direction : void 0,
-      style: (0, import_richtext2.isPureTextAlign)(format) ? { textAlign: format } : void 0
+      dir: (0, import_richtext4.isPureDirection)(direction) ? direction : void 0,
+      style: (0, import_richtext4.isPureTextAlign)(format) ? { textAlign: format } : void 0
     },
     children
   );
 };
 
 // src/components/nodes/TableCellRichTextNode.tsx
-var import_richtext3 = require("@uniformdev/richtext");
+var import_richtext5 = require("@uniformdev/richtext");
 var import_react8 = __toESM(require("react"));
 var TableCellRichTextNode = ({ children, node }) => {
   const { headerState } = node;
-  const TableCellTag = (0, import_richtext3.getRichTextTagFromTableCellHeaderState)(headerState);
+  const TableCellTag = (0, import_richtext5.getRichTextTagFromTableCellHeaderState)(headerState);
   return /* @__PURE__ */ import_react8.default.createElement(TableCellTag, null, children);
 };
 
@@ -1031,18 +1047,18 @@ var TabRichTextNode = () => {
 };
 
 // src/components/nodes/TextRichTextNode.tsx
-var import_richtext4 = require("@uniformdev/richtext");
+var import_richtext6 = require("@uniformdev/richtext");
 var import_react10 = __toESM(require("react"));
 var TextRichTextNode = ({ node }) => {
   const { text, format } = node;
-  const tags = (0, import_richtext4.getRichTextTagsFromTextFormat)(format);
+  const tags = (0, import_richtext6.getRichTextTagsFromTextFormat)(format);
   return /* @__PURE__ */ import_react10.default.createElement(import_react10.default.Fragment, null, tags.length > 0 ? tags.reduceRight((children, Tag) => /* @__PURE__ */ import_react10.default.createElement(Tag, null, children), text) : text);
 };
 
 // src/components/UniformRichTextNode.tsx
 function UniformRichTextNode({ node, ...props }) {
   var _a;
-  if (!(0, import_richtext5.isRichTextNode)(node)) return null;
+  if (!(0, import_richtext7.isRichTextNode)(node)) return null;
   let NodeRenderer = (_a = props.resolveRichTextRenderer) == null ? void 0 : _a.call(props, node);
   if (typeof NodeRenderer === "undefined") {
     NodeRenderer = resolveRichTextDefaultRenderer(node);
@@ -1096,8 +1112,8 @@ var UniformRichText = import_react12.default.forwardRef(function UniformRichText
   }
   const computedPlaceholder = typeof placeholder === "function" ? placeholder({ id: parameter.parameterId }) : placeholder;
   const value = parameter.value;
-  if (!value || !(0, import_richtext6.isRichTextValue)(value)) return null;
-  if (!isContextualEditing && (0, import_richtext6.isRichTextValueConsideredEmpty)(value)) return null;
+  if (!value || !(0, import_richtext8.isRichTextValue)(value)) return null;
+  if (!isContextualEditing && (0, import_richtext8.isRichTextValueConsideredEmpty)(value)) return null;
   return Tag === null ? /* @__PURE__ */ import_react12.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer }) : /* @__PURE__ */ import_react12.default.createElement(
     Tag,
     {
@@ -1109,7 +1125,7 @@ var UniformRichText = import_react12.default.forwardRef(function UniformRichText
         [ATTRIBUTE_PARAMETER_TYPE]: "richText"
       } : {}
     },
-    (0, import_richtext6.isRichTextValueConsideredEmpty)(value) ? /* @__PURE__ */ import_react12.default.createElement("p", null, /* @__PURE__ */ import_react12.default.createElement("i", null, computedPlaceholder)) : /* @__PURE__ */ import_react12.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer })
+    (0, import_richtext8.isRichTextValueConsideredEmpty)(value) ? /* @__PURE__ */ import_react12.default.createElement("p", null, /* @__PURE__ */ import_react12.default.createElement("i", null, computedPlaceholder)) : /* @__PURE__ */ import_react12.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer })
   );
 });
 

package/dist/component.mjs

@@ -974,18 +974,34 @@ var LinkRichTextNode = ({ children, node }) => {
 };
 
 // src/components/nodes/ListItemRichTextNode.tsx
+import { getRichTextListItemValue } from "@uniformdev/richtext";
 import React5 from "react";
 var ListItemRichTextNode = ({ children, node }) => {
   const { value } = node;
-  return /* @__PURE__ */ React5.createElement("li", { value: Number.isFinite(value) && value > 0 ? value : void 0 }, children);
+  const normalizedValue = getRichTextListItemValue(value);
+  return /* @__PURE__ */ React5.createElement(
+    "li",
+    {
+      value: typeof normalizedValue === "number" && Number.isFinite(normalizedValue) && normalizedValue > 0 ? normalizedValue : void 0
+    },
+    children
+  );
 };
 
 // src/components/nodes/ListRichTextNode.tsx
+import { getRichTextListStart } from "@uniformdev/richtext";
 import React6 from "react";
 var ListRichTextNode = ({ children, node }) => {
   const { tag, start } = node;
   const ListTag = tag != null ? tag : "ul";
-  return /* @__PURE__ */ React6.createElement(ListTag, { start: Number.isFinite(start) && start > 0 ? start : void 0 }, children);
+  const normalizedStart = getRichTextListStart(start);
+  return /* @__PURE__ */ React6.createElement(
+    ListTag,
+    {
+      start: typeof normalizedStart === "number" && Number.isFinite(normalizedStart) && normalizedStart > 0 ? normalizedStart : void 0
+    },
+    children
+  );
 };
 
 // src/components/nodes/ParagraphRichTextNode.tsx

package/dist/index.d.mts

@@ -2,8 +2,8 @@ import { CanvasClient, CompositionDeliveryClient, RouteClient, ComponentInstance
 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-Bo6UsTDC.mjs';
-export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-Bo6UsTDC.mjs';
+import { U as UniformCompositionProps } from './UniformComposition-CpEVJ-SR.mjs';
+export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-CpEVJ-SR.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-DRMp2gpi.mjs';
 import { a as ResolvedRouteResult } from './resolveRouteFromCode-C0dkUV2T.mjs';
@@ -249,12 +249,12 @@ type EvaluatePersonalizationsFunction = (personalization: {
 type PrecomputeCompositionOptions = Pick<ResolvedRouteResult, 'pageState' | 'route'> & {
     /**
      * Whether to evaluate tests
-     * @default true
+     * @defaultValue true
      */
     evaluateTests?: boolean | EvaluateTestsFunction;
     /**
      * Whether to evaluate personalizations
-     * @default true
+     * @defaultValue true
      */
     evaluatePersonalizations?: boolean | EvaluatePersonalizationsFunction;
 };

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import { CanvasClient, CompositionDeliveryClient, RouteClient, ComponentInstance
 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-BWxMuY7i.js';
-export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-BWxMuY7i.js';
+import { U as UniformCompositionProps } from './UniformComposition-Ck7mRTp-.js';
+export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-Ck7mRTp-.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-DRMp2gpi.js';
 import { a as ResolvedRouteResult } from './resolveRouteFromCode-Bhz8EJBu.js';
@@ -249,12 +249,12 @@ type EvaluatePersonalizationsFunction = (personalization: {
 type PrecomputeCompositionOptions = Pick<ResolvedRouteResult, 'pageState' | 'route'> & {
     /**
      * Whether to evaluate tests
-     * @default true
+     * @defaultValue true
      */
     evaluateTests?: boolean | EvaluateTestsFunction;
     /**
      * Whether to evaluate personalizations
-     * @default true
+     * @defaultValue true
      */
     evaluatePersonalizations?: boolean | EvaluatePersonalizationsFunction;
 };