@tokenoftrust/storefront-runner 2.4.87 → 2.4.88

package/apps/storefront/src/pages/blog/[slug].astro

@@ -1,6 +1,6 @@
 ---
-import BlogPostArticle from "@/components/blog/BlogPostArticle.astro";
-import { loadBlogPostViewV1 } from "@/lib/blog/postView.js";
+import BlogPostArticle from "@/components/content/storefront/blog/BlogPostArticle.astro";
+import { loadBlogPostViewV1 } from "@/lib/content/blog/postView.js";
 
 // These redirects also exist in the published artifact: the publication composition lifts this
 // file into the space's `routes.aliases`, which reach the CDN plane through the live pointer. The

package/apps/storefront/src/pages/blog/author/[author].astro

@@ -1,13 +1,13 @@
 ---
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
-import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
-import { authorSlug, getAuthors } from "@/lib/blog/collection.js";
-import { breadcrumbLd } from "@/lib/jsonld.js";
-import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import PostAccessBadge from "@/components/content/storefront/blog/PostAccessBadge.astro";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
+import { resolveBlogPresentation } from "@/lib/content/blog/presentation.js";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs.js";
+import { authorSlug, getAuthors } from "@/lib/content/blog/collection.js";
+import { breadcrumbLd } from "@/lib/content/shared/jsonld.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 // Author archive for the `/blog` collection. Lists exactly the posts whose
 // bylines link here (same source as /blog/index.astro + /blog/[slug].astro),

package/apps/storefront/src/pages/blog/category/[category].astro

@@ -1,13 +1,13 @@
 ---
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import PostGrid from "@/components/blog/PostGrid.astro";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
-import { collectPostsByTerm } from "@/lib/blog/collection.js";
-import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
-import { breadcrumbLd } from "@/lib/jsonld.js";
-import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import PostGrid from "@/components/content/storefront/blog/PostGrid.astro";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
+import { collectPostsByTerm } from "@/lib/content/blog/collection.js";
+import { resolveBlogPresentation } from "@/lib/content/blog/presentation.js";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs.js";
+import { breadcrumbLd } from "@/lib/content/shared/jsonld.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 const { tenant, basePath, canonicalBase, content, publicationTimestamp } = Astro.locals;
 const param = Astro.params.category ?? "";

package/apps/storefront/src/pages/blog/index.astro

@@ -1,8 +1,8 @@
 ---
-import BlogIndexView from "@/components/blog/BlogIndexView.astro";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
-import { paginateBlogPosts, resolveBlogIndexCopy } from "@/lib/blog/pagination.js";
-import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
+import BlogIndexView from "@/components/content/storefront/blog/BlogIndexView.astro";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
+import { paginateBlogPosts, resolveBlogIndexCopy } from "@/lib/content/blog/pagination.js";
+import { resolveBlogPresentation } from "@/lib/content/blog/presentation.js";
 
 const { tenant, basePath, canonicalBase, content, publicationTimestamp } = Astro.locals;
 const posts = await listBlogPosts(tenant.tenant_id, content, publicationTimestamp);

package/apps/storefront/src/pages/blog/page/[n].astro

@@ -2,10 +2,10 @@
 // /blog/page/<n>/ — page N≥2 of the blog index. Page 1 lives at /blog/
 // (src/pages/blog/index.astro); both render through the same BlogIndexView so the
 // tenant-copy + pagination contract can't drift between the two routes.
-import BlogIndexView from "@/components/blog/BlogIndexView.astro";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
-import { paginateBlogPosts, parseBlogPageParam, resolveBlogIndexCopy } from "@/lib/blog/pagination.js";
-import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
+import BlogIndexView from "@/components/content/storefront/blog/BlogIndexView.astro";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
+import { paginateBlogPosts, parseBlogPageParam, resolveBlogIndexCopy } from "@/lib/content/blog/pagination.js";
+import { resolveBlogPresentation } from "@/lib/content/blog/presentation.js";
 
 const page = parseBlogPageParam(Astro.params.n);
 if (page === null) return new Response(null, { status: 404 });

package/apps/storefront/src/pages/blog/tag/[tag].astro

