Merge branch 'main' into feat/cart-product-url

deno.json

@@ -62,5 +62,5 @@
     "jsx": "react-jsx",
     "jsxImportSource": "preact"
   },
-  "version": "0.62.6"
+  "version": "0.62.8"
 }

shopify/loaders/ProductListingPage.ts

@@ -44,6 +44,11 @@ export interface Props {
    * @description search for metafields
    */
   metafields?: Metafield[];
+  /**
+   * @title Starting page query parameter offset.
+   * @description Set the starting page offset. Default to 1.
+   */
+  pageOffset?: number;
   /**
    * @hide
    * @description it is hidden because only page prop is not sufficient, we need cursors
@@ -80,7 +85,11 @@ const loader = async (
 
   const count = props.count ?? 12;
   const query = props.query || url.searchParams.get("q") || "";
-  const page = props.page || Number(url.searchParams.get("page")) || 0;
+  const currentPageoffset = props.pageOffset ?? 1;
+  const pageParam = url.searchParams.get("page")
+    ? Number(url.searchParams.get("page")) - currentPageoffset
+    : 0;
+  const page = props.page || pageParam;
   const endCursor = props.endCursor || url.searchParams.get("endCursor") || "";
   const startCursor = props.startCursor ||
     url.searchParams.get("startCursor") || "";
@@ -96,6 +105,8 @@ const loader = async (
     | undefined = undefined;
   let shopifyFilters = undefined;
   let records = undefined;
+  let collectionTitle = undefined;
+  let collectionDescription = undefined;
 
   const sort = url.searchParams.get("sort") ?? "";
 
@@ -156,6 +167,8 @@ const loader = async (
     hasPreviousPage = Boolean(
       data?.collection?.products.pageInfo.hasPreviousPage ?? false,
     );
+    collectionTitle = data.collection?.title;
+    collectionDescription = data.collection?.description;
   }
 
   // Transform Shopify product format into schema.org's compatible format
@@ -169,18 +182,19 @@ const loader = async (
   const previousPage = new URLSearchParams(url.searchParams);
 
   if (hasNextPage) {
-    nextPage.set("page", (page + 1).toString());
+    nextPage.set("page", (page + currentPageoffset + 1).toString());
     nextPage.set("startCursor", shopifyProducts?.pageInfo.endCursor ?? "");
     nextPage.delete("endCursor");
   }
 
   if (hasPreviousPage) {
-    previousPage.set("page", (page - 1).toString());
+    previousPage.set("page", (page + currentPageoffset - 1).toString());
     previousPage.set("endCursor", shopifyProducts?.pageInfo.startCursor ?? "");
     previousPage.delete("startCursor");
   }
 
   const filters = shopifyFilters?.map((filter) => toFilter(filter, url));
+  const currentPage = page + currentPageoffset;
 
   return {
     "@type": "ProductListingPage",
@@ -200,11 +214,18 @@ const loader = async (
     pageInfo: {
       nextPage: hasNextPage ? `?${nextPage}` : undefined,
       previousPage: hasPreviousPage ? `?${previousPage}` : undefined,
-      currentPage: page,
+      currentPage,
       records,
       recordPerPage: count,
     },
     sortOptions: isSearch ? searchSortOptions : sortOptions,
+    seo: {
+      title: collectionTitle || "",
+      description: collectionDescription || "",
+      canonical: `${url.origin}${url.pathname}${
+        page >= 1 ? `?page=${page}` : ""
+      }`,
+    },
   };
 };
 

shopify/loaders/proxy.ts

@@ -1,4 +1,5 @@
 import { Route } from "../../website/flags/audience.ts";
+import { TextReplace } from "../../website/handlers/proxy.ts";
 import { AppContext } from "../mod.ts";
 import { withDigestCookie } from "../utils/password.ts";
 
@@ -32,11 +33,13 @@ const buildProxyRoutes = (
     includeSiteMap,
     generateDecoSiteMap,
     excludePathsFromDecoSiteMap,
+    replaces,
   }: {
     extraPaths: string[];
     includeSiteMap?: string[];
     generateDecoSiteMap?: boolean;
     excludePathsFromDecoSiteMap: string[];
+    replaces: TextReplace[];
     ctx: AppContext;
   },
 ) => {
@@ -65,6 +68,7 @@ const buildProxyRoutes = (
           url: urlToProxy,
           host: hostToUse,
           customHeaders: withDigestCookie(ctx),
+          replaces,
         },
       },
     });
@@ -126,6 +130,7 @@ export interface Props {
    * @title Exclude paths from /deco-sitemap.xml
    */
   excludePathsFromDecoSiteMap?: string[];
+  replaces?: TextReplace[];
 }
 
 /**
@@ -137,6 +142,7 @@ function loader(
     includeSiteMap = [],
     generateDecoSiteMap = true,
     excludePathsFromDecoSiteMap = [],
+    replaces = [],
   }: Props,
   _req: Request,
   ctx: AppContext,
@@ -146,6 +152,7 @@ function loader(
     excludePathsFromDecoSiteMap,
     includeSiteMap,
     extraPaths: extraPathsToProxy,
+    replaces,
     ctx,
   });
 }

shopify/utils/storefront/queries.ts

@@ -335,6 +335,8 @@ export const ProductsByCollection = {
     ){
     collection(handle: $handle) {
       handle
+      description
+      title
       products(
         first: $first, 
         last: $last, 

shopify/utils/transform.ts

@@ -1,6 +1,7 @@
 import type {
   BreadcrumbList,
   Filter,
+  ListItem,
   Product,
   ProductDetailsPage,
   PropertyValue,
@@ -63,20 +64,58 @@ export const toProductPage = (
   };
 };
 
+export const toBreadcrumbItem = ({
+  name,
+  position,
+  item,
+}: {
+  name: string;
+  position: number;
+  item: string;
+}): ListItem => ({
+  "@type": "ListItem",
+  name: decodeURI(name),
+  position,
+  item,
+});
+
 export const toBreadcrumbList = (
   product: ProductShopify,
   sku: SkuShopify,
 ): BreadcrumbList => {
-  return {
+  let list: ListItem[] = [];
+  const collection = product.collections?.nodes[0];
+
+  if (collection) {
+    list = [
+      toBreadcrumbItem({
+        name: collection.title,
+        position: 1,
+        item: `/${collection.handle}`,
+      }),
+      toBreadcrumbItem({
+        name: product.title,
+        position: 2,
+        item: getPath(product, sku),
+      }),
+    ];
+  } else {
+    list = [
+      toBreadcrumbItem({
+        name: product.title,
+        position: 2,
+        item: getPath(product, sku),
+      }),
+    ];
+  }
+
+  const data: BreadcrumbList = {
     "@type": "BreadcrumbList",
-    numberOfItems: 1,
-    itemListElement: [{
-      "@type": "ListItem",
-      name: product.title,
-      item: getPath(product, sku),
-      position: 1,
-    }],
+    numberOfItems: list.length,
+    itemListElement: list,
   };
+
+  return data as BreadcrumbList;
 };
 
 export const toProduct = (

vtex/utils/client.ts

@@ -181,6 +181,7 @@ export interface VTEXCommerceStable {
   "POST /api/checkout/pub/orderForm/:orderFormId/items/update": {
     response: OrderForm;
     body: {
+      noSplitItem?: boolean;
       orderItems: Array<{
         quantity: number;
         index: number;