@shopify/cli-hydrogen 10.0.1 → 10.0.2

package/dist/assets/hydrogen/starter/CHANGELOG.md

@@ -1,5 +1,32 @@
 # skeleton
 
+## 2025.4.0
+
+### Patch Changes
+
+- Moved the Cursor rules into more generic LLM prompt files. If you were using the Cursor rules, you will find the prompts in the `cookbook/llms` folder and they can be put into your `.cursor/rules` folder manually. LLM prompt files will be maintained moving forward, while previous Cursor rules will not be updated anymore. ([#2936](https://github.com/Shopify/hydrogen/pull/2936)) by [@ruggishop](https://github.com/ruggishop)
+
+- Added bundles recipe ([#2915](https://github.com/Shopify/hydrogen/pull/2915)) by [@ruggishop](https://github.com/ruggishop)
+
+- Update copy for subscriptions, combined listings, bundles recipes ([#2924](https://github.com/Shopify/hydrogen/pull/2924)) by [@ruggishop](https://github.com/ruggishop)
+
+- Bump skeleton @shopify/cli and @shopify/mini-oxygen ([#2883](https://github.com/Shopify/hydrogen/pull/2883)) by [@juanpprieto](https://github.com/juanpprieto)
+
+- Remove rules from the template. ([#2931](https://github.com/Shopify/hydrogen/pull/2931)) by [@ruggishop](https://github.com/ruggishop)
+
+- Update SFAPI and CAAPI versions to 2025.04 ([#2886](https://github.com/Shopify/hydrogen/pull/2886)) by [@juanpprieto](https://github.com/juanpprieto)
+
+- Updated recipes: subscriptions, bundles, combined-listings. New recipe: markets. ([#2930](https://github.com/Shopify/hydrogen/pull/2930)) by [@ruggishop](https://github.com/ruggishop)
+
+- Updated the subscriptions recipe to better display the purchase options. ([#2912](https://github.com/Shopify/hydrogen/pull/2912)) by [@ruggishop](https://github.com/ruggishop)
+
+- Bump recipes with copy adjustments ([#2935](https://github.com/Shopify/hydrogen/pull/2935)) by [@ruggishop](https://github.com/ruggishop)
+
+- Added a Combined Listings recipe. ([#2876](https://github.com/Shopify/hydrogen/pull/2876)) by [@ruggishop](https://github.com/ruggishop)
+
+- Updated dependencies [[`af23e710`](https://github.com/Shopify/hydrogen/commit/af23e710dac83bb57498d9c2ef1d8bcf9df55d34), [`9d8a6644`](https://github.com/Shopify/hydrogen/commit/9d8a6644a5b67dca890c6687df390aee78fc85c3)]:
+  - @shopify/hydrogen@2025.4.0
+
 ## 2025.1.7
 
 ### Patch Changes
@@ -137,13 +164,13 @@
   1. Add a routes.ts file. This is your new Remix route configuration file.
 
      ```ts
-     import { flatRoutes } from "@remix-run/fs-routes";
-     import { layout, type RouteConfig } from "@remix-run/route-config";
-     import { hydrogenRoutes } from "@shopify/hydrogen";
+     import {flatRoutes} from '@remix-run/fs-routes';
+     import {layout, type RouteConfig} from '@remix-run/route-config';
+     import {hydrogenRoutes} from '@shopify/hydrogen';
 
      export default hydrogenRoutes([
        // Your entire app reading from routes folder using Layout from layout.tsx
-       layout("./layout.tsx", await flatRoutes()),
+       layout('./layout.tsx', await flatRoutes()),
      ]) satisfies RouteConfig;
      ```
 
@@ -734,25 +761,25 @@
   8. Update the `ProductForm` component.
 
   ```tsx
-  import { Link, useNavigate } from "@remix-run/react";
-  import { type MappedProductOptions } from "@shopify/hydrogen";
+  import {Link, useNavigate} from '@remix-run/react';
+  import {type MappedProductOptions} from '@shopify/hydrogen';
   import type {
     Maybe,
     ProductOptionValueSwatch,
-  } from "@shopify/hydrogen/storefront-api-types";
-  import { AddToCartButton } from "./AddToCartButton";
-  import { useAside } from "./Aside";
-  import type { ProductFragment } from "storefrontapi.generated";
+  } from '@shopify/hydrogen/storefront-api-types';
+  import {AddToCartButton} from './AddToCartButton';
+  import {useAside} from './Aside';
+  import type {ProductFragment} from 'storefrontapi.generated';
 
   export function ProductForm({
     productOptions,
     selectedVariant,
   }: {
     productOptions: MappedProductOptions[];
-    selectedVariant: ProductFragment["selectedOrFirstAvailableVariant"];
+    selectedVariant: ProductFragment['selectedOrFirstAvailableVariant'];
   }) {
     const navigate = useNavigate();
-    const { open } = useAside();
+    const {open} = useAside();
     return (
       <div className="product-form">
         {productOptions.map((option) => (
@@ -786,8 +813,8 @@
                       to={`/products/${handle}?${variantUriQuery}`}
                       style={{
                         border: selected
-                          ? "1px solid black"
-                          : "1px solid transparent",
+                          ? '1px solid black'
+                          : '1px solid transparent',
                         opacity: available ? 1 : 0.3,
                       }}
                     >
@@ -804,13 +831,13 @@
                     <button
                       type="button"
                       className={`product-options-item${
-                        exists && !selected ? " link" : ""
+                        exists && !selected ? ' link' : ''
                       }`}
                       key={option.name + name}
                       style={{
                         border: selected
-                          ? "1px solid black"
-                          : "1px solid transparent",
+                          ? '1px solid black'
+                          : '1px solid transparent',
                         opacity: available ? 1 : 0.3,
                       }}
                       disabled={!exists}
@@ -834,7 +861,7 @@
         <AddToCartButton
           disabled={!selectedVariant || !selectedVariant.availableForSale}
           onClick={() => {
-            open("cart");
+            open('cart');
           }}
           lines={
             selectedVariant
@@ -848,7 +875,7 @@
               : []
           }
         >
-          {selectedVariant?.availableForSale ? "Add to cart" : "Sold out"}
+          {selectedVariant?.availableForSale ? 'Add to cart' : 'Sold out'}
         </AddToCartButton>
       </div>
     );
@@ -871,7 +898,7 @@
         aria-label={name}
         className="product-option-label-swatch"
         style={{
-          backgroundColor: color || "transparent",
+          backgroundColor: color || 'transparent',
         }}
       >
         {!!image && <img src={image} alt={name} />}
@@ -1372,21 +1399,21 @@
   New `withCache.fetch` is for caching simple fetch requests. This method caches the responses if they are OK responses, and you can pass `shouldCacheResponse`, `cacheKey`, etc. to modify behavior. `data` is the consumed body of the response (we need to consume to cache it).
 
   ```ts
-  const withCache = createWithCache({ cache, waitUntil, request });
+  const withCache = createWithCache({cache, waitUntil, request});
 
-  const { data, response } = await withCache.fetch<{ data: T; error: string }>(
-    "my-cms.com/api",
+  const {data, response} = await withCache.fetch<{data: T; error: string}>(
+    'my-cms.com/api',
     {
-      method: "POST",
-      headers: { "Content-type": "application/json" },
+      method: 'POST',
+      headers: {'Content-type': 'application/json'},
       body,
     },
     {
       cacheStrategy: CacheLong(),
       // Cache if there are no data errors or a specific data that make this result not suited for caching
       shouldCacheResponse: (result) => !result?.error,
-      cacheKey: ["my-cms", body],
-      displayName: "My CMS query",
+      cacheKey: ['my-cms', body],
+      displayName: 'My CMS query',
     },
   );
   ```
@@ -1962,9 +1989,9 @@
 
   ```tsx
   // app/lib/root-data.ts
-  import { useMatches } from "@remix-run/react";
-  import type { SerializeFrom } from "@shopify/remix-oxygen";
-  import type { loader } from "~/root";
+  import {useMatches} from '@remix-run/react';
+  import type {SerializeFrom} from '@shopify/remix-oxygen';
+  import type {loader} from '~/root';
 
   /**
    * Access the result of the root loader from a React component.
@@ -2126,10 +2153,10 @@
 - This is an important fix to a bug with 404 routes and path-based i18n projects where some unknown routes would not properly render a 404. This fixes all new projects, but to fix existing projects, add a `($locale).tsx` route with the following contents: ([#1732](https://github.com/Shopify/hydrogen/pull/1732)) by [@blittle](https://github.com/blittle)
 
   ```ts
-  import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+  import {type LoaderFunctionArgs} from '@remix-run/server-runtime';
 
-  export async function loader({ params, context }: LoaderFunctionArgs) {
-    const { language, country } = context.storefront.i18n;
+  export async function loader({params, context}: LoaderFunctionArgs) {
+    const {language, country} = context.storefront.i18n;
 
     if (
       params.locale &&
@@ -2137,7 +2164,7 @@
     ) {
       // If the locale URL param is defined, yet we still are still at the default locale
       // then the the locale param must be invalid, send to the 404 page
-      throw new Response(null, { status: 404 });
+      throw new Response(null, {status: 404});
     }
 
     return null;
@@ -2193,11 +2220,11 @@
   ```yaml
   projects:
     default:
-      schema: "node_modules/@shopify/hydrogen/storefront.schema.json"
+      schema: 'node_modules/@shopify/hydrogen/storefront.schema.json'
       documents:
-        - "!*.d.ts"
-        - "*.{ts,tsx,js,jsx}"
-        - "app/**/*.{ts,tsx,js,jsx}"
+        - '!*.d.ts'
+        - '*.{ts,tsx,js,jsx}'
+        - 'app/**/*.{ts,tsx,js,jsx}'
   ```
 
 - Improve resiliency of `HydrogenSession` ([#1583](https://github.com/Shopify/hydrogen/pull/1583)) by [@blittle](https://github.com/blittle)
@@ -2412,8 +2439,8 @@
   ```ts
   // root.tsx
 
-  import { useMatches } from "@remix-run/react";
-  import { type SerializeFrom } from "@shopify/remix-oxygen";
+  import {useMatches} from '@remix-run/react';
+  import {type SerializeFrom} from '@shopify/remix-oxygen';
 
   export const useRootLoaderData = () => {
     const [root] = useMatches();

package/dist/assets/hydrogen/starter/package.json

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2025.1.7",
+  "version": "2025.4.0",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
@@ -17,7 +17,7 @@
     "@remix-run/react": "^2.16.1",
     "@remix-run/server-runtime": "^2.16.1",
     "graphql": "^16.10.0",
-    "@shopify/hydrogen": "2025.1.4",
+    "@shopify/hydrogen": "2025.4.0",
     "@shopify/remix-oxygen": "^2.0.12",
     "graphql-tag": "^2.12.6",
     "isbot": "^5.1.22",
@@ -32,7 +32,7 @@
     "@remix-run/dev": "^2.16.1",
     "@remix-run/fs-routes": "^2.16.1",
     "@remix-run/route-config": "^2.16.1",
-    "@shopify/cli": "~3.78.1",
+    "@shopify/cli": "~3.79.2",
     "@shopify/hydrogen-codegen": "^0.3.3",
     "@shopify/mini-oxygen": "^3.2.1",
     "@shopify/oxygen-workers-types": "^4.1.6",

package/dist/assets/hydrogen/tailwind/package.json

@@ -2,7 +2,10 @@
   "browserslist": [
     "defaults"
   ],
+  "dependencies": {
+    "tailwindcss": "^4.1.6"
+  },
   "devDependencies": {
-    "@tailwindcss/vite": "4.0.14"
+    "@tailwindcss/vite": "^4.1.6"
   }
 }

package/oclif.manifest.json

@@ -1748,5 +1748,5 @@
       ]
     }
   },
-  "version": "10.0.1"
+  "version": "10.0.2"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "10.0.1",
+  "version": "10.0.2",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -39,7 +39,7 @@
   "dependencies": {
     "@ast-grep/napi": "0.11.0",
     "@oclif/core": "3.26.5",
-    "@shopify/cli-kit": "^3.78.1",
+    "@shopify/cli-kit": "^3.79.2",
     "@shopify/oxygen-cli": "4.6.18",
     "@shopify/plugin-cloudflare": "^3.78.1",
     "ansi-escapes": "^6.2.0",

package/dist/assets/hydrogen/starter/.cursor/rules/cookbook-recipe-subscriptions.mdc

@@ -1,921 +0,0 @@
----
-description: Recipe for implementing "Subscriptions (subscriptions)" in a Hydrogen storefront. Add subscription-based products to your Hydrogen storefront.
-globs: *
-alwaysApply: false
----
-
-# Overview
-
-This rule describes how to implement "Subscriptions" in a Hydrogen storefront. Below is a "recipe" that contains the steps to apply to a basic Hydrogen skeleton template to achieve the desired outcome.
-The same logic can be applied to any other Hydrogen storefront project, adapting the implementation details to the specific needs/structure/conventions of the project, but it's up to the developer to do so.
-If there are any prerequisites, the recipe below will explain them; if the user is trying to implement the feature described in this recipe, make sure to prominently mention the prerequisites and any other preliminary instructions, as well as followups.
-If the user is asking on how to implement the feature from scratch, please first describe the feature in a general way before jumping into the implementation details.
-Please note that the recipe steps below are not necessarily ordered in the way they should be executed, as it depends on the user's needs and the specific details of the project. The recipe steps descriptions should allow you to understand what is required to be done in a certain order and what is not. Remember that file names in the recipe are related to the Hydrogen skeleton template, not the user's project, so make sure to adapt the file names to the user's project.
-
-# AI model verification steps
-
-- Never edit generated files (ending with .d.ts) directly; instead, run the `npm run codegen` command to update them.
-
-# Summary
-
-Add subscription-based products to your Hydrogen storefront.
-
-# User Intent Recognition
-
-<user_queries>
-- How do I add subscriptions to my Hydrogen storefront?
-- How do I add selling plans to my Hydrogen storefront?
-- How do I display subscription details on applicable line items in the cart?
-</user_queries>
-
-# Troubleshooting
-
-<troubleshooting>
-- **Issue**: I'm getting an error when I try to add a subscription to my storefront.
-  **Solution**: Make sure you have the Shopify Subscriptions app installed and configured correctly.
-- **Issue**: I'm not seeing the subscription options on my product pages.
-  **Solution**: Make sure you have the Shopify Subscriptions app installed and configured correctly.
-- **Issue**: I'm not seeing the subscription details on my cart line items.
-  **Solution**: Make sure you have the Shopify Subscriptions app installed and configured correctly.
-</troubleshooting>
-
-# Recipe Implementation
-
-Here's the subscriptions recipe for the base Hydrogen skeleton template:
-
-<recipe_implementation>
-
-## Description
-
-This recipe lets you sell subscription-based products on your Hydrogen storefront by implementing [selling plan groups](https://shopify.dev/docs/api/storefront/latest/objects/SellingPlanGroup). Your customers will be able to choose between one-time purchases or recurring subscriptions for any products with available selling plans.
-
-
-In this recipe you'll make the following changes:
-
-
-1. Set up a subscriptions app in your Shopify admin and add selling plans to any products that will be sold as subscriptions.
-2. Modify product detail pages to display subscription options with accurate pricing using the `SellingPlanSelector` component.
-3. Enhance GraphQL fragments to fetch all necessary selling plan data.
-4. Display subscription details on applicable line items in the cart.
-
-
-## Requirements
-
-To implement subscriptions in your own store, you need to install a subscriptions app in your Shopify admin. In this recipe, we'll use the [Shopify Subscriptions app](https://apps.shopify.com/shopify-subscriptions).
-
-
-## New files added to the template by this recipe
-
-### templates/skeleton/app/components/SellingPlanSelector.tsx
-
-The `SellingPlanSelector` component is used to display the available subscription options on product pages.
-
-```tsx
-import type {
-  ProductFragment,
-  SellingPlanGroupFragment,
-  SellingPlanFragment,
-} from 'storefrontapi.generated';
-import {useMemo} from 'react';
-import {useLocation} from '@remix-run/react';
-
-/* Enriched sellingPlan type including isSelected and url */
-export type SellingPlan = SellingPlanFragment & {
-  isSelected: boolean;
-  url: string;
-};
-
-/* Enriched sellingPlanGroup type including enriched SellingPlan nodes */
-export type SellingPlanGroup = Omit<
-  SellingPlanGroupFragment,
-  'sellingPlans'
-> & {
-  sellingPlans: {
-    nodes: SellingPlan[];
-  };
-};
-
-/**
- * A component that simplifies selecting sellingPlans subscription options
- * @example Example use
- * ```ts
- *   <SellingPlanSelector
- *     sellingPlanGroups={sellingPlanGroups}
- *     selectedSellingPlanId={selectedSellingPlanId}
- *   >
- *     {({sellingPlanGroup}) => ( ...your sellingPlanGroup component )}
- *  </SellingPlanSelector>
- *  ```
- **/
-export function SellingPlanSelector({
-  sellingPlanGroups,
-  selectedSellingPlan,
-  children,
-  paramKey = 'selling_plan',
-}: {
-  sellingPlanGroups: ProductFragment['sellingPlanGroups'];
-  selectedSellingPlan: SellingPlanFragment | null;
-  paramKey?: string;
-  children: (params: {
-    sellingPlanGroup: SellingPlanGroup;
-    selectedSellingPlan: SellingPlanFragment | null;
-  }) => React.ReactNode;
-}) {
-  const {search, pathname} = useLocation();
-  const params = new URLSearchParams(search);
-
-  return useMemo(
-    () =>
-      (sellingPlanGroups.nodes as SellingPlanGroup[]).map(
-        (sellingPlanGroup) => {
-          // Augmnet each sellingPlan node with isSelected and url
-          const sellingPlans = sellingPlanGroup.sellingPlans.nodes
-            .map((sellingPlan: SellingPlan) => {
-              if (!sellingPlan?.id) {
-                //eslint-disable-next-line no-console
-                console.warn(
-                  'SellingPlanSelector: sellingPlan.id is missing in the product query',
-                );
-                return null;
-              }
-              if (!sellingPlan.id) return null;
-              params.set(paramKey, sellingPlan.id);
-              sellingPlan.isSelected =
-                selectedSellingPlan?.id === sellingPlan.id;
-              sellingPlan.url = `${pathname}?${params.toString()}`;
-              return sellingPlan;
-            })
-            .filter(Boolean) as SellingPlan[];
-          sellingPlanGroup.sellingPlans.nodes = sellingPlans;
-          return children({sellingPlanGroup, selectedSellingPlan});
-        },
-      ),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [sellingPlanGroups, children, selectedSellingPlan, paramKey, pathname],
-  );
-}
-
-```
-
-### templates/skeleton/app/styles/selling-plan.css
-
-The `selling-plan.css` file is used to style the `SellingPlanSelector` component.
-
-```css
-.selling-plan-group {
-  margin-bottom: 1rem;
-}
-
-.selling-plan-group-title {
-  font-weight: 500;
-  margin-bottom: 0.5rem;
-}
-
-.selling-plan {
-  border: 1px solid;
-  display: inline-block;
-  padding: 1rem;
-  margin-right: 0.5rem;
-  line-height: 1;
-  padding-top: 0.25rem;
-  padding-bottom: 0.25rem;
-  border-bottom-width: 1.5px;
-  cursor: pointer;
-  transition: all 0.2s;
-}
-
-.selling-plan:hover {
-  text-decoration: none;
-}
-
-.selling-plan.selected {
-  border-color: #6b7280; /* Equivalent to 'border-gray-500' */
-}
-
-.selling-plan.unselected {
-  border-color: #fafafa; /* Equivalent to 'border-neutral-50' */
-}
-
-```
-
-## Steps
-
-### Step 1: Set up the Shopify Subscriptions app
-
-1. Install the [Shopify Subscriptions app](https://apps.shopify.com/shopify-subscriptions).
-2. In your Shopify admin, [use the Subscriptions app](https://admin.shopify.com/apps/subscriptions-remix/app) to create one or more subscription plans.
-3. On the [Products](https://admin.shopify.com/products) page, open any products that will be sold as subscriptions and add the relevant subscription plans in the **Purchase options** section.
-The Hydrogen demo storefront comes pre-configured with an example subscription product with the handle `shopify-wax`.
-
-
-### Step 2: Render the selling plan in the cart
-
-1. Update `CartLineItem` to show subscription details when they're available.
-2. Extract `sellingPlanAllocation` from cart line data, display the plan name, and standardize component import paths.
-
-
-#### File: /app/components/CartLineItem.tsx
-
-```diff
-@@ -3,8 +3,8 @@ import type {CartLayout} from '~/components/CartMain';
- import {CartForm, Image, type OptimisticCartLine} from '@shopify/hydrogen';
- import {useVariantUrl} from '~/lib/variants';
- import {Link} from '@remix-run/react';
--import {ProductPrice} from './ProductPrice';
--import {useAside} from './Aside';
-+import {ProductPrice} from '~/components/ProductPrice';
-+import {useAside} from '~/components/Aside';
- import type {CartApiQueryFragment} from 'storefrontapi.generated';
- 
- type CartLine = OptimisticCartLine<CartApiQueryFragment>;
-@@ -20,7 +20,9 @@ export function CartLineItem({
-   layout: CartLayout;
-   line: CartLine;
- }) {
--  const {id, merchandise} = line;
-+  // Get the selling plan allocation
-+  const {id, merchandise, sellingPlanAllocation} = line;
-+
-   const {product, title, image, selectedOptions} = merchandise;
-   const lineItemUrl = useVariantUrl(product.handle, selectedOptions);
-   const {close} = useAside();
-@@ -54,6 +56,12 @@ export function CartLineItem({
-         </Link>
-         <ProductPrice price={line?.cost?.totalAmount} />
-         <ul>
-+          {/* Optionally render the selling plan name if available */}
-+          {sellingPlanAllocation && (
-+            <li key={sellingPlanAllocation.sellingPlan.name}>
-+              <small>{sellingPlanAllocation.sellingPlan.name}</small>
-+            </li>
-+          )}
-           {selectedOptions.map((option) => (
-             <li key={option.name}>
-               <small>
-```
-
-### Step 3: Update `ProductForm` to support subscriptions
-
-1. Add conditional rendering to display either subscription options or standard variant selectors.
-2. Implement `SellingPlanSelector` and `SellingPlanGroup` components to handle subscription plan selection.
-3. Update `AddToCartButton` to include selling plan data when subscriptions are selected.
-
-
-#### File: /app/components/ProductForm.tsx
-
-```diff
-@@ -6,120 +6,169 @@ import type {
- } from '@shopify/hydrogen/storefront-api-types';
- import {AddToCartButton} from './AddToCartButton';
- import {useAside} from './Aside';
--import type {ProductFragment} from 'storefrontapi.generated';
-+import type {
-+  ProductFragment,
-+  SellingPlanFragment,
-+} from 'storefrontapi.generated';
-+import {
-+  SellingPlanSelector,
-+  type SellingPlanGroup,
-+} from '~/components/SellingPlanSelector';
- 
- export function ProductForm({
-   productOptions,
-   selectedVariant,
-+  sellingPlanGroups,
-+  selectedSellingPlan,
- }: {
-   productOptions: MappedProductOptions[];
-   selectedVariant: ProductFragment['selectedOrFirstAvailableVariant'];
-+  selectedSellingPlan: SellingPlanFragment | null;
-+  sellingPlanGroups: ProductFragment['sellingPlanGroups'];
- }) {
-   const navigate = useNavigate();
-   const {open} = useAside();
-   return (
-     <div className="product-form">
--      {productOptions.map((option) => {
--        // If there is only a single value in the option values, don't display the option
--        if (option.optionValues.length === 1) return null;
-+      {sellingPlanGroups.nodes.length > 0 ? (
-+        <>
-+          <SellingPlanSelector
-+            sellingPlanGroups={sellingPlanGroups}
-+            selectedSellingPlan={selectedSellingPlan}
-+          >
-+            {({sellingPlanGroup}) => (
-+              <SellingPlanGroup
-+                key={sellingPlanGroup.name}
-+                sellingPlanGroup={sellingPlanGroup}
-+              />
-+            )}
-+          </SellingPlanSelector>
-+          <br />
-+          <AddToCartButton
-+            disabled={!selectedSellingPlan}
-+            onClick={() => {
-+              open('cart');
-+            }}
-+            lines={
-+              selectedSellingPlan && selectedVariant
-+                ? [
-+                    {
-+                      quantity: 1,
-+                      selectedVariant,
-+                      sellingPlanId: selectedSellingPlan.id,
-+                      merchandiseId: selectedVariant.id,
-+                    },
-+                  ]
-+                : []
-+            }
-+          >
-+            {selectedSellingPlan ? 'Subscribe' : 'Select Subscription'}
-+          </AddToCartButton>
-+        </>
-+      ) : (
-+        productOptions.map((option) => {
-+          // If there is only a single value in the option values, don't display the option
-+          if (option.optionValues.length === 1) return null;
- 
--        return (
--          <div className="product-options" key={option.name}>
--            <h5>{option.name}</h5>
--            <div className="product-options-grid">
--              {option.optionValues.map((value) => {
--                const {
--                  name,
--                  handle,
--                  variantUriQuery,
--                  selected,
--                  available,
--                  exists,
--                  isDifferentProduct,
--                  swatch,
--                } = value;
-+          return (
-+            <div className="product-options" key={option.name}>
-+              <h5>{option.name}</h5>
-+              <div className="product-options-grid">
-+                {option.optionValues.map((value) => {
-+                  const {
-+                    name,
-+                    handle,
-+                    variantUriQuery,
-+                    selected,
-+                    available,
-+                    exists,
-+                    isDifferentProduct,
-+                    swatch,
-+                  } = value;
- 
--                if (isDifferentProduct) {
--                  // SEO
--                  // When the variant is a combined listing child product
--                  // that leads to a different url, we need to render it
--                  // as an anchor tag
--                  return (
--                    <Link
--                      className="product-options-item"
--                      key={option.name + name}
--                      prefetch="intent"
--                      preventScrollReset
--                      replace
--                      to={`/products/${handle}?${variantUriQuery}`}
--                      style={{
--                        border: selected
--                          ? '1px solid black'
--                          : '1px solid transparent',
--                        opacity: available ? 1 : 0.3,
--                      }}
--                    >
--                      <ProductOptionSwatch swatch={swatch} name={name} />
--                    </Link>
--                  );
--                } else {
--                  // SEO
--                  // When the variant is an update to the search param,
--                  // render it as a button with javascript navigating to
--                  // the variant so that SEO bots do not index these as
--                  // duplicated links
--                  return (
--                    <button
--                      type="button"
--                      className={`product-options-item${
--                        exists && !selected ? ' link' : ''
--                      }`}
--                      key={option.name + name}
--                      style={{
--                        border: selected
--                          ? '1px solid black'
--                          : '1px solid transparent',
--                        opacity: available ? 1 : 0.3,
--                      }}
--                      disabled={!exists}
--                      onClick={() => {
--                        if (!selected) {
--                          navigate(`?${variantUriQuery}`, {
--                            replace: true,
--                            preventScrollReset: true,
--                          });
--                        }
--                      }}
--                    >
--                      <ProductOptionSwatch swatch={swatch} name={name} />
--                    </button>
--                  );
-+                  if (isDifferentProduct) {
-+                    // SEO
-+                    // When the variant is a combined listing child product
-+                    // that leads to a different url, we need to render it
-+                    // as an anchor tag
-+                    return (
-+                      <Link
-+                        className="product-options-item"
-+                        key={option.name + name}
-+                        prefetch="intent"
-+                        preventScrollReset
-+                        replace
-+                        to={`/products/${handle}?${variantUriQuery}`}
-+                        style={{
-+                          border: selected
-+                            ? '1px solid black'
-+                            : '1px solid transparent',
-+                          opacity: available ? 1 : 0.3,
-+                        }}
-+                      >
-+                        <ProductOptionSwatch swatch={swatch} name={name} />
-+                      </Link>
-+                    );
-+                  } else {
-+                    // SEO
-+                    // When the variant is an update to the search param,
-+                    // render it as a button with javascript navigating to
-+                    // the variant so that SEO bots do not index these as
-+                    // duplicated links
-+                    return (
-+                      <button
-+                        type="button"
-+                        className={`product-options-item${
-+                          exists && !selected ? ' link' : ''
-+                        }`}
-+                        key={option.name + name}
-+                        style={{
-+                          border: selected
-+                            ? '1px solid black'
-+                            : '1px solid transparent',
-+                          opacity: available ? 1 : 0.3,
-+                        }}
-+                        disabled={!exists}
-+                        onClick={() => {
-+                          if (!selected) {
-+                            navigate(`?${variantUriQuery}`, {
-+                              replace: true,
-+                              preventScrollReset: true,
-+                            });
-+                          }
-+                        }}
-+                      >
-+                        <ProductOptionSwatch swatch={swatch} name={name} />
-+                      </button>
-+                    );
-+                  }
-+                })}
-+              </div>
-+              <AddToCartButton
-+                disabled={!selectedVariant || !selectedVariant.availableForSale}
-+                onClick={() => {
-+                  open('cart');
-+                }}
-+                lines={
-+                  selectedVariant
-+                    ? [
-+                        {
-+                          merchandiseId: selectedVariant.id,
-+                          quantity: 1,
-+                          selectedVariant,
-+                        },
-+                      ]
-+                    : []
-                 }
--              })}
-+              >
-+                {selectedVariant?.availableForSale ? 'Add to cart' : 'Sold out'}
-+              </AddToCartButton>
-+
-+              <br />
-             </div>
--            <br />
--          </div>
--        );
--      })}
--      <AddToCartButton
--        disabled={!selectedVariant || !selectedVariant.availableForSale}
--        onClick={() => {
--          open('cart');
--        }}
--        lines={
--          selectedVariant
--            ? [
--                {
--                  merchandiseId: selectedVariant.id,
--                  quantity: 1,
--                  selectedVariant,
--                },
--              ]
--            : []
--        }
--      >
--        {selectedVariant?.availableForSale ? 'Add to cart' : 'Sold out'}
--      </AddToCartButton>
-+          );
-+        })
-+      )}
-     </div>
-   );
- }
-@@ -148,3 +197,38 @@ function ProductOptionSwatch({
-     </div>
-   );
- }
-+
-+// Update as you see fit to match your design and requirements
-+function SellingPlanGroup({
-+  sellingPlanGroup,
-+}: {
-+  sellingPlanGroup: SellingPlanGroup;
-+}) {
-+  return (
-+    <div className="selling-plan-group" key={sellingPlanGroup.name}>
-+      <p className="selling-plan-group-title">
-+        <strong>{sellingPlanGroup.name}:</strong>
-+      </p>
-+      {sellingPlanGroup.sellingPlans.nodes.map((sellingPlan) => {
-+        return (
-+          <Link
-+            key={sellingPlan.id}
-+            prefetch="intent"
-+            to={sellingPlan.url}
-+            className={`selling-plan ${
-+              sellingPlan.isSelected ? 'selected' : 'unselected'
-+            }`}
-+            preventScrollReset
-+            replace
-+          >
-+            <p>
-+              {sellingPlan.options.map(
-+                (option) => `${option.name} ${option.value}`,
-+              )}
-+            </p>
-+          </Link>
-+        );
-+      })}
-+    </div>
-+  );
-+}
-```
-
-### Step 4: Update `ProductPrice` to display subscription pricing
-
-1. Add a `SellingPlanPrice` function to calculate adjusted prices based on subscription plan type (fixed amount, fixed price, or percentage).
-2. Add logic to handle different price adjustment types and render the appropriate subscription price when a selling plan is selected.
-
-
-#### File: /app/components/ProductPrice.tsx
-
-```diff
-@@ -1,13 +1,31 @@
-+import type {CurrencyCode} from '@shopify/hydrogen/customer-account-api-types';
-+import type {
-+  ProductFragment,
-+  SellingPlanFragment,
-+} from 'storefrontapi.generated';
- import {Money} from '@shopify/hydrogen';
- import type {MoneyV2} from '@shopify/hydrogen/storefront-api-types';
- 
- export function ProductPrice({
-   price,
-   compareAtPrice,
-+  selectedSellingPlan,
-+  selectedVariant,
- }: {
-   price?: MoneyV2;
-   compareAtPrice?: MoneyV2 | null;
-+  selectedVariant?: ProductFragment['selectedOrFirstAvailableVariant'];
-+  selectedSellingPlan?: SellingPlanFragment | null;
- }) {
-+  if (selectedSellingPlan) {
-+    return (
-+      <SellingPlanPrice
-+        selectedSellingPlan={selectedSellingPlan}
-+        selectedVariant={selectedVariant}
-+      />
-+    );
-+  }
-+
-   return (
-     <div className="product-price">
-       {compareAtPrice ? (
-@@ -25,3 +43,74 @@ export function ProductPrice({
-     </div>
-   );
- }
-+
-+type SellingPlanPrice = {
-+  amount: number;
-+  currencyCode: CurrencyCode;
-+};
-+
-+/*
-+  Render the selected selling plan price is available
-+*/
-+function SellingPlanPrice({
-+  selectedSellingPlan,
-+  selectedVariant,
-+}: {
-+  selectedSellingPlan: SellingPlanFragment;
-+  selectedVariant: ProductFragment['selectedOrFirstAvailableVariant'];
-+}) {
-+  if (!selectedVariant) {
-+    return null;
-+  }
-+
-+  const sellingPlanPriceAdjustments = selectedSellingPlan?.priceAdjustments;
-+
-+  if (!sellingPlanPriceAdjustments?.length) {
-+    return selectedVariant ? <Money data={selectedVariant.price} /> : null;
-+  }
-+
-+  const selectedVariantPrice: SellingPlanPrice = {
-+    amount: parseFloat(selectedVariant.price.amount),
-+    currencyCode: selectedVariant.price.currencyCode,
-+  };
-+
-+  const sellingPlanPrice: SellingPlanPrice = sellingPlanPriceAdjustments.reduce(
-+    (acc, adjustment) => {
-+      switch (adjustment.adjustmentValue.__typename) {
-+        case 'SellingPlanFixedAmountPriceAdjustment':
-+          return {
-+            amount:
-+              acc.amount +
-+              parseFloat(adjustment.adjustmentValue.adjustmentAmount.amount),
-+            currencyCode: acc.currencyCode,
-+          };
-+        case 'SellingPlanFixedPriceAdjustment':
-+          return {
-+            amount: parseFloat(adjustment.adjustmentValue.price.amount),
-+            currencyCode: acc.currencyCode,
-+          };
-+        case 'SellingPlanPercentagePriceAdjustment':
-+          return {
-+            amount:
-+              acc.amount *
-+              (1 - adjustment.adjustmentValue.adjustmentPercentage / 100),
-+            currencyCode: acc.currencyCode,
-+          };
-+        default:
-+          return acc;
-+      }
-+    },
-+    selectedVariantPrice,
-+  );
-+
-+  return (
-+    <div className="selling-plan-price">
-+      <Money
-+        data={{
-+          amount: `${sellingPlanPrice.amount}`,
-+          currencyCode: sellingPlanPrice.currencyCode,
-+        }}
-+      />
-+    </div>
-+  );
-+}
-```
-
-### Step 5: Add selling plan data to cart queries
-
-Add a `sellingPlanAllocation` field with the plan name to the standard and componentizable cart line GraphQL fragments. This displays subscription details in the cart.
-
-
-#### File: /app/lib/fragments.ts
-
-```diff
-@@ -54,6 +54,11 @@ export const CART_QUERY_FRAGMENT = `#graphql
-         }
-       }
-     }
-+    sellingPlanAllocation {
-+      sellingPlan {
-+         name
-+      }
-+    }
-   }
-   fragment CartLineComponent on ComponentizableCartLine {
-     id
-@@ -104,6 +109,11 @@ export const CART_QUERY_FRAGMENT = `#graphql
-         }
-       }
-     }
-+    sellingPlanAllocation {
-+      sellingPlan {
-+         name
-+      }
-+    }
-   }
-   fragment CartApiQuery on Cart {
-     updatedAt
-```
-
-### Step 6: Add `SellingPlanSelector` to product pages
-
-1. Add the `SellingPlanSelector` component to display subscription options on product pages.
-2. Add logic to handle pricing adjustments, maintain selection state using URL parameters, and update the add-to-cart functionality.
-3. Fetch subscription data through the updated cart GraphQL fragments.
-
-
-#### File: /app/routes/products.$handle.tsx
-
-```diff
-@@ -1,3 +1,5 @@
-+import type {SellingPlanFragment} from 'storefrontapi.generated';
-+import type {LinksFunction} from '@remix-run/node';
- import {redirect, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
- import {useLoaderData, type MetaFunction} from '@remix-run/react';
- import {
-@@ -13,6 +15,12 @@ import {ProductImage} from '~/components/ProductImage';
- import {ProductForm} from '~/components/ProductForm';
- import {redirectIfHandleIsLocalized} from '~/lib/redirect';
- 
-+import sellingPanStyle from '~/styles/selling-plan.css?url';
-+
-+export const links: LinksFunction = () => [
-+  {rel: 'stylesheet', href: sellingPanStyle},
-+];
-+
- export const meta: MetaFunction<typeof loader> = ({data}) => {
-   return [
-     {title: `Hydrogen | ${data?.product.title ?? ''}`},
-@@ -63,8 +71,34 @@ async function loadCriticalData({
-   // The API handle might be localized, so redirect to the localized handle
-   redirectIfHandleIsLocalized(request, {handle, data: product});
- 
-+  // Initialize the selectedSellingPlan to null
-+  let selectedSellingPlan = null;
-+
-+  // Get the selected selling plan id from the request url
-+  const selectedSellingPlanId =
-+    new URL(request.url).searchParams.get('selling_plan') ?? null;
-+
-+  // Get the selected selling plan bsed on the selectedSellingPlanId
-+  if (selectedSellingPlanId) {
-+    const selectedSellingPlanGroup =
-+      product.sellingPlanGroups.nodes?.find((sellingPlanGroup) => {
-+        return sellingPlanGroup.sellingPlans.nodes?.find(
-+          (sellingPlan: SellingPlanFragment) =>
-+            sellingPlan.id === selectedSellingPlanId,
-+        );
-+      }) ?? null;
-+
-+    if (selectedSellingPlanGroup) {
-+      selectedSellingPlan =
-+        selectedSellingPlanGroup.sellingPlans.nodes.find((sellingPlan) => {
-+          return sellingPlan.id === selectedSellingPlanId;
-+        }) ?? null;
-+    }
-+  }
-+
-   return {
-     product,
-+    selectedSellingPlan,
-   };
- }
- 
-@@ -81,7 +115,7 @@ function loadDeferredData({context, params}: LoaderFunctionArgs) {
- }
- 
- export default function Product() {
--  const {product} = useLoaderData<typeof loader>();
-+  const {product, selectedSellingPlan} = useLoaderData<typeof loader>();
- 
-   // Optimistically selects a variant with given available variant information
-   const selectedVariant = useOptimisticVariant(
-@@ -99,7 +133,7 @@ export default function Product() {
-     selectedOrFirstAvailableVariant: selectedVariant,
-   });
- 
--  const {title, descriptionHtml} = product;
-+  const {title, descriptionHtml, sellingPlanGroups} = product;
- 
-   return (
-     <div className="product">
-@@ -109,11 +143,15 @@ export default function Product() {
-         <ProductPrice
-           price={selectedVariant?.price}
-           compareAtPrice={selectedVariant?.compareAtPrice}
-+          selectedSellingPlan={selectedSellingPlan}
-+          selectedVariant={selectedVariant}
-         />
-         <br />
-         <ProductForm
-           productOptions={productOptions}
-           selectedVariant={selectedVariant}
-+          selectedSellingPlan={selectedSellingPlan}
-+          sellingPlanGroups={sellingPlanGroups}
-         />
-         <br />
-         <br />
-@@ -180,6 +218,73 @@ const PRODUCT_VARIANT_FRAGMENT = `#graphql
-   }
- ` as const;
- 
-+const SELLING_PLAN_FRAGMENT = `#graphql
-+  fragment SellingPlanMoney on MoneyV2 {
-+    amount
-+    currencyCode
-+  }
-+  fragment SellingPlan on SellingPlan {
-+    id
-+    options {
-+      name
-+      value
-+    }
-+    priceAdjustments {
-+      adjustmentValue {
-+        ... on SellingPlanFixedAmountPriceAdjustment {
-+          __typename
-+          adjustmentAmount {
-+            ... on MoneyV2 {
-+               ...SellingPlanMoney
-+            }
-+          }
-+        }
-+        ... on SellingPlanFixedPriceAdjustment {
-+          __typename
-+          price {
-+            ... on MoneyV2 {
-+              ...SellingPlanMoney
-+            }
-+          }
-+        }
-+        ... on SellingPlanPercentagePriceAdjustment {
-+          __typename
-+          adjustmentPercentage
-+        }
-+      }
-+      orderCount
-+    }
-+    recurringDeliveries
-+    checkoutCharge {
-+      type
-+      value {
-+        ... on MoneyV2 {
-+          ...SellingPlanMoney
-+        }
-+        ... on SellingPlanCheckoutChargePercentageValue {
-+          percentage
-+        }
-+      }
-+    }
-+ }
-+` as const;
-+
-+const SELLING_PLAN_GROUP_FRAGMENT = `#graphql
-+  fragment SellingPlanGroup on SellingPlanGroup {
-+    name
-+    options {
-+      name
-+      values
-+    }
-+    sellingPlans(first:10) {
-+      nodes {
-+        ...SellingPlan
-+      }
-+    }
-+  }
-+  ${SELLING_PLAN_FRAGMENT}
-+` as const;
-+
- const PRODUCT_FRAGMENT = `#graphql
-   fragment Product on Product {
-     id
-@@ -207,6 +312,11 @@ const PRODUCT_FRAGMENT = `#graphql
-         }
-       }
-     }
-+    sellingPlanGroups(first:10) {
-+      nodes {
-+        ...SellingPlanGroup
-+      }
-+    }
-     selectedOrFirstAvailableVariant(selectedOptions: $selectedOptions, ignoreUnknownOptions: true, caseInsensitiveMatch: true) {
-       ...ProductVariant
-     }
-@@ -218,6 +328,7 @@ const PRODUCT_FRAGMENT = `#graphql
-       title
-     }
-   }
-+  ${SELLING_PLAN_GROUP_FRAGMENT}
-   ${PRODUCT_VARIANT_FRAGMENT}
- ` as const;
-```
-
-</recipe_implementation>