@tokenoftrust/storefront-runner 2.4.86 → 2.4.88

package/apps/storefront/src/pages/api/admin/orders.ts

@@ -16,9 +16,9 @@ import {
   createCheckoutOrderClient,
   orderApiBaseUrl,
   OrderApiError,
-} from "@/lib/admin/orderClient";
+} from "@/lib/orders/admin/orderClient";
 import { commerceStageForEnv } from "@/lib/fulfillment/fulfillmentService";
-import { assessCheckoutOrder, parseOrderFilters } from "@/lib/admin/services/orders";
+import { assessCheckoutOrder, parseOrderFilters } from "@/lib/orders/admin/services/orders";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/blog/[collection]/[slug]/react.ts

@@ -18,7 +18,7 @@ import {
   isReaction,
   recordReaction,
   type Reaction,
-} from "@/lib/blog/reactions";
+} from "@/lib/content/blog/reactions";
 import { checkRateLimit } from "@/lib/rate/kvWindow";
 
 export const prerender = false;

package/apps/storefront/src/pages/api/commerce/checkout-handoff.ts

@@ -25,8 +25,8 @@ import {
   defaultConsentSnapshot,
   type CartDenialCode,
 } from "@tot/public-runtime";
-import { resolveCheckoutHandoffCorrelation } from "@/lib/commerce/checkoutHandoffCorrelation";
-import { resolveCartSigning, shopperCartDenialMessage } from "@/lib/checkoutCommerce";
+import { resolveCheckoutHandoffCorrelation } from "@/lib/checkout/commerce/checkoutHandoffCorrelation";
+import { resolveCartSigning, shopperCartDenialMessage } from "@/lib/checkout/shared/checkoutCommerce";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/commerce/final-cart-authorization.ts

@@ -17,9 +17,9 @@ import {
   type PaymentState,
   type StockState,
 } from "@tot/public-runtime";
-import { fromD1, listAllActiveProducts } from "@/lib/d1/catalog.js";
+import { fromD1, listAllActiveProducts } from "@/lib/catalog/d1/catalog.js";
 import { readD1, readEnv } from "@/lib/env";
-import { evaluateFinalCart, type SeamView } from "@/lib/commerce/finalCartAuthorization.js";
+import { evaluateFinalCart, type SeamView } from "@/lib/checkout/commerce/finalCartAuthorization.js";
 import { d1CommerceRunner, mirrorOnHand, reserveAllocation } from "@/lib/inventory/allocations.js";
 import { POST as compliancePreflight } from "../compliance/preflight.js";
 

package/apps/storefront/src/pages/api/compliance/preflight.ts

@@ -33,7 +33,7 @@ import {
   createTotVerificationClient,
   type TotVerificationClient,
   type TotVerificationStatus,
-} from "@/lib/verification/totVerificationClient";
+} from "@/lib/compliance/verification/totVerificationClient";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/newsletter/[collection]/subscribe.ts

@@ -16,11 +16,11 @@
  */
 import type { APIRoute } from "astro";
 import { readD1, readKv, readEnv } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { checkRateLimit } from "@/lib/rate/kvWindow";
-import { NewsletterSubscribersStore } from "@/lib/newsletter/subscribers";
-import { randomToken, hashConsentIp } from "@/lib/newsletter/consent";
-import { sendConfirmationEmail } from "@/lib/newsletter/confirmationEmail";
+import { NewsletterSubscribersStore } from "@/lib/engagement/newsletter/subscribers";
+import { randomToken, hashConsentIp } from "@/lib/engagement/newsletter/consent";
+import { sendConfirmationEmail } from "@/lib/engagement/newsletter/confirmationEmail";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/newsletter/confirm.ts

@@ -11,8 +11,8 @@
  */
 import type { APIRoute } from "astro";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
-import { NewsletterSubscribersStore } from "@/lib/newsletter/subscribers";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
+import { NewsletterSubscribersStore } from "@/lib/engagement/newsletter/subscribers";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/newsletter/unsubscribe.ts

@@ -20,8 +20,8 @@
  */
 import type { APIContext } from "astro";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
-import { unsubscribeByToken } from "@/lib/newsletter/subscribers";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
+import { unsubscribeByToken } from "@/lib/engagement/newsletter/subscribers";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/rum/vitals.ts

@@ -15,7 +15,7 @@
 import type { APIRoute } from "astro";
 import { rateMetric, type WebVitalName, type WebVitalsSample } from "@/lib/analytics/webVitals";
 import { readKv, runAfterResponse, type CfExecutionContextLike } from "@/lib/env";
-import { recordBlogView } from "@/lib/blog/viewCounts";
+import { recordBlogView } from "@/lib/content/blog/viewCounts";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/tracking/interaction.ts

@@ -2,7 +2,7 @@
  * POST /api/tracking/interaction (dt-collector-v1) — the beacon sink for
  * declarative interaction tracking.
  *
