@tokenoftrust/storefront-runner 2.4.87 → 2.4.88

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/Faq.astro

@@ -3,13 +3,13 @@
  * <Faq> — a no-JS accordion of question/answer pairs using native
  * <details>/<summary>. Emits FAQPage JSON-LD so answers are eligible for rich
  * results — unless the tenant declares a structured-data profile, which owns every
- * JSON-LD node on the page (lib/seo/structuredData.ts). Answers are plain text
+ * JSON-LD node on the page (lib/content/seo/structuredData.ts). Answers are plain text
  * (auto-escaped).
  */
-import Section from "@/components/Section.astro";
-import type { FaqBlock } from "@/lib/storyblok/content-model";
-import { safeJsonScriptContent } from "@/lib/jsonScript";
-import { structuredDataProfile } from "@/lib/seo/structuredData";
+import Section from "@/components/content/storefront/Section.astro";
+import type { FaqBlock } from "@/lib/content/storyblok/content-model";
+import { safeJsonScriptContent } from "@/lib/content/shared/jsonScript";
+import { structuredDataProfile } from "@/lib/content/seo/structuredData";
 interface Props {
   block: FaqBlock;
 }

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/Integrations.astro

@@ -4,9 +4,9 @@
  * platform names/links, optional implementation points, and an optional safe
  * code sample. Platform links open externally when they carry an http href.
  */
