@shopify/cli-hydrogen 11.1.7 → 11.1.8

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

@@ -1,5 +1,79 @@
 # skeleton
 
+## 2025.10.1
+
+### Major Changes
+
+- Update Storefront API and Customer Account API to version 2025-10 ([#3430](https://github.com/Shopify/hydrogen/pull/3430)) by [@kdaviduik](https://github.com/kdaviduik)
+
+### Patch Changes
+
+- Add support for Bun's text-based lockfile (`bun.lock`) introduced in Bun 1.2, and npm's shrinkwrap lockfile (`npm-shrinkwrap.json`), as alternatives to their respective primary lockfiles (`bun.lockb` and `package-lock.json`). ([#3430](https://github.com/Shopify/hydrogen/pull/3430)) by [@kdaviduik](https://github.com/kdaviduik)
+
+- Add `cartGiftCardCodesAdd` mutation ([#3430](https://github.com/Shopify/hydrogen/pull/3430)) by [@kdaviduik](https://github.com/kdaviduik)
+
+  ## New Feature: cartGiftCardCodesAdd
+
+  The skeleton template has been updated to use the new `cartGiftCardCodesAdd` mutation:
+  - Removed `UpdateGiftCardForm` component from `CartSummary.tsx`
+  - Added `AddGiftCardForm` component using `CartForm.ACTIONS.GiftCardCodesAdd`
+
+  If you customized the gift card form in your project, you may want to migrate to the new `Add` action for simpler code.
+
+  ## Usage
+
+  ```typescript
+  import {CartForm} from '@shopify/hydrogen';
+
+  <CartForm action={CartForm.ACTIONS.GiftCardCodesAdd} inputs={{giftCardCodes: ['CODE1', 'CODE2']}}>
+    <button>Add Gift Cards</button>
+  </CartForm>
+  ```
+
+  Or with createCartHandler:
+
+  ```typescript
+  const cart = createCartHandler({storefront, getCartId, setCartId});
+  await cart.addGiftCardCodes(['SUMMER2025', 'WELCOME10']);
+  ```
+
+- Add support for nested cart line items (warranties, gift wrapping, etc.) ([#3430](https://github.com/Shopify/hydrogen/pull/3430)) by [@kdaviduik](https://github.com/kdaviduik)
+
+  Storefront API 2025-10 introduces `parentRelationship` on cart line items, enabling parent-child relationships for add-ons. This update displays nested line items in the cart.
+
+  ### Changes
+  - Updates GraphQL fragments to include `parentRelationship` and `lineComponents` fields
+  - Updates `CartMain` and `CartLineItem` to render child line items with visual hierarchy
+
+  ### Note
+
+  This update focuses on **displaying** nested line items. To add both a product and its child (e.g., warranty) in a single action:
+
+  ```tsx
+  <AddToCartButton
+    lines={[
+      {merchandiseId: 'gid://shopify/ProductVariant/laptop-456', quantity: 1},
+      {
+        merchandiseId: 'gid://shopify/ProductVariant/warranty-123',
+        quantity: 1,
+        parent: {merchandiseId: 'gid://shopify/ProductVariant/laptop-456'},
+      },
+    ]}
+  >
+    Add to Cart with Warranty
+  </AddToCartButton>
+  ```
+
+- Updated dependencies [[`722915130410086bc7af22215ba57ee77aa14156`](https://github.com/Shopify/hydrogen/commit/722915130410086bc7af22215ba57ee77aa14156)]:
+  - @shopify/hydrogen@2025.10.1
+
+## 2025.10.0
+
+### Patch Changes
+
+- Updated dependencies [[`cd653456fbd1e7e1ab1f6fecff04c89a74b6cad9`](https://github.com/Shopify/hydrogen/commit/cd653456fbd1e7e1ab1f6fecff04c89a74b6cad9), [`24d26ad94e90ab0a859c274838f7f31e75a7808c`](https://github.com/Shopify/hydrogen/commit/24d26ad94e90ab0a859c274838f7f31e75a7808c), [`13a6f8987ea20d33a30a9c0329d7c11528b892ea`](https://github.com/Shopify/hydrogen/commit/13a6f8987ea20d33a30a9c0329d7c11528b892ea), [`403c1f5b6e266c3dfad30f7cfed229e3304570b0`](https://github.com/Shopify/hydrogen/commit/403c1f5b6e266c3dfad30f7cfed229e3304570b0), [`38f8a79625838a9cd4520b20c0db2e5d331f7d26`](https://github.com/Shopify/hydrogen/commit/38f8a79625838a9cd4520b20c0db2e5d331f7d26)]:
+  - @shopify/hydrogen@2026.0.0
+
 ## 2025.7.3
 
 ### Patch Changes

package/dist/assets/hydrogen/starter/app/components/CartLineItem.tsx

@@ -1,69 +1,98 @@
 import type {CartLineUpdateInput} from '@shopify/hydrogen/storefront-api-types';
-import type {CartLayout} from '~/components/CartMain';
+import type {CartLayout, LineItemChildrenMap} from '~/components/CartMain';
 import {CartForm, Image, type OptimisticCartLine} from '@shopify/hydrogen';
 import {useVariantUrl} from '~/lib/variants';
 import {Link} from 'react-router';
 import {ProductPrice} from './ProductPrice';
 import {useAside} from './Aside';
-import type {CartApiQueryFragment} from 'storefrontapi.generated';
+import type {
+  CartApiQueryFragment,
+  CartLineFragment,
+} from 'storefrontapi.generated';
 
-type CartLine = OptimisticCartLine<CartApiQueryFragment>;
+export type CartLine = OptimisticCartLine<CartApiQueryFragment>;
 
 /**
  * A single line item in the cart. It displays the product image, title, price.
  * It also provides controls to update the quantity or remove the line item.
+ * If the line is a parent line that has child components (like warranties or gift wrapping), they are
+ * rendered nested below the parent line.
  */
 export function CartLineItem({
   layout,
   line,
+  childrenMap,
 }: {
   layout: CartLayout;
   line: CartLine;
+  childrenMap: LineItemChildrenMap;
 }) {
   const {id, merchandise} = line;
   const {product, title, image, selectedOptions} = merchandise;
   const lineItemUrl = useVariantUrl(product.handle, selectedOptions);
   const {close} = useAside();
+  const lineItemChildren = childrenMap[id];
+  const childrenLabelId = `cart-line-children-${id}`;
 
   return (
     <li key={id} className="cart-line">
-      {image && (
-        <Image
-          alt={title}
-          aspectRatio="1/1"
-          data={image}
-          height={100}
-          loading="lazy"
-          width={100}
-        />
-      )}
+      <div className="cart-line-inner">
+        {image && (
+          <Image
+            alt={title}
+            aspectRatio="1/1"
+            data={image}
+            height={100}
+            loading="lazy"
+            width={100}
+          />
+        )}
 
-      <div>
-        <Link
-          prefetch="intent"
-          to={lineItemUrl}
-          onClick={() => {
-            if (layout === 'aside') {
-              close();
-            }
-          }}
-        >
-          <p>
-            <strong>{product.title}</strong>
-          </p>
-        </Link>
-        <ProductPrice price={line?.cost?.totalAmount} />
-        <ul>
-          {selectedOptions.map((option) => (
-            <li key={option.name}>
-              <small>
-                {option.name}: {option.value}
-              </small>
-            </li>
-          ))}
-        </ul>
-        <CartLineQuantity line={line} />
+        <div>
+          <Link
+            prefetch="intent"
+            to={lineItemUrl}
+            onClick={() => {
+              if (layout === 'aside') {
+                close();
+              }
+            }}
+          >
+            <p>
+              <strong>{product.title}</strong>
+            </p>
+          </Link>
+          <ProductPrice price={line?.cost?.totalAmount} />
+          <ul>
+            {selectedOptions.map((option) => (
+              <li key={option.name}>
+                <small>
+                  {option.name}: {option.value}
+                </small>
+              </li>
+            ))}
+          </ul>
+          <CartLineQuantity line={line} />
+        </div>
       </div>
+
+      {lineItemChildren ? (
+        <div>
+          <p id={childrenLabelId} className="sr-only">
+            Line items with {product.title}
+          </p>
+          <ul aria-labelledby={childrenLabelId} className="cart-line-children">
+            {lineItemChildren.map((childLine) => (
+              <CartLineItem
+                childrenMap={childrenMap}
+                key={childLine.id}
+                line={childLine}
+                layout={layout}
+              />
+            ))}
+          </ul>
+        </div>
+      ) : null}
     </li>
   );
 }

package/dist/assets/hydrogen/starter/app/components/CartMain.tsx

@@ -1,8 +1,8 @@
-import {useOptimisticCart} from '@shopify/hydrogen';
+import {useOptimisticCart, type OptimisticCartLine} from '@shopify/hydrogen';
 import {Link} from 'react-router';
 import type {CartApiQueryFragment} from 'storefrontapi.generated';
 import {useAside} from '~/components/Aside';
-import {CartLineItem} from '~/components/CartLineItem';
+import {CartLineItem, type CartLine} from '~/components/CartLineItem';
 import {CartSummary} from './CartSummary';
 
 export type CartLayout = 'page' | 'aside';
@@ -12,6 +12,26 @@ export type CartMainProps = {
   layout: CartLayout;
 };
 
+export type LineItemChildrenMap = {[parentId: string]: CartLine[]};
+/** Returns a map of all line items and their children. */
+function getLineItemChildrenMap(lines: CartLine[]): LineItemChildrenMap {
+  const children: LineItemChildrenMap = {};
+  for (const line of lines) {
+    if ('parentRelationship' in line && line.parentRelationship?.parent) {
+      const parentId = line.parentRelationship.parent.id;
+      if (!children[parentId]) children[parentId] = [];
+      children[parentId].push(line);
+    }
+    if ('lineComponents' in line) {
+      const children = getLineItemChildrenMap(line.lineComponents);
+      for (const [parentId, childIds] of Object.entries(children)) {
+        if (!children[parentId]) children[parentId] = [];
+        children[parentId].push(...childIds);
+      }
+    }
+  }
+  return children;
+}
 /**
  * The main cart component that displays the cart items and summary.
  * It is used by both the /cart route and the cart aside dialog.
@@ -27,16 +47,34 @@ export function CartMain({layout, cart: originalCart}: CartMainProps) {
     Boolean(cart?.discountCodes?.filter((code) => code.applicable)?.length);
   const className = `cart-main ${withDiscount ? 'with-discount' : ''}`;
   const cartHasItems = cart?.totalQuantity ? cart.totalQuantity > 0 : false;
+  const childrenMap = getLineItemChildrenMap(cart?.lines?.nodes ?? []);
 
   return (
     <div className={className}>
       <CartEmpty hidden={linesCount} layout={layout} />
       <div className="cart-details">
-        <div aria-labelledby="cart-lines">
-          <ul>
-            {(cart?.lines?.nodes ?? []).map((line) => (
-              <CartLineItem key={line.id} line={line} layout={layout} />
-            ))}
+        <p id="cart-lines" className="sr-only">
+          Line items
+        </p>
+        <div>
+          <ul aria-labelledby="cart-lines">
+            {(cart?.lines?.nodes ?? []).map((line) => {
+              // we do not render non-parent lines at the root of the cart
+              if (
+                'parentRelationship' in line &&
+                line.parentRelationship?.parent
+              ) {
+                return null;
+              }
+              return (
+                <CartLineItem
+                  key={line.id}
+                  line={line}
+                  layout={layout}
+                  childrenMap={childrenMap}
+                />
+              );
+            })}
           </ul>
         </div>
         {cartHasItems && <CartSummary cart={cart} layout={layout} />}

package/dist/assets/hydrogen/starter/app/components/CartSummary.tsx

@@ -3,7 +3,6 @@ import type {CartLayout} from '~/components/CartMain';
 import {CartForm, Money, type OptimisticCart} from '@shopify/hydrogen';
 import {useEffect, useRef} from 'react';
 import {useFetcher} from 'react-router';
-import type {FetcherWithComponents} from 'react-router';
 
 type CartSummaryProps = {
   cart: OptimisticCart<CartApiQueryFragment | null>;
@@ -67,7 +66,9 @@ function CartDiscounts({
             <div className="cart-discount">
               <code>{codes?.join(', ')}</code>
               &nbsp;
-              <button>Remove</button>
+              <button type="submit" aria-label="Remove discount">
+                Remove
+              </button>
             </div>
           </UpdateDiscountForm>
         </div>
@@ -76,9 +77,19 @@ function CartDiscounts({
       {/* Show an input to apply a discount */}
       <UpdateDiscountForm discountCodes={codes}>
         <div>
-          <input type="text" name="discountCode" placeholder="Discount code" />
+          <label htmlFor="discount-code-input" className="sr-only">
+            Discount code
+          </label>
+          <input
+            id="discount-code-input"
+            type="text"
+            name="discountCode"
+            placeholder="Discount code"
+          />
           &nbsp;
-          <button type="submit">Apply</button>
+          <button type="submit" aria-label="Apply discount code">
+            Apply
+          </button>
         </div>
       </UpdateDiscountForm>
     </div>
@@ -110,27 +121,17 @@ function CartGiftCard({
 }: {
   giftCardCodes: CartApiQueryFragment['appliedGiftCards'] | undefined;
 }) {
-  const appliedGiftCardCodes = useRef<string[]>([]);
   const giftCardCodeInput = useRef<HTMLInputElement>(null);
   const giftCardAddFetcher = useFetcher({key: 'gift-card-add'});
 
-  // Clear the gift card code input after the gift card is added
   useEffect(() => {
     if (giftCardAddFetcher.data) {
       giftCardCodeInput.current!.value = '';
     }
   }, [giftCardAddFetcher.data]);
 
-  function saveAppliedCode(code: string) {
-    const formattedCode = code.replace(/\s/g, ''); // Remove spaces
-    if (!appliedGiftCardCodes.current.includes(formattedCode)) {
-      appliedGiftCardCodes.current.push(formattedCode);
-    }
-  }
-
   return (
     <div>
-      {/* Display applied gift cards with individual remove buttons */}
       {giftCardCodes && giftCardCodes.length > 0 && (
         <dl>
           <dt>Applied Gift Card(s)</dt>
@@ -148,12 +149,7 @@ function CartGiftCard({
         </dl>
       )}
 
-      {/* Show an input to apply a gift card */}
-      <UpdateGiftCardForm
-        giftCardCodes={appliedGiftCardCodes.current}
-        saveAppliedCode={saveAppliedCode}
-        fetcherKey="gift-card-add"
-      >
+      <AddGiftCardForm fetcherKey="gift-card-add">
         <div>
           <input
             type="text"
@@ -166,19 +162,15 @@ function CartGiftCard({
             Apply
           </button>
         </div>
-      </UpdateGiftCardForm>
+      </AddGiftCardForm>
     </div>
   );
 }
 
-function UpdateGiftCardForm({
-  giftCardCodes,
-  saveAppliedCode,
+function AddGiftCardForm({
   fetcherKey,
   children,
 }: {
-  giftCardCodes?: string[];
-  saveAppliedCode?: (code: string) => void;
   fetcherKey?: string;
   children: React.ReactNode;
 }) {
@@ -186,18 +178,9 @@ function UpdateGiftCardForm({
     <CartForm
       fetcherKey={fetcherKey}
       route="/cart"
-      action={CartForm.ACTIONS.GiftCardCodesUpdate}
-      inputs={{
-        giftCardCodes: giftCardCodes || [],
-      }}
+      action={CartForm.ACTIONS.GiftCardCodesAdd}
     >
-      {(fetcher: FetcherWithComponents<any>) => {
-        const code = fetcher.formData?.get('giftCardCode');
-        if (code && saveAppliedCode) {
-          saveAppliedCode(code as string);
-        }
-        return children;
-      }}
+      {children}
     </CartForm>
   );
 }
@@ -221,4 +204,3 @@ function RemoveGiftCardForm({
     </CartForm>
   );
 }
-

package/dist/assets/hydrogen/starter/app/lib/fragments.ts

@@ -54,6 +54,11 @@ export const CART_QUERY_FRAGMENT = `#graphql
         }
       }
     }
+    parentRelationship {
+      parent {
+        id
+      }
+    }
   }
   fragment CartLineComponent on ComponentizableCartLine {
     id
@@ -104,6 +109,9 @@ export const CART_QUERY_FRAGMENT = `#graphql
         }
       }
     }
+    lineComponents {
+      ...CartLine
+    }
   }
   fragment CartApiQuery on Cart {
     updatedAt

package/dist/assets/hydrogen/starter/app/routes/cart.tsx

@@ -52,18 +52,14 @@ export async function action({request, context}: Route.ActionArgs) {
       result = await cart.updateDiscountCodes(discountCodes);
       break;
     }
-    case CartForm.ACTIONS.GiftCardCodesUpdate: {
+    case CartForm.ACTIONS.GiftCardCodesAdd: {
       const formGiftCardCode = inputs.giftCardCode;
 
-      // User inputted gift card code
       const giftCardCodes = (
         formGiftCardCode ? [formGiftCardCode] : []
       ) as string[];
 
-      // Combine gift card codes already applied on cart
-      giftCardCodes.push(...inputs.giftCardCodes);
-
-      result = await cart.updateGiftCardCodes(giftCardCodes);
+      result = await cart.addGiftCardCodes(giftCardCodes);
       break;
     }
     case CartForm.ACTIONS.GiftCardCodesRemove: {

package/dist/assets/hydrogen/starter/app/styles/app.css

@@ -90,6 +90,18 @@ aside li {
   margin-bottom: 0.125rem;
 }
 
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip-path: inset(50%);
+  white-space: nowrap;
+  border-width: 0;
+}
+
 .overlay {
   background: rgba(0, 0, 0, 0.2);
   bottom: 0;
@@ -250,10 +262,13 @@ button.reset:hover:not(:has(> *)) {
 }
 
 .cart-line {
-  display: flex;
   padding: 0.75rem 0;
 }
 
+.cart-line-inner {
+  display: flex;
+}
+
 .cart-line img {
   height: 100%;
   display: block;
@@ -277,6 +292,11 @@ button.reset:hover:not(:has(> *)) {
   display: flex;
 }
 
+/* Child line components (warranties, gift wrapping, etc.) */
+.cart-line-children {
+  padding-left: 2rem;
+}
+
 .cart-discount {
   align-items: center;
   display: flex;

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

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2025.7.3",
+  "version": "2025.10.1",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
@@ -14,7 +14,7 @@
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@shopify/hydrogen": "2025.7.3",
+    "@shopify/hydrogen": "2025.10.1",
     "graphql": "^16.10.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^5.1.22",

package/dist/assets/hydrogen/starter/storefrontapi.generated.d.ts

@@ -36,6 +36,9 @@ export type CartLineFragment = Pick<
       Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
     >;
   };
+  parentRelationship?: StorefrontAPI.Maybe<{
+    parent: Pick<StorefrontAPI.CartLine, 'id'>;
+  }>;
 };
 
 export type CartLineComponentFragment = Pick<
@@ -66,6 +69,46 @@ export type CartLineComponentFragment = Pick<
       Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
     >;
   };
+  lineComponents: Array<
+    Pick<StorefrontAPI.CartLine, 'id' | 'quantity'> & {
+      attributes: Array<Pick<StorefrontAPI.Attribute, 'key' | 'value'>>;
+      cost: {
+        totalAmount: Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>;
+        amountPerQuantity: Pick<
+          StorefrontAPI.MoneyV2,
+          'currencyCode' | 'amount'
+        >;
+        compareAtAmountPerQuantity?: StorefrontAPI.Maybe<
+          Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+        >;
+      };
+      merchandise: Pick<
+        StorefrontAPI.ProductVariant,
+        'id' | 'availableForSale' | 'requiresShipping' | 'title'
+      > & {
+        compareAtPrice?: StorefrontAPI.Maybe<
+          Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+        >;
+        price: Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>;
+        image?: StorefrontAPI.Maybe<
+          Pick<
+            StorefrontAPI.Image,
+            'id' | 'url' | 'altText' | 'width' | 'height'
+          >
+        >;
+        product: Pick<
+          StorefrontAPI.Product,
+          'handle' | 'title' | 'id' | 'vendor'
+        >;
+        selectedOptions: Array<
+          Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
+        >;
+      };
+      parentRelationship?: StorefrontAPI.Maybe<{
+        parent: Pick<StorefrontAPI.CartLine, 'id'>;
+      }>;
+    }
+  >;
 };
 
 export type CartApiQueryFragment = Pick<
@@ -124,6 +167,9 @@ export type CartApiQueryFragment = Pick<
               Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
             >;
           };
+          parentRelationship?: StorefrontAPI.Maybe<{
+            parent: Pick<StorefrontAPI.CartLine, 'id'>;
+          }>;
         })
       | (Pick<StorefrontAPI.ComponentizableCartLine, 'id' | 'quantity'> & {
           attributes: Array<Pick<StorefrontAPI.Attribute, 'key' | 'value'>>;
@@ -159,6 +205,49 @@ export type CartApiQueryFragment = Pick<
               Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
             >;
           };
+          lineComponents: Array<
+            Pick<StorefrontAPI.CartLine, 'id' | 'quantity'> & {
+              attributes: Array<Pick<StorefrontAPI.Attribute, 'key' | 'value'>>;
+              cost: {
+                totalAmount: Pick<
+                  StorefrontAPI.MoneyV2,
+                  'currencyCode' | 'amount'
+                >;
+                amountPerQuantity: Pick<
+                  StorefrontAPI.MoneyV2,
+                  'currencyCode' | 'amount'
+                >;
+                compareAtAmountPerQuantity?: StorefrontAPI.Maybe<
+                  Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+                >;
+              };
+              merchandise: Pick<
+                StorefrontAPI.ProductVariant,
+                'id' | 'availableForSale' | 'requiresShipping' | 'title'
+              > & {
+                compareAtPrice?: StorefrontAPI.Maybe<
+                  Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>
+                >;
+                price: Pick<StorefrontAPI.MoneyV2, 'currencyCode' | 'amount'>;
+                image?: StorefrontAPI.Maybe<
+                  Pick<
+                    StorefrontAPI.Image,
+                    'id' | 'url' | 'altText' | 'width' | 'height'
+                  >
+                >;
+                product: Pick<
+                  StorefrontAPI.Product,
+                  'handle' | 'title' | 'id' | 'vendor'
+                >;
+                selectedOptions: Array<
+                  Pick<StorefrontAPI.SelectedOption, 'name' | 'value'>
+                >;
+              };
+              parentRelationship?: StorefrontAPI.Maybe<{
+                parent: Pick<StorefrontAPI.CartLine, 'id'>;
+              }>;
+            }
+          >;
         })
     >;
   };

package/dist/commands/hydrogen/deploy.js

@@ -193,15 +193,21 @@ async function runDeploy(options) {
         errorMessage += `:
 
 ${changedFiles.trimEnd()}`;
-        packageManagers.forEach(({ name, lockfile, installCommand }) => {
-          if (changedFiles.includes(lockfile)) {
-            nextSteps.push([
-              `If you are using ${name}, try running`,
-              { command: installCommand },
-              `to avoid changes to ${lockfile}.`
-            ]);
+        packageManagers.forEach(
+          ({ name, lockfile, alternativeLockfiles, installCommand }) => {
+            const allLockfiles = [lockfile, ...alternativeLockfiles || []];
+            const changedLockfile = allLockfiles.find(
+              (lf) => changedFiles.includes(lf)
+            );
+            if (changedLockfile) {
+              nextSteps.push([
+                `If you are using ${name}, try running`,
+                { command: installCommand },
+                `to avoid changes to ${changedLockfile}.`
+              ]);
+            }
           }
-        });
+        );
       }
       throw new AbortError(errorMessage, null, nextSteps);
     }

package/dist/commands/hydrogen/init.d.ts

@@ -60,7 +60,7 @@ declare class Init extends Command {
 declare function runInit({ markets, ...options }?: InitOptions & {
     markets?: InitOptions['i18n'];
 }): Promise<{
-    language?: "ts" | "js";
+    language?: "js" | "ts";
     packageManager: "npm" | "pnpm" | "yarn" | "bun" | "unknown";
     cssStrategy?: CssStrategy;
     cliCommand: CliCommand;

package/dist/lib/check-lockfile.js

@@ -24,10 +24,12 @@ function missingLockfileWarning(shouldExit) {
     renderWarning({ headline, body, nextSteps });
   }
 }
-function multipleLockfilesWarning(packageManagers2, shouldExit) {
-  const lockfileList = packageManagers2.map(({ name, lockfile }) => {
-    return `${lockfile} (created by ${name})`;
-  });
+function multipleLockfilesWarning(foundPackageManagers, shouldExit) {
+  const lockfileList = foundPackageManagers.map(
+    ({ packageManager, foundLockfile }) => {
+      return `${foundLockfile} (created by ${packageManager.name})`;
+    }
+  );
   const headline = "Multiple lockfiles found";
   const body = [
     `Your project contains more than one lockfile. This can cause version conflicts when installing and deploying your app. The following lockfiles were detected:
@@ -57,8 +59,15 @@ async function checkLockfileStatus(directory, shouldExit = false) {
   if (isHydrogenMonorepo && !process.env.SHOPIFY_UNIT_TEST) return;
   const foundPackageManagers = [];
   for (const packageManager of packageManagers) {
-    if (await fileExists(resolvePath(directory, packageManager.lockfile))) {
-      foundPackageManagers.push(packageManager);
+    const allLockfiles = [
+      packageManager.lockfile,
+      ...packageManager.alternativeLockfiles || []
+    ];
+    for (const lockfile2 of allLockfiles) {
+      if (await fileExists(resolvePath(directory, lockfile2))) {
+        foundPackageManagers.push({ packageManager, foundLockfile: lockfile2 });
+        break;
+      }
     }
   }
   if (foundPackageManagers.length === 0) {
@@ -67,7 +76,7 @@ async function checkLockfileStatus(directory, shouldExit = false) {
   if (foundPackageManagers.length > 1) {
     return multipleLockfilesWarning(foundPackageManagers, shouldExit);
   }
-  const lockfile = foundPackageManagers[0].lockfile;
+  const lockfile = foundPackageManagers[0].foundLockfile;
   const ignoredLockfile = await checkIfIgnoredInGitRepository(directory, [
     lockfile
   ]).catch(() => {

package/dist/lib/package-managers.js

@@ -2,6 +2,7 @@ const packageManagers = [
   {
     name: "npm",
     lockfile: "package-lock.json",
+    alternativeLockfiles: ["npm-shrinkwrap.json"],
     installCommand: "npm ci"
   },
   {
@@ -17,6 +18,7 @@ const packageManagers = [
   {
     name: "bun",
     lockfile: "bun.lockb",
+    alternativeLockfiles: ["bun.lock"],
     installCommand: "bun install --frozen-lockfile"
   }
 ];

package/oclif.manifest.json

@@ -1683,5 +1683,5 @@
       ]
     }
   },
-  "version": "11.1.7"
+  "version": "11.1.8"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "11.1.7",
+  "version": "11.1.8",
   "license": "MIT",
   "type": "module",
   "repository": {