@orion-studios/payload-studio 0.6.0-beta.9 → 0.7.0

package/dist/index.js

@@ -107,7 +107,7 @@ var navItemIsActive = (pathname, item) => {
 };
 
 // src/shared/studioSections.ts
-var studioRoles = /* @__PURE__ */ new Set(["admin", "editor", "client"]);
+var studioRoles = /* @__PURE__ */ new Set(["admin", "developer", "editor", "client"]);
 var studioIcons = new Set(adminNavIcons);
 var isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 var isAbsoluteExternalURL = (value) => /^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(value) || value.startsWith("//");
@@ -241,6 +241,7 @@ function configureAdmin(config) {
     brandPrimary = "#3b82f6",
     brandSecondary = "#8b5cf6",
     defaultTheme = "brand-light",
+    logoOnDarkUrl,
     logoUrl,
     allowThemePreference = false,
     userSessionDurationSeconds = 60 * 60 * 24
@@ -285,23 +286,33 @@ function configureAdmin(config) {
   if (cssSources.length === 0) {
     cssPath = sourceCssPath;
   } else {
-    let css = cssSources.map((filePath) => import_fs.default.readFileSync(filePath, "utf-8")).join("\n\n");
-    css = css.replace(
-      "--orion-cms-brand-primary-fallback: #3b82f6;",
-      `--orion-cms-brand-primary-fallback: ${brandPrimary};`
-    );
-    css = css.replace(
-      "--orion-cms-brand-secondary-fallback: #8b5cf6;",
-      `--orion-cms-brand-secondary-fallback: ${brandSecondary};`
-    );
-    const outputBasePath = config.basePath || process.cwd();
-    const genDir = import_path.default.resolve(outputBasePath, ".generated");
-    if (!import_fs.default.existsSync(genDir)) {
-      import_fs.default.mkdirSync(genDir, { recursive: true });
+    try {
+      let css = cssSources.map((filePath) => import_fs.default.readFileSync(filePath, "utf-8")).join("\n\n");
+      css = css.replace(
+        "--orion-cms-brand-primary-fallback: #3b82f6;",
+        `--orion-cms-brand-primary-fallback: ${brandPrimary};`
+      );
+      css = css.replace(
+        "--orion-cms-brand-secondary-fallback: #8b5cf6;",
+        `--orion-cms-brand-secondary-fallback: ${brandSecondary};`
+      );
+      const outputBasePath = config.basePath || process.cwd();
+      const genDir = import_path.default.resolve(outputBasePath, ".generated");
+      const genPath = import_path.default.resolve(genDir, "admin.css");
+      let existing = null;
+      try {
+        existing = import_fs.default.readFileSync(genPath, "utf-8");
+      } catch {
+        existing = null;
+      }
+      if (existing !== css) {
+        import_fs.default.mkdirSync(genDir, { recursive: true });
+        import_fs.default.writeFileSync(genPath, css);
+      }
+      cssPath = genPath;
+    } catch {
+      cssPath = sourceCssPath;
     }
-    const genPath = import_path.default.resolve(genDir, "admin.css");
-    import_fs.default.writeFileSync(genPath, css);
-    cssPath = genPath;
   }
   const clientPath = "@orion-studios/payload-studio/admin/client";
   const studioNavClientProps = {
@@ -348,6 +359,49 @@ function configureAdmin(config) {
       }
     };
   };
+  const attachStudioEditRedirectToCollection = (collection, options) => {
+    if (!studioEnabled) {
+      return collection;
+    }
+    const collectionWithBreadcrumb = attachStudioBackBreadcrumbToCollection(collection);
+    const existingViews = collectionWithBreadcrumb.admin?.components?.views;
+    const existingEditViews = existingViews?.edit;
+    const hasCustomEditView = Boolean(
+      existingEditViews?.root || existingEditViews?.default && typeof existingEditViews.default === "object" && existingEditViews.default.Component
+    );
+    if (hasCustomEditView) {
+      return collectionWithBreadcrumb;
+    }
+    return {
+      ...collectionWithBreadcrumb,
+      admin: {
+        ...collectionWithBreadcrumb.admin,
+        components: {
+          ...collectionWithBreadcrumb.admin?.components,
+          views: {
+            ...existingViews,
+            edit: {
+              ...existingEditViews,
+              default: {
+                ...typeof existingEditViews?.default === "object" ? existingEditViews.default : {},
+                Component: {
+                  exportName: "StudioDocumentRedirect",
+                  path: clientPath,
+                  clientProps: {
+                    description: options.description,
+                    ...options.emptyHref ? { emptyHref: options.emptyHref } : {},
+                    ...options.emptyLabel ? { emptyLabel: options.emptyLabel } : {},
+                    pathBase: options.pathBase,
+                    title: options.title
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+  };
   return {
     admin: {
       css: cssPath,
@@ -365,6 +419,7 @@ function configureAdmin(config) {
             path: clientPath,
             clientProps: {
               brandName,
+              logoOnDarkUrl,
               logoUrl
             }
           },
@@ -373,6 +428,7 @@ function configureAdmin(config) {
             path: clientPath,
             clientProps: {
               brandName,
+              logoOnDarkUrl,
               logoUrl
             }
           }
@@ -387,6 +443,7 @@ function configureAdmin(config) {
           },
           ...studioEnabled ? {
             studioGlobals: {
+              exact: true,
               path: globalsBasePath,
               Component: {
                 exportName: "AdminStudioGlobalsView",
@@ -398,10 +455,11 @@ function configureAdmin(config) {
                 }
               }
             },
-            studioPages: {
-              path: pagesBasePath,
+            studioPageNew: {
+              exact: true,
+              path: `${pagesBasePath}/new`,
               Component: {
-                exportName: "AdminStudioPagesListView",
+                exportName: "AdminStudioNewPageView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -410,6 +468,7 @@ function configureAdmin(config) {
               }
             },
             studioPageEditor: {
+              exact: true,
               path: `${pagesBasePath}/:id`,
               Component: {
                 exportName: "AdminStudioPageEditView",
@@ -420,10 +479,11 @@ function configureAdmin(config) {
                 }
               }
             },
-            studioPageNew: {
-              path: `${pagesBasePath}/new`,
+            studioPages: {
+              exact: true,
+              path: pagesBasePath,
               Component: {
-                exportName: "AdminStudioNewPageView",
+                exportName: "AdminStudioPagesListView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -432,6 +492,7 @@ function configureAdmin(config) {
               }
             },
             studioContactForm: {
+              exact: true,
               path: contactFormStudioPath,
               Component: {
                 exportName: "AdminStudioContactFormView",
@@ -444,7 +505,47 @@ function configureAdmin(config) {
               }
             },
             ...formsEnabled ? {
+              studioFormSubmission: {
+                exact: true,
+                path: `${formsBasePath}/submissions/:id`,
+                Component: {
+                  exportName: "AdminStudioFormSubmissionView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    formsCollectionSlug,
+                    formSubmissionsCollectionSlug,
+                    formUploadsCollectionSlug
+                  }
+                }
+              },
+              studioFormUpload: {
+                exact: true,
+                path: `${formsBasePath}/uploads/:id`,
+                Component: {
+                  exportName: "AdminStudioFormUploadView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    formUploadsCollectionSlug
+                  }
+                }
+              },
+              studioFormDetail: {
+                exact: true,
+                path: `${formsBasePath}/:id`,
+                Component: {
+                  exportName: "AdminStudioFormDetailView",
+                  path: clientPath,
+                  clientProps: {
+                    ...studioNavClientProps,
+                    formsCollectionSlug,
+                    formSubmissionsCollectionSlug
+                  }
+                }
+              },
               studioForms: {
+                exact: true,
                 path: formsBasePath,
                 Component: {
                   exportName: "AdminStudioFormsView",
@@ -458,10 +559,11 @@ function configureAdmin(config) {
                 }
               }
             } : {},
-            studioMedia: {
-              path: mediaBasePath,
+            studioMediaItem: {
+              exact: true,
+              path: `${mediaBasePath}/:id`,
               Component: {
-                exportName: "AdminStudioMediaView",
+                exportName: "AdminStudioMediaItemView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -469,10 +571,11 @@ function configureAdmin(config) {
                 }
               }
             },
-            studioMediaItem: {
-              path: `${mediaBasePath}/:id`,
+            studioMedia: {
+              exact: true,
+              path: mediaBasePath,
               Component: {
-                exportName: "AdminStudioMediaItemView",
+                exportName: "AdminStudioMediaView",
                 path: clientPath,
                 clientProps: {
                   ...studioNavClientProps,
@@ -481,6 +584,7 @@ function configureAdmin(config) {
               }
             },
             studioTools: {
+              exact: true,
               path: toolsBasePath,
               Component: {
                 exportName: "AdminStudioToolsView",
@@ -525,6 +629,7 @@ function configureAdmin(config) {
             path: clientPath,
             clientProps: {
               brandName,
+              logoOnDarkUrl,
               logoUrl
             }
           }
@@ -633,25 +738,74 @@ function configureAdmin(config) {
       return attachStudioBackBreadcrumbToCollection(mediaCollection);
     },
     wrapFormsCollection(formsCollection) {
-      return attachStudioBackBreadcrumbToCollection(formsCollection);
+      return attachStudioEditRedirectToCollection(formsCollection, {
+        description: "Redirecting to the Studio form workspace.",
+        emptyHref: formsBasePath,
+        emptyLabel: "Open Forms",
+        pathBase: formsBasePath,
+        title: "Opening Form..."
+      });
     },
     wrapFormSubmissionsCollection(formSubmissionsCollection) {
-      return attachStudioBackBreadcrumbToCollection(formSubmissionsCollection);
+      return attachStudioEditRedirectToCollection(formSubmissionsCollection, {
+        description: "Redirecting to the Studio submission workspace.",
+        emptyHref: formsBasePath,
+        emptyLabel: "Open Forms",
+        pathBase: `${formsBasePath}/submissions`,
+        title: "Opening Submission..."
+      });
     },
     wrapFormUploadsCollection(formUploadsCollection) {
-      return attachStudioBackBreadcrumbToCollection(formUploadsCollection);
+      return attachStudioEditRedirectToCollection(formUploadsCollection, {
+        description: "Redirecting to the Studio upload workspace.",
+        emptyHref: formsBasePath,
+        emptyLabel: "Open Forms",
+        pathBase: `${formsBasePath}/uploads`,
+        title: "Opening Upload..."
+      });
     },
     wrapGlobals(globals2) {
-      const labelMap = {
+      const defaultLabelMap = {
         header: { group: "Site Design", label: "Header & Navigation" },
         footer: { group: "Site Design", label: "Footer" },
         "site-settings": { group: "Site Design", label: "Website Settings" },
         "social-media": { group: "Site Design", label: "Social Media" },
         "contact-form": { group: "Lead Forms", label: "Contact Form" }
       };
+      const configuredBySlug = new Map(
+        (config.studio?.globals || []).map((link) => [link.slug, link])
+      );
+      const attachBreadcrumbToGlobal = (global) => {
+        if (!studioEnabled) {
+          return global;
+        }
+        const existingControls = global.admin?.components?.elements?.beforeDocumentControls;
+        return {
+          ...global,
+          admin: {
+            ...global.admin,
+            components: {
+              ...global.admin?.components,
+              elements: {
+                ...global.admin?.components?.elements,
+                beforeDocumentControls: appendComponent(
+                  existingControls,
+                  studioBackBreadcrumbComponent,
+                  "StudioBackBreadcrumb"
+                )
+              }
+            }
+          }
+        };
+      };
       return globals2.map((global) => {
-        const mapping = labelMap[global.slug];
-        if (!mapping) return global;
+        const configured = configuredBySlug.get(global.slug);
+        const defaults = defaultLabelMap[global.slug];
+        const mapping = configured || defaults ? {
+          group: configured?.group || defaults?.group,
+          label: configured?.label || defaults?.label || global.slug
+        } : void 0;
+        if (!mapping) return attachBreadcrumbToGlobal(global);
         const shouldAttachSiteSettingsEditView = studioEnabled && global.slug === "site-settings";
         const shouldAttachSocialMediaEditView = studioEnabled && global.slug === "social-media";
         const shouldAttachContactFormRedirect = studioEnabled && global.slug === "contact-form";
@@ -760,7 +914,7 @@ function configureAdmin(config) {
           ...global,
           admin: {
             ...global.admin,
-            group: mapping.group,
+            ...mapping.group ? { group: mapping.group } : {},
             components: {
               ...global.admin?.components,
               elements: {
@@ -3217,12 +3371,15 @@ __export(nextjs_exports, {
 
 // src/nextjs/client/payload.ts
 var import_payload = require("payload");
-var payloadPromise = null;
 var WEBSITE_CONTENT_TAG = "website-content";
 function createPayloadClient(config) {
+  let payloadPromise = null;
   return function getPayloadClient() {
     if (!payloadPromise) {
-      payloadPromise = (0, import_payload.getPayload)({ config });
+      payloadPromise = Promise.resolve(config).then((resolvedConfig) => (0, import_payload.getPayload)({ config: resolvedConfig })).catch((error) => {
+        payloadPromise = null;
+        throw error;
+      });
     }
     return payloadPromise;
   };
@@ -3580,7 +3737,9 @@ var defaultBuilderBlockSettingsV2 = {
   },
   typography: {
     bodyAlign: "left",
+    bodySizePt: null,
     headingAlign: "left",
+    headingSizePt: null,
     letterSpacingPreset: "normal",
     lineHeightPreset: "normal",
     maxTextWidth: "auto"
@@ -3609,7 +3768,9 @@ var defaultBuilderItemSettingsV2 = {
   },
   typography: {
     bodyAlign: "left",
+    bodySizePt: null,
     headingAlign: "left",
+    headingSizePt: null,
     letterSpacingPreset: "normal",
     lineHeightPreset: "normal",
     maxTextWidth: "auto"
@@ -3639,6 +3800,7 @@ var defaultBuilderThemeTokens = {
 
 // src/studio-pages/builder/adapters/settingsV2.ts
 var isRecord3 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+var isTextAlign = (value) => value === "left" || value === "center" || value === "right" || value === "justify";
 var parsePercent = (value) => {
   if (typeof value === "number" && Number.isFinite(value)) {
     return Math.max(0, Math.min(100, value));
@@ -3663,6 +3825,18 @@ var parsePixel = (value) => {
   }
   return null;
 };
+var parsePoint = (value) => {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return Math.max(6, Math.min(120, Math.round(value)));
+  }
+  if (typeof value === "string" && value.trim().length > 0) {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed)) {
+      return Math.max(6, Math.min(120, Math.round(parsed)));
+    }
+  }
+  return null;
+};
 var mergeSettings = (defaults, input) => {
   if (!isRecord3(input)) {
     return structuredClone(defaults);
@@ -3681,6 +3855,10 @@ var mergeSettings = (defaults, input) => {
 };
 var legacyBlockToV2Settings = (block) => {
   const current = structuredClone(defaultBuilderBlockSettingsV2);
+  if (block.blockType === "hero" && block.variant === "centered") {
+    current.typography.headingAlign = "center";
+    current.typography.bodyAlign = "center";
+  }
   current.layout.contentWidth = block.contentWidth === "narrow" || block.contentWidth === "content" || block.contentWidth === "wide" || block.contentWidth === "full" || block.contentWidth === "inherit" ? block.contentWidth : current.layout.contentWidth;
   current.layout.sectionPaddingX = block.sectionPaddingX === "none" || block.sectionPaddingX === "sm" || block.sectionPaddingX === "md" || block.sectionPaddingX === "lg" || block.sectionPaddingX === "inherit" ? block.sectionPaddingX : current.layout.sectionPaddingX;
   current.layout.sectionPaddingY = block.sectionPaddingY === "none" || block.sectionPaddingY === "sm" || block.sectionPaddingY === "lg" ? block.sectionPaddingY : current.layout.sectionPaddingY;
@@ -3717,15 +3895,28 @@ var legacyBlockToV2Settings = (block) => {
   current.media.positionX = parsePercent(block.imagePositionX ?? block.backgroundImagePositionX);
   current.media.positionY = parsePercent(block.imagePositionY ?? block.backgroundImagePositionY);
   current.media.height = parsePixel(block.imageHeight);
-  current.typography.headingAlign = block.textHeadingAlign === "left" || block.textHeadingAlign === "center" || block.textHeadingAlign === "right" || block.textHeadingAlign === "justify" ? block.textHeadingAlign : current.typography.headingAlign;
-  current.typography.bodyAlign = block.textBodyAlign === "left" || block.textBodyAlign === "center" || block.textBodyAlign === "right" || block.textBodyAlign === "justify" ? block.textBodyAlign : current.typography.bodyAlign;
+  current.typography.headingAlign = isTextAlign(block.textHeadingAlign) ? block.textHeadingAlign : current.typography.headingAlign;
+  current.typography.bodyAlign = isTextAlign(block.textBodyAlign) ? block.textBodyAlign : current.typography.bodyAlign;
+  current.typography.headingSizePt = parsePoint(block.textHeadingSizePt);
+  current.typography.bodySizePt = parsePoint(block.textBodySizePt);
   current.typography.maxTextWidth = block.textMaxWidth === "auto" || block.textMaxWidth === "sm" || block.textMaxWidth === "md" || block.textMaxWidth === "lg" || block.textMaxWidth === "full" ? block.textMaxWidth : current.typography.maxTextWidth;
   current.typography.lineHeightPreset = block.textLineHeightPreset === "tight" || block.textLineHeightPreset === "normal" || block.textLineHeightPreset === "relaxed" ? block.textLineHeightPreset : current.typography.lineHeightPreset;
   current.typography.letterSpacingPreset = block.textLetterSpacingPreset === "tight" || block.textLetterSpacingPreset === "normal" || block.textLetterSpacingPreset === "relaxed" ? block.textLetterSpacingPreset : current.typography.letterSpacingPreset;
   current.advanced.editCopyInPanel = Boolean(block.editCopyInPanel ?? current.advanced.editCopyInPanel);
   current.advanced.customClassName = typeof block.customClassName === "string" ? block.customClassName : current.advanced.customClassName;
   current.advanced.hideOnMobile = Boolean(block.hideOnMobile ?? current.advanced.hideOnMobile);
-  return mergeSettings(current, block.settings);
+  const settings = mergeSettings(current, block.settings);
+  if (block.blockType === "hero") {
+    const top = settings.layout.paddingTopPt;
+    const bottom = settings.layout.paddingBottomPt;
+    const hasLegacyLinkedHeroPadding = settings.layout.linkVerticalPadding !== false && (top === null || typeof top === "undefined" || top === 30) && (bottom === null || typeof bottom === "undefined" || bottom === 30 || bottom === 20);
+    if (hasLegacyLinkedHeroPadding) {
+      settings.layout.linkVerticalPadding = false;
+      settings.layout.paddingTopPt = 30;
+      settings.layout.paddingBottomPt = 20;
+    }
+  }
+  return settings;
 };
 var v2SettingsToLegacyBlock = (blockWithSettings) => {
   const settings = legacyBlockToV2Settings(blockWithSettings);
@@ -3751,6 +3942,8 @@ var v2SettingsToLegacyBlock = (blockWithSettings) => {
   next.contentGradientAngle = settings.appearance.contentGradientAngle;
   next.textHeadingAlign = settings.typography.headingAlign;
   next.textBodyAlign = settings.typography.bodyAlign;
+  next.textHeadingSizePt = settings.typography.headingSizePt;
+  next.textBodySizePt = settings.typography.bodySizePt;
   next.textMaxWidth = settings.typography.maxTextWidth;
   next.textLineHeightPreset = settings.typography.lineHeightPreset;
   next.textLetterSpacingPreset = settings.typography.letterSpacingPreset;
@@ -3883,7 +4076,7 @@ function normalizePath(segments) {
   const cleaned = segments.map((segment) => segment.trim()).filter(Boolean).join("/");
   return cleaned.length > 0 ? `/${cleaned}` : "/";
 }
-async function queryPageByPath(payload, path2, draft) {
+async function queryPageByPath(payload, path2, draft, collectionSlug, homeSlug) {
   const pathWhere = {
     path: {
       equals: path2
@@ -3895,7 +4088,7 @@ async function queryPageByPath(payload, path2, draft) {
     }
   };
   const result = await payload.find({
-    collection: "pages",
+    collection: collectionSlug,
     depth: 2,
     draft,
     limit: 1,
@@ -3908,11 +4101,11 @@ async function queryPageByPath(payload, path2, draft) {
   if (path2 === "/") {
     const homeWhere = {
       slug: {
-        equals: "home"
+        equals: homeSlug
       }
     };
     const homeResult = await payload.find({
-      collection: "pages",
+      collection: collectionSlug,
       depth: 2,
       draft,
       limit: 1,
@@ -3923,27 +4116,31 @@ async function queryPageByPath(payload, path2, draft) {
   }
   return null;
 }
-function createPageQueries(getPayloadClient, contentTag = "website-content") {
+function createPageQueries(getPayloadClient, contentTagOrOptions = "website-content") {
+  const options = typeof contentTagOrOptions === "string" ? { contentTag: contentTagOrOptions } : contentTagOrOptions;
+  const contentTag = options.contentTag || "website-content";
+  const pagesCollectionSlug = options.pagesCollectionSlug || "pages";
+  const homeSlug = options.homeSlug || "home";
   const getPublishedPageByPathCached = (0, import_cache.unstable_cache)(
     async (path2) => {
       const payload = await getPayloadClient();
-      return queryPageByPath(payload, path2, false);
+      return queryPageByPath(payload, path2, false, pagesCollectionSlug, homeSlug);
     },
-    ["page-by-path", PAGE_QUERY_CACHE_VERSION],
+    ["page-by-path", PAGE_QUERY_CACHE_VERSION, pagesCollectionSlug, homeSlug, contentTag],
     { tags: [contentTag] }
   );
   async function getPageBySegments(segments, draft = false) {
     const path2 = normalizePath(segments);
     const payload = await getPayloadClient();
     if (draft) {
-      return queryPageByPath(payload, path2, true);
+      return queryPageByPath(payload, path2, true, pagesCollectionSlug, homeSlug);
     }
     return getPublishedPageByPathCached(path2);
   }
   async function listPublishedPagePaths() {
     const payload = await getPayloadClient();
     const pages = await payload.find({
-      collection: "pages",
+      collection: pagesCollectionSlug,
       depth: 0,
       draft: false,
       limit: 1e3,
@@ -3972,108 +4169,46 @@ function createPageQueries(getPayloadClient, contentTag = "website-content") {
 
 // src/nextjs/queries/site.ts
 var import_cache2 = require("next/cache");
-function createSiteQueries(getPayloadClient, contentTag = "website-content") {
-  const getSiteSettingsCached = (0, import_cache2.unstable_cache)(
-    async () => {
-      const payload = await getPayloadClient();
-      const settings = await payload.findGlobal({
-        slug: "site-settings",
-        depth: 1
-      });
-      return settings;
-    },
-    ["site-settings-global"],
-    { tags: [contentTag] }
-  );
-  const getHeaderCached = (0, import_cache2.unstable_cache)(
-    async () => {
-      const payload = await getPayloadClient();
-      const header = await payload.findGlobal({
-        slug: "header",
-        depth: 1
-      });
-      return header;
-    },
-    ["header-global"],
-    { tags: [contentTag] }
-  );
-  const getFooterCached = (0, import_cache2.unstable_cache)(
-    async () => {
-      const payload = await getPayloadClient();
-      const footer = await payload.findGlobal({
-        slug: "footer",
-        depth: 1
-      });
-      return footer;
-    },
-    ["footer-global"],
-    { tags: [contentTag] }
-  );
-  const getSocialMediaCached = (0, import_cache2.unstable_cache)(
-    async () => {
-      const payload = await getPayloadClient();
-      const socialMedia = await payload.findGlobal({
-        slug: "social-media",
-        depth: 1
-      });
-      return socialMedia;
-    },
-    ["social-media-global"],
-    { tags: [contentTag] }
-  );
-  async function getSiteSettings(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const settings = await payload.findGlobal({
-        slug: "site-settings",
-        depth: 1,
-        draft: true
-      });
-      return settings;
-    }
-    return getSiteSettingsCached();
-  }
-  async function getHeader(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const header = await payload.findGlobal({
-        slug: "header",
-        depth: 1,
-        draft: true
-      });
-      return header;
-    }
-    return getHeaderCached();
-  }
-  async function getFooter(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const footer = await payload.findGlobal({
-        slug: "footer",
-        depth: 1,
-        draft: true
-      });
-      return footer;
-    }
-    return getFooterCached();
-  }
-  async function getSocialMedia(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const socialMedia = await payload.findGlobal({
-        slug: "social-media",
-        depth: 1,
-        draft: true
-      });
-      return socialMedia;
-    }
-    return getSocialMediaCached();
+function createSiteQueries(getPayloadClient, contentTagOrOptions = "website-content") {
+  const options = typeof contentTagOrOptions === "string" ? { contentTag: contentTagOrOptions } : contentTagOrOptions;
+  const contentTag = options.contentTag || "website-content";
+  const siteSettingsSlug = options.siteSettingsSlug || "site-settings";
+  const headerSlug = options.headerSlug || "header";
+  const footerSlug = options.footerSlug || "footer";
+  const socialMediaSlug = options.socialMediaSlug || "social-media";
+  function createGlobalQuery(slug, cacheKey) {
+    const getCached = (0, import_cache2.unstable_cache)(
+      async () => {
+        const payload = await getPayloadClient();
+        const data = await payload.findGlobal({
+          slug,
+          depth: 1,
+          overrideAccess: false
+        });
+        return data;
+      },
+      [cacheKey, slug, contentTag],
+      { tags: [contentTag] }
+    );
+    return async function getGlobal(draft = false) {
+      if (draft) {
+        const payload = await getPayloadClient();
+        const data = await payload.findGlobal({
+          slug,
+          depth: 1,
+          draft: true,
+          overrideAccess: false
+        });
+        return data;
+      }
+      return getCached();
+    };
   }
   return {
-    getSiteSettings,
-    getHeader,
-    getFooter,
-    getSocialMedia
+    getSiteSettings: createGlobalQuery(siteSettingsSlug, "site-settings-global"),
+    getHeader: createGlobalQuery(headerSlug, "header-global"),
+    getFooter: createGlobalQuery(footerSlug, "footer-global"),
+    getSocialMedia: createGlobalQuery(socialMediaSlug, "social-media-global")
   };
 }
 
@@ -4129,9 +4264,13 @@ function resolveSocialMediaLinks(data) {
 // src/studio-pages/index.ts
 var studio_pages_exports = {};
 __export(studio_pages_exports, {
+  DEFAULT_LEGACY_HERO_BACKGROUND_COLORS: () => DEFAULT_LEGACY_HERO_BACKGROUND_COLORS,
   createDefaultStudioDocument: () => createDefaultStudioDocument,
+  createStudioPageFields: () => createStudioPageFields,
   createStudioPageService: () => createStudioPageService,
+  createStudioPagesCollection: () => createStudioPagesCollection,
   defaultBuilderThemeTokens: () => defaultBuilderThemeTokens,
+  defaultRelationshipHydrationMap: () => defaultRelationshipHydrationMap,
   getStudioDocumentFromPage: () => getStudioDocumentFromPage,
   layoutToStudioDocument: () => layoutToStudioDocument,
   pageInspectorPanels: () => pageInspectorPanels,
@@ -4174,8 +4313,52 @@ var alignOptions = [
   { label: "Right", value: "right" },
   { label: "Justify", value: "justify" }
 ];
-var layoutFieldSet = [];
+var layoutFieldSet = [
+  {
+    group: "layout",
+    key: "settings.layout.linkVerticalPadding",
+    label: "Link Top/Bottom Padding",
+    tags: ["spacing", "padding", "vertical"],
+    type: "checkbox"
+  },
+  {
+    group: "layout",
+    key: "settings.layout.paddingTopPt",
+    label: "Top Padding (pt)",
+    max: 240,
+    min: 0,
+    tags: ["spacing", "padding", "top"],
+    type: "number"
+  },
+  {
+    group: "layout",
+    key: "settings.layout.paddingBottomPt",
+    label: "Bottom Padding (pt)",
+    max: 240,
+    min: 0,
+    tags: ["spacing", "padding", "bottom"],
+    type: "number"
+  }
+];
 var typographyFieldSet = [
+  {
+    group: "typography",
+    key: "settings.typography.headingSizePt",
+    label: "Heading Text Size (pt)",
+    max: 120,
+    min: 6,
+    tags: ["text", "size", "heading", "font"],
+    type: "number"
+  },
+  {
+    group: "typography",
+    key: "settings.typography.bodySizePt",
+    label: "Body Text Size (pt)",
+    max: 72,
+    min: 6,
+    tags: ["text", "size", "body", "paragraph", "font"],
+    type: "number"
+  },
   {
     group: "typography",
     key: "settings.typography.headingAlign",
@@ -4392,6 +4575,13 @@ var inspectorDefinitionByBlockType = {
       { group: "basics", inlineEditable: true, key: "kicker", label: "Kicker", type: "text" },
       { group: "basics", inlineEditable: true, key: "headline", label: "Headline", type: "text" },
       { group: "basics", inlineEditable: true, key: "subheadline", label: "Subheadline", type: "textarea" },
+      {
+        group: "basics",
+        key: "settings.marquee.itemsText",
+        label: "Scrolling Bar Options",
+        tags: ["marquee", "scrolling", "bar", "categories"],
+        type: "textarea"
+      },
       {
         group: "basics",
         key: "variant",
@@ -4518,6 +4708,13 @@ var inspectorDefinitionByBlockType = {
 };
 
 // src/studio-pages/pageService.ts
+var defaultRelationshipHydrationMap = {
+  beforeAfter: { arrays: { items: ["media", "beforeMedia", "afterMedia"] } },
+  featureGrid: { arrays: { items: ["media", "beforeMedia", "afterMedia"] } },
+  hero: { fields: ["media"] },
+  logoWall: { arrays: { items: ["media", "beforeMedia", "afterMedia"] } },
+  media: { fields: ["image"] }
+};
 var isRecord5 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 var toRecordArray = (value) => Array.isArray(value) ? value.filter((item) => isRecord5(item)) : [];
 var getRelationID = (value) => {
@@ -4545,7 +4742,7 @@ var hydrateRelationship = (valueFromStudio, valueFromLayout) => {
   }
   return valueFromLayout;
 };
-var hydrateDocumentWithLayoutRelations = (document, layout) => {
+var hydrateDocumentWithLayoutRelations = (document, layout, hydrationMap = defaultRelationshipHydrationMap) => {
   const nextNodes = document.nodes.map((node, index) => {
     const layoutBlock = layout[index];
     if (!isRecord5(layoutBlock)) {
@@ -4554,17 +4751,18 @@ var hydrateDocumentWithLayoutRelations = (document, layout) => {
     if (typeof layoutBlock.blockType !== "string" || layoutBlock.blockType !== node.type) {
       return node;
     }
-    const nextData = { ...node.data };
-    if (node.type === "hero") {
-      nextData.media = hydrateRelationship(nextData.media, layoutBlock.media);
+    const rule = hydrationMap[node.type];
+    if (!rule) {
+      return node;
     }
-    if (node.type === "media") {
-      nextData.image = hydrateRelationship(nextData.image, layoutBlock.image);
+    const nextData = { ...node.data };
+    for (const fieldName of rule.fields || []) {
+      nextData[fieldName] = hydrateRelationship(nextData[fieldName], layoutBlock[fieldName]);
     }
-    if (node.type === "featureGrid" || node.type === "logoWall" || node.type === "beforeAfter") {
-      const studioItems = Array.isArray(nextData.items) ? nextData.items : [];
-      const layoutItems = Array.isArray(layoutBlock.items) ? layoutBlock.items : [];
-      nextData.items = studioItems.map((rawStudioItem, itemIndex) => {
+    for (const [arrayField, itemFields] of Object.entries(rule.arrays || {})) {
+      const studioItems = Array.isArray(nextData[arrayField]) ? nextData[arrayField] : [];
+      const layoutItems = Array.isArray(layoutBlock[arrayField]) ? layoutBlock[arrayField] : [];
+      nextData[arrayField] = studioItems.map((rawStudioItem, itemIndex) => {
         if (!isRecord5(rawStudioItem)) {
           return rawStudioItem;
         }
@@ -4573,9 +4771,9 @@ var hydrateDocumentWithLayoutRelations = (document, layout) => {
           return rawStudioItem;
         }
         const nextItem = { ...rawStudioItem };
-        nextItem.media = hydrateRelationship(nextItem.media, layoutItem.media);
-        nextItem.beforeMedia = hydrateRelationship(nextItem.beforeMedia, layoutItem.beforeMedia);
-        nextItem.afterMedia = hydrateRelationship(nextItem.afterMedia, layoutItem.afterMedia);
+        for (const itemField of itemFields) {
+          nextItem[itemField] = hydrateRelationship(nextItem[itemField], layoutItem[itemField]);
+        }
         return nextItem;
       });
     }
@@ -4594,7 +4792,12 @@ var normalizeDocument = (document) => ({
   schemaVersion: 1,
   updatedAt: (/* @__PURE__ */ new Date()).toISOString()
 });
-var normalizeLegacyHeroDefaults = (document) => {
+var DEFAULT_LEGACY_HERO_BACKGROUND_COLORS = ["#124a37"];
+var normalizeLegacyHeroDefaults = (document, legacyColors = DEFAULT_LEGACY_HERO_BACKGROUND_COLORS) => {
+  if (legacyColors.length === 0) {
+    return document;
+  }
+  const normalizedLegacyColors = legacyColors.map((color) => color.trim().toLowerCase());
   const nodes = document.nodes.map((node) => {
     if (node.type !== "hero" || !isRecord5(node.data)) {
       return node;
@@ -4604,7 +4807,7 @@ var normalizeLegacyHeroDefaults = (document) => {
     const sectionBackgroundMode = typeof nextData.sectionBackgroundMode === "string" ? nextData.sectionBackgroundMode : "none";
     const hasBackgroundImageURL = typeof nextData.backgroundImageURL === "string" && nextData.backgroundImageURL.trim().length > 0;
     const mediaRelation = getRelationID(nextData.media);
-    if (heroBackgroundColor === "#124a37" && sectionBackgroundMode === "none" && !hasBackgroundImageURL && mediaRelation === null) {
+    if (normalizedLegacyColors.includes(heroBackgroundColor) && sectionBackgroundMode === "none" && !hasBackgroundImageURL && mediaRelation === null) {
       nextData.backgroundColor = "";
     }
     return {
@@ -4623,13 +4826,13 @@ var assertCanPublish = (issues) => {
     throw new Error(`Cannot publish page: ${publishErrors[0].message}`);
   }
 };
-var getStudioDocumentFromPage = (doc) => {
+var getStudioDocumentFromPage = (doc, relationshipHydration = defaultRelationshipHydrationMap) => {
   const title = typeof doc.title === "string" ? doc.title : void 0;
   const layout = asLayoutArray(doc.layout);
   try {
     const studioDocument = assertStudioDocumentV1(doc.studioDocument);
     if (layout.length > 0) {
-      return hydrateDocumentWithLayoutRelations(studioDocument, layout);
+      return hydrateDocumentWithLayoutRelations(studioDocument, layout, relationshipHydration);
     }
     return studioDocument;
   } catch {
@@ -4641,8 +4844,10 @@ var getStudioDocumentFromPage = (doc) => {
 };
 var createStudioPageService = ({
   collectionSlug = "pages",
+  legacyHeroBackgroundColors = DEFAULT_LEGACY_HERO_BACKGROUND_COLORS,
   modules,
   payload,
+  relationshipHydration = defaultRelationshipHydrationMap,
   user
 }) => ({
   getPageForStudio: async (pageID) => {
@@ -4654,7 +4859,7 @@ var createStudioPageService = ({
       overrideAccess: false,
       user
     });
-    const studioDocument = getStudioDocumentFromPage(page);
+    const studioDocument = getStudioDocumentFromPage(page, relationshipHydration);
     return {
       id: String(page.id),
       slug: typeof page.slug === "string" ? page.slug : "",
@@ -4664,7 +4869,10 @@ var createStudioPageService = ({
   },
   validateStudioDocument: (document) => validateStudioDocument(document, modules),
   saveDraft: async (pageID, document, _metadata) => {
-    const normalizedDocument = normalizeLegacyHeroDefaults(normalizeDocument(document));
+    const normalizedDocument = normalizeLegacyHeroDefaults(
+      normalizeDocument(document),
+      legacyHeroBackgroundColors
+    );
     const compileResult = compileStudioDocument(normalizedDocument, modules);
     await payload.update({
       collection: collectionSlug,
@@ -4685,7 +4893,10 @@ var createStudioPageService = ({
     };
   },
   publish: async (pageID, document, _metadata) => {
-    const normalizedDocument = normalizeLegacyHeroDefaults(normalizeDocument(document));
+    const normalizedDocument = normalizeLegacyHeroDefaults(
+      normalizeDocument(document),
+      legacyHeroBackgroundColors
+    );
     const compileResult = compileStudioDocument(normalizedDocument, modules);
     assertCanPublish(compileResult.issues);
     await payload.update({
@@ -4714,6 +4925,146 @@ var toEditorInitialDoc = (payloadPage) => ({
   title: payloadPage.title
 });
 
+// src/studio-pages/pageFields.ts
+var formatSlugValue = (value) => {
+  if (typeof value !== "string") return void 0;
+  return value.trim().toLowerCase().replace(/[^a-z0-9/]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+};
+function createStudioPageFields(options = {}) {
+  const {
+    blocks = defaultPageLayoutBlocks,
+    mediaCollectionSlug = "media",
+    additionalFields = []
+  } = options;
+  return [
+    {
+      name: "title",
+      type: "text",
+      required: true
+    },
+    {
+      name: "slug",
+      type: "text",
+      admin: {
+        description: "URL identifier for this page. `home` is served at `/`.",
+        position: "sidebar"
+      },
+      hooks: {
+        beforeValidate: [({ value }) => formatSlugValue(value) ?? value]
+      },
+      index: true,
+      required: true,
+      unique: true
+    },
+    {
+      name: "path",
+      type: "text",
+      admin: {
+        description: "Full public path. Derived from the slug when left empty.",
+        position: "sidebar"
+      },
+      hooks: {
+        beforeValidate: [
+          ({ value, data }) => {
+            if (typeof value === "string" && value.trim().length > 0) {
+              return value.trim();
+            }
+            const slug = formatSlugValue(data?.slug);
+            if (!slug) return value;
+            return slug === "home" ? "/" : `/${slug}`;
+          }
+        ]
+      },
+      index: true,
+      unique: true
+    },
+    {
+      name: "studioDocument",
+      type: "json",
+      admin: {
+        description: "Canonical Studio editor state. Managed by the page builder.",
+        hidden: true
+      }
+    },
+    {
+      name: "studioValidationIssues",
+      type: "json",
+      admin: {
+        description: "Validation issues from the last Studio compile. Managed by the page builder.",
+        hidden: true
+      }
+    },
+    {
+      name: "layout",
+      type: "blocks",
+      admin: {
+        description: "Compiled output only \u2014 edit pages through the Studio builder."
+      },
+      blocks
+    },
+    {
+      name: "seo",
+      type: "group",
+      fields: [
+        { name: "metaTitle", type: "text" },
+        { name: "metaDescription", type: "textarea" },
+        { name: "canonicalUrl", type: "text" },
+        {
+          name: "ogImage",
+          type: "upload",
+          relationTo: mediaCollectionSlug
+        }
+      ]
+    },
+    {
+      name: "noIndex",
+      type: "checkbox",
+      admin: { position: "sidebar" },
+      defaultValue: false
+    },
+    {
+      name: "noFollow",
+      type: "checkbox",
+      admin: { position: "sidebar" },
+      defaultValue: false
+    },
+    ...additionalFields
+  ];
+}
+function createStudioPagesCollection(options = {}) {
+  const { slug = "pages", access, overrides, ...fieldOptions } = options;
+  const base = {
+    slug,
+    access: access || {
+      create: ({ req }) => Boolean(req.user),
+      delete: ({ req }) => Boolean(req.user),
+      read: ({ req }) => {
+        if (req.user) return true;
+        return { _status: { equals: "published" } };
+      },
+      update: ({ req }) => Boolean(req.user)
+    },
+    admin: {
+      defaultColumns: ["title", "slug", "_status", "updatedAt"],
+      useAsTitle: "title"
+    },
+    fields: createStudioPageFields(fieldOptions),
+    versions: {
+      drafts: {
+        autosave: false
+      },
+      maxPerDoc: 50
+    }
+  };
+  if (!overrides) return base;
+  return {
+    ...base,
+    ...overrides,
+    admin: { ...base.admin, ...overrides.admin },
+    fields: overrides.fields || base.fields
+  };
+}
+
 // src/studio-pages/migrations.ts
 var isRecord6 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 var assertPageStudioDocumentV1 = (value) => {