@@ -1,13 +1,13 @@
 ---
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import PostGrid from "@/components/blog/PostGrid.astro";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
-import { collectPostsByTerm } from "@/lib/blog/collection.js";
-import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
-import { breadcrumbLd } from "@/lib/jsonld.js";
-import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import PostGrid from "@/components/content/storefront/blog/PostGrid.astro";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
+import { collectPostsByTerm } from "@/lib/content/blog/collection.js";
+import { resolveBlogPresentation } from "@/lib/content/blog/presentation.js";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs.js";
+import { breadcrumbLd } from "@/lib/content/shared/jsonld.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 const { tenant, basePath, canonicalBase, content, publicationTimestamp } = Astro.locals;
 const param = Astro.params.tag ?? "";

package/apps/storefront/src/pages/cart.ts

@@ -1,5 +1,5 @@
 import type { APIRoute } from "astro";
-import { managedCartHref } from "@/lib/chrome/managedCart.js";
+import { managedCartHref } from "@/lib/content/chrome/managedCart.js";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/collections/[handle].astro

@@ -6,20 +6,20 @@
  * override later — documented seam).
  */
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
 import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
-import EmptyState from "@/components/EmptyState.astro";
+import EmptyState from "@/components/content/storefront/EmptyState.astro";
 import FacetSidebar from "@/components/catalog/storefront/plp/FacetSidebar.astro";
 import ActiveFilters from "@/components/catalog/storefront/plp/ActiveFilters.astro";
 import SortSelect from "@/components/catalog/storefront/plp/SortSelect.astro";
 import Pagination from "@/components/catalog/storefront/plp/Pagination.astro";
 import Img from "@/components/assets/storefront/Img.astro";
 import { parseQuery, buildQueryString } from "@/lib/url";
-import { breadcrumbLd, itemListLd } from "@/lib/jsonld";
-import { truncate } from "@/lib/format";
-import { pageUrlForm } from "@/lib/seo/urlForm";
-import { sourceSeoTitle } from "@/lib/seo/documentTitle";
+import { breadcrumbLd, itemListLd } from "@/lib/content/shared/jsonld";
+import { truncate } from "@/lib/content/shared/format";
+import { pageUrlForm } from "@/lib/content/seo/urlForm";
+import { sourceSeoTitle } from "@/lib/content/seo/documentTitle";
 import { withBase } from "@/lib/basePath";
 import { isBlankDescriptionHtml, sanitizeDescriptionHtml } from "@/lib/content/sanitizeDescriptionHtml";
 

package/apps/storefront/src/pages/collections/index.astro

@@ -4,11 +4,11 @@
  * one per collection (product counts from the collection record's handles).
  */
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
 import CollectionCard from "@/components/catalog/storefront/CollectionCard.astro";
-import EmptyState from "@/components/EmptyState.astro";
-import { breadcrumbLd } from "@/lib/jsonld";
+import EmptyState from "@/components/content/storefront/EmptyState.astro";
+import { breadcrumbLd } from "@/lib/content/shared/jsonld";
 import { activeMemberCount, nonEmptyCollections } from "@/lib/catalog/tot/query";
 
 const { tenant, tot, canonicalBase } = Astro.locals;

package/apps/storefront/src/pages/index.astro

@@ -7,19 +7,19 @@
  * the template renders simple typed view-models.
  */
 import Layout from "@/layouts/Layout.astro";
-import Section from "@/components/Section.astro";
-import Hero from "@/components/home/Hero.astro";
+import Section from "@/components/content/storefront/Section.astro";
+import Hero from "@/components/content/storefront/home/Hero.astro";
 import ProductCarousel from "@/components/catalog/storefront/commerce/ProductCarousel.astro";
 import ProductGrid from "@/components/catalog/storefront/commerce/ProductGrid.astro";
 import CollectionCard from "@/components/catalog/storefront/CollectionCard.astro";
 import Img from "@/components/assets/storefront/Img.astro";
-import PromoTiles from "@/components/content/PromoTiles.astro";
-import TrustStrip from "@/components/content/TrustStrip.astro";
-import Faq from "@/components/marketing/Faq.astro";
-import MarketingBlocks from "@/components/marketing/MarketingBlocks.astro";
+import PromoTiles from "@/components/content/storefront/content/PromoTiles.astro";
+import TrustStrip from "@/components/content/storefront/content/TrustStrip.astro";
+import Faq from "@/components/content/storefront/marketing/Faq.astro";
+import MarketingBlocks from "@/components/content/storefront/marketing/MarketingBlocks.astro";
 import TierCards from "@/components/membership/storefront/membership/TierCards.astro";
 import { withBase } from "@/lib/basePath";
-import { rawHtmlPolicy, rawHtmlResponse } from "@/lib/rawMarketingHtml";
+import { rawHtmlPolicy, rawHtmlResponse } from "@/lib/content/shared/rawMarketingHtml";
 import { renderRawComplianceTop, renderRawComplianceBottom } from "@/lib/compliance/rawComplianceNotices";
 import AppWidgetFrame from "@/components/integrations/storefront/apps/AppWidgetFrame.astro";
 import { getRegistryService } from "@/lib/integrations/apps/registryAccess.js";
@@ -30,18 +30,18 @@ import {
   type HeroBlock,
   type MarketingBlock,
   type FeaturedProductsBlock,
-} from "@/lib/storyblok/content-model";
+} from "@/lib/content/storyblok/content-model";
 import type { Tier } from "@/lib/membership/model";
 import {
   normalizeProductSectionSource,
 } from "@tot/public-runtime";