- * The browser collector (`@/lib/tracking/interactionCollector`) batches
+ * The browser collector (`@/lib/measurement/tracking/interactionCollector`) batches
  * `TotInteraction`s captured off `installInteractionTracking` /
  * `onInteraction` (`@tot/public-runtime`) — via `dt-consent-environment-gate`'s
  * consent/environment wrapper in front of it — and POSTs them here with
@@ -38,11 +38,11 @@
  */
 import type { APIContext } from "astro";
 import { readD1, readAnalytics, runAfterResponse, type CfExecutionContextLike } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
-import { ingestInteractions, type StampedInteractionEvent } from "@/lib/tracking/collectorIngest";
-import { readD1Control } from "@/lib/tracking/d1Control";
-import { resolveTenantStore, trackingNamePrefix } from "@/lib/tracking/tenantD1Registry";
-import { persistInteractions } from "@/lib/tracking/interactionStore";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
+import { ingestInteractions, type StampedInteractionEvent } from "@/lib/measurement/tracking/collectorIngest";
+import { readD1Control } from "@/lib/measurement/tracking/d1Control";
+import { resolveTenantStore, trackingNamePrefix } from "@/lib/measurement/tracking/tenantD1Registry";
+import { persistInteractions } from "@/lib/measurement/tracking/interactionStore";
 import type { AnalyticsEngineLike } from "@/lib/activity/store";
 
 export const prerender = false;

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 ProductCard from "@/components/ProductCard.astro";
-import EmptyState from "@/components/EmptyState.astro";
-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 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/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,12 +4,12 @@
  * 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 CollectionCard from "@/components/CollectionCard.astro";
-import EmptyState from "@/components/EmptyState.astro";
-import { breadcrumbLd } from "@/lib/jsonld";
-import { activeMemberCount, nonEmptyCollections } from "@/lib/tot/query";
+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/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;
 // Commerce-only route: marketing tenants have no catalog surface.

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 ProductCarousel from "@/components/commerce/ProductCarousel.astro";
-import ProductGrid from "@/components/commerce/ProductGrid.astro";
-import CollectionCard from "@/components/CollectionCard.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 { featuredProductsPresentationView } from "@/lib/featuredProductsPresentation";
+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

@@ -10,8 +10,8 @@
  * SEO text; compliance facts come from tenant.compliance.
  */
 import type { APIContext } from "astro";
-import { nonEmptyCollections } from "@/lib/tot/query.js";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
+import { nonEmptyCollections } from "@/lib/catalog/tot/query.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,20 +6,20 @@
  * 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 ProductCard from "@/components/ProductCard.astro";
-import Section from "@/components/Section.astro";
-import ImageGallery from "@/components/islands/ImageGallery.tsx";
-import VariantSelector, { publicSelectorVariants } from "@/components/islands/VariantSelector.tsx";
-import CheckoutComplianceGate from "@/components/islands/CheckoutComplianceGate.tsx";
-import RecentlyViewed from "@/components/islands/RecentlyViewed.tsx";
-import NicotineWarning from "@/components/compliance/NicotineWarning.astro";
-import Prop65Warning from "@/components/compliance/Prop65Warning.astro";
-import ReviewSummary from "@/components/commerce/ReviewSummary.astro";
-import ReviewList from "@/components/commerce/ReviewList.astro";
-import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/tot/query";
+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/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";
+import RecentlyViewed from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
+import NicotineWarning from "@/components/compliance/storefront/compliance/NicotineWarning.astro";
+import Prop65Warning from "@/components/compliance/storefront/compliance/Prop65Warning.astro";
+import ReviewSummary from "@/components/catalog/storefront/commerce/ReviewSummary.astro";
+import ReviewList from "@/components/catalog/storefront/commerce/ReviewList.astro";
+import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/catalog/tot/query";
 import {
   buildMemberSignedCartPayload,
   workerCartApiPath,
@@ -38,17 +38,17 @@ import type {
   MembershipStackingPolicy,
   PurchaseOptionPricingContext,
 } from "@tot/public-runtime";
-import { resolveCartSigning, shopperCheckoutUnavailableHtml } from "@/lib/checkoutCommerce";
+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 ProductCard from "@/components/ProductCard.astro";
-import EmptyState from "@/components/EmptyState.astro";
-import Section from "@/components/Section.astro";
-import { toTypeaheadDoc } from "@/lib/search";
-import { breadcrumbLd } from "@/lib/jsonld";
+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/content/storefront/EmptyState.astro";
+import Section from "@/components/content/storefront/Section.astro";
+import { toTypeaheadDoc } from "@/lib/catalog/search/index";
+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

@@ -9,13 +9,13 @@
  * loc is prefix-correct without special-casing here.
  */
 import type { APIContext } from "astro";
-import { nonEmptyCollections } from "@/lib/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 { nonEmptyCollections } from "@/lib/catalog/tot/query.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;