@tokenoftrust/storefront-runner 2.4.86 → 2.4.88

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

@@ -20,73 +20,73 @@ 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/commerce/PriceDisplay.astro";
-import RatingStars from "@/components/commerce/RatingStars.astro";
-import ReviewSummary from "@/components/commerce/ReviewSummary.astro";
-import ReviewList from "@/components/commerce/ReviewList.astro";
+import PriceDisplay from "@/components/catalog/storefront/commerce/PriceDisplay.astro";
+import RatingStars from "@/components/catalog/storefront/commerce/RatingStars.astro";
+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 ProductCard from "@/components/ProductCard.astro";
-import ProductCarousel from "@/components/commerce/ProductCarousel.astro";
-import ProductGrid from "@/components/commerce/ProductGrid.astro";
-import BrandGrid from "@/components/commerce/BrandGrid.astro";
-import type { Brand } from "@/components/commerce/BrandGrid.astro";
-import ArticleCard from "@/components/commerce/ArticleCard.astro";
-import type { Article } from "@/components/commerce/ArticleCard.astro";
-import TagFilterCloud from "@/components/commerce/TagFilterCloud.astro";
-import type { TagItem } from "@/components/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 NicotineWarning from "@/components/compliance/NicotineWarning.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/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/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/PactActNotice.astro";
-import AdultSignatureNotice from "@/components/compliance/AdultSignatureNotice.astro";
-import Prop65Warning from "@/components/compliance/Prop65Warning.astro";
-import PurchaseLimitNotice from "@/components/compliance/PurchaseLimitNotice.astro";
-import StateEligibilityNotice from "@/components/compliance/StateEligibilityNotice.astro";
-import ShippingRestrictionNotice from "@/components/compliance/ShippingRestrictionNotice.astro";
-import ExciseTaxNotice from "@/components/compliance/ExciseTaxNotice.astro";
+import PactActNotice from "@/components/compliance/storefront/compliance/PactActNotice.astro";
+import AdultSignatureNotice from "@/components/compliance/storefront/compliance/AdultSignatureNotice.astro";
+import Prop65Warning from "@/components/compliance/storefront/compliance/Prop65Warning.astro";
+import PurchaseLimitNotice from "@/components/compliance/storefront/compliance/PurchaseLimitNotice.astro";
+import StateEligibilityNotice from "@/components/compliance/storefront/compliance/StateEligibilityNotice.astro";
+import ShippingRestrictionNotice from "@/components/compliance/storefront/compliance/ShippingRestrictionNotice.astro";
+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/subscription/HowItWorksSteps.astro";
-import SavingsExplainer from "@/components/subscription/SavingsExplainer.astro";
-import ManageSubscriptionEntry from "@/components/subscription/ManageSubscriptionEntry.astro";
-import AgeGate from "@/components/islands/AgeGate.tsx";
-import VariantSelector, { publicSelectorVariants } from "@/components/islands/VariantSelector.tsx";
-import QuickView from "@/components/islands/QuickView.tsx";
-import SearchTypeahead from "@/components/islands/SearchTypeahead.tsx";
-import MobileNav from "@/components/islands/MobileNav.tsx";
-import RecentlyViewed from "@/components/islands/RecentlyViewed.tsx";
-import type { RVItem } from "@/components/islands/RecentlyViewed.tsx";
+import HowItWorksSteps from "@/components/subscriptions/storefront/subscription/HowItWorksSteps.astro";
+import SavingsExplainer from "@/components/subscriptions/storefront/subscription/SavingsExplainer.astro";
+import ManageSubscriptionEntry from "@/components/subscriptions/storefront/subscription/ManageSubscriptionEntry.astro";
+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/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";
-import FacetSidebar from "@/components/plp/FacetSidebar.astro";
-import ActiveFilters from "@/components/plp/ActiveFilters.astro";
-import SortSelect from "@/components/plp/SortSelect.astro";
-import Pagination from "@/components/plp/Pagination.astro";
-import Hero from "@/components/home/Hero.astro";
-import MarketingBlocks from "@/components/marketing/MarketingBlocks.astro";
-import { sampleProducts, sampleRatings } from "@/lib/fixtures/sampleProducts";
-import type { ChromeNavItem } from "@/lib/chrome/model";
+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/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/content/chrome/model";
 import type { Tier, ComparisonRow } from "@/lib/membership/model";
-import type { SubscriptionStep, SubscriptionManageEntry } from "@/lib/subscription/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;