-import Section from "@/components/Section.astro";
-import CodeSample from "@/components/marketing/CodeSample.astro";
-import type { IntegrationsBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import CodeSample from "@/components/content/storefront/marketing/CodeSample.astro";
+import type { IntegrationsBlock } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 interface Props {

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/MarketingBlocks.astro

@@ -5,17 +5,17 @@
  * block is styled through theme tokens and reads its copy from tenant content.
  * Reused by the homepage and (future) marketing content pages.
  */
-import type { MarketingBlock } from "@/lib/storyblok/content-model";
-import MarketingHero from "@/components/marketing/MarketingHero.astro";
-import TrustBar from "@/components/marketing/TrustBar.astro";
-import SplitCompare from "@/components/marketing/SplitCompare.astro";
-import Steps from "@/components/marketing/Steps.astro";
-import CardGrid from "@/components/marketing/CardGrid.astro";
-import Integrations from "@/components/marketing/Integrations.astro";
-import ProofStrip from "@/components/marketing/ProofStrip.astro";
-import Testimonials from "@/components/marketing/Testimonials.astro";
-import Faq from "@/components/marketing/Faq.astro";
-import CtaBand from "@/components/marketing/CtaBand.astro";
+import type { MarketingBlock } from "@/lib/content/storyblok/content-model";
+import MarketingHero from "@/components/content/storefront/marketing/MarketingHero.astro";
+import TrustBar from "@/components/content/storefront/marketing/TrustBar.astro";
+import SplitCompare from "@/components/content/storefront/marketing/SplitCompare.astro";
+import Steps from "@/components/content/storefront/marketing/Steps.astro";
+import CardGrid from "@/components/content/storefront/marketing/CardGrid.astro";
+import Integrations from "@/components/content/storefront/marketing/Integrations.astro";
+import ProofStrip from "@/components/content/storefront/marketing/ProofStrip.astro";
+import Testimonials from "@/components/content/storefront/marketing/Testimonials.astro";
+import Faq from "@/components/content/storefront/marketing/Faq.astro";
+import CtaBand from "@/components/content/storefront/marketing/CtaBand.astro";
 
 interface Props {
   blocks: MarketingBlock[];

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/MarketingCtas.astro

@@ -5,7 +5,7 @@
  * a new tab with rel="noopener"; same-origin root-absolute hrefs get the tenant
  * base-path prefix so path-routed tenants stay in-tenant.
  */
-import type { MarketingCta } from "@/lib/storyblok/content-model";
+import type { MarketingCta } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 interface Props {

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/MarketingHero.astro

@@ -5,8 +5,8 @@
  * Right (optional): a "product moment" panel of demo/evidence log lines.
  * All copy is plain text (auto-escaped); no raw HTML is rendered.
  */
-import type { MarketingHeroBlock } from "@/lib/storyblok/content-model";
-import MarketingCtas from "@/components/marketing/MarketingCtas.astro";
+import type { MarketingHeroBlock } from "@/lib/content/storyblok/content-model";
+import MarketingCtas from "@/components/content/storefront/marketing/MarketingCtas.astro";
 
 interface Props {
   block: MarketingHeroBlock;

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/ProofStrip.astro

@@ -4,7 +4,7 @@
  * data"). A bold statement + supporting copy + a grid of proof bullets. Painted
  * in the primary color for a single strong moment. Plain text only.
  */
-import type { ProofStripBlock } from "@/lib/storyblok/content-model";
+import type { ProofStripBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: ProofStripBlock;
 }

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/SplitCompare.astro

@@ -4,8 +4,8 @@
  * patchwork" vs "one platform"). The `before` column reads as the problem
  * (muted, ⚠) and `after` as the solution (accent, ✓).
  */
-import Section from "@/components/Section.astro";
-import type { SplitCompareBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import type { SplitCompareBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: SplitCompareBlock;
 }

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/Steps.astro

@@ -3,8 +3,8 @@
  * <Steps> — a numbered/emoji journey (e.g. the checkout verification flow).
  * Renders as a horizontal-scrolling rail on small screens, a wrapped row above.
  */
-import Section from "@/components/Section.astro";
-import type { StepsBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import type { StepsBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: StepsBlock;
 }

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/Testimonials.astro

@@ -3,8 +3,8 @@
  * <Testimonials> — outcome/quote cards with an optional stat lead-in and
  * attribution, plus an optional row of rating tokens. Plain text only.
  */
-import Section from "@/components/Section.astro";
-import type { TestimonialsBlock } from "@/lib/storyblok/content-model";
+import Section from "@/components/content/storefront/Section.astro";
+import type { TestimonialsBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: TestimonialsBlock;
 }

package/apps/storefront/src/components/{marketing → content/storefront/marketing}/TrustBar.astro

@@ -3,7 +3,7 @@
  * <TrustBar> — a quiet horizontal strip of proof tokens (countries, standards,
  * platform names, ratings). Plain text, dot-separated on small screens.
  */
-import type { TrustBarBlock } from "@/lib/storyblok/content-model";
+import type { TrustBarBlock } from "@/lib/content/storyblok/content-model";
 interface Props {
   block: TrustBarBlock;
 }

package/apps/storefront/src/components/{style-guide → content/storefront/style-guide}/StyleGuideNav.astro

@@ -14,7 +14,7 @@
  * aria-current="page". When `headings` is supplied (the guide's H2 outline) a
  * nested table of contents is rendered as in-page anchor links.
  */
-import { styleGuideHref } from "@/lib/styleGuidePaths";
+import { styleGuideHref } from "@/lib/content/shared/styleGuidePaths";
 
 type Active = "index" | "tenant" | "components" | "chrome" | "guide";
 

package/apps/storefront/src/components/{the-build → content/storefront/the-build}/TheBuildIndexView.astro

@@ -5,11 +5,11 @@
 // implements, can't drift between the two routes (the-build sibling of fb-1791301493691-brzl6f —
 // mirrors @/components/blog/BlogIndexView.astro).
 import Layout from "@/layouts/Layout.astro";
-import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
-import type { BlogPostSummary } from "@/lib/blog/types.js";
-import type { TheBuildIndexCopy } from "@/lib/the-build/pagination.js";
-import type { BlogPresentation } from "@/lib/blog/presentation.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import PostAccessBadge from "@/components/content/storefront/blog/PostAccessBadge.astro";
+import type { BlogPostSummary } from "@/lib/content/blog/types.js";
+import type { TheBuildIndexCopy } from "@/lib/content/the-build/pagination.js";
+import type { BlogPresentation } from "@/lib/content/blog/presentation.js";
+import { collectionPathsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 interface Props {
   basePath: string;

package/apps/storefront/src/components/customers/storefront/islands/SavedList.tsx

@@ -11,8 +11,8 @@ import {
   WISHLIST_EVENT,
   type SavedItem,
 } from "@/lib/customers/shared/wishlist";
-import { formatPrice } from "@/lib/format";
-import { placeholderDataUri, isUsableImageUrl } from "@/lib/placeholder";
+import { formatPrice } from "@/lib/content/shared/format";
+import { placeholderDataUri, isUsableImageUrl } from "@/lib/content/shared/placeholder";
 import { withClientBase } from "@/lib/basePath";
 
 interface Props {

package/apps/storefront/src/layouts/Layout.astro

@@ -8,10 +8,10 @@ import "@/styles/global.css";
 // Self-hosted web fonts (audit finding 6) — replaces the render-blocking
 // fonts.googleapis.com stylesheet. Bundled by Vite, served same-origin.
 import "@/styles/fonts.css";
-import Seo from "@/components/Seo.astro";
-import AnnouncementBar from "@/components/chrome/AnnouncementBar.astro";
-import SiteHeader from "@/components/chrome/SiteHeader.astro";
-import SiteFooter from "@/components/chrome/SiteFooter.astro";
+import Seo from "@/components/content/storefront/Seo.astro";
+import AnnouncementBar from "@/components/content/storefront/chrome/AnnouncementBar.astro";
+import SiteHeader from "@/components/content/storefront/chrome/SiteHeader.astro";
+import SiteFooter from "@/components/content/storefront/chrome/SiteFooter.astro";
 import QuickView from "@/components/catalog/storefront/islands/QuickView.tsx";
 import CheckoutLoader from "@/components/checkout/storefront/commerce/CheckoutLoader.astro";
 import CartDrawerStyles from "@/components/checkout/storefront/commerce/CartDrawerStyles.astro";
@@ -24,18 +24,18 @@ import IsolatedAgeGate from "@/components/compliance/storefront/islands/Isolated
 import AuthBadge from "@/components/auth/AuthBadge.astro";
 import { referenceTheme } from "@/themes/reference";
 import { mergeTheme } from "@/themes/schema";
-import { organizationLd, websiteLd } from "@/lib/jsonld";
-import { composeStructuredData, structuredDataProfile, type StructuredDataPage } from "@/lib/seo/structuredData";
-import { canonicalUrl } from "@/lib/seo/urlForm";
-import { documentTitle } from "@/lib/seo/documentTitle";
-import { nonceInlineTags, prefixApiFormActions, CHROME_BODY_MARKER } from "@/lib/rawMarketingHtml";
-import { CHROME_BEHAVIOR_JS, CHROME_HEAD_JS, sanitizeSharedChromeFragment } from "@/lib/rawChrome";
-import { ASYNC_CSS_SWAP_JS } from "@/lib/asyncCss";
-import { reportTrackingChainHealth } from "@/lib/tracking/interactionHealth";
-import { resolveHeaderVariant, resolveFooterVariant } from "@/lib/chrome/variant";
-import { splitFooterLegal } from "@/lib/chrome/footerLegal";
-import { bindManagedCartAnchors, managedCartHref } from "@/lib/chrome/managedCart";
-import type { HeaderVariant, FooterVariant } from "@/lib/chrome/model";
+import { organizationLd, websiteLd } from "@/lib/content/shared/jsonld";
+import { composeStructuredData, structuredDataProfile, type StructuredDataPage } from "@/lib/content/seo/structuredData";
+import { canonicalUrl } from "@/lib/content/seo/urlForm";
+import { documentTitle } from "@/lib/content/seo/documentTitle";
+import { nonceInlineTags, prefixApiFormActions, CHROME_BODY_MARKER } from "@/lib/content/shared/rawMarketingHtml";
+import { CHROME_BEHAVIOR_JS, CHROME_HEAD_JS, sanitizeSharedChromeFragment } from "@/lib/content/shared/rawChrome";
+import { ASYNC_CSS_SWAP_JS } from "@/lib/content/shared/asyncCss";
+import { reportTrackingChainHealth } from "@/lib/measurement/tracking/interactionHealth";
+import { resolveHeaderVariant, resolveFooterVariant } from "@/lib/content/chrome/variant";
+import { splitFooterLegal } from "@/lib/content/chrome/footerLegal";
+import { bindManagedCartAnchors, managedCartHref } from "@/lib/content/chrome/managedCart";
+import type { HeaderVariant, FooterVariant } from "@/lib/content/chrome/model";
 import { renderIntegrationPhases, INTERACTION_TRACKING_BOOT_JS } from "@tot/public-runtime";
 import { readViewerSession } from "@/lib/auth/route";
 import AppWidgetFrame from "@/components/integrations/storefront/apps/AppWidgetFrame.astro";
@@ -54,7 +54,7 @@ interface Props {
   jsonLd?: Record<string, unknown> | Record<string, unknown>[];
   /**
    * What the page knows about itself for the tenant's declared structured-data profile
-   * (lib/seo/structuredData.ts). When the profile declares a graph for `pageType`, that graph
+   * (lib/content/seo/structuredData.ts). When the profile declares a graph for `pageType`, that graph
    * is the page's ONLY JSON-LD and `jsonLd` is not emitted.
    */
   structuredData?: StructuredDataPage;
@@ -66,7 +66,7 @@ interface Props {
   fullBleed?: boolean;
   /**
    * Explicit per-page header/footer content-variant override (see
-   * lib/chrome/model.ts HeaderVariant/FooterVariant). NEVER inferred from the
+   * lib/content/chrome/model.ts HeaderVariant/FooterVariant). NEVER inferred from the
    * route/CSS/title — a page that wants e.g. a minimal checkout header sets
    * this prop. Absent ⇒ the tenant's chrome-config default
    * (chrome.header.variant / chrome.footer.variant). An unrecognized value
@@ -76,7 +76,7 @@ interface Props {
   headerVariant?: HeaderVariant;
   footerVariant?: FooterVariant;
   // --- Article SEO hardening: pass-through to <Seo> (all additive) ---
-  article?: import("@/lib/seo/meta.js").ArticleMeta;
+  article?: import("@/lib/content/seo/meta.js").ArticleMeta;
   imageAlt?: string;
   imageWidth?: number;
   imageHeight?: number;
@@ -86,7 +86,7 @@ interface Props {
   // --- hreflang / <html lang> (additive) ---
   /** Per-variant `hreflang` alternates for a translated article; threaded to
    *  <Seo>. Absent/empty ⇒ no alternate links (singleton unchanged). */
-  alternates?: import("@/lib/seo/alternates.js").Alternate[];
+  alternates?: import("@/lib/content/seo/alternates.js").Alternate[];
   /** Overrides `<html lang>` (e.g. a translated article's `inLanguage`). Absent ⇒
    *  the tenant-locale default, so non-translated pages are unchanged. */
   lang?: string;
@@ -156,7 +156,7 @@ const chrome = await Astro.locals.content.getChrome();
 
 // Explicit variant resolution (fail-closed): the page's override wins over
 // the tenant's chrome-config default; an unrecognized value throws with an
-// actionable message rather than silently falling back (lib/chrome/variant.ts).
+// actionable message rather than silently falling back (lib/content/chrome/variant.ts).
 const resolvedHeaderVariant = resolveHeaderVariant(headerVariant, chrome.header.variant);
 const resolvedFooterVariant = resolveFooterVariant(footerVariant, chrome.footer.variant);
 const footerCompliance = [chrome.footer.warning, chrome.complianceStrip]
@@ -256,7 +256,7 @@ const themeHeaderLogo =
     ? { src: headerLogoSrc, alt: tenant.displayName }
     : undefined;
 
-// chrome.header.brand (lib/chrome/model.ts ChromeBrand) is the governed,
+// chrome.header.brand (lib/content/chrome/model.ts ChromeBrand) is the governed,
 // schema-validated brand identity — SOURCE OF TRUTH per field when set,
 // falling back to the theme-derived values above only where a field is
 // absent, so a tenant that hasn't authored a brand config is unaffected.
@@ -268,7 +268,7 @@ const headerBrandHref = brand?.href;
 
 // Footer bottom bar: a "Legal"-titled column MOVES out of the grid and its
 // links render beside the copyright — one shared split with the raw renderer
-// (lib/chrome/footerLegal.ts), so neither surface can duplicate them.
+// (lib/content/chrome/footerLegal.ts), so neither surface can duplicate them.
 const { gridColumns: footerColumns, legalLinks: bottomLinks } = splitFooterLegal(
   chrome.footer.columns,
 );
@@ -636,7 +636,7 @@ const footerWidgets = await renderWidgetSlot(
 
     {/* Swaps every <AsyncStylesheet>-rendered preload link to rel="stylesheet"
         once fetched. ONE nonced script per document handles every such link,
-        however many <AsyncStylesheet> instances rendered (lib/asyncCss.ts —
+        however many <AsyncStylesheet> instances rendered (lib/content/shared/asyncCss.ts —
         the onload="" attribute trick can't carry a nonce under this CSP). A
         no-op when the page has none. */}
     <script is:inline nonce={cspNonce} set:html={ASYNC_CSS_SWAP_JS}></script>

package/apps/storefront/src/lib/assets/shared/imageAttrs.ts

@@ -8,7 +8,7 @@
  *   - referenced Shopify CDN -> Shopify's native ?width= scheme
  *   - anything else usable   -> the URL as-is, no srcset
  */
-import { placeholderDataUri, isUsableImageUrl } from "../../placeholder.js";
+import { placeholderDataUri, isUsableImageUrl } from "../../content/shared/placeholder.js";
 
 const RESPONSIVE_IMAGE_WIDTHS = [320, 480, 640, 960, 1280, 1600] as const;
 

package/apps/storefront/src/lib/basePath.ts

@@ -34,7 +34,7 @@
  * covers that one, so the two cannot drift apart unnoticed.
  *
  * Consumers: {@link withBase} (and through it {@link bindBasePathAnchors}) and
- * `prefixTenantLinks` (lib/rawMarketingHtml.ts).
+ * `prefixTenantLinks` (lib/content/shared/rawMarketingHtml.ts).
  */
 export const ROOT_SERVED_HREF_NAMESPACES = [
   "_a",

package/apps/storefront/src/lib/catalog/shared/featuredProductsPresentation.ts

@@ -1,4 +1,4 @@
-import type { FeaturedProductsBlock } from "@/lib/storyblok/content-model";
+import type { FeaturedProductsBlock } from "@/lib/content/storyblok/content-model";
 
 export function featuredProductsPresentationView(presentation: FeaturedProductsBlock["presentation"]) {
   return presentation === "carousel" ? "carousel" : "grid";

package/apps/storefront/src/lib/catalog/tot/tenantCatalog.ts

@@ -26,7 +26,7 @@ import {
   readCatalogListing,
   type CatalogStore,
 } from "@tot/public-runtime/catalog-files";
-import { LocalContentProvider, type ContentProvider } from "../../storyblok/provider.js";
+import { LocalContentProvider, type ContentProvider } from "../../content/storyblok/provider.js";
 
 export type CatalogArtifactSource = Pick<
   ContentProvider,

package/apps/storefront/src/lib/{blog → content/blog}/collection.ts

@@ -6,7 +6,7 @@ import {
 } from "@tot/public-runtime";
 import type { AuthorBio, BlogPost, BlogPostSummary, BlogSettings, PostStatus } from "./types.js";
 import type { ContentProvider } from "../storyblok/provider.js";
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 type ArtifactSource = Pick<ContentProvider, "readArtifact" | "listArtifactPaths">;
 function canReadArtifacts(value: ArtifactSource | undefined): value is ArtifactSource {
@@ -29,29 +29,29 @@ export interface Collection {
 // is the set of `posts/*.json` files — there is no hand-maintained index.json.
 const postGlobs = import.meta.glob<BlogPost>(
   [
-    "../../../../../tenants/*/content/*/posts/*.json",
-    "../../../../../tenants/e2e/*/content/*/posts/*.json",
+    "../../../../../../tenants/*/content/*/posts/*.json",
+    "../../../../../../tenants/e2e/*/content/*/posts/*.json",
   ],
   { import: "default" },
 );
 const redirectGlobs = import.meta.glob<Record<string, string>>(
   [
-    "../../../../../tenants/*/content/*/redirects.json",
-    "../../../../../tenants/e2e/*/content/*/redirects.json",
+    "../../../../../../tenants/*/content/*/redirects.json",
+    "../../../../../../tenants/e2e/*/content/*/redirects.json",
   ],
   { import: "default" },
 );
 const authorsGlobs = import.meta.glob<Record<string, AuthorBio>>(
   [
-    "../../../../../tenants/*/content/*/authors.json",
-    "../../../../../tenants/e2e/*/content/*/authors.json",
+    "../../../../../../tenants/*/content/*/authors.json",
+    "../../../../../../tenants/e2e/*/content/*/authors.json",
   ],
   { import: "default" },
 );
 const settingsGlobs = import.meta.glob<BlogSettings>(
   [
-    "../../../../../tenants/*/content/*/settings.json",
-    "../../../../../tenants/e2e/*/content/*/settings.json",
+    "../../../../../../tenants/*/content/*/settings.json",
+    "../../../../../../tenants/e2e/*/content/*/settings.json",
   ],
   { import: "default" },
 );

package/apps/storefront/src/lib/{blog → content/blog}/postView.ts

@@ -15,12 +15,12 @@ import {
   type BlogPresentation,
   type ShareLink,
 } from "./presentation.js";
-import { homeCrumbLabel, siteTrail, type Crumb } from "@/lib/breadcrumbs.js";
+import { homeCrumbLabel, siteTrail, type Crumb } from "@/lib/content/shared/breadcrumbs.js";
 import { viewerHasBlogAccess } from "./access.js";
 import { articleBodyHtml } from "./teaser.js";
 import { readViewerSession, safeNext } from "@/lib/auth/route.js";
-import { buildAlternates, type Alternate } from "@/lib/seo/alternates.js";
-import { breadcrumbLd, blogPostingLd } from "@/lib/jsonld.js";
+import { buildAlternates, type Alternate } from "@/lib/content/seo/alternates.js";
+import { breadcrumbLd, blogPostingLd } from "@/lib/content/shared/jsonld.js";
 import { collectionPathsV1, blogPathOptsV1 } from "./collectionPaths.js";
 import type { BlogPost } from "./types.js";
 import type { SessionRecord } from "@/lib/auth/session.js";

package/apps/storefront/src/lib/{blog → content/blog}/provider.ts

@@ -13,7 +13,7 @@ import {
 import { getIndexSettings, listPosts } from "./collection.js";
 import type { BlogPost, BlogPostSummary, BlogSettings } from "./types.js";
 import type { ContentProvider } from "../storyblok/provider.js";
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 /** The collection id `/blog` reads — the derived fallback's second argument. */
 const BLOG_COLLECTION = "blog";
@@ -34,22 +34,22 @@ async function visibilityTimestamp(explicit?: string | null): Promise<string | n
 // tenant's keys back up.
 const indexGlobs = import.meta.glob<BlogPostSummary[]>(
   [
-    "../../../../../tenants/*/content/blog/index.json",
-    "../../../../../tenants/e2e/*/content/blog/index.json",
+    "../../../../../../tenants/*/content/blog/index.json",
+    "../../../../../../tenants/e2e/*/content/blog/index.json",
   ],
   { import: "default" },
 );
 const postGlobs = import.meta.glob<BlogPost>(
   [
-    "../../../../../tenants/*/content/blog/posts/*.json",
-    "../../../../../tenants/e2e/*/content/blog/posts/*.json",
+    "../../../../../../tenants/*/content/blog/posts/*.json",
+    "../../../../../../tenants/e2e/*/content/blog/posts/*.json",
   ],
   { import: "default" },
 );
 const redirectGlobs = import.meta.glob<Record<string, string>>(
   [
-    "../../../../../tenants/*/content/blog/redirects.json",
-    "../../../../../tenants/e2e/*/content/blog/redirects.json",
+    "../../../../../../tenants/*/content/blog/redirects.json",
+    "../../../../../../tenants/e2e/*/content/blog/redirects.json",
   ],
   { import: "default" },
 );

package/apps/storefront/src/lib/{chrome → content/chrome}/footerLegal.ts

@@ -1,7 +1,7 @@
 /**
  * The footer's Legal split — ONE source of truth for both renderers (the
- * raw-string footer in lib/rawChrome.ts and the component footer in
- * components/chrome/SiteFooter.astro), so a tenant's `Legal` column can never
+ * raw-string footer in lib/content/shared/rawChrome.ts and the component footer in
+ * components/content/storefront/chrome/SiteFooter.astro), so a tenant's `Legal` column can never
  * land in the grid on one surface and in the bottom bar on the other.
  *
  * Contract, title-based (no extra schema field): a footer column titled

package/apps/storefront/src/lib/{chrome → content/chrome}/trackingPlacements.ts

@@ -26,7 +26,7 @@ export const CHROME_PLACEMENT = {
   /**
    * Footer bottom legal/policy link row, on either surface — the links of a
    * `Legal`-titled footer column, which both renderers move out of the grid and
-   * into the bottom bar (lib/chrome/footerLegal.ts). `ChromeFooter.bottom`
+   * into the bottom bar (lib/content/chrome/footerLegal.ts). `ChromeFooter.bottom`
    * itself carries text only.
    */
   footerBottom: "footer-bottom",

package/apps/storefront/src/lib/{seo → content/seo}/faqItems.ts

@@ -1,6 +1,6 @@
 /**
  * The question/answer pairs a page visibly carries, for a declared FAQPage node
- * (lib/seo/structuredData.ts). Derived from the rendered content itself, so the markup can never
+ * (lib/content/seo/structuredData.ts). Derived from the rendered content itself, so the markup can never
  * claim an answer the page does not show: a heading phrased as a question, answered by the text
  * up to the next heading. Fewer than two pairs is not an FAQ.
  */

package/apps/storefront/src/lib/{seo → content/seo}/structuredData.ts

@@ -16,7 +16,7 @@ import type {
   StructuredDataPageType,
   TenantConfig,
 } from "@tot/public-runtime";
-import { productLd } from "../jsonld.js";
+import { productLd } from "../shared/jsonld.js";
 import { pageUrlForm } from "./urlForm.js";
 
 type Node = Record<string, unknown>;

package/apps/storefront/src/lib/{breadcrumbs.ts → content/shared/breadcrumbs.ts}

@@ -1,4 +1,4 @@
-import type { ChromeConfig } from "./chrome/model.js";
+import type { ChromeConfig } from "../chrome/model.js";
 
 /**
  * One breadcrumb trail per page. A page builds it ONCE with `siteTrail` and hands the same array

package/apps/storefront/src/lib/{heroSlideshow.ts → content/shared/heroSlideshow.ts}

@@ -1,4 +1,4 @@
-import type { HeroBlock } from "@/lib/storyblok/content-model";
+import type { HeroBlock } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 export function heroAutoplayAllowed(input: {

package/apps/storefront/src/lib/{homeVisualParity.ts → content/shared/homeVisualParity.ts}

@@ -12,7 +12,7 @@ import type {
   MembershipBandBlock,
   NewsletterBlock,
   PromoTilesBlock,
-} from "@/lib/storyblok/content-model";
+} from "@/lib/content/storyblok/content-model";
 
 export type CommerceStaticResolved =
   | { kind: "promo_tiles"; block: PromoTilesBlock }

package/apps/storefront/src/lib/{jsonld.ts → content/shared/jsonld.ts}

@@ -3,7 +3,7 @@
  * BreadcrumbList, Organization. Kept pure so pages compose them and pass to <Seo>.
  */
 import type { CatalogProduct, Review, TenantConfig } from "@tot/public-runtime";
-import { isAvailable } from "./catalog/tot/query.js";
+import { isAvailable } from "../../catalog/tot/query.js";
 
 export function organizationLd(tenant: TenantConfig, base: string) {
   // Logo sourced from the migrated brand assets (og image / logo), so the

package/apps/storefront/src/lib/{rawChrome.ts → content/shared/rawChrome.ts}

@@ -2,12 +2,12 @@
  * Canonical RAW chrome renderer.
  *
  * ONE platform-shipped chrome wrapper, driven entirely by a tenant's `chrome.json`
- * (typed `ChromeConfig`, lib/chrome/model.ts) — CONTENT ONLY. It replaces the three
+ * (typed `ChromeConfig`, lib/content/chrome/model.ts) — CONTENT ONLY. It replaces the three
  * divergent, hand-authored `content/<tenant>/chrome.html` documents with a single
  * generator, so chrome lives in ONE place and a tenant supplies only data. The
  * output is a full wrapper document carrying the splice markers the rawMarketingHtml
  * pipeline understands (`<!--PAGE_HEAD-->` / `<!--PAGE_BODY-->`), so body-only page
- * fragments get wrapped exactly as before (see lib/rawMarketingHtml.ts,
+ * fragments get wrapped exactly as before (see lib/content/shared/rawMarketingHtml.ts,
  * wrapFragmentInChrome). Two governing constraints:
  *   - Single stylesheet: the wrapper LINKS the platform stylesheet
  *     (/shared/commerce-chrome.css) and emits NO inline chrome CSS — every
@@ -25,11 +25,11 @@
  * defense-in-depth, not a sanitizer for untrusted input.
  */
 import { CHROME_BODY_MARKER, CHROME_HEAD_MARKER } from "./rawMarketingHtml.js";
-import { isCurrentNavHref } from "./chrome/navCurrent.js";
-import { ctaIdentityAttr } from "./chrome/ctaIdentity.js";
-import { CHROME_PLACEMENT } from "./chrome/trackingPlacements.js";
-import { LEGAL_NAV_LABEL, splitFooterLegal } from "./chrome/footerLegal.js";
-import { resolveNewsletterAgeAttestation } from "./chrome/newsletterAgeAttestation.js";
+import { isCurrentNavHref } from "../chrome/navCurrent.js";
+import { ctaIdentityAttr } from "../chrome/ctaIdentity.js";
+import { CHROME_PLACEMENT } from "../chrome/trackingPlacements.js";
+import { LEGAL_NAV_LABEL, splitFooterLegal } from "../chrome/footerLegal.js";
+import { resolveNewsletterAgeAttestation } from "../chrome/newsletterAgeAttestation.js";
 import { trackingAttributesHtml } from "@tot/public-runtime";
 import type {
   ChromeAgeGate,
@@ -46,9 +46,9 @@ import type {
   ChromeUtilityNav,
   HeaderVariant,
   SocialLink,
-} from "./chrome/model.js";
-import { isSafeAgeGateHref, resolveAgeGateCopy, resolveChromeAssignment } from "./chrome/model.js";
-import { resolveHeaderVariant } from "./chrome/variant.js";
+} from "../chrome/model.js";
+import { isSafeAgeGateHref, resolveAgeGateCopy, resolveChromeAssignment } from "../chrome/model.js";
+import { resolveHeaderVariant } from "../chrome/variant.js";
 
 /** HTML-escape text/attribute content. Covers the five significant characters. */
 function esc(value: string): string {
@@ -295,7 +295,7 @@ function renderSearchForm(search: ChromeSearch, inMenu = false): string {
 
 /**
  * Labelled header action links, in authored order. A `kind: "cart"` link carries
- * the `cart` class, so bindManagedCartAnchors (lib/chrome/managedCart.ts) binds it
+ * the `cart` class, so bindManagedCartAnchors (lib/content/chrome/managedCart.ts) binds it
  * to the managed checkout exactly like the icon cart.
  */
 function renderActionLinks(links: ChromeHeaderActionLink[]): string {
@@ -526,7 +526,7 @@ function renderFooter(footer: ChromeFooter): string {
           return `      <div class="footer-brand">${logo}${text}${news}</div>\n`;
         })()
       : "";
-  // A `Legal`-titled column moves to the bottom bar (lib/chrome/footerLegal.ts)
+  // A `Legal`-titled column moves to the bottom bar (lib/content/chrome/footerLegal.ts)
   // — scope indices count RENDERED grid columns, so they describe where a link
   // actually is rather than where it sat in the authored array.
   const { gridColumns, legalLinks } = splitFooterLegal(footer.columns);

package/apps/storefront/src/lib/{rawMarketingHtml.ts → content/shared/rawMarketingHtml.ts}

@@ -22,9 +22,9 @@ import {
   type EffectivePlan,
   type ConsentSnapshot,
 } from "@tot/public-runtime";
-import { reportTrackingChainHealth } from "./tracking/interactionHealth.js";
+import { reportTrackingChainHealth } from "../../measurement/tracking/interactionHealth.js";
 import { ASYNC_CSS_SWAP_JS } from "./asyncCss.js";
-import { ROOT_SERVED_HREF_NAMESPACES } from "./basePath.js";
+import { ROOT_SERVED_HREF_NAMESPACES } from "../../basePath.js";
 
 export { rawHtmlPolicy } from "@tot/public-runtime";
 
@@ -139,7 +139,7 @@ export function interactionTrackingScript(nonce: string): string {
 /**
  * Swaps every `data-async-css`-tagged `<link rel="preload">` to
  * `rel="stylesheet"` once fetched — the raw-mount half of the
- * `<AsyncStylesheet>` primitive (lib/asyncCss.ts; Layout.astro is the other,
+ * `<AsyncStylesheet>` primitive (lib/content/shared/asyncCss.ts; Layout.astro is the other,
  * same one-engine-two-mounts discipline as {@link interactionTrackingScript}).
  * A raw-HTML tenant hand-authors the plain `<link rel="preload" as="style"
  * data-async-css>` + `<noscript>` markup directly (no Astro component