-import { resolveSectionSource } from "@/lib/sections";
+import { resolveSectionSource } from "@/lib/content/shared/sections";
 import { featuredProductsPresentationView } from "@/lib/catalog/shared/featuredProductsPresentation";
 import {
   editorialMediaView,
   resolveCommerceStaticBlock,
   type CommerceStaticResolved,
-} from "@/lib/homeVisualParity";
+} from "@/lib/content/shared/homeVisualParity";
 
 const { tenant, tot, content, basePath, apiBasePath, canonicalBase, features, capabilities } = Astro.locals;
 const marketing = !features.catalog;

package/apps/storefront/src/pages/llms.txt.ts

@@ -11,7 +11,7 @@
  */
 import type { APIContext } from "astro";
 import { nonEmptyCollections } from "@/lib/catalog/tot/query.js";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
 import { compileRouteTierIndexV1 } from "@tot/public-runtime";
 import { readKv } from "@/lib/runtimeEnv.js";
 import {
@@ -20,7 +20,7 @@ import {
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
-import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 /** Collapse HTML/whitespace to a single trimmed line for a link description. */
 function oneLine(s: string | undefined, max = 140): string | undefined {

package/apps/storefront/src/pages/products/[handle].astro

@@ -6,11 +6,11 @@
  * Product + BreadcrumbList JSON-LD.
  */
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
-import Badge from "@/components/Badge.astro";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
+import Badge from "@/components/content/storefront/Badge.astro";
 import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
-import Section from "@/components/Section.astro";
+import Section from "@/components/content/storefront/Section.astro";
 import ImageGallery from "@/components/catalog/storefront/islands/ImageGallery.tsx";
 import VariantSelector, { publicSelectorVariants } from "@/components/catalog/storefront/islands/VariantSelector.tsx";
 import CheckoutComplianceGate from "@/components/compliance/storefront/islands/CheckoutComplianceGate.tsx";
@@ -41,14 +41,14 @@ import type {
 import { resolveCartSigning, shopperCheckoutUnavailableHtml } from "@/lib/checkout/shared/checkoutCommerce";
 import { isRegulatedTenant } from "@/lib/compliance/enforcement";
 import { resolveMemberContext } from "@/lib/membership/eligibility";
-import { truncate } from "@/lib/format";
-import { productLd, breadcrumbLd, reviewLd } from "@/lib/jsonld";
-import { isUsableImageUrl } from "@/lib/placeholder";
+import { truncate } from "@/lib/content/shared/format";
+import { productLd, breadcrumbLd, reviewLd } from "@/lib/content/shared/jsonld";
+import { isUsableImageUrl } from "@/lib/content/shared/placeholder";
 import { withBase } from "@/lib/basePath";
-import { productPageType, structuredDataProfile } from "@/lib/seo/structuredData";
-import { pageUrlForm } from "@/lib/seo/urlForm";
-import { sourceSeoTitle } from "@/lib/seo/documentTitle";
-import { shippingPolicyPath } from "@/lib/commerce/shippingPolicy";
+import { productPageType, structuredDataProfile } from "@/lib/content/seo/structuredData";
+import { pageUrlForm } from "@/lib/content/seo/urlForm";
+import { sourceSeoTitle } from "@/lib/content/seo/documentTitle";
+import { shippingPolicyPath } from "@/lib/content/policies/shippingPolicy";
 import AppWidgetFrame from "@/components/integrations/storefront/apps/AppWidgetFrame.astro";
 import { getRegistryService } from "@/lib/integrations/apps/registryAccess.js";
 import { renderWidgetSlot } from "@/lib/integrations/apps/widgets/renderSlot.js";

package/apps/storefront/src/pages/saved.astro

@@ -4,8 +4,8 @@
  * (SavedList island); noindex since it's per-device and has no stable content.
  */
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
 import SavedList from "@/components/customers/storefront/islands/SavedList.tsx";
 
 const { tenant } = Astro.locals;

package/apps/storefront/src/pages/search.astro

@@ -10,13 +10,13 @@
  *    practice — thin, parameterized, duplicative).
  */
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
 import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
-import EmptyState from "@/components/EmptyState.astro";
-import Section from "@/components/Section.astro";
+import EmptyState from "@/components/content/storefront/EmptyState.astro";
+import Section from "@/components/content/storefront/Section.astro";
 import { toTypeaheadDoc } from "@/lib/catalog/search/index";
-import { breadcrumbLd } from "@/lib/jsonld";
+import { breadcrumbLd } from "@/lib/content/shared/jsonld";
 import { withBase } from "@/lib/basePath";
 
 const { tenant, tot, canonicalBase, basePath } = Astro.locals;

package/apps/storefront/src/pages/sitemap.xml.ts

@@ -10,12 +10,12 @@
  */
 import type { APIContext } from "astro";
 import { nonEmptyCollections } from "@/lib/catalog/tot/query.js";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
-import { authorSlug, categorySlug } from "@/lib/blog/collection.js";
-import { resolveBlogIndexCopy } from "@/lib/blog/pagination.js";
-import { getTheBuildSettings, listBuildPosts } from "@/lib/the-build/provider.js";
-import { resolveTheBuildIndexCopy } from "@/lib/the-build/pagination.js";
-import { isIndexableHtml, rawPageCanonicalUrl } from "@/lib/rawMarketingHtml.js";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
+import { authorSlug, categorySlug } from "@/lib/content/blog/collection.js";
+import { resolveBlogIndexCopy } from "@/lib/content/blog/pagination.js";
+import { getTheBuildSettings, listBuildPosts } from "@/lib/content/the-build/provider.js";
+import { resolveTheBuildIndexCopy } from "@/lib/content/the-build/pagination.js";
+import { isIndexableHtml, rawPageCanonicalUrl } from "@/lib/content/shared/rawMarketingHtml.js";
 import { compileRouteTierIndexV1 } from "@tot/public-runtime";
 import { readKv } from "@/lib/runtimeEnv.js";
 import {
@@ -24,8 +24,8 @@ import {
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
-import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
-import { pageUrlForm } from "@/lib/seo/urlForm.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/content/blog/collectionPaths.js";
+import { pageUrlForm } from "@/lib/content/seo/urlForm.js";
 
 interface SitemapUrl {
   loc: string;

package/apps/storefront/src/pages/style-guide/[tenant]/[theme].astro

@@ -20,8 +20,8 @@ export const prerender = false;
 // utilities + reference theme-token fallbacks so the (token-styled) components
 // render here without the app Layout. The `.sg-commerce` wrapper pins the
 // reference palette so they look coherent regardless of the marketing theme CSS.
-import { loadStyleGuideThemes, styleGuideCompositionSheets } from "@/lib/styleGuideThemes";
-import { styleGuideHref } from "@/lib/styleGuidePaths";
+import { loadStyleGuideThemes, styleGuideCompositionSheets } from "@/lib/content/shared/styleGuideThemes";
+import { styleGuideHref } from "@/lib/content/shared/styleGuidePaths";
 import { derivedTokenDeclarations } from "@/themes/derivedTokens";
 import "@/styles/global.css";
 import PriceDisplay from "@/components/catalog/storefront/commerce/PriceDisplay.astro";
@@ -29,23 +29,23 @@ import RatingStars from "@/components/catalog/storefront/commerce/RatingStars.as
 import ReviewSummary from "@/components/catalog/storefront/commerce/ReviewSummary.astro";
 import ReviewList from "@/components/catalog/storefront/commerce/ReviewList.astro";
 import type { Review } from "@tot/public-runtime";
-import Badge from "@/components/Badge.astro";
+import Badge from "@/components/content/storefront/Badge.astro";
 import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import ProductCarousel from "@/components/catalog/storefront/commerce/ProductCarousel.astro";
 import ProductGrid from "@/components/catalog/storefront/commerce/ProductGrid.astro";
 import BrandGrid from "@/components/catalog/storefront/commerce/BrandGrid.astro";
 import type { Brand } from "@/components/catalog/storefront/commerce/BrandGrid.astro";
-import ArticleCard from "@/components/commerce/ArticleCard.astro";
-import type { Article } from "@/components/commerce/ArticleCard.astro";
+import ArticleCard from "@/components/content/storefront/commerce/ArticleCard.astro";
+import type { Article } from "@/components/content/storefront/commerce/ArticleCard.astro";
 import TagFilterCloud from "@/components/catalog/storefront/commerce/TagFilterCloud.astro";
 import type { TagItem } from "@/components/catalog/storefront/commerce/TagFilterCloud.astro";
-import AnnouncementBar from "@/components/chrome/AnnouncementBar.astro";
-import UtilityNav from "@/components/chrome/UtilityNav.astro";
-import SiteHeader from "@/components/chrome/SiteHeader.astro";
-import MegaMenu from "@/components/chrome/MegaMenu.astro";
-import NavDropdown from "@/components/chrome/NavDropdown.astro";
-import SiteFooter from "@/components/chrome/SiteFooter.astro";
-import { CHROME_PLACEMENT } from "@/lib/chrome/trackingPlacements";
+import AnnouncementBar from "@/components/content/storefront/chrome/AnnouncementBar.astro";
+import UtilityNav from "@/components/content/storefront/chrome/UtilityNav.astro";
+import SiteHeader from "@/components/content/storefront/chrome/SiteHeader.astro";
+import MegaMenu from "@/components/content/storefront/chrome/MegaMenu.astro";
+import NavDropdown from "@/components/content/storefront/chrome/NavDropdown.astro";
+import SiteFooter from "@/components/content/storefront/chrome/SiteFooter.astro";
+import { CHROME_PLACEMENT } from "@/lib/content/chrome/trackingPlacements";
 import NicotineWarning from "@/components/compliance/storefront/compliance/NicotineWarning.astro";
 import { NICOTINE_WARNING_PRESETS } from "../../../../../../packages/cli/src/declared-config.mjs";
 import PactActNotice from "@/components/compliance/storefront/compliance/PactActNotice.astro";
@@ -57,11 +57,11 @@ import ShippingRestrictionNotice from "@/components/compliance/storefront/compli
 import ExciseTaxNotice from "@/components/compliance/storefront/compliance/ExciseTaxNotice.astro";
 import TierCards from "@/components/membership/storefront/membership/TierCards.astro";
 import TierComparisonTable from "@/components/membership/storefront/membership/TierComparisonTable.astro";
-import ProseSections from "@/components/content/ProseSections.astro";
-import ProseToc from "@/components/content/ProseToc.astro";
-import Callout from "@/components/content/Callout.astro";
-import NeedsReviewCallout from "@/components/content/NeedsReviewCallout.astro";
-import TrustStrip from "@/components/content/TrustStrip.astro";
+import ProseSections from "@/components/content/storefront/content/ProseSections.astro";
+import ProseToc from "@/components/content/storefront/content/ProseToc.astro";
+import Callout from "@/components/content/storefront/content/Callout.astro";
+import NeedsReviewCallout from "@/components/content/storefront/content/NeedsReviewCallout.astro";
+import TrustStrip from "@/components/content/storefront/content/TrustStrip.astro";
 import type { ProseSection } from "@/lib/content/prose";
 import type { TrustStripItem } from "@/lib/content/trustStrip";
 import HowItWorksSteps from "@/components/subscriptions/storefront/subscription/HowItWorksSteps.astro";
@@ -71,7 +71,7 @@ import AgeGate from "@/components/compliance/storefront/islands/AgeGate.tsx";
 import VariantSelector, { publicSelectorVariants } from "@/components/catalog/storefront/islands/VariantSelector.tsx";
 import QuickView from "@/components/catalog/storefront/islands/QuickView.tsx";
 import SearchTypeahead from "@/components/catalog/storefront/islands/SearchTypeahead.tsx";
-import MobileNav from "@/components/islands/MobileNav.tsx";
+import MobileNav from "@/components/content/storefront/islands/MobileNav.tsx";
 import RecentlyViewed from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
 import type { RVItem } from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
 import SavedList from "@/components/customers/storefront/islands/SavedList.tsx";
@@ -79,14 +79,14 @@ import FacetSidebar from "@/components/catalog/storefront/plp/FacetSidebar.astro
 import ActiveFilters from "@/components/catalog/storefront/plp/ActiveFilters.astro";
 import SortSelect from "@/components/catalog/storefront/plp/SortSelect.astro";
 import Pagination from "@/components/catalog/storefront/plp/Pagination.astro";
-import Hero from "@/components/home/Hero.astro";
-import MarketingBlocks from "@/components/marketing/MarketingBlocks.astro";
+import Hero from "@/components/content/storefront/home/Hero.astro";
+import MarketingBlocks from "@/components/content/storefront/marketing/MarketingBlocks.astro";
 import { sampleProducts, sampleRatings } from "@/lib/catalog/fixtures/sampleProducts";
-import type { ChromeNavItem } from "@/lib/chrome/model";
+import type { ChromeNavItem } from "@/lib/content/chrome/model";
 import type { Tier, ComparisonRow } from "@/lib/membership/model";
 import type { SubscriptionStep, SubscriptionManageEntry } from "@/lib/subscriptions/subscription/model";
 import type { Facet, ListProductsQuery } from "@tot/public-runtime";
-import type { HeroBlock, MarketingBlock } from "@/lib/storyblok/content-model";
+import type { HeroBlock, MarketingBlock } from "@/lib/content/storyblok/content-model";
 
 const { tenant, theme } = Astro.params;
 const cspNonce = Astro.locals.cspNonce;
@@ -1473,12 +1473,12 @@ const componentVarsInline = [
         </div>
       </section>
 
-      {/* ── Home hero (components/home/Hero.astro) ─────────────────────────
+      {/* ── Home hero (components/content/storefront/home/Hero.astro) ─────────────────────────
           The signature homepage moment — bold (default) vs. light, set by
           the tenant's brand.heroVariant (not a prop; the guide fakes locals
           to preview both). */}
       <section class="sg-block">
-        <p class="sg-h">Home hero — <code>components/home/Hero.astro</code></p>
+        <p class="sg-h">Home hero — <code>components/content/storefront/home/Hero.astro</code></p>
         <p class="lede" style="font-size:.95rem;color:var(--color-muted)">The homepage "thesis" moment. Bold is the default; light matches merchants whose own site favors a light page with brand-color accents.</p>
 
         <p class="sg-cap" style="margin:18px 0 8px">Bold (default)</p>

package/apps/storefront/src/pages/style-guide/[tenant]/chrome/[theme].astro

@@ -29,8 +29,8 @@ const { tenant, theme } = Astro.params;
 const cspNonce = Astro.locals.cspNonce;
 const favicon = Astro.locals.tenant.theme_tokens.brand?.favicon ?? "/favicon.svg";
 
-import { loadStyleGuideThemes } from "@/lib/styleGuideThemes";
-import { styleGuideHref } from "@/lib/styleGuidePaths";
+import { loadStyleGuideThemes } from "@/lib/content/shared/styleGuideThemes";
+import { styleGuideHref } from "@/lib/content/shared/styleGuidePaths";
 import { derivedTokenDeclarations } from "@/themes/derivedTokens";
 
 const href = (path: string) => styleGuideHref(Astro.locals.basePath ?? "", path);

package/apps/storefront/src/pages/style-guide/[tenant]/guide/[theme].astro

@@ -19,9 +19,9 @@ export const prerender = false;
 
 import "@/styles/global.css";
 import type { MarkdownInstance } from "astro";
-import StyleGuideNav from "@/components/style-guide/StyleGuideNav.astro";
-import { loadStyleGuideThemes } from "@/lib/styleGuideThemes";
-import { styleGuideHref } from "@/lib/styleGuidePaths";
+import StyleGuideNav from "@/components/content/storefront/style-guide/StyleGuideNav.astro";
+import { loadStyleGuideThemes } from "@/lib/content/shared/styleGuideThemes";
+import { styleGuideHref } from "@/lib/content/shared/styleGuidePaths";
 import { derivedTokenDeclarations } from "@/themes/derivedTokens";
 
 const { tenant, theme } = Astro.params;

package/apps/storefront/src/pages/style-guide/[tenant]/index.astro

@@ -16,9 +16,9 @@
  */
 export const prerender = false;
 
-import StyleGuideNav from "@/components/style-guide/StyleGuideNav.astro";
-import { loadStyleGuideThemes } from "@/lib/styleGuideThemes";
-import { styleGuideHref } from "@/lib/styleGuidePaths";
+import StyleGuideNav from "@/components/content/storefront/style-guide/StyleGuideNav.astro";
+import { loadStyleGuideThemes } from "@/lib/content/shared/styleGuideThemes";
+import { styleGuideHref } from "@/lib/content/shared/styleGuidePaths";
 
 const { tenant } = Astro.params;
 const cspNonce = Astro.locals.cspNonce;

package/apps/storefront/src/pages/style-guide/index.astro

@@ -21,7 +21,7 @@
 export const prerender = false;
 
 import { listedTenantIds } from "@tot/public-runtime";
-import { styleGuideHref } from "@/lib/styleGuidePaths";
+import { styleGuideHref } from "@/lib/content/shared/styleGuidePaths";
 
 const cspNonce = Astro.locals.cspNonce;
 const href = (path: string) => styleGuideHref(Astro.locals.basePath ?? "", path);

package/apps/storefront/src/pages/the-build/[slug].astro

@@ -5,16 +5,16 @@
 // visibility chokepoint); unlisted posts resolve here but carry noindex and
 // stay out of the index/sitemap/RSS (see collection.ts isVisibleOnLive).
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import ReactionBar from "@/components/blog/ReactionBar.astro";
-import ShareRow from "@/components/blog/ShareRow.astro";
-import { getBuildPost, getTheBuildSettings, resolveBuildRedirect, THE_BUILD } from "@/lib/the-build/provider.js";
-import { bylineAuthor, resolveBlogPresentation, shareLinks } from "@/lib/blog/presentation.js";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
-import { getTranslations } from "@/lib/blog/collection.js";
-import { buildAlternates } from "@/lib/seo/alternates.js";
-import { breadcrumbLd } from "@/lib/jsonld.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import ReactionBar from "@/components/content/storefront/blog/ReactionBar.astro";
+import ShareRow from "@/components/content/storefront/blog/ShareRow.astro";
+import { getBuildPost, getTheBuildSettings, resolveBuildRedirect, THE_BUILD } from "@/lib/content/the-build/provider.js";
+import { bylineAuthor, resolveBlogPresentation, shareLinks } from "@/lib/content/blog/presentation.js";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs.js";
+import { getTranslations } from "@/lib/content/blog/collection.js";
+import { buildAlternates } from "@/lib/content/seo/alternates.js";
+import { breadcrumbLd } from "@/lib/content/shared/jsonld.js";
+import { collectionPathsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 // Same contract as blog/[slug].astro: the publication composition lifts this file into the space's
 // `routes.aliases`, so these redirects reach the CDN plane through the live pointer. The redirect

package/apps/storefront/src/pages/the-build/index.astro

@@ -4,11 +4,11 @@
 // collection.ts) via the the-build/provider.ts thin wrapper, so any tenant
 // with the-build content renders the same way (per-tenant/multi-collection
 // invariant — see docs/plans/2026-08-21-blog-platform-workstream.md §1).
-import TheBuildIndexView from "@/components/the-build/TheBuildIndexView.astro";
-import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
-import { getTheBuildSettings, listBuildPosts } from "@/lib/the-build/provider.js";
-import { paginateBlogPosts } from "@/lib/blog/pagination.js";
-import { resolveTheBuildIndexCopy } from "@/lib/the-build/pagination.js";
+import TheBuildIndexView from "@/components/content/storefront/the-build/TheBuildIndexView.astro";
+import { resolveBlogPresentation } from "@/lib/content/blog/presentation.js";
+import { getTheBuildSettings, listBuildPosts } from "@/lib/content/the-build/provider.js";
+import { paginateBlogPosts } from "@/lib/content/blog/pagination.js";
+import { resolveTheBuildIndexCopy } from "@/lib/content/the-build/pagination.js";
 
 const { tenant, basePath, apiBasePath, canonicalBase, content, publicationTimestamp } =
   Astro.locals;

package/apps/storefront/src/pages/the-build/page/[n].astro

@@ -3,11 +3,11 @@
 // /the-build/ (src/pages/the-build/index.astro); both render through the same
 // TheBuildIndexView so the tenant-copy + pagination contract can't drift
 // between the two routes (mirrors src/pages/blog/page/[n].astro).
-import TheBuildIndexView from "@/components/the-build/TheBuildIndexView.astro";
-import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
-import { getTheBuildSettings, listBuildPosts } from "@/lib/the-build/provider.js";
-import { paginateBlogPosts } from "@/lib/blog/pagination.js";
-import { parseTheBuildPageParam, resolveTheBuildIndexCopy } from "@/lib/the-build/pagination.js";
+import TheBuildIndexView from "@/components/content/storefront/the-build/TheBuildIndexView.astro";
+import { resolveBlogPresentation } from "@/lib/content/blog/presentation.js";
+import { getTheBuildSettings, listBuildPosts } from "@/lib/content/the-build/provider.js";
+import { paginateBlogPosts } from "@/lib/content/blog/pagination.js";
+import { parseTheBuildPageParam, resolveTheBuildIndexCopy } from "@/lib/content/the-build/pagination.js";
 
 const page = parseTheBuildPageParam(Astro.params.n);
 if (page === null) return new Response(null, { status: 404 });

package/apps/storefront/src/pages/the-build/rss.xml.ts

@@ -3,13 +3,13 @@
  * syndication mirror of `sitemap.xml.ts` and the newsletter on-ramp (B1.1).
  * Reads the engine's live-visible list (`listBuildPosts` default), so drafts and
  * unlisted posts never syndicate — the same visibility chokepoint the sitemap
- * rides. The XML itself is hand-rolled in `lib/blog/rss.ts` (no `@astrojs/rss`),
+ * rides. The XML itself is hand-rolled in `lib/content/blog/rss.ts` (no `@astrojs/rss`),
  * which is tenant/collection-generic so `/blog/rss.xml` can reuse it later.
  */
 import type { APIContext } from "astro";
-import { getTheBuildSettings, listBuildPosts, THE_BUILD } from "@/lib/the-build/provider.js";
-import { resolveTheBuildIndexCopy } from "@/lib/the-build/pagination.js";
-import { renderRssFeed } from "@/lib/blog/rss.js";
+import { getTheBuildSettings, listBuildPosts, THE_BUILD } from "@/lib/content/the-build/provider.js";
+import { resolveTheBuildIndexCopy } from "@/lib/content/the-build/pagination.js";
+import { renderRssFeed } from "@/lib/content/blog/rss.js";
 
 export async function GET(context: APIContext): Promise<Response> {
   const { tenant, canonicalBase, content, publicationTimestamp } = context.